diff options
| author | Aurindam Jana <aurindam.jana@nokia.com> | 2012-05-25 10:14:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-25 13:35:16 +0200 |
| commit | 9ce3a474e6eae130aa3d1c28e84f934dc3f01d19 (patch) | |
| tree | 4f5992dd95874c770f299f59fff4d26a37a685d2 | |
| parent | 50bd267a0b7623f5310b4d3bba6dcccbfb815179 (diff) | |
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>
| -rw-r--r-- | src/qml/debugger/qqmlenginedebugservice.cpp | 2 | ||||
| -rw-r--r-- | src/qml/debugger/qqmlenginedebugservice_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp index 764ba6bbe6..b824bc0e23 100644 --- 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 7ece25be1b..0717deeda3 100644 --- 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 59623fec96..f0e3d956ab 100644 --- 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() |