diff options
Diffstat (limited to 'tests/auto/dbus/qdbusabstractadaptor')
-rw-r--r-- | tests/auto/dbus/qdbusabstractadaptor/myobject.h | 8 | ||||
-rw-r--r-- | tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/dbus/qdbusabstractadaptor/myobject.h b/tests/auto/dbus/qdbusabstractadaptor/myobject.h index fe3f6f3dd2..a0c5d5c129 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/myobject.h +++ b/tests/auto/dbus/qdbusabstractadaptor/myobject.h @@ -198,15 +198,15 @@ public: void emitSignal(const QString &, const QVariant &value) { - switch (value.type()) + switch (value.metaType().id()) { - case QVariant::Invalid: + case QMetaType::UnknownType: emit signal(); break; - case QVariant::Int: + case QMetaType::Int: emit signal(value.toInt()); break; - case QVariant::String: + case QMetaType::QString: emit signal(value.toString()); break; default: diff --git a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp index 0f266200af..fed87cc438 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp +++ b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp @@ -953,7 +953,7 @@ void tst_QDBusAbstractAdaptor::readPropertiesEmptyInterface() continue; } - QCOMPARE(int(reply.value().type()), int(QVariant::String)); + QCOMPARE(reply.value().userType(), int(QMetaType::QString)); if (it.value().isValid()) QCOMPARE(reply.value().toString(), it.value().toString()); } @@ -1479,7 +1479,7 @@ void tst_QDBusAbstractAdaptor::readPropertiesEmptyInterfacePeer() continue; } - QCOMPARE(int(reply.value().type()), int(QVariant::String)); + QCOMPARE(int(reply.value().userType()), int(QMetaType::QString)); if (it.value().isValid()) QCOMPARE(reply.value().toString(), it.value().toString()); } |