Regenerate projects

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

4 files changed, 61 insertions, 17 deletions

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
 )
+