Regenerate tests

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

81 files changed, 131 insertions, 746 deletions

diff --git a/tests/auto/quick/drawingmodes/CMakeLists.txt b/tests/auto/quick/drawingmodes/CMakeLists.txt
index ab0be47cfa..168d2b918e 100644
--- a/tests/auto/quick/drawingmodes/CMakeLists.txt
+++ b/tests/auto/quick/drawingmodes/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_drawingmodes
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_drawingmodes.cpp
@@ -29,15 +26,11 @@ add_qt_test(tst_drawingmodes
 )
 
 #### Keys ignored in scope 1:.:.:drawingmodes.pro:<TRUE>:
-# CONFIG = "testcase" "parallel_test"
 # OTHER_FILES = "data/DrawingModes.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:drawingmodes.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_drawingmodes CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt
index f8526b8dc7..339b72dbe3 100644
--- a/tests/auto/quick/examples/CMakeLists.txt
+++ b/tests/auto/quick/examples/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_examples
-    GUI
     SOURCES
         tst_examples.cpp
     DEFINES
@@ -22,11 +21,7 @@ add_qt_test(tst_examples
 )
 
 #### Keys ignored in scope 1:.:.:examples.pro:<TRUE>:
-# CONFIG = "testcase"
 # testcase.timeout = "400"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:examples.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/geometry/CMakeLists.txt b/tests/auto/quick/geometry/CMakeLists.txt
index 006b5529b7..c017ffc3d5 100644
--- a/tests/auto/quick/geometry/CMakeLists.txt
+++ b/tests/auto/quick/geometry/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_geometry
-    GUI
     SOURCES
         tst_geometry.cpp
     LIBRARIES
@@ -19,11 +18,5 @@ add_qt_test(tst_geometry
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:geometry.pro:<TRUE>:
-# CONFIG = "testcase" "parallel_test"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:geometry.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/nodes/CMakeLists.txt b/tests/auto/quick/nodes/CMakeLists.txt
index 734480abe3..a971539c63 100644
--- a/tests/auto/quick/nodes/CMakeLists.txt
+++ b/tests/auto/quick/nodes/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_nodestest
-    GUI
     SOURCES
         tst_nodestest.cpp
     LIBRARIES
@@ -19,11 +18,5 @@ add_qt_test(tst_nodestest
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:nodes.pro:<TRUE>:
-# CONFIG = "testcase" "parallel_test"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:nodes.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/nokeywords/CMakeLists.txt b/tests/auto/quick/nokeywords/CMakeLists.txt
index 4295eb996c..78e1604b12 100644
--- a/tests/auto/quick/nokeywords/CMakeLists.txt
+++ b/tests/auto/quick/nokeywords/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_nokeywords
-    GUI
     SOURCES
         tst_nokeywords.cpp
     LIBRARIES
@@ -19,11 +18,5 @@ add_qt_test(tst_nokeywords
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:nokeywords.pro:<TRUE>:
-# CONFIG = "testcase" "parallel_test"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:nokeywords.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt
index f45173d469..ef495e7844 100644
--- a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_flickableinterop
-    GUI
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -37,15 +34,11 @@ add_qt_test(tst_flickableinterop
 )
 
 #### Keys ignored in scope 1:.:.:flickableinterop.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/flickableWithHandlers.qml" "data/Slider.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:flickableinterop.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_flickableinterop CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt
index e65638f6d5..a6ff5adab4 100644
--- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_multipointtoucharea_interop
-    GUI
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -37,15 +34,11 @@ add_qt_test(tst_multipointtoucharea_interop
 )
 
 #### Keys ignored in scope 1:.:.:multipointtoucharea_interop.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/pinchDragMPTA.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:multipointtoucharea_interop.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt
index fdd71ce558..2db5a70c03 100644
--- a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickdraghandler
-    GUI
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -37,15 +34,11 @@ add_qt_test(tst_qquickdraghandler
 )
 
 #### Keys ignored in scope 1:.:.:qquickdraghandler.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/DragAnywhereSlider.qml" "data/FlashAnimation.qml" "data/Slider.qml" "data/draggables.qml" "data/grabberstate.qml" "data/multipleSliders.qml" "data/reparenting.qml" "data/snapMode.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickdraghandler.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickdraghandler CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt
index 0305faf119..b7e2983b73 100644
--- a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickhoverhandler
-    GUI
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -37,15 +34,11 @@ add_qt_test(tst_qquickhoverhandler
 )
 
 #### Keys ignored in scope 1:.:.:qquickhoverhandler.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/lesHoverables.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickhoverhandler.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickhoverhandler CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt
index c00d7af096..edcc3cd7c3 100644
--- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickpinchhandler
-    GUI
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -37,15 +34,11 @@ add_qt_test(tst_qquickpinchhandler
 )
 
 #### Keys ignored in scope 1:.:.:qquickpinchhandler.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/pinchproperties.qml" "data/threeFingers.qml" "data/transformedPinchArea.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickpinchhandler.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickpinchhandler CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt
index 7650009e5e..d05c3067d3 100644
--- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickpointerhandler
-    GUI
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquickpointerhandler
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickpointerhandler.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickpointerhandler.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickpointerhandler CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt
index ec05ce058e..5db27144bf 100644
--- a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickpointhandler
-    GUI
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -37,15 +34,11 @@ add_qt_test(tst_qquickpointhandler
 )
 
 #### Keys ignored in scope 1:.:.:qquickpointhandler.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/pointTracker.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickpointhandler.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickpointhandler CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt
index f80bb5400b..c57a77725e 100644
--- a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquicktaphandler
-    GUI
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquicktaphandler
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquicktaphandler.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquicktaphandler.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicktaphandler CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt
index beee5e2c7a..222c985ce7 100644
--- a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickwheelhandler
-    GUI
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -37,15 +34,11 @@ add_qt_test(tst_qquickwheelhandler
 )
 
 #### Keys ignored in scope 1:.:.:qquickwheelhandler.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/rectWheel.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickwheelhandler.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickwheelhandler CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/propertyrequirements/CMakeLists.txt b/tests/auto/quick/propertyrequirements/CMakeLists.txt
index f1682f6f0b..6eacc6e68b 100644
--- a/tests/auto/quick/propertyrequirements/CMakeLists.txt
+++ b/tests/auto/quick/propertyrequirements/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_propertyrequirements
-    GUI
     SOURCES
         tst_propertyrequirements.cpp
     LIBRARIES
@@ -15,11 +14,5 @@ add_qt_test(tst_propertyrequirements
         Qt::Qml
 )
 
-#### Keys ignored in scope 1:.:.:propertyrequirements.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:propertyrequirements.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/qquickaccessible/CMakeLists.txt b/tests/auto/quick/qquickaccessible/CMakeLists.txt
index 5ad7f7df61..b2379be093 100644
--- a/tests/auto/quick/qquickaccessible/CMakeLists.txt
+++ b/tests/auto/quick/qquickaccessible/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickaccessible
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickaccessible.cpp
@@ -33,15 +30,11 @@ add_qt_test(tst_qquickaccessible
 )
 
 #### Keys ignored in scope 1:.:.:qquickaccessible.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/checkbuttons.qml" "data/hittest.qml" "data/pushbutton.qml" "data/statictext.qml" "data/ignored.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickaccessible.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickaccessible CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickanchors/CMakeLists.txt b/tests/auto/quick/qquickanchors/CMakeLists.txt
index 1593de24d8..35a72c411e 100644
--- a/tests/auto/quick/qquickanchors/CMakeLists.txt
+++ b/tests/auto/quick/qquickanchors/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickanchors
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquickanchors
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickanchors.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickanchors.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickanchors CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt
index 7032f478ab..cb9c578b6a 100644
--- a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickanimatedimage
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickanimatedimage
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickanimatedimage.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickanimatedimage.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickanimatedimage CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt
index e03b7c1810..fe7ad609e0 100644
--- a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickanimatedsprite
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickanimatedsprite.cpp
@@ -34,15 +31,11 @@ add_qt_test(tst_qquickanimatedsprite
 )
 
 #### Keys ignored in scope 1:.:.:qquickanimatedsprite.pro:<TRUE>:
-# CONFIG = "testcase"
-# OTHER_FILES = "$$filesdata/*.qml"
+# OTHER_FILES = "data/*.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickanimatedsprite.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt
index 41dc23283e..e0ac399cd4 100644
--- a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt
@@ -5,11 +5,9 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickanimationcontroller
@@ -28,5 +26,4 @@ add_qt_test(tst_qquickanimationcontroller
 )
 
 #### Keys ignored in scope 1:.:.:qquickanimationcontroller.pro:<TRUE>:
-# CONFIG = "qmltestcase"
 # TEMPLATE = "app"
diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt
index 6400a6b966..6a2541a247 100644
--- a/tests/auto/quick/qquickanimations/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimations/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickanimations
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickanimations.cpp
@@ -36,15 +33,11 @@ add_qt_test(tst_qquickanimations
 )
 
 #### Keys ignored in scope 1:.:.:qquickanimations.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/animationJobSelfDestructionBug.qml" "data/attached.qml" "data/badproperty1.qml" "data/badproperty2.qml" "data/badtype1.qml" "data/badtype2.qml" "data/badtype3.qml" "data/badtype4.qml" "data/disabledTransition.qml" "data/dontAutoStart.qml" "data/dontStart.qml" "data/dontStart2.qml" "data/dotproperty.qml" "data/Double.qml" "data/doubleRegistrationBug.qml" "data/fastFlickingBug.qml" "data/looping.qml" "data/mixedtype1.qml" "data/mixedtype2.qml" "data/nonTransitionBug.qml" "data/parallelAnimationNullChildBug.qml" "data/pathAnimation.qml" "data/pathAnimation2.qml" "data/pathAnimationInOutBackCrash.qml" "data/pathAnimationNoStart.qml" "data/pathInterpolator.qml" "data/pathInterpolatorBack.qml" "data/pathInterpolatorBack2.qml" "data/pathTransition.qml" "data/pauseBindingBug.qml" "data/pauseBug.qml" "data/properties.qml" "data/properties2.qml" "data/properties3.qml" "data/properties4.qml" "data/properties5.qml" "data/propertiesTransition.qml" "data/propertiesTransition2.qml" "data/propertiesTransition3.qml" "data/propertiesTransition4.qml" "data/propertiesTransition5.qml" "data/propertiesTransition6.qml" "data/propertiesTransition7.qml" "data/reanchor.qml" "data/registrationBug.qml" "data/reparent.qml" "data/rotation.qml" "data/runningTrueBug.qml" "data/scriptActionBug.qml" "data/scriptActionCrash.qml" "data/sequentialAnimationNullChildBug.qml" "data/signals.qml" "data/transitionAssignmentBug.qml" "data/valuesource.qml" "data/valuesource2.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickanimations.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickanimations CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickanimators/CMakeLists.txt b/tests/auto/quick/qquickanimators/CMakeLists.txt
index eeb0d00634..428073f0dc 100644
--- a/tests/auto/quick/qquickanimators/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimators/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qquickanimators
-    GUI
     SOURCES
         tst_qquickanimators.cpp
     LIBRARIES
@@ -19,11 +18,5 @@ add_qt_test(tst_qquickanimators
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquickanimators.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qquickanimators.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/qquickapplication/CMakeLists.txt b/tests/auto/quick/qquickapplication/CMakeLists.txt
index 0fe704c8f5..a7a2f4157d 100644
--- a/tests/auto/quick/qquickapplication/CMakeLists.txt
+++ b/tests/auto/quick/qquickapplication/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickapplication
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickapplication.cpp
@@ -32,15 +29,11 @@ add_qt_test(tst_qquickapplication
 )
 
 #### Keys ignored in scope 1:.:.:qquickapplication.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/tst_displayname.qml" "data/tst_platformname.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickapplication.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickapplication CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickbehaviors/CMakeLists.txt b/tests/auto/quick/qquickbehaviors/CMakeLists.txt
index b9bb0d0bba..5894ac2774 100644
--- a/tests/auto/quick/qquickbehaviors/CMakeLists.txt
+++ b/tests/auto/quick/qquickbehaviors/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickbehaviors
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickbehaviors.cpp
@@ -32,15 +29,11 @@ add_qt_test(tst_qquickbehaviors
 )
 
 #### Keys ignored in scope 1:.:.:qquickbehaviors.pro:<TRUE>:
-# CONFIG = "testcase"
-# DISTFILES = "$$filesdata/*"
+# DISTFILES = "data/*"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickbehaviors.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickbehaviors CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickborderimage/CMakeLists.txt b/tests/auto/quick/qquickborderimage/CMakeLists.txt
index 8a675c1bb6..07fe7a1339 100644
--- a/tests/auto/quick/qquickborderimage/CMakeLists.txt
+++ b/tests/auto/quick/qquickborderimage/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickborderimage
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -38,15 +35,9 @@ add_qt_test(tst_qquickborderimage
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickborderimage.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickborderimage.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickborderimage CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt
index eedcb1b8c7..b695355359 100644
--- a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt
+++ b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt
@@ -5,11 +5,9 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickcanvasitem
@@ -28,7 +26,6 @@ add_qt_test(tst_qquickcanvasitem
 )
 
 #### Keys ignored in scope 1:.:.:qquickcanvasitem.pro:<TRUE>:
-# CONFIG = "qmltestcase" "insignificant_test"
 # OTHER_FILES = "data/tst_transform.qml" "data/tst_text.qml" "data/tst_strokeStyle.qml" "data/tst_state.qml" "data/tst_shadow.qml" "data/tst_pattern.qml" "data/tst_path.qml" "data/tst_line.qml" "data/tst_fillStyle.qml" "data/tst_fillrect.qml" "data/tst_composite.qml" "data/tst_canvas.qml" "data/tst_pixel.qml" "data/tst_gradient.qml" "data/tst_arcto.qml" "data/tst_arc.qml" "data/tst_context.qml" "data/tst_imagedata.qml" "data/CanvasTestCase.qml" "data/CanvasComponent.qml" "data/tst_image.qml" "data/tst_svgpath.qml" "data/anim-gr.gif" "data/anim-gr.png" "data/anim-poster-gr.png" "data/background.png" "data/broken.png" "data/ggrr-256x256.png" "data/green-1x1.png" "data/green-2x2.png" "data/green-16x16.png" "data/green-256x256.png" "data/green.png" "data/grgr-256x256.png" "data/red-16x16.png" "data/red.png" "data/redtransparent.png" "data/rgrg-256x256.png" "data/rrgg-256x256.png" "data/transparent.png" "data/transparent50.png" "data/yellow.png" "data/yellow75.png" "data/tst_invalidContext.qml"
 # TEMPLATE = "app"
 
diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
index 900822ed06..87492ff436 100644
--- a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
+++ b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickdesignersupport
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -37,15 +34,11 @@ add_qt_test(tst_qquickdesignersupport
 )
 
 #### Keys ignored in scope 1:.:.:qquickdesignersupport.pro:<TRUE>:
-# CONFIG = "testcase"
 # DISTFILES = "data/TestComponent.qml" "data/test.qml" "data/componentTest.qml" "data/Component01.qml" "data/Component02.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickdesignersupport.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickdesignersupport CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickdrag/CMakeLists.txt b/tests/auto/quick/qquickdrag/CMakeLists.txt
index 379be72636..ad077411c2 100644
--- a/tests/auto/quick/qquickdrag/CMakeLists.txt
+++ b/tests/auto/quick/qquickdrag/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qquickdrag
-    GUI
     SOURCES
         tst_qquickdrag.cpp
     LIBRARIES
@@ -20,11 +19,5 @@ add_qt_test(tst_qquickdrag
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquickdrag.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qquickdrag.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt
index ccac3c9752..f56593b245 100644
--- a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt
+++ b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickdynamicpropertyanimation
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickdynamicpropertyanimation.cpp
@@ -26,15 +23,9 @@ add_qt_test(tst_qquickdynamicpropertyanimation
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickdynamicpropertyanimation.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickdynamicpropertyanimation.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickflickable/CMakeLists.txt b/tests/auto/quick/qquickflickable/CMakeLists.txt
index 89403c19bd..43ec4cd14d 100644
--- a/tests/auto/quick/qquickflickable/CMakeLists.txt
+++ b/tests/auto/quick/qquickflickable/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickflickable
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquickflickable
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickflickable.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickflickable.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickflickable CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickflipable/CMakeLists.txt b/tests/auto/quick/qquickflipable/CMakeLists.txt
index 1ae064806d..42d3e5516e 100644
--- a/tests/auto/quick/qquickflipable/CMakeLists.txt
+++ b/tests/auto/quick/qquickflipable/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickflipable
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickflipable.cpp
@@ -31,15 +28,9 @@ add_qt_test(tst_qquickflipable
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickflipable.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickflipable.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickflipable CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickfocusscope/CMakeLists.txt b/tests/auto/quick/qquickfocusscope/CMakeLists.txt
index 9fb29df116..3d13e0b9e0 100644
--- a/tests/auto/quick/qquickfocusscope/CMakeLists.txt
+++ b/tests/auto/quick/qquickfocusscope/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickfocusscope
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquickfocusscope
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickfocusscope.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickfocusscope.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickfocusscope CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickfontloader/CMakeLists.txt b/tests/auto/quick/qquickfontloader/CMakeLists.txt
index 38fc6d9814..44dcfdad0a 100644
--- a/tests/auto/quick/qquickfontloader/CMakeLists.txt
+++ b/tests/auto/quick/qquickfontloader/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickfontloader
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickfontloader
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickfontloader.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickfontloader.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickfontloader CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt
index 47bd55237d..0ddf042334 100644
--- a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt
+++ b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickfontloader_static
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickfontloader_static.cpp
@@ -34,15 +31,9 @@ add_qt_test(tst_qquickfontloader_static
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickfontloader_static.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickfontloader_static.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickfontloader_static CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt
index b141b4ef8f..6cab5d6550 100644
--- a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt
+++ b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_quickfontmetrics
-    GUI
     SOURCES
         tst_quickfontmetrics.cpp
     LIBRARIES
@@ -16,11 +15,5 @@ add_qt_test(tst_quickfontmetrics
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquickfontmetrics.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qquickfontmetrics.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt
index 32ecd761f0..d58a100884 100644
--- a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt
+++ b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickframebufferobject
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickframebufferobject.cpp
@@ -26,15 +23,11 @@ add_qt_test(tst_qquickframebufferobject
 )
 
 #### Keys ignored in scope 1:.:.:qquickframebufferobject.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/testStuff.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickframebufferobject.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickframebufferobject CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt
index 111de2b978..6de5162b10 100644
--- a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt
+++ b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickgraphicsinfo
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickgraphicsinfo.cpp
@@ -26,15 +23,11 @@ add_qt_test(tst_qquickgraphicsinfo
 )
 
 #### Keys ignored in scope 1:.:.:qquickgraphicsinfo.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/basic.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickgraphicsinfo.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickgridview/CMakeLists.txt b/tests/auto/quick/qquickgridview/CMakeLists.txt
index a9c985920d..885ef9eae4 100644
--- a/tests/auto/quick/qquickgridview/CMakeLists.txt
+++ b/tests/auto/quick/qquickgridview/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickgridview
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -40,15 +37,11 @@ add_qt_test(tst_qquickgridview
 )
 
 #### Keys ignored in scope 1:.:.:qquickgridview.pro:<TRUE>:
-# CONFIG = "testcase"
 # testcase.timeout = "1100"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickgridview.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickgridview CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickimage/CMakeLists.txt b/tests/auto/quick/qquickimage/CMakeLists.txt
index 4fcb949ce0..9c519290ce 100644
--- a/tests/auto/quick/qquickimage/CMakeLists.txt
+++ b/tests/auto/quick/qquickimage/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickimage
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -38,15 +35,9 @@ add_qt_test(tst_qquickimage
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickimage.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickimage.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickimage CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickimageprovider/CMakeLists.txt b/tests/auto/quick/qquickimageprovider/CMakeLists.txt
index 4db2a56630..d81a845a02 100644
--- a/tests/auto/quick/qquickimageprovider/CMakeLists.txt
+++ b/tests/auto/quick/qquickimageprovider/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qquickimageprovider
-    GUI
     SOURCES
         tst_qquickimageprovider.cpp
     LIBRARIES
@@ -20,11 +19,5 @@ add_qt_test(tst_qquickimageprovider
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquickimageprovider.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qquickimageprovider.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/qquickitem/CMakeLists.txt b/tests/auto/quick/qquickitem/CMakeLists.txt
index fe9f817b4b..e78d7d7b40 100644
--- a/tests/auto/quick/qquickitem/CMakeLists.txt
+++ b/tests/auto/quick/qquickitem/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickitem
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquickitem
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickitem.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickitem.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets
     DEFINES
         TEST_QTBUG_60123
diff --git a/tests/auto/quick/qquickitem2/CMakeLists.txt b/tests/auto/quick/qquickitem2/CMakeLists.txt
index 48d0a21a91..1555ad6cef 100644
--- a/tests/auto/quick/qquickitem2/CMakeLists.txt
+++ b/tests/auto/quick/qquickitem2/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickitem2
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickitem.cpp
@@ -31,15 +28,9 @@ add_qt_test(tst_qquickitem2
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickitem2.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickitem2.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickitem2 CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickitemlayer/CMakeLists.txt b/tests/auto/quick/qquickitemlayer/CMakeLists.txt
index cb140b92d0..a03a0d3478 100644
--- a/tests/auto/quick/qquickitemlayer/CMakeLists.txt
+++ b/tests/auto/quick/qquickitemlayer/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickitemlayer
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickitemlayer.cpp
@@ -32,15 +29,11 @@ add_qt_test(tst_qquickitemlayer
 )
 
 #### Keys ignored in scope 1:.:.:qquickitemlayer.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/Smooth.qml" "data/Enabled.qml" "data/Mipmap.qml" "data/Effect.qml" "data/SourceRect.qml" "data/TextureProvider.qml" "data/Visible.qml" "data/ZOrder.qml" "data/ZOrderChange.qml" "data/ToggleLayerAndEffect.qml" "data/DisableLayer.qml" "data/SamplerNameChange.qml" "data/ItemEffect.qml" "data/RectangleEffect.qml" "data/TextureMirroring.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickitemlayer.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickitemlayer CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquicklayouts/CMakeLists.txt b/tests/auto/quick/qquicklayouts/CMakeLists.txt
index e37f376d43..1c515786a2 100644
--- a/tests/auto/quick/qquicklayouts/CMakeLists.txt
+++ b/tests/auto/quick/qquicklayouts/CMakeLists.txt
@@ -5,11 +5,9 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquicklayouts
@@ -28,6 +26,5 @@ add_qt_test(tst_qquicklayouts
 )
 
 #### Keys ignored in scope 1:.:.:qquicklayouts.pro:<TRUE>:
-# CONFIG = "qmltestcase"
 # OTHER_FILES = "data/tst_rowlayout.qml" "data/tst_gridlayout.qml" "data/tst_stacklayout.qml"
 # TEMPLATE = "app"
diff --git a/tests/auto/quick/qquicklistview/CMakeLists.txt b/tests/auto/quick/qquicklistview/CMakeLists.txt
index 6c70160aac..7c809d8c29 100644
--- a/tests/auto/quick/qquicklistview/CMakeLists.txt
+++ b/tests/auto/quick/qquicklistview/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquicklistview
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -43,16 +40,12 @@ add_qt_test(tst_qquicklistview
 )
 
 #### Keys ignored in scope 1:.:.:qquicklistview.pro:<TRUE>:
-# CONFIG = "testcase"
 # DISTFILES = "data/*"
 # testcase.timeout = "900"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquicklistview.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicklistview CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickloader/CMakeLists.txt b/tests/auto/quick/qquickloader/CMakeLists.txt
index 73125de827..a92ea61df5 100644
--- a/tests/auto/quick/qquickloader/CMakeLists.txt
+++ b/tests/auto/quick/qquickloader/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickloader
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -38,15 +35,9 @@ add_qt_test(tst_qquickloader
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickloader.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickloader.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickloader CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickmousearea/CMakeLists.txt b/tests/auto/quick/qquickmousearea/CMakeLists.txt
index dac995f721..bb60a32d8b 100644
--- a/tests/auto/quick/qquickmousearea/CMakeLists.txt
+++ b/tests/auto/quick/qquickmousearea/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickmousearea
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -39,15 +36,11 @@ add_qt_test(tst_qquickmousearea
 )
 
 #### Keys ignored in scope 1:.:.:qquickmousearea.pro:<TRUE>:
-# CONFIG = "testcase"
-# OTHER_FILES = "$$filesdata/*.qml"
+# OTHER_FILES = "data/*.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickmousearea.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickmousearea CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt
index 4f7b5b9c99..bb3ae58ab3 100644
--- a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt
+++ b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickmultipointtoucharea
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquickmultipointtoucharea
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickmultipointtoucharea.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickmultipointtoucharea.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt
index a35670be38..bf366c2b7c 100644
--- a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt
+++ b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickopenglinfo
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickopenglinfo.cpp
@@ -26,15 +23,11 @@ add_qt_test(tst_qquickopenglinfo
 )
 
 #### Keys ignored in scope 1:.:.:qquickopenglinfo.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/basic.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickopenglinfo.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickopenglinfo CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickpainteditem/CMakeLists.txt b/tests/auto/quick/qquickpainteditem/CMakeLists.txt
index 09c480b9f6..fd528006b0 100644
--- a/tests/auto/quick/qquickpainteditem/CMakeLists.txt
+++ b/tests/auto/quick/qquickpainteditem/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qquickpainteditem
-    GUI
     SOURCES
         tst_qquickpainteditem.cpp
     LIBRARIES
@@ -20,11 +19,5 @@ add_qt_test(tst_qquickpainteditem
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquickpainteditem.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qquickpainteditem.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/qquickpath/CMakeLists.txt b/tests/auto/quick/qquickpath/CMakeLists.txt
index 2338df87fa..cf7d7740ac 100644
--- a/tests/auto/quick/qquickpath/CMakeLists.txt
+++ b/tests/auto/quick/qquickpath/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickpath
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickpath.cpp
@@ -32,15 +29,11 @@ add_qt_test(tst_qquickpath
 )
 
 #### Keys ignored in scope 1:.:.:qquickpath.pro:<TRUE>:
-# CONFIG = "testcase"
 # DISTFILES = "data/*"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickpath.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickpath CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickpathview/CMakeLists.txt b/tests/auto/quick/qquickpathview/CMakeLists.txt
index dfb7a8cc54..a9b2bfb1af 100644
--- a/tests/auto/quick/qquickpathview/CMakeLists.txt
+++ b/tests/auto/quick/qquickpathview/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickpathview
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -39,15 +36,9 @@ add_qt_test(tst_qquickpathview
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickpathview.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickpathview.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
diff --git a/tests/auto/quick/qquickpincharea/CMakeLists.txt b/tests/auto/quick/qquickpincharea/CMakeLists.txt
index ca35da6eaf..07a3768684 100644
--- a/tests/auto/quick/qquickpincharea/CMakeLists.txt
+++ b/tests/auto/quick/qquickpincharea/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickpincharea
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquickpincharea
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickpincharea.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickpincharea.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickpincharea CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt
index 5dc5bd71ab..7064dc9ce5 100644
--- a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt
+++ b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickpixmapcache
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -34,15 +31,9 @@ add_qt_test(tst_qquickpixmapcache
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickpixmapcache.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickpixmapcache.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickpixmapcache CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickpositioners/CMakeLists.txt b/tests/auto/quick/qquickpositioners/CMakeLists.txt
index a01fd45328..3a5aa6aa5f 100644
--- a/tests/auto/quick/qquickpositioners/CMakeLists.txt
+++ b/tests/auto/quick/qquickpositioners/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickpositioners
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -37,15 +34,9 @@ add_qt_test(tst_qquickpositioners
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickpositioners.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickpositioners.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickpositioners CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickrectangle/CMakeLists.txt b/tests/auto/quick/qquickrectangle/CMakeLists.txt
index 8186d01e61..5653c08dd3 100644
--- a/tests/auto/quick/qquickrectangle/CMakeLists.txt
+++ b/tests/auto/quick/qquickrectangle/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickrectangle
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquickrectangle
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickrectangle.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickrectangle.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickrectangle CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickrepeater/CMakeLists.txt b/tests/auto/quick/qquickrepeater/CMakeLists.txt
index db9ff124c3..5863de83ef 100644
--- a/tests/auto/quick/qquickrepeater/CMakeLists.txt
+++ b/tests/auto/quick/qquickrepeater/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickrepeater
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -38,15 +35,9 @@ add_qt_test(tst_qquickrepeater
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickrepeater.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickrepeater.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickrepeater CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickscreen/CMakeLists.txt b/tests/auto/quick/qquickscreen/CMakeLists.txt
index ccd5e04513..c53ed38d28 100644
--- a/tests/auto/quick/qquickscreen/CMakeLists.txt
+++ b/tests/auto/quick/qquickscreen/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qquickscreen
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickscreen.cpp
@@ -22,15 +21,9 @@ add_qt_test(tst_qquickscreen
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquickscreen.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickscreen.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickscreen CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickshadereffect/CMakeLists.txt b/tests/auto/quick/qquickshadereffect/CMakeLists.txt
index 50afc961b7..11b63af453 100644
--- a/tests/auto/quick/qquickshadereffect/CMakeLists.txt
+++ b/tests/auto/quick/qquickshadereffect/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qquickshadereffect
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickshadereffect.cpp
@@ -22,15 +21,9 @@ add_qt_test(tst_qquickshadereffect
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquickshadereffect.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickshadereffect.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickshadereffect CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickshape/CMakeLists.txt b/tests/auto/quick/qquickshape/CMakeLists.txt
index 2e74f493fa..4e31680f7f 100644
--- a/tests/auto/quick/qquickshape/CMakeLists.txt
+++ b/tests/auto/quick/qquickshape/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickshape
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -39,15 +36,11 @@ add_qt_test(tst_qquickshape
 )
 
 #### Keys ignored in scope 1:.:.:qquickshape.pro:<TRUE>:
-# CONFIG = "testcase"
 # DISTFILES = "data/*"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickshape.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
diff --git a/tests/auto/quick/qquickshortcut/CMakeLists.txt b/tests/auto/quick/qquickshortcut/CMakeLists.txt
index f5f4ef9590..42b69b9587 100644
--- a/tests/auto/quick/qquickshortcut/CMakeLists.txt
+++ b/tests/auto/quick/qquickshortcut/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickshortcut
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickshortcut.cpp
@@ -26,9 +23,6 @@ add_qt_test(tst_qquickshortcut
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickshortcut.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
diff --git a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt
index 7cfa0a3fb8..837160e69b 100644
--- a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt
+++ b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquicksmoothedanimation
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquicksmoothedanimation.cpp
@@ -31,15 +28,9 @@ add_qt_test(tst_qquicksmoothedanimation
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquicksmoothedanimation.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquicksmoothedanimation.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickspringanimation/CMakeLists.txt b/tests/auto/quick/qquickspringanimation/CMakeLists.txt
index bfee6d380c..85b53abf9a 100644
--- a/tests/auto/quick/qquickspringanimation/CMakeLists.txt
+++ b/tests/auto/quick/qquickspringanimation/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickspringanimation
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickspringanimation.cpp
@@ -31,15 +28,9 @@ add_qt_test(tst_qquickspringanimation
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickspringanimation.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickspringanimation.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickspringanimation CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickspritesequence/CMakeLists.txt b/tests/auto/quick/qquickspritesequence/CMakeLists.txt
index a415757072..f40680742a 100644
--- a/tests/auto/quick/qquickspritesequence/CMakeLists.txt
+++ b/tests/auto/quick/qquickspritesequence/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickspritesequence
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickspritesequence.cpp
@@ -32,15 +29,9 @@ add_qt_test(tst_qquickspritesequence
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickspritesequence.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickspritesequence.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickspritesequence CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickstates/CMakeLists.txt b/tests/auto/quick/qquickstates/CMakeLists.txt
index 38a026fb05..7494cfb97f 100644
--- a/tests/auto/quick/qquickstates/CMakeLists.txt
+++ b/tests/auto/quick/qquickstates/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickstates
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickstates.cpp
@@ -31,15 +28,9 @@ add_qt_test(tst_qquickstates
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickstates.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickstates.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickstates CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickstyledtext/CMakeLists.txt b/tests/auto/quick/qquickstyledtext/CMakeLists.txt
index 360e910bd7..0d0808969a 100644
--- a/tests/auto/quick/qquickstyledtext/CMakeLists.txt
+++ b/tests/auto/quick/qquickstyledtext/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qquickstyledtext
-    GUI
     SOURCES
         tst_qquickstyledtext.cpp
     LIBRARIES
@@ -20,11 +19,5 @@ add_qt_test(tst_qquickstyledtext
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquickstyledtext.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qquickstyledtext.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/qquicksystempalette/CMakeLists.txt b/tests/auto/quick/qquicksystempalette/CMakeLists.txt
index 20f4186cef..53287a6d0c 100644
--- a/tests/auto/quick/qquicksystempalette/CMakeLists.txt
+++ b/tests/auto/quick/qquicksystempalette/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qquicksystempalette
-    GUI
     SOURCES
         tst_qquicksystempalette.cpp
     LIBRARIES
@@ -19,15 +18,9 @@ add_qt_test(tst_qquicksystempalette
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquicksystempalette.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquicksystempalette.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicksystempalette CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
diff --git a/tests/auto/quick/qquicktableview/CMakeLists.txt b/tests/auto/quick/qquicktableview/CMakeLists.txt
index 76001f9b84..773a166473 100644
--- a/tests/auto/quick/qquicktableview/CMakeLists.txt
+++ b/tests/auto/quick/qquicktableview/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquicktableview
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -40,15 +37,9 @@ add_qt_test(tst_qquicktableview
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquicktableview.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquicktableview.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicktableview CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquicktext/CMakeLists.txt b/tests/auto/quick/qquicktext/CMakeLists.txt
index c0c52eab6b..7148567a25 100644
--- a/tests/auto/quick/qquicktext/CMakeLists.txt
+++ b/tests/auto/quick/qquicktext/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquicktext
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -34,15 +31,9 @@ add_qt_test(tst_qquicktext
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquicktext.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquicktext.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicktext CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquicktextdocument/CMakeLists.txt b/tests/auto/quick/qquicktextdocument/CMakeLists.txt
index 5ae5ef9154..5b23371191 100644
--- a/tests/auto/quick/qquicktextdocument/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextdocument/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquicktextdocument
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquicktextdocument.cpp
@@ -31,15 +28,9 @@ add_qt_test(tst_qquicktextdocument
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquicktextdocument.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquicktextdocument.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicktextdocument CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquicktextedit/CMakeLists.txt b/tests/auto/quick/qquicktextedit/CMakeLists.txt
index d87505d35f..cc244983b0 100644
--- a/tests/auto/quick/qquicktextedit/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextedit/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquicktextedit
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -39,9 +36,6 @@ add_qt_test(tst_qquicktextedit
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquicktextedit.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
@@ -50,9 +44,6 @@ extend_target(tst_qquicktextedit CONDITION APPLE_OSX
         ${FWAppKit}
 )
 
-#### Keys ignored in scope 2:.:.:qquicktextedit.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicktextedit CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquicktextinput/CMakeLists.txt b/tests/auto/quick/qquicktextinput/CMakeLists.txt
index ac914291da..0901c29b21 100644
--- a/tests/auto/quick/qquicktextinput/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextinput/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquicktextinput
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -32,9 +29,6 @@ add_qt_test(tst_qquicktextinput
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquicktextinput.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
@@ -43,9 +37,6 @@ extend_target(tst_qquicktextinput CONDITION APPLE_OSX
         ${FWAppKit}
 )
 
-#### Keys ignored in scope 2:.:.:qquicktextinput.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicktextinput CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt
index 508657b370..0fbb74e0a8 100644
--- a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qquicktextmetrics
-    GUI
     SOURCES
         tst_qquicktextmetrics.cpp
     LIBRARIES
@@ -16,11 +15,5 @@ add_qt_test(tst_qquicktextmetrics
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquicktextmetrics.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qquicktextmetrics.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/qquicktimeline/CMakeLists.txt b/tests/auto/quick/qquicktimeline/CMakeLists.txt
index d303e7a462..40e926dd0d 100644
--- a/tests/auto/quick/qquicktimeline/CMakeLists.txt
+++ b/tests/auto/quick/qquicktimeline/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qquicktimeline
-    GUI
     SOURCES
         tst_qquicktimeline.cpp
     LIBRARIES
@@ -19,11 +18,5 @@ add_qt_test(tst_qquicktimeline
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:qquicktimeline.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qquicktimeline.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quick/qquickview/CMakeLists.txt b/tests/auto/quick/qquickview/CMakeLists.txt
index 09aea1d0a3..c7cf57a66a 100644
--- a/tests/auto/quick/qquickview/CMakeLists.txt
+++ b/tests/auto/quick/qquickview/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickview
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquickview
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickview.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickview.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickview CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt
index db173d0d3e..f9d4d96473 100644
--- a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt
+++ b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickvisualdatamodel
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -38,15 +35,9 @@ add_qt_test(tst_qquickvisualdatamodel
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickvisualdatamodel.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickvisualdatamodel.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
diff --git a/tests/auto/quick/qquickwindow/CMakeLists.txt b/tests/auto/quick/qquickwindow/CMakeLists.txt
index 390fa0c154..8d119952f7 100644
--- a/tests/auto/quick/qquickwindow/CMakeLists.txt
+++ b/tests/auto/quick/qquickwindow/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qquickwindow
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -37,15 +34,11 @@ add_qt_test(tst_qquickwindow
 )
 
 #### Keys ignored in scope 1:.:.:qquickwindow.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/active.qml" "data/AnimationsWhileHidden.qml" "data/Headless.qml" "data/showHideAnimate.qml" "data/windoworder.qml" "data/grabContentItemToImage.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickwindow.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickwindow CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/rendernode/CMakeLists.txt b/tests/auto/quick/rendernode/CMakeLists.txt
index 2cbc4fdc66..7116c65a6c 100644
--- a/tests/auto/quick/rendernode/CMakeLists.txt
+++ b/tests/auto/quick/rendernode/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_rendernode
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_rendernode.cpp
@@ -32,15 +29,11 @@ add_qt_test(tst_rendernode
 )
 
 #### Keys ignored in scope 1:.:.:rendernode.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/RenderOrder.qml" "data/MessUpState.qml" "data/matrix.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:rendernode.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_rendernode CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/scenegraph/CMakeLists.txt b/tests/auto/quick/scenegraph/CMakeLists.txt
index a635944e60..e36a2b6720 100644
--- a/tests/auto/quick/scenegraph/CMakeLists.txt
+++ b/tests/auto/quick/scenegraph/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_scenegraph
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -28,15 +27,11 @@ add_qt_test(tst_scenegraph
 )
 
 #### Keys ignored in scope 1:.:.:scenegraph.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/render_OutOfFloatRange.qml" "data/simple.qml" "data/render_ImageFiltering.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:scenegraph.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_scenegraph CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/sharedimage/CMakeLists.txt b/tests/auto/quick/sharedimage/CMakeLists.txt
index 3c400bbef0..41ab25187d 100644
--- a/tests/auto/quick/sharedimage/CMakeLists.txt
+++ b/tests/auto/quick/sharedimage/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_sharedimage
-    GUI
     SOURCES
         tst_sharedimage.cpp
     LIBRARIES
@@ -25,5 +22,4 @@ add_qt_test(tst_sharedimage
 )
 
 #### Keys ignored in scope 1:.:.:sharedimage.pro:<TRUE>:
-# CONFIG = "testcase" "-app_bundle"
 # OTHER_FILES = "data/yellow.png"
diff --git a/tests/auto/quick/touchmouse/CMakeLists.txt b/tests/auto/quick/touchmouse/CMakeLists.txt
index bc5f2cdd67..5b1c02b0e5 100644
--- a/tests/auto/quick/touchmouse/CMakeLists.txt
+++ b/tests/auto/quick/touchmouse/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_touchmouse
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_touchmouse
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:touchmouse.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:touchmouse.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_touchmouse CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"