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>

8 files changed, 22 insertions, 22 deletions

diff --git a/tests/auto/tools/moc/CMakeLists.txt b/tests/auto/tools/moc/CMakeLists.txt
index db953ab735..b34a4d0a3f 100644
--- a/tests/auto/tools/moc/CMakeLists.txt
+++ b/tests/auto/tools/moc/CMakeLists.txt
@@ -60,7 +60,7 @@ qt_wrap_cpp(comparison_relevant_moc_list ${JSON_HEADERS}
 
 list(TRANSFORM comparison_relevant_moc_list  APPEND ".json" OUTPUT_VARIABLE moc_json_files)
 
-qt_add_test(tst_moc
+qt_internal_add_test(tst_moc
     SOURCES
         cxx-attributes.h
         tst_moc.cpp
@@ -77,9 +77,9 @@ qt_add_test(tst_moc
     EXCEPTIONS
 )
 
-qt_extend_target(tst_moc PUBLIC_LIBRARIES Qt::CorePrivate)
+qt_internal_extend_target(tst_moc PUBLIC_LIBRARIES Qt::CorePrivate)
 
-qt_extend_target(tst_moc CONDITION CMAKE_CROSSCOMPILING
+qt_internal_extend_target(tst_moc CONDITION CMAKE_CROSSCOMPILING
     DEFINES
         MOC_CROSS_COMPILED
 )
@@ -88,34 +88,34 @@ if (UNIX AND (CLANG OR GCC OR ICC))
     qt_wrap_cpp(os9_moc os9-newlines.h)
 endif()
 
-qt_extend_target(tst_moc CONDITION UNIX AND (CLANG OR GCC OR ICC)
+qt_internal_extend_target(tst_moc CONDITION UNIX AND (CLANG OR GCC OR ICC)
     SOURCES
         os9-newlines.h
         win-newlines.h
         ${os9_moc}
 )
 
-qt_extend_target(tst_moc CONDITION CLANG OR GCC
+qt_internal_extend_target(tst_moc CONDITION CLANG OR GCC
     SOURCES
         dollars.h
 )
 
-qt_extend_target(tst_moc CONDITION TARGET Qt::DBus
+qt_internal_extend_target(tst_moc CONDITION TARGET Qt::DBus
     PUBLIC_LIBRARIES
         Qt::DBus
 )
 
-qt_extend_target(tst_moc CONDITION TARGET Qt::Concurrent
+qt_internal_extend_target(tst_moc CONDITION TARGET Qt::Concurrent
     PUBLIC_LIBRARIES
         Qt::Concurrent
 )
 
-qt_extend_target(tst_moc CONDITION TARGET Qt::Network
+qt_internal_extend_target(tst_moc CONDITION TARGET Qt::Network
     PUBLIC_LIBRARIES
         Qt::Network
 )
 
-qt_extend_target(tst_moc CONDITION TARGET Qt::Sql
+qt_internal_extend_target(tst_moc CONDITION TARGET Qt::Sql
     PUBLIC_LIBRARIES
         Qt::Sql
 )
diff --git a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
index 83819cf2c6..ad2d289eb4 100644
--- a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
+++ b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbuscpp2xml Test:
 #####################################################################
 
-qt_add_test(tst_qdbuscpp2xml
+qt_internal_add_test(tst_qdbuscpp2xml
     SOURCES
         test1.h
         tst_qdbuscpp2xml.cpp
@@ -17,7 +17,7 @@ set(qdbuscpp2xml_resource_files
     "test1.h"
 )
 
-qt_add_resource(tst_qdbuscpp2xml "qdbuscpp2xml"
+qt_internal_add_resource(tst_qdbuscpp2xml "qdbuscpp2xml"
     PREFIX
         "/tst_qdbuscpp2xml/"
     FILES
diff --git a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
index 6a24094462..9932f9f32b 100644
--- a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
+++ b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusxml2cpp Test:
 #####################################################################
 
-qt_add_test(tst_qdbusxml2cpp
+qt_internal_add_test(tst_qdbusxml2cpp
     SOURCES
         tst_qdbusxml2cpp.cpp
 )
diff --git a/tests/auto/tools/qmake/.prev_CMakeLists.txt b/tests/auto/tools/qmake/.prev_CMakeLists.txt
index 48b88a2285..a6aec5df5f 100644
--- a/tests/auto/tools/qmake/.prev_CMakeLists.txt
+++ b/tests/auto/tools/qmake/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     testdata/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qmake
+qt_internal_add_test(tst_qmake
     SOURCES
         testcompiler.cpp testcompiler.h
         tst_qmake.cpp
diff --git a/tests/auto/tools/qmake/CMakeLists.txt b/tests/auto/tools/qmake/CMakeLists.txt
index adb2da7916..a6aec5df5f 100644
--- a/tests/auto/tools/qmake/CMakeLists.txt
+++ b/tests/auto/tools/qmake/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     testdata/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qmake
+qt_internal_add_test(tst_qmake
     SOURCES
         testcompiler.cpp testcompiler.h
         tst_qmake.cpp
diff --git a/tests/auto/tools/qmakelib/CMakeLists.txt b/tests/auto/tools/qmakelib/CMakeLists.txt
index c95ef2fe0f..8d0f8d7026 100644
--- a/tests/auto/tools/qmakelib/CMakeLists.txt
+++ b/tests/auto/tools/qmakelib/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmakelib Test:
 #####################################################################
 
-qt_add_test(tst_qmakelib
+qt_internal_add_test(tst_qmakelib
     SOURCES
         ../../../../qmake/library/ioutils.cpp
         ../../../../qmake/library/proitems.cpp
@@ -29,7 +29,7 @@ qt_add_test(tst_qmakelib
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmakelib CONDITION WIN32
+qt_internal_extend_target(tst_qmakelib CONDITION WIN32
     PUBLIC_LIBRARIES
         advapi32
 )
diff --git a/tests/auto/tools/rcc/CMakeLists.txt b/tests/auto/tools/rcc/CMakeLists.txt
index 06d62244ff..40b91baa3a 100644
--- a/tests/auto/tools/rcc/CMakeLists.txt
+++ b/tests/auto/tools/rcc/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_rcc Test:
 #####################################################################
 
-qt_add_test(tst_rcc
+qt_internal_add_test(tst_rcc
     SOURCES
         tst_rcc.cpp
 )
@@ -16,7 +16,7 @@ set(images_resource_files
     "images/subdir/triangle.png"
 )
 
-qt_add_resource(tst_rcc "images"
+qt_internal_add_resource(tst_rcc "images"
     PREFIX
         "/"
     BASE
@@ -28,7 +28,7 @@ set(size-0_resource_files
     "data/data-0.txt"
 )
 
-qt_add_resource(tst_rcc "size-0"
+qt_internal_add_resource(tst_rcc "size-0"
     PREFIX
         "/"
     BASE
@@ -43,7 +43,7 @@ set(size-2-0-35-1_resource_files
     "data/data-35.txt"
 )
 
-qt_add_resource(tst_rcc "size-2-0-35-1"
+qt_internal_add_resource(tst_rcc "size-2-0-35-1"
     PREFIX
         "/"
     BASE
@@ -55,7 +55,7 @@ set(size-1_resource_files
     "data/data-1.txt"
 )
 
-qt_add_resource(tst_rcc "size-1"
+qt_internal_add_resource(tst_rcc "size-1"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/tools/uic/CMakeLists.txt b/tests/auto/tools/uic/CMakeLists.txt
index 2f8b8aa648..03af78a9c2 100644
--- a/tests/auto/tools/uic/CMakeLists.txt
+++ b/tests/auto/tools/uic/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_uic Test:
 #####################################################################
 
-qt_add_test(tst_uic
+qt_internal_add_test(tst_uic
     SOURCES
         tst_uic.cpp
 )