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>

134 files changed, 175 insertions, 175 deletions

diff --git a/tests/manual/cocoa/appicon/CMakeLists.txt b/tests/manual/cocoa/appicon/CMakeLists.txt
index 258c6ce7e3..b027994db1 100644
--- a/tests/manual/cocoa/appicon/CMakeLists.txt
+++ b/tests/manual/cocoa/appicon/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## appicon Binary:
 #####################################################################
 
-qt_add_manual_test(appicon
+qt_internal_add_manual_test(appicon
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/cocoa/menurama/CMakeLists.txt b/tests/manual/cocoa/menurama/CMakeLists.txt
index 56fe17e34d..2d93198df8 100644
--- a/tests/manual/cocoa/menurama/CMakeLists.txt
+++ b/tests/manual/cocoa/menurama/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Menurama Binary:
 #####################################################################
 
-qt_add_manual_test(Menurama
+qt_internal_add_manual_test(Menurama
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/cocoa/menus/CMakeLists.txt b/tests/manual/cocoa/menus/CMakeLists.txt
index 534a567a7d..878a7ce998 100644
--- a/tests/manual/cocoa/menus/CMakeLists.txt
+++ b/tests/manual/cocoa/menus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## menus Binary:
 #####################################################################
 
-qt_add_manual_test(menus
+qt_internal_add_manual_test(menus
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/cocoa/nativewidgets/CMakeLists.txt b/tests/manual/cocoa/nativewidgets/CMakeLists.txt
index 25d1963feb..342a99372b 100644
--- a/tests/manual/cocoa/nativewidgets/CMakeLists.txt
+++ b/tests/manual/cocoa/nativewidgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nativewigets Binary:
 #####################################################################
 
-qt_add_manual_test(nativewigets
+qt_internal_add_manual_test(nativewigets
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/cocoa/popups/CMakeLists.txt b/tests/manual/cocoa/popups/CMakeLists.txt
index 8c572b56c2..ac48dec318 100644
--- a/tests/manual/cocoa/popups/CMakeLists.txt
+++ b/tests/manual/cocoa/popups/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## popups Binary:
 #####################################################################
 
-qt_add_manual_test(popups
+qt_internal_add_manual_test(popups
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt b/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt
index f00b835902..37220922d0 100644
--- a/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt
+++ b/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qsystemtrayicon Binary:
 #####################################################################
 
-qt_add_manual_test(qsystemtrayicon
+qt_internal_add_manual_test(qsystemtrayicon
     GUI
     SOURCES
         main.cpp
@@ -26,7 +26,7 @@ set(icons_resource_files
     "macsystray64x64.png"
 )
 
-qt_add_resource(qsystemtrayicon "icons"
+qt_internal_add_resource(qsystemtrayicon "icons"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt
index fb9c395169..332fd8c9d7 100644
--- a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt
+++ b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qt_on_cocoa Binary:
 #####################################################################
 
-qt_add_manual_test(qt_on_cocoa
+qt_internal_add_manual_test(qt_on_cocoa
     GUI
     SOURCES
         main.mm
diff --git a/tests/manual/cocoa/wheelevent/CMakeLists.txt b/tests/manual/cocoa/wheelevent/CMakeLists.txt
index d544ab2730..e52da47db1 100644
--- a/tests/manual/cocoa/wheelevent/CMakeLists.txt
+++ b/tests/manual/cocoa/wheelevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## wheelevent Binary:
 #####################################################################
 
-qt_add_manual_test(wheelevent
+qt_internal_add_manual_test(wheelevent
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/dialogs/CMakeLists.txt b/tests/manual/dialogs/CMakeLists.txt
index d449c191fe..09c9a287c2 100644
--- a/tests/manual/dialogs/CMakeLists.txt
+++ b/tests/manual/dialogs/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## dialogs Binary:
 #####################################################################
 
-qt_add_manual_test(dialogs
+qt_internal_add_manual_test(dialogs
     GUI
     SOURCES
         colordialogpanel.cpp colordialogpanel.h
@@ -25,12 +25,12 @@ qt_add_manual_test(dialogs
 ## Scopes:
 #####################################################################
 
-qt_extend_target(dialogs CONDITION TARGET Qt::PrintSupport
+qt_internal_extend_target(dialogs CONDITION TARGET Qt::PrintSupport
     PUBLIC_LIBRARIES
         Qt::PrintSupport
 )
 
-qt_extend_target(dialogs CONDITION NOT (QT_FEATURE_printer EQUAL FALSE)
+qt_internal_extend_target(dialogs CONDITION NOT (QT_FEATURE_printer EQUAL FALSE)
     SOURCES
         printdialogpanel.cpp printdialogpanel.h printdialogpanel.ui
     ENABLE_AUTOGEN_TOOLS
diff --git a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
index 06fee7d482..84ce8b4daa 100644
--- a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
+++ b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## embeddedintoforeignwindow Binary:
 #####################################################################
 
-qt_add_manual_test(embeddedintoforeignwindow
+qt_internal_add_manual_test(embeddedintoforeignwindow
     SOURCES
         ../diaglib/eventfilter.cpp ../diaglib/eventfilter.h
         ../diaglib/nativewindowdump.h
@@ -28,19 +28,19 @@ qt_add_manual_test(embeddedintoforeignwindow
 ## Scopes:
 #####################################################################
 
-qt_extend_target(embeddedintoforeignwindow CONDITION WIN32
+qt_internal_extend_target(embeddedintoforeignwindow CONDITION WIN32
     SOURCES
         ../diaglib/nativewindowdump_win.cpp
     PUBLIC_LIBRARIES
         user32
 )
 
-qt_extend_target(embeddedintoforeignwindow CONDITION UNIX
+qt_internal_extend_target(embeddedintoforeignwindow CONDITION UNIX
     SOURCES
         ../diaglib/nativewindowdump.cpp
 )
 
-qt_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets
+qt_internal_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets
     SOURCES
         ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h
         ../diaglib/logwidget.cpp ../diaglib/logwidget.h
@@ -49,7 +49,7 @@ qt_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets
         Qt::WidgetsPrivate
 )
 
-qt_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl
     SOURCES
         ../diaglib/glinfo.cpp ../diaglib/glinfo.h
     PUBLIC_LIBRARIES
diff --git a/tests/manual/filetest/CMakeLists.txt b/tests/manual/filetest/CMakeLists.txt
index e8c04be928..f1b562ccf1 100644
--- a/tests/manual/filetest/CMakeLists.txt
+++ b/tests/manual/filetest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## filetest Binary:
 #####################################################################
 
-qt_add_manual_test(filetest
+qt_internal_add_manual_test(filetest
     SOURCES
         main.cpp
 )
diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt
index bd0af73058..96df481ba4 100644
--- a/tests/manual/foreignwindows/CMakeLists.txt
+++ b/tests/manual/foreignwindows/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## foreignwindows Binary:
 #####################################################################
 
-qt_add_manual_test(foreignwindows
+qt_internal_add_manual_test(foreignwindows
     SOURCES
         ../diaglib/eventfilter.cpp ../diaglib/eventfilter.h
         ../diaglib/nativewindowdump.h
@@ -29,19 +29,19 @@ qt_add_manual_test(foreignwindows
 ## Scopes:
 #####################################################################
 
-qt_extend_target(foreignwindows CONDITION WIN32
+qt_internal_extend_target(foreignwindows CONDITION WIN32
     SOURCES
         ../diaglib/nativewindowdump_win.cpp
     PUBLIC_LIBRARIES
         user32
 )
 
-qt_extend_target(foreignwindows CONDITION UNIX
+qt_internal_extend_target(foreignwindows CONDITION UNIX
     SOURCES
         ../diaglib/nativewindowdump.cpp
 )
 
-qt_extend_target(foreignwindows CONDITION QT_FEATURE_widgets
+qt_internal_extend_target(foreignwindows CONDITION QT_FEATURE_widgets
     SOURCES
         ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h
         ../diaglib/logwidget.cpp ../diaglib/logwidget.h
@@ -50,7 +50,7 @@ qt_extend_target(foreignwindows CONDITION QT_FEATURE_widgets
         Qt::WidgetsPrivate
 )
 
-qt_extend_target(foreignwindows CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(foreignwindows CONDITION QT_FEATURE_opengl
     SOURCES
         ../diaglib/glinfo.cpp ../diaglib/glinfo.h
     PUBLIC_LIBRARIES
diff --git a/tests/manual/gestures/graphicsview/CMakeLists.txt b/tests/manual/gestures/graphicsview/CMakeLists.txt
index e998bf113e..e728dba542 100644
--- a/tests/manual/gestures/graphicsview/CMakeLists.txt
+++ b/tests/manual/gestures/graphicsview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_graphicsview Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_graphicsview
+qt_internal_add_manual_test(tst_manual_graphicsview
     GUI
     SOURCES
         gestures.cpp gestures.h
diff --git a/tests/manual/gestures/scrollarea/CMakeLists.txt b/tests/manual/gestures/scrollarea/CMakeLists.txt
index d1446964cd..fe33655ca1 100644
--- a/tests/manual/gestures/scrollarea/CMakeLists.txt
+++ b/tests/manual/gestures/scrollarea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## scrollarea Binary:
 #####################################################################
 
-qt_add_manual_test(scrollarea
+qt_internal_add_manual_test(scrollarea
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt
index 72ed49bb71..b163599185 100644
--- a/tests/manual/highdpi/CMakeLists.txt
+++ b/tests/manual/highdpi/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## highdpi Binary:
 #####################################################################
 
-qt_add_manual_test(highdpi
+qt_internal_add_manual_test(highdpi
     SOURCES
         dragwidget.cpp dragwidget.h
         main.cpp
@@ -28,7 +28,7 @@ set(highdpi_resource_files
     "qticon64.png"
 )
 
-qt_add_resource(highdpi "highdpi"
+qt_internal_add_resource(highdpi "highdpi"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/inputmethodhints/CMakeLists.txt b/tests/manual/inputmethodhints/CMakeLists.txt
index 8b501f66a0..6a25220c45 100644
--- a/tests/manual/inputmethodhints/CMakeLists.txt
+++ b/tests/manual/inputmethodhints/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_inputmethodhints Binary:
 #####################################################################
 
-qt_add_manual_test(tst_inputmethodhints
+qt_internal_add_manual_test(tst_inputmethodhints
     GUI
     SOURCES
         inputmethodhints.cpp inputmethodhints.h inputmethodhints.ui
diff --git a/tests/manual/keypadnavigation/CMakeLists.txt b/tests/manual/keypadnavigation/CMakeLists.txt
index 34946e643f..17206e8c31 100644
--- a/tests/manual/keypadnavigation/CMakeLists.txt
+++ b/tests/manual/keypadnavigation/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## keypadnavigation Binary:
 #####################################################################
 
-qt_add_manual_test(keypadnavigation
+qt_internal_add_manual_test(keypadnavigation
     GUI
     SOURCES
         keypadnavigation.ui
diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt
index d0d898b257..568aeaa6e7 100644
--- a/tests/manual/lance/CMakeLists.txt
+++ b/tests/manual/lance/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## lance Binary:
 #####################################################################
 
-qt_add_manual_test(lance
+qt_internal_add_manual_test(lance
     SOURCES
         ../../auto/other/lancelot/paintcommands.cpp ../../auto/other/lancelot/paintcommands.h
         interactivewidget.cpp interactivewidget.h
@@ -28,7 +28,7 @@ set(icons_resource_files
     "tools.png"
 )
 
-qt_add_resource(lance "icons"
+qt_internal_add_resource(lance "icons"
     PREFIX
         "/icons"
     FILES
@@ -153,7 +153,7 @@ set(images_resource_files
     "images/zebra.png"
 )
 
-qt_add_resource(lance "images"
+qt_internal_add_resource(lance "images"
     PREFIX
         "/"
     BASE
@@ -169,7 +169,7 @@ qt_add_resource(lance "images"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(lance CONDITION TARGET Qt::OpenGL
+qt_internal_extend_target(lance CONDITION TARGET Qt::OpenGL
     PUBLIC_LIBRARIES
         Qt::OpenGL
 )
diff --git a/tests/manual/markdown/CMakeLists.txt b/tests/manual/markdown/CMakeLists.txt
index 33af58f812..e02515a80b 100644
--- a/tests/manual/markdown/CMakeLists.txt
+++ b/tests/manual/markdown/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## html2md Binary:
 #####################################################################
 
-qt_add_manual_test(html2md
+qt_internal_add_manual_test(html2md
     GUI
     SOURCES
         html2md.cpp
diff --git a/tests/manual/network_remote_stresstest/CMakeLists.txt b/tests/manual/network_remote_stresstest/CMakeLists.txt
index 409f5c2833..20006c2cb9 100644
--- a/tests/manual/network_remote_stresstest/CMakeLists.txt
+++ b/tests/manual/network_remote_stresstest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_network_remote_stresstest Binary:
 #####################################################################
 
-qt_add_manual_test(tst_network_remote_stresstest
+qt_internal_add_manual_test(tst_network_remote_stresstest
     SOURCES
         tst_network_remote_stresstest.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(url-list_resource_files
     "url-list.txt"
 )
 
-qt_add_resource(tst_network_remote_stresstest "url-list"
+qt_internal_add_resource(tst_network_remote_stresstest "url-list"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/network_stresstest/CMakeLists.txt b/tests/manual/network_stresstest/CMakeLists.txt
index 664457caef..bb29e74615 100644
--- a/tests/manual/network_stresstest/CMakeLists.txt
+++ b/tests/manual/network_stresstest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_network_stresstest Binary:
 #####################################################################
 
-qt_add_manual_test(tst_network_stresstest
+qt_internal_add_manual_test(tst_network_stresstest
     SOURCES
         minihttpserver.cpp minihttpserver.h
         tst_network_stresstest.cpp
@@ -21,7 +21,7 @@ set(wwwfiles_resource_files
     "qtest"
 )
 
-qt_add_resource(tst_network_stresstest "wwwfiles"
+qt_internal_add_resource(tst_network_stresstest "wwwfiles"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/qcursor/allcursors/CMakeLists.txt b/tests/manual/qcursor/allcursors/CMakeLists.txt
index cfaf947ff9..65e7251c6d 100644
--- a/tests/manual/qcursor/allcursors/CMakeLists.txt
+++ b/tests/manual/qcursor/allcursors/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_allcursors Binary:
 #####################################################################
 
-qt_add_manual_test(tst_allcursors
+qt_internal_add_manual_test(tst_allcursors
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qcursor/childwidget/CMakeLists.txt b/tests/manual/qcursor/childwidget/CMakeLists.txt
index bb357f348d..ca377cb90f 100644
--- a/tests/manual/qcursor/childwidget/CMakeLists.txt
+++ b/tests/manual/qcursor/childwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_childwidget Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_childwidget
+qt_internal_add_manual_test(tst_manual_childwidget
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qcursor/childwindow/CMakeLists.txt b/tests/manual/qcursor/childwindow/CMakeLists.txt
index 5399735075..147bd065d1 100644
--- a/tests/manual/qcursor/childwindow/CMakeLists.txt
+++ b/tests/manual/qcursor/childwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childwindow Binary:
 #####################################################################
 
-qt_add_manual_test(childwindow
+qt_internal_add_manual_test(childwindow
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt b/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt
index 1653e5764f..0efe0cb61a 100644
--- a/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt
+++ b/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childwindowcontainer Binary:
 #####################################################################
 
-qt_add_manual_test(childwindowcontainer
+qt_internal_add_manual_test(childwindowcontainer
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qcursor/grab_override/CMakeLists.txt b/tests/manual/qcursor/grab_override/CMakeLists.txt
index d2395630e8..c52ed6a1dd 100644
--- a/tests/manual/qcursor/grab_override/CMakeLists.txt
+++ b/tests/manual/qcursor/grab_override/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## t_cursors Binary:
 #####################################################################
 
-qt_add_manual_test(t_cursors
+qt_internal_add_manual_test(t_cursors
     GUI
     SOURCES
         main.cpp
@@ -21,7 +21,7 @@ set(images_resource_files
     "data/monkey_on_64x64.png"
 )
 
-qt_add_resource(t_cursors "images"
+qt_internal_add_resource(t_cursors "images"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
index 635536c9ed..99114a0514 100644
--- a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
+++ b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcursorhighdpi Binary:
 #####################################################################
 
-qt_add_manual_test(qcursorhighdpi
+qt_internal_add_manual_test(qcursorhighdpi
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
@@ -20,7 +20,7 @@ qt_add_manual_test(qcursorhighdpi
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qcursorhighdpi CONDITION WIN32
+qt_internal_extend_target(qcursorhighdpi CONDITION WIN32
     PUBLIC_LIBRARIES
         User32
 )
diff --git a/tests/manual/qdesktopservices/CMakeLists.txt b/tests/manual/qdesktopservices/CMakeLists.txt
index 8b93835b66..3909128fd3 100644
--- a/tests/manual/qdesktopservices/CMakeLists.txt
+++ b/tests/manual/qdesktopservices/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_qdesktopservices Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_qdesktopservices
+qt_internal_add_manual_test(tst_manual_qdesktopservices
     SOURCES
         tst_qdesktopservices.cpp
     DEFINES
diff --git a/tests/manual/qgraphicsitem/CMakeLists.txt b/tests/manual/qgraphicsitem/CMakeLists.txt
index 32814afb33..85303d3674 100644
--- a/tests/manual/qgraphicsitem/CMakeLists.txt
+++ b/tests/manual/qgraphicsitem/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qgraphicsitem Binary:
 #####################################################################
 
-qt_add_manual_test(qgraphicsitem
+qt_internal_add_manual_test(qgraphicsitem
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qgraphicsitemgroup/CMakeLists.txt b/tests/manual/qgraphicsitemgroup/CMakeLists.txt
index 0558b9475d..737bcd5851 100644
--- a/tests/manual/qgraphicsitemgroup/CMakeLists.txt
+++ b/tests/manual/qgraphicsitemgroup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qgraphicsitemgroup Binary:
 #####################################################################
 
-qt_add_manual_test(qgraphicsitemgroup
+qt_internal_add_manual_test(qgraphicsitemgroup
     GUI
     SOURCES
         customitem.cpp customitem.h
diff --git a/tests/manual/qgraphicslayout/flicker/CMakeLists.txt b/tests/manual/qgraphicslayout/flicker/CMakeLists.txt
index 005c6ca07f..73130ed9c7 100644
--- a/tests/manual/qgraphicslayout/flicker/CMakeLists.txt
+++ b/tests/manual/qgraphicslayout/flicker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## flicker Binary:
 #####################################################################
 
-qt_add_manual_test(flicker
+qt_internal_add_manual_test(flicker
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qhttpnetworkconnection/CMakeLists.txt b/tests/manual/qhttpnetworkconnection/CMakeLists.txt
index 08308011a6..1606869d21 100644
--- a/tests/manual/qhttpnetworkconnection/CMakeLists.txt
+++ b/tests/manual/qhttpnetworkconnection/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_qhttpnetworkconnection Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_qhttpnetworkconnection
+qt_internal_add_manual_test(tst_manual_qhttpnetworkconnection
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qimagereader/CMakeLists.txt b/tests/manual/qimagereader/CMakeLists.txt
index 898cdbae0e..00cceab584 100644
--- a/tests/manual/qimagereader/CMakeLists.txt
+++ b/tests/manual/qimagereader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qimagereader Binary:
 #####################################################################
 
-qt_add_manual_test(qimagereader
+qt_internal_add_manual_test(qimagereader
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qlayout/CMakeLists.txt b/tests/manual/qlayout/CMakeLists.txt
index 72702a4701..746a6392ce 100644
--- a/tests/manual/qlayout/CMakeLists.txt
+++ b/tests/manual/qlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlayout Binary:
 #####################################################################
 
-qt_add_manual_test(qlayout
+qt_internal_add_manual_test(qlayout
     GUI
     SOURCES
         gridwidget.cpp gridwidget.h
diff --git a/tests/manual/qlocale/CMakeLists.txt b/tests/manual/qlocale/CMakeLists.txt
index c837bf5a9b..a41d3fb33a 100644
--- a/tests/manual/qlocale/CMakeLists.txt
+++ b/tests/manual/qlocale/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlocale Binary:
 #####################################################################
 
-qt_add_manual_test(qlocale
+qt_internal_add_manual_test(qlocale
     GUI
     SOURCES
         calendar.cpp calendar.h
diff --git a/tests/manual/qmetatype/CMakeLists.txt b/tests/manual/qmetatype/CMakeLists.txt
index 696c74ee34..76e565a0ac 100644
--- a/tests/manual/qmetatype/CMakeLists.txt
+++ b/tests/manual/qmetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmetatype_expect_fail Test:
 #####################################################################
 
-qt_add_test(tst_qmetatype_expect_fail
+qt_internal_add_test(tst_qmetatype_expect_fail
     GUI
     SOURCES
         declare_metatype_noninline.cpp declare_metatype_noninline.h
diff --git a/tests/manual/qmimedatabase/CMakeLists.txt b/tests/manual/qmimedatabase/CMakeLists.txt
index 4b15506e1c..b308eeac67 100644
--- a/tests/manual/qmimedatabase/CMakeLists.txt
+++ b/tests/manual/qmimedatabase/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmimedatabase Binary:
 #####################################################################
 
-qt_add_manual_test(qmimedatabase
+qt_internal_add_manual_test(qmimedatabase
     SOURCES
         main.cpp
 )
diff --git a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt
index 0c08769907..71d18e8f6b 100644
--- a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt
+++ b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qnetconmonitor Binary:
 #####################################################################
 
-qt_add_manual_test(qnetconmonitor
+qt_internal_add_manual_test(qnetconmonitor
     SOURCES
         tst_qnetconmonitor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qnetconmonitor/CMakeLists.txt b/tests/manual/qnetconmonitor/CMakeLists.txt
index 714344e1d9..cddb59b3da 100644
--- a/tests/manual/qnetconmonitor/CMakeLists.txt
+++ b/tests/manual/qnetconmonitor/CMakeLists.txt
@@ -10,7 +10,7 @@ if (NOT QT_FEATURE_private_tests)
 endif()
 # special case end
 
-qt_add_manual_test(qnetconmonitor
+qt_internal_add_manual_test(qnetconmonitor
     SOURCES
         tst_qnetconmonitor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt b/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt
index 21d129d09f..1de539cbb0 100644
--- a/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt
+++ b/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qget Binary:
 #####################################################################
 
-qt_add_manual_test(qget
+qt_internal_add_manual_test(qget
     SOURCES
         downloadmanager.cpp
         qget.cpp qget.h
diff --git a/tests/manual/qnetworkreply/.prev_CMakeLists.txt b/tests/manual/qnetworkreply/.prev_CMakeLists.txt
index 2b2ba41e0b..052f8e4b58 100644
--- a/tests/manual/qnetworkreply/.prev_CMakeLists.txt
+++ b/tests/manual/qnetworkreply/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_qnetworkreply Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_qnetworkreply
+qt_internal_add_manual_test(tst_manual_qnetworkreply
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qnetworkreply/CMakeLists.txt b/tests/manual/qnetworkreply/CMakeLists.txt
index 9af59aae91..6fc330b6a4 100644
--- a/tests/manual/qnetworkreply/CMakeLists.txt
+++ b/tests/manual/qnetworkreply/CMakeLists.txt
@@ -10,7 +10,7 @@ if (NOT QT_FEATURE_private_tests)
 endif()
 # special case end
 
-qt_add_manual_test(tst_manual_qnetworkreply
+qt_internal_add_manual_test(tst_manual_qnetworkreply
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qopenglcontext/CMakeLists.txt b/tests/manual/qopenglcontext/CMakeLists.txt
index 396da589ca..fe9d332ca8 100644
--- a/tests/manual/qopenglcontext/CMakeLists.txt
+++ b/tests/manual/qopenglcontext/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qopenglcontext Binary:
 #####################################################################
 
-qt_add_manual_test(qopenglcontext
+qt_internal_add_manual_test(qopenglcontext
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt
index db7fff8093..b79130458d 100644
--- a/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt
+++ b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qopengltextureblitter Binary:
 #####################################################################
 
-qt_add_manual_test(qopengltextureblitter
+qt_internal_add_manual_test(qopengltextureblitter
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qopengltextureblitter/CMakeLists.txt b/tests/manual/qopengltextureblitter/CMakeLists.txt
index c9e9a49901..e45089d778 100644
--- a/tests/manual/qopengltextureblitter/CMakeLists.txt
+++ b/tests/manual/qopengltextureblitter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qopengltextureblitter Binary:
 #####################################################################
 
-qt_add_manual_test(qopengltextureblitter
+qt_internal_add_manual_test(qopengltextureblitter
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt
index 66c7b8495e..c0c031489f 100644
--- a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt
+++ b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## openglwidget Binary:
 #####################################################################
 
-qt_add_manual_test(openglwidget
+qt_internal_add_manual_test(openglwidget
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt b/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt
index c322d40027..5f6aaef0d2 100644
--- a/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt
+++ b/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiwindow Binary:
 #####################################################################
 
-qt_add_manual_test(multiwindow
+qt_internal_add_manual_test(multiwindow
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qprintdevice_dump/CMakeLists.txt b/tests/manual/qprintdevice_dump/CMakeLists.txt
index 73e25b6677..78334c603b 100644
--- a/tests/manual/qprintdevice_dump/CMakeLists.txt
+++ b/tests/manual/qprintdevice_dump/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qprintdevice_dump Binary:
 #####################################################################
 
-qt_add_manual_test(qprintdevice_dump
+qt_internal_add_manual_test(qprintdevice_dump
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qscreen/CMakeLists.txt b/tests/manual/qscreen/CMakeLists.txt
index 3c5622536a..22c1401f1d 100644
--- a/tests/manual/qscreen/CMakeLists.txt
+++ b/tests/manual/qscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qscreen Binary:
 #####################################################################
 
-qt_add_manual_test(qscreen
+qt_internal_add_manual_test(qscreen
     SOURCES
         main.cpp
         propertyfield.cpp propertyfield.h
diff --git a/tests/manual/qssloptions/CMakeLists.txt b/tests/manual/qssloptions/CMakeLists.txt
index 92983a7a5b..edfbf88d80 100644
--- a/tests/manual/qssloptions/CMakeLists.txt
+++ b/tests/manual/qssloptions/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qssloptions Binary:
 #####################################################################
 
-qt_add_manual_test(tst_qssloptions
+qt_internal_add_manual_test(tst_qssloptions
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qsslsocket/CMakeLists.txt b/tests/manual/qsslsocket/CMakeLists.txt
index a0d0fd23a0..9347418bff 100644
--- a/tests/manual/qsslsocket/CMakeLists.txt
+++ b/tests/manual/qsslsocket/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_qsslsocket Test:
 #####################################################################
 
-qt_add_test(tst_manual_qsslsocket
+qt_internal_add_test(tst_manual_qsslsocket
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/qstorageinfo/CMakeLists.txt b/tests/manual/qstorageinfo/CMakeLists.txt
index 58782c138d..40bf1fdeaf 100644
--- a/tests/manual/qstorageinfo/CMakeLists.txt
+++ b/tests/manual/qstorageinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qstorageinfo Binary:
 #####################################################################
 
-qt_add_manual_test(qstorageinfo
+qt_internal_add_manual_test(qstorageinfo
     SOURCES
         main.cpp
 )
diff --git a/tests/manual/qsysinfo/CMakeLists.txt b/tests/manual/qsysinfo/CMakeLists.txt
index e0e49fa1bf..08117af9fc 100644
--- a/tests/manual/qsysinfo/CMakeLists.txt
+++ b/tests/manual/qsysinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qsysinfo Binary:
 #####################################################################
 
-qt_add_manual_test(qsysinfo
+qt_internal_add_manual_test(qsysinfo
     SOURCES
         main.cpp
 )
diff --git a/tests/manual/qt_poll/CMakeLists.txt b/tests/manual/qt_poll/CMakeLists.txt
index d8784a6ed3..2b61787b10 100644
--- a/tests/manual/qt_poll/CMakeLists.txt
+++ b/tests/manual/qt_poll/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qt_poll Test:
 #####################################################################
 
-qt_add_test(tst_qt_poll
+qt_internal_add_test(tst_qt_poll
     SOURCES
         ../../../src/corelib/kernel/qpoll.cpp
         tst_qt_poll.cpp
diff --git a/tests/manual/qtabbar/CMakeLists.txt b/tests/manual/qtabbar/CMakeLists.txt
index 157c64250f..ea8d27ac91 100644
--- a/tests/manual/qtabbar/CMakeLists.txt
+++ b/tests/manual/qtabbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtabbar Binary:
 #####################################################################
 
-qt_add_manual_test(qtabbar
+qt_internal_add_manual_test(qtabbar
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtabletevent/device_information/CMakeLists.txt b/tests/manual/qtabletevent/device_information/CMakeLists.txt
index 8a13e6e730..02c0789ffe 100644
--- a/tests/manual/qtabletevent/device_information/CMakeLists.txt
+++ b/tests/manual/qtabletevent/device_information/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## device_information Binary:
 #####################################################################
 
-qt_add_manual_test(device_information
+qt_internal_add_manual_test(device_information
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtabletevent/event_compression/CMakeLists.txt b/tests/manual/qtabletevent/event_compression/CMakeLists.txt
index 1f959a51e2..8f5b6a3962 100644
--- a/tests/manual/qtabletevent/event_compression/CMakeLists.txt
+++ b/tests/manual/qtabletevent/event_compression/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## event_compression Binary:
 #####################################################################
 
-qt_add_manual_test(event_compression
+qt_internal_add_manual_test(event_compression
     SOURCES
         main.cpp
         mousestatwidget.cpp mousestatwidget.h
diff --git a/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt
index f4630a3789..340510fc6b 100644
--- a/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt
+++ b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## regular_widgets Binary:
 #####################################################################
 
-qt_add_manual_test(regular_widgets
+qt_internal_add_manual_test(regular_widgets
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtbug-52641/CMakeLists.txt b/tests/manual/qtbug-52641/CMakeLists.txt
index 7ae762b62f..7b752dc1ee 100644
--- a/tests/manual/qtbug-52641/CMakeLists.txt
+++ b/tests/manual/qtbug-52641/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtbug-52641 Binary:
 #####################################################################
 
-qt_add_manual_test(qtbug-52641
+qt_internal_add_manual_test(qtbug-52641
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtbug-8933/CMakeLists.txt b/tests/manual/qtbug-8933/CMakeLists.txt
index ec47dd5ce7..5405c77f34 100644
--- a/tests/manual/qtbug-8933/CMakeLists.txt
+++ b/tests/manual/qtbug-8933/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtbug-8933 Binary:
 #####################################################################
 
-qt_add_manual_test(qtbug-8933
+qt_internal_add_manual_test(qtbug-8933
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtexteditlist/CMakeLists.txt b/tests/manual/qtexteditlist/CMakeLists.txt
index 49647ca7c0..7b11cade93 100644
--- a/tests/manual/qtexteditlist/CMakeLists.txt
+++ b/tests/manual/qtexteditlist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtexteditlist Binary:
 #####################################################################
 
-qt_add_manual_test(qtexteditlist
+qt_internal_add_manual_test(qtexteditlist
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qtexttableborders/CMakeLists.txt b/tests/manual/qtexttableborders/CMakeLists.txt
index 83c46c5ad5..0f88a2443b 100644
--- a/tests/manual/qtexttableborders/CMakeLists.txt
+++ b/tests/manual/qtexttableborders/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtexttableborders Binary:
 #####################################################################
 
-qt_add_manual_test(qtexttableborders
+qt_internal_add_manual_test(qtexttableborders
     GUI
     SOURCES
         main.cpp
@@ -23,7 +23,7 @@ set(resources_resource_files
     "table-border-test.html"
 )
 
-qt_add_resource(qtexttableborders "resources"
+qt_internal_add_resource(qtexttableborders "resources"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/qtouchevent/CMakeLists.txt b/tests/manual/qtouchevent/CMakeLists.txt
index 031d2b3521..21042a12c8 100644
--- a/tests/manual/qtouchevent/CMakeLists.txt
+++ b/tests/manual/qtouchevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtouchevent Binary:
 #####################################################################
 
-qt_add_manual_test(qtouchevent
+qt_internal_add_manual_test(qtouchevent
     SOURCES
         form.ui
         main.cpp
diff --git a/tests/manual/qvulkaninstance/CMakeLists.txt b/tests/manual/qvulkaninstance/CMakeLists.txt
index e645ee007c..eafd1baa0a 100644
--- a/tests/manual/qvulkaninstance/CMakeLists.txt
+++ b/tests/manual/qvulkaninstance/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qvulkaninstance Binary:
 #####################################################################
 
-qt_add_manual_test(qvulkaninstance
+qt_internal_add_manual_test(qvulkaninstance
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qwidget_zorder/CMakeLists.txt b/tests/manual/qwidget_zorder/CMakeLists.txt
index 62c3963481..7d769c2be9 100644
--- a/tests/manual/qwidget_zorder/CMakeLists.txt
+++ b/tests/manual/qwidget_zorder/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwidget_zorder Binary:
 #####################################################################
 
-qt_add_manual_test(qwidget_zorder
+qt_internal_add_manual_test(qwidget_zorder
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/repaint/mainwindow/CMakeLists.txt b/tests/manual/repaint/mainwindow/CMakeLists.txt
index 24bbbc93c0..f632da9827 100644
--- a/tests/manual/repaint/mainwindow/CMakeLists.txt
+++ b/tests/manual/repaint/mainwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_mainwindow Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_mainwindow
+qt_internal_add_manual_test(tst_manual_mainwindow
     GUI
     SOURCES
         ../shared/shared.h
diff --git a/tests/manual/repaint/scrollarea/CMakeLists.txt b/tests/manual/repaint/scrollarea/CMakeLists.txt
index 1c1bfdfb3f..54ab0fd410 100644
--- a/tests/manual/repaint/scrollarea/CMakeLists.txt
+++ b/tests/manual/repaint/scrollarea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_scrollarea Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_scrollarea
+qt_internal_add_manual_test(tst_manual_scrollarea
     GUI
     SOURCES
         ../shared/shared.h
diff --git a/tests/manual/repaint/splitter/CMakeLists.txt b/tests/manual/repaint/splitter/CMakeLists.txt
index 2cecbc3741..9799abce09 100644
--- a/tests/manual/repaint/splitter/CMakeLists.txt
+++ b/tests/manual/repaint/splitter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## splitter Binary:
 #####################################################################
 
-qt_add_manual_test(splitter
+qt_internal_add_manual_test(splitter
     GUI
     SOURCES
         ../shared/shared.h
diff --git a/tests/manual/repaint/tableview/CMakeLists.txt b/tests/manual/repaint/tableview/CMakeLists.txt
index 0c7ed5d532..1885076501 100644
--- a/tests/manual/repaint/tableview/CMakeLists.txt
+++ b/tests/manual/repaint/tableview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tableview Binary:
 #####################################################################
 
-qt_add_manual_test(tableview
+qt_internal_add_manual_test(tableview
     GUI
     SOURCES
         ../shared/shared.h
diff --git a/tests/manual/repaint/task141091/CMakeLists.txt b/tests/manual/repaint/task141091/CMakeLists.txt
index 3d899d79e3..1ef2896c03 100644
--- a/tests/manual/repaint/task141091/CMakeLists.txt
+++ b/tests/manual/repaint/task141091/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## task141091 Binary:
 #####################################################################
 
-qt_add_manual_test(task141091
+qt_internal_add_manual_test(task141091
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/repaint/toplevel/CMakeLists.txt b/tests/manual/repaint/toplevel/CMakeLists.txt
index a4e603686a..c345ce974c 100644
--- a/tests/manual/repaint/toplevel/CMakeLists.txt
+++ b/tests/manual/repaint/toplevel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_toplevel Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_toplevel
+qt_internal_add_manual_test(tst_manual_toplevel
     SOURCES
         ../shared/shared.h
         main.cpp
diff --git a/tests/manual/repaint/widget/CMakeLists.txt b/tests/manual/repaint/widget/CMakeLists.txt
index 681f1e090c..2900692f1b 100644
--- a/tests/manual/repaint/widget/CMakeLists.txt
+++ b/tests/manual/repaint/widget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## widget Binary:
 #####################################################################
 
-qt_add_manual_test(widget
+qt_internal_add_manual_test(widget
     GUI
     SOURCES
         ../shared/shared.h
diff --git a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
index 294b6cb942..ee50072919 100644
--- a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
+++ b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## compressedtexture_bc1 Binary:
 #####################################################################
 
-qt_add_manual_test(compressedtexture_bc1
+qt_internal_add_manual_test(compressedtexture_bc1
     GUI
     SOURCES
         compressedtexture_bc1.cpp
@@ -29,7 +29,7 @@ set(compressedtexture_bc1_resource_files
     "../shared/texture.vert.qsb"
 )
 
-qt_add_resource(compressedtexture_bc1 "compressedtexture_bc1"
+qt_internal_add_resource(compressedtexture_bc1 "compressedtexture_bc1"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
index 508df6b5d5..e77e09e2e6 100644
--- a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
+++ b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## compressedtexture_bc1_subupload Binary:
 #####################################################################
 
-qt_add_manual_test(compressedtexture_bc1_subupload
+qt_internal_add_manual_test(compressedtexture_bc1_subupload
     GUI
     SOURCES
         compressedtexture_bc1_subupload.cpp
@@ -33,7 +33,7 @@ set(compressedtexture_bc1_subupload_resource_files
     "../shared/texture.vert.qsb"
 )
 
-qt_add_resource(compressedtexture_bc1_subupload "compressedtexture_bc1_subupload"
+qt_internal_add_resource(compressedtexture_bc1_subupload "compressedtexture_bc1_subupload"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/computebuffer/CMakeLists.txt b/tests/manual/rhi/computebuffer/CMakeLists.txt
index 3d19620dce..a47a8436f8 100644
--- a/tests/manual/rhi/computebuffer/CMakeLists.txt
+++ b/tests/manual/rhi/computebuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## computebuffer Binary:
 #####################################################################
 
-qt_add_manual_test(computebuffer
+qt_internal_add_manual_test(computebuffer
     GUI
     SOURCES
         computebuffer.cpp
@@ -20,7 +20,7 @@ set(computebuffer_resource_files
     "main.vert.qsb"
 )
 
-qt_add_resource(computebuffer "computebuffer"
+qt_internal_add_resource(computebuffer "computebuffer"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/computeimage/CMakeLists.txt b/tests/manual/rhi/computeimage/CMakeLists.txt
index a5408233d5..f7ecd5ce65 100644
--- a/tests/manual/rhi/computeimage/CMakeLists.txt
+++ b/tests/manual/rhi/computeimage/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## computeimage Binary:
 #####################################################################
 
-qt_add_manual_test(computeimage
+qt_internal_add_manual_test(computeimage
     GUI
     SOURCES
         computeimage.cpp
@@ -30,7 +30,7 @@ set(computeimage_resource_files
     "image.comp.qsb"
 )
 
-qt_add_resource(computeimage "computeimage"
+qt_internal_add_resource(computeimage "computeimage"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/cubemap/CMakeLists.txt b/tests/manual/rhi/cubemap/CMakeLists.txt
index 6a69d76065..b3e3206cf5 100644
--- a/tests/manual/rhi/cubemap/CMakeLists.txt
+++ b/tests/manual/rhi/cubemap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cubemap Binary:
 #####################################################################
 
-qt_add_manual_test(cubemap
+qt_internal_add_manual_test(cubemap
     GUI
     SOURCES
         cubemap.cpp
@@ -20,7 +20,7 @@ set(cubemap_resource_files
     "cubemap.vert.qsb"
 )
 
-qt_add_resource(cubemap "cubemap"
+qt_internal_add_resource(cubemap "cubemap"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/cubemap_render/CMakeLists.txt b/tests/manual/rhi/cubemap_render/CMakeLists.txt
index c21ebc40a3..66abf688ea 100644
--- a/tests/manual/rhi/cubemap_render/CMakeLists.txt
+++ b/tests/manual/rhi/cubemap_render/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cubemap_render Binary:
 #####################################################################
 
-qt_add_manual_test(cubemap_render
+qt_internal_add_manual_test(cubemap_render
     GUI
     SOURCES
         cubemap_render.cpp
@@ -23,7 +23,7 @@ set(cubemap_render_resource_files
     "cubemap_sample.vert.qsb"
 )
 
-qt_add_resource(cubemap_render "cubemap_render"
+qt_internal_add_resource(cubemap_render "cubemap_render"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
index 759c722006..dd59b1791c 100644
--- a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
+++ b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cubemap_scissor Binary:
 #####################################################################
 
-qt_add_manual_test(cubemap_scissor
+qt_internal_add_manual_test(cubemap_scissor
     GUI
     SOURCES
         cubemap_scissor.cpp
@@ -29,7 +29,7 @@ set(cubemap_scissor_resource_files
     "../cubemap/cubemap.vert.qsb"
 )
 
-qt_add_resource(cubemap_scissor "cubemap_scissor"
+qt_internal_add_resource(cubemap_scissor "cubemap_scissor"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt b/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt
index 935f653742..e50a3c841f 100644
--- a/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt
+++ b/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## float16texture_with_compute Binary:
 #####################################################################
 
-qt_add_manual_test(float16texture_with_compute
+qt_internal_add_manual_test(float16texture_with_compute
     GUI
     SOURCES
         float16texture_with_compute.cpp
@@ -31,7 +31,7 @@ set(float16texture_with_compute_resource_files
     "prefilter.comp.qsb"
 )
 
-qt_add_resource(float16texture_with_compute "float16texture_with_compute"
+qt_internal_add_resource(float16texture_with_compute "float16texture_with_compute"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/floattexture/CMakeLists.txt b/tests/manual/rhi/floattexture/CMakeLists.txt
index 241387eb4b..7748388c54 100644
--- a/tests/manual/rhi/floattexture/CMakeLists.txt
+++ b/tests/manual/rhi/floattexture/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## floattexture Binary:
 #####################################################################
 
-qt_add_manual_test(floattexture
+qt_internal_add_manual_test(floattexture
     GUI
     SOURCES
         floattexture.cpp
@@ -29,7 +29,7 @@ set(floattexture_resource_files
     "../shared/texture.vert.qsb"
 )
 
-qt_add_resource(floattexture "floattexture"
+qt_internal_add_resource(floattexture "floattexture"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
index c995f56de2..d695bcbb9b 100644
--- a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
+++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## hellominimalcrossgfxtriangle Binary:
 #####################################################################
 
-qt_add_manual_test(hellominimalcrossgfxtriangle
+qt_internal_add_manual_test(hellominimalcrossgfxtriangle
     SOURCES
         hellowindow.cpp hellowindow.h
         main.cpp
@@ -26,7 +26,7 @@ set(hellominimalcrossgfxtriangle_resource_files
     "../shared/color.vert.qsb"
 )
 
-qt_add_resource(hellominimalcrossgfxtriangle "hellominimalcrossgfxtriangle"
+qt_internal_add_resource(hellominimalcrossgfxtriangle "hellominimalcrossgfxtriangle"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/instancing/CMakeLists.txt b/tests/manual/rhi/instancing/CMakeLists.txt
index 6cc41c7a73..71de7da494 100644
--- a/tests/manual/rhi/instancing/CMakeLists.txt
+++ b/tests/manual/rhi/instancing/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## instancing Binary:
 #####################################################################
 
-qt_add_manual_test(instancing
+qt_internal_add_manual_test(instancing
     GUI
     SOURCES
         instancing.cpp
@@ -19,7 +19,7 @@ set(instancing_resource_files
     "inst.vert.qsb"
 )
 
-qt_add_resource(instancing "instancing"
+qt_internal_add_resource(instancing "instancing"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/mrt/CMakeLists.txt b/tests/manual/rhi/mrt/CMakeLists.txt
index 0df83106d0..cd30003cd8 100644
--- a/tests/manual/rhi/mrt/CMakeLists.txt
+++ b/tests/manual/rhi/mrt/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mrt Binary:
 #####################################################################
 
-qt_add_manual_test(mrt
+qt_internal_add_manual_test(mrt
     GUI
     SOURCES
         mrt.cpp
@@ -27,7 +27,7 @@ set(mrt_resource_files
     "mrt.vert.qsb"
 )
 
-qt_add_resource(mrt "mrt"
+qt_internal_add_resource(mrt "mrt"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
index 2b682d81f7..c9050bcdd9 100644
--- a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
+++ b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## msaarenderbuffer Binary:
 #####################################################################
 
-qt_add_manual_test(msaarenderbuffer
+qt_internal_add_manual_test(msaarenderbuffer
     GUI
     SOURCES
         msaarenderbuffer.cpp
@@ -33,7 +33,7 @@ set(msaarenderbuffer_resource_files
     "../shared/texture.vert.qsb"
 )
 
-qt_add_resource(msaarenderbuffer "msaarenderbuffer"
+qt_internal_add_resource(msaarenderbuffer "msaarenderbuffer"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/msaatexture/CMakeLists.txt b/tests/manual/rhi/msaatexture/CMakeLists.txt
index e2392e4c3d..a498780e4e 100644
--- a/tests/manual/rhi/msaatexture/CMakeLists.txt
+++ b/tests/manual/rhi/msaatexture/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## msaatexture Binary:
 #####################################################################
 
-qt_add_manual_test(msaatexture
+qt_internal_add_manual_test(msaatexture
     GUI
     SOURCES
         msaatexture.cpp
@@ -37,7 +37,7 @@ set(msaatexture_resource_files
     "../shared/texture_ms4.frag.qsb"
 )
 
-qt_add_resource(msaatexture "msaatexture"
+qt_internal_add_resource(msaatexture "msaatexture"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/multiwindow/CMakeLists.txt b/tests/manual/rhi/multiwindow/CMakeLists.txt
index eb6e739add..57960fc7d1 100644
--- a/tests/manual/rhi/multiwindow/CMakeLists.txt
+++ b/tests/manual/rhi/multiwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiwindow Binary:
 #####################################################################
 
-qt_add_manual_test(multiwindow
+qt_internal_add_manual_test(multiwindow
     GUI
     SOURCES
         multiwindow.cpp
@@ -26,7 +26,7 @@ set(multiwindow_resource_files
     "../shared/color.vert.qsb"
 )
 
-qt_add_resource(multiwindow "multiwindow"
+qt_internal_add_resource(multiwindow "multiwindow"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
index 2aad008e74..421042f84f 100644
--- a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
+++ b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiwindow_threaded Binary:
 #####################################################################
 
-qt_add_manual_test(multiwindow_threaded
+qt_internal_add_manual_test(multiwindow_threaded
     GUI
     SOURCES
         multiwindow_threaded.cpp
@@ -31,7 +31,7 @@ set(multiwindow_threaded_resource_files
     "../shared/texture.vert.qsb"
 )
 
-qt_add_resource(multiwindow_threaded "multiwindow_threaded"
+qt_internal_add_resource(multiwindow_threaded "multiwindow_threaded"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/offscreen/CMakeLists.txt b/tests/manual/rhi/offscreen/CMakeLists.txt
index ffda2b17b4..00a4221dc4 100644
--- a/tests/manual/rhi/offscreen/CMakeLists.txt
+++ b/tests/manual/rhi/offscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## offscreen Binary:
 #####################################################################
 
-qt_add_manual_test(offscreen
+qt_internal_add_manual_test(offscreen
     SOURCES
         offscreen.cpp
     PUBLIC_LIBRARIES
@@ -24,7 +24,7 @@ set(offscreen_resource_files
     "../shared/color.vert.qsb"
 )
 
-qt_add_resource(offscreen "offscreen"
+qt_internal_add_resource(offscreen "offscreen"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/qrhiprof/CMakeLists.txt b/tests/manual/rhi/qrhiprof/CMakeLists.txt
index a10161afaf..f064db6565 100644
--- a/tests/manual/rhi/qrhiprof/CMakeLists.txt
+++ b/tests/manual/rhi/qrhiprof/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qrhiprof Binary:
 #####################################################################
 
-qt_add_manual_test(qrhiprof
+qt_internal_add_manual_test(qrhiprof
     GUI
     SOURCES
         qrhiprof.cpp
diff --git a/tests/manual/rhi/shadowmap/CMakeLists.txt b/tests/manual/rhi/shadowmap/CMakeLists.txt
index 23e24c1762..07c25d3a07 100644
--- a/tests/manual/rhi/shadowmap/CMakeLists.txt
+++ b/tests/manual/rhi/shadowmap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## shadowmap Binary:
 #####################################################################
 
-qt_add_manual_test(shadowmap
+qt_internal_add_manual_test(shadowmap
     GUI
     SOURCES
         shadowmap.cpp
@@ -21,7 +21,7 @@ set(shadowmap_resource_files
     "shadowmap.vert.qsb"
 )
 
-qt_add_resource(shadowmap "shadowmap"
+qt_internal_add_resource(shadowmap "shadowmap"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/texuploads/CMakeLists.txt b/tests/manual/rhi/texuploads/CMakeLists.txt
index 20078d4067..ce37af18ed 100644
--- a/tests/manual/rhi/texuploads/CMakeLists.txt
+++ b/tests/manual/rhi/texuploads/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## texuploads Binary:
 #####################################################################
 
-qt_add_manual_test(texuploads
+qt_internal_add_manual_test(texuploads
     GUI
     SOURCES
         texuploads.cpp
@@ -29,7 +29,7 @@ set(texuploads_resource_files
     "../shared/texture.vert.qsb"
 )
 
-qt_add_resource(texuploads "texuploads"
+qt_internal_add_resource(texuploads "texuploads"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/triquadcube/CMakeLists.txt b/tests/manual/rhi/triquadcube/CMakeLists.txt
index c4fd5a0498..8c343890b3 100644
--- a/tests/manual/rhi/triquadcube/CMakeLists.txt
+++ b/tests/manual/rhi/triquadcube/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## triquadcube Binary:
 #####################################################################
 
-qt_add_manual_test(triquadcube
+qt_internal_add_manual_test(triquadcube
     GUI
     SOURCES
         quadrenderer.cpp quadrenderer.h
@@ -41,7 +41,7 @@ set(triquadcube_resource_files
     "../shared/texture.vert.qsb"
 )
 
-qt_add_resource(triquadcube "triquadcube"
+qt_internal_add_resource(triquadcube "triquadcube"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/shortcuts/CMakeLists.txt b/tests/manual/shortcuts/CMakeLists.txt
index e8474fc9a7..23d468e228 100644
--- a/tests/manual/shortcuts/CMakeLists.txt
+++ b/tests/manual/shortcuts/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## shortcuts Binary:
 #####################################################################
 
-qt_add_manual_test(shortcuts
+qt_internal_add_manual_test(shortcuts
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/socketengine/.prev_CMakeLists.txt b/tests/manual/socketengine/.prev_CMakeLists.txt
index a96c5b2e75..10f9c5e938 100644
--- a/tests/manual/socketengine/.prev_CMakeLists.txt
+++ b/tests/manual/socketengine/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_socketengine Binary:
 #####################################################################
 
-qt_add_manual_test(tst_socketengine
+qt_internal_add_manual_test(tst_socketengine
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/socketengine/CMakeLists.txt b/tests/manual/socketengine/CMakeLists.txt
index 81e937a3c3..02de148455 100644
--- a/tests/manual/socketengine/CMakeLists.txt
+++ b/tests/manual/socketengine/CMakeLists.txt
@@ -10,7 +10,7 @@ if (NOT QT_FEATURE_private_tests)
 endif()
 # special case end
 
-qt_add_manual_test(tst_socketengine
+qt_internal_add_manual_test(tst_socketengine
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/textrendering/glyphshaping/CMakeLists.txt b/tests/manual/textrendering/glyphshaping/CMakeLists.txt
index 0dd163183b..e0a69745e8 100644
--- a/tests/manual/textrendering/glyphshaping/CMakeLists.txt
+++ b/tests/manual/textrendering/glyphshaping/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## glyphshaping Binary:
 #####################################################################
 
-qt_add_manual_test(glyphshaping
+qt_internal_add_manual_test(glyphshaping
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/textrendering/nativetext/CMakeLists.txt b/tests/manual/textrendering/nativetext/CMakeLists.txt
index b8f215f57b..447288e6df 100644
--- a/tests/manual/textrendering/nativetext/CMakeLists.txt
+++ b/tests/manual/textrendering/nativetext/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nativetext Binary:
 #####################################################################
 
-qt_add_manual_test(nativetext
+qt_internal_add_manual_test(nativetext
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ qt_add_manual_test(nativetext
 ## Scopes:
 #####################################################################
 
-qt_extend_target(nativetext CONDITION APPLE
+qt_internal_extend_target(nativetext CONDITION APPLE
     PUBLIC_LIBRARIES
         ${FWAppKit}
         ${FWCoreGraphics}
diff --git a/tests/manual/textrendering/textperformance/CMakeLists.txt b/tests/manual/textrendering/textperformance/CMakeLists.txt
index b84db9e0aa..ed1664dd2a 100644
--- a/tests/manual/textrendering/textperformance/CMakeLists.txt
+++ b/tests/manual/textrendering/textperformance/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## textperformance Binary:
 #####################################################################
 
-qt_add_manual_test(textperformance
+qt_internal_add_manual_test(textperformance
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt
index 1545095efa..2d941a6c94 100644
--- a/tests/manual/touch/CMakeLists.txt
+++ b/tests/manual/touch/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## touch Binary:
 #####################################################################
 
-qt_add_manual_test(touch
+qt_internal_add_manual_test(touch
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/touchGraphicsItem/CMakeLists.txt b/tests/manual/touchGraphicsItem/CMakeLists.txt
index 1055a761b2..870b297ba6 100644
--- a/tests/manual/touchGraphicsItem/CMakeLists.txt
+++ b/tests/manual/touchGraphicsItem/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## touchGraphicsItem Binary:
 #####################################################################
 
-qt_add_manual_test(touchGraphicsItem
+qt_internal_add_manual_test(touchGraphicsItem
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/transientwindow/CMakeLists.txt b/tests/manual/transientwindow/CMakeLists.txt
index c3307282c1..20d37bbc69 100644
--- a/tests/manual/transientwindow/CMakeLists.txt
+++ b/tests/manual/transientwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## transientwindow Binary:
 #####################################################################
 
-qt_add_manual_test(transientwindow
+qt_internal_add_manual_test(transientwindow
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/triangulator/CMakeLists.txt b/tests/manual/triangulator/CMakeLists.txt
index d3d6a8cc1f..e9fe7f50ef 100644
--- a/tests/manual/triangulator/CMakeLists.txt
+++ b/tests/manual/triangulator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## triangulator Binary:
 #####################################################################
 
-qt_add_manual_test(triangulator
+qt_internal_add_manual_test(triangulator
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/unc/CMakeLists.txt b/tests/manual/unc/CMakeLists.txt
index edab5ef368..e8c90cbd65 100644
--- a/tests/manual/unc/CMakeLists.txt
+++ b/tests/manual/unc/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## unc Binary:
 #####################################################################
 
-qt_add_manual_test(unc
+qt_internal_add_manual_test(unc
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgetgrab/CMakeLists.txt b/tests/manual/widgetgrab/CMakeLists.txt
index 8285d19992..1ad19e581b 100644
--- a/tests/manual/widgetgrab/CMakeLists.txt
+++ b/tests/manual/widgetgrab/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## widgetgrab Binary:
 #####################################################################
 
-qt_add_manual_test(widgetgrab
+qt_internal_add_manual_test(widgetgrab
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt
index fe6202f644..e37182121b 100644
--- a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testtable1 Binary:
 #####################################################################
 
-qt_add_manual_test(testtable1
+qt_internal_add_manual_test(testtable1
     GUI
     SOURCES
         testtable1.cpp
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt
index ad27ac8698..ccb4477247 100644
--- a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testtable2 Binary:
 #####################################################################
 
-qt_add_manual_test(testtable2
+qt_internal_add_manual_test(testtable2
     GUI
     SOURCES
         testtable2.cpp
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt
index 9812b7956f..30fad7c910 100644
--- a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testtree Binary:
 #####################################################################
 
-qt_add_manual_test(testtree
+qt_internal_add_manual_test(testtree
     GUI
     SOURCES
         testtree.cpp
diff --git a/tests/manual/widgets/itemviews/delegate/CMakeLists.txt b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt
index b00639bc3f..62ff4e33ca 100644
--- a/tests/manual/widgets/itemviews/delegate/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## delegate Binary:
 #####################################################################
 
-qt_add_manual_test(delegate
+qt_internal_add_manual_test(delegate
     GUI
     SOURCES
         example.cpp
diff --git a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt
index 47d53d1646..0859204297 100644
--- a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qconcatenatetablesproxymodel Binary:
 #####################################################################
 
-qt_add_manual_test(qconcatenatetablesproxymodel
+qt_internal_add_manual_test(qconcatenatetablesproxymodel
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt
index d99ecf0f39..02dc7fd5b1 100644
--- a/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qheaderview Binary:
 #####################################################################
 
-qt_add_manual_test(qheaderview
+qt_internal_add_manual_test(qheaderview
     GUI
     SOURCES
         qheaderviewtest1.cpp
diff --git a/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt
index 06bf5b71a6..719ef928c9 100644
--- a/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtreeview Binary:
 #####################################################################
 
-qt_add_manual_test(qtreeview
+qt_internal_add_manual_test(qtreeview
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt
index ada07cd5f8..1cefae616c 100644
--- a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtreewidget Binary:
 #####################################################################
 
-qt_add_manual_test(qtreewidget
+qt_internal_add_manual_test(qtreewidget
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt
index cad99e4783..a1ff2f70da 100644
--- a/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt
+++ b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tableview-span-navigation Binary:
 #####################################################################
 
-qt_add_manual_test(tableview-span-navigation
+qt_internal_add_manual_test(tableview-span-navigation
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt
index 1f36f4c326..e6a54cfea3 100644
--- a/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt
+++ b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## layoutreplace Binary:
 #####################################################################
 
-qt_add_manual_test(layoutreplace
+qt_internal_add_manual_test(layoutreplace
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt
index 10d98cb0c5..bc076cf523 100644
--- a/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt
+++ b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtooltip Binary:
 #####################################################################
 
-qt_add_manual_test(qtooltip
+qt_internal_add_manual_test(qtooltip
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/widgets/kernel/setscreen/CMakeLists.txt b/tests/manual/widgets/kernel/setscreen/CMakeLists.txt
index 610a748830..6754450481 100644
--- a/tests/manual/widgets/kernel/setscreen/CMakeLists.txt
+++ b/tests/manual/widgets/kernel/setscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## setscreen Binary:
 #####################################################################
 
-qt_add_manual_test(setscreen
+qt_internal_add_manual_test(setscreen
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt
index de3b724196..f1b420f1b2 100644
--- a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt
+++ b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## sizeonhide Binary:
 #####################################################################
 
-qt_add_manual_test(sizeonhide
+qt_internal_add_manual_test(sizeonhide
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt
index 06e5029bb5..1e265eda2a 100644
--- a/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt
+++ b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## rubberband Binary:
 #####################################################################
 
-qt_add_manual_test(rubberband
+qt_internal_add_manual_test(rubberband
     GUI
     SOURCES
         rubberbandtest.cpp
diff --git a/tests/manual/widgets/styles/CMakeLists.txt b/tests/manual/widgets/styles/CMakeLists.txt
index 4dfa6d7d30..c134472355 100644
--- a/tests/manual/widgets/styles/CMakeLists.txt
+++ b/tests/manual/widgets/styles/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_styles Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_styles
+qt_internal_add_manual_test(tst_manual_styles
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt
index 44db18eefe..c44d839714 100644
--- a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## BigMenuCreator Binary:
 #####################################################################
 
-qt_add_manual_test(BigMenuCreator
+qt_internal_add_manual_test(BigMenuCreator
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt
index 1327ea39ef..7e973fdcf2 100644
--- a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## defaultUpMenuBar Binary:
 #####################################################################
 
-qt_add_manual_test(defaultUpMenuBar
+qt_internal_add_manual_test(defaultUpMenuBar
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt
index 40fd38edf7..b5e97479fb 100644
--- a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiscreen-menus Binary:
 #####################################################################
 
-qt_add_manual_test(multiscreen-menus
+qt_internal_add_manual_test(multiscreen-menus
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt
index e49d5ea559..183855d6b2 100644
--- a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## saveStateSize Binary:
 #####################################################################
 
-qt_add_manual_test(saveStateSize
+qt_internal_add_manual_test(saveStateSize
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt b/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt
index cb4ee1f4d1..2b8b71eb44 100644
--- a/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtabbar Binary:
 #####################################################################
 
-qt_add_manual_test(qtabbar
+qt_internal_add_manual_test(qtabbar
     GUI
     PUBLIC_LIBRARIES
         Qt::Gui
diff --git a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt
index 4be0bcf05e..f1a4a13462 100644
--- a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt
+++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## menuOnMultiScreens Binary:
 #####################################################################
 
-qt_add_manual_test(menuOnMultiScreens
+qt_internal_add_manual_test(menuOnMultiScreens
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/windowchildgeometry/CMakeLists.txt b/tests/manual/windowchildgeometry/CMakeLists.txt
index 22b4af820b..17117ce80f 100644
--- a/tests/manual/windowchildgeometry/CMakeLists.txt
+++ b/tests/manual/windowchildgeometry/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## windowchildgeometry Binary:
 #####################################################################
 
-qt_add_manual_test(windowchildgeometry
+qt_internal_add_manual_test(windowchildgeometry
     GUI
     SOURCES
         ../windowflags/controls.cpp ../windowflags/controls.h
diff --git a/tests/manual/windowflags/CMakeLists.txt b/tests/manual/windowflags/CMakeLists.txt
index 179acbef72..5c4941bec8 100644
--- a/tests/manual/windowflags/CMakeLists.txt
+++ b/tests/manual/windowflags/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_windowflags Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_windowflags
+qt_internal_add_manual_test(tst_manual_windowflags
     GUI
     SOURCES
         controllerwindow.cpp controllerwindow.h
diff --git a/tests/manual/windowgeometry/CMakeLists.txt b/tests/manual/windowgeometry/CMakeLists.txt
index 1c158a513a..0467958e59 100644
--- a/tests/manual/windowgeometry/CMakeLists.txt
+++ b/tests/manual/windowgeometry/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## windowgeometry Binary:
 #####################################################################
 
-qt_add_manual_test(windowgeometry
+qt_internal_add_manual_test(windowgeometry
     GUI
     SOURCES
         ../windowflags/controls.cpp ../windowflags/controls.h
diff --git a/tests/manual/windowmodality/CMakeLists.txt b/tests/manual/windowmodality/CMakeLists.txt
index 02280cef9b..63a18701ba 100644
--- a/tests/manual/windowmodality/CMakeLists.txt
+++ b/tests/manual/windowmodality/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## windowmodality Binary:
 #####################################################################
 
-qt_add_manual_test(windowmodality
+qt_internal_add_manual_test(windowmodality
     GUI
     SOURCES
         dialog.ui
diff --git a/tests/manual/windowtransparency/CMakeLists.txt b/tests/manual/windowtransparency/CMakeLists.txt
index 6b245898dc..c35f0bebd9 100644
--- a/tests/manual/windowtransparency/CMakeLists.txt
+++ b/tests/manual/windowtransparency/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## windowtransparency Binary:
 #####################################################################
 
-qt_add_manual_test(windowtransparency
+qt_internal_add_manual_test(windowtransparency
     SOURCES
         windowtransparency.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/xcb_gl_integration/CMakeLists.txt b/tests/manual/xcb_gl_integration/CMakeLists.txt
index 6d3f32e68e..45faaf10f9 100644
--- a/tests/manual/xcb_gl_integration/CMakeLists.txt
+++ b/tests/manual/xcb_gl_integration/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## xcb_gl_integration Binary:
 #####################################################################
 
-qt_add_manual_test(xcb_gl_integration
+qt_internal_add_manual_test(xcb_gl_integration
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/xembed-raster/CMakeLists.txt b/tests/manual/xembed-raster/CMakeLists.txt
index be32275222..20ec90e2c6 100644
--- a/tests/manual/xembed-raster/CMakeLists.txt
+++ b/tests/manual/xembed-raster/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_rasterwindow Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_rasterwindow
+qt_internal_add_manual_test(tst_manual_rasterwindow
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/xembed-widgets/CMakeLists.txt b/tests/manual/xembed-widgets/CMakeLists.txt
index 2164095c78..411df543e3 100644
--- a/tests/manual/xembed-widgets/CMakeLists.txt
+++ b/tests/manual/xembed-widgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_manual_lineedits Binary:
 #####################################################################
 
-qt_add_manual_test(tst_manual_lineedits
+qt_internal_add_manual_test(tst_manual_lineedits
     GUI
     SOURCES
         main.cpp