diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-22 16:36:41 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-06-12 15:50:08 +0200 |
| commit | 5caf7ef3b1c67cc65efd21d2341955230a6ed43c (patch) | |
| tree | 6421c69cfbd84fd59b62987f5e4244691b683bf4 /tests/auto/corelib/kernel/qvariant | |
| parent | a769ca1d91aaa7b4cb4f0f3b2fb00940c7e8b201 (diff) | |
Remove deprecated methods
Those aren't part of Qt 6 anymore.
Change-Id: I9ea7de07d89156e8d0fb6ae9deeb24e0de5fa429
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qvariant')
| -rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 69322356a8..0b760f75a8 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -379,13 +379,6 @@ void tst_QVariant::isNull() QString str1; QVariant var1( str1 ); QVERIFY( var1.isNull() ); -#if QT_DEPRECATED_SINCE(5, 9) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - QVariant var2( QString::null ); -QT_WARNING_POP - QVERIFY( var2.isNull() ); -#endif QVariant var3( QString( "blah" ) ); QVERIFY( !var3.isNull() ); @@ -405,19 +398,6 @@ QT_WARNING_POP QVariant varLL( (qlonglong)0 ); QVERIFY( !varLL.isNull() ); -#if QT_DEPRECATED_SINCE(5, 9) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - QVariant var7(QString::null); -QT_WARNING_POP - QVERIFY(var7.isNull()); -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - var7 = QVariant::fromValue<QString>(QString::null); -QT_WARNING_POP - QVERIFY(var7.isNull()); -#endif - QVariant var8(QMetaType::Nullptr, nullptr); QVERIFY(var8.isNull()); var8 = QVariant::fromValue<std::nullptr_t>(nullptr); |