Regenerate projects

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

5 files changed, 34 insertions, 28 deletions

diff --git a/tests/auto/qicon_svg/CMakeLists.txt b/tests/auto/qicon_svg/CMakeLists.txt
index d314181..7373cc7 100644
--- a/tests/auto/qicon_svg/CMakeLists.txt
+++ b/tests/auto/qicon_svg/CMakeLists.txt
@@ -4,7 +4,13 @@
 ## tst_qicon_svg Test:
 #####################################################################
 
-add_qt_test(tst_qicon_svg
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    icons/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_add_test(tst_qicon_svg
     SOURCES
         tst_qicon_svg.cpp
     LIBRARIES
@@ -12,18 +18,23 @@ add_qt_test(tst_qicon_svg
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Svg
+    TESTDATA ${test_data}
 )
 
 # Resources:
-add_qt_resource(tst_qicon_svg "tst_qicon_svg" PREFIX "/" FILES
-    ./icons/heart.svg
-    ./icons/heart.svgz
-    ./icons/image.png
-    ./icons/rect.svg
-    ./icons/rect_size_100percent.svg
-    ./icons/trash.svg)
+set(tst_qicon_svg_resource_files
+    "./icons/heart.svg"
+    "./icons/heart.svgz"
+    "./icons/image.png"
+    "./icons/rect.svg"
+    "./icons/rect_size_100percent.svg"
+    "./icons/trash.svg"
+)
 
+qt_add_resource(tst_qicon_svg "tst_qicon_svg"
+    PREFIX
+        "/"
+    FILES
+        ${tst_qicon_svg_resource_files}
+)
 
-#### Keys ignored in scope 1:.:.:qicon_svg.pro:<TRUE>:
-# CONFIG = "testcase"
-# TESTDATA = "icons/*"
diff --git a/tests/auto/qsvgdevice/CMakeLists.txt b/tests/auto/qsvgdevice/CMakeLists.txt
index 87d8fc2..479bd17 100644
--- a/tests/auto/qsvgdevice/CMakeLists.txt
+++ b/tests/auto/qsvgdevice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsvgdevice Test:
 #####################################################################
 
-add_qt_test(tst_qsvgdevice
+qt_add_test(tst_qsvgdevice
     SOURCES
         tst_qsvgdevice.cpp
     LIBRARIES
@@ -13,6 +13,3 @@ add_qt_test(tst_qsvgdevice
         Qt::Gui
         Qt::Widgets
 )
-
-#### Keys ignored in scope 1:.:.:qsvgdevice.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/qsvggenerator/CMakeLists.txt b/tests/auto/qsvggenerator/CMakeLists.txt
index 039f7db..e86ca91 100644
--- a/tests/auto/qsvggenerator/CMakeLists.txt
+++ b/tests/auto/qsvggenerator/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qsvggenerator Test:
 #####################################################################
 
-add_qt_test(tst_qsvggenerator
-    GUI
+qt_add_test(tst_qsvggenerator
     SOURCES
         tst_qsvggenerator.cpp
     LIBRARIES
@@ -23,7 +22,7 @@ set(qmake_immediate_resource_files
     "referenceSvgs/radial_gradient.svg"
 )
 
-add_qt_resource(tst_qsvggenerator "qmake_immediate"
+qt_add_resource(tst_qsvggenerator "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qsvgplugin/CMakeLists.txt b/tests/auto/qsvgplugin/CMakeLists.txt
index 19ee765..673f39d 100644
--- a/tests/auto/qsvgplugin/CMakeLists.txt
+++ b/tests/auto/qsvgplugin/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qsvgplugin Test:
 #####################################################################
 
-add_qt_test(tst_qsvgplugin
-    GUI
+qt_add_test(tst_qsvgplugin
     SOURCES
         tst_qsvgplugin.cpp
     LIBRARIES
@@ -34,7 +33,7 @@ set(resources_resource_files
     "wide_viewbox.svg"
 )
 
-add_qt_resource(tst_qsvgplugin "resources"
+qt_add_resource(tst_qsvgplugin "resources"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qsvgrenderer/CMakeLists.txt b/tests/auto/qsvgrenderer/CMakeLists.txt
index 5ff0f43..43a3720 100644
--- a/tests/auto/qsvgrenderer/CMakeLists.txt
+++ b/tests/auto/qsvgrenderer/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qsvgrenderer Test:
 #####################################################################
 
-add_qt_test(tst_qsvgrenderer
-    GUI
+qt_add_test(tst_qsvgrenderer
     SOURCES
         tst_qsvgrenderer.cpp
     DEFINES
@@ -19,13 +18,14 @@ add_qt_test(tst_qsvgrenderer
 )
 
 # Resources:
-add_qt_resource(tst_qsvgrenderer "resources"
+set(resources_resource_files
+    "heart.svgz"
+)
+
+qt_add_resource(tst_qsvgrenderer "resources"
     PREFIX
         "/"
     FILES
-        heart.svgz
+        ${resources_resource_files}
 )
 
-
-#### Keys ignored in scope 1:.:.:qsvgrenderer.pro:<TRUE>:
-# CONFIG = "testcase"