From dcd34febabccdcb96fc7963172cba270e20aa483 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Tue, 24 May 2011 17:24:42 +0200
Subject: [PATCH] QmlDesigner.textToModelMerger: do not sync children of
Components
Everything that is inside a Component is ignored.
Change-Id: If9fee49fbddbb7093a4275e7afd8cf9c7befba74
Reviewed-on: http://codereview.qt.nokia.com/95
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
---
.../qmldesigner/designercore/model/texttomodelmerger.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 6a9cf7bc2d3..35dbb6e5273 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -811,6 +811,9 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
if (isCustomParserType(typeName))
setupCustomParserNode(modelNode);
+ if (isComponentType(typeNameFixedForImplicitComponents))
+ return; //No need to enter components
+
context->enterScope(astNode);
QSet<QString> modelPropertyNames = QSet<QString>::fromList(modelNode.propertyNames());
--
GitLab