Set correct property flags for custom property types.

If a property type was a composite object pointer
(e.g. property MyObject obj), it was not being correctly identified as an
object type.

Task-number: QTBUG-6335
Reviewed-by: Aaron Kennedy

1 files changed, 10 insertions, 0 deletions

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 6b66095..f541631 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1527,6 +1527,16 @@ int QmlEnginePrivate::qmlListType(int t) const
         return QmlMetaType::qmlListType(t);
 }
 
+QmlMetaType::TypeCategory QmlEnginePrivate::typeCategory(int t) const
+{
+    if (m_compositeTypes.contains(t))
+        return QmlMetaType::Object;
+    else if (m_qmlLists.contains(t))
+        return QmlMetaType::QmlList;
+    else
+        return QmlMetaType::typeCategory(t);
+}
+
 const QMetaObject *QmlEnginePrivate::rawMetaObjectForType(int t) const
 {
     QHash<int, QmlCompiledData*>::ConstIterator iter = m_compositeTypes.find(t);