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/corelib/kernel/qmetaobjectbuilder | |
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/corelib/kernel/qmetaobjectbuilder')
-rw-r--r-- | tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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")); } |