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>

11 files changed, 29 insertions, 29 deletions

diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
index b97733003b..704c51a6be 100644
--- a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
+++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     icons/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qicoimageformat
+qt_internal_add_test(tst_qicoimageformat
     SOURCES
         tst_qicoimageformat.cpp
     PUBLIC_LIBRARIES
@@ -40,7 +40,7 @@ if(ANDROID)
         "icons/valid/yellow.cur"
     )
 
-    qt_add_resource(tst_qicoimageformat "qicoimageformat"
+    qt_internal_add_resource(tst_qicoimageformat "qicoimageformat"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/image/qicon/CMakeLists.txt b/tests/auto/gui/image/qicon/CMakeLists.txt
index 48ec1c348c..5f6b139205 100644
--- a/tests/auto/gui/image/qicon/CMakeLists.txt
+++ b/tests/auto/gui/image/qicon/CMakeLists.txt
@@ -30,7 +30,7 @@ file(GLOB_RECURSE test_data_glob
     *.svgz)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qicon
+qt_internal_add_test(tst_qicon
     SOURCES
         tst_qicon.cpp
     PUBLIC_LIBRARIES
@@ -69,7 +69,7 @@ set(tst_qicon_resource_files
     "tst_qicon.cpp"
 )
 
-qt_add_resource(tst_qicon "tst_qicon"
+qt_internal_add_resource(tst_qicon "tst_qicon"
     PREFIX
         "/"
     FILES
@@ -79,7 +79,7 @@ set(qmake_immediate_resource_files
     "tst_qicon.cpp"
 )
 
-qt_add_resource(tst_qicon "qmake_immediate"
+qt_internal_add_resource(tst_qicon "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -90,7 +90,7 @@ qt_add_resource(tst_qicon "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qicon CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qicon CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
index 8113422c1e..989cf1f44d 100644
--- a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
+++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     icons/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qiconhighdpi
+qt_internal_add_test(tst_qiconhighdpi
     SOURCES
         tst_qiconhighdpi.cpp
     PUBLIC_LIBRARIES
@@ -28,7 +28,7 @@ set(tst_qiconhighdpi_resource_files
     "icons/testtheme/index.theme"
 )
 
-qt_add_resource(tst_qiconhighdpi "tst_qiconhighdpi"
+qt_internal_add_resource(tst_qiconhighdpi "tst_qiconhighdpi"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt
index a9e3b783a7..85f3fd1c76 100644
--- a/tests/auto/gui/image/qimage/CMakeLists.txt
+++ b/tests/auto/gui/image/qimage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qimage
+qt_internal_add_test(tst_qimage
     SOURCES
         tst_qimage.cpp
     PUBLIC_LIBRARIES
@@ -46,7 +46,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "images/jpeg_exif_orientation_value_8.jpg"
     )
 
-    qt_add_resource(tst_qimage "qimage"
+    qt_internal_add_resource(tst_qimage "qimage"
         PREFIX
             "/"
         FILES
@@ -54,13 +54,13 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
     )
 endif()
 
-qt_extend_target(tst_qimage CONDITION WIN32
+qt_internal_extend_target(tst_qimage CONDITION WIN32
     PUBLIC_LIBRARIES
         gdi32
         user32
 )
 
-qt_extend_target(tst_qimage CONDITION APPLE
+qt_internal_extend_target(tst_qimage CONDITION APPLE
     PUBLIC_LIBRARIES
         ${FWCoreGraphics}
 )
diff --git a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
index 53bfb384aa..4bbf2f5b01 100644
--- a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
+++ b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qimageiohandler Test:
 #####################################################################
 
-qt_add_test(tst_qimageiohandler
+qt_internal_add_test(tst_qimageiohandler
     SOURCES
         tst_qimageiohandler.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt
index a477252e73..dd15618370 100644
--- a/tests/auto/gui/image/qimagereader/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob
     baseline/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qimagereader
+qt_internal_add_test(tst_qimagereader
     SOURCES
         tst_qimagereader.cpp
     PUBLIC_LIBRARIES
@@ -35,7 +35,7 @@ set(qmake_immediate_resource_files
     ${resource_glob_0}
 )
 
-qt_add_resource(tst_qimagereader "qmake_immediate"
+qt_internal_add_resource(tst_qimagereader "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -56,7 +56,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "images/trans.gif"
     )
 
-    qt_add_resource(tst_qimagereader "android_testdata"
+    qt_internal_add_resource(tst_qimagereader "android_testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
index 9e5c7362a8..f7212eca3e 100644
--- a/tests/auto/gui/image/qimagewriter/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qimagewriter
+qt_internal_add_test(tst_qimagewriter
     SOURCES
         tst_qimagewriter.cpp
     PUBLIC_LIBRARIES
@@ -41,7 +41,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "images/trolltech.gif"
     )
 
-    qt_add_resource(tst_qimagewriter "qimagewriter"
+    qt_internal_add_resource(tst_qimagewriter "qimagewriter"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/image/qmovie/CMakeLists.txt b/tests/auto/gui/image/qmovie/CMakeLists.txt
index 3e9b2ad100..545ee481d1 100644
--- a/tests/auto/gui/image/qmovie/CMakeLists.txt
+++ b/tests/auto/gui/image/qmovie/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     animations/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qmovie
+qt_internal_add_test(tst_qmovie
     SOURCES
         tst_qmovie.cpp
     PUBLIC_LIBRARIES
@@ -25,7 +25,7 @@ set(resources_resource_files
     "animations/trolltech.gif"
 )
 
-qt_add_resource(tst_qmovie "resources"
+qt_internal_add_resource(tst_qmovie "resources"
     PREFIX
         "/"
     FILES
@@ -40,17 +40,17 @@ qt_add_resource(tst_qmovie "resources"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmovie CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qmovie CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-qt_extend_target(tst_qmovie CONDITION QT_FEATURE_gif
+qt_internal_extend_target(tst_qmovie CONDITION QT_FEATURE_gif
     DEFINES
         QTEST_HAVE_GIF
 )
 
-qt_extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg
+qt_internal_extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg
     DEFINES
         QTEST_HAVE_JPEG
 )
diff --git a/tests/auto/gui/image/qpicture/CMakeLists.txt b/tests/auto/gui/image/qpicture/CMakeLists.txt
index f79c72974a..29bf68fa06 100644
--- a/tests/auto/gui/image/qpicture/CMakeLists.txt
+++ b/tests/auto/gui/image/qpicture/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpicture Test:
 #####################################################################
 
-qt_add_test(tst_qpicture
+qt_internal_add_test(tst_qpicture
     SOURCES
         tst_qpicture.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/image/qpixmap/CMakeLists.txt b/tests/auto/gui/image/qpixmap/CMakeLists.txt
index b58609a760..1946715047 100644
--- a/tests/auto/gui/image/qpixmap/CMakeLists.txt
+++ b/tests/auto/gui/image/qpixmap/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qpixmap
+qt_internal_add_test(tst_qpixmap
     SOURCES
         tst_qpixmap.cpp
     PUBLIC_LIBRARIES
@@ -83,7 +83,7 @@ set(qpixmap_resource_files
     "loadFromData/designer_rgb32.png"
 )
 
-qt_add_resource(tst_qpixmap "qpixmap"
+qt_internal_add_resource(tst_qpixmap "qpixmap"
     PREFIX
         "/"
     FILES
@@ -94,13 +94,13 @@ qt_add_resource(tst_qpixmap "qpixmap"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
         Qt::WidgetsPrivate
 )
 
-qt_extend_target(tst_qpixmap CONDITION WIN32
+qt_internal_extend_target(tst_qpixmap CONDITION WIN32
     PUBLIC_LIBRARIES
         gdi32
         user32
diff --git a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
index 33c1faf865..9e99842e6e 100644
--- a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
+++ b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpixmapcache Test:
 #####################################################################
 
-qt_add_test(tst_qpixmapcache
+qt_internal_add_test(tst_qpixmapcache
     SOURCES
         tst_qpixmapcache.cpp
     PUBLIC_LIBRARIES