CMake: Regenerate projects before API change

Task-number: QTBUG-86815
Change-Id: I2b5975cc1995518f1995955d9b655ab26e764ad0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

10 files changed, 68 insertions, 8 deletions

diff --git a/.cmake.conf b/.cmake.conf
new file mode 100644
index 0000000..9305480
--- /dev/null
+++ b/.cmake.conf
@@ -0,0 +1 @@
+set(QT_REPO_MODULE_VERSION "6.0.0")
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
index ee686dc..c72c853 100644
--- a/.prev_CMakeLists.txt
+++ b/.prev_CMakeLists.txt
@@ -2,8 +2,9 @@
 
 cmake_minimum_required(VERSION 3.15.0)
 
+include(.cmake.conf)
 project(QtSvg
-    VERSION 6.0.0
+    VERSION "${QT_REPO_MODULE_VERSION}"
     DESCRIPTION "Qt Svg Libraries"
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b8f368..c3b98d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,9 @@
 
 cmake_minimum_required(VERSION 3.15.0)
 
+include(.cmake.conf)
 project(QtSvg
-    VERSION 6.0.0
+    VERSION "${QT_REPO_MODULE_VERSION}"
     DESCRIPTION "Qt SVG Libraries" # special case
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 344fbe5..4d059f4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,6 @@ if(TARGET Qt::Gui)
     add_subdirectory(svg)
     add_subdirectory(plugins)
 endif()
-
 if(TARGET Qt::Widgets)
     add_subdirectory(svgwidgets)
 endif()
diff --git a/src/plugins/iconengines/svgiconengine/CMakeLists.txt b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
index 545e124..9371b6e 100644
--- a/src/plugins/iconengines/svgiconengine/CMakeLists.txt
+++ b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QSvgIconPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QSvgIconPlugin
+qt_internal_add_plugin(QSvgIconPlugin
     OUTPUT_NAME qsvgicon
     TYPE iconengines
     SOURCES
diff --git a/src/plugins/imageformats/svg/CMakeLists.txt b/src/plugins/imageformats/svg/CMakeLists.txt
index 4d9619c..cec6f77 100644
--- a/src/plugins/imageformats/svg/CMakeLists.txt
+++ b/src/plugins/imageformats/svg/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QSvgPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QSvgPlugin
+qt_internal_add_plugin(QSvgPlugin
     OUTPUT_NAME qsvg
     TYPE imageformats
     SOURCES
diff --git a/src/svg/.prev_CMakeLists.txt b/src/svg/.prev_CMakeLists.txt
index 31374ee..c29103d 100644
--- a/src/svg/.prev_CMakeLists.txt
+++ b/src/svg/.prev_CMakeLists.txt
@@ -32,6 +32,15 @@ qt_add_module(Svg
 ## Scopes:
 #####################################################################
 
+qt_extend_target(Svg CONDITION TARGET Qt::Widgets
+    LIBRARIES
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+    PRIVATE_MODULE_INTERFACE
+        Qt::WidgetsPrivate
+)
+
 qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
diff --git a/src/svgwidgets/CMakeLists.txt b/src/svgwidgets/CMakeLists.txt
index afbe83e..59551ba 100644
--- a/src/svgwidgets/CMakeLists.txt
+++ b/src/svgwidgets/CMakeLists.txt
@@ -1,12 +1,14 @@
+# Generated from svgwidgets.pro.
+
 #####################################################################
 ## SvgWidgets Module:
 #####################################################################
 
 qt_add_module(SvgWidgets
     SOURCES
-        qtsvgwidgetsglobal.h
         qgraphicssvgitem.cpp qgraphicssvgitem.h
         qsvgwidget.cpp qsvgwidget.h
+        qtsvgwidgetsglobal.h
     DEFINES
         QT_NO_USING_NAMESPACE
     LIBRARIES
@@ -16,10 +18,18 @@ qt_add_module(SvgWidgets
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
-        Qt::Widgets
         Qt::Svg
+        Qt::Widgets
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::WidgetsPrivate
 )
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(SvgWidgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x66000000"
+)
diff --git a/tests/auto/qicon_svg/.prev_CMakeLists.txt b/tests/auto/qicon_svg/.prev_CMakeLists.txt
new file mode 100644
index 0000000..54b8666
--- /dev/null
+++ b/tests/auto/qicon_svg/.prev_CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from qicon_svg.pro.
+
+#####################################################################
+## tst_qicon_svg Test:
+#####################################################################
+
+# 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
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Svg
+    TESTDATA ${test_data}
+)
+
+# Resources:
+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}
+)
+
diff --git a/tests/auto/qicon_svg/CMakeLists.txt b/tests/auto/qicon_svg/CMakeLists.txt
index 5f18ff2..bbdfe5f 100644
--- a/tests/auto/qicon_svg/CMakeLists.txt
+++ b/tests/auto/qicon_svg/CMakeLists.txt
@@ -11,7 +11,7 @@ file(GLOB_RECURSE test_data_glob
 list(APPEND test_data ${test_data_glob})
 
 qt_add_test(tst_qicon_svg
-    LOWDPI
+    LOWDPI # special case
     SOURCES
         tst_qicon_svg.cpp
     PUBLIC_LIBRARIES