CMake: Regenerate subdir test projects

And generate a few more test projects that were missing.

Change-Id: I5df51106549aa5ae09bc3c42360e14b143719547
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

49 files changed, 240 insertions, 85 deletions

diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
index 8a491d7b9c..21b6c2aff2 100644
--- a/tests/auto/.prev_CMakeLists.txt
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 if(TARGET Qt::Concurrent)
     add_subdirectory(concurrent)
 endif()
-if((((system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1")) AND (TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt))))
+if((((TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt) AND (system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1")))))
     add_subdirectory(dbus)
 endif()
 if(TARGET Qt::Network)
diff --git a/tests/auto/corelib/animation/CMakeLists.txt b/tests/auto/corelib/animation/CMakeLists.txt
index ed238bb4f7..79c2d6c4e9 100644
--- a/tests/auto/corelib/animation/CMakeLists.txt
+++ b/tests/auto/corelib/animation/CMakeLists.txt
@@ -1,6 +1,11 @@
+# Generated from animation.pro.
+
 add_subdirectory(qabstractanimation)
 add_subdirectory(qanimationgroup)
 add_subdirectory(qparallelanimationgroup)
 add_subdirectory(qpauseanimation)
 add_subdirectory(qsequentialanimationgroup)
 add_subdirectory(qvariantanimation)
+if(TARGET Qt::Widgets)
+    add_subdirectory(qpropertyanimation)
+endif()
diff --git a/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt b/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt
new file mode 100644
index 0000000000..be27578dae
--- /dev/null
+++ b/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qpropertyanimation.pro.
+
+#####################################################################
+## tst_qpropertyanimation Test:
+#####################################################################
+
+qt_add_test(tst_qpropertyanimation
+    SOURCES
+        tst_qpropertyanimation.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt
index 58e083d665..8f1a8171ea 100644
--- a/tests/auto/corelib/global/CMakeLists.txt
+++ b/tests/auto/corelib/global/CMakeLists.txt
@@ -1,12 +1,17 @@
-add_subdirectory(q_func_info)
+# Generated from global.pro.
+
 add_subdirectory(qflags)
-add_subdirectory(qfloat16)
+add_subdirectory(q_func_info)
 add_subdirectory(qgetputenv)
-add_subdirectory(qglobalstatic)
-add_subdirectory(qhooks)
-add_subdirectory(qlogging)
+add_subdirectory(qglobal)
 add_subdirectory(qnumeric)
+add_subdirectory(qfloat16)
 add_subdirectory(qrand)
 add_subdirectory(qrandomgenerator)
+add_subdirectory(qlogging)
 add_subdirectory(qtendian)
-
+add_subdirectory(qglobalstatic)
+add_subdirectory(qhooks)
+if(WIN32)
+    add_subdirectory(qwinregistry)
+endif()
diff --git a/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt b/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c95195c71e
--- /dev/null
+++ b/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qlogging.pro.
+
+add_subdirectory(app)
+add_subdirectory(test)
diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt
index ce9235f91e..e47f62776d 100644
--- a/tests/auto/corelib/global/qlogging/CMakeLists.txt
+++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt
@@ -1,11 +1,14 @@
-add_qt_executable(qlogging_helper
+# Generated from qlogging.pro.
+# This file is almost completely custom written # special case
+
+qt_add_executable(qlogging_helper
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES app/main.cpp
     DEFINES QT_MESSAGELOGCONTEXT
     LIBRARIES Qt::Core)
 
-#special case begin
+# special case begin
 # Fixes required for the backtrace stack to be correct
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW)
     target_link_options(qlogging_helper PRIVATE -rdynamic)
@@ -13,7 +16,7 @@ endif()
 set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
 # special case end
 
-add_qt_test(tst_qlogging SOURCES tst_qlogging.cpp
+qt_add_test(tst_qlogging SOURCES tst_qlogging.cpp
     DEFINES
         QT_MESSAGELOGCONTEXT
         QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/corelib/global/qwinregistry/CMakeLists.txt b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt
new file mode 100644
index 0000000000..fc88750c9c
--- /dev/null
+++ b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qwinregistry.pro.
+
+#####################################################################
+## tst_qwinregistry Test:
+#####################################################################
+
+qt_add_test(tst_qwinregistry
+    SOURCES
+        tst_qwinregistry.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
index 196a0c056f..8e72a89649 100644
--- a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt")
 list(APPEND test_data "forRenaming.txt")
 list(APPEND test_data "resources/file1.ext1")
 
-add_qt_test(tst_qfile
+qt_add_test(tst_qfile
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qfile.cpp
@@ -33,7 +33,7 @@ set(qfile_resource_files
     "resources/"
 )
 
-add_qt_resource(tst_qfile "qfile"
+qt_add_resource(tst_qfile "qfile"
     PREFIX
         "/tst_qfileinfo/"
     FILES
@@ -43,7 +43,7 @@ set(rename-fallback_resource_files
     "rename-fallback.qrc"
 )
 
-add_qt_resource(tst_qfile "rename-fallback"
+qt_add_resource(tst_qfile "rename-fallback"
     PREFIX
         "/"
     FILES
@@ -53,7 +53,7 @@ set(copy-fallback_resource_files
     "copy-fallback.qrc"
 )
 
-add_qt_resource(tst_qfile "copy-fallback"
+qt_add_resource(tst_qfile "copy-fallback"
     PREFIX
         "/"
     FILES
@@ -64,22 +64,22 @@ add_qt_resource(tst_qfile "copy-fallback"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qfile CONDITION TARGET Qt::Network
+qt_extend_target(tst_qfile CONDITION TARGET Qt::Network
     PUBLIC_LIBRARIES
         Qt::Network
 )
 
-extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
+qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
     DEFINES
         QT_NO_NETWORK
 )
 
-extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
+qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
 
-extend_target(tst_qfile CONDITION WIN32
+qt_extend_target(tst_qfile CONDITION WIN32
     PUBLIC_LIBRARIES
         ole32
         uuid
diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt
index bfea2c7f49..916b291f54 100644
--- a/tests/auto/corelib/io/qfile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt")
 list(APPEND test_data "forRenaming.txt")
 list(APPEND test_data "resources/file1.ext1")
 
-add_qt_test(tst_qfile
+qt_add_test(tst_qfile
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qfile.cpp
@@ -33,7 +33,7 @@ set(qfile_resource_files
     "resources/"
 )
 
-add_qt_resource(tst_qfile "qfile"
+qt_add_resource(tst_qfile "qfile"
     PREFIX
         "/tst_qfileinfo/"
     FILES
@@ -43,7 +43,7 @@ set(rename-fallback_resource_files
     "rename-fallback.qrc"
 )
 
-add_qt_resource(tst_qfile "rename-fallback"
+qt_add_resource(tst_qfile "rename-fallback"
     PREFIX
         "/"
     FILES
@@ -53,7 +53,7 @@ set(copy-fallback_resource_files
     "copy-fallback.qrc"
 )
 
-add_qt_resource(tst_qfile "copy-fallback"
+qt_add_resource(tst_qfile "copy-fallback"
     PREFIX
         "/"
     FILES
@@ -64,22 +64,22 @@ add_qt_resource(tst_qfile "copy-fallback"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qfile CONDITION TARGET Qt::Network
+qt_extend_target(tst_qfile CONDITION TARGET Qt::Network
     PUBLIC_LIBRARIES
         Qt::Network
 )
 
-extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
+qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
     DEFINES
         QT_NO_NETWORK
 )
 
-extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
+qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
 
-extend_target(tst_qfile CONDITION WIN32
+qt_extend_target(tst_qfile CONDITION WIN32
     PUBLIC_LIBRARIES
         ole32
         uuid
diff --git a/tests/auto/corelib/io/qlockfile/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/CMakeLists.txt
index d422ae9d24..baab320b8c 100644
--- a/tests/auto/corelib/io/qlockfile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qlockfile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlockfile Test:
 #####################################################################
 
-add_qt_test(tst_qlockfile
+qt_add_test(tst_qlockfile
     SOURCES
         tst_qlockfile.cpp
     PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ add_qt_test(tst_qlockfile
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qlockfile CONDITION WIN32
+qt_extend_target(tst_qlockfile CONDITION WIN32
     PUBLIC_LIBRARIES
         advapi32
 )
diff --git a/tests/auto/corelib/kernel/qobject/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/CMakeLists.txt
index ba8c67bd99..ea894ff3d3 100644
--- a/tests/auto/corelib/kernel/qobject/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qobject Test:
 #####################################################################
 
-add_qt_test(tst_qobject
+qt_add_test(tst_qobject
     SOURCES
         tst_qobject.cpp
     DEFINES
diff --git a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt
index 7cd08cd377..90a9c9e17c 100644
--- a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
     ## tst_qsharedmemory Test:
     #####################################################################
 
-    add_qt_test(tst_qsharedmemory
+    qt_add_test(tst_qsharedmemory
         SOURCES
             tst_qsharedmemory.cpp
         PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@
     ## Scopes:
     #####################################################################
 
-    extend_target(tst_qsharedmemory CONDITION LINUX
+    qt_extend_target(tst_qsharedmemory CONDITION LINUX
     PUBLIC_LIBRARIES
         rt
     )
diff --git a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt
index c96e6a8825..8fb89d9af9 100644
--- a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt
@@ -5,7 +5,7 @@ if(QT_FEATURE_sharedmemory) # special case
     ## tst_qsharedmemory Test:
     #####################################################################
 
-    add_qt_test(tst_qsharedmemory
+    qt_add_test(tst_qsharedmemory
         SOURCES
             tst_qsharedmemory.cpp
         PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ if(QT_FEATURE_sharedmemory) # special case
     ## Scopes:
     #####################################################################
 
-    extend_target(tst_qsharedmemory CONDITION LINUX
+    qt_extend_target(tst_qsharedmemory CONDITION LINUX
     PUBLIC_LIBRARIES
         rt
     )
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt
index 1e6889eec0..0024c522e4 100644
--- a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt
@@ -1,20 +1,14 @@
 # Generated from qsystemsemaphore.pro.
 
-add_subdirectory(acquirerelease)
 #####################################################################
 ## tst_qsystemsemaphore Test:
 #####################################################################
 
-add_qt_test(tst_qsystemsemaphore
+qt_add_test(tst_qsystemsemaphore
     SOURCES
         tst_qsystemsemaphore.cpp
 )
 
-#### Keys ignored in scope 2:.:.:test.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 3:.:.:test.pro:WIN32:
-# CONFIG = "console"
+add_subdirectory(acquirerelease)
diff --git a/tests/auto/corelib/mimetypes/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..00c7dd7df2
--- /dev/null
+++ b/tests/auto/corelib/mimetypes/.prev_CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from mimetypes.pro.
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qmimetype)
+endif()
+add_subdirectory(qmimedatabase)
diff --git a/tests/auto/corelib/mimetypes/CMakeLists.txt b/tests/auto/corelib/mimetypes/CMakeLists.txt
index ea0463de36..00c7dd7df2 100644
--- a/tests/auto/corelib/mimetypes/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/CMakeLists.txt
@@ -1,14 +1,6 @@
 # Generated from mimetypes.pro.
 
-# special case begin
-if(FEATURE_private_tests)
-# special case end
+if(QT_FEATURE_private_tests)
     add_subdirectory(qmimetype)
-    add_subdirectory(qmimedatabase)
-# special case begin
-endif()
-# special case end
-
-if(NOT QT_FEATURE_private_tests)
-    ### remove_subdirectory("qmimetype")
 endif()
+add_subdirectory(qmimedatabase)
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt
index 6661952a68..14086efd59 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt
@@ -1,10 +1,8 @@
 # Generated from qmimedatabase.pro.
 
-
 if(TARGET Qt::Concurrent)
     add_subdirectory(qmimedatabase-xml)
-
-    if(UNIX AND NOT APPLE AND NOT QNX)
-        add_subdirectory(qmimedatabase-cache)
-    endif()
+endif()
+if(TARGET Qt::Concurrent AND UNIX AND NOT APPLE AND NOT QNX)
+    add_subdirectory(qmimedatabase-cache)
 endif()
diff --git a/tests/auto/corelib/serialization/CMakeLists.txt b/tests/auto/corelib/serialization/CMakeLists.txt
index f6af7fa256..60a4dc7c35 100644
--- a/tests/auto/corelib/serialization/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/CMakeLists.txt
@@ -5,9 +5,9 @@ add_subdirectory(qcborstreamreader)
 add_subdirectory(qcborstreamwriter)
 add_subdirectory(qcborvalue)
 add_subdirectory(qcborvalue_json)
-add_subdirectory(qdatastream_core_pixmap)
 if(TARGET Qt::Gui)
     add_subdirectory(qdatastream)
+    add_subdirectory(qdatastream_core_pixmap)
 endif()
 if(TARGET Qt::Network)
     add_subdirectory(qtextstream)
diff --git a/tests/auto/corelib/statemachine/CMakeLists.txt b/tests/auto/corelib/statemachine/CMakeLists.txt
index 52c956cd03..362bdbf113 100644
--- a/tests/auto/corelib/statemachine/CMakeLists.txt
+++ b/tests/auto/corelib/statemachine/CMakeLists.txt
@@ -1,2 +1,4 @@
-add_subdirectory(qstate)
+# Generated from statemachine.pro.
 
+add_subdirectory(qstate)
+add_subdirectory(qstatemachine)
diff --git a/tests/auto/corelib/statemachine/qstatemachine/CMakeLists.txt b/tests/auto/corelib/statemachine/qstatemachine/CMakeLists.txt
new file mode 100644
index 0000000000..8cbe69dfdf
--- /dev/null
+++ b/tests/auto/corelib/statemachine/qstatemachine/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qstatemachine.pro.
+
+#####################################################################
+## tst_qstatemachine Test:
+#####################################################################
+
+qt_add_test(tst_qstatemachine
+    SOURCES
+        tst_qstatemachine.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(tst_qstatemachine CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
diff --git a/tests/auto/corelib/tools/.prev_CMakeLists.txt b/tests/auto/corelib/tools/.prev_CMakeLists.txt
index 5350c29b79..02dec30c5d 100644
--- a/tests/auto/corelib/tools/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/tools/.prev_CMakeLists.txt
@@ -16,6 +16,7 @@ add_subdirectory(qfreelist)
 add_subdirectory(qhash)
 add_subdirectory(qhashfunctions)
 add_subdirectory(qline)
+add_subdirectory(qlist)
 add_subdirectory(qmakearray)
 add_subdirectory(qmap)
 add_subdirectory(qmargins)
@@ -38,7 +39,6 @@ add_subdirectory(qsizef)
 add_subdirectory(qstl)
 add_subdirectory(qtimeline)
 add_subdirectory(qvarlengtharray)
-add_subdirectory(qvector)
 add_subdirectory(qversionnumber)
 if(APPLE)
     add_subdirectory(qmacautoreleasepool)
diff --git a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt
index 2fc50a7d89..75e9ebfc94 100644
--- a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcommandlineparser Test:
 #####################################################################
 
-add_qt_test(tst_qcommandlineparser
+qt_add_test(tst_qcommandlineparser
     SOURCES
         tst_qcommandlineparser.cpp
 )
diff --git a/tests/auto/dbus/qdbusabstractadaptor/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..9a8132d115
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractadaptor/.prev_CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qdbusabstractadaptor.pro.
+
+add_subdirectory(qmyserver)
+add_subdirectory(qdbusabstractadaptor)
diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
index a97accb925..0f6d732b09 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
@@ -1,9 +1,9 @@
-
 # Generated from qdbusabstractadaptor.pro.
 
 add_subdirectory(qmyserver)
 
-add_qt_test(tst_qdbusabstractadaptor
+# special case begin
+qt_add_test(tst_qdbusabstractadaptor
     SOURCES
         myobject.h
         tst_qdbusabstractadaptor.cpp
@@ -11,4 +11,4 @@ add_qt_test(tst_qdbusabstractadaptor
         Qt::CorePrivate
         Qt::DBus
 )
-
+# special case end
diff --git a/tests/auto/dbus/qdbusabstractinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..111012aba9
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractinterface/.prev_CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qdbusabstractinterface.pro.
+
+add_subdirectory(qpinger)
+add_subdirectory(qdbusabstractinterface)
diff --git a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
index 55592832c1..ec49268777 100644
--- a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 add_subdirectory(qpinger)
 
+# special case begin
 qt_add_test(tst_qdbusabstractinterface
     SOURCES
         interface.cpp
@@ -19,3 +20,5 @@ qt_extend_target(tst_qdbusabstractinterface
     DBUS_INTERFACE_FLAGS
         -i interface.h
 )
+
+# special case end
diff --git a/tests/auto/dbus/qdbusinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ae79490a83
--- /dev/null
+++ b/tests/auto/dbus/qdbusinterface/.prev_CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qdbusinterface.pro.
+
+add_subdirectory(qmyserver)
+add_subdirectory(qdbusinterface)
diff --git a/tests/auto/dbus/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/CMakeLists.txt
index c96944cd56..321c61a627 100644
--- a/tests/auto/dbus/qdbusinterface/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusinterface/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from qdbusinterface.pro.
 
-# special case begin
 add_subdirectory(qmyserver)
+# special case begin
 
 #####################################################################
 ## ../tst_qdbusinterface Test:
diff --git a/tests/auto/dbus/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/CMakeLists.txt
index aabeae0f4a..5d40035aee 100644
--- a/tests/auto/dbus/qdbusmarshall/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/CMakeLists.txt
@@ -1,4 +1,7 @@
 # Generated from qdbusmarshall.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
 add_subdirectory(qpong)
 add_subdirectory(qdbusmarshall)
diff --git a/tests/auto/gui/itemmodels/CMakeLists.txt b/tests/auto/gui/itemmodels/CMakeLists.txt
index 870024a9a1..b8c55489c4 100644
--- a/tests/auto/gui/itemmodels/CMakeLists.txt
+++ b/tests/auto/gui/itemmodels/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory("qstandarditem")
-if (QT_FEATURE_widgets)
-    add_subdirectory("qstandarditemmodel")
+# Generated from itemmodels.pro.
+
+add_subdirectory(qstandarditem)
+if(TARGET Qt::Widgets)
+    add_subdirectory(qstandarditemmodel)
 endif()
diff --git a/tests/auto/gui/math3d/CMakeLists.txt b/tests/auto/gui/math3d/CMakeLists.txt
index 91e59874b7..11c50163ad 100644
--- a/tests/auto/gui/math3d/CMakeLists.txt
+++ b/tests/auto/gui/math3d/CMakeLists.txt
@@ -1,3 +1,5 @@
-add_subdirectory("qquaternion")
-add_subdirectory("qvectornd")
-add_subdirectory("qmatrixnxn")
+# Generated from math3d.pro.
+
+add_subdirectory(qquaternion)
+add_subdirectory(qvectornd)
+add_subdirectory(qmatrixnxn)
diff --git a/tests/auto/gui/text/.prev_CMakeLists.txt b/tests/auto/gui/text/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8326190831
--- /dev/null
+++ b/tests/auto/gui/text/.prev_CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from text.pro.
+
+add_subdirectory(qabstracttextdocumentlayout)
+add_subdirectory(qfont)
+add_subdirectory(qfontdatabase)
+add_subdirectory(qfontmetrics)
+add_subdirectory(qglyphrun)
+add_subdirectory(qrawfont)
+add_subdirectory(qstatictext)
+add_subdirectory(qsyntaxhighlighter)
+add_subdirectory(qtextblock)
+add_subdirectory(qtextcursor)
+add_subdirectory(qtextdocumentfragment)
+add_subdirectory(qtextdocumentlayout)
+add_subdirectory(qtextformat)
+add_subdirectory(qtextlist)
+add_subdirectory(qtextobject)
+add_subdirectory(qtextscriptengine)
+add_subdirectory(qtexttable)
+add_subdirectory(qinputcontrol)
+if(QT_FEATURE_private_tests AND TARGET Qt::Xml)
+    add_subdirectory(qcssparser)
+endif()
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qfontcache)
+    add_subdirectory(qtextlayout)
+    add_subdirectory(qzip)
+    add_subdirectory(qtextodfwriter)
+endif()
+if(TARGET Qt::Xml)
+    add_subdirectory(qtextdocument)
+endif()
+if(QT_FEATURE_private_tests AND UNIX)
+    add_subdirectory(qtextpiecetable)
+endif()
+if(QT_FEATURE_textmarkdownreader)
+    add_subdirectory(qtextmarkdownimporter)
+endif()
+if(QT_FEATURE_private_tests AND QT_FEATURE_textmarkdownwriter)
+    add_subdirectory(qtextmarkdownwriter)
+endif()
diff --git a/tests/auto/gui/text/CMakeLists.txt b/tests/auto/gui/text/CMakeLists.txt
index b5c91a2cfa..5040060a33 100644
--- a/tests/auto/gui/text/CMakeLists.txt
+++ b/tests/auto/gui/text/CMakeLists.txt
@@ -15,7 +15,7 @@ add_subdirectory(qtextdocumentlayout)
 add_subdirectory(qtextformat)
 add_subdirectory(qtextlist)
 add_subdirectory(qtextobject)
-# add_subdirectory(qtextscriptengine) # disable until system_harfbuzz feature is available
+# add_subdirectory(qtextscriptengine) # disable until system_harfbuzz feature is available # special case
 add_subdirectory(qtexttable)
 add_subdirectory(qinputcontrol)
 if(QT_FEATURE_private_tests AND TARGET Qt::Xml)
diff --git a/tests/auto/network/.prev_CMakeLists.txt b/tests/auto/network/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..aafbe7abff
--- /dev/null
+++ b/tests/auto/network/.prev_CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from network.pro.
+
+add_subdirectory(selftest)
+add_subdirectory(access)
+add_subdirectory(kernel)
+add_subdirectory(ssl)
+add_subdirectory(socket)
diff --git a/tests/auto/network/CMakeLists.txt b/tests/auto/network/CMakeLists.txt
index b85ff6c0de..c8bb0cf799 100644
--- a/tests/auto/network/CMakeLists.txt
+++ b/tests/auto/network/CMakeLists.txt
@@ -14,6 +14,7 @@ if (QT_FEATURE_private_tests)
 endif()
 # special case end
 
+# add_subdirectory(selftest) # special case not ported
 add_subdirectory(access)
 add_subdirectory(kernel)
 add_subdirectory(ssl)
diff --git a/tests/auto/network/access/CMakeLists.txt b/tests/auto/network/access/CMakeLists.txt
index 432c19ec81..47e2a52945 100644
--- a/tests/auto/network/access/CMakeLists.txt
+++ b/tests/auto/network/access/CMakeLists.txt
@@ -8,8 +8,6 @@ add_subdirectory(qnetworkrequest)
 add_subdirectory(qnetworkreply)
 add_subdirectory(qnetworkcachemetadata)
 add_subdirectory(qabstractnetworkcache)
-
-
 if(QT_FEATURE_private_tests)
     add_subdirectory(qhttpnetworkconnection)
     add_subdirectory(qhttpnetworkreply)
diff --git a/tests/auto/opengl/CMakeLists.txt b/tests/auto/opengl/CMakeLists.txt
index 7281d56838..34011c9b92 100644
--- a/tests/auto/opengl/CMakeLists.txt
+++ b/tests/auto/opengl/CMakeLists.txt
@@ -1 +1,2 @@
 # Generated from opengl.pro.
+
diff --git a/tests/auto/other/macplist/.prev_CMakeLists.txt b/tests/auto/other/macplist/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..2a9bfccdcf
--- /dev/null
+++ b/tests/auto/other/macplist/.prev_CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from macplist.pro.
+
+if(NOT widgets)
+    return()
+endif()
+add_subdirectory(app)
+add_subdirectory(test)
diff --git a/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt b/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt
index ccc2c55c13..cbb2d26a87 100644
--- a/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt
+++ b/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qprocess_and_guieventloop Test:
 #####################################################################
 
-add_qt_test(tst_qprocess_and_guieventloop
+qt_add_test(tst_qprocess_and_guieventloop
     SOURCES
         tst_qprocess_and_guieventloop.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/printsupport/CMakeLists.txt b/tests/auto/printsupport/CMakeLists.txt
index 633c7d5e71..b9c74d5b67 100644
--- a/tests/auto/printsupport/CMakeLists.txt
+++ b/tests/auto/printsupport/CMakeLists.txt
@@ -1,4 +1,7 @@
 # Generated from printsupport.pro.
 
+if(NOT QT_FEATURE_printer)
+    return()
+endif()
 add_subdirectory(dialogs)
 add_subdirectory(kernel)
diff --git a/tests/auto/sql/kernel/CMakeLists.txt b/tests/auto/sql/kernel/CMakeLists.txt
index 8d3f0b6bc5..dbd36bf012 100644
--- a/tests/auto/sql/kernel/CMakeLists.txt
+++ b/tests/auto/sql/kernel/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Generated from kernel.pro.
+
 add_subdirectory(qsqlfield)
 add_subdirectory(qsqldatabase)
 add_subdirectory(qsqlerror)
diff --git a/tests/auto/testlib/.prev_CMakeLists.txt b/tests/auto/testlib/.prev_CMakeLists.txt
index 194852f91c..2b5c95417f 100644
--- a/tests/auto/testlib/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/.prev_CMakeLists.txt
@@ -1,5 +1,6 @@
 # Generated from testlib.pro.
 
+add_subdirectory(initmain)
 add_subdirectory(outformat)
 add_subdirectory(qsignalspy)
 add_subdirectory(selftests)
diff --git a/tests/auto/testlib/CMakeLists.txt b/tests/auto/testlib/CMakeLists.txt
index fe80927327..76790e2ee3 100644
--- a/tests/auto/testlib/CMakeLists.txt
+++ b/tests/auto/testlib/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Generated from testlib.pro.
 
+# add_subdirectory(initmain) # special case missing project
 # add_subdirectory(outformat) # special case missing project
 add_subdirectory(qsignalspy)
 add_subdirectory(selftests)
diff --git a/tests/auto/tools/.prev_CMakeLists.txt b/tests/auto/tools/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d6cc753db7
--- /dev/null
+++ b/tests/auto/tools/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from tools.pro.
+
+add_subdirectory(qmakelib)
+add_subdirectory(qmake)
+add_subdirectory(moc)
+add_subdirectory(rcc)
+if(TARGET Qt::Widgets)
+    add_subdirectory(uic)
+endif()
+if(TARGET Qt::DBus)
+    add_subdirectory(qdbuscpp2xml)
+    add_subdirectory(qdbusxml2cpp)
+endif()
diff --git a/tests/auto/tools/CMakeLists.txt b/tests/auto/tools/CMakeLists.txt
index b0895a1e70..128b919538 100644
--- a/tests/auto/tools/CMakeLists.txt
+++ b/tests/auto/tools/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 add_subdirectory(qmakelib)
 add_subdirectory(qmake)
-#add_subdirectory(moc)
+#add_subdirectory(moc) # special case to be ported
 add_subdirectory(rcc)
 if(TARGET Qt::Widgets)
     add_subdirectory(uic)
diff --git a/tests/auto/widgets/effects/CMakeLists.txt b/tests/auto/widgets/effects/CMakeLists.txt
index 2e2045e33e..3c0af4537a 100644
--- a/tests/auto/widgets/effects/CMakeLists.txt
+++ b/tests/auto/widgets/effects/CMakeLists.txt
@@ -1,2 +1,4 @@
+# Generated from effects.pro.
+
 add_subdirectory(qgraphicseffect)
 add_subdirectory(qpixmapfilter)
diff --git a/tests/auto/widgets/itemviews/CMakeLists.txt b/tests/auto/widgets/itemviews/CMakeLists.txt
index a3737b2abc..ec6e00ec7f 100644
--- a/tests/auto/widgets/itemviews/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/CMakeLists.txt
@@ -13,7 +13,6 @@ add_subdirectory(qtablewidget)
 add_subdirectory(qtreeview)
 add_subdirectory(qtreewidget)
 add_subdirectory(qtreewidgetitemiterator)
-
 if(QT_FEATURE_private_tests)
     add_subdirectory(qcolumnview)
     add_subdirectory(qlistwidget)
diff --git a/tests/auto/widgets/kernel/CMakeLists.txt b/tests/auto/widgets/kernel/CMakeLists.txt
index ec32603585..0c48aec149 100644
--- a/tests/auto/widgets/kernel/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/CMakeLists.txt
@@ -1,7 +1,5 @@
 # Generated from kernel.pro.
 
-add_subdirectory(qaction)
-add_subdirectory(qactiongroup)
 add_subdirectory(qapplication)
 add_subdirectory(qboxlayout)
 add_subdirectory(qformlayout)
@@ -11,12 +9,18 @@ add_subdirectory(qstackedlayout)
 add_subdirectory(qtooltip)
 add_subdirectory(qwidget)
 add_subdirectory(qwidget_window)
-add_subdirectory(qwidgetaction)
 add_subdirectory(qwidgetmetatype)
 add_subdirectory(qwidgetsvariant)
 add_subdirectory(qwindowcontainer)
-add_subdirectory(qshortcut)
 add_subdirectory(qsizepolicy)
 if(NOT APPLE)
     add_subdirectory(qgesturerecognizer)
 endif()
+if(QT_FEATURE_shortcut)
+    add_subdirectory(qshortcut)
+endif()
+if(QT_FEATURE_action)
+    add_subdirectory(qaction)
+    add_subdirectory(qactiongroup)
+    add_subdirectory(qwidgetaction)
+endif()
diff --git a/tests/auto/widgets/styles/CMakeLists.txt b/tests/auto/widgets/styles/CMakeLists.txt
index 4ded7b9d80..b1c9d1fce3 100644
--- a/tests/auto/widgets/styles/CMakeLists.txt
+++ b/tests/auto/widgets/styles/CMakeLists.txt
@@ -1,12 +1,10 @@
 # Generated from styles.pro.
 
-if (MACOS)
+if(APPLE)
     add_subdirectory(qmacstyle)
 endif()
 add_subdirectory(qstyle)
-if (NOT UIKIT AND NOT ANDROID AND NOT QNX)
-    add_subdirectory(qstyleoption)
-endif()
-if (QT_FEATURE_private_tests)
+add_subdirectory(qstyleoption)
+if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT QNX AND NOT UIKIT)
     add_subdirectory(qstylesheetstyle)
 endif()