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/serialization | |
| 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/serialization')
| -rw-r--r-- | tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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) |