4 files changed, 27 insertions, 17 deletions
diff --git a/src/svg/.prev_CMakeLists.txt b/src/svg/.prev_CMakeLists.txt
index c29103d..3da6f44 100644
--- a/src/svg/.prev_CMakeLists.txt
+++ b/src/svg/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Svg Module:
 #####################################################################
 
-qt_add_module(Svg
+qt_internal_add_module(Svg
     SOURCES
         qsvgfont.cpp qsvgfont_p.h
         qsvggenerator.cpp qsvggenerator.h
@@ -32,7 +32,7 @@ qt_add_module(Svg
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Svg CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(Svg CONDITION TARGET Qt::Widgets
     LIBRARIES
         Qt::WidgetsPrivate
     PUBLIC_LIBRARIES
@@ -41,7 +41,7 @@ qt_extend_target(Svg CONDITION TARGET Qt::Widgets
         Qt::WidgetsPrivate
 )
 
-qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
 )
@@ -49,16 +49,16 @@ qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
 #### Keys ignored in scope 4:.:.:svg.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-qt_extend_target(Svg CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(Svg CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib
     LIBRARIES
         Qt::ZlibPrivate
 )
-qt_add_docs(Svg
+qt_internal_add_docs(Svg
     doc/qtsvg.qdocconf
 )
 
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index ca09b70..1d3b23e 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -13,7 +13,7 @@ elseif(NOT TARGET ZLIB::ZLIB)
 endif()
 # special case end
 
-qt_add_module(Svg
+qt_internal_add_module(Svg
     SOURCES
         qsvgfont.cpp qsvgfont_p.h
         qsvggenerator.cpp qsvggenerator.h
@@ -41,7 +41,7 @@ qt_add_module(Svg
 ## Scopes:
 #####################################################################
 
-qt_extend_target(Svg CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(Svg CONDITION TARGET Qt::Widgets
     LIBRARIES
         Qt::WidgetsPrivate
     PUBLIC_LIBRARIES
@@ -50,7 +50,7 @@ qt_extend_target(Svg CONDITION TARGET Qt::Widgets
         Qt::WidgetsPrivate
 )
 
-qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
 )
@@ -58,16 +58,16 @@ qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
 #### Keys ignored in scope 4:.:.:svg.pro:solaris-cc_x_:
 # QMAKE_CXXFLAGS_RELEASE = "--O2"
 
-qt_extend_target(Svg CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(Svg CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         ZLIB::ZLIB
 )
 
-qt_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib
     LIBRARIES
         Qt::ZlibPrivate
 )
-qt_add_docs(Svg
+qt_internal_add_docs(Svg
     doc/qtsvg.qdocconf
 )
 
diff --git a/src/svgwidgets/.prev_CMakeLists.txt b/src/svgwidgets/.prev_CMakeLists.txt
index afbe83e..5f2ae6f 100644
--- a/src/svgwidgets/.prev_CMakeLists.txt
+++ b/src/svgwidgets/.prev_CMakeLists.txt
@@ -1,12 +1,14 @@
+# Generated from svgwidgets.pro.
+
 #####################################################################
 ## SvgWidgets Module:
 #####################################################################
 
-qt_add_module(SvgWidgets
+qt_internal_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_internal_extend_target(SvgWidgets 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 59551ba..5f2ae6f 100644
--- a/src/svgwidgets/CMakeLists.txt
+++ b/src/svgwidgets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## SvgWidgets Module:
 #####################################################################
 
-qt_add_module(SvgWidgets
+qt_internal_add_module(SvgWidgets
     SOURCES
         qgraphicssvgitem.cpp qgraphicssvgitem.h
         qsvgwidget.cpp qsvgwidget.h
@@ -29,7 +29,7 @@ qt_add_module(SvgWidgets
 ## Scopes:
 #####################################################################
 
-qt_extend_target(SvgWidgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_internal_extend_target(SvgWidgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
 )