CMake: Regenerate projects to use new qt_internal_ API

Modify special case locations to use the new API as well.
Clean up some stale .prev files that are not needed anymore.
Clean up some project files that are not used anymore.

Task-number: QTBUG-86815
Change-Id: I9947da921f98686023c6bb053dfcc101851276b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

45 files changed, 48 insertions, 48 deletions

diff --git a/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt b/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt
index 37c3a21d78..0b0d8e062a 100644
--- a/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_collections Test:
 #####################################################################
 
-qt_add_test(tst_collections
+qt_internal_add_test(tst_collections
     SOURCES
         tst_collections.cpp
     DEFINES
diff --git a/tests/auto/corelib/tools/collections/CMakeLists.txt b/tests/auto/corelib/tools/collections/CMakeLists.txt
index 4575d27d20..32ef8d7506 100644
--- a/tests/auto/corelib/tools/collections/CMakeLists.txt
+++ b/tests/auto/corelib/tools/collections/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_collections Test:
 #####################################################################
 
-qt_add_test(tst_collections
+qt_internal_add_test(tst_collections
     SOURCES
         tst_collections.cpp
     DEFINES
diff --git a/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt b/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt
index 8d160af9af..f640996a53 100644
--- a/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt
+++ b/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_containerapisymmetry Test:
 #####################################################################
 
-qt_add_test(tst_containerapisymmetry
+qt_internal_add_test(tst_containerapisymmetry
     SOURCES
         tst_containerapisymmetry.cpp
 )
diff --git a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt
index 2ddc47b5c0..d793c81ce6 100644
--- a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qalgorithms Test:
 #####################################################################
 
-qt_add_test(tst_qalgorithms
+qt_internal_add_test(tst_qalgorithms
     SOURCES
         tst_qalgorithms.cpp
 )
diff --git a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt
index fac007f3b5..4a2f9d0d6a 100644
--- a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qarraydata Test:
 #####################################################################
 
-qt_add_test(tst_qarraydata
+qt_internal_add_test(tst_qarraydata
     EXCEPTIONS
     SOURCES
         simplevector.h
diff --git a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt
index 439aa4af6c..37e7a873e8 100644
--- a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbitarray Test:
 #####################################################################
 
-qt_add_test(tst_qbitarray
+qt_internal_add_test(tst_qbitarray
     SOURCES
         tst_qbitarray.cpp
 )
diff --git a/tests/auto/corelib/tools/qcache/CMakeLists.txt b/tests/auto/corelib/tools/qcache/CMakeLists.txt
index 509056c06b..5ed12a7973 100644
--- a/tests/auto/corelib/tools/qcache/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcache Test:
 #####################################################################
 
-qt_add_test(tst_qcache
+qt_internal_add_test(tst_qcache
     SOURCES
         tst_qcache.cpp
 )
diff --git a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt
index 75e9ebfc94..128b8cfd73 100644
--- a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcommandlineparser Test:
 #####################################################################
 
-qt_add_test(tst_qcommandlineparser
+qt_internal_add_test(tst_qcommandlineparser
     SOURCES
         tst_qcommandlineparser.cpp
 )
diff --git a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt
index 688c685ade..2068f988dd 100644
--- a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcommandlineparser_test_helper Binary:
 #####################################################################
 
-qt_add_executable(qcommandlineparser_test_helper
+qt_internal_add_executable(qcommandlineparser_test_helper
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         qcommandlineparser_test_helper.cpp
diff --git a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt
index 7754954457..dc9722ccc7 100644
--- a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcontiguouscache Test:
 #####################################################################
 
-qt_add_test(tst_qcontiguouscache
+qt_internal_add_test(tst_qcontiguouscache
     SOURCES
         tst_qcontiguouscache.cpp
 )
diff --git a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
index 4984606509..a4b3106856 100644
--- a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qcryptographichash
+qt_internal_add_test(tst_qcryptographichash
     SOURCES
         tst_qcryptographichash.cpp
     TESTDATA ${test_data}
@@ -26,7 +26,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "data/d41d8cd98f00b204e9800998ecf8427e.md5"
     )
 
-    qt_add_resource(tst_qcryptographichash "testdata"
+    qt_internal_add_resource(tst_qcryptographichash "testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt
index f93bfe6b94..ce12cd9bfc 100644
--- a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qeasingcurve Test:
 #####################################################################
 
-qt_add_test(tst_qeasingcurve
+qt_internal_add_test(tst_qeasingcurve
     SOURCES
         tst_qeasingcurve.cpp
 )
diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt
index 9943f5200b..92850a8c4e 100644
--- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qexplicitlyshareddatapointer Test:
 #####################################################################
 
-qt_add_test(tst_qexplicitlyshareddatapointer
+qt_internal_add_test(tst_qexplicitlyshareddatapointer
     SOURCES
         tst_qexplicitlyshareddatapointer.cpp
 )
diff --git a/tests/auto/corelib/tools/qflatmap/CMakeLists.txt b/tests/auto/corelib/tools/qflatmap/CMakeLists.txt
index f5a5dfd5fc..5d79b16776 100644
--- a/tests/auto/corelib/tools/qflatmap/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qflatmap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qflatmap Test:
 #####################################################################
 
-qt_add_test(tst_qflatmap
+qt_internal_add_test(tst_qflatmap
     SOURCES
         tst_qflatmap.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/tools/qfreelist/CMakeLists.txt b/tests/auto/corelib/tools/qfreelist/CMakeLists.txt
index 3940470240..cdac17e612 100644
--- a/tests/auto/corelib/tools/qfreelist/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qfreelist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfreelist Test:
 #####################################################################
 
-qt_add_test(tst_qfreelist
+qt_internal_add_test(tst_qfreelist
     SOURCES
         tst_qfreelist.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qfreelist
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qfreelist CONDITION NOT QT_FEATURE_private_tests
+qt_internal_extend_target(tst_qfreelist CONDITION NOT QT_FEATURE_private_tests
     SOURCES
         ${QT_SOURCE_TREE}/src/corelib/tools/qfreelist.cpp
 )
diff --git a/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt
index cb0327c90f..0d41a6875e 100644
--- a/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qhash Test:
 #####################################################################
 
-qt_add_test(tst_qhash
+qt_internal_add_test(tst_qhash
     SOURCES
         tst_qhash.cpp
     DEFINES
diff --git a/tests/auto/corelib/tools/qhash/CMakeLists.txt b/tests/auto/corelib/tools/qhash/CMakeLists.txt
index 39b8e25e30..b01782aed5 100644
--- a/tests/auto/corelib/tools/qhash/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qhash/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qhash Test:
 #####################################################################
 
-qt_add_test(tst_qhash
+qt_internal_add_test(tst_qhash
     SOURCES
         tst_qhash.cpp
     DEFINES
diff --git a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt
index a91a7c02ef..86d4207d6e 100644
--- a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qhashfunctions Test:
 #####################################################################
 
-qt_add_test(tst_qhashfunctions
+qt_internal_add_test(tst_qhashfunctions
     SOURCES
         tst_qhashfunctions.cpp
 )
diff --git a/tests/auto/corelib/tools/qline/CMakeLists.txt b/tests/auto/corelib/tools/qline/CMakeLists.txt
index 24de03c81a..49253ff06c 100644
--- a/tests/auto/corelib/tools/qline/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qline/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qline Test:
 #####################################################################
 
-qt_add_test(tst_qline
+qt_internal_add_test(tst_qline
     SOURCES
         tst_qline.cpp
 )
@@ -12,7 +12,7 @@ qt_add_test(tst_qline
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qline CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS
+qt_internal_extend_target(tst_qline CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS
     PUBLIC_LIBRARIES
         m
 )
diff --git a/tests/auto/corelib/tools/qlist/CMakeLists.txt b/tests/auto/corelib/tools/qlist/CMakeLists.txt
index 6909d83967..89b92ab305 100644
--- a/tests/auto/corelib/tools/qlist/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qlist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlist Test:
 #####################################################################
 
-qt_add_test(tst_qlist
+qt_internal_add_test(tst_qlist
     SOURCES
         tst_qlist.cpp
 )
diff --git a/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt b/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
index e41a779029..e2f1ed45ea 100644
--- a/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmacautoreleasepool Test:
 #####################################################################
 
-qt_add_test(tst_qmacautoreleasepool
+qt_internal_add_test(tst_qmacautoreleasepool
     SOURCES
         tst_qmacautoreleasepool.mm
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt
index 1c38a99d99..fc5be609e1 100644
--- a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmakearray Test:
 #####################################################################
 
-qt_add_test(tst_qmakearray
+qt_internal_add_test(tst_qmakearray
     SOURCES
         tst_qmakearray.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt
index 4d1425251b..d96ed13596 100644
--- a/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmap Test:
 #####################################################################
 
-qt_add_test(tst_qmap
+qt_internal_add_test(tst_qmap
     SOURCES
         tst_qmap.cpp
     DEFINES
diff --git a/tests/auto/corelib/tools/qmap/CMakeLists.txt b/tests/auto/corelib/tools/qmap/CMakeLists.txt
index 5de85b2fc2..c0a2cb79ab 100644
--- a/tests/auto/corelib/tools/qmap/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmap Test:
 #####################################################################
 
-qt_add_test(tst_qmap
+qt_internal_add_test(tst_qmap
     SOURCES
         tst_qmap.cpp
     DEFINES
diff --git a/tests/auto/corelib/tools/qmargins/CMakeLists.txt b/tests/auto/corelib/tools/qmargins/CMakeLists.txt
index fa1530b32c..aa58ce03ab 100644
--- a/tests/auto/corelib/tools/qmargins/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmargins/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmargins Test:
 #####################################################################
 
-qt_add_test(tst_qmargins
+qt_internal_add_test(tst_qmargins
     SOURCES
         tst_qmargins.cpp
 )
diff --git a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt
index 75a6febf81..dcc86fe555 100644
--- a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmessageauthenticationcode Test:
 #####################################################################
 
-qt_add_test(tst_qmessageauthenticationcode
+qt_internal_add_test(tst_qmessageauthenticationcode
     SOURCES
         tst_qmessageauthenticationcode.cpp
 )
diff --git a/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt b/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt
index 1a10b0dc47..7584d580ec 100644
--- a/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qoffsetstringarray Test:
 #####################################################################
 
-qt_add_test(tst_qoffsetstringarray
+qt_internal_add_test(tst_qoffsetstringarray
     SOURCES
         tst_qoffsetstringarray.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/tools/qpair/CMakeLists.txt b/tests/auto/corelib/tools/qpair/CMakeLists.txt
index b02f4feb0b..3d0ba82e44 100644
--- a/tests/auto/corelib/tools/qpair/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qpair/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpair Test:
 #####################################################################
 
-qt_add_test(tst_qpair
+qt_internal_add_test(tst_qpair
     SOURCES
         tst_qpair.cpp
 )
diff --git a/tests/auto/corelib/tools/qpoint/CMakeLists.txt b/tests/auto/corelib/tools/qpoint/CMakeLists.txt
index 1667c0239c..ddc0733231 100644
--- a/tests/auto/corelib/tools/qpoint/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qpoint/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpoint Test:
 #####################################################################
 
-qt_add_test(tst_qpoint
+qt_internal_add_test(tst_qpoint
     SOURCES
         tst_qpoint.cpp
 )
diff --git a/tests/auto/corelib/tools/qpointf/CMakeLists.txt b/tests/auto/corelib/tools/qpointf/CMakeLists.txt
index e7d1f1b0ff..09f725f8e6 100644
--- a/tests/auto/corelib/tools/qpointf/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qpointf/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpointf Test:
 #####################################################################
 
-qt_add_test(tst_qpointf
+qt_internal_add_test(tst_qpointf
     SOURCES
         tst_qpointf.cpp
 )
diff --git a/tests/auto/corelib/tools/qqueue/CMakeLists.txt b/tests/auto/corelib/tools/qqueue/CMakeLists.txt
index fc0517b69f..c3528163eb 100644
--- a/tests/auto/corelib/tools/qqueue/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qqueue/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqueue Test:
 #####################################################################
 
-qt_add_test(tst_qqueue
+qt_internal_add_test(tst_qqueue
     SOURCES
         tst_qqueue.cpp
 )
diff --git a/tests/auto/corelib/tools/qrect/CMakeLists.txt b/tests/auto/corelib/tools/qrect/CMakeLists.txt
index 5acc4522b6..d48bec0c7d 100644
--- a/tests/auto/corelib/tools/qrect/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qrect/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrect Test:
 #####################################################################
 
-qt_add_test(tst_qrect
+qt_internal_add_test(tst_qrect
     SOURCES
         tst_qrect.cpp
 )
diff --git a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt
index 029d032d5c..d5d633c0bd 100644
--- a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qringbuffer Test:
 #####################################################################
 
-qt_add_test(tst_qringbuffer
+qt_internal_add_test(tst_qringbuffer
     SOURCES
         tst_qringbuffer.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt
index 8bc4b7e43b..df2d2aa509 100644
--- a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qscopedpointer Test:
 #####################################################################
 
-qt_add_test(tst_qscopedpointer
+qt_internal_add_test(tst_qscopedpointer
     SOURCES
         tst_qscopedpointer.cpp
 )
diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt
index 653f0bc071..fa3e3e3024 100644
--- a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qscopedvaluerollback Test:
 #####################################################################
 
-qt_add_test(tst_qscopedvaluerollback
+qt_internal_add_test(tst_qscopedvaluerollback
     SOURCES
         tst_qscopedvaluerollback.cpp
 )
diff --git a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt
index 79efcd4d86..d21df799ea 100644
--- a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qscopeguard Test:
 #####################################################################
 
-qt_add_test(tst_qscopeguard
+qt_internal_add_test(tst_qscopeguard
     SOURCES
         tst_qscopeguard.cpp
 )
diff --git a/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt
index 8e7312b739..acf423880d 100644
--- a/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qset Test:
 #####################################################################
 
-qt_add_test(tst_qset
+qt_internal_add_test(tst_qset
     SOURCES
         tst_qset.cpp
     DEFINES
diff --git a/tests/auto/corelib/tools/qset/CMakeLists.txt b/tests/auto/corelib/tools/qset/CMakeLists.txt
index 85845f76d2..ed92c1e036 100644
--- a/tests/auto/corelib/tools/qset/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qset/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qset Test:
 #####################################################################
 
-qt_add_test(tst_qset
+qt_internal_add_test(tst_qset
     SOURCES
         tst_qset.cpp
     #DEFINES # special case remove
diff --git a/tests/auto/corelib/tools/qsize/CMakeLists.txt b/tests/auto/corelib/tools/qsize/CMakeLists.txt
index 1d3018f066..5ecd154cd3 100644
--- a/tests/auto/corelib/tools/qsize/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qsize/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsize Test:
 #####################################################################
 
-qt_add_test(tst_qsize
+qt_internal_add_test(tst_qsize
     SOURCES
         tst_qsize.cpp
 )
diff --git a/tests/auto/corelib/tools/qsizef/CMakeLists.txt b/tests/auto/corelib/tools/qsizef/CMakeLists.txt
index cb942e10ec..eb59fc6d8e 100644
--- a/tests/auto/corelib/tools/qsizef/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qsizef/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsizef Test:
 #####################################################################
 
-qt_add_test(tst_qsizef
+qt_internal_add_test(tst_qsizef
     SOURCES
         tst_qsizef.cpp
 )
diff --git a/tests/auto/corelib/tools/qstl/CMakeLists.txt b/tests/auto/corelib/tools/qstl/CMakeLists.txt
index 65af48f1a2..49b209cffa 100644
--- a/tests/auto/corelib/tools/qstl/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qstl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstl Test:
 #####################################################################
 
-qt_add_test(tst_qstl
+qt_internal_add_test(tst_qstl
     SOURCES
         tst_qstl.cpp
 )
diff --git a/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt b/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt
index 1057e5ebe5..7f3ae75028 100644
--- a/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtaggedpointer Test:
 #####################################################################
 
-qt_add_test(tst_qtaggedpointer
+qt_internal_add_test(tst_qtaggedpointer
     SOURCES
         tst_qtaggedpointer.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt
index abf76e4b73..de61529fd2 100644
--- a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtimeline Test:
 #####################################################################
 
-qt_add_test(tst_qtimeline
+qt_internal_add_test(tst_qtimeline
     SOURCES
         tst_qtimeline.cpp
 )
diff --git a/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt b/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt
index 63bb827ec1..bdc927d5b6 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qvarlengtharray Test:
 #####################################################################
 
-qt_add_test(tst_qvarlengtharray
+qt_internal_add_test(tst_qvarlengtharray
     SOURCES
         tst_qvarlengtharray.cpp
 )
diff --git a/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt b/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt
index 893ea91413..2ab3703121 100644
--- a/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qversionnumber Test:
 #####################################################################
 
-qt_add_test(tst_qversionnumber
+qt_internal_add_test(tst_qversionnumber
     SOURCES
         tst_qversionnumber.cpp
 )