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>

50 files changed, 60 insertions, 60 deletions

diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
index a308721727..d192549f94 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractbutton Test:
 #####################################################################
 
-qt_add_test(tst_qabstractbutton
+qt_internal_add_test(tst_qabstractbutton
     SOURCES
         tst_qabstractbutton.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt
index 4a72b409e3..d756d28952 100644
--- a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractscrollarea Test:
 #####################################################################
 
-qt_add_test(tst_qabstractscrollarea
+qt_internal_add_test(tst_qabstractscrollarea
     SOURCES
         tst_qabstractscrollarea.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
index d2dbcb3585..37c725c391 100644
--- a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractslider Test:
 #####################################################################
 
-qt_add_test(tst_qabstractslider
+qt_internal_add_test(tst_qabstractslider
     SOURCES
         tst_qabstractslider.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
index 3ca8eb63d0..df077a0bbd 100644
--- a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractspinbox Test:
 #####################################################################
 
-qt_add_test(tst_qabstractspinbox
+qt_internal_add_test(tst_qabstractspinbox
     SOURCES
         tst_qabstractspinbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt
index 822fdf223c..1f876ec5d6 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbuttongroup Test:
 #####################################################################
 
-qt_add_test(tst_qbuttongroup
+qt_internal_add_test(tst_qbuttongroup
     SOURCES
         tst_qbuttongroup.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt
index 051b00d0bb..853ff95a03 100644
--- a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcalendarwidget Test:
 #####################################################################
 
-qt_add_test(tst_qcalendarwidget
+qt_internal_add_test(tst_qcalendarwidget
     SOURCES
         tst_qcalendarwidget.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt
index 1c44111753..df03bea079 100644
--- a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcheckbox Test:
 #####################################################################
 
-qt_add_test(tst_qcheckbox
+qt_internal_add_test(tst_qcheckbox
     SOURCES
         tst_qcheckbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
index a0aabd6773..a1dded1384 100644
--- a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "qtlogo.png")
 list(APPEND test_data "qtlogoinverted.png")
 
-qt_add_test(tst_qcombobox
+qt_internal_add_test(tst_qcombobox
     SOURCES
         tst_qcombobox.cpp
     DEFINES
diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt
index 5beababe97..dfb555673a 100644
--- a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcommandlinkbutton Test:
 #####################################################################
 
-qt_add_test(tst_qcommandlinkbutton
+qt_internal_add_test(tst_qcommandlinkbutton
     SOURCES
         tst_qcommandlinkbutton.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
index 8db1423992..8ddb0a3b0d 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdatetimeedit Test:
 #####################################################################
 
-qt_add_test(tst_qdatetimeedit
+qt_internal_add_test(tst_qdatetimeedit
     SOURCES
         tst_qdatetimeedit.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qdial/CMakeLists.txt b/tests/auto/widgets/widgets/qdial/CMakeLists.txt
index 162eda24eb..e76cc4a7db 100644
--- a/tests/auto/widgets/widgets/qdial/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdial/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdial Test:
 #####################################################################
 
-qt_add_test(tst_qdial
+qt_internal_add_test(tst_qdial
     SOURCES
         tst_qdial.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
index 16ad2286fb..c42fccd87f 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdialogbuttonbox Test:
 #####################################################################
 
-qt_add_test(tst_qdialogbuttonbox
+qt_internal_add_test(tst_qdialogbuttonbox
     SOURCES
         tst_qdialogbuttonbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
index 0f3e83cead..adf48ddb11 100644
--- a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdockwidget Test:
 #####################################################################
 
-qt_add_test(tst_qdockwidget
+qt_internal_add_test(tst_qdockwidget
     SOURCES
         tst_qdockwidget.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt
index bef0745d01..6be779bb81 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdoublespinbox Test:
 #####################################################################
 
-qt_add_test(tst_qdoublespinbox
+qt_internal_add_test(tst_qdoublespinbox
     SOURCES
         tst_qdoublespinbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt
index 6456e5b7c5..d5e32e9337 100644
--- a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfocusframe Test:
 #####################################################################
 
-qt_add_test(tst_qfocusframe
+qt_internal_add_test(tst_qfocusframe
     SOURCES
         tst_qfocusframe.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt
index 1500be0023..869666cb19 100644
--- a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfontcombobox Test:
 #####################################################################
 
-qt_add_test(tst_qfontcombobox
+qt_internal_add_test(tst_qfontcombobox
     SOURCES
         tst_qfontcombobox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt
index 89f91d1967..6d0c10d4ba 100644
--- a/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qframe
+qt_internal_add_test(tst_qframe
     SOURCES
         tst_qframe.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt
index be08a9b797..968f9ac3f3 100644
--- a/tests/auto/widgets/widgets/qframe/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qframe
+qt_internal_add_test(tst_qframe
     LOWDPI # special case
     SOURCES
         tst_qframe.cpp
diff --git a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt
index d71fcd18d8..ed08cce5f2 100644
--- a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qgroupbox Test:
 #####################################################################
 
-qt_add_test(tst_qgroupbox
+qt_internal_add_test(tst_qgroupbox
     SOURCES
         tst_qgroupbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt
index e373c14ea4..a016280b5d 100644
--- a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qkeysequenceedit Test:
 #####################################################################
 
-qt_add_test(tst_qkeysequenceedit
+qt_internal_add_test(tst_qkeysequenceedit
     SOURCES
         tst_qkeysequenceedit.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
index 6f8ac33b83..bbd51a206c 100644
--- a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob
     *.png)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qlabel
+qt_internal_add_test(tst_qlabel
     SOURCES
         tst_qlabel.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt
index 739b9bb55f..4d6a8ff77a 100644
--- a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlcdnumber Test:
 #####################################################################
 
-qt_add_test(tst_qlcdnumber
+qt_internal_add_test(tst_qlcdnumber
     SOURCES
         tst_qlcdnumber.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
index cdb026c220..8cdee2a111 100644
--- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlineedit Test:
 #####################################################################
 
-qt_add_test(tst_qlineedit
+qt_internal_add_test(tst_qlineedit
     SOURCES
         tst_qlineedit.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ qt_add_test(tst_qlineedit
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qlineedit CONDITION MACOS
+qt_internal_extend_target(tst_qlineedit CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
index 93d0e212c6..85ce87f764 100644
--- a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmainwindow Test:
 #####################################################################
 
-qt_add_test(tst_qmainwindow
+qt_internal_add_test(tst_qmainwindow
     SOURCES
         tst_qmainwindow.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
index aa694bd9b7..9586d69352 100644
--- a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmdiarea Test:
 #####################################################################
 
-qt_add_test(tst_qmdiarea
+qt_internal_add_test(tst_qmdiarea
     SOURCES
         tst_qmdiarea.cpp
     DEFINES
@@ -21,12 +21,12 @@ qt_add_test(tst_qmdiarea
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmdiarea CONDITION TARGET Qt::OpenGL
+qt_internal_extend_target(tst_qmdiarea CONDITION TARGET Qt::OpenGL
     PUBLIC_LIBRARIES
         Qt::OpenGL
 )
 
-qt_extend_target(tst_qmdiarea CONDITION APPLE
+qt_internal_extend_target(tst_qmdiarea CONDITION APPLE
     PUBLIC_LIBRARIES
         ${FWSecurity}
 )
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
index 47c8078777..2c72f7d4e1 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmdisubwindow Test:
 #####################################################################
 
-qt_add_test(tst_qmdisubwindow
+qt_internal_add_test(tst_qmdisubwindow
     SOURCES
         tst_qmdisubwindow.cpp
     DEFINES
diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
index 493e8af6b1..8e596a6b5b 100644
--- a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmenu Test:
 #####################################################################
 
-qt_add_test(tst_qmenu
+qt_internal_add_test(tst_qmenu
     SOURCES
         tst_qmenu.cpp
     PUBLIC_LIBRARIES
@@ -17,14 +17,14 @@ qt_add_test(tst_qmenu
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmenu CONDITION MACOS
+qt_internal_extend_target(tst_qmenu CONDITION MACOS
     SOURCES
         tst_qmenu_mac.mm
     PUBLIC_LIBRARIES
         objc
 )
 
-qt_extend_target(tst_qmenu CONDITION NOT MACOS
+qt_internal_extend_target(tst_qmenu CONDITION NOT MACOS
     DEFINES
         QTEST_QPA_MOUSE_HANDLING
 )
diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
index 1b412981d8..63f690a2ed 100644
--- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmenubar Test:
 #####################################################################
 
-qt_add_test(tst_qmenubar
+qt_internal_add_test(tst_qmenubar
     SOURCES
         tst_qmenubar.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ qt_add_test(tst_qmenubar
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmenubar CONDITION MACOS
+qt_internal_extend_target(tst_qmenubar CONDITION MACOS
     SOURCES
         tst_qmenubar_mac.mm
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt
index d1af2e811c..9a724eccc1 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qopenglwidget Test:
 #####################################################################
 
-qt_add_test(tst_qopenglwidget
+qt_internal_add_test(tst_qopenglwidget
     SOURCES
         tst_qopenglwidget.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
index 036f3316d9..f32b547329 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qopenglwidget Test:
 #####################################################################
 
-qt_add_test(tst_qopenglwidget
+qt_internal_add_test(tst_qopenglwidget
     LOWDPI # special case
     SOURCES
         tst_qopenglwidget.cpp
diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
index 994f2b97ab..a339b158c2 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qplaintextedit Test:
 #####################################################################
 
-qt_add_test(tst_qplaintextedit
+qt_internal_add_test(tst_qplaintextedit
     SOURCES
         tst_qplaintextedit.cpp
     INCLUDE_DIRECTORIES
@@ -19,7 +19,7 @@ qt_add_test(tst_qplaintextedit
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qplaintextedit CONDITION MACOS
+qt_internal_extend_target(tst_qplaintextedit CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt
index 34131ba34e..699ba0a2f1 100644
--- a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qprogressbar Test:
 #####################################################################
 
-qt_add_test(tst_qprogressbar
+qt_internal_add_test(tst_qprogressbar
     SOURCES
         tst_qprogressbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt
index 186bce967f..0ec5c1fe09 100644
--- a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpushbutton Test:
 #####################################################################
 
-qt_add_test(tst_qpushbutton
+qt_internal_add_test(tst_qpushbutton
     SOURCES
         tst_qpushbutton.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt
index 194f6689fe..8ce8aadea8 100644
--- a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qradiobutton Test:
 #####################################################################
 
-qt_add_test(tst_qradiobutton
+qt_internal_add_test(tst_qradiobutton
     SOURCES
         tst_qradiobutton.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt
index 0de4565b5d..a10c911286 100644
--- a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qscrollarea Test:
 #####################################################################
 
-qt_add_test(tst_qscrollarea
+qt_internal_add_test(tst_qscrollarea
     SOURCES
         tst_qscrollarea.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
index 8b9a3d85ce..fbaba594cf 100644
--- a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qscrollbar Test:
 #####################################################################
 
-qt_add_test(tst_qscrollbar
+qt_internal_add_test(tst_qscrollbar
     SOURCES
         tst_qscrollbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt
index 084b6b1404..c05b601d87 100644
--- a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsizegrip Test:
 #####################################################################
 
-qt_add_test(tst_qsizegrip
+qt_internal_add_test(tst_qsizegrip
     SOURCES
         tst_qsizegrip.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/widgets/widgets/qslider/CMakeLists.txt b/tests/auto/widgets/widgets/qslider/CMakeLists.txt
index a34bfc1ef2..4fe495b3c5 100644
--- a/tests/auto/widgets/widgets/qslider/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qslider/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qslider Test:
 #####################################################################
 
-qt_add_test(tst_qslider
+qt_internal_add_test(tst_qslider
     SOURCES
         tst_qslider.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt
index 9b1dbaa337..adc0ee093f 100644
--- a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qspinbox Test:
 #####################################################################
 
-qt_add_test(tst_qspinbox
+qt_internal_add_test(tst_qspinbox
     SOURCES
         tst_qspinbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt
index fba11c19d7..7c13db39a2 100644
--- a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsplashscreen Test:
 #####################################################################
 
-qt_add_test(tst_qsplashscreen
+qt_internal_add_test(tst_qsplashscreen
     SOURCES
         tst_qsplashscreen.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt
index d25ce98e6c..6cbbfd3792 100644
--- a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "extradata.txt")
 list(APPEND test_data "setSizes3.dat")
 
-qt_add_test(tst_qsplitter
+qt_internal_add_test(tst_qsplitter
     SOURCES
         tst_qsplitter.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt
index 64a97eb7b7..7c99df28a4 100644
--- a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstackedwidget Test:
 #####################################################################
 
-qt_add_test(tst_qstackedwidget
+qt_internal_add_test(tst_qstackedwidget
     SOURCES
         tst_qstackedwidget.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt
index e5f731d9eb..e4e19e230e 100644
--- a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstatusbar Test:
 #####################################################################
 
-qt_add_test(tst_qstatusbar
+qt_internal_add_test(tst_qstatusbar
     SOURCES
         tst_qstatusbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt
index 4df38be259..edc90d3138 100644
--- a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtabbar Test:
 #####################################################################
 
-qt_add_test(tst_qtabbar
+qt_internal_add_test(tst_qtabbar
     SOURCES
         tst_qtabbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
index f433986a8b..d0689d0b66 100644
--- a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtabwidget Test:
 #####################################################################
 
-qt_add_test(tst_qtabwidget
+qt_internal_add_test(tst_qtabwidget
     SOURCES
         tst_qtabwidget.cpp
     INCLUDE_DIRECTORIES
@@ -18,7 +18,7 @@ qt_add_test(tst_qtabwidget
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtabwidget CONDITION WIN32
+qt_internal_extend_target(tst_qtabwidget CONDITION WIN32
     PUBLIC_LIBRARIES
         user32
 )
diff --git a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt
index 8f1ddaf3bd..170ac1e139 100644
--- a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt
@@ -19,7 +19,7 @@ file(GLOB_RECURSE test_data_glob
     subdir/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qtextbrowser
+qt_internal_add_test(tst_qtextbrowser
     SOURCES
         tst_qtextbrowser.cpp
     PUBLIC_LIBRARIES
@@ -31,7 +31,7 @@ qt_add_test(tst_qtextbrowser
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtextbrowser CONDITION builtin_testdata
+qt_internal_extend_target(tst_qtextbrowser CONDITION builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
index df973fe087..e90b59ccb8 100644
--- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "fullWidthSelection")
 
-qt_add_test(tst_qtextedit
+qt_internal_add_test(tst_qtextedit
     SOURCES
         tst_qtextedit.cpp
     PUBLIC_LIBRARIES
@@ -22,7 +22,7 @@ qt_add_test(tst_qtextedit
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtextedit CONDITION MACOS
+qt_internal_extend_target(tst_qtextedit CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
index afe50c1f13..79b4816d53 100644
--- a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtoolbar Test:
 #####################################################################
 
-qt_add_test(tst_qtoolbar
+qt_internal_add_test(tst_qtoolbar
     SOURCES
         tst_qtoolbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt
index 1692176f50..bb50233c6e 100644
--- a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtoolbox Test:
 #####################################################################
 
-qt_add_test(tst_qtoolbox
+qt_internal_add_test(tst_qtoolbox
     SOURCES
         tst_qtoolbox.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt
index 42d7cf73f1..b27d88f503 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtoolbutton Test:
 #####################################################################
 
-qt_add_test(tst_qtoolbutton
+qt_internal_add_test(tst_qtoolbutton
     SOURCES
         tst_qtoolbutton.cpp
     PUBLIC_LIBRARIES