QmlDesigner.Rewriter: Fix root node version

The rewriter has used always 1.0 as version Number.

Change-Id: I0884f9998933647d54d34b3c367ba249a423f9ce
Reviewed-on: http://codereview.qt.nokia.com/574
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 41d564d..8237679 100644 (file)
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -822,10 +822,9 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
     bool isImplicitComponent = modelNode.parentProperty().isValid() && propertyIsComponentType(modelNode.parentProperty(), typeName);
 
 
-    if (modelNode.type() != typeName //If there is no valid parentProperty
-                                                                                                       //the node has just been created. The type is correct then.
-            /*|| modelNode.majorVersion() != domObject.objectTypeMajorVersion()
-            || modelNode.minorVersion() != domObject.objectTypeMinorVersion()*/) {
+    if (modelNode.type() != typeName //If there is no valid parentProperty                                                                                                      //the node has just been created. The type is correct then.
+            || modelNode.majorVersion() != majorVersion
+            || modelNode.minorVersion() != minorVersion) {
         const bool isRootNode = m_rewriterView->rootModelNode() == modelNode;
         differenceHandler.typeDiffers(isRootNode, modelNode, typeName,
                                       majorVersion, minorVersion,