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/plugin | |
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/plugin')
-rw-r--r-- | tests/auto/corelib/plugin/quuid/tst_quuid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |