Regenerate tests

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

23 files changed, 46 insertions, 253 deletions

diff --git a/tests/auto/particles/qquickage/CMakeLists.txt b/tests/auto/particles/qquickage/CMakeLists.txt
index cceeab2f82..9dfec05256 100644
--- a/tests/auto/particles/qquickage/CMakeLists.txt
+++ b/tests/auto/particles/qquickage/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_qquickage
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickage.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickage
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickage.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickage.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickage CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickangleddirection/CMakeLists.txt b/tests/auto/particles/qquickangleddirection/CMakeLists.txt
index 76c7edb765..aa31081b37 100644
--- a/tests/auto/particles/qquickangleddirection/CMakeLists.txt
+++ b/tests/auto/particles/qquickangleddirection/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_qquickangleddirection
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickangleddirection.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickangleddirection
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickangleddirection.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickangleddirection.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickangleddirection CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt
index c5fcf48c42..baf55ff930 100644
--- a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt
+++ b/tests/auto/particles/qquickcumulativedirection/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_qquickcumulativedirection
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickcumulativedirection.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickcumulativedirection
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickcumulativedirection.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickcumulativedirection.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickcumulativedirection CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt
index 9a36a03a67..dd37fc9599 100644
--- a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt
+++ b/tests/auto/particles/qquickcustomaffector/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_qquickcustomaffector
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickcustomaffector.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickcustomaffector
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickcustomaffector.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickcustomaffector.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickcustomaffector CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt b/tests/auto/particles/qquickcustomparticle/CMakeLists.txt
index c63b52027a..6df41b08bd 100644
--- a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt
+++ b/tests/auto/particles/qquickcustomparticle/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_qquickcustomparticle
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickcustomparticle.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickcustomparticle
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickcustomparticle.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickcustomparticle.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickcustomparticle CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt
index 2fcbc03d50..ffa8751587 100644
--- a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquickellipseextruder/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_qquickellipseextruder
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickellipseextruder.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickellipseextruder
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickellipseextruder.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickellipseextruder.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickellipseextruder CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickfriction/CMakeLists.txt b/tests/auto/particles/qquickfriction/CMakeLists.txt
index e495b693a4..e404d91591 100644
--- a/tests/auto/particles/qquickfriction/CMakeLists.txt
+++ b/tests/auto/particles/qquickfriction/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_qquickfriction
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickfriction.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickfriction
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickfriction.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickfriction.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickfriction CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickgravity/CMakeLists.txt b/tests/auto/particles/qquickgravity/CMakeLists.txt
index 4ddde296ba..4afb097e17 100644
--- a/tests/auto/particles/qquickgravity/CMakeLists.txt
+++ b/tests/auto/particles/qquickgravity/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_qquickgravity
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickgravity.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickgravity
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickgravity.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickgravity.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickgravity CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt
index 52a2b4bb3f..9fb39223dd 100644
--- a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt
+++ b/tests/auto/particles/qquickgroupgoal/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_qquickgroupgoal
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickgroupgoal.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickgroupgoal
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickgroupgoal.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickgroupgoal.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickgroupgoal CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickimageparticle/CMakeLists.txt b/tests/auto/particles/qquickimageparticle/CMakeLists.txt
index 505e42bc03..c46568e32e 100644
--- a/tests/auto/particles/qquickimageparticle/CMakeLists.txt
+++ b/tests/auto/particles/qquickimageparticle/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_qquickimageparticle
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickimageparticle.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickimageparticle
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickimageparticle.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickimageparticle.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickimageparticle CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickitemparticle/CMakeLists.txt b/tests/auto/particles/qquickitemparticle/CMakeLists.txt
index 200950e251..c0db633f17 100644
--- a/tests/auto/particles/qquickitemparticle/CMakeLists.txt
+++ b/tests/auto/particles/qquickitemparticle/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_qquickitemparticle
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickitemparticle.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickitemparticle
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickitemparticle.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickitemparticle.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickitemparticle CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquicklineextruder/CMakeLists.txt b/tests/auto/particles/qquicklineextruder/CMakeLists.txt
index eb99095029..3178315d90 100644
--- a/tests/auto/particles/qquicklineextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquicklineextruder/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_qquicklineextruder
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquicklineextruder.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquicklineextruder
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquicklineextruder.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquicklineextruder.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicklineextruder CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt
index fd27aba91c..ea9ec81666 100644
--- a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquickmaskextruder/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_qquickmaskextruder
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickmaskextruder.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickmaskextruder
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickmaskextruder.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickmaskextruder.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickmaskextruder CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt
index f881057601..469a070192 100644
--- a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt
+++ b/tests/auto/particles/qquickparticlegroup/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_qquickparticlegroup
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickparticlegroup.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickparticlegroup
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickparticlegroup.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickparticlegroup.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickparticlegroup CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt
index e13047ad1d..30ba359ccd 100644
--- a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt
+++ b/tests/auto/particles/qquickparticlesystem/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_qquickparticlesystem
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickparticlesystem.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickparticlesystem
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickparticlesystem.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickparticlesystem.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickparticlesystem CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickpointattractor/CMakeLists.txt b/tests/auto/particles/qquickpointattractor/CMakeLists.txt
index 0093811ab0..0dd60223ec 100644
--- a/tests/auto/particles/qquickpointattractor/CMakeLists.txt
+++ b/tests/auto/particles/qquickpointattractor/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_qquickpointattractor
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickpointattractor.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickpointattractor
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickpointattractor.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickpointattractor.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickpointattractor CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickpointdirection/CMakeLists.txt b/tests/auto/particles/qquickpointdirection/CMakeLists.txt
index c5b8489f20..128e6a202b 100644
--- a/tests/auto/particles/qquickpointdirection/CMakeLists.txt
+++ b/tests/auto/particles/qquickpointdirection/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_qquickpointdirection
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickpointdirection.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickpointdirection
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickpointdirection.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickpointdirection.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickpointdirection CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt
index 0375792ac1..8b180893e8 100644
--- a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquickrectangleextruder/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_qquickrectangleextruder
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickrectangleextruder.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickrectangleextruder
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickrectangleextruder.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickrectangleextruder.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickrectangleextruder CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickspritegoal/CMakeLists.txt b/tests/auto/particles/qquickspritegoal/CMakeLists.txt
index e92e736257..ee298e96fb 100644
--- a/tests/auto/particles/qquickspritegoal/CMakeLists.txt
+++ b/tests/auto/particles/qquickspritegoal/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_qquickspritegoal
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickspritegoal.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickspritegoal
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickspritegoal.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickspritegoal.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickspritegoal CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt
index af2e47f52c..e167d487dc 100644
--- a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt
+++ b/tests/auto/particles/qquicktargetdirection/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_qquicktargetdirection
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquicktargetdirection.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquicktargetdirection
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquicktargetdirection.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquicktargetdirection.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicktargetdirection CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt
index f305ba5179..2ae5c0a108 100644
--- a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt
+++ b/tests/auto/particles/qquicktrailemitter/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_qquicktrailemitter
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquicktrailemitter.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquicktrailemitter
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquicktrailemitter.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquicktrailemitter.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquicktrailemitter CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickturbulence/CMakeLists.txt b/tests/auto/particles/qquickturbulence/CMakeLists.txt
index 67151dbc55..9409f54053 100644
--- a/tests/auto/particles/qquickturbulence/CMakeLists.txt
+++ b/tests/auto/particles/qquickturbulence/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_qquickturbulence
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickturbulence.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickturbulence
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickturbulence.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickturbulence.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickturbulence CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/particles/qquickwander/CMakeLists.txt b/tests/auto/particles/qquickwander/CMakeLists.txt
index 412ae65872..440afb7d4d 100644
--- a/tests/auto/particles/qquickwander/CMakeLists.txt
+++ b/tests/auto/particles/qquickwander/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_qquickwander
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickwander.cpp
@@ -33,15 +30,9 @@ add_qt_test(tst_qquickwander
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickwander.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickwander.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickwander CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"