From 850d850c5af8ff77a4b9d53457ec6b1ba6c20cb3 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 9 Sep 2020 13:42:35 +0200 Subject: Use QMetaType instead of integer based type ids Change the implementation of Qt DBus to use QMetaType directly instead of integer based type ids. Change-Id: I999023b58fa50dcc3504386467faf09874f7d2cf Reviewed-by: Qt CI Bot Reviewed-by: Thiago Macieira --- tests/auto/dbus/qdbusmarshall/common.h | 4 ++-- tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/dbus') diff --git a/tests/auto/dbus/qdbusmarshall/common.h b/tests/auto/dbus/qdbusmarshall/common.h index 6695567a80..3dfe3e39bb 100644 --- a/tests/auto/dbus/qdbusmarshall/common.h +++ b/tests/auto/dbus/qdbusmarshall/common.h @@ -386,7 +386,7 @@ inline bool compare(const QDBusArgument &arg, const QVariant &v2, T * = 0) bool compareToArgument(const QDBusArgument &arg, const QVariant &v2) { - if (arg.currentSignature() != QDBusMetaType::typeToSignature(v2.userType())) + if (arg.currentSignature() != QDBusMetaType::typeToSignature(v2.metaType())) return false; // try to demarshall the arg according to v2 @@ -521,7 +521,7 @@ bool compareToArgument(const QDBusArgument &arg, const QVariant &v2) } qWarning() << "Unexpected QVariant type" << v2.userType() - << QByteArray(QDBusMetaType::typeToSignature(v2.userType())) + << QByteArray(QDBusMetaType::typeToSignature(v2.metaType())) << v2.metaType().name(); return false; } diff --git a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp index 18503483ed..2217f112f8 100644 --- a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp +++ b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp @@ -354,7 +354,7 @@ void tst_QDBusMetaType::staticTypes() { QFETCH(QVariant::Type, typeId); - QString result = QDBusMetaType::typeToSignature(typeId); + QString result = QDBusMetaType::typeToSignature(QMetaType(typeId)); QTEST(result, "signature"); } -- cgit v1.2.3