diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-09-10 17:05:10 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-10-23 09:58:57 +0200 |
commit | 11bad6109606794091adc3b8a14070ac09707f45 (patch) | |
tree | 603d07bada752a534a8549c6d008b9b8a4aa832a /tests/auto/dbus | |
parent | a618c260ed0d1de711a5bc20337f9b8c3835c407 (diff) |
Deprecate QVariant::Type
It's been obsolete for a long time already. Make sure
the compiler now warns about it and remove all remaining
uses in qtbase.
Change-Id: I0ff80311184dba52d2ba5f4e2fabe0d47fdc59d7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/dbus')
7 files changed, 91 insertions, 94 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()); } diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp index 481d40d00a..4cf2a81c6b 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -483,14 +483,14 @@ void tst_QDBusInterface::callMethod() QCOMPARE(MyObject::callArgs.count(), 1); QVariant v = MyObject::callArgs.at(0); QDBusVariant dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("foo")); // verify reply QCOMPARE(reply.arguments().count(), 1); v = reply.arguments().at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("foo")); // call an INVOKABLE method @@ -502,14 +502,14 @@ void tst_QDBusInterface::callMethod() QCOMPARE(MyObject::callArgs.count(), 1); v = MyObject::callArgs.at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("bar")); // verify reply QCOMPARE(reply.arguments().count(), 1); v = reply.arguments().at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("bar")); } @@ -530,7 +530,7 @@ void tst_QDBusInterface::invokeMethod() QCOMPARE(MyObject::callArgs.count(), 1); QVariant v = MyObject::callArgs.at(0); QDBusVariant dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("foo")); // make the INVOKABLE call without a return type @@ -542,7 +542,7 @@ void tst_QDBusInterface::invokeMethod() QCOMPARE(MyObject::callArgs.count(), 1); v = MyObject::callArgs.at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("bar")); } @@ -564,7 +564,7 @@ void tst_QDBusInterface::invokeMethodWithReturn() QCOMPARE(MyObject::callArgs.count(), 1); QVariant v = MyObject::callArgs.at(0); QDBusVariant dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg.variant().toString()); // verify that we got the reply as expected @@ -579,7 +579,7 @@ void tst_QDBusInterface::invokeMethodWithReturn() QCOMPARE(MyObject::callArgs.count(), 1); v = MyObject::callArgs.at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg2.variant().toString()); // verify that we got the reply as expected @@ -608,12 +608,12 @@ void tst_QDBusInterface::invokeMethodWithMultiReturn() QCOMPARE(MyObject::callArgs.count(), 2); QVariant v = MyObject::callArgs.at(0); QDBusVariant dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg.variant().toString()); v = MyObject::callArgs.at(1); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg2.variant().toString()); // verify that we got the replies as expected @@ -633,12 +633,12 @@ void tst_QDBusInterface::invokeMethodWithMultiReturn() QCOMPARE(MyObject::callArgs.count(), 2); v = MyObject::callArgs.at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg3.variant().toString()); v = MyObject::callArgs.at(1); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg4.variant().toString()); // verify that we got the replies as expected @@ -718,14 +718,14 @@ void tst_QDBusInterface::callMethodPeer() QCOMPARE(callArgs.count(), 1); QVariant v = callArgs.at(0); QDBusVariant dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("foo")); // verify reply QCOMPARE(reply.arguments().count(), 1); v = reply.arguments().at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("foo")); // call an INVOKABLE method @@ -738,14 +738,14 @@ void tst_QDBusInterface::callMethodPeer() QCOMPARE(callArgs.count(), 1); v = callArgs.at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("bar")); // verify reply QCOMPARE(reply.arguments().count(), 1); v = reply.arguments().at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("bar")); } @@ -767,7 +767,7 @@ void tst_QDBusInterface::invokeMethodPeer() QCOMPARE(callArgs.count(), 1); QVariant v = callArgs.at(0); QDBusVariant dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("foo")); // make the INVOKABLE call without a return type @@ -780,7 +780,7 @@ void tst_QDBusInterface::invokeMethodPeer() QCOMPARE(callArgs.count(), 1); v = callArgs.at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), QString("bar")); } @@ -803,7 +803,7 @@ void tst_QDBusInterface::invokeMethodWithReturnPeer() QCOMPARE(callArgs.count(), 1); QVariant v = callArgs.at(0); QDBusVariant dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg.variant().toString()); // verify that we got the reply as expected @@ -819,7 +819,7 @@ void tst_QDBusInterface::invokeMethodWithReturnPeer() QCOMPARE(callArgs.count(), 1); v = callArgs.at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg2.variant().toString()); // verify that we got the reply as expected @@ -849,12 +849,12 @@ void tst_QDBusInterface::invokeMethodWithMultiReturnPeer() QCOMPARE(callArgs.count(), 2); QVariant v = callArgs.at(0); QDBusVariant dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg.variant().toString()); v = callArgs.at(1); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg2.variant().toString()); // verify that we got the replies as expected @@ -875,12 +875,12 @@ void tst_QDBusInterface::invokeMethodWithMultiReturnPeer() QCOMPARE(callArgs.count(), 2); v = callArgs.at(0); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg3.variant().toString()); v = callArgs.at(1); dv = qdbus_cast<QDBusVariant>(v); - QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().userType(), QMetaType::QString); QCOMPARE(dv.variant().toString(), arg4.variant().toString()); // verify that we got the replies as expected diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp index b483372ead..c4419d552f 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -861,8 +861,7 @@ void tst_QDBusMarshall::sendArgument() QVERIFY(arg.atEnd()); QCOMPARE(arg.currentType(), QDBusArgument::UnknownType); - if (value.type() != QVariant::UserType) - QCOMPARE(extracted, value); + QCOMPARE(extracted, value); } void tst_QDBusMarshall::sendSignalErrors() @@ -1272,7 +1271,7 @@ void tst_QDBusMarshall::demarshallPrimitives() QCOMPARE(receiveArg.currentSignature(), sig); const QVariant receiveValue = demarshallPrimitiveAs(typeIndex, receiveArg); - if (receiveValue.type() == value.type()) { + if (receiveValue.metaType() == value.metaType()) { // Value type is the same, compare the values QCOMPARE(receiveValue, value); QVERIFY(receiveArg.atEnd()); diff --git a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp index 1d2e776fca..ae0f7a4140 100644 --- a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp +++ b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp @@ -418,7 +418,7 @@ void tst_QDBusMetaObject::types() QCOMPARE(constructed.isUser(), expected.isUser()); QCOMPARE(constructed.isWritable(), expected.isWritable()); QCOMPARE(constructed.typeName(), expected.typeName()); - QCOMPARE(constructed.type(), expected.type()); + QCOMPARE(constructed.metaType(), expected.metaType()); QCOMPARE(constructed.userType(), expected.userType()); } } diff --git a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp index 2217f112f8..4fd8b8103f 100644 --- a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp +++ b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp @@ -108,8 +108,6 @@ typedef QMap<int, QString> IntStringMap; typedef QMap<QString, QString> StringStringMap; typedef QMap<QString, Struct1> StringStruct1Map; -Q_DECLARE_METATYPE(QVariant::Type) - QT_BEGIN_NAMESPACE QDBusArgument &operator<<(QDBusArgument &arg, const Struct1 &) { @@ -289,70 +287,70 @@ void tst_QDBusMetaType::initTestCase() void tst_QDBusMetaType::staticTypes_data() { - QTest::addColumn<QVariant::Type>("typeId"); + QTest::addColumn<int>("typeId"); QTest::addColumn<QString>("signature"); - QTest::newRow("uchar") << QVariant::Type(QMetaType::UChar) << "y"; - QTest::newRow("bool") << QVariant::Bool << "b"; - QTest::newRow("short") << QVariant::Type(QMetaType::Short) << "n"; - QTest::newRow("ushort") << QVariant::Type(QMetaType::UShort) << "q"; - QTest::newRow("int") << QVariant::Int << "i"; - QTest::newRow("uint") << QVariant::UInt << "u"; - QTest::newRow("qlonglong") << QVariant::LongLong << "x"; - QTest::newRow("qulonglong") << QVariant::ULongLong << "t"; - QTest::newRow("double") << QVariant::Double << "d"; - QTest::newRow("QString") << QVariant::String << "s"; - QTest::newRow("QDBusObjectPath") << QVariant::Type(qMetaTypeId<QDBusObjectPath>()) << "o"; - QTest::newRow("QDBusSignature") << QVariant::Type(qMetaTypeId<QDBusSignature>()) << "g"; - QTest::newRow("QDBusVariant") << QVariant::Type(qMetaTypeId<QDBusVariant>()) << "v"; - - QTest::newRow("QByteArray") << QVariant::ByteArray << "ay"; - QTest::newRow("QStringList") << QVariant::StringList << "as"; + QTest::newRow("uchar") << int(QMetaType::UChar) << "y"; + QTest::newRow("bool") << int(QMetaType::Bool) << "b"; + QTest::newRow("short") << int(QMetaType::Short) << "n"; + QTest::newRow("ushort") << int(QMetaType::UShort) << "q"; + QTest::newRow("int") << int(QMetaType::Int) << "i"; + QTest::newRow("uint") << int(QMetaType::UInt) << "u"; + QTest::newRow("qlonglong") << int(QMetaType::LongLong) << "x"; + QTest::newRow("qulonglong") << int(QMetaType::ULongLong) << "t"; + QTest::newRow("double") << int(QMetaType::Double) << "d"; + QTest::newRow("QString") << int(QMetaType::QString) << "s"; + QTest::newRow("QDBusObjectPath") << qMetaTypeId<QDBusObjectPath>() << "o"; + QTest::newRow("QDBusSignature") << qMetaTypeId<QDBusSignature>() << "g"; + QTest::newRow("QDBusVariant") << qMetaTypeId<QDBusVariant>() << "v"; + + QTest::newRow("QByteArray") << int(QMetaType::QByteArray) << "ay"; + QTest::newRow("QStringList") << int(QMetaType::QStringList) << "as"; } void tst_QDBusMetaType::dynamicTypes_data() { - QTest::addColumn<QVariant::Type>("typeId"); + QTest::addColumn<int>("typeId"); QTest::addColumn<QString>("signature"); - QTest::newRow("QVariantList") << QVariant::List << "av"; - QTest::newRow("QVariantMap") << QVariant::Map << "a{sv}"; - QTest::newRow("QDate") << QVariant::Date << "(iii)"; - QTest::newRow("QTime") << QVariant::Time << "(iiii)"; - QTest::newRow("QDateTime") << QVariant::DateTime << "((iii)(iiii)i)"; - QTest::newRow("QRect") << QVariant::Rect << "(iiii)"; - QTest::newRow("QRectF") << QVariant::RectF << "(dddd)"; - QTest::newRow("QSize") << QVariant::Size << "(ii)"; - QTest::newRow("QSizeF") << QVariant::SizeF << "(dd)"; - QTest::newRow("QPoint") << QVariant::Point << "(ii)"; - QTest::newRow("QPointF") << QVariant::PointF << "(dd)"; - QTest::newRow("QLine") << QVariant::Line << "((ii)(ii))"; - QTest::newRow("QLineF") << QVariant::LineF << "((dd)(dd))"; + QTest::newRow("QVariantList") << int(QMetaType::QVariantList) << "av"; + QTest::newRow("QVariantMap") << int(QMetaType::QVariantMap) << "a{sv}"; + QTest::newRow("QDate") << int(QMetaType::QDate) << "(iii)"; + QTest::newRow("QTime") << int(QMetaType::QTime) << "(iiii)"; + QTest::newRow("QDateTime") << int(QMetaType::QDateTime) << "((iii)(iiii)i)"; + QTest::newRow("QRect") << int(QMetaType::QRect) << "(iiii)"; + QTest::newRow("QRectF") << int(QMetaType::QRectF) << "(dddd)"; + QTest::newRow("QSize") << int(QMetaType::QSize) << "(ii)"; + QTest::newRow("QSizeF") << int(QMetaType::QSizeF) << "(dd)"; + QTest::newRow("QPoint") << int(QMetaType::QPoint) << "(ii)"; + QTest::newRow("QPointF") << int(QMetaType::QPointF) << "(dd)"; + QTest::newRow("QLine") << int(QMetaType::QLine) << "((ii)(ii))"; + QTest::newRow("QLineF") << int(QMetaType::QLineF) << "((dd)(dd))"; - QTest::newRow("Struct1") << QVariant::Type(qMetaTypeId<Struct1>()) << "(s)"; - QTest::newRow("QList<Struct1>") << QVariant::Type(qMetaTypeId<QList<Struct1> >()) << "a(s)"; + QTest::newRow("Struct1") << qMetaTypeId<Struct1>() << "(s)"; + QTest::newRow("QList<Struct1>") << qMetaTypeId<QList<Struct1> >() << "a(s)"; - QTest::newRow("Struct2") << QVariant::Type(qMetaTypeId<Struct2>()) << "(sos)"; - QTest::newRow("QList<Struct2>") << QVariant::Type(qMetaTypeId<QList<Struct2> >()) << "a(sos)"; + QTest::newRow("Struct2") << qMetaTypeId<Struct2>() << "(sos)"; + QTest::newRow("QList<Struct2>") << qMetaTypeId<QList<Struct2>>() << "a(sos)"; - QTest::newRow("QList<Struct3>") << QVariant::Type(qMetaTypeId<QList<Struct3> >()) << "a(sas)"; - QTest::newRow("Struct3") << QVariant::Type(qMetaTypeId<Struct3>()) << "(sas)"; + QTest::newRow("QList<Struct3>") << qMetaTypeId<QList<Struct3>>() << "a(sas)"; + QTest::newRow("Struct3") << qMetaTypeId<Struct3>() << "(sas)"; - QTest::newRow("Struct4") << QVariant::Type(qMetaTypeId<Struct4>()) << "(ssa(ss)sayasx)"; - QTest::newRow("QList<Struct4>") << QVariant::Type(qMetaTypeId<QList<Struct4> >()) << "a(ssa(ss)sayasx)"; + QTest::newRow("Struct4") << qMetaTypeId<Struct4>() << "(ssa(ss)sayasx)"; + QTest::newRow("QList<Struct4>") << qMetaTypeId<QList<Struct4>>() << "a(ssa(ss)sayasx)"; - QTest::newRow("Struct5") << QVariant::Type(qMetaTypeId<Struct5>()) << "a{sa{sv}}"; + QTest::newRow("Struct5") << qMetaTypeId<Struct5>() << "a{sa{sv}}"; - QTest::newRow("Struct6") << QVariant::Type(qMetaTypeId<Struct6>()) << "av"; + QTest::newRow("Struct6") << qMetaTypeId<Struct6>() << "av"; - QTest::newRow("QMap<int,QString>") << QVariant::Type(intStringMap) << "a{is}"; - QTest::newRow("QMap<QString,QString>") << QVariant::Type(stringStringMap) << "a{ss}"; - QTest::newRow("QMap<QString,Struct1>") << QVariant::Type(stringStruct1Map) << "a{s(s)}"; + QTest::newRow("QMap<int,QString>") << intStringMap << "a{is}"; + QTest::newRow("QMap<QString,QString>") << stringStringMap << "a{ss}"; + QTest::newRow("QMap<QString,Struct1>") << stringStruct1Map << "a{s(s)}"; } void tst_QDBusMetaType::staticTypes() { - QFETCH(QVariant::Type, typeId); + QFETCH(int, typeId); QString result = QDBusMetaType::typeToSignature(QMetaType(typeId)); QTEST(result, "signature"); @@ -366,22 +364,22 @@ void tst_QDBusMetaType::dynamicTypes() void tst_QDBusMetaType::invalidTypes_data() { - QTest::addColumn<QVariant::Type>("typeId"); + QTest::addColumn<int>("typeId"); QTest::addColumn<QString>("signature"); - QTest::newRow("Invalid0") << QVariant::Type(qMetaTypeId<Invalid0>()) << ""; - QTest::newRow("Invalid1") << QVariant::Type(qMetaTypeId<Invalid1>()) << ""; - QTest::newRow("Invalid2") << QVariant::Type(qMetaTypeId<Invalid2>()) << ""; - QTest::newRow("Invalid3") << QVariant::Type(qMetaTypeId<Invalid3>()) << ""; - QTest::newRow("Invalid4") << QVariant::Type(qMetaTypeId<Invalid4>()) << ""; - QTest::newRow("Invalid5") << QVariant::Type(qMetaTypeId<Invalid5>()) << ""; - QTest::newRow("Invalid6") << QVariant::Type(qMetaTypeId<Invalid6>()) << ""; - QTest::newRow("Invalid7") << QVariant::Type(qMetaTypeId<Invalid7>()) << ""; + QTest::newRow("Invalid0") << qMetaTypeId<Invalid0>() << ""; + QTest::newRow("Invalid1") << qMetaTypeId<Invalid1>() << ""; + QTest::newRow("Invalid2") << qMetaTypeId<Invalid2>() << ""; + QTest::newRow("Invalid3") << qMetaTypeId<Invalid3>() << ""; + QTest::newRow("Invalid4") << qMetaTypeId<Invalid4>() << ""; + QTest::newRow("Invalid5") << qMetaTypeId<Invalid5>() << ""; + QTest::newRow("Invalid6") << qMetaTypeId<Invalid6>() << ""; + QTest::newRow("Invalid7") << qMetaTypeId<Invalid7>() << ""; - QTest::newRow("QList<Invalid0>") << QVariant::Type(qMetaTypeId<QList<Invalid0> >()) << ""; + QTest::newRow("QList<Invalid0>") << qMetaTypeId<QList<Invalid0>>() << ""; - QTest::newRow("long") << QVariant::Type(QMetaType::Long) << ""; - QTest::newRow("void*") << QVariant::Type(QMetaType::VoidStar) << ""; + QTest::newRow("long") << int(QMetaType::Long) << ""; + QTest::newRow("void*") << int(QMetaType::VoidStar) << ""; } void tst_QDBusMetaType::invalidTypes() diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp index 99c7504207..818579932b 100644 --- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp +++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp @@ -179,7 +179,7 @@ void tst_QDBusPendingCall::waitForFinished() QCOMPARE(args.count(), 1); const QVariant &arg = args.at(0); - QCOMPARE(arg.type(), QVariant::StringList); + QCOMPARE(arg.userType(), QMetaType::QStringList); QVERIFY(arg.toStringList().contains(conn.baseService())); } |