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

Change-Id: I886cfdcd8bd124a02c54f23b694799610f60d7bd

19 files changed, 150 insertions, 75 deletions

diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
new file mode 100644
index 0000000..a285cd8
--- /dev/null
+++ b/dist/changes-5.12.4
@@ -0,0 +1,20 @@
+Qt 5.12.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.3.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0
new file mode 100644
index 0000000..ebb4be1
--- /dev/null
+++ b/dist/changes-5.13.0
@@ -0,0 +1,18 @@
+Qt 5.13 introduces many new features and improvements as well as bugfixes
+over the 5.12.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/examples/svg/embedded/fluidlauncher/pictureflow.cpp b/examples/svg/embedded/fluidlauncher/pictureflow.cpp
index 191ff2e..b0657a2 100644
--- a/examples/svg/embedded/fluidlauncher/pictureflow.cpp
+++ b/examples/svg/embedded/fluidlauncher/pictureflow.cpp
@@ -85,7 +85,7 @@
 #include <QTimer>
 #include <QVector>
 #include <QWidget>
-#include <QTime>
+#include <QElapsedTimer>
 
 #include <QDebug>
 
@@ -376,7 +376,7 @@ public:
   int    singlePressThreshold;
   QPoint firstPress;
   QPoint previousPos;
-  QTime  previousPosTimestamp;
+  QElapsedTimer previousPosTimestamp;
   int    pixelDistanceMoved;
   int    pixelsToMovePerSlide;
 
@@ -1397,7 +1397,7 @@ void PictureFlow::timerEvent(QTimerEvent* event)
 {
   if(event->timerId() == d->animateTimer.timerId())
   {
-//    QTime now = QTime::currentTime();
+//    QElapsedTimer now; now.start();
     d->updateAnimation();
 //    d->animateTimer.start(qMax(0, 30-now.elapsed() ), this);
   }
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
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
new file mode 100644
index 0000000..d33db21
--- /dev/null
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from auto.pro.
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(qsvgdevice)
+    add_subdirectory(qsvggenerator)
+    add_subdirectory(qsvgplugin)
+    add_subdirectory(qicon_svg)
+    add_subdirectory(cmake)
+    add_subdirectory(installed_cmake)
+endif()
+if(TARGET Qt::Widgets AND NOT ANDROID)
+    add_subdirectory(qsvgrenderer)
+endif()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 7fa439e..31b62c6 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,15 +1,15 @@
 # Generated from auto.pro.
 
-
 if(TARGET Qt::Widgets)
     add_subdirectory(qsvgdevice)
     if(TARGET Qt::Xml) # special case
         add_subdirectory(qsvggenerator) # special case
     endif() # special case
-    add_subdirectory(qsvgrenderer)
     add_subdirectory(qsvgplugin)
     add_subdirectory(qicon_svg)
+    # add_subdirectory(cmake) # special case remove
+    # add_subdirectory(installed_cmake) # special case remove
 endif()
-
-if(NOT cross_compile)
+if(TARGET Qt::Widgets AND NOT ANDROID)
+    add_subdirectory(qsvgrenderer)
 endif()
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index e2d84ec..925e4cd 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -3,12 +3,13 @@ qtHaveModule(widgets) {
     SUBDIRS = \
         qsvgdevice \
         qsvggenerator \
-        qsvgrenderer \
         qsvgplugin \
         qicon_svg \
         cmake \
         installed_cmake
 
+    !android: SUBDIRS += qsvgrenderer
+
     installed_cmake.depends = cmake
 }
 !cross_compile: SUBDIRS += host.pro
diff --git a/tests/auto/qsvggenerator/CMakeLists.txt b/tests/auto/qsvggenerator/CMakeLists.txt
index 0903d80..039f7db 100644
--- a/tests/auto/qsvggenerator/CMakeLists.txt
+++ b/tests/auto/qsvggenerator/CMakeLists.txt
@@ -5,10 +5,9 @@
 #####################################################################
 
 add_qt_test(tst_qsvggenerator
+    GUI
     SOURCES
         tst_qsvggenerator.cpp
-    DEFINES
-        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
     LIBRARIES
         Qt::GuiPrivate
     PUBLIC_LIBRARIES
@@ -18,5 +17,16 @@ add_qt_test(tst_qsvggenerator
         Qt::Xml
 )
 
-#### Keys ignored in scope 1:.:.:qsvggenerator.pro:<TRUE>:
-# CONFIG = "testcase"
+# Resources:
+set(qmake_immediate_resource_files
+    "referenceSvgs/fileName_output.svg"
+    "referenceSvgs/radial_gradient.svg"
+)
+
+add_qt_resource(tst_qsvggenerator "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
+
diff --git a/tests/auto/qsvggenerator/qsvggenerator.pro b/tests/auto/qsvggenerator/qsvggenerator.pro
index fd0edfa..1b6f329 100644
--- a/tests/auto/qsvggenerator/qsvggenerator.pro
+++ b/tests/auto/qsvggenerator/qsvggenerator.pro
@@ -4,4 +4,5 @@ QT += svg xml testlib widgets gui-private
 
 SOURCES += tst_qsvggenerator.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
+RESOURCES += referenceSvgs/fileName_output.svg \
+             referenceSvgs/radial_gradient.svg
diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
index b55b687..9217a5b 100644
--- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
+++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
@@ -122,7 +122,7 @@ static void checkFile(const QString &fileName)
     QFile file(fileName);
     QVERIFY(file.open(QIODevice::ReadOnly));
 
-    QFile referenceFile(SRCDIR "referenceSvgs/" + fileName);
+    QFile referenceFile(QFINDTESTDATA("referenceSvgs/" + fileName));
     QVERIFY(referenceFile.open(QIODevice::ReadOnly));
 
     compareWithoutFontInfo(file.readAll(), referenceFile.readAll());
diff --git a/tests/auto/qsvgplugin/CMakeLists.txt b/tests/auto/qsvgplugin/CMakeLists.txt
index aa67c41..19ee765 100644
--- a/tests/auto/qsvgplugin/CMakeLists.txt
+++ b/tests/auto/qsvgplugin/CMakeLists.txt
@@ -8,8 +8,6 @@ add_qt_test(tst_qsvgplugin
     GUI
     SOURCES
         tst_qsvgplugin.cpp
-    DEFINES
-        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
     LIBRARIES
         Qt::GuiPrivate
     PUBLIC_LIBRARIES
@@ -19,26 +17,27 @@ add_qt_test(tst_qsvgplugin
 )
 
 # Resources:
+set(resources_resource_files
+    "imageInclude.svg"
+    "imageIncludeA.svg"
+    "square.svg"
+    "square_size.svg"
+    "square_size_viewbox.svg"
+    "square_viewbox.svg"
+    "tall.svg"
+    "tall_size.svg"
+    "tall_size_viewbox.svg"
+    "tall_viewbox.svg"
+    "wide.svg"
+    "wide_size.svg"
+    "wide_size_viewbox.svg"
+    "wide_viewbox.svg"
+)
+
 add_qt_resource(tst_qsvgplugin "resources"
     PREFIX
         "/"
     FILES
-        imageInclude.svg
-        imageIncludeA.svg
-        square.svg
-        square_size.svg
-        square_size_viewbox.svg
-        square_viewbox.svg
-        tall.svg
-        tall_size.svg
-        tall_size_viewbox.svg
-        tall_viewbox.svg
-        wide.svg
-        wide_size.svg
-        wide_size_viewbox.svg
-        wide_viewbox.svg
+        ${resources_resource_files}
 )
 
-
-#### Keys ignored in scope 1:.:.:qsvgplugin.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/qsvgplugin/qsvgplugin.pro b/tests/auto/qsvgplugin/qsvgplugin.pro
index 3fec52e..657b511 100644
--- a/tests/auto/qsvgplugin/qsvgplugin.pro
+++ b/tests/auto/qsvgplugin/qsvgplugin.pro
@@ -5,4 +5,3 @@ QT += svg testlib widgets gui-private
 SOURCES += tst_qsvgplugin.cpp
 RESOURCES += resources.qrc
 
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
index da49b75..e1f84f3 100644
--- a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
+++ b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
@@ -79,18 +79,18 @@ void tst_QSvgPlugin::checkSize_data()
     QTest::addColumn<int>("imageHeight");
     QTest::addColumn<int>("imageWidth");
 
-    QTest::newRow("square")              << SRCDIR "square.svg"              <<  50 <<  50;
-    QTest::newRow("square_size")         << SRCDIR "square_size.svg"         << 200 << 200;
-    QTest::newRow("square_size_viewbox") << SRCDIR "square_size_viewbox.svg" << 200 << 200;
-    QTest::newRow("square_viewbox")      << SRCDIR "square_viewbox.svg"      << 100 << 100;
-    QTest::newRow("tall")                << SRCDIR "tall.svg"                <<  50 <<  25;
-    QTest::newRow("tall_size")           << SRCDIR "tall_size.svg"           << 200 << 100;
-    QTest::newRow("tall_size_viewbox")   << SRCDIR "tall_size_viewbox.svg"   << 200 << 100;
-    QTest::newRow("tall_viewbox")        << SRCDIR "tall_viewbox.svg"        << 100 <<  50;
-    QTest::newRow("wide")                << SRCDIR "wide.svg"                <<  25 <<  50;
-    QTest::newRow("wide_size")           << SRCDIR "wide_size.svg"           << 100 << 200;
-    QTest::newRow("wide_size_viewbox")   << SRCDIR "wide_size_viewbox.svg"   << 100 << 200;
-    QTest::newRow("wide_viewbox")        << SRCDIR "wide_viewbox.svg"        <<  50 << 100;
+    QTest::newRow("square")              << QFINDTESTDATA("square.svg")              <<  50 <<  50;
+    QTest::newRow("square_size")         << QFINDTESTDATA("square_size.svg")         << 200 << 200;
+    QTest::newRow("square_size_viewbox") << QFINDTESTDATA("square_size_viewbox.svg") << 200 << 200;
+    QTest::newRow("square_viewbox")      << QFINDTESTDATA("square_viewbox.svg")      << 100 << 100;
+    QTest::newRow("tall")                << QFINDTESTDATA("tall.svg")                <<  50 <<  25;
+    QTest::newRow("tall_size")           << QFINDTESTDATA("tall_size.svg")           << 200 << 100;
+    QTest::newRow("tall_size_viewbox")   << QFINDTESTDATA("tall_size_viewbox.svg")   << 200 << 100;
+    QTest::newRow("tall_viewbox")        << QFINDTESTDATA("tall_viewbox.svg")        << 100 <<  50;
+    QTest::newRow("wide")                << QFINDTESTDATA("wide.svg")                <<  25 <<  50;
+    QTest::newRow("wide_size")           << QFINDTESTDATA("wide_size.svg")           << 100 << 200;
+    QTest::newRow("wide_size_viewbox")   << QFINDTESTDATA("wide_size_viewbox.svg")   << 100 << 200;
+    QTest::newRow("wide_viewbox")        << QFINDTESTDATA("wide_viewbox.svg")        <<  50 << 100;
 }
 
 void tst_QSvgPlugin::checkSize()
@@ -116,7 +116,8 @@ void tst_QSvgPlugin::checkSize()
 
 void tst_QSvgPlugin::checkImageInclude()
 {
-    const QString filename(SRCDIR "imageInclude.svg");
+    const QString filename(QFINDTESTDATA("imageInclude.svg"));
+    const QString path = filename.left(filename.size() - strlen("imageInclude.svg"));
 
     QFile file(filename);
     file.open(QIODevice::ReadOnly);
@@ -132,9 +133,9 @@ void tst_QSvgPlugin::checkImageInclude()
     file.close();
 
     QCOMPARE(logMessages.size(), 8);
-    QCOMPARE(logMessages.at(0), QString("Could not create image from \"%1notExisting.svg\"").arg(SRCDIR));
-    QCOMPARE(logMessages.at(1), QString("Could not create image from \"%1./notExisting.svg\"").arg(SRCDIR));
-    QCOMPARE(logMessages.at(2), QString("Could not create image from \"%1../notExisting.svg\"").arg(SRCDIR));
+    QCOMPARE(logMessages.at(0), QString("Could not create image from \"%1notExisting.svg\"").arg(path));
+    QCOMPARE(logMessages.at(1), QString("Could not create image from \"%1./notExisting.svg\"").arg(path));
+    QCOMPARE(logMessages.at(2), QString("Could not create image from \"%1../notExisting.svg\"").arg(path));
     QCOMPARE(logMessages.at(3), QString("Could not create image from \"%1notExisting.svg\"").arg(QDir::rootPath()));
     QCOMPARE(logMessages.at(4), QLatin1String("Could not create image from \":/notExisting.svg\""));
     QCOMPARE(logMessages.at(5), QLatin1String("Could not create image from \"qrc:///notExisting.svg\""));