From 5caf7ef3b1c67cc65efd21d2341955230a6ed43c Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 22 May 2020 16:36:41 +0200
Subject: 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>
---
 .../auto/corelib/kernel/qvariant/tst_qvariant.cpp  | 20 ------------------
 .../corelib/text/qstringref/tst_qstringref.cpp     | 24 ----------------------
 2 files changed, 44 deletions(-)

(limited to 'tests')

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);
diff --git a/tests/auto/corelib/text/qstringref/tst_qstringref.cpp b/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
index 7eea1db7c8..f6a2326af1 100644
--- a/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
@@ -598,9 +598,6 @@ void tst_QStringRef::startsWith()
         QVERIFY(!ref.startsWith("ABCDEF"));
         QVERIFY(ref.startsWith(""));
         QVERIFY(ref.startsWith(QString()));
-#if QT_DEPRECATED_SINCE(5, 9)
-        QVERIFY(ref.startsWith(QString::null));
-#endif
         QVERIFY(ref.startsWith('A'));
         QVERIFY(ref.startsWith(QLatin1Char('A')));
         QVERIFY(ref.startsWith(QChar('A')));
@@ -628,9 +625,6 @@ void tst_QStringRef::startsWith()
         QVERIFY(!ref.startsWith("abcdef", Qt::CaseInsensitive));
         QVERIFY(ref.startsWith("", Qt::CaseInsensitive));
         QVERIFY(ref.startsWith(QString(), Qt::CaseInsensitive));
-#if QT_DEPRECATED_SINCE(5, 9)
-        QVERIFY(ref.startsWith(QString::null, Qt::CaseInsensitive));
-#endif
         QVERIFY(ref.startsWith('a', Qt::CaseInsensitive));
         QVERIFY(ref.startsWith('A', Qt::CaseInsensitive));
         QVERIFY(ref.startsWith(QLatin1Char('a'), Qt::CaseInsensitive));
@@ -664,9 +658,6 @@ void tst_QStringRef::startsWith()
         CREATE_REF(a);
         QVERIFY(ref.startsWith(""));
         QVERIFY(ref.startsWith(QString()));
-#if QT_DEPRECATED_SINCE(5, 9)
-        QVERIFY(ref.startsWith(QString::null));
-#endif
         QVERIFY(!ref.startsWith("ABC"));
 
         QVERIFY(ref.startsWith(QLatin1String("")));
@@ -681,9 +672,6 @@ void tst_QStringRef::startsWith()
         const QStringRef ref;
         QVERIFY(!ref.startsWith(""));
         QVERIFY(ref.startsWith(QString()));
-#if QT_DEPRECATED_SINCE(5, 9)
-        QVERIFY(ref.startsWith(QString::null));
-#endif
         QVERIFY(!ref.startsWith("ABC"));
 
         QVERIFY(!ref.startsWith(QLatin1String("")));
@@ -707,9 +695,6 @@ void tst_QStringRef::endsWith()
         QVERIFY(!ref.endsWith("ABCDEF"));
         QVERIFY(ref.endsWith(""));
         QVERIFY(ref.endsWith(QString()));
-#if QT_DEPRECATED_SINCE(5, 9)
-        QVERIFY(ref.endsWith(QString::null));
-#endif
         QVERIFY(ref.endsWith('B'));
         QVERIFY(ref.endsWith(QLatin1Char('B')));
         QVERIFY(ref.endsWith(QChar('B')));
@@ -737,9 +722,6 @@ void tst_QStringRef::endsWith()
         QVERIFY(!ref.endsWith("abcdef", Qt::CaseInsensitive));
         QVERIFY(ref.endsWith("", Qt::CaseInsensitive));
         QVERIFY(ref.endsWith(QString(), Qt::CaseInsensitive));
-#if QT_DEPRECATED_SINCE(5, 9)
-        QVERIFY(ref.endsWith(QString::null, Qt::CaseInsensitive));
-#endif
         QVERIFY(ref.endsWith('b', Qt::CaseInsensitive));
         QVERIFY(ref.endsWith('B', Qt::CaseInsensitive));
         QVERIFY(ref.endsWith(QLatin1Char('b'), Qt::CaseInsensitive));
@@ -774,9 +756,6 @@ void tst_QStringRef::endsWith()
         CREATE_REF(a);
         QVERIFY(ref.endsWith(""));
         QVERIFY(ref.endsWith(QString()));
-#if QT_DEPRECATED_SINCE(5, 9)
-        QVERIFY(ref.endsWith(QString::null));
-#endif
         QVERIFY(!ref.endsWith("ABC"));
         QVERIFY(!ref.endsWith(QLatin1Char(0)));
         QVERIFY(!ref.endsWith(QLatin1Char('x')));
@@ -791,9 +770,6 @@ void tst_QStringRef::endsWith()
         QStringRef ref;
         QVERIFY(!ref.endsWith(""));
         QVERIFY(ref.endsWith(QString()));
-#if QT_DEPRECATED_SINCE(5, 9)
-        QVERIFY(ref.endsWith(QString::null));
-#endif
         QVERIFY(!ref.endsWith("ABC"));
 
         QVERIFY(!ref.endsWith(QLatin1String("")));
-- 
cgit v1.2.3