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

QmlDesigner.Rewriter: Fix root node version

Browse Source 
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>
This commit is contained in:
Marco Bubke
2011-06-21 15:06:38 +02:00
parent 95ca7ecfef
commit 0c1d3e98ef
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,