From 13e2e711819afa5bb7c204b462828643c3b43fae Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Wed, 31 Jul 2013 17:52:37 +0200
Subject: [PATCH] QmlDesigner: crash fix
qmlSource() contains the source and not qml().
Change-Id: I00d34ca511eb0e1af032a6a9766b3cd8296101f9
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
---
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index afd962070c..6ca3ab6184 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -134,7 +134,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary
}
}
- if (itemLibraryEntry.qml().isEmpty()) {
+ if (itemLibraryEntry.qmlSource().isEmpty()) {
QList<QPair<PropertyName, QVariant> > propertyPairList;
propertyPairList.append(qMakePair(PropertyName("x"), QVariant(qRound(position.x()))));
propertyPairList.append(qMakePair(PropertyName("y"), QVariant(qRound(position.y()))));
@@ -144,7 +144,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary
newQmlItemNode = QmlItemNode(view->createModelNode(itemLibraryEntry.typeName(), majorVersion, minorVersion, propertyPairList));
} else {
- newQmlItemNode = createQmlItemNodeFromSource(view, itemLibraryEntry.qml(), position);
+ newQmlItemNode = createQmlItemNodeFromSource(view, itemLibraryEntry.qmlSource(), position);
}
if (parentQmlItemNode.hasDefaultPropertyName())
--
GitLab