12 files changed, 21 insertions, 36 deletions

diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
index 16d353434a..3225f7d308 100644
--- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
@@ -10,8 +10,8 @@ endif()
 
 add_qt_test(tst_qurlinternal
     SOURCES
-        utf8data.cpp
         tst_qurlinternal.cpp
+        utf8data.cpp
     PUBLIC_LIBRARIES
         Qt::CorePrivate
 )
diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
index cb847dc503..bb9429cdb5 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
@@ -29,10 +29,3 @@ extend_target(tst_qsocketnotifier CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
-
-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/qabstractsocketengine_p.h
-        ${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/thread/qpromise/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..dc25a38fea
--- /dev/null
+++ b/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpromise.pro.
+
+#####################################################################
+## tst_qpromise Test:
+#####################################################################
+
+qt_add_test(tst_qpromise
+    SOURCES
+        tst_qpromise.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/thread/qpromise/CMakeLists.txt b/tests/auto/corelib/thread/qpromise/CMakeLists.txt
index 3cc20cafd7..c591092257 100644
--- a/tests/auto/corelib/thread/qpromise/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qpromise/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Generated from qpromise.pro.
+
 #####################################################################
 ## tst_qpromise Test:
 #####################################################################
@@ -7,6 +9,6 @@ qt_add_test(tst_qpromise
         tst_qpromise.cpp
     PUBLIC_LIBRARIES
         Qt::CorePrivate
-    LIBRARIES
-        Threads::Threads  # solves issue with libpthread linkage
+    LIBRARIES # special case
+        Threads::Threads  # solves issue with libpthread linkage # special case
 )
diff --git a/tests/auto/corelib/tools/qlist/CMakeLists.txt b/tests/auto/corelib/tools/qlist/CMakeLists.txt
index fd771de03a..6909d83967 100644
--- a/tests/auto/corelib/tools/qlist/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qlist/CMakeLists.txt
@@ -1,7 +1,7 @@
-# Generated from qvector.pro.
+# Generated from qlist.pro.
 
 #####################################################################
-## tst_qvector Test:
+## tst_qlist Test:
 #####################################################################
 
 qt_add_test(tst_qlist
diff --git a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
index bbf1482041..18d4968695 100644
--- a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Generated from qinputdevice.pro.
+
 #####################################################################
 ## tst_qinputdevice Test:
 #####################################################################
diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
index 1dece78966..bb29119011 100644
--- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
@@ -29,10 +29,3 @@ extend_target(tst_platformsocketengine CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
-
-extend_target(tst_platformsocketengine CONDITION QT_FEATURE_reduce_exports AND UNIX
-    SOURCES
-        ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h
-        ${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/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
index 6aeec0a983..22007a31d1 100644
--- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
@@ -32,10 +32,3 @@ extend_target(tst_qhttpsocketengine CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
-
-extend_target(tst_qhttpsocketengine CONDITION QT_FEATURE_reduce_exports AND UNIX
-    SOURCES
-        ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h
-        ${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/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
index fd58b931e6..7c4a56031b 100644
--- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
@@ -32,10 +32,3 @@ extend_target(tst_qsocks5socketengine CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
-
-extend_target(tst_qsocks5socketengine CONDITION QT_FEATURE_reduce_exports AND UNIX
-    SOURCES
-        ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h
-        ${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/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
index 7dea6c37e6..340a2f14ec 100644
--- a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
@@ -33,7 +33,6 @@ extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND
 
 extend_target(tst_qaccessibility CONDITION WIN32
     PUBLIC_LIBRARIES
-        Qt::WindowsUIAutomationSupportPrivate
         ole32
         oleacc
         oleaut32
diff --git a/tests/auto/other/qaccessibility/CMakeLists.txt b/tests/auto/other/qaccessibility/CMakeLists.txt
index 8a27fc25cc..18785e4e86 100644
--- a/tests/auto/other/qaccessibility/CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/CMakeLists.txt
@@ -39,7 +39,6 @@ extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND
 
 extend_target(tst_qaccessibility CONDITION WIN32
     PUBLIC_LIBRARIES
-        Qt::WindowsUIAutomationSupportPrivate
         ole32
         oleacc
         oleaut32
diff --git a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
index 7111e9cf57..343df83dc0 100644
--- a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
+++ b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
@@ -10,7 +10,6 @@ add_qt_test(tst_qaccessibilitylinux
     DBUS_INTERFACE_SOURCES
         ../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml
     PUBLIC_LIBRARIES
-        Qt::AccessibilitySupportPrivate
         Qt::DBus
         Qt::Gui
         Qt::GuiPrivate