Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I886cfdcd8bd124a02c54f23b694799610f60d7bd

7 files changed, 38 insertions, 25 deletions

diff --git a/src/plugins/iconengines/svgiconengine/CMakeLists.txt b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
index 4bbb188..4b047be 100644
--- a/src/plugins/iconengines/svgiconengine/CMakeLists.txt
+++ b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
@@ -6,17 +6,22 @@
 
 add_qt_plugin(qsvgicon
     TYPE iconengines
+    CLASS_NAME QSvgIconPlugin
     SOURCES
         main.cpp
         qsvgiconengine.cpp qsvgiconengine.h
-    PUBLIC_LIBRARIES
-        Qt::Svg
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-
-    # OTHER_FILES = "qsvgiconengine.json" "qsvgiconengine-nocompress.json"
-    # PLUGIN_CLASS_NAME = "QSvgIconPlugin"
-    # PLUGIN_EXTENDS = "svg"
-    # _LOADED = "qt_plugin"
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Svg
 )
+
+#### 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 cef8f5b..66a255c 100644
--- a/src/plugins/imageformats/svg/CMakeLists.txt
+++ b/src/plugins/imageformats/svg/CMakeLists.txt
@@ -6,12 +6,18 @@
 
 add_qt_plugin(qsvg
     TYPE imageformats
+    CLASS_NAME QSvgPlugin
     SOURCES
         main.cpp
         qsvgiohandler.cpp qsvgiohandler.h
-    LIBRARIES
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
         Qt::Svg
-    # PLUGIN_CLASS_NAME = "QSvgPlugin"
-    # PLUGIN_EXTENDS = "svg"
-    # _LOADED = "qt_plugin"
 )
+
+#### 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/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp
index a999d47..6999d51 100644
--- a/src/plugins/imageformats/svg/qsvgiohandler.cpp
+++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp
@@ -140,12 +140,12 @@ bool QSvgIOHandler::canRead() const
     return false;
 }
 
-
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QSvgIOHandler::name() const
 {
     return "svg";
 }
-
+#endif
 
 bool QSvgIOHandler::read(QImage *image)
 {
diff --git a/src/plugins/imageformats/svg/qsvgiohandler.h b/src/plugins/imageformats/svg/qsvgiohandler.h
index fdafa0a..5fdf6ee 100644
--- a/src/plugins/imageformats/svg/qsvgiohandler.h
+++ b/src/plugins/imageformats/svg/qsvgiohandler.h
@@ -58,7 +58,9 @@ public:
     QSvgIOHandler();
     ~QSvgIOHandler();
     bool canRead() const override;
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
     bool read(QImage *image) override;
     static bool canRead(QIODevice *device);
     QVariant option(ImageOption option) const override;
diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf
index b180daa..1254d61 100644
--- a/src/svg/doc/qtsvg.qdocconf
+++ b/src/svg/doc/qtsvg.qdocconf
@@ -1,4 +1,5 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtsvg.qdocconf)
 
 project                 = QtSvg
 description             = Qt SVG Reference Documentation
diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
index 77aafb4..3143ad2 100644
--- a/src/svg/qsvgtinydocument.cpp
+++ b/src/svg/qsvgtinydocument.cpp
@@ -60,6 +60,7 @@ QSvgTinyDocument::QSvgTinyDocument()
     : QSvgStructureNode(0)
     , m_widthPercent(false)
     , m_heightPercent(false)
+    , m_time(0)
     , m_animated(false)
     , m_animationDuration(0)
     , m_fps(30)
@@ -230,9 +231,8 @@ QSvgTinyDocument * QSvgTinyDocument::load(QXmlStreamReader *contents)
 
 void QSvgTinyDocument::draw(QPainter *p, const QRectF &bounds)
 {
-    if (m_time.isNull()) {
-        m_time.start();
-    }
+    if (m_time == 0)
+        m_time = QDateTime::currentMSecsSinceEpoch();
 
     if (displayMode() == QSvgNode::NoneMode)
         return;
@@ -269,9 +269,8 @@ void QSvgTinyDocument::draw(QPainter *p, const QString &id,
         qCDebug(lcSvgHandler, "Couldn't find node %s. Skipping rendering.", qPrintable(id));
         return;
     }
-    if (m_time.isNull()) {
-        m_time.start();
-    }
+    if (m_time == 0)
+        m_time = QDateTime::currentMSecsSinceEpoch();
 
     if (node->displayMode() == QSvgNode::NoneMode)
         return;
@@ -377,7 +376,7 @@ QSvgFillStyleProperty *QSvgTinyDocument::namedStyle(const QString &id) const
 
 void QSvgTinyDocument::restartAnimation()
 {
-    m_time.restart();
+    m_time = QDateTime::currentMSecsSinceEpoch();
 }
 
 bool QSvgTinyDocument::animated() const
@@ -491,7 +490,7 @@ QMatrix QSvgTinyDocument::matrixForElement(const QString &id) const
 
 int QSvgTinyDocument::currentFrame() const
 {
-    double runningPercentage = qMin(m_time.elapsed()/double(m_animationDuration), 1.);
+    double runningPercentage = qMin(currentElapsed() / double(m_animationDuration), 1.);
 
     int totalFrames = m_fps * m_animationDuration;
 
@@ -504,8 +503,8 @@ void QSvgTinyDocument::setCurrentFrame(int frame)
     double framePercentage = frame/double(totalFrames);
     double timeForFrame = m_animationDuration * framePercentage; //in S
     timeForFrame *= 1000; //in ms
-    int timeToAdd = int(timeForFrame - m_time.elapsed());
-    m_time = m_time.addMSecs(timeToAdd);
+    int timeToAdd = int(timeForFrame - currentElapsed());
+    m_time += timeToAdd;
 }
 
 void QSvgTinyDocument::setFramesPerSecond(int num)
diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h
index 5f5d06b..404587d 100644
--- a/src/svg/qsvgtinydocument_p.h
+++ b/src/svg/qsvgtinydocument_p.h
@@ -132,7 +132,7 @@ private:
     QHash<QString, QSvgNode *> m_namedNodes;
     QHash<QString, QSvgRefCounter<QSvgFillStyleProperty> > m_namedStyles;
 
-    QTime m_time;
+    qint64 m_time;
     bool  m_animated;
     int   m_animationDuration;
     int   m_fps;
@@ -189,7 +189,7 @@ inline bool QSvgTinyDocument::preserveAspectRatio() const
 
 inline int QSvgTinyDocument::currentElapsed() const
 {
-    return m_time.elapsed();
+    return QDateTime::currentMSecsSinceEpoch() - m_time;
 }
 
 inline int QSvgTinyDocument::animationDuration() const