From 0398eb6acdf9df854f3ea3cbe8026ebce07b9a2d Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 18 Apr 2013 10:01:37 +0200 Subject: [PATCH] QmlDesigner.Rewriter: fix for setting node source This was wrong and could trigger asserts. Change-Id: I5daac224b467444d46f16a888a3ad3682f423c20 Reviewed-by: Marco Bubke --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index b436ecdf851..dd2dfa21753 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -903,10 +903,10 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, } if (isComponentType(typeName) || isImplicitComponent) - setupComponentDelayed(modelNode, !differenceHandler.isValidator()); + setupComponentDelayed(modelNode, differenceHandler.isValidator()); if (isCustomParserType(typeName)) - setupCustomParserNodeDelayed(modelNode, !differenceHandler.isValidator()); + setupCustomParserNodeDelayed(modelNode, differenceHandler.isValidator()); context->enterScope(astNode); @@ -1001,7 +1001,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, if (!defaultPropertyItems.isEmpty()) { if (isComponentType(modelNode.type())) - setupComponentDelayed(modelNode, !differenceHandler.isValidator()); + setupComponentDelayed(modelNode, differenceHandler.isValidator()); if (defaultPropertyName.isEmpty()) { qWarning() << "No default property for node type" << modelNode.type() << ", ignoring child items."; } else {