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>

21 files changed, 41 insertions, 41 deletions

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