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/qmetaobject | |
| 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/qmetaobject')
| -rw-r--r-- | tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp | 12 |
1 files changed, 10 insertions, 2 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() |