From 03192f749c14ffdde24d3e1585fadf98f9750938 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Thu, 5 Jul 2012 11:53:18 +1000 Subject: Don't provide typehint in QQmlExpression::evaluate() Previously, the result returned by QQmlExpression::evaluate() was converted from the actual JavaScript result with a default typehint of QList. This commit removes that typehint so that the engine's conversion code will choose the most appropriate return type for the result JavaScript value, instead. Task-number: QTBUG-17082 Change-Id: I368a018b235e9e001b1b92db3699de377748b74f Reviewed-by: Michael Brasser --- .../debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/qml/debugger') diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp index f0e3d956ab..3ecc0d6e95 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp @@ -858,7 +858,7 @@ void tst_QQmlEngineDebugService::queryExpressionResult_data() QTest::newRow("blueRect.width") << "blueRect.width" << qVariantFromValue(500); QTest::newRow("bad expr") << "aeaef" << qVariantFromValue(QString("")); QTest::newRow("QObject*") << "varObj" << qVariantFromValue(QString("")); - QTest::newRow("list of QObject*") << "varObjList" << qVariantFromValue(QString("")); + QTest::newRow("list of QObject*") << "varObjList" << qVariantFromValue(QVariantList() << QVariant(QString(""))); QVariantMap map; map.insert(QLatin1String("rect"), QVariant(QLatin1String(""))); QTest::newRow("varObjMap") << "varObjMap" << qVariantFromValue(map); @@ -906,7 +906,7 @@ void tst_QQmlEngineDebugService::queryExpressionResultBC_data() QTest::newRow("blueRect.width") << "blueRect.width" << qVariantFromValue(500); QTest::newRow("bad expr") << "aeaef" << qVariantFromValue(QString("")); QTest::newRow("QObject*") << "varObj" << qVariantFromValue(QString("")); - QTest::newRow("list of QObject*") << "varObjList" << qVariantFromValue(QString("")); + QTest::newRow("list of QObject*") << "varObjList" << qVariantFromValue(QVariantList() << QVariant(QString(""))); QVariantMap map; map.insert(QLatin1String("rect"), QVariant(QLatin1String(""))); QTest::newRow("varObjMap") << "varObjMap" << qVariantFromValue(map); -- cgit v1.2.3