aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-07-12 16:22:36 +0200
committerThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-07-12 14:59:08 +0000
commita5cc7e3c7bc08f6b1641c83a74bdff0594885d0f (patch)
treefe2967c5fd7312fc67c26afe78cc562f76c15400 /src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
parent2cbd4ed0ddf59d5d41960bac55651252c45fac7e (diff)
QmlDesigner.MetaInfo: Resolve properties using the CppComponentValue
If the type is still "unknown" use the CppComponentValue to resolve the type. Change-Id: Ib404faa89a06d93f34189abfc7427122567ff25a Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp')
-rw-r--r--src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 6b4af9e9f8..6c5650359d 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -441,6 +441,10 @@ QVector<PropertyInfo> getQmlTypes(const CppComponentValue *objectValue, const Co
TypeName type = property.second;
if (!objectValue->isPointer(nameAsString) && !objectValue->isListProperty(nameAsString))
type = objectValue->propertyType(nameAsString).toUtf8();
+
+ if (type == "unknown" && objectValue->hasProperty(nameAsString))
+ type = objectValue->propertyType(nameAsString).toUtf8();
+
propertyList.append(qMakePair(name, type));
}