feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: crash fix

Browse Source 
qmlSource() contains the source and not qml().

Change-Id: I00d34ca511eb0e1af032a6a9766b3cd8296101f9
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2013-07-31 17:52:37 +02:00
committed by Marco Bubke
parent 51a6ff75e0
commit 13e2e71181
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
View File

@@ -134,7 +134,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary
} }
} }
if (itemLibraryEntry.qml().isEmpty()) { if (itemLibraryEntry.qmlSource().isEmpty()) {
QList<QPair<PropertyName, QVariant> > propertyPairList; QList<QPair<PropertyName, QVariant> > propertyPairList;
propertyPairList.append(qMakePair(PropertyName("x"), QVariant(qRound(position.x())))); propertyPairList.append(qMakePair(PropertyName("x"), QVariant(qRound(position.x()))));
propertyPairList.append(qMakePair(PropertyName("y"), QVariant(qRound(position.y())))); 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)); newQmlItemNode = QmlItemNode(view->createModelNode(itemLibraryEntry.typeName(), majorVersion, minorVersion, propertyPairList));
} else { } else {
newQmlItemNode = createQmlItemNodeFromSource(view, itemLibraryEntry.qml(), position); newQmlItemNode = createQmlItemNodeFromSource(view, itemLibraryEntry.qmlSource(), position);
} }
if (parentQmlItemNode.hasDefaultPropertyName()) if (parentQmlItemNode.hasDefaultPropertyName())