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>

28 files changed, 41 insertions, 41 deletions

diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
index 28df19d195..f78e1d81c7 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstracttextdocumentlayout Test:
 #####################################################################
 
-qt_add_test(tst_qabstracttextdocumentlayout
+qt_internal_add_test(tst_qabstracttextdocumentlayout
     SOURCES
         tst_qabstracttextdocumentlayout.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qcssparser/CMakeLists.txt b/tests/auto/gui/text/qcssparser/CMakeLists.txt
index dc86787c45..adb3e6269c 100644
--- a/tests/auto/gui/text/qcssparser/CMakeLists.txt
+++ b/tests/auto/gui/text/qcssparser/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 # Collect test data
 list(APPEND test_data "testdata")
 
-qt_add_test(tst_qcssparser
+qt_internal_add_test(tst_qcssparser
     SOURCES
         tst_qcssparser.cpp
     DEFINES
@@ -48,7 +48,7 @@ if(ANDROID)
         "testdata/scanner/unicode/output"
     )
 
-    qt_add_resource(tst_qcssparser "testdata"
+    qt_internal_add_resource(tst_qcssparser "testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/text/qfont/CMakeLists.txt b/tests/auto/gui/text/qfont/CMakeLists.txt
index b7e30318fb..eb1f9747b2 100644
--- a/tests/auto/gui/text/qfont/CMakeLists.txt
+++ b/tests/auto/gui/text/qfont/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfont Test:
 #####################################################################
 
-qt_add_test(tst_qfont
+qt_internal_add_test(tst_qfont
     SOURCES
         tst_qfont.cpp
     PUBLIC_LIBRARIES
@@ -18,7 +18,7 @@ set(testfont_resource_files
     "weirdfont.otf"
 )
 
-qt_add_resource(tst_qfont "testfont"
+qt_internal_add_resource(tst_qfont "testfont"
     PREFIX
         "/"
     FILES
@@ -29,7 +29,7 @@ qt_add_resource(tst_qfont "testfont"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qfont CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qfont CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qfontcache/CMakeLists.txt b/tests/auto/gui/text/qfontcache/CMakeLists.txt
index 374854b410..fb93c91e0c 100644
--- a/tests/auto/gui/text/qfontcache/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontcache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfontcache Test:
 #####################################################################
 
-qt_add_test(tst_qfontcache
+qt_internal_add_test(tst_qfontcache
     SOURCES
         tst_qfontcache.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
index f6ff9e8e7d..73ab56d49f 100644
--- a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "LED_REAL.TTF")
 
-qt_add_test(tst_qfontdatabase
+qt_internal_add_test(tst_qfontdatabase
     SOURCES
         tst_qfontdatabase.cpp
     PUBLIC_LIBRARIES
@@ -38,7 +38,7 @@ set(testdata_resource_files
     "LED_REAL.TTF"
 )
 
-qt_add_resource(tst_qfontdatabase "testdata"
+qt_internal_add_resource(tst_qfontdatabase "testdata"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
index b0b8eb3f42..d7a22671d6 100644
--- a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfontmetrics Test:
 #####################################################################
 
-qt_add_test(tst_qfontmetrics
+qt_internal_add_test(tst_qfontmetrics
     SOURCES
         tst_qfontmetrics.cpp
     PUBLIC_LIBRARIES
@@ -22,7 +22,7 @@ set(testfont_resource_files
     "ucs4font.ttf"
 )
 
-qt_add_resource(tst_qfontmetrics "testfont"
+qt_internal_add_resource(tst_qfontmetrics "testfont"
     PREFIX
         "/fonts"
     FILES
diff --git a/tests/auto/gui/text/qglyphrun/CMakeLists.txt b/tests/auto/gui/text/qglyphrun/CMakeLists.txt
index 7ea92f2924..b0585af16f 100644
--- a/tests/auto/gui/text/qglyphrun/CMakeLists.txt
+++ b/tests/auto/gui/text/qglyphrun/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qglyphrun Test:
 #####################################################################
 
-qt_add_test(tst_qglyphrun
+qt_internal_add_test(tst_qglyphrun
     SOURCES
         tst_qglyphrun.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(testdata_resource_files
     "../../../shared/resources/test.ttf"
 )
 
-qt_add_resource(tst_qglyphrun "testdata"
+qt_internal_add_resource(tst_qglyphrun "testdata"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
index f5cdd63ec0..048a96ef77 100644
--- a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
+++ b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qinputcontrol Test:
 #####################################################################
 
-qt_add_test(tst_qinputcontrol
+qt_internal_add_test(tst_qinputcontrol
     SOURCES
         tst_qinputcontrol.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qrawfont/CMakeLists.txt b/tests/auto/gui/text/qrawfont/CMakeLists.txt
index f51d4ec13d..04db8d8760 100644
--- a/tests/auto/gui/text/qrawfont/CMakeLists.txt
+++ b/tests/auto/gui/text/qrawfont/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrawfont Test:
 #####################################################################
 
-qt_add_test(tst_qrawfont
+qt_internal_add_test(tst_qrawfont
     SOURCES
         tst_qrawfont.cpp
     PUBLIC_LIBRARIES
@@ -23,7 +23,7 @@ set(testdata_resource_files
     "testfont_os2_v1.ttf"
 )
 
-qt_add_resource(tst_qrawfont "testdata"
+qt_internal_add_resource(tst_qrawfont "testdata"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qstatictext/CMakeLists.txt b/tests/auto/gui/text/qstatictext/CMakeLists.txt
index 1c182b3659..a7ba4e392a 100644
--- a/tests/auto/gui/text/qstatictext/CMakeLists.txt
+++ b/tests/auto/gui/text/qstatictext/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstatictext Test:
 #####################################################################
 
-qt_add_test(tst_qstatictext
+qt_internal_add_test(tst_qstatictext
     SOURCES
         tst_qstatictext.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qstatictext
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
+qt_internal_extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
index 4c66cf94a7..9ac732cee0 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
+++ b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsyntaxhighlighter Test:
 #####################################################################
 
-qt_add_test(tst_qsyntaxhighlighter
+qt_internal_add_test(tst_qsyntaxhighlighter
     SOURCES
         tst_qsyntaxhighlighter.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qsyntaxhighlighter
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qtextblock/CMakeLists.txt b/tests/auto/gui/text/qtextblock/CMakeLists.txt
index c186fa8a75..aedd6c27a3 100644
--- a/tests/auto/gui/text/qtextblock/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextblock/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextblock Test:
 #####################################################################
 
-qt_add_test(tst_qtextblock
+qt_internal_add_test(tst_qtextblock
     SOURCES
         tst_qtextblock.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextcursor/CMakeLists.txt b/tests/auto/gui/text/qtextcursor/CMakeLists.txt
index 2a48931662..a82dc928e9 100644
--- a/tests/auto/gui/text/qtextcursor/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextcursor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextcursor Test:
 #####################################################################
 
-qt_add_test(tst_qtextcursor
+qt_internal_add_test(tst_qtextcursor
     SOURCES
         tst_qtextcursor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextdocument/CMakeLists.txt b/tests/auto/gui/text/qtextdocument/CMakeLists.txt
index e99604e32a..bff5cabfb7 100644
--- a/tests/auto/gui/text/qtextdocument/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocument/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextdocument Test:
 #####################################################################
 
-qt_add_test(tst_qtextdocument
+qt_internal_add_test(tst_qtextdocument
     SOURCES
         common.h
         tst_qtextdocument.cpp
diff --git a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
index 03f36c3f6a..6f1207c49a 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextdocumentfragment Test:
 #####################################################################
 
-qt_add_test(tst_qtextdocumentfragment
+qt_internal_add_test(tst_qtextdocumentfragment
     SOURCES
         tst_qtextdocumentfragment.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
index 11dda5929e..da41073962 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextdocumentlayout Test:
 #####################################################################
 
-qt_add_test(tst_qtextdocumentlayout
+qt_internal_add_test(tst_qtextdocumentlayout
     SOURCES
         tst_qtextdocumentlayout.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qtextdocumentlayout
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qtextformat/CMakeLists.txt b/tests/auto/gui/text/qtextformat/CMakeLists.txt
index 31320cd14b..cacd7fbd18 100644
--- a/tests/auto/gui/text/qtextformat/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextformat/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextformat Test:
 #####################################################################
 
-qt_add_test(tst_qtextformat
+qt_internal_add_test(tst_qtextformat
     SOURCES
         tst_qtextformat.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextlayout/CMakeLists.txt b/tests/auto/gui/text/qtextlayout/CMakeLists.txt
index a899375497..3fb5dea8b9 100644
--- a/tests/auto/gui/text/qtextlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextlayout Test:
 #####################################################################
 
-qt_add_test(tst_qtextlayout
+qt_internal_add_test(tst_qtextlayout
     SOURCES
         tst_qtextlayout.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextlist/CMakeLists.txt b/tests/auto/gui/text/qtextlist/CMakeLists.txt
index 9ba6d82660..2f325d5e17 100644
--- a/tests/auto/gui/text/qtextlist/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextlist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextlist Test:
 #####################################################################
 
-qt_add_test(tst_qtextlist
+qt_internal_add_test(tst_qtextlist
     SOURCES
         ../qtextdocument/common.h
         tst_qtextlist.cpp
diff --git a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
index eb5d34cbac..cf14f38b5f 100644
--- a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND test_data "data/headingBulletsContinuations.md")
 list(APPEND test_data "data/fuzz20450.md")
 list(APPEND test_data "data/fuzz20580.md")
 
-qt_add_test(tst_qtextmarkdownimporter
+qt_internal_add_test(tst_qtextmarkdownimporter
     SOURCES
         tst_qtextmarkdownimporter.cpp
     DEFINES
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
index 008f501e23..d8815c64f6 100644
--- a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "data/example.md")
 list(APPEND test_data "data/blockquotes.md")
 
-qt_add_test(tst_qtextmarkdownwriter
+qt_internal_add_test(tst_qtextmarkdownwriter
     SOURCES
         tst_qtextmarkdownwriter.cpp
     DEFINES
diff --git a/tests/auto/gui/text/qtextobject/CMakeLists.txt b/tests/auto/gui/text/qtextobject/CMakeLists.txt
index 94cd60d6a6..07ea132de0 100644
--- a/tests/auto/gui/text/qtextobject/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextobject Test:
 #####################################################################
 
-qt_add_test(tst_qtextobject
+qt_internal_add_test(tst_qtextobject
     SOURCES
         tst_qtextobject.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qtextobject
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
index 70f73f0bad..16c86c4977 100644
--- a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextodfwriter Test:
 #####################################################################
 
-qt_add_test(tst_qtextodfwriter
+qt_internal_add_test(tst_qtextodfwriter
     SOURCES
         tst_qtextodfwriter.cpp
     DEFINES
diff --git a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
index 82861b9b8c..49cfcfab6a 100644
--- a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 ## tst_qtextpiecetable Test:
 #####################################################################
 
-qt_add_test(tst_qtextpiecetable
+qt_internal_add_test(tst_qtextpiecetable
     SOURCES
         ../qtextdocument/common.h
         tst_qtextpiecetable.cpp
diff --git a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
index 8bd9909fe1..01d418ebd4 100644
--- a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextscriptengine Test:
 #####################################################################
 
-qt_add_test(tst_qtextscriptengine
+qt_internal_add_test(tst_qtextscriptengine
     SOURCES
         tst_qtextscriptengine.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
index 9bc97be6a3..d3b6b1dc6d 100644
--- a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## generate Binary:
 #####################################################################
 
-qt_add_executable(generate
+qt_internal_add_executable(generate
     GUI
     SOURCES
         main.cpp
diff --git a/tests/auto/gui/text/qtexttable/CMakeLists.txt b/tests/auto/gui/text/qtexttable/CMakeLists.txt
index 036d39bbff..94d33d3530 100644
--- a/tests/auto/gui/text/qtexttable/CMakeLists.txt
+++ b/tests/auto/gui/text/qtexttable/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtexttable Test:
 #####################################################################
 
-qt_add_test(tst_qtexttable
+qt_internal_add_test(tst_qtexttable
     SOURCES
         tst_qtexttable.cpp
     PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ qt_add_test(tst_qtexttable
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qzip/CMakeLists.txt b/tests/auto/gui/text/qzip/CMakeLists.txt
index 02620d5e64..7240a611d2 100644
--- a/tests/auto/gui/text/qzip/CMakeLists.txt
+++ b/tests/auto/gui/text/qzip/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "testdata")
 
-qt_add_test(tst_qzip
+qt_internal_add_test(tst_qzip
     SOURCES
         tst_qzip.cpp
     PUBLIC_LIBRARIES
@@ -26,7 +26,7 @@ if(ANDROID)
         "testdata/test.zip"
     )
 
-    qt_add_resource(tst_qzip "testdata"
+    qt_internal_add_resource(tst_qzip "testdata"
         PREFIX
             "/"
         FILES