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>

121 files changed, 175 insertions, 188 deletions

diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
index b97733003b..704c51a6be 100644
--- a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
+++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     icons/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qicoimageformat
+qt_internal_add_test(tst_qicoimageformat
     SOURCES
         tst_qicoimageformat.cpp
     PUBLIC_LIBRARIES
@@ -40,7 +40,7 @@ if(ANDROID)
         "icons/valid/yellow.cur"
     )
 
-    qt_add_resource(tst_qicoimageformat "qicoimageformat"
+    qt_internal_add_resource(tst_qicoimageformat "qicoimageformat"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/image/qicon/CMakeLists.txt b/tests/auto/gui/image/qicon/CMakeLists.txt
index 48ec1c348c..5f6b139205 100644
--- a/tests/auto/gui/image/qicon/CMakeLists.txt
+++ b/tests/auto/gui/image/qicon/CMakeLists.txt
@@ -30,7 +30,7 @@ file(GLOB_RECURSE test_data_glob
     *.svgz)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qicon
+qt_internal_add_test(tst_qicon
     SOURCES
         tst_qicon.cpp
     PUBLIC_LIBRARIES
@@ -69,7 +69,7 @@ set(tst_qicon_resource_files
     "tst_qicon.cpp"
 )
 
-qt_add_resource(tst_qicon "tst_qicon"
+qt_internal_add_resource(tst_qicon "tst_qicon"
     PREFIX
         "/"
     FILES
@@ -79,7 +79,7 @@ set(qmake_immediate_resource_files
     "tst_qicon.cpp"
 )
 
-qt_add_resource(tst_qicon "qmake_immediate"
+qt_internal_add_resource(tst_qicon "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -90,7 +90,7 @@ qt_add_resource(tst_qicon "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qicon CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qicon CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
index 8113422c1e..989cf1f44d 100644
--- a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
+++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     icons/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qiconhighdpi
+qt_internal_add_test(tst_qiconhighdpi
     SOURCES
         tst_qiconhighdpi.cpp
     PUBLIC_LIBRARIES
@@ -28,7 +28,7 @@ set(tst_qiconhighdpi_resource_files
     "icons/testtheme/index.theme"
 )
 
-qt_add_resource(tst_qiconhighdpi "tst_qiconhighdpi"
+qt_internal_add_resource(tst_qiconhighdpi "tst_qiconhighdpi"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt
index a9e3b783a7..85f3fd1c76 100644
--- a/tests/auto/gui/image/qimage/CMakeLists.txt
+++ b/tests/auto/gui/image/qimage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qimage
+qt_internal_add_test(tst_qimage
     SOURCES
         tst_qimage.cpp
     PUBLIC_LIBRARIES
@@ -46,7 +46,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "images/jpeg_exif_orientation_value_8.jpg"
     )
 
-    qt_add_resource(tst_qimage "qimage"
+    qt_internal_add_resource(tst_qimage "qimage"
         PREFIX
             "/"
         FILES
@@ -54,13 +54,13 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
     )
 endif()
 
-qt_extend_target(tst_qimage CONDITION WIN32
+qt_internal_extend_target(tst_qimage CONDITION WIN32
     PUBLIC_LIBRARIES
         gdi32
         user32
 )
 
-qt_extend_target(tst_qimage CONDITION APPLE
+qt_internal_extend_target(tst_qimage CONDITION APPLE
     PUBLIC_LIBRARIES
         ${FWCoreGraphics}
 )
diff --git a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
index 53bfb384aa..4bbf2f5b01 100644
--- a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
+++ b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qimageiohandler Test:
 #####################################################################
 
-qt_add_test(tst_qimageiohandler
+qt_internal_add_test(tst_qimageiohandler
     SOURCES
         tst_qimageiohandler.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt
index a477252e73..dd15618370 100644
--- a/tests/auto/gui/image/qimagereader/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob
     baseline/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qimagereader
+qt_internal_add_test(tst_qimagereader
     SOURCES
         tst_qimagereader.cpp
     PUBLIC_LIBRARIES
@@ -35,7 +35,7 @@ set(qmake_immediate_resource_files
     ${resource_glob_0}
 )
 
-qt_add_resource(tst_qimagereader "qmake_immediate"
+qt_internal_add_resource(tst_qimagereader "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -56,7 +56,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "images/trans.gif"
     )
 
-    qt_add_resource(tst_qimagereader "android_testdata"
+    qt_internal_add_resource(tst_qimagereader "android_testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
index 9e5c7362a8..f7212eca3e 100644
--- a/tests/auto/gui/image/qimagewriter/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qimagewriter
+qt_internal_add_test(tst_qimagewriter
     SOURCES
         tst_qimagewriter.cpp
     PUBLIC_LIBRARIES
@@ -41,7 +41,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "images/trolltech.gif"
     )
 
-    qt_add_resource(tst_qimagewriter "qimagewriter"
+    qt_internal_add_resource(tst_qimagewriter "qimagewriter"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/image/qmovie/CMakeLists.txt b/tests/auto/gui/image/qmovie/CMakeLists.txt
index 3e9b2ad100..545ee481d1 100644
--- a/tests/auto/gui/image/qmovie/CMakeLists.txt
+++ b/tests/auto/gui/image/qmovie/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     animations/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qmovie
+qt_internal_add_test(tst_qmovie
     SOURCES
         tst_qmovie.cpp
     PUBLIC_LIBRARIES
@@ -25,7 +25,7 @@ set(resources_resource_files
     "animations/trolltech.gif"
 )
 
-qt_add_resource(tst_qmovie "resources"
+qt_internal_add_resource(tst_qmovie "resources"
     PREFIX
         "/"
     FILES
@@ -40,17 +40,17 @@ qt_add_resource(tst_qmovie "resources"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmovie CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qmovie CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-qt_extend_target(tst_qmovie CONDITION QT_FEATURE_gif
+qt_internal_extend_target(tst_qmovie CONDITION QT_FEATURE_gif
     DEFINES
         QTEST_HAVE_GIF
 )
 
-qt_extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg
+qt_internal_extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg
     DEFINES
         QTEST_HAVE_JPEG
 )
diff --git a/tests/auto/gui/image/qpicture/CMakeLists.txt b/tests/auto/gui/image/qpicture/CMakeLists.txt
index f79c72974a..29bf68fa06 100644
--- a/tests/auto/gui/image/qpicture/CMakeLists.txt
+++ b/tests/auto/gui/image/qpicture/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpicture Test:
 #####################################################################
 
-qt_add_test(tst_qpicture
+qt_internal_add_test(tst_qpicture
     SOURCES
         tst_qpicture.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/image/qpixmap/CMakeLists.txt b/tests/auto/gui/image/qpixmap/CMakeLists.txt
index b58609a760..1946715047 100644
--- a/tests/auto/gui/image/qpixmap/CMakeLists.txt
+++ b/tests/auto/gui/image/qpixmap/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qpixmap
+qt_internal_add_test(tst_qpixmap
     SOURCES
         tst_qpixmap.cpp
     PUBLIC_LIBRARIES
@@ -83,7 +83,7 @@ set(qpixmap_resource_files
     "loadFromData/designer_rgb32.png"
 )
 
-qt_add_resource(tst_qpixmap "qpixmap"
+qt_internal_add_resource(tst_qpixmap "qpixmap"
     PREFIX
         "/"
     FILES
@@ -94,13 +94,13 @@ qt_add_resource(tst_qpixmap "qpixmap"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
         Qt::WidgetsPrivate
 )
 
-qt_extend_target(tst_qpixmap CONDITION WIN32
+qt_internal_extend_target(tst_qpixmap CONDITION WIN32
     PUBLIC_LIBRARIES
         gdi32
         user32
diff --git a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
index 33c1faf865..9e99842e6e 100644
--- a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
+++ b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpixmapcache Test:
 #####################################################################
 
-qt_add_test(tst_qpixmapcache
+qt_internal_add_test(tst_qpixmapcache
     SOURCES
         tst_qpixmapcache.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt b/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt
index 595b30bd56..375eb5b245 100644
--- a/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt
+++ b/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfilesystemmodel Test:
 #####################################################################
 
-qt_add_test(tst_qfilesystemmodel
+qt_internal_add_test(tst_qfilesystemmodel
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qfilesystemmodel.cpp
diff --git a/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt b/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
index 65f13a10c8..e5446d596a 100644
--- a/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
+++ b/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstandarditem Test:
 #####################################################################
 
-qt_add_test(tst_qstandarditem
+qt_internal_add_test(tst_qstandarditem
     SOURCES
         tst_qstandarditem.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt b/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt
index 08c97c4eac..49cbcbfa88 100644
--- a/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt
+++ b/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstandarditemmodel Test:
 #####################################################################
 
-qt_add_test(tst_qstandarditemmodel
+qt_internal_add_test(tst_qstandarditemmodel
     SOURCES
         tst_qstandarditemmodel.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
index 262b2ad2f2..9e47156add 100644
--- a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
+++ b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_noqteventloop Test:
 #####################################################################
 
-qt_add_test(tst_noqteventloop
+qt_internal_add_test(tst_noqteventloop
     SOURCES
         tst_noqteventloop.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ qt_add_test(tst_noqteventloop
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32
+qt_internal_extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32
     PUBLIC_LIBRARIES
         user32
 )
diff --git a/tests/auto/gui/kernel/qaction/CMakeLists.txt b/tests/auto/gui/kernel/qaction/CMakeLists.txt
index 70065156ca..ed0a0a8a5b 100644
--- a/tests/auto/gui/kernel/qaction/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qaction/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qaction_kernel Test:
 #####################################################################
 
-qt_add_test(tst_qaction_kernel
+qt_internal_add_test(tst_qaction_kernel
     SOURCES
         tst_qaction.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt b/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
index e313aebec5..10354f865c 100644
--- a/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qactiongroup_kernel Test:
 #####################################################################
 
-qt_add_test(tst_qactiongroup_kernel
+qt_internal_add_test(tst_qactiongroup_kernel
     SOURCES
         tst_qactiongroup.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qaddpostroutine/CMakeLists.txt b/tests/auto/gui/kernel/qaddpostroutine/CMakeLists.txt
index 4af9ebedd5..454196ce1b 100644
--- a/tests/auto/gui/kernel/qaddpostroutine/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qaddpostroutine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qaddpostroutine Test:
 #####################################################################
 
-qt_add_test(tst_qaddpostroutine
+qt_internal_add_test(tst_qaddpostroutine
     SOURCES
         tst_qaddpostroutine.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
index 55d53545bb..64ef31a0b5 100644
--- a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbackingstore Test:
 #####################################################################
 
-qt_add_test(tst_qbackingstore
+qt_internal_add_test(tst_qbackingstore
     SOURCES
         tst_qbackingstore.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt
index 744bd3d654..69e313b1d1 100644
--- a/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## copier Binary:
 #####################################################################
 
-qt_add_executable(copier
+qt_internal_add_executable(copier
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt
index ee3c7b1ab9..ef599b121e 100644
--- a/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt
@@ -8,7 +8,7 @@
 set(args OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 # special case end
 
-qt_add_executable(copier
+qt_internal_add_executable(copier
     ${args} # special case
     SOURCES
         main.cpp
diff --git a/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt
index 0f2fbb1b9b..fa0b9bc4a6 100644
--- a/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## paster Binary:
 #####################################################################
 
-qt_add_executable(paster
+qt_internal_add_executable(paster
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt
index 6ce4070af2..571ae4944e 100644
--- a/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt
@@ -8,7 +8,7 @@
 set(args OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 # special case end
 
-qt_add_executable(paster
+qt_internal_add_executable(paster
     ${args} # special case
     SOURCES
         main.cpp
diff --git a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
index e7c1313c7b..0e9fa8f40d 100644
--- a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
@@ -4,18 +4,19 @@
 ## tst_qclipboard Test:
 #####################################################################
 
-add_qt_test(tst_qclipboard
+qt_internal_add_test(tst_qclipboard
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_qclipboard.cpp
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qclipboard CONDITION MACOS
+qt_internal_extend_target(tst_qclipboard CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
index 1e2c89e538..0e9fa8f40d 100644
--- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qclipboard Test:
 #####################################################################
 
-qt_add_test(tst_qclipboard
+qt_internal_add_test(tst_qclipboard
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_qclipboard.cpp
@@ -16,7 +16,7 @@ qt_add_test(tst_qclipboard
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qclipboard CONDITION MACOS
+qt_internal_extend_target(tst_qclipboard CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/gui/kernel/qcursor/CMakeLists.txt b/tests/auto/gui/kernel/qcursor/CMakeLists.txt
index 2c3cf28c1a..1304dd2ba2 100644
--- a/tests/auto/gui/kernel/qcursor/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qcursor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcursor Test:
 #####################################################################
 
-qt_add_test(tst_qcursor
+qt_internal_add_test(tst_qcursor
     SOURCES
         tst_qcursor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qdrag/CMakeLists.txt b/tests/auto/gui/kernel/qdrag/CMakeLists.txt
index 1b13df54d3..b03f82da39 100644
--- a/tests/auto/gui/kernel/qdrag/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qdrag/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdrag Test:
 #####################################################################
 
-qt_add_test(tst_qdrag
+qt_internal_add_test(tst_qdrag
     SOURCES
         tst_qdrag.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qevent/CMakeLists.txt b/tests/auto/gui/kernel/qevent/CMakeLists.txt
index 21a2ddad66..2bb22eb469 100644
--- a/tests/auto/gui/kernel/qevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qevent Test:
 #####################################################################
 
-qt_add_test(tst_qevent
+qt_internal_add_test(tst_qevent
     SOURCES
         tst_qevent.cpp
 )
diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
index 0b9cd6d481..658a70619f 100644
--- a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qfileopeneventexternal Binary:
 #####################################################################
 
-qt_add_executable(qfileopeneventexternal
+qt_internal_add_executable(qfileopeneventexternal
     GUI
     SOURCES
         qfileopeneventexternal.cpp
diff --git a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
index a306a3eae6..faa5e5acfc 100644
--- a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfileopenevent Test:
 #####################################################################
 
-qt_add_test(tst_qfileopenevent
+qt_internal_add_test(tst_qfileopenevent
     SOURCES
         tst_qfileopenevent.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
index 0da40c5aa3..933957a839 100644
--- a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qguiapplication Test:
 #####################################################################
 
-qt_add_test(tst_qguiapplication
+qt_internal_add_test(tst_qguiapplication
     SOURCES
         tst_qcoreapplication.cpp tst_qcoreapplication.h
         tst_qguiapplication.cpp
@@ -27,7 +27,7 @@ set(tst_qguiapplication_resource_files
     "icons/usericon.png"
 )
 
-qt_add_resource(tst_qguiapplication "tst_qguiapplication"
+qt_internal_add_resource(tst_qguiapplication "tst_qguiapplication"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
index 0347b3cc4a..ffd07cad26 100644
--- a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
@@ -16,7 +16,7 @@ else()
 endif()
 # special case end
 
-qt_add_test(tst_qguiapplication
+qt_internal_add_test(tst_qguiapplication
     VERSION ${target_version} # special case
     SOURCES
         ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.h # special case
@@ -36,7 +36,7 @@ set(tst_qguiapplication_resource_files
     "icons/usericon.png"
 )
 
-qt_add_resource(tst_qguiapplication "tst_qguiapplication"
+qt_internal_add_resource(tst_qguiapplication "tst_qguiapplication"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
index 14babc165c..b1c0508198 100644
--- a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguieventdispatcher Test:
 #####################################################################
 
-qt_add_test(tst_qguieventdispatcher
+qt_internal_add_test(tst_qguieventdispatcher
     SOURCES
         ../../../corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt
index 7fb82219a9..ec9441a1dc 100644
--- a/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt
@@ -4,12 +4,11 @@
 ## tst_qguieventloop Test:
 #####################################################################
 
-add_qt_test(tst_qguieventloop
+qt_internal_add_test(tst_qguieventloop
     SOURCES
         ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
         Qt::Network
 )
@@ -17,12 +16,12 @@ add_qt_test(tst_qguieventloop
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qguieventloop CONDITION WIN32
+qt_internal_extend_target(tst_qguieventloop CONDITION WIN32
     PUBLIC_LIBRARIES
         user32
 )
 
-extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
+qt_internal_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
     DEFINES
         HAVE_GLIB
 )
diff --git a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
index 8d62d716a5..ec9441a1dc 100644
--- a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguieventloop Test:
 #####################################################################
 
-qt_add_test(tst_qguieventloop
+qt_internal_add_test(tst_qguieventloop
     SOURCES
         ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp
     PUBLIC_LIBRARIES
@@ -16,12 +16,12 @@ qt_add_test(tst_qguieventloop
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qguieventloop CONDITION WIN32
+qt_internal_extend_target(tst_qguieventloop CONDITION WIN32
     PUBLIC_LIBRARIES
         user32
 )
 
-qt_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
+qt_internal_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
     DEFINES
         HAVE_GLIB
 )
diff --git a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
index d124b08828..0887f05fc6 100644
--- a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguimetatype Test:
 #####################################################################
 
-qt_add_test(tst_qguimetatype
+qt_internal_add_test(tst_qguimetatype
     SOURCES
         tst_qguimetatype.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
deleted file mode 100644
index 8c2ec60bdf..0000000000
--- a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated from qguitimer.pro.
-
-#####################################################################
-## tst_qguitimer Test:
-#####################################################################
-
-qt_add_test(tst_qguitimer
-    SOURCES
-        ../../../corelib/kernel/qtimer/tst_qtimer.cpp
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-)
diff --git a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
index 8c2ec60bdf..5375155a82 100644
--- a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguitimer Test:
 #####################################################################
 
-qt_add_test(tst_qguitimer
+qt_internal_add_test(tst_qguitimer
     SOURCES
         ../../../corelib/kernel/qtimer/tst_qtimer.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
index 344b81bf6d..2e6f548f11 100644
--- a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## no_application Test:
 #####################################################################
 
-qt_add_test(no_application
+qt_internal_add_test(no_application
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
index 40671c920c..a3292511bd 100644
--- a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguivariant Test:
 #####################################################################
 
-qt_add_test(tst_qguivariant
+qt_internal_add_test(tst_qguivariant
     SOURCES
         tst_qguivariant.cpp
     INCLUDE_DIRECTORIES
@@ -18,7 +18,7 @@ set(qguivariant_resource_files
     "data"
 )
 
-qt_add_resource(tst_qguivariant "qguivariant"
+qt_internal_add_resource(tst_qguivariant "qguivariant"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt b/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt
index 69cff9229f..9db351dbda 100644
--- a/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qhighdpiscaling Test:
 #####################################################################
 
-qt_add_test(tst_qhighdpiscaling
+qt_internal_add_test(tst_qhighdpiscaling
     SOURCES
         tst_qhighdpiscaling.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
index 5c368838ab..aea72357dd 100644
--- a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qinputdevice Test:
 #####################################################################
 
-qt_add_test(tst_qinputdevice
+qt_internal_add_test(tst_qinputdevice
     SOURCES
         tst_qinputdevice.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
index bdd4940392..bbe8652e99 100644
--- a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qinputmethod Test:
 #####################################################################
 
-qt_add_test(tst_qinputmethod
+qt_internal_add_test(tst_qinputmethod
     SOURCES
         tst_qinputmethod.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
index 3c48a6492b..bd9f602e56 100644
--- a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qkeyevent Test:
 #####################################################################
 
-qt_add_test(tst_qkeyevent
+qt_internal_add_test(tst_qkeyevent
     SOURCES
         tst_qkeyevent.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
index f5a0c38fe4..9d0e25d356 100644
--- a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qkeysequence Test:
 #####################################################################
 
-qt_add_test(tst_qkeysequence
+qt_internal_add_test(tst_qkeysequence
     SOURCES
         tst_qkeysequence.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(qkeysequence_resource_files
     "qt_de.qm"
 )
 
-qt_add_resource(tst_qkeysequence "qkeysequence"
+qt_internal_add_resource(tst_qkeysequence "qkeysequence"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
index c7cc51a465..baf9b83b55 100644
--- a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmouseevent Test:
 #####################################################################
 
-qt_add_test(tst_qmouseevent
+qt_internal_add_test(tst_qmouseevent
     SOURCES
         tst_qmouseevent.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
index afe9fe33ed..698327736e 100644
--- a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmouseevent_modal Test:
 #####################################################################
 
-qt_add_test(tst_qmouseevent_modal
+qt_internal_add_test(tst_qmouseevent_modal
     SOURCES
         tst_qmouseevent_modal.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
index 1a460a567f..d171716776 100644
--- a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qopenglwindow Test:
 #####################################################################
 
-qt_add_test(tst_qopenglwindow
+qt_internal_add_test(tst_qopenglwindow
     SOURCES
         tst_qopenglwindow.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qpalette/CMakeLists.txt b/tests/auto/gui/kernel/qpalette/CMakeLists.txt
index acb413007e..f69ac75a41 100644
--- a/tests/auto/gui/kernel/qpalette/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qpalette/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpalette Test:
 #####################################################################
 
-qt_add_test(tst_qpalette
+qt_internal_add_test(tst_qpalette
     SOURCES
         tst_qpalette.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
index 907564dc3d..e33600dd8c 100644
--- a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpixelformat Test:
 #####################################################################
 
-qt_add_test(tst_qpixelformat
+qt_internal_add_test(tst_qpixelformat
     SOURCES
         tst_qpixelformat.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
index 6b34b71dac..82391cf18f 100644
--- a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrasterwindow Test:
 #####################################################################
 
-qt_add_test(tst_qrasterwindow
+qt_internal_add_test(tst_qrasterwindow
     SOURCES
         tst_qrasterwindow.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qscreen/CMakeLists.txt b/tests/auto/gui/kernel/qscreen/CMakeLists.txt
index b073070155..9bed97cfcb 100644
--- a/tests/auto/gui/kernel/qscreen/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qscreen Test:
 #####################################################################
 
-qt_add_test(tst_qscreen
+qt_internal_add_test(tst_qscreen
     SOURCES
         tst_qscreen.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qshortcut/CMakeLists.txt b/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
index 8c3c2556fe..469ab47769 100644
--- a/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshortcut_kernel Test:
 #####################################################################
 
-qt_add_test(tst_qshortcut_kernel
+qt_internal_add_test(tst_qshortcut_kernel
     SOURCES
         tst_qshortcut.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
index 1d319aaddd..f1fab57ebe 100644
--- a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsurfaceformat Test:
 #####################################################################
 
-qt_add_test(tst_qsurfaceformat
+qt_internal_add_test(tst_qsurfaceformat
     SOURCES
         tst_qsurfaceformat.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
index a2976c351f..e9a6271f58 100644
--- a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtouchevent Test:
 #####################################################################
 
-qt_add_test(tst_qtouchevent
+qt_internal_add_test(tst_qtouchevent
     SOURCES
         tst_qtouchevent.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qwindow/CMakeLists.txt b/tests/auto/gui/kernel/qwindow/CMakeLists.txt
index 84b46b76f5..23671cc385 100644
--- a/tests/auto/gui/kernel/qwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwindow Test:
 #####################################################################
 
-qt_add_test(tst_qwindow
+qt_internal_add_test(tst_qwindow
     SOURCES
         tst_qwindow.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ qt_add_test(tst_qwindow
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32
+qt_internal_extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32
     PUBLIC_LIBRARIES
         user32
 )
diff --git a/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt b/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
index fb2c3ef813..5c54bd6b95 100644
--- a/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
+++ b/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmatrixnxn Test:
 #####################################################################
 
-qt_add_test(tst_qmatrixnxn
+qt_internal_add_test(tst_qmatrixnxn
     SOURCES
         tst_qmatrixnxn.cpp
     DEFINES
diff --git a/tests/auto/gui/math3d/qquaternion/CMakeLists.txt b/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
index dec4a3d352..fbeb76abdd 100644
--- a/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
+++ b/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qquaternion Test:
 #####################################################################
 
-qt_add_test(tst_qquaternion
+qt_internal_add_test(tst_qquaternion
     SOURCES
         tst_qquaternion.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/math3d/qvectornd/CMakeLists.txt b/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
index 7dd6fe0dcb..c29550463a 100644
--- a/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
+++ b/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qvectornd Test:
 #####################################################################
 
-qt_add_test(tst_qvectornd
+qt_internal_add_test(tst_qvectornd
     SOURCES
         tst_qvectornd.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qbrush/CMakeLists.txt b/tests/auto/gui/painting/qbrush/CMakeLists.txt
index 64659bb07e..c8dad25d94 100644
--- a/tests/auto/gui/painting/qbrush/CMakeLists.txt
+++ b/tests/auto/gui/painting/qbrush/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbrush Test:
 #####################################################################
 
-qt_add_test(tst_qbrush
+qt_internal_add_test(tst_qbrush
     SOURCES
         tst_qbrush.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qcolor/CMakeLists.txt b/tests/auto/gui/painting/qcolor/CMakeLists.txt
index 0baa27ac11..87753803fb 100644
--- a/tests/auto/gui/painting/qcolor/CMakeLists.txt
+++ b/tests/auto/gui/painting/qcolor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcolor Test:
 #####################################################################
 
-qt_add_test(tst_qcolor
+qt_internal_add_test(tst_qcolor
     SOURCES
         tst_qcolor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qcolorspace/CMakeLists.txt b/tests/auto/gui/painting/qcolorspace/CMakeLists.txt
index ad719f3bca..9e3460d363 100644
--- a/tests/auto/gui/painting/qcolorspace/CMakeLists.txt
+++ b/tests/auto/gui/painting/qcolorspace/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     resources/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qcolorspace
+qt_internal_add_test(tst_qcolorspace
     SOURCES
         tst_qcolorspace.cpp
     PUBLIC_LIBRARIES
@@ -30,7 +30,7 @@ set(qmake_immediate_resource_files
     ${resource_glob_0}
 )
 
-qt_add_resource(tst_qcolorspace "qmake_immediate"
+qt_internal_add_resource(tst_qcolorspace "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/painting/qpagelayout/CMakeLists.txt b/tests/auto/gui/painting/qpagelayout/CMakeLists.txt
index 15ffd4a000..913619461e 100644
--- a/tests/auto/gui/painting/qpagelayout/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpagelayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpagelayout Test:
 #####################################################################
 
-qt_add_test(tst_qpagelayout
+qt_internal_add_test(tst_qpagelayout
     SOURCES
         tst_qpagelayout.cpp
     DEFINES
diff --git a/tests/auto/gui/painting/qpagesize/CMakeLists.txt b/tests/auto/gui/painting/qpagesize/CMakeLists.txt
index 706fa3e402..fc6fd931c2 100644
--- a/tests/auto/gui/painting/qpagesize/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpagesize/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpagesize Test:
 #####################################################################
 
-qt_add_test(tst_qpagesize
+qt_internal_add_test(tst_qpagesize
     SOURCES
         tst_qpagesize.cpp
     DEFINES
diff --git a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
index 602bfe7316..b843135645 100644
--- a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpaintengine Test:
 #####################################################################
 
-qt_add_test(tst_qpaintengine
+qt_internal_add_test(tst_qpaintengine
     SOURCES
         tst_qpaintengine.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpainter/CMakeLists.txt b/tests/auto/gui/painting/qpainter/CMakeLists.txt
index 6b46db4385..bfb992c7b5 100644
--- a/tests/auto/gui/painting/qpainter/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpainter/CMakeLists.txt
@@ -23,7 +23,7 @@ file(GLOB_RECURSE test_data_glob
 list(APPEND test_data ${test_data_glob})
 list(APPEND test_data "task217400.png")
 
-qt_add_test(tst_qpainter
+qt_internal_add_test(tst_qpainter
     SOURCES
         tst_qpainter.cpp
     PUBLIC_LIBRARIES
@@ -36,7 +36,7 @@ qt_add_test(tst_qpainter
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpainter CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qpainter CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
         Qt::WidgetsPrivate
@@ -229,7 +229,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "task217400.png"
     )
 
-    qt_add_resource(tst_qpainter "testdata"
+    qt_internal_add_resource(tst_qpainter "testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
index edc1ab14bf..47450c9146 100644
--- a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpainterpath Test:
 #####################################################################
 
-qt_add_test(tst_qpainterpath
+qt_internal_add_test(tst_qpainterpath
     SOURCES
         tst_qpainterpath.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
index 1344682991..f4c301c42e 100644
--- a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpainterpathstroker Test:
 #####################################################################
 
-qt_add_test(tst_qpainterpathstroker
+qt_internal_add_test(tst_qpainterpathstroker
     SOURCES
         tst_qpainterpathstroker.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpathclipper/CMakeLists.txt b/tests/auto/gui/painting/qpathclipper/CMakeLists.txt
index 0cfaee06ec..191b1b8a93 100644
--- a/tests/auto/gui/painting/qpathclipper/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpathclipper/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qpathclipper Test:
 #####################################################################
 
-qt_add_test(tst_qpathclipper
+qt_internal_add_test(tst_qpathclipper
     SOURCES
         paths.cpp paths.h
         tst_qpathclipper.cpp
@@ -25,7 +25,7 @@ qt_add_test(tst_qpathclipper
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpathclipper CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY
+qt_internal_extend_target(tst_qpathclipper CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY
     PUBLIC_LIBRARIES
         m
 )
diff --git a/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt b/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt
index 1f2cf3db27..c6eb5b1034 100644
--- a/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpdfwriter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpdfwriter Test:
 #####################################################################
 
-qt_add_test(tst_qpdfwriter
+qt_internal_add_test(tst_qpdfwriter
     SOURCES
         tst_qpdfwriter.cpp
     DEFINES
diff --git a/tests/auto/gui/painting/qpen/CMakeLists.txt b/tests/auto/gui/painting/qpen/CMakeLists.txt
index 076d15b1d1..321c40fa8f 100644
--- a/tests/auto/gui/painting/qpen/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpen Test:
 #####################################################################
 
-qt_add_test(tst_qpen
+qt_internal_add_test(tst_qpen
     SOURCES
         tst_qpen.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpolygon/CMakeLists.txt b/tests/auto/gui/painting/qpolygon/CMakeLists.txt
index 83477e0689..a61529d397 100644
--- a/tests/auto/gui/painting/qpolygon/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpolygon/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpolygon Test:
 #####################################################################
 
-qt_add_test(tst_qpolygon
+qt_internal_add_test(tst_qpolygon
     SOURCES
         tst_qpolygon.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qpolygon
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpolygon CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY
+qt_internal_extend_target(tst_qpolygon CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY
     PUBLIC_LIBRARIES
         m
 )
diff --git a/tests/auto/gui/painting/qrangecollection/CMakeLists.txt b/tests/auto/gui/painting/qrangecollection/CMakeLists.txt
index ce25304c4a..d4aa7986a7 100644
--- a/tests/auto/gui/painting/qrangecollection/CMakeLists.txt
+++ b/tests/auto/gui/painting/qrangecollection/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrangecollection Test:
 #####################################################################
 
-qt_add_test(tst_qrangecollection
+qt_internal_add_test(tst_qrangecollection
     SOURCES
         tst_qrangecollection.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qregion/CMakeLists.txt b/tests/auto/gui/painting/qregion/CMakeLists.txt
index 8779fecd5e..9564e0719e 100644
--- a/tests/auto/gui/painting/qregion/CMakeLists.txt
+++ b/tests/auto/gui/painting/qregion/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qregion Test:
 #####################################################################
 
-qt_add_test(tst_qregion
+qt_internal_add_test(tst_qregion
     SOURCES
         tst_qregion.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qtransform/CMakeLists.txt b/tests/auto/gui/painting/qtransform/CMakeLists.txt
index 07056be3ee..4d50e2cf33 100644
--- a/tests/auto/gui/painting/qtransform/CMakeLists.txt
+++ b/tests/auto/gui/painting/qtransform/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtransform Test:
 #####################################################################
 
-qt_add_test(tst_qtransform
+qt_internal_add_test(tst_qtransform
     SOURCES
         tst_qtransform.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qtransform
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtransform CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY
+qt_internal_extend_target(tst_qtransform CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY
     PUBLIC_LIBRARIES
         m
 )
diff --git a/tests/auto/gui/qopengl/CMakeLists.txt b/tests/auto/gui/qopengl/CMakeLists.txt
index a32730fd70..3be29695a5 100644
--- a/tests/auto/gui/qopengl/CMakeLists.txt
+++ b/tests/auto/gui/qopengl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qopengl Test:
 #####################################################################
 
-qt_add_test(tst_qopengl
+qt_internal_add_test(tst_qopengl
     SOURCES
         tst_qopengl.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ qt_add_test(tst_qopengl
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qopengl CONDITION LINUX AND QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin
+qt_internal_extend_target(tst_qopengl CONDITION LINUX AND QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin
     DEFINES
         USE_GLX
 )
diff --git a/tests/auto/gui/qopenglconfig/CMakeLists.txt b/tests/auto/gui/qopenglconfig/CMakeLists.txt
index 60fcdb67df..d193e15c2e 100644
--- a/tests/auto/gui/qopenglconfig/CMakeLists.txt
+++ b/tests/auto/gui/qopenglconfig/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "buglist.json")
 
-qt_add_test(tst_qopenglconfig
+qt_internal_add_test(tst_qopenglconfig
     SOURCES
         tst_qopenglconfig.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/qvulkan/CMakeLists.txt b/tests/auto/gui/qvulkan/CMakeLists.txt
index e3a6643f3d..7cca165ed2 100644
--- a/tests/auto/gui/qvulkan/CMakeLists.txt
+++ b/tests/auto/gui/qvulkan/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qvulkan Test:
 #####################################################################
 
-qt_add_test(tst_qvulkan
+qt_internal_add_test(tst_qvulkan
     SOURCES
         tst_qvulkan.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/rhi/qrhi/CMakeLists.txt b/tests/auto/gui/rhi/qrhi/CMakeLists.txt
index 8ea9bf36af..65d072c6b9 100644
--- a/tests/auto/gui/rhi/qrhi/CMakeLists.txt
+++ b/tests/auto/gui/rhi/qrhi/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrhi Test:
 #####################################################################
 
-qt_add_test(tst_qrhi
+qt_internal_add_test(tst_qrhi
     SOURCES
         tst_qrhi.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ set(qrhi_resource_files
     "data"
 )
 
-qt_add_resource(tst_qrhi "qrhi"
+qt_internal_add_resource(tst_qrhi "qrhi"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/rhi/qshader/CMakeLists.txt b/tests/auto/gui/rhi/qshader/CMakeLists.txt
index ae35f7e84e..9a0e246aa4 100644
--- a/tests/auto/gui/rhi/qshader/CMakeLists.txt
+++ b/tests/auto/gui/rhi/qshader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshader Test:
 #####################################################################
 
-qt_add_test(tst_qshader
+qt_internal_add_test(tst_qshader
     SOURCES
         tst_qshader.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ set(qshader_resource_files
     "data"
 )
 
-qt_add_resource(tst_qshader "qshader"
+qt_internal_add_resource(tst_qshader "qshader"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
index 28df19d195..f78e1d81c7 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstracttextdocumentlayout Test:
 #####################################################################
 
-qt_add_test(tst_qabstracttextdocumentlayout
+qt_internal_add_test(tst_qabstracttextdocumentlayout
     SOURCES
         tst_qabstracttextdocumentlayout.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qcssparser/CMakeLists.txt b/tests/auto/gui/text/qcssparser/CMakeLists.txt
index dc86787c45..adb3e6269c 100644
--- a/tests/auto/gui/text/qcssparser/CMakeLists.txt
+++ b/tests/auto/gui/text/qcssparser/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 # Collect test data
 list(APPEND test_data "testdata")
 
-qt_add_test(tst_qcssparser
+qt_internal_add_test(tst_qcssparser
     SOURCES
         tst_qcssparser.cpp
     DEFINES
@@ -48,7 +48,7 @@ if(ANDROID)
         "testdata/scanner/unicode/output"
     )
 
-    qt_add_resource(tst_qcssparser "testdata"
+    qt_internal_add_resource(tst_qcssparser "testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/text/qfont/CMakeLists.txt b/tests/auto/gui/text/qfont/CMakeLists.txt
index b7e30318fb..eb1f9747b2 100644
--- a/tests/auto/gui/text/qfont/CMakeLists.txt
+++ b/tests/auto/gui/text/qfont/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfont Test:
 #####################################################################
 
-qt_add_test(tst_qfont
+qt_internal_add_test(tst_qfont
     SOURCES
         tst_qfont.cpp
     PUBLIC_LIBRARIES
@@ -18,7 +18,7 @@ set(testfont_resource_files
     "weirdfont.otf"
 )
 
-qt_add_resource(tst_qfont "testfont"
+qt_internal_add_resource(tst_qfont "testfont"
     PREFIX
         "/"
     FILES
@@ -29,7 +29,7 @@ qt_add_resource(tst_qfont "testfont"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qfont CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qfont CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qfontcache/CMakeLists.txt b/tests/auto/gui/text/qfontcache/CMakeLists.txt
index 374854b410..fb93c91e0c 100644
--- a/tests/auto/gui/text/qfontcache/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontcache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfontcache Test:
 #####################################################################
 
-qt_add_test(tst_qfontcache
+qt_internal_add_test(tst_qfontcache
     SOURCES
         tst_qfontcache.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
index f6ff9e8e7d..73ab56d49f 100644
--- a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "LED_REAL.TTF")
 
-qt_add_test(tst_qfontdatabase
+qt_internal_add_test(tst_qfontdatabase
     SOURCES
         tst_qfontdatabase.cpp
     PUBLIC_LIBRARIES
@@ -38,7 +38,7 @@ set(testdata_resource_files
     "LED_REAL.TTF"
 )
 
-qt_add_resource(tst_qfontdatabase "testdata"
+qt_internal_add_resource(tst_qfontdatabase "testdata"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
index b0b8eb3f42..d7a22671d6 100644
--- a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfontmetrics Test:
 #####################################################################
 
-qt_add_test(tst_qfontmetrics
+qt_internal_add_test(tst_qfontmetrics
     SOURCES
         tst_qfontmetrics.cpp
     PUBLIC_LIBRARIES
@@ -22,7 +22,7 @@ set(testfont_resource_files
     "ucs4font.ttf"
 )
 
-qt_add_resource(tst_qfontmetrics "testfont"
+qt_internal_add_resource(tst_qfontmetrics "testfont"
     PREFIX
         "/fonts"
     FILES
diff --git a/tests/auto/gui/text/qglyphrun/CMakeLists.txt b/tests/auto/gui/text/qglyphrun/CMakeLists.txt
index 7ea92f2924..b0585af16f 100644
--- a/tests/auto/gui/text/qglyphrun/CMakeLists.txt
+++ b/tests/auto/gui/text/qglyphrun/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qglyphrun Test:
 #####################################################################
 
-qt_add_test(tst_qglyphrun
+qt_internal_add_test(tst_qglyphrun
     SOURCES
         tst_qglyphrun.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(testdata_resource_files
     "../../../shared/resources/test.ttf"
 )
 
-qt_add_resource(tst_qglyphrun "testdata"
+qt_internal_add_resource(tst_qglyphrun "testdata"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
index f5cdd63ec0..048a96ef77 100644
--- a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
+++ b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qinputcontrol Test:
 #####################################################################
 
-qt_add_test(tst_qinputcontrol
+qt_internal_add_test(tst_qinputcontrol
     SOURCES
         tst_qinputcontrol.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qrawfont/CMakeLists.txt b/tests/auto/gui/text/qrawfont/CMakeLists.txt
index f51d4ec13d..04db8d8760 100644
--- a/tests/auto/gui/text/qrawfont/CMakeLists.txt
+++ b/tests/auto/gui/text/qrawfont/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrawfont Test:
 #####################################################################
 
-qt_add_test(tst_qrawfont
+qt_internal_add_test(tst_qrawfont
     SOURCES
         tst_qrawfont.cpp
     PUBLIC_LIBRARIES
@@ -23,7 +23,7 @@ set(testdata_resource_files
     "testfont_os2_v1.ttf"
 )
 
-qt_add_resource(tst_qrawfont "testdata"
+qt_internal_add_resource(tst_qrawfont "testdata"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qstatictext/CMakeLists.txt b/tests/auto/gui/text/qstatictext/CMakeLists.txt
index 1c182b3659..a7ba4e392a 100644
--- a/tests/auto/gui/text/qstatictext/CMakeLists.txt
+++ b/tests/auto/gui/text/qstatictext/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstatictext Test:
 #####################################################################
 
-qt_add_test(tst_qstatictext
+qt_internal_add_test(tst_qstatictext
     SOURCES
         tst_qstatictext.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qstatictext
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
+qt_internal_extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
index 4c66cf94a7..9ac732cee0 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
+++ b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsyntaxhighlighter Test:
 #####################################################################
 
-qt_add_test(tst_qsyntaxhighlighter
+qt_internal_add_test(tst_qsyntaxhighlighter
     SOURCES
         tst_qsyntaxhighlighter.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qsyntaxhighlighter
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qtextblock/CMakeLists.txt b/tests/auto/gui/text/qtextblock/CMakeLists.txt
index c186fa8a75..aedd6c27a3 100644
--- a/tests/auto/gui/text/qtextblock/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextblock/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextblock Test:
 #####################################################################
 
-qt_add_test(tst_qtextblock
+qt_internal_add_test(tst_qtextblock
     SOURCES
         tst_qtextblock.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextcursor/CMakeLists.txt b/tests/auto/gui/text/qtextcursor/CMakeLists.txt
index 2a48931662..a82dc928e9 100644
--- a/tests/auto/gui/text/qtextcursor/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextcursor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextcursor Test:
 #####################################################################
 
-qt_add_test(tst_qtextcursor
+qt_internal_add_test(tst_qtextcursor
     SOURCES
         tst_qtextcursor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextdocument/CMakeLists.txt b/tests/auto/gui/text/qtextdocument/CMakeLists.txt
index e99604e32a..bff5cabfb7 100644
--- a/tests/auto/gui/text/qtextdocument/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocument/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextdocument Test:
 #####################################################################
 
-qt_add_test(tst_qtextdocument
+qt_internal_add_test(tst_qtextdocument
     SOURCES
         common.h
         tst_qtextdocument.cpp
diff --git a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
index 03f36c3f6a..6f1207c49a 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextdocumentfragment Test:
 #####################################################################
 
-qt_add_test(tst_qtextdocumentfragment
+qt_internal_add_test(tst_qtextdocumentfragment
     SOURCES
         tst_qtextdocumentfragment.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
index 11dda5929e..da41073962 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextdocumentlayout Test:
 #####################################################################
 
-qt_add_test(tst_qtextdocumentlayout
+qt_internal_add_test(tst_qtextdocumentlayout
     SOURCES
         tst_qtextdocumentlayout.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qtextdocumentlayout
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qtextformat/CMakeLists.txt b/tests/auto/gui/text/qtextformat/CMakeLists.txt
index 31320cd14b..cacd7fbd18 100644
--- a/tests/auto/gui/text/qtextformat/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextformat/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextformat Test:
 #####################################################################
 
-qt_add_test(tst_qtextformat
+qt_internal_add_test(tst_qtextformat
     SOURCES
         tst_qtextformat.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextlayout/CMakeLists.txt b/tests/auto/gui/text/qtextlayout/CMakeLists.txt
index a899375497..3fb5dea8b9 100644
--- a/tests/auto/gui/text/qtextlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextlayout Test:
 #####################################################################
 
-qt_add_test(tst_qtextlayout
+qt_internal_add_test(tst_qtextlayout
     SOURCES
         tst_qtextlayout.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextlist/CMakeLists.txt b/tests/auto/gui/text/qtextlist/CMakeLists.txt
index 9ba6d82660..2f325d5e17 100644
--- a/tests/auto/gui/text/qtextlist/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextlist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextlist Test:
 #####################################################################
 
-qt_add_test(tst_qtextlist
+qt_internal_add_test(tst_qtextlist
     SOURCES
         ../qtextdocument/common.h
         tst_qtextlist.cpp
diff --git a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
index eb5d34cbac..cf14f38b5f 100644
--- a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND test_data "data/headingBulletsContinuations.md")
 list(APPEND test_data "data/fuzz20450.md")
 list(APPEND test_data "data/fuzz20580.md")
 
-qt_add_test(tst_qtextmarkdownimporter
+qt_internal_add_test(tst_qtextmarkdownimporter
     SOURCES
         tst_qtextmarkdownimporter.cpp
     DEFINES
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
index 008f501e23..d8815c64f6 100644
--- a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "data/example.md")
 list(APPEND test_data "data/blockquotes.md")
 
-qt_add_test(tst_qtextmarkdownwriter
+qt_internal_add_test(tst_qtextmarkdownwriter
     SOURCES
         tst_qtextmarkdownwriter.cpp
     DEFINES
diff --git a/tests/auto/gui/text/qtextobject/CMakeLists.txt b/tests/auto/gui/text/qtextobject/CMakeLists.txt
index 94cd60d6a6..07ea132de0 100644
--- a/tests/auto/gui/text/qtextobject/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextobject Test:
 #####################################################################
 
-qt_add_test(tst_qtextobject
+qt_internal_add_test(tst_qtextobject
     SOURCES
         tst_qtextobject.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qtextobject
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
index 70f73f0bad..16c86c4977 100644
--- a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextodfwriter Test:
 #####################################################################
 
-qt_add_test(tst_qtextodfwriter
+qt_internal_add_test(tst_qtextodfwriter
     SOURCES
         tst_qtextodfwriter.cpp
     DEFINES
diff --git a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
index 82861b9b8c..49cfcfab6a 100644
--- a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 ## tst_qtextpiecetable Test:
 #####################################################################
 
-qt_add_test(tst_qtextpiecetable
+qt_internal_add_test(tst_qtextpiecetable
     SOURCES
         ../qtextdocument/common.h
         tst_qtextpiecetable.cpp
diff --git a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
index 8bd9909fe1..01d418ebd4 100644
--- a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextscriptengine Test:
 #####################################################################
 
-qt_add_test(tst_qtextscriptengine
+qt_internal_add_test(tst_qtextscriptengine
     SOURCES
         tst_qtextscriptengine.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
index 9bc97be6a3..d3b6b1dc6d 100644
--- a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## generate Binary:
 #####################################################################
 
-qt_add_executable(generate
+qt_internal_add_executable(generate
     GUI
     SOURCES
         main.cpp
diff --git a/tests/auto/gui/text/qtexttable/CMakeLists.txt b/tests/auto/gui/text/qtexttable/CMakeLists.txt
index 036d39bbff..94d33d3530 100644
--- a/tests/auto/gui/text/qtexttable/CMakeLists.txt
+++ b/tests/auto/gui/text/qtexttable/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtexttable Test:
 #####################################################################
 
-qt_add_test(tst_qtexttable
+qt_internal_add_test(tst_qtexttable
     SOURCES
         tst_qtexttable.cpp
     PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ qt_add_test(tst_qtexttable
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qzip/CMakeLists.txt b/tests/auto/gui/text/qzip/CMakeLists.txt
index 02620d5e64..7240a611d2 100644
--- a/tests/auto/gui/text/qzip/CMakeLists.txt
+++ b/tests/auto/gui/text/qzip/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "testdata")
 
-qt_add_test(tst_qzip
+qt_internal_add_test(tst_qzip
     SOURCES
         tst_qzip.cpp
     PUBLIC_LIBRARIES
@@ -26,7 +26,7 @@ if(ANDROID)
         "testdata/test.zip"
     )
 
-    qt_add_resource(tst_qzip "testdata"
+    qt_internal_add_resource(tst_qzip "testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
index ce1db36f16..7536251cd3 100644
--- a/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
+++ b/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdesktopservices Test:
 #####################################################################
 
-qt_add_test(tst_qdesktopservices
+qt_internal_add_test(tst_qdesktopservices
     SOURCES
         tst_qdesktopservices.cpp
     DEFINES
diff --git a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
index 433e97414a..475a3405c0 100644
--- a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
+++ b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdesktopservices Test:
 #####################################################################
 
-qt_add_test(tst_qdesktopservices
+qt_internal_add_test(tst_qdesktopservices
     SOURCES
         tst_qdesktopservices.cpp
     DEFINES
diff --git a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
index 01ed8772ea..27996300d7 100644
--- a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
+++ b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdoublevalidator Test:
 #####################################################################
 
-qt_add_test(tst_qdoublevalidator
+qt_internal_add_test(tst_qdoublevalidator
     SOURCES
         tst_qdoublevalidator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qintvalidator/CMakeLists.txt b/tests/auto/gui/util/qintvalidator/CMakeLists.txt
index 841fd02bb0..83891a3541 100644
--- a/tests/auto/gui/util/qintvalidator/CMakeLists.txt
+++ b/tests/auto/gui/util/qintvalidator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qintvalidator Test:
 #####################################################################
 
-qt_add_test(tst_qintvalidator
+qt_internal_add_test(tst_qintvalidator
     SOURCES
         tst_qintvalidator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
index 9a1491681e..9caf7a1596 100644
--- a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
+++ b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qregularexpressionvalidator Test:
 #####################################################################
 
-qt_add_test(tst_qregularexpressionvalidator
+qt_internal_add_test(tst_qregularexpressionvalidator
     SOURCES
         tst_qregularexpressionvalidator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
index 8a6f95da57..77cefcbd06 100644
--- a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshadergenerator Test:
 #####################################################################
 
-qt_add_test(tst_qshadergenerator
+qt_internal_add_test(tst_qshadergenerator
     SOURCES
         tst_qshadergenerator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadergraph/CMakeLists.txt b/tests/auto/gui/util/qshadergraph/CMakeLists.txt
index f59e85af6c..e510fffb03 100644
--- a/tests/auto/gui/util/qshadergraph/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadergraph/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshadergraph Test:
 #####################################################################
 
-qt_add_test(tst_qshadergraph
+qt_internal_add_test(tst_qshadergraph
     SOURCES
         tst_qshadergraph.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
index 8e2b63213c..70f99d9266 100644
--- a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshadergraphloader Test:
 #####################################################################
 
-qt_add_test(tst_qshadergraphloader
+qt_internal_add_test(tst_qshadergraphloader
     SOURCES
         tst_qshadergraphloader.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadernodes/CMakeLists.txt b/tests/auto/gui/util/qshadernodes/CMakeLists.txt
index 153e9fa09a..471a203ffc 100644
--- a/tests/auto/gui/util/qshadernodes/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadernodes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshadernodes Test:
 #####################################################################
 
-qt_add_test(tst_qshadernodes
+qt_internal_add_test(tst_qshadernodes
     SOURCES
         tst_qshadernodes.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
index 915e8b4a58..0491e4d149 100644
--- a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshadernodesloader Test:
 #####################################################################
 
-qt_add_test(tst_qshadernodesloader
+qt_internal_add_test(tst_qshadernodesloader
     SOURCES
         tst_qshadernodesloader.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
index 23dc595d96..91083348f7 100644
--- a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
+++ b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtexturefilereader Test:
 #####################################################################
 
-qt_add_test(tst_qtexturefilereader
+qt_internal_add_test(tst_qtexturefilereader
     SOURCES
         tst_qtexturefilereader.cpp
     PUBLIC_LIBRARIES
@@ -21,7 +21,7 @@ set(qtexturefilereader_resource_files
     "texturefiles/pattern.pkm"
 )
 
-qt_add_resource(tst_qtexturefilereader "qtexturefilereader"
+qt_internal_add_resource(tst_qtexturefilereader "qtexturefilereader"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/util/qundogroup/CMakeLists.txt b/tests/auto/gui/util/qundogroup/CMakeLists.txt
index 9aa35ba9a7..c1396326f7 100644
--- a/tests/auto/gui/util/qundogroup/CMakeLists.txt
+++ b/tests/auto/gui/util/qundogroup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qundogroup Test:
 #####################################################################
 
-qt_add_test(tst_qundogroup
+qt_internal_add_test(tst_qundogroup
     SOURCES
         tst_qundogroup.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qundostack/CMakeLists.txt b/tests/auto/gui/util/qundostack/CMakeLists.txt
index 9e8ac65c97..0e56171add 100644
--- a/tests/auto/gui/util/qundostack/CMakeLists.txt
+++ b/tests/auto/gui/util/qundostack/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qundostack Test:
 #####################################################################
 
-qt_add_test(tst_qundostack
+qt_internal_add_test(tst_qundostack
     SOURCES
         tst_qundostack.cpp
     PUBLIC_LIBRARIES