Regenerate tests/auto/corelib/kernel

Change-Id: I466387408d26854e11fde0a1fbef74c2fad764c7
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

25 files changed, 113 insertions, 83 deletions

diff --git a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
index de1901e9e4..5feb9ff535 100644
--- a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test(tst_qdeadlinetimer
     SOURCES
         tst_qdeadlinetimer.cpp
 )
-
-#### Keys ignored in scope 1:.:.:qdeadlinetimer.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
index 9355b18cc5..e188c94933 100644
--- a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test(tst_qelapsedtimer
     SOURCES
         tst_qelapsedtimer.cpp
 )
-
-#### Keys ignored in scope 1:.:.:qelapsedtimer.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
index 3e9bd56cc4..4dbabc2d69 100644
--- a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test(tst_qeventdispatcher
     SOURCES
         tst_qeventdispatcher.cpp
 )
-
-#### Keys ignored in scope 1:.:.:qeventdispatcher.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
index 4f5abffddd..389fd55a9f 100644
--- a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
@@ -13,9 +13,6 @@ add_qt_test(tst_qeventloop
         Qt::Network
 )
 
-#### Keys ignored in scope 1:.:.:qeventloop.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
diff --git a/tests/auto/corelib/kernel/qmath/CMakeLists.txt b/tests/auto/corelib/kernel/qmath/CMakeLists.txt
index 0b5fc99508..5e73597c67 100644
--- a/tests/auto/corelib/kernel/qmath/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmath/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test(tst_qmath
     SOURCES
         tst_qmath.cpp
 )
-
-#### Keys ignored in scope 1:.:.:qmath.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
index c52b326044..12c9d9a8a7 100644
--- a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test(tst_qmetaenum
     SOURCES
         tst_qmetaenum.cpp
 )
-
-#### Keys ignored in scope 1:.:.:qmetaenum.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
index 9175343044..b16101a1a1 100644
--- a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test(tst_qmetamethod
     SOURCES
         tst_qmetamethod.cpp
 )
-
-#### Keys ignored in scope 1:.:.:qmetamethod.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
index 3b9fb44a0d..e0e03051b4 100644
--- a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
@@ -11,11 +11,5 @@ add_qt_test(tst_qmetaobject
         Qt::CorePrivate
 )
 
-#### Keys ignored in scope 1:.:.:qmetaobject.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qmetaobject.pro:qtConfig(c++14):
-# CONFIG = "c++14"
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
index cd301b145c..b876807ba9 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
@@ -10,6 +10,3 @@ add_qt_test(tst_qmetaobjectbuilder
     LIBRARIES
         Qt::CorePrivate
 )
-
-#### Keys ignored in scope 1:.:.:qmetaobjectbuilder.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
index 9543735ee4..2d657d5217 100644
--- a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test(tst_qmetaproperty
     SOURCES
         tst_qmetaproperty.cpp
 )
-
-#### Keys ignored in scope 1:.:.:qmetaproperty.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1cc577fda7
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
@@ -0,0 +1,42 @@
+# Generated from qmetatype.pro.
+
+#####################################################################
+## tst_qmetatype Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "./typeFlags.bin")
+
+add_qt_test(tst_qmetatype
+    SOURCES
+        tst_qmetatype.cpp
+    DEFINES
+        -QT_NO_LINKED_LIST
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    INCLUDE_DIRECTORIES
+        ../../../other/qvariant_common
+    LIBRARIES
+        Qt::CorePrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmetatype CONDITION MSVC OR WINRT
+    COMPILE_OPTIONS
+        /bigobj
+)
+
+#### Keys ignored in scope 3:.:.:qmetatype.pro:WINRT:
+# QMAKE_CFLAGS_RELEASE = "--O2"
+# QMAKE_CXXFLAGS_RELEASE = "--O2"
+
+#### Keys ignored in scope 4:.:.:qmetatype.pro:CLANG:
+# QMAKE_CFLAGS_RELEASE = "--O2" "--g"
+# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
+
+extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
+    DEFINES
+        TST_QMETATYPE_BROKEN_COMPILER
+)
diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
index 7a498cecfd..0a84d8bb0a 100644
--- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
@@ -4,21 +4,22 @@
 ## tst_qmetatype Test:
 #####################################################################
 
+# Collect test data
+list(APPEND test_data "./typeFlags.bin")
+
 add_qt_test(tst_qmetatype
     SOURCES
         tst_qmetatype.cpp
     DEFINES
+        # -QT_NO_LINKED_LIST # special case remove until we fix this
         QT_DISABLE_DEPRECATED_BEFORE=0
     INCLUDE_DIRECTORIES
         ../../../other/qvariant_common
     LIBRARIES
         Qt::CorePrivate
+    TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qmetatype.pro:<TRUE>:
-# CONFIG = "testcase"
-# TESTDATA = "./typeFlags.bin"
-
 ## Scopes:
 #####################################################################
 
diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
index 7b373d6e6a..b4965302dd 100644
--- a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
@@ -10,6 +10,3 @@ add_qt_test(tst_qmimedata
     PUBLIC_LIBRARIES
         Qt::Gui
 )
-
-#### Keys ignored in scope 1:.:.:qmimedata.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
index 4d641bcef8..e798028b1b 100644
--- a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test_helper(signalbug_helper
     SOURCES
         signalbug.cpp signalbug.h
 )
-
-#### Keys ignored in scope 1:.:.:signalbug.pro:<TRUE>:
-# _LOADED = "qt_test_helper"
diff --git a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
index c7683d5a24..804a3a9def 100644
--- a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
@@ -9,9 +9,6 @@ add_qt_test(tst_qpointer
         tst_qpointer.cpp
 )
 
-#### Keys ignored in scope 1:.:.:qpointer.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
diff --git a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
index da13968cc4..2e16a673b1 100644
--- a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
@@ -10,6 +10,3 @@ add_qt_test_helper(producerconsumer_helper
     PUBLIC_LIBRARIES
         Qt::Test
 )
-
-#### Keys ignored in scope 1:.:.:producerconsumer.pro:<TRUE>:
-# _LOADED = "qt_test_helper"
diff --git a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
index f27761f8ef..ae86137c94 100644
--- a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test(tst_qsignalblocker
     SOURCES
         tst_qsignalblocker.cpp
 )
-
-#### Keys ignored in scope 1:.:.:qsignalblocker.pro:<TRUE>:
-# CONFIG = "testcase" "console"
diff --git a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
index 4a4b5084fe..1360e76ea1 100644
--- a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test(tst_qsignalmapper
     SOURCES
         tst_qsignalmapper.cpp
 )
-
-#### Keys ignored in scope 1:.:.:qsignalmapper.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
index 788fb5c4ec..b669361a80 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
@@ -1,11 +1,14 @@
 # Generated from qsocketnotifier.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
 #####################################################################
 ## tst_qsocketnotifier Test:
 #####################################################################
 
 add_qt_test(tst_qsocketnotifier
-    GUI
     SOURCES
         tst_qsocketnotifier.cpp
     INCLUDE_DIRECTORIES
@@ -18,7 +21,7 @@ add_qt_test(tst_qsocketnotifier
 )
 
 #### Keys ignored in scope 1:.:.:qsocketnotifier.pro:<TRUE>:
-# CONFIG = "testcase"
+# _REQUIREMENTS = "qtConfig(private_tests)"
 
 ## Scopes:
 #####################################################################
@@ -31,6 +34,6 @@ extend_target(tst_qsocketnotifier CONDITION WIN32
 extend_target(tst_qsocketnotifier CONDITION QT_FEATURE_reduce_exports AND UNIX
     SOURCES
         ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp
-        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h
         ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp
 )
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
index 795afb28c5..ddce7297d2 100644
--- a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
@@ -10,6 +10,3 @@ add_qt_test_helper(acquirerelease_helper
     PUBLIC_LIBRARIES
         Qt::Test
 )
-
-#### Keys ignored in scope 1:.:.:acquirerelease.pro:<TRUE>:
-# _LOADED = "qt_test_helper"
diff --git a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
index 5632875361..320f3a6705 100644
--- a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
@@ -11,11 +11,5 @@ add_qt_test(tst_qtimer
         Qt::CorePrivate
 )
 
-#### Keys ignored in scope 1:.:.:qtimer.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qtimer.pro:QT_CONFIG___contains___c++1z:
-# CONFIG = "c++1z"
diff --git a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
index fc0b1ccdac..79e44bc928 100644
--- a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
@@ -10,24 +10,38 @@ add_qt_test(tst_qtranslator
 )
 
 # Resources:
-add_qt_resource(tst_qtranslator "qtranslator" PREFIX "/tst_qtranslator" FILES
-    hellotr_empty.qm
-    hellotr_la.qm)
+set(qtranslator_resource_files
+    "hellotr_empty.qm"
+    "hellotr_la.qm"
+)
 
+add_qt_resource(tst_qtranslator "qtranslator"
+    PREFIX
+        "/tst_qtranslator"
+    FILES
+        ${qtranslator_resource_files}
+)
 
-#### Keys ignored in scope 1:.:.:qtranslator.pro:<TRUE>:
-# CONFIG = "testcase"
 
 ## Scopes:
 #####################################################################
 
-# Resources:
-add_qt_resource(tst_qtranslator "android_testdata" PREFIX "/android_testdata" FILES
-    dependencies_la.qm
-    hellotr_empty.qm
-    hellotr_la.qm
-    msgfmt_from_po.qm)
-
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(android_testdata_resource_files
+        "dependencies_la.qm"
+        "hellotr_empty.qm"
+        "hellotr_la.qm"
+        "msgfmt_from_po.qm"
+    )
+
+    add_qt_resource(tst_qtranslator "android_testdata"
+        PREFIX
+            "/android_testdata"
+        FILES
+            ${android_testdata_resource_files}
+    )
+endif()
 
 #### Keys ignored in scope 3:.:.:qtranslator.pro:else:
 # TESTDATA = "dependencies_la.qm" "hellotr_empty.qm" "hellotr_la.qm" "msgfmt_from_po.qm"
diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..102d847d95
--- /dev/null
+++ b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from qvariant.pro.
+
+#####################################################################
+## tst_qvariant Test:
+#####################################################################
+
+add_qt_test(tst_qvariant
+    SOURCES
+        tst_qvariant.cpp
+    DEFINES
+        -QT_NO_LINKED_LIST
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    INCLUDE_DIRECTORIES
+        ../../../other/qvariant_common
+    LIBRARIES
+        Qt::CorePrivate
+)
+
+# Resources:
+set(qvariant_resource_files
+    "stream/qt4.9/"
+    "stream/qt5.0/"
+)
+
+add_qt_resource(tst_qvariant "qvariant"
+    PREFIX
+        "/"
+    FILES
+        ${qvariant_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
index dbf9e0b119..b32b8835d4 100644
--- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qvariant
-    GUI
     SOURCES
         tst_qvariant.cpp
     DEFINES
diff --git a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
index f4a1f9bc62..af154db0de 100644
--- a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
@@ -10,6 +10,3 @@ add_qt_test(tst_qwineventnotifier
     LIBRARIES
         Qt::CorePrivate
 )
-
-#### Keys ignored in scope 1:.:.:qwineventnotifier.pro:<TRUE>:
-# CONFIG = "testcase"