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/io/qsettings/tst_qsettings.cpp | |
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/io/qsettings/tst_qsettings.cpp')
-rw-r--r-- | tests/auto/corelib/io/qsettings/tst_qsettings.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index 29c1a4c9e0..60904f7ebc 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -721,11 +721,11 @@ void tst_QSettings::embeddedZeroByte() QSettings settings("QtProject", "tst_qsettings"); QVariant outValue = settings.value(QTest::currentDataTag()); - switch (value.type()) { - case QVariant::ByteArray: + switch (value.typeId()) { + case QMetaType::QByteArray: QCOMPARE(outValue.toByteArray(), value.toByteArray()); break; - case QVariant::String: + case QMetaType::QString: QCOMPARE(outValue.toString(), value.toString()); break; default: @@ -932,9 +932,9 @@ void tst_QSettings::testIniParsing() if (expect.isValid()) QVERIFY(v.canConvert(expect.type())); // check some types so as to give prettier error messages - if ( v.type() == QVariant::String ) { + if ( v.typeId() == QMetaType::QString ) { QCOMPARE(v.toString(), expect.toString()); - } else if ( v.type() == QVariant::Int ) { + } else if ( v.typeId() == QMetaType::Int ) { QCOMPARE(v.toInt(), expect.toInt()); } else { QCOMPARE(v, expect); |