From c060d778bbdef0b232eb24f54021f77825a231f3 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Thu, 20 Sep 2012 12:49:26 +0200
Subject: [PATCH] QmlDesigner.model: fix majorQtQuickVersion()
This function was broken for Item.
Change-Id: I772a2fd1b63933ba1134c824eb245b78d0270d9d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
---
src/plugins/qmldesigner/designercore/model/modelnode.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index c224486bb9f..4c21eaf45f5 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -249,10 +249,12 @@ int ModelNode::majorQtQuickVersion() const
}
if (metaInfo().isValid()) {
+ if (type() == "QtQuick.QtObject")
+ return majorVersion();
NodeMetaInfo superClass = metaInfo().directSuperClass();
while (superClass.isValid()) {
- if (superClass.typeName() == "QtQuick.Item")
+ if (superClass.typeName() == "QtQuick.QtObject")
return superClass.majorVersion();
superClass = superClass.directSuperClass();
}
--
GitLab