Regenerate projects

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

11 files changed, 115 insertions, 48 deletions

diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
new file mode 100644
index 0000000..ee686dc
--- /dev/null
+++ b/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtsvg.pro.
+
+cmake_minimum_required(VERSION 3.15.0)
+
+project(QtSvg
+    VERSION 6.0.0
+    DESCRIPTION "Qt Svg Libraries"
+    HOMEPAGE_URL "https://qt.io/"
+    LANGUAGES CXX C
+)
+
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
+
+qt_build_repo()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d78b2db..7b8f368 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,14 @@
+# Generated from qtsvg.pro.
+
 cmake_minimum_required(VERSION 3.15.0)
 
 project(QtSvg
     VERSION 6.0.0
-    DESCRIPTION "Qt SVG Libraries"
+    DESCRIPTION "Qt SVG Libraries" # special case
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C
 )
 
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG COMPONENTS Xml) # For tests
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets) # special case
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Xml) # special case for tests
 qt_build_repo()
diff --git a/src/plugins/iconengines/svgiconengine/CMakeLists.txt b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
index 4b047be..2ddb15c 100644
--- a/src/plugins/iconengines/svgiconengine/CMakeLists.txt
+++ b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qsvgicon Plugin:
 #####################################################################
 
-add_qt_plugin(qsvgicon
+qt_add_plugin(qsvgicon
     TYPE iconengines
     CLASS_NAME QSvgIconPlugin
     SOURCES
@@ -21,7 +21,4 @@ add_qt_plugin(qsvgicon
 
 #### Keys ignored in scope 1:.:.:svgiconengine.pro:<TRUE>:
 # OTHER_FILES = "qsvgiconengine.json" "qsvgiconengine-nocompress.json"
-# PLUGIN_CLASS_NAME = "QSvgIconPlugin"
 # PLUGIN_EXTENDS = "svg"
-# PLUGIN_TYPE = "iconengines"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/svg/CMakeLists.txt b/src/plugins/imageformats/svg/CMakeLists.txt
index 66a255c..d7818c9 100644
--- a/src/plugins/imageformats/svg/CMakeLists.txt
+++ b/src/plugins/imageformats/svg/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qsvg Plugin:
 #####################################################################
 
-add_qt_plugin(qsvg
+qt_add_plugin(qsvg
     TYPE imageformats
     CLASS_NAME QSvgPlugin
     SOURCES
@@ -17,7 +17,4 @@ add_qt_plugin(qsvg
 )
 
 #### Keys ignored in scope 1:.:.:svg.pro:<TRUE>:
-# PLUGIN_CLASS_NAME = "QSvgPlugin"
 # PLUGIN_EXTENDS = "svg"
-# PLUGIN_TYPE = "imageformats"
-# _LOADED = "qt_plugin"
diff --git a/src/svg/.prev_CMakeLists.txt b/src/svg/.prev_CMakeLists.txt
new file mode 100644
index 0000000..b0bb9b6
--- /dev/null
+++ b/src/svg/.prev_CMakeLists.txt
@@ -0,0 +1,52 @@
+# Generated from svg.pro.
+
+#####################################################################
+## Svg Module:
+#####################################################################
+
+qt_add_module(Svg
+    SOURCES
+        qgraphicssvgitem.cpp qgraphicssvgitem.h
+        qsvgfont.cpp qsvgfont_p.h
+        qsvggenerator.cpp qsvggenerator.h
+        qsvggraphics.cpp qsvggraphics_p.h
+        qsvghandler.cpp qsvghandler_p.h
+        qsvgnode.cpp qsvgnode_p.h
+        qsvgrenderer.cpp qsvgrenderer.h
+        qsvgstructure.cpp qsvgstructure_p.h
+        qsvgstyle.cpp qsvgstyle_p.h
+        qsvgtinydocument.cpp qsvgtinydocument_p.h
+        qsvgwidget.cpp qsvgwidget.h
+        qtsvgglobal.h
+    DEFINES
+        QT_NO_USING_NAMESPACE
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        ZLIB::ZLIB
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Svg CONDITION TARGET Qt::Widgets
+    LIBRARIES
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
+qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x66000000"
+)
+
+#### Keys ignored in scope 4:.:.:svg.pro:solaris-cc_x_:
+# QMAKE_CXXFLAGS_RELEASE = "--O2"
+qt_add_docs(Svg
+    doc/qtsvg.qdocconf
+)
+
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index 955daee..0906f1d 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from svg.pro.
 
-find_package(ZLIB MODULE REQUIRED) # special case
-
 #####################################################################
 ## Svg Module:
 #####################################################################
 
-add_qt_module(Svg
+find_package(ZLIB MODULE REQUIRED) # special case
+
+qt_add_module(Svg
     SOURCES
         qgraphicssvgitem.cpp qgraphicssvgitem.h
         qsvgfont.cpp qsvgfont_p.h
@@ -31,26 +31,24 @@ add_qt_module(Svg
         Qt::Gui
 )
 
-#### Keys ignored in scope 1:.:.:svg.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
-extend_target(Svg CONDITION TARGET Qt::Widgets
+qt_extend_target(Svg CONDITION TARGET Qt::Widgets
     LIBRARIES
         Qt::WidgetsPrivate
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
 )
 
 #### Keys ignored in scope 4:.:.:svg.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
-add_qt_docs(
+qt_add_docs(Svg
     doc/qtsvg.qdocconf
 )
+
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"