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

QmlDesigner.Rewriter: fix for setting node source

Browse Source 
This was wrong and could trigger asserts.

Change-Id: I5daac224b467444d46f16a888a3ad3682f423c20
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2013-04-18 10:01:37 +02:00
parent fecde3e8a1
commit 0398eb6acd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -903,10 +903,10 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
} }
if (isComponentType(typeName) || isImplicitComponent) if (isComponentType(typeName) || isImplicitComponent)
setupComponentDelayed(modelNode, !differenceHandler.isValidator()); setupComponentDelayed(modelNode, differenceHandler.isValidator());
if (isCustomParserType(typeName)) if (isCustomParserType(typeName))
setupCustomParserNodeDelayed(modelNode, !differenceHandler.isValidator()); setupCustomParserNodeDelayed(modelNode, differenceHandler.isValidator());
context->enterScope(astNode); context->enterScope(astNode);
@@ -1001,7 +1001,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
if (!defaultPropertyItems.isEmpty()) { if (!defaultPropertyItems.isEmpty()) {
if (isComponentType(modelNode.type())) if (isComponentType(modelNode.type()))
setupComponentDelayed(modelNode, !differenceHandler.isValidator()); setupComponentDelayed(modelNode, differenceHandler.isValidator());
if (defaultPropertyName.isEmpty()) { if (defaultPropertyName.isEmpty()) {
qWarning() << "No default property for node type" << modelNode.type() << ", ignoring child items."; qWarning() << "No default property for node type" << modelNode.type() << ", ignoring child items.";
} else { } else {