Regenerate remaining tests to be in sync

Change-Id: I200c8f58ad13bc1bc78409a3ce49348584ba5b51
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

21 files changed, 49 insertions, 114 deletions

diff --git a/tests/benchmarks/particles/affectors/CMakeLists.txt b/tests/benchmarks/particles/affectors/CMakeLists.txt
index 75a6b52f73..0a6b52e563 100644
--- a/tests/benchmarks/particles/affectors/CMakeLists.txt
+++ b/tests/benchmarks/particles/affectors/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_affectors Binary:
 #####################################################################
 
-add_qt_executable(tst_affectors
-    GUI
+add_qt_benchmark(tst_affectors
     SOURCES
         tst_affectors.cpp
     DEFINES
@@ -23,6 +22,3 @@ add_qt_executable(tst_affectors
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:affectors.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/particles/emission/CMakeLists.txt b/tests/benchmarks/particles/emission/CMakeLists.txt
index 7749d5f877..de9598b76f 100644
--- a/tests/benchmarks/particles/emission/CMakeLists.txt
+++ b/tests/benchmarks/particles/emission/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_emission Binary:
 #####################################################################
 
-add_qt_executable(tst_emission
-    GUI
+add_qt_benchmark(tst_emission
     SOURCES
         tst_emission.cpp
     LIBRARIES
@@ -23,6 +22,3 @@ add_qt_executable(tst_emission
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:emission.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/animation/CMakeLists.txt b/tests/benchmarks/qml/animation/CMakeLists.txt
index 79416db229..e1697ad18b 100644
--- a/tests/benchmarks/qml/animation/CMakeLists.txt
+++ b/tests/benchmarks/qml/animation/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_animation Binary:
 #####################################################################
 
-add_qt_executable(tst_animation
-    GUI
+add_qt_benchmark(tst_animation
     SOURCES
         tst_animation.cpp
     DEFINES
@@ -23,11 +22,7 @@ add_qt_executable(tst_animation
 )
 
 #### Keys ignored in scope 1:.:.:animation.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:animation.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/binding/CMakeLists.txt b/tests/benchmarks/qml/binding/CMakeLists.txt
index 7cc445700b..8069310430 100644
--- a/tests/benchmarks/qml/binding/CMakeLists.txt
+++ b/tests/benchmarks/qml/binding/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_binding Binary:
 #####################################################################
 
-add_qt_executable(tst_binding
-    GUI
+add_qt_benchmark(tst_binding
     SOURCES
         testtypes.cpp testtypes.h
         tst_binding.cpp
@@ -18,11 +17,7 @@ add_qt_executable(tst_binding
 )
 
 #### Keys ignored in scope 1:.:.:binding.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:binding.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/compilation/CMakeLists.txt b/tests/benchmarks/qml/compilation/CMakeLists.txt
index e4512d1960..ba6d59fdf5 100644
--- a/tests/benchmarks/qml/compilation/CMakeLists.txt
+++ b/tests/benchmarks/qml/compilation/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_compilation Binary:
 #####################################################################
 
-add_qt_executable(tst_compilation
-    GUI
+add_qt_benchmark(tst_compilation
     SOURCES
         tst_compilation.cpp
     DEFINES
@@ -20,11 +19,7 @@ add_qt_executable(tst_compilation
 )
 
 #### Keys ignored in scope 1:.:.:compilation.pro:<TRUE>:
-# CONFIG = "benchmark" "release"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:compilation.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/creation/CMakeLists.txt b/tests/benchmarks/qml/creation/CMakeLists.txt
index 46f9f78126..3b3cd56d8e 100644
--- a/tests/benchmarks/qml/creation/CMakeLists.txt
+++ b/tests/benchmarks/qml/creation/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_creation Binary:
 #####################################################################
 
-add_qt_executable(tst_creation
-    GUI
+add_qt_benchmark(tst_creation
     SOURCES
         tst_creation.cpp
     DEFINES
@@ -23,11 +22,7 @@ add_qt_executable(tst_creation
 )
 
 #### Keys ignored in scope 1:.:.:creation.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:creation.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/holistic/CMakeLists.txt b/tests/benchmarks/qml/holistic/CMakeLists.txt
index 5f48cf9f3a..16942d0350 100644
--- a/tests/benchmarks/qml/holistic/CMakeLists.txt
+++ b/tests/benchmarks/qml/holistic/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_holistic Binary:
 #####################################################################
 
-add_qt_executable(tst_holistic
-    GUI
+add_qt_benchmark(tst_holistic
     SOURCES
         testtypes.cpp testtypes.h
         tst_holistic.cpp
@@ -19,11 +18,7 @@ add_qt_executable(tst_holistic
 )
 
 #### Keys ignored in scope 1:.:.:holistic.pro:<TRUE>:
-# CONFIG = "benchmark" "release"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:holistic.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/javascript/CMakeLists.txt b/tests/benchmarks/qml/javascript/CMakeLists.txt
index 3c767ce333..9a73b0f047 100644
--- a/tests/benchmarks/qml/javascript/CMakeLists.txt
+++ b/tests/benchmarks/qml/javascript/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_javascript Binary:
 #####################################################################
 
-add_qt_executable(tst_javascript
-    GUI
+add_qt_benchmark(tst_javascript
     SOURCES
         testtypes.cpp testtypes.h
         tst_javascript.cpp
@@ -18,11 +17,7 @@ add_qt_executable(tst_javascript
 )
 
 #### Keys ignored in scope 1:.:.:javascript.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:javascript.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt b/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt
index 57aff6bf12..f44669cdc6 100644
--- a/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt
+++ b/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_bench_qjsengine Binary:
 #####################################################################
 
-add_qt_executable(tst_bench_qjsengine
-    GUI
+add_qt_benchmark(tst_bench_qjsengine
     SOURCES
         tst_qjsengine.cpp
     PUBLIC_LIBRARIES
@@ -15,11 +14,7 @@ add_qt_executable(tst_bench_qjsengine
 )
 
 #### Keys ignored in scope 1:.:.:qjsengine.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qjsengine.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt b/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt
index ba82b28a86..c9dc3ad76d 100644
--- a/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt
+++ b/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_bench_qjsvalue Binary:
 #####################################################################
 
-add_qt_executable(tst_bench_qjsvalue
-    GUI
+add_qt_benchmark(tst_bench_qjsvalue
     SOURCES
         tst_qjsvalue.cpp
     PUBLIC_LIBRARIES
@@ -15,11 +14,7 @@ add_qt_executable(tst_bench_qjsvalue
 )
 
 #### Keys ignored in scope 1:.:.:qjsvalue.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qjsvalue.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt b/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt
index b5d355eeee..dd5f818591 100644
--- a/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt
+++ b/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_bench_qjsvalueiterator Binary:
 #####################################################################
 
-add_qt_executable(tst_bench_qjsvalueiterator
-    GUI
+add_qt_benchmark(tst_bench_qjsvalueiterator
     SOURCES
         tst_qjsvalueiterator.cpp
     PUBLIC_LIBRARIES
@@ -14,5 +13,4 @@ add_qt_executable(tst_bench_qjsvalueiterator
 )
 
 #### Keys ignored in scope 1:.:.:qjsvalueiterator.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
diff --git a/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt b/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt
index 5145874028..4c9df052a8 100644
--- a/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt
+++ b/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_librarymetrics_performance Binary:
 #####################################################################
 
-add_qt_executable(tst_librarymetrics_performance
-    GUI
+add_qt_benchmark(tst_librarymetrics_performance
     SOURCES
         tst_librarymetrics_performance.cpp
     PUBLIC_LIBRARIES
@@ -17,20 +16,20 @@ add_qt_executable(tst_librarymetrics_performance
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "data"
+)
+
 add_qt_resource(tst_librarymetrics_performance "qmake_immediate"
     PREFIX
         "/"
     FILES
-        data
+        ${qmake_immediate_resource_files}
 )
 
 
 #### Keys ignored in scope 1:.:.:librarymetrics_performance.pro:<TRUE>:
-# CONFIG = "benchmark" "release"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:librarymetrics_performance.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/painting/CMakeLists.txt b/tests/benchmarks/qml/painting/CMakeLists.txt
index 83290b2483..35af3afdf9 100644
--- a/tests/benchmarks/qml/painting/CMakeLists.txt
+++ b/tests/benchmarks/qml/painting/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## painting Binary:
 #####################################################################
 
-add_qt_executable(painting
+add_qt_benchmark(painting
     SOURCES
         paintbenchmark.cpp
     PUBLIC_LIBRARIES
@@ -13,10 +13,7 @@ add_qt_executable(painting
 )
 
 #### Keys ignored in scope 1:.:.:painting.pro:<TRUE>:
-# CONFIG = "console"
+# _REQUIREMENTS = "qtHaveModule(opengl)"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:painting.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt
index 83d628265e..60c0f42b78 100644
--- a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt
+++ b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qqmlchangeset Binary:
 #####################################################################
 
-add_qt_executable(tst_qqmlchangeset
-    GUI
+add_qt_benchmark(tst_qqmlchangeset
     SOURCES
         tst_qqmlchangeset.cpp
     DEFINES
@@ -20,11 +19,7 @@ add_qt_executable(tst_qqmlchangeset
 )
 
 #### Keys ignored in scope 1:.:.:qqmlchangeset.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qqmlchangeset.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt b/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..cda254fc4d
--- /dev/null
+++ b/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from qqmlcomponent.pro.
+
+#####################################################################
+## tst_qqmlcomponent Binary:
+#####################################################################
+
+add_qt_benchmark(tst_qqmlcomponent
+    SOURCES
+        testtypes.cpp testtypes.h
+        tst_qqmlcomponent.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Qml
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qqmlcomponent.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
diff --git a/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt b/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt
index 442d405832..3d980daed5 100644
--- a/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt
+++ b/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlcomponent Binary:
 #####################################################################
 
-add_qt_executable(tst_qqmlcomponent_benchmark # special case avoid collision with auto test
+add_qt_benchmark(tst_qqmlcomponent_benchmark # special case avoid collision with auto test
     GUI
     SOURCES
         testtypes.cpp testtypes.h
@@ -18,11 +18,7 @@ add_qt_executable(tst_qqmlcomponent_benchmark # special case avoid collision wit
 )
 
 #### Keys ignored in scope 1:.:.:qqmlcomponent.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qqmlcomponent.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt b/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt
index 5e4205e1f8..872d676b70 100644
--- a/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt
+++ b/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qqmlmetaproperty Binary:
 #####################################################################
 
-add_qt_executable(tst_qqmlmetaproperty
-    GUI
+add_qt_benchmark(tst_qqmlmetaproperty
     SOURCES
         tst_qqmlmetaproperty.cpp
     DEFINES
@@ -17,11 +16,7 @@ add_qt_executable(tst_qqmlmetaproperty
 )
 
 #### Keys ignored in scope 1:.:.:qqmlmetaproperty.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qqmlmetaproperty.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/qquickwindow/CMakeLists.txt b/tests/benchmarks/qml/qquickwindow/CMakeLists.txt
index 192479355a..b9c4569d1b 100644
--- a/tests/benchmarks/qml/qquickwindow/CMakeLists.txt
+++ b/tests/benchmarks/qml/qquickwindow/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qquickwindow Binary:
 #####################################################################
 
-add_qt_executable(tst_qquickwindow
-    GUI
+add_qt_benchmark(tst_qquickwindow
     SOURCES
         tst_qquickwindow.cpp
     DEFINES
@@ -25,13 +24,9 @@ add_qt_executable(tst_qquickwindow
 )
 
 #### Keys ignored in scope 1:.:.:qquickwindow.pro:<TRUE>:
-# CONFIG = "benchmark"
 # DEPLOYMENT = "testDataFiles"
 # testDataFiles.files = "data"
 # testDataFiles.path = "."
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qquickwindow.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/script/CMakeLists.txt b/tests/benchmarks/qml/script/CMakeLists.txt
index bf30b75b5b..8e1941304a 100644
--- a/tests/benchmarks/qml/script/CMakeLists.txt
+++ b/tests/benchmarks/qml/script/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_script Binary:
 #####################################################################
 
-add_qt_executable(tst_script
-    GUI
+add_qt_benchmark(tst_script
     SOURCES
         tst_script.cpp
     DEFINES
@@ -24,11 +23,7 @@ add_qt_executable(tst_script
 )
 
 #### Keys ignored in scope 1:.:.:script.pro:<TRUE>:
-# CONFIG = "benchmark" "release"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:script.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/typeimports/CMakeLists.txt b/tests/benchmarks/qml/typeimports/CMakeLists.txt
index 08a164537f..dd28a9bc0c 100644
--- a/tests/benchmarks/qml/typeimports/CMakeLists.txt
+++ b/tests/benchmarks/qml/typeimports/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_typeimports Binary:
 #####################################################################
 
-add_qt_executable(tst_typeimports
-    GUI
+add_qt_benchmark(tst_typeimports
     SOURCES
         tst_typeimports.cpp
     DEFINES
@@ -17,11 +16,7 @@ add_qt_executable(tst_typeimports
 )
 
 #### Keys ignored in scope 1:.:.:typeimports.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:typeimports.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/quick/events/CMakeLists.txt b/tests/benchmarks/quick/events/CMakeLists.txt
index 0e7041c882..5cd731f9be 100644
--- a/tests/benchmarks/quick/events/CMakeLists.txt
+++ b/tests/benchmarks/quick/events/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qevents Binary:
 #####################################################################
 
-add_qt_executable(tst_qevents
-    GUI
+add_qt_benchmark(tst_qevents
     SOURCES
         ../../../auto/quick/shared/geometrytestutil.cpp ../../../auto/quick/shared/geometrytestutil.h
         ../../../auto/quick/shared/viewtestutil.cpp ../../../auto/quick/shared/viewtestutil.h
@@ -29,15 +28,11 @@ add_qt_executable(tst_qevents
 )
 
 #### Keys ignored in scope 1:.:.:events.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:events.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qevents CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"