Regenerate tests

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

6 files changed, 10 insertions, 55 deletions

diff --git a/tests/auto/quicktest/polish-qml/CMakeLists.txt b/tests/auto/quicktest/polish-qml/CMakeLists.txt
index 8960319efd..d6e97809bd 100644
--- a/tests/auto/quicktest/polish-qml/CMakeLists.txt
+++ b/tests/auto/quicktest/polish-qml/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}
-    "${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml")
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_polish-qml
-    GUI
     QMLTEST
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
@@ -28,15 +25,9 @@ add_qt_test(tst_polish-qml
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:polish-qml.pro:<TRUE>:
-# CONFIG = "qmltestcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:polish-qml.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_polish-qml CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quicktest/polish/CMakeLists.txt b/tests/auto/quicktest/polish/CMakeLists.txt
index 666d38352b..d55bd789b9 100644
--- a/tests/auto/quicktest/polish/CMakeLists.txt
+++ b/tests/auto/quicktest/polish/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}
-    "${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml")
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_polish
-    GUI
     QMLTEST
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
@@ -28,15 +25,9 @@ add_qt_test(tst_polish
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:polish.pro:<TRUE>:
-# CONFIG = "qmltestcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:polish.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_polish CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt
index e65654b4be..ebd9130394 100644
--- a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt
+++ b/tests/auto/quicktest/quicktestmainwithsetup/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}
-    "${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml")
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_quicktestmainwithsetup
-    GUI
     QMLTEST
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
@@ -26,15 +23,9 @@ add_qt_test(tst_quicktestmainwithsetup
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:quicktestmainwithsetup.pro:<TRUE>:
-# CONFIG = "qmltestcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:quicktestmainwithsetup.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quicktest/signalspy/CMakeLists.txt b/tests/auto/quicktest/signalspy/CMakeLists.txt
index 20731a6fc4..ae4e3e7b48 100644
--- a/tests/auto/quicktest/signalspy/CMakeLists.txt
+++ b/tests/auto/quicktest/signalspy/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_signalspy
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         mypropertymap.cpp mypropertymap.h
@@ -17,15 +16,9 @@ add_qt_test(tst_signalspy
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:signalspy.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:signalspy.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_signalspy CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt b/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt
index ff1f91ab58..b27c8b6dc4 100644
--- a/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt
+++ b/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt
@@ -5,16 +5,15 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "${CMAKE_CURRENT_SOURCE_DIR}/*.qml")
+    ${CMAKE_CURRENT_SOURCE_DIR}/*.qml)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(quicktestmain
     GUI
     QMLTEST
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         quicktestmain.cpp
     DEFINES
@@ -24,11 +23,5 @@ add_qt_test(quicktestmain
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:quicktestmain.pro:<TRUE>:
-# CONFIG = "qmltestcase"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:quicktestmain.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt
index 7771c3a41a..194e8fe4b7 100644
--- a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt
+++ b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt
@@ -1,16 +1,12 @@
 # Generated from test.pro.
 
 #####################################################################
-## ../tst_testfiltering Test:
+## tst_testfiltering Test:
 #####################################################################
 
 add_qt_test(tst_testfiltering
-    GUI
     SOURCES
         ../tst_testfiltering.cpp
     PUBLIC_LIBRARIES
         Qt::Gui
 )
-
-#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
-# CONFIG = "testcase"