QQmlEngineDebugService: Property Data of type QVariant

Send property data of type QVariant to the client.

Change-Id: I5a18da18f1347935e4ccaafb05e3a877e73bbede
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp
index 764ba6b..b824bc0 100644 (file)
--- a/src/qml/debugger/qqmlenginedebugservice.cpp
+++ b/src/qml/debugger/qqmlenginedebugservice.cpp
@@ -163,6 +163,8 @@ QQmlEngineDebugService::propertyData(QObject *obj, int propIdx)
         rv.type = QQmlObjectProperty::Object;
     } else if (QQmlMetaType::isList(prop.userType())) {
         rv.type = QQmlObjectProperty::List;
+    } else if (prop.userType() == QMetaType::QVariant) {
+        rv.type = QQmlObjectProperty::Variant;
     }
 
     QVariant value;

diff --git a/src/qml/debugger/qqmlenginedebugservice_p.h b/src/qml/debugger/qqmlenginedebugservice_p.h
index 7ece25b..0717dee 100644 (file)
--- a/src/qml/debugger/qqmlenginedebugservice_p.h
+++ b/src/qml/debugger/qqmlenginedebugservice_p.h
@@ -87,7 +87,7 @@ public:
     };
 
     struct QQmlObjectProperty {
-        enum Type { Unknown, Basic, Object, List, SignalProperty };
+        enum Type { Unknown, Basic, Object, List, SignalProperty, Variant };
         Type type;
         QString name;
         QVariant value;

diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
index 59623fe..f0e3d95 100644 (file)
--- a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
+++ b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
@@ -268,6 +268,7 @@ void tst_QQmlEngineDebugService::initTestCase()
                 "property variant varObj\n"
                 "property variant varObjList: []\n"
                 "property variant varObjMap\n"
+                "property variant simpleVar: 10.05\n"
                 "Component.onCompleted: {\n"
                     "varObj = blueRect;\n"
                     "var list = varObjList;\n"
@@ -861,6 +862,7 @@ void tst_QQmlEngineDebugService::queryExpressionResult_data()
     QVariantMap map;
     map.insert(QLatin1String("rect"), QVariant(QLatin1String("<unnamed object>")));
     QTest::newRow("varObjMap") << "varObjMap" << qVariantFromValue(map);
+    QTest::newRow("simpleVar") << "simpleVar" << qVariantFromValue(10.05);
 }
 
 void tst_QQmlEngineDebugService::queryExpressionResultInRootContext()
@@ -908,6 +910,7 @@ void tst_QQmlEngineDebugService::queryExpressionResultBC_data()
     QVariantMap map;
     map.insert(QLatin1String("rect"), QVariant(QLatin1String("<unnamed object>")));
     QTest::newRow("varObjMap") << "varObjMap" << qVariantFromValue(map);
+    QTest::newRow("simpleVar") << "simpleVar" << qVariantFromValue(10.05);
 }
 
 void tst_QQmlEngineDebugService::setBindingForObject()