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

QmlDesigner.model: fix majorQtQuickVersion()

Browse Source 
This function was broken for Item.

Change-Id: I772a2fd1b63933ba1134c824eb245b78d0270d9d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2012-09-20 12:49:26 +02:00
parent 3c5b64a722
commit c060d778bb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/model/modelnode.cpp
View File

@@ -249,10 +249,12 @@ int ModelNode::majorQtQuickVersion() const
} }
if (metaInfo().isValid()) { if (metaInfo().isValid()) {
if (type() == "QtQuick.QtObject")
return majorVersion();
NodeMetaInfo superClass = metaInfo().directSuperClass(); NodeMetaInfo superClass = metaInfo().directSuperClass();
while (superClass.isValid()) { while (superClass.isValid()) {
if (superClass.typeName() == "QtQuick.Item") if (superClass.typeName() == "QtQuick.QtObject")
return superClass.majorVersion(); return superClass.majorVersion();
superClass = superClass.directSuperClass(); superClass = superClass.directSuperClass();
} }