summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/io/qsettings/tst_qsettings.cpp10
-rw-r--r--tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp36
-rw-r--r--tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp12
-rw-r--r--tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp10
-rw-r--r--tests/auto/corelib/plugin/quuid/tst_quuid.cpp6
-rw-r--r--tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp2
-rw-r--r--tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp2
-rw-r--r--tests/auto/dbus/qdbusabstractadaptor/myobject.h8
-rw-r--r--tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp4
-rw-r--r--tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp48
-rw-r--r--tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp5
-rw-r--r--tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp2
-rw-r--r--tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp116
-rw-r--r--tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp2
-rw-r--r--tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp4
-rw-r--r--tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp2
-rw-r--r--tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp2
-rw-r--r--tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp2
-rw-r--r--tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp26
-rw-r--r--tests/auto/widgets/itemviews/qitemeditorfactory/tst_qitemeditorfactory.cpp18
-rw-r--r--tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp6
-rw-r--r--tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp4
-rw-r--r--tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp2
-rw-r--r--tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp2
-rw-r--r--tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp2
-rw-r--r--tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp18
-rw-r--r--tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp2
27 files changed, 179 insertions, 174 deletions
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 29c1a4c9e0..60904f7ebc 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -721,11 +721,11 @@ void tst_QSettings::embeddedZeroByte()
QSettings settings("QtProject", "tst_qsettings");
QVariant outValue = settings.value(QTest::currentDataTag());
- switch (value.type()) {
- case QVariant::ByteArray:
+ switch (value.typeId()) {
+ case QMetaType::QByteArray:
QCOMPARE(outValue.toByteArray(), value.toByteArray());
break;
- case QVariant::String:
+ case QMetaType::QString:
QCOMPARE(outValue.toString(), value.toString());
break;
default:
@@ -932,9 +932,9 @@ void tst_QSettings::testIniParsing()
if (expect.isValid())
QVERIFY(v.canConvert(expect.type()));
// check some types so as to give prettier error messages
- if ( v.type() == QVariant::String ) {
+ if ( v.typeId() == QMetaType::QString ) {
QCOMPARE(v.toString(), expect.toString());
- } else if ( v.type() == QVariant::Int ) {
+ } else if ( v.typeId() == QMetaType::Int ) {
QCOMPARE(v.toInt(), expect.toInt());
} else {
QCOMPARE(v, expect);
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
index 267d218cf0..78749559b5 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
@@ -1609,16 +1609,16 @@ void tst_QSortFilterProxyModel::removeSourceRows()
QCOMPARE(aboutToRemoveSpy.count(), expectedRemovedProxyIntervals.count());
for (int i = 0; i < aboutToRemoveSpy.count(); ++i) {
const auto &args = aboutToRemoveSpy.at(i);
- QCOMPARE(args.at(1).type(), QVariant::Int);
- QCOMPARE(args.at(2).type(), QVariant::Int);
+ QCOMPARE(args.at(1).userType(), QMetaType::Int);
+ QCOMPARE(args.at(2).userType(), QMetaType::Int);
QCOMPARE(args.at(1).toInt(), expectedRemovedProxyIntervals.at(i).first);
QCOMPARE(args.at(2).toInt(), expectedRemovedProxyIntervals.at(i).second);
}
QCOMPARE(removeSpy.count(), expectedRemovedProxyIntervals.count());
for (int i = 0; i < removeSpy.count(); ++i) {
const auto &args = removeSpy.at(i);
- QCOMPARE(args.at(1).type(), QVariant::Int);
- QCOMPARE(args.at(2).type(), QVariant::Int);
+ QCOMPARE(args.at(1).userType(), QMetaType::Int);
+ QCOMPARE(args.at(2).userType(), QMetaType::Int);
QCOMPARE(args.at(1).toInt(), expectedRemovedProxyIntervals.at(i).first);
QCOMPARE(args.at(2).toInt(), expectedRemovedProxyIntervals.at(i).second);
}
@@ -1787,8 +1787,8 @@ void tst_QSortFilterProxyModel::changeFilter()
QCOMPARE(initialInsertSpy.count(), 0);
for (int i = 0; i < initialRemoveSpy.count(); ++i) {
const auto &args = initialRemoveSpy.at(i);
- QCOMPARE(args.at(1).type(), QVariant::Int);
- QCOMPARE(args.at(2).type(), QVariant::Int);
+ QCOMPARE(args.at(1).userType(), QMetaType::Int);
+ QCOMPARE(args.at(2).userType(), QMetaType::Int);
QCOMPARE(args.at(1).toInt(), initialRemoveIntervals.at(i).first);
QCOMPARE(args.at(2).toInt(), initialRemoveIntervals.at(i).second);
}
@@ -1810,8 +1810,8 @@ void tst_QSortFilterProxyModel::changeFilter()
QCOMPARE(finalRemoveSpy.count(), finalRemoveIntervals.count());
for (int i = 0; i < finalRemoveSpy.count(); ++i) {
const auto &args = finalRemoveSpy.at(i);
- QCOMPARE(args.at(1).type(), QVariant::Int);
- QCOMPARE(args.at(2).type(), QVariant::Int);
+ QCOMPARE(args.at(1).userType(), QMetaType::Int);
+ QCOMPARE(args.at(2).userType(), QMetaType::Int);
QCOMPARE(args.at(1).toInt(), finalRemoveIntervals.at(i).first);
QCOMPARE(args.at(2).toInt(), finalRemoveIntervals.at(i).second);
}
@@ -1819,8 +1819,8 @@ void tst_QSortFilterProxyModel::changeFilter()
QCOMPARE(finalInsertSpy.count(), insertIntervals.count());
for (int i = 0; i < finalInsertSpy.count(); ++i) {
const auto &args = finalInsertSpy.at(i);
- QCOMPARE(args.at(1).type(), QVariant::Int);
- QCOMPARE(args.at(2).type(), QVariant::Int);
+ QCOMPARE(args.at(1).userType(), QMetaType::Int);
+ QCOMPARE(args.at(2).userType(), QMetaType::Int);
QCOMPARE(args.at(1).toInt(), insertIntervals.at(i).first);
QCOMPARE(args.at(2).toInt(), insertIntervals.at(i).second);
}
@@ -2025,8 +2025,8 @@ void tst_QSortFilterProxyModel::changeSourceData()
QCOMPARE(removeSpy.count(), removeIntervals.count());
for (int i = 0; i < removeSpy.count(); ++i) {
const auto &args = removeSpy.at(i);
- QCOMPARE(args.at(1).type(), QVariant::Int);
- QCOMPARE(args.at(2).type(), QVariant::Int);
+ QCOMPARE(args.at(1).userType(), QMetaType::Int);
+ QCOMPARE(args.at(2).userType(), QMetaType::Int);
QCOMPARE(args.at(1).toInt(), removeIntervals.at(i).first);
QCOMPARE(args.at(2).toInt(), removeIntervals.at(i).second);
}
@@ -2034,8 +2034,8 @@ void tst_QSortFilterProxyModel::changeSourceData()
QCOMPARE(insertSpy.count(), insertIntervals.count());
for (int i = 0; i < insertSpy.count(); ++i) {
const auto &args = insertSpy.at(i);
- QCOMPARE(args.at(1).type(), QVariant::Int);
- QCOMPARE(args.at(2).type(), QVariant::Int);
+ QCOMPARE(args.at(1).userType(), QMetaType::Int);
+ QCOMPARE(args.at(2).userType(), QMetaType::Int);
QCOMPARE(args.at(1).toInt(), insertIntervals.at(i).first);
QCOMPARE(args.at(2).toInt(), insertIntervals.at(i).second);
}
@@ -4606,16 +4606,16 @@ void tst_QSortFilterProxyModel::removeIntervals()
QCOMPARE(aboutToRemoveSpy.count(), expectedRemovedProxyIntervals.count());
for (int i = 0; i < aboutToRemoveSpy.count(); ++i) {
const auto &args = aboutToRemoveSpy.at(i);
- QCOMPARE(args.at(1).type(), QVariant::Int);
- QCOMPARE(args.at(2).type(), QVariant::Int);
+ QCOMPARE(args.at(1).userType(), QMetaType::Int);
+ QCOMPARE(args.at(2).userType(), QMetaType::Int);
QCOMPARE(args.at(1).toInt(), expectedRemovedProxyIntervals.at(i).first);
QCOMPARE(args.at(2).toInt(), expectedRemovedProxyIntervals.at(i).second);
}
QCOMPARE(removeSpy.count(), expectedRemovedProxyIntervals.count());
for (int i = 0; i < removeSpy.count(); ++i) {
const auto &args = removeSpy.at(i);
- QCOMPARE(args.at(1).type(), QVariant::Int);
- QCOMPARE(args.at(2).type(), QVariant::Int);
+ QCOMPARE(args.at(1).userType(), QMetaType::Int);
+ QCOMPARE(args.at(2).userType(), QMetaType::Int);
QCOMPARE(args.at(1).toInt(), expectedRemovedProxyIntervals.at(i).first);
QCOMPARE(args.at(2).toInt(), expectedRemovedProxyIntervals.at(i).second);
}
diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index 08219d45d2..dca4f0fea5 100644
--- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
@@ -1447,7 +1447,15 @@ void tst_QMetaObject::customPropertyType()
{
QMetaProperty prop = metaObject()->property(metaObject()->indexOfProperty("value3"));
+#if QT_DEPRECATED_SINCE(6, 0)
+ QT_WARNING_PUSH
+ QT_WARNING_DISABLE_DEPRECATED
+
QCOMPARE(prop.type(), QVariant::UserType);
+
+ QT_WARNING_POP
+#endif
+
QCOMPARE(prop.userType(), QMetaType::fromType<MyStruct>().id());
QCOMPARE(prop.metaType(), QMetaType::fromType<MyStruct>());
@@ -1455,11 +1463,11 @@ void tst_QMetaObject::customPropertyType()
QCOMPARE(prop.userType(), QMetaType::fromName("MyStruct").id());
prop = metaObject()->property(metaObject()->indexOfProperty("value4"));
- QCOMPARE(prop.type(), QVariant::List);
+ QCOMPARE(prop.metaType().id(), QMetaType::QVariantList);
QCOMPARE(prop.metaType(), QMetaType::fromType<QList<QVariant>>());
prop = metaObject()->property(metaObject()->indexOfProperty("value5"));
- QCOMPARE(prop.type(), QVariant::List);
+ QCOMPARE(prop.metaType().id(), QMetaType::QVariantList);
}
void tst_QMetaObject::checkScope_data()
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index 33daaea759..2660c1a53c 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -749,7 +749,7 @@ void tst_QMetaObjectBuilder::variantProperty()
QMetaObject *meta = builder.toMetaObject();
QMetaProperty prop = meta->property(meta->propertyOffset());
- QCOMPARE(QMetaType::Type(prop.type()), QMetaType::QVariant);
+ QCOMPARE(QMetaType::Type(prop.userType()), QMetaType::QVariant);
QCOMPARE(QMetaType::Type(prop.userType()), QMetaType::QVariant);
QCOMPARE(QByteArray(prop.typeName()), QByteArray("QVariant"));
@@ -1582,7 +1582,7 @@ void tst_QMetaObjectBuilder::usage_property()
QScopedPointer<TestObject> testObject(new TestObject);
QVariant prop = testObject->property("intProp");
- QCOMPARE(prop.type(), QVariant::Int);
+ QCOMPARE(prop.metaType(), QMetaType(QMetaType::Int));
QCOMPARE(prop.toInt(), testObject->intProp());
QSignalSpy propChangedSpy(testObject.data(), &TestObject::intPropChanged);
@@ -1590,7 +1590,7 @@ void tst_QMetaObjectBuilder::usage_property()
testObject->setProperty("intProp", 123);
QCOMPARE(propChangedSpy.count(), 1);
prop = testObject->property("intProp");
- QCOMPARE(prop.type(), QVariant::Int);
+ QCOMPARE(prop.metaType(), QMetaType(QMetaType::Int));
QCOMPARE(prop.toInt(), 123);
}
@@ -1618,9 +1618,9 @@ void tst_QMetaObjectBuilder::usage_method()
QVERIFY(listInvokableQRealQString.invoke(testObject.data(), Q_RETURN_ARG(QVariantList, list),
Q_ARG(qreal, 123.0), Q_ARG(QString, "ciao")));
QCOMPARE(list.size(), 2);
- QCOMPARE(list.at(0).type(), QVariant::Type(QMetaType::QReal));
+ QCOMPARE(list.at(0).metaType(), QMetaType(QMetaType::QReal));
QCOMPARE(list.at(0).toDouble(), double(123));
- QCOMPARE(list.at(1).type(), QVariant::String);
+ QCOMPARE(list.at(1).metaType(), QMetaType(QMetaType::QString));
QCOMPARE(list.at(1).toString(), QString::fromLatin1("ciao"));
}
diff --git a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
index 8563804ff8..6ebf4a7c33 100644
--- a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
+++ b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
@@ -451,7 +451,7 @@ void tst_QUuid::qvariant()
QUuid uuid = QUuid::createUuid();
QVariant v = QVariant::fromValue(uuid);
QVERIFY(!v.isNull());
- QCOMPARE(v.type(), QVariant::Uuid);
+ QCOMPARE(v.metaType(), QMetaType(QMetaType::QUuid));
QUuid uuid2 = v.value<QUuid>();
QVERIFY(!uuid2.isNull());
@@ -478,14 +478,14 @@ void tst_QUuid::qvariant_conversion()
// try reverse conversion QString -> QUuid
QVariant sv = QVariant::fromValue(uuid.toString());
- QCOMPARE(sv.type(), QVariant::String);
+ QCOMPARE(sv.metaType(), QMetaType(QMetaType::QString));
QVERIFY(sv.canConvert<QUuid>());
QCOMPARE(sv.value<QUuid>(), uuid);
// QString -> QUuid
{
QVariant sv = QVariant::fromValue(uuid.toByteArray());
- QCOMPARE(sv.type(), QVariant::ByteArray);
+ QCOMPARE(sv.metaType(), QMetaType(QMetaType::QByteArray));
QVERIFY(sv.canConvert<QUuid>());
QCOMPARE(sv.value<QUuid>(), uuid);
}
diff --git a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
index 3252919c4c..9324459512 100644
--- a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
@@ -224,7 +224,7 @@ void tst_QCborValue_Json::fromVariant()
QCOMPARE(QCborArray::fromVariantList({variant}), QCborArray{v});
QCOMPARE(QCborArray::fromVariantList({variant, variant}), QCborArray({v, v}));
- if (variant.type() == QVariant::String) {
+ if (variant.metaType() == QMetaType(QMetaType::QString)) {
QString s = variant.toString();
QCOMPARE(QCborArray::fromStringList({s}), QCborArray{v});
QCOMPARE(QCborArray::fromStringList({s, s}), QCborArray({v, v}));
diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
index 0710e257b8..7249e2a6d8 100644
--- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
@@ -578,7 +578,7 @@ void tst_QDataStream::readQRegularExpression(QDataStream *s)
*s >> R;
QCOMPARE(R, test);
*s >> V;
- QCOMPARE(V.type(), QVariant::RegularExpression);
+ QCOMPARE(V.userType(), QMetaType::QRegularExpression);
QCOMPARE(V.toRegularExpression(), test);
}
#endif //QT_CONFIG(regularexpression)
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()));
}
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 28ca3b8e7b..87d9774358 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -128,7 +128,7 @@ void tst_QGuiVariant::constructor_invalid()
QFETCH(uint, typeId);
{
QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:"));
- QVariant variant(static_cast<QVariant::Type>(typeId));
+ QVariant variant{QMetaType(typeId)};
QVERIFY(!variant.isValid());
QCOMPARE(variant.userType(), int(QMetaType::UnknownType));
}
@@ -655,7 +655,7 @@ void tst_QGuiVariant::debugStream_data()
const char *tagName = QMetaType(id).name();
if (!tagName)
continue;
- QTest::newRow(tagName) << QVariant(static_cast<QVariant::Type>(id)) << id;
+ QTest::newRow(tagName) << QVariant(QMetaType(id)) << id;
}
}
diff --git a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp
index a641a3adba..d0f19dd9a3 100644
--- a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp
+++ b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp
@@ -154,7 +154,7 @@ static void dumpConfiguration(QTextStream &str)
// On Windows, this will provide addition GPU info similar to the output of dxdiag.
if (QGuiApplication::platformNativeInterface()) {
const QVariant gpuInfoV = QGuiApplication::platformNativeInterface()->property("gpu");
- if (gpuInfoV.type() == QVariant::Map) {
+ if (gpuInfoV.userType() == QMetaType::QVariantMap) {
const QString description = gpuInfoV.toMap().value(QStringLiteral("printable")).toString();
if (!description.isEmpty())
str << "\nGPU:\n" << description << "\n\n";
diff --git a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
index 6637be0174..b2d8136ea3 100644
--- a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
+++ b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
@@ -498,7 +498,7 @@ void tst_QNetworkRequest::rawHeaderParsing()
QCOMPARE(QString(request.rawHeader(rawHeader.toLatin1())), rawValue);
QCOMPARE(request.header(cookedHeader).isNull(), !success);
- if (cookedValue.type() != QVariant::UserType)
+ if (cookedValue.metaType().id() < QMetaType::User)
QCOMPARE(request.header(cookedHeader), cookedValue);
else if (cookedValue.userType() == qMetaTypeId<QList<QNetworkCookie> >())
QCOMPARE(qvariant_cast<QList<QNetworkCookie> >(request.header(cookedHeader)),
diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
index 14933fbe8b..a7c6421d90 100644
--- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
+++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
@@ -311,7 +311,7 @@ void tst_Cmptest::compare_tostring_data()
;
QTest::newRow("null hash, invalid")
- << QVariant(QVariant::Hash)
+ << QVariant(QMetaType(QMetaType::QVariantHash))
<< QVariant()
;
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index a8a39b7113..7493daa432 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -881,7 +881,7 @@ void tst_QItemDelegate::dateAndTimeEditorTest2()
QCOMPARE(w.fastEdit(i1), timeEdit.data());
timeEdit->setTime(time1);
d->setModelData(timeEdit, &s, i1);
- QCOMPARE(s.data(i1).type(), QVariant::Time); // ensure that we wrote a time variant.
+ QCOMPARE(s.data(i1).metaType().id(), QMetaType::QTime); // ensure that we wrote a time variant.
QCOMPARE(s.data(i1).toTime(), time1); // ensure that it is the correct time.
w.doCloseEditor(timeEdit);
QVERIFY(d->currentEditor() == 0); // should happen at doCloseEditor. We only test this once.
@@ -910,7 +910,7 @@ void tst_QItemDelegate::dateAndTimeEditorTest2()
QCOMPARE(dateTimeEdit->dateTime(), datetime2);
dateTimeEdit->setDateTime(datetime1);
d->setModelData(dateTimeEdit, &s, i1);
- QCOMPARE(s.data(i1).type(), QVariant::DateTime); // ensure that we wrote a datetime variant.
+ QCOMPARE(s.data(i1).metaType().id(), QMetaType::QDateTime); // ensure that we wrote a datetime variant.
QCOMPARE(s.data(i1).toDateTime(), datetime1);
w.doCloseEditor(dateTimeEdit);
@@ -921,7 +921,7 @@ void tst_QItemDelegate::dateAndTimeEditorTest2()
QCOMPARE(w.fastEdit(i2), dateEdit.data());
dateEdit->setDate(date1);
d->setModelData(dateEdit, &s, i2);
- QCOMPARE(s.data(i2).type(), QVariant::Date); // ensure that we wrote a time variant.
+ QCOMPARE(s.data(i2).metaType().id(), QMetaType::QDate); // ensure that we wrote a time variant.
QCOMPARE(s.data(i2).toDate(), date1); // ensure that it is the correct date.
w.doCloseEditor(dateEdit);
@@ -1002,30 +1002,30 @@ void tst_QItemDelegate::decoration_data()
int pm = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
QTest::newRow("pixmap 30x30")
- << (int)QVariant::Pixmap
+ << (int)QMetaType::QPixmap
<< QSize(30, 30)
<< QSize(30, 30);
QTest::newRow("image 30x30")
- << (int)QVariant::Image
+ << (int)QMetaType::QImage
<< QSize(30, 30)
<< QSize(30, 30);
//The default engine scales pixmaps down if required, but never up. For WinCE we need bigger IconSize than 30
QTest::newRow("icon 30x30")
- << (int)QVariant::Icon
+ << (int)QMetaType::QIcon
<< QSize(60, 60)
<< QSize(pm, pm);
QTest::newRow("color 30x30")
- << (int)QVariant::Color
+ << (int)QMetaType::QColor
<< QSize(30, 30)
<< QSize(pm, pm);
// This demands too much memory and potentially hangs. Feel free to uncomment
// for your own testing.
// QTest::newRow("pixmap 30x30 big")
-// << (int)QVariant::Pixmap
+// << (int)QMetaType::QPixmap
// << QSize(1024, 1024) // Over 1M
// << QSize(1024, 1024);
}
@@ -1049,26 +1049,26 @@ void tst_QItemDelegate::decoration()
QVERIFY(QTest::qWaitForWindowActive(&table));
QVariant value;
- switch ((QVariant::Type)type) {
- case QVariant::Pixmap: {
+ switch (type) {
+ case QMetaType::QPixmap: {
QPixmap pm(size);
pm.fill(Qt::black);
value = pm;
break;
}
- case QVariant::Image: {
+ case QMetaType::QImage: {
QImage img(size, QImage::Format_Mono);
memset(img.bits(), 0, img.sizeInBytes());
value = img;
break;
}
- case QVariant::Icon: {
+ case QMetaType::QIcon: {
QPixmap pm(size);
pm.fill(Qt::black);
value = QIcon(pm);
break;
}
- case QVariant::Color:
+ case QMetaType::QColor:
value = QColor(Qt::green);
break;
default:
diff --git a/tests/auto/widgets/itemviews/qitemeditorfactory/tst_qitemeditorfactory.cpp b/tests/auto/widgets/itemviews/qitemeditorfactory/tst_qitemeditorfactory.cpp
index ed4c543d0a..6f176c4ba5 100644
--- a/tests/auto/widgets/itemviews/qitemeditorfactory/tst_qitemeditorfactory.cpp
+++ b/tests/auto/widgets/itemviews/qitemeditorfactory/tst_qitemeditorfactory.cpp
@@ -46,7 +46,7 @@ void tst_QItemEditorFactory::createEditor()
QWidget parent;
- QWidget *w = factory->createEditor(QVariant::String, &parent);
+ QWidget *w = factory->createEditor(QMetaType::QString, &parent);
QCOMPARE(w->metaObject()->className(), "QExpandingLineEdit");
}
@@ -63,23 +63,23 @@ void tst_QItemEditorFactory::createCustomEditor()
{
QItemEditorFactory editorFactory;
- editorFactory.registerEditor(QVariant::Rect, creator);
- editorFactory.registerEditor(QVariant::RectF, creator);
+ editorFactory.registerEditor(QMetaType::QRect, creator);
+ editorFactory.registerEditor(QMetaType::QRectF, creator);
//creator should not be deleted as a result of calling the next line
- editorFactory.registerEditor(QVariant::Rect, creator2);
+ editorFactory.registerEditor(QMetaType::QRect, creator2);
QVERIFY(creator);
//this should erase creator2
- editorFactory.registerEditor(QVariant::Rect, creator);
+ editorFactory.registerEditor(QMetaType::QRect, creator);
QVERIFY(creator2.isNull());
QWidget parent;
- QWidget *w = editorFactory.createEditor(QVariant::Rect, &parent);
+ QWidget *w = editorFactory.createEditor(QMetaType::QRect, &parent);
QCOMPARE(w->metaObject()->className(), "QDoubleSpinBox");
- QCOMPARE(w->metaObject()->userProperty().type(), QVariant::Double);
+ QCOMPARE(w->metaObject()->userProperty().userType(), QMetaType::Double);
}
//editorFactory has been deleted, so should be creator
@@ -99,12 +99,12 @@ void tst_QItemEditorFactory::uintValues()
{
QWidget *editor = editorFactory.createEditor(QMetaType::UInt, &parent);
QCOMPARE(editor->metaObject()->className(), "QUIntSpinBox");
- QCOMPARE(editor->metaObject()->userProperty().type(), QVariant::UInt);
+ QCOMPARE(editor->metaObject()->userProperty().userType(), QMetaType::UInt);
}
{
QWidget *editor = editorFactory.createEditor(QMetaType::Int, &parent);
QCOMPARE(editor->metaObject()->className(), "QSpinBox");
- QCOMPARE(editor->metaObject()->userProperty().type(), QVariant::Int);
+ QCOMPARE(editor->metaObject()->userProperty().userType(), QMetaType::Int);
}
}
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index 25a7989c95..2a02afb36b 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -1938,13 +1938,13 @@ void tst_QTreeWidget::setData()
// ### add more data types here
item->setData(0, Qt::DisplayRole, 5);
- QCOMPARE(item->data(0, Qt::DisplayRole).type(), QVariant::Int);
+ QCOMPARE(item->data(0, Qt::DisplayRole).userType(), QMetaType::Int);
item->setData(0, Qt::DisplayRole, "test");
- QCOMPARE(item->data(0, Qt::DisplayRole).type(), QVariant::String);
+ QCOMPARE(item->data(0, Qt::DisplayRole).userType(), QMetaType::QString);
item->setData(0, Qt::DisplayRole, 0.4);
- QCOMPARE(item->data(0, Qt::DisplayRole).type(), QVariant::Double);
+ QCOMPARE(item->data(0, Qt::DisplayRole).userType(), QMetaType::Double);
delete item;
}
diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp
index 18f07bbc42..364d7fc8c7 100644
--- a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp
+++ b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp
@@ -77,7 +77,7 @@ void tst_QWidgetsVariant::constructor_invalid()
QFETCH(uint, typeId);
{
QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:"));
- QVariant variant(static_cast<QVariant::Type>(typeId));
+ QVariant variant{QMetaType(typeId)};
QVERIFY(!variant.isValid());
QCOMPARE(variant.userType(), int(QMetaType::UnknownType));
}
@@ -218,7 +218,7 @@ void tst_QWidgetsVariant::debugStream_data()
const char *tagName = QMetaType(id).name();
if (!tagName)
continue;
- QTest::newRow(tagName) << QVariant(static_cast<QVariant::Type>(id)) << id;
+ QTest::newRow(tagName) << QVariant(QMetaType(id)) << id;
}
}
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index 89888aa54e..b7ae7df5ed 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -4601,7 +4601,7 @@ void tst_QDateTimeEdit::stepModifierPressAndHold()
QTest::mouseRelease(&edit, Qt::LeftButton, modifiers, buttonRect.center());
const auto value = spy.last().at(0);
- QVERIFY(value.type() == QVariant::Date);
+ QVERIFY(value.userType() == QMetaType::QDate);
const QDate expectedDate = startDate.addYears(spy.length() *
expectedStepModifier);
QCOMPARE(value.toDate(), expectedDate);
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index 66a4dff584..0260910856 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -1790,7 +1790,7 @@ void tst_QDoubleSpinBox::stepModifierPressAndHold()
QTest::mouseRelease(&spin, Qt::LeftButton, modifiers, buttonRect.center());
const auto value = spy.last().at(0);
- QVERIFY(value.type() == QVariant::Double);
+ QVERIFY(value.userType() == QMetaType::Double);
QCOMPARE(value.toDouble(), spy.length() * expectedStepModifier);
}
diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
index e3812f16d0..831612b910 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
@@ -1739,7 +1739,7 @@ void tst_QPlainTextEdit::inputMethodCursorRect()
ed->moveCursor(QTextCursor::End);
const QRectF cursorRect = ed->cursorRect();
const QVariant cursorRectV = ed->inputMethodQuery(Qt::ImCursorRectangle);
- QCOMPARE(cursorRectV.type(), QVariant::RectF);
+ QCOMPARE(cursorRectV.userType(), QMetaType::QRectF);
QCOMPARE(cursorRectV.toRect(), cursorRect.toRect());
}
diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
index f562f84037..6995c09119 100644
--- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
+++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
@@ -163,12 +163,12 @@ void tst_QTextBrowser::forwardButton()
QVERIFY(!forwardEmissions.isEmpty());
QVariant val = forwardEmissions.takeLast()[0];
- QCOMPARE(val.type(), QVariant::Bool);
+ QCOMPARE(val.userType(), QMetaType::Bool);
QVERIFY(!val.toBool());
QVERIFY(!backwardEmissions.isEmpty());
val = backwardEmissions.takeLast()[0];
- QCOMPARE(val.type(), QVariant::Bool);
+ QCOMPARE(val.userType(), QMetaType::Bool);
QVERIFY(!val.toBool());
QVERIFY(browser->historyTitle(-1).isEmpty());
@@ -181,12 +181,12 @@ void tst_QTextBrowser::forwardButton()
QVERIFY(!forwardEmissions.isEmpty());
val = forwardEmissions.takeLast()[0];
- QCOMPARE(val.type(), QVariant::Bool);
+ QCOMPARE(val.userType(), QMetaType::Bool);
QVERIFY(!val.toBool());
QVERIFY(!backwardEmissions.isEmpty());
val = backwardEmissions.takeLast()[0];
- QCOMPARE(val.type(), QVariant::Bool);
+ QCOMPARE(val.userType(), QMetaType::Bool);
QVERIFY(val.toBool());
QCOMPARE(browser->historyTitle(-1), QString("Page With BG"));
@@ -197,12 +197,12 @@ void tst_QTextBrowser::forwardButton()
QVERIFY(!forwardEmissions.isEmpty());
val = forwardEmissions.takeLast()[0];
- QCOMPARE(val.type(), QVariant::Bool);
+ QCOMPARE(val.userType(), QMetaType::Bool);
QVERIFY(val.toBool());
QVERIFY(!backwardEmissions.isEmpty());
val = backwardEmissions.takeLast()[0];
- QCOMPARE(val.type(), QVariant::Bool);
+ QCOMPARE(val.userType(), QMetaType::Bool);
QVERIFY(!val.toBool());
QVERIFY(browser->historyTitle(-1).isEmpty());
@@ -213,12 +213,12 @@ void tst_QTextBrowser::forwardButton()
QVERIFY(!forwardEmissions.isEmpty());
val = forwardEmissions.takeLast()[0];
- QCOMPARE(val.type(), QVariant::Bool);
+ QCOMPARE(val.userType(), QMetaType::Bool);
QVERIFY(!val.toBool());
QVERIFY(!backwardEmissions.isEmpty());
val = backwardEmissions.takeLast()[0];
- QCOMPARE(val.type(), QVariant::Bool);
+ QCOMPARE(val.userType(), QMetaType::Bool);
QVERIFY(val.toBool());
}
@@ -546,7 +546,7 @@ void tst_QTextBrowser::loadResourceOnRelativeLocalFiles()
QVERIFY(!browser->toPlainText().isEmpty());
QVariant v = browser->loadResource(QTextDocument::HtmlResource, QUrl("../anchor.html"));
QVERIFY(v.isValid());
- QCOMPARE(v.type(), QVariant::ByteArray);
+ QCOMPARE(v.userType(), QMetaType::QByteArray);
QVERIFY(!v.toByteArray().isEmpty());
}
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index a90ae9a55b..b0e78892b2 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -2545,7 +2545,7 @@ void tst_QTextEdit::inputMethodCursorRect()
ed->moveCursor(QTextCursor::End);
const QRectF cursorRect = ed->cursorRect();
const QVariant cursorRectV = ed->inputMethodQuery(Qt::ImCursorRectangle);
- QCOMPARE(cursorRectV.type(), QVariant::RectF);
+ QCOMPARE(cursorRectV.userType(), QMetaType::QRectF);
QCOMPARE(cursorRectV.toRect(), cursorRect.toRect());
}