Rename more test targets conflicting with qtbase ones

Fixes: QTBUG-88790
Change-Id: I886592001ed2d8aad8ab6df542ea788b44d2ff71
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit e4cd93bcad4953e95f5bc6f3d35502a604f2ec97)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

20 files changed, 201 insertions, 18 deletions

diff --git a/tests/auto/animation/qabstractanimation/.prev_CMakeLists.txt b/tests/auto/animation/qabstractanimation/.prev_CMakeLists.txt
new file mode 100644
index 000000000..032c74f5d
--- /dev/null
+++ b/tests/auto/animation/qabstractanimation/.prev_CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qabstractanimation.pro.
+
+#####################################################################
+## tst_qabstractanimation Test:
+#####################################################################
+
+qt_internal_add_test(tst_qabstractanimation
+    SOURCES
+        tst_qabstractanimation.cpp
+    PUBLIC_LIBRARIES
+        Qt::3DAnimation
+        Qt::3DAnimationPrivate
+        Qt::3DCore
+        Qt::3DCorePrivate
+        Qt::3DRender
+        Qt::3DRenderPrivate
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:qabstractanimation.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/animation/qabstractanimation/CMakeLists.txt b/tests/auto/animation/qabstractanimation/CMakeLists.txt
index 032c74f5d..96f35e668 100644
--- a/tests/auto/animation/qabstractanimation/CMakeLists.txt
+++ b/tests/auto/animation/qabstractanimation/CMakeLists.txt
@@ -4,7 +4,10 @@
 ## tst_qabstractanimation Test:
 #####################################################################
 
-qt_internal_add_test(tst_qabstractanimation
+
+# special case begin
+qt_internal_add_test(tst_qt3d_qabstractanimation
+# special case end
     SOURCES
         tst_qabstractanimation.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/core/qtransform/CMakeLists.txt b/tests/auto/core/qtransform/CMakeLists.txt
index d78858afb..1cac1ed5e 100644
--- a/tests/auto/core/qtransform/CMakeLists.txt
+++ b/tests/auto/core/qtransform/CMakeLists.txt
@@ -1,10 +1,12 @@
 # Generated from qtransform.pro.
 
+# special case skip regeneration
+
 #####################################################################
 ## tst_qtransform Test:
 #####################################################################
 
-qt_internal_add_test(tst_qtransform
+qt_internal_add_test(tst_qt3d_qtransform
     SOURCES
         tst_qtransform.cpp
     INCLUDE_DIRECTORIES
@@ -22,7 +24,7 @@ qt_internal_add_test(tst_qtransform
 ## Scopes:
 #####################################################################
 
-qt_internal_extend_target(tst_qtransform CONDITION QT_FEATURE_private_tests
+qt_internal_extend_target(tst_qt3d_qtransform CONDITION QT_FEATURE_private_tests
     SOURCES
         ../common/qbackendnodetester.cpp ../common/qbackendnodetester.h
         ../common/testarbiter.h
diff --git a/tests/auto/input/qaction/.prev_CMakeLists.txt b/tests/auto/input/qaction/.prev_CMakeLists.txt
new file mode 100644
index 000000000..6acfd8fd2
--- /dev/null
+++ b/tests/auto/input/qaction/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from qaction.pro.
+
+#####################################################################
+## tst_qaction Test:
+#####################################################################
+
+qt_internal_add_test(tst_qaction
+    SOURCES
+        ../commons/testdevice.h
+        ../commons/testdeviceproxy.h
+        tst_qaction.cpp
+    INCLUDE_DIRECTORIES
+        ../../core/common
+        ../commons
+    PUBLIC_LIBRARIES
+        Qt::3DCore
+        Qt::3DCorePrivate
+        Qt::3DInput
+        Qt::3DInputPrivate
+        Qt::CorePrivate
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:qaction.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qaction CONDITION QT_FEATURE_private_tests
+    SOURCES
+        ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h
+        ../../core/common/testarbiter.h
+)
diff --git a/tests/auto/input/qaction/CMakeLists.txt b/tests/auto/input/qaction/CMakeLists.txt
index 6acfd8fd2..724ef0b7a 100644
--- a/tests/auto/input/qaction/CMakeLists.txt
+++ b/tests/auto/input/qaction/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## tst_qaction Test:
 #####################################################################
 
-qt_internal_add_test(tst_qaction
+# special case begin
+qt_internal_add_test(tst_qt3d_qaction
+# special case end
     SOURCES
         ../commons/testdevice.h
         ../commons/testdeviceproxy.h
@@ -27,7 +29,9 @@ qt_internal_add_test(tst_qaction
 ## Scopes:
 #####################################################################
 
-qt_internal_extend_target(tst_qaction CONDITION QT_FEATURE_private_tests
+# special case begin
+qt_internal_extend_target(tst_qt3d_qaction CONDITION QT_FEATURE_private_tests
+# special case end
     SOURCES
         ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h
         ../../core/common/testarbiter.h
diff --git a/tests/auto/input/qmouseevent/.prev_CMakeLists.txt b/tests/auto/input/qmouseevent/.prev_CMakeLists.txt
new file mode 100644
index 000000000..f0fd99874
--- /dev/null
+++ b/tests/auto/input/qmouseevent/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from qmouseevent.pro.
+
+#####################################################################
+## tst_qmouseevent Test:
+#####################################################################
+
+qt_internal_add_test(tst_qmouseevent
+    SOURCES
+        ../commons/testdevice.h
+        ../commons/testdeviceproxy.h
+        tst_qmouseevent.cpp
+    INCLUDE_DIRECTORIES
+        ../../core/common
+        ../commons
+    PUBLIC_LIBRARIES
+        Qt::3DCore
+        Qt::3DCorePrivate
+        Qt::3DInput
+        Qt::3DInputPrivate
+        Qt::CorePrivate
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:qmouseevent.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qmouseevent CONDITION QT_FEATURE_private_tests
+    SOURCES
+        ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h
+        ../../core/common/testarbiter.h
+)
diff --git a/tests/auto/input/qmouseevent/CMakeLists.txt b/tests/auto/input/qmouseevent/CMakeLists.txt
index f0fd99874..8a2e0bb8b 100644
--- a/tests/auto/input/qmouseevent/CMakeLists.txt
+++ b/tests/auto/input/qmouseevent/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## tst_qmouseevent Test:
 #####################################################################
 
-qt_internal_add_test(tst_qmouseevent
+#special case begin
+qt_internal_add_test(tst_qt3d_qmouseevent
+#special case end
     SOURCES
         ../commons/testdevice.h
         ../commons/testdeviceproxy.h
@@ -27,7 +29,9 @@ qt_internal_add_test(tst_qmouseevent
 ## Scopes:
 #####################################################################
 
-qt_internal_extend_target(tst_qmouseevent CONDITION QT_FEATURE_private_tests
+#special case begin
+qt_internal_extend_target(tst_qt3d_qmouseevent CONDITION QT_FEATURE_private_tests
+#special case end
     SOURCES
         ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h
         ../../core/common/testarbiter.h
diff --git a/tests/auto/render/geometry/CMakeLists.txt b/tests/auto/render/geometry/CMakeLists.txt
index c1e8a81e1..2413e29ae 100644
--- a/tests/auto/render/geometry/CMakeLists.txt
+++ b/tests/auto/render/geometry/CMakeLists.txt
@@ -1,10 +1,12 @@
 # Generated from geometry.pro.
 
+# special case skip regeneration
+
 #####################################################################
 ## tst_geometry Test:
 #####################################################################
 
-qt_internal_add_test(tst_geometry
+qt_internal_add_test(tst_qt3d_geometry
     SOURCES
         tst_geometry.cpp
     PUBLIC_LIBRARIES
@@ -23,4 +25,4 @@ qt_internal_add_test(tst_geometry
 #####################################################################
 
 include(../commons/commons.cmake)
-qt3d_setup_common_render_test(tst_geometry)
+qt3d_setup_common_render_test(tst_qt3d_geometry)
diff --git a/tests/auto/render/material/CMakeLists.txt b/tests/auto/render/material/CMakeLists.txt
index f9b093e66..189bd0694 100644
--- a/tests/auto/render/material/CMakeLists.txt
+++ b/tests/auto/render/material/CMakeLists.txt
@@ -1,10 +1,12 @@
 # Generated from material.pro.
 
+# special case skip regeneration
+
 #####################################################################
 ## tst_material Test:
 #####################################################################
 
-qt_internal_add_test(tst_material
+qt_internal_add_test(tst_qt3d_material
     SOURCES
         tst_material.cpp
     PUBLIC_LIBRARIES
@@ -23,4 +25,4 @@ qt_internal_add_test(tst_material
 #####################################################################
 
 include(../commons/commons.cmake)
-qt3d_setup_common_render_test(tst_material)
+qt3d_setup_common_render_test(tst_qt3d_material)
diff --git a/tests/auto/render/qbuffer/CMakeLists.txt b/tests/auto/render/qbuffer/CMakeLists.txt
index 80a3a5fd0..b4a808daf 100644
--- a/tests/auto/render/qbuffer/CMakeLists.txt
+++ b/tests/auto/render/qbuffer/CMakeLists.txt
@@ -1,10 +1,12 @@
 # Generated from qbuffer.pro.
 
+# special case skip regeneration
+
 #####################################################################
 ## tst_qbuffer Test:
 #####################################################################
 
-qt_internal_add_test(tst_qbuffer
+qt_internal_add_test(tst_qt3d_qbuffer
     SOURCES
         tst_qbuffer.cpp
     PUBLIC_LIBRARIES
@@ -23,4 +25,4 @@ qt_internal_add_test(tst_qbuffer
 #####################################################################
 
 include(../commons/commons.cmake)
-qt3d_setup_common_render_test(tst_qbuffer)
+qt3d_setup_common_render_test(tst_qt3d_qbuffer)
diff --git a/tests/auto/render/shadergraph/qshadergenerator/.prev_CMakeLists.txt b/tests/auto/render/shadergraph/qshadergenerator/.prev_CMakeLists.txt
new file mode 100644
index 000000000..0c8113adf
--- /dev/null
+++ b/tests/auto/render/shadergraph/qshadergenerator/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qshadergenerator.pro.
+
+#####################################################################
+## tst_qshadergenerator Test:
+#####################################################################
+
+qt_internal_add_test(tst_qshadergenerator
+    SOURCES
+        tst_qshadergenerator.cpp
+    PUBLIC_LIBRARIES
+        Qt::3DRenderPrivate
+        Qt::Gui
+)
diff --git a/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt
index 0c8113adf..b3c003f74 100644
--- a/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt
+++ b/tests/auto/render/shadergraph/qshadergenerator/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## tst_qshadergenerator Test:
 #####################################################################
 
-qt_internal_add_test(tst_qshadergenerator
+# special case begin
+qt_internal_add_test(tst_qt3d_qshadergenerator
+# special case end
     SOURCES
         tst_qshadergenerator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/render/shadergraph/qshadergraph/.prev_CMakeLists.txt b/tests/auto/render/shadergraph/qshadergraph/.prev_CMakeLists.txt
new file mode 100644
index 000000000..b270b171a
--- /dev/null
+++ b/tests/auto/render/shadergraph/qshadergraph/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qshadergraph.pro.
+
+#####################################################################
+## tst_qshadergraph Test:
+#####################################################################
+
+qt_internal_add_test(tst_qshadergraph
+    SOURCES
+        tst_qshadergraph.cpp
+    PUBLIC_LIBRARIES
+        Qt::3DRenderPrivate
+        Qt::Gui
+)
diff --git a/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt
index b270b171a..31bf69fca 100644
--- a/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt
+++ b/tests/auto/render/shadergraph/qshadergraph/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## tst_qshadergraph Test:
 #####################################################################
 
-qt_internal_add_test(tst_qshadergraph
+# special case begin
+qt_internal_add_test(tst_qt3d_qshadergraph
+# special case end
     SOURCES
         tst_qshadergraph.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/render/shadergraph/qshadergraphloader/.prev_CMakeLists.txt b/tests/auto/render/shadergraph/qshadergraphloader/.prev_CMakeLists.txt
new file mode 100644
index 000000000..68a214246
--- /dev/null
+++ b/tests/auto/render/shadergraph/qshadergraphloader/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qshadergraphloader.pro.
+
+#####################################################################
+## tst_qshadergraphloader Test:
+#####################################################################
+
+qt_internal_add_test(tst_qshadergraphloader
+    SOURCES
+        tst_qshadergraphloader.cpp
+    PUBLIC_LIBRARIES
+        Qt::3DRenderPrivate
+        Qt::Gui
+)
diff --git a/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt b/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt
index 68a214246..138194b67 100644
--- a/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt
+++ b/tests/auto/render/shadergraph/qshadergraphloader/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## tst_qshadergraphloader Test:
 #####################################################################
 
-qt_internal_add_test(tst_qshadergraphloader
+# special case begin
+qt_internal_add_test(tst_qt3d_qshadergraphloader
+# special case end
     SOURCES
         tst_qshadergraphloader.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/render/shadergraph/qshadernodes/.prev_CMakeLists.txt b/tests/auto/render/shadergraph/qshadernodes/.prev_CMakeLists.txt
new file mode 100644
index 000000000..3bb079957
--- /dev/null
+++ b/tests/auto/render/shadergraph/qshadernodes/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qshadernodes.pro.
+
+#####################################################################
+## tst_qshadernodes Test:
+#####################################################################
+
+qt_internal_add_test(tst_qshadernodes
+    SOURCES
+        tst_qshadernodes.cpp
+    PUBLIC_LIBRARIES
+        Qt::3DRenderPrivate
+        Qt::Gui
+)
diff --git a/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt b/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt
index 3bb079957..f08e1f113 100644
--- a/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt
+++ b/tests/auto/render/shadergraph/qshadernodes/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## tst_qshadernodes Test:
 #####################################################################
 
-qt_internal_add_test(tst_qshadernodes
+# special case begin
+qt_internal_add_test(tst_qt3d_qshadernodes
+# special case end
     SOURCES
         tst_qshadernodes.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/render/shadergraph/qshadernodesloader/.prev_CMakeLists.txt b/tests/auto/render/shadergraph/qshadernodesloader/.prev_CMakeLists.txt
new file mode 100644
index 000000000..db460342a
--- /dev/null
+++ b/tests/auto/render/shadergraph/qshadernodesloader/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qshadernodesloader.pro.
+
+#####################################################################
+## tst_qshadernodesloader Test:
+#####################################################################
+
+qt_internal_add_test(tst_qshadernodesloader
+    SOURCES
+        tst_qshadernodesloader.cpp
+    PUBLIC_LIBRARIES
+        Qt::3DRenderPrivate
+        Qt::Gui
+)
diff --git a/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt b/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt
index db460342a..821af44ae 100644
--- a/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt
+++ b/tests/auto/render/shadergraph/qshadernodesloader/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## tst_qshadernodesloader Test:
 #####################################################################
 
-qt_internal_add_test(tst_qshadernodesloader
+#special case begin
+qt_internal_add_test(tst_qt3d_qshadernodesloader
+#special case end
     SOURCES
         tst_qshadernodesloader.cpp
     PUBLIC_LIBRARIES