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

QmlDesigner: Fix crash in TestCore::testRewriterForArrayMagic

Browse Source 
Qml allows property lists to be written as single properties, i.e.

  states: State {}

However, for the QmlDesigner model states is a list. Take care of this
in the texttomodelmerger.

Reviewed-by: Erik Verbruggen
This commit is contained in:
Kai Koehne
2010-03-24 13:22:12 +01:00
parent f956b52e0e
commit 35e36f75b7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
View File

@@ -382,7 +382,12 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
} else { } else {
if (isValidPropertyForNode(modelNode, astPropertyName)) { if (isValidPropertyForNode(modelNode, astPropertyName)) {
AbstractProperty modelProperty = modelNode.property(astPropertyName); AbstractProperty modelProperty = modelNode.property(astPropertyName);
if (modelProperty.metaInfo().isListProperty()) {
NodeListProperty listProperty = modelProperty.toNodeListProperty();
syncNodeListProperty(listProperty, QList<QmlJS::AST::UiObjectMember*>() << member, context, differenceHandler);
} else {
syncNodeProperty(modelProperty, binding, context, differenceHandler); syncNodeProperty(modelProperty, binding, context, differenceHandler);
}
modelPropertyNames.remove(astPropertyName); modelPropertyNames.remove(astPropertyName);
} else { } else {
qWarning() << "Skipping invalid node property" << astPropertyName qWarning() << "Skipping invalid node property" << astPropertyName