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>

2 files changed, 15 insertions, 7 deletions

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"));
 }