aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/debugger
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/debugger')
-rw-r--r--tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
index 9bef2185de..a87a77180f 100644
--- a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
+++ b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
@@ -283,7 +283,7 @@ void tst_QQmlEngineDebugService::recursiveObjectTest(
} else if (pmeta.userType() < QMetaType::User && pmeta.userType() != QMetaType::QVariant) {
const QVariant expected = pmeta.read(o);
QVariant value = p.value;
- auto expectedType = expected.metaType().id();
+ QMetaType expectedType = expected.metaType();
if (value != expected && p.value.canConvert(expectedType))
value.convert(expectedType);
QVERIFY2(value == expected, QString::fromLatin1("%1 != %2. Details: %3/%4/%5/%6")
@@ -778,8 +778,8 @@ void tst_QQmlEngineDebugService::queryObject()
// test specific property values
QCOMPARE(findProperty(rect.properties, "width").value, QVariant::fromValue(500));
QCOMPARE(findProperty(rect.properties, "height").value, QVariant::fromValue(600));
- auto expected = findProperty(rect.properties, "color").value;
- expected.convert(QMetaType::fromType<QColor>().id());
+ QVariant expected = findProperty(rect.properties, "color").value;
+ expected.convert(QMetaType::fromType<QColor>());
QCOMPARE(expected , QVariant::fromValue(QColor("blue")));
} else {
foreach (const QQmlEngineDebugObjectReference &child, obj.children) {
@@ -857,8 +857,8 @@ void tst_QQmlEngineDebugService::queryObjectsForLocation()
// test specific property values
QCOMPARE(findProperty(rect.properties, "width").value, QVariant::fromValue(500));
QCOMPARE(findProperty(rect.properties, "height").value, QVariant::fromValue(600));
- auto expected = findProperty(rect.properties, "color").value;
- auto colorMetatype = QMetaType::fromType<QColor>().id();
+ QVariant expected = findProperty(rect.properties, "color").value;
+ QMetaType colorMetatype = QMetaType::fromType<QColor>();
QVERIFY(expected.canConvert(colorMetatype));
expected.convert(colorMetatype);
QCOMPARE(expected , QVariant::fromValue(QColor("blue")));