4 files changed, 116 insertions, 33 deletions
diff --git a/src/svg/.prev_CMakeLists.txt b/src/svg/.prev_CMakeLists.txt
new file mode 100644
index 0000000..30ed3e1
--- /dev/null
+++ b/src/svg/.prev_CMakeLists.txt
@@ -0,0 +1,57 @@
+# 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
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+## 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"
+)
+
+#### 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
new file mode 100644
index 0000000..49d8531
--- /dev/null
+++ b/src/svg/CMakeLists.txt
@@ -0,0 +1,59 @@
+# Generated from svg.pro.
+
+#####################################################################
+## Svg Module:
+#####################################################################
+
+find_package(ZLIB MODULE REQUIRED) # special case
+
+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
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+## 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"
+)
+
+#### 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/qsvgrenderer.cpp b/src/svg/qsvgrenderer.cpp
index 0097ec2..7cc7968 100644
--- a/src/svg/qsvgrenderer.cpp
+++ b/src/svg/qsvgrenderer.cpp
@@ -507,33 +507,6 @@ bool QSvgRenderer::elementExists(const QString &id) const
     return exists;
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-/*!
-    \since 4.2
-    \deprecated
-
-    Use transformForElement() instead.
-
-
-    Returns the transformation matrix for the element
-    with the given \a id. The matrix is a product of
-    the transformation of the element's parents. The transformation of
-    the element itself is not included.
-
-    To find the bounding rectangle of the element in logical coordinates,
-    you can apply the matrix on the rectangle returned from boundsOnElement().
-
-    \sa boundsOnElement()
-*/
-QMatrix QSvgRenderer::matrixForElement(const QString &id) const
-{
-    return transformForElement(id).toAffine();
-}
-QT_WARNING_POP
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 /*!
     \since 5.15
 
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index 3703b1c..418da85 100644
--- a/src/svg/qsvgrenderer.h
+++ b/src/svg/qsvgrenderer.h
@@ -40,8 +40,6 @@
 #ifndef QSVGRENDERER_H
 #define QSVGRENDERER_H
 
-#include <QtGui/qmatrix.h>
-
 #ifndef QT_NO_SVGRENDERER
 
 #include <QtCore/qobject.h>
@@ -94,10 +92,6 @@ public:
 
     QRectF boundsOnElement(const QString &id) const;
     bool elementExists(const QString &id) const;
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use transformForElement()")
-    QMatrix matrixForElement(const QString &id) const;
-#endif // QT_DEPRECATED_SINCE(5, 15)
     QTransform transformForElement(const QString &id) const;
 
 public Q_SLOTS: