3 files changed, 10 insertions, 11 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
index b611bece63..dbf9e0b119 100644
--- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
@@ -9,6 +9,7 @@ add_qt_test(tst_qvariant
     SOURCES
         tst_qvariant.cpp
     DEFINES
+        # -QT_NO_LINKED_LIST # special case remove until we fix this
         QT_DISABLE_DEPRECATED_BEFORE=0
     INCLUDE_DIRECTORIES
         ../../../other/qvariant_common
@@ -17,23 +18,18 @@ add_qt_test(tst_qvariant
 )
 
 # Resources:
+set(qvariant_resource_files
+    "stream/qt4.9/"
+    "stream/qt5.0/"
+)
+
 add_qt_resource(tst_qvariant "qvariant"
     PREFIX
         "/"
     FILES
-        stream/qt4.9/
-        stream/qt5.0/
+        ${qvariant_resource_files}
 )
 
 
-#### Keys ignored in scope 1:.:.:qvariant.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qvariant.pro:qtConfig(c++14):
-# CONFIG = "c++14"
-
-#### Keys ignored in scope 3:.:.:qvariant.pro:qtConfig(c++1z):
-# CONFIG = "c++1z"
diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro
index a620be0091..0b5280df86 100644
--- a/tests/auto/corelib/kernel/qvariant/qvariant.pro
+++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro
@@ -5,6 +5,7 @@ INCLUDEPATH += $$PWD/../../../other/qvariant_common
 SOURCES = tst_qvariant.cpp
 RESOURCES += qvariant.qrc
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+DEFINES -= QT_NO_LINKED_LIST
 qtConfig(c++14): CONFIG += c++14
 qtConfig(c++1z): CONFIG += c++1z
 !qtConfig(doubleconversion):!qtConfig(system-doubleconversion) {
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 5d06f6e8c8..074cb07092 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -379,11 +379,13 @@ 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() );