Hello community, here is the log from the commit of package libqt5-qtsvg for openSUSE:Factory checked in at 2019-06-28 16:30:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtsvg (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtsvg" Fri Jun 28 16:30:13 2019 rev:39 rq:711197 version:5.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtsvg/libqt5-qtsvg.changes 2019-04-26 22:53:37.537347014 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new.4615/libqt5-qtsvg.changes 2019-06-28 16:30:14.522270060 +0200 @@ -1,0 +2,23 @@ +Wed Jun 19 11:24:32 UTC 2019 - [email protected] + +- Update to 5.13.0: + * New bugfix release + * No changelog available + * For more details about Qt 5.13 please see: + * http://code.qt.io/cgit/qt/qtsvg.git/plain/dist/changes-5.13.0/?h=5.13 + +------------------------------------------------------------------- +Tue Jun 4 07:25:09 UTC 2019 - [email protected] + +- Update to 5.13.0-rc: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Mon Apr 29 09:16:59 UTC 2019 - [email protected] + +- Update to 5.13.0-beta2: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- @@ -9,0 +33,8 @@ +Thu Mar 21 10:26:19 UTC 2019 - [email protected] + +- Update to 5.13.0-beta1: + * New feature release + * For more details about Qt 5.13 please see: + * http://code.qt.io/cgit/qt/qtsvg.git/plain/dist/changes-5.13.0/?h=5.13 + +------------------------------------------------------------------- @@ -520,0 +552 @@ + Old: ---- qtsvg-everywhere-src-5.12.3.tar.xz New: ---- qtsvg-everywhere-src-5.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtsvg.spec ++++++ --- /var/tmp/diff_new_pack.EzNxK7/_old 2019-06-28 16:30:15.362271329 +0200 +++ /var/tmp/diff_new_pack.EzNxK7/_new 2019-06-28 16:30:15.362271329 +0200 @@ -21,17 +21,17 @@ %define libname libQt5Svg5 Name: libqt5-qtsvg -Version: 5.12.3 +Version: 5.13.0 Release: 0 Summary: Qt 5 SVG Library License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.12.3 -%define so_version 5.12.3 -%define tar_version qtsvg-everywhere-src-5.12.3 -Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.13.0 +%define so_version 5.13.0 +%define tar_version qtsvg-everywhere-src-5.13.0 +Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version} ++++++ qtsvg-everywhere-src-5.12.3.tar.xz -> qtsvg-everywhere-src-5.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/.qmake.conf new/qtsvg-everywhere-src-5.13.0/.qmake.conf --- old/qtsvg-everywhere-src-5.12.3/.qmake.conf 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/.qmake.conf 2019-05-08 10:46:56.000000000 +0200 @@ -3,4 +3,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.12.3 +MODULE_VERSION = 5.13.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/.tag new/qtsvg-everywhere-src-5.13.0/.tag --- old/qtsvg-everywhere-src-5.12.3/.tag 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/.tag 2019-05-08 10:46:56.000000000 +0200 @@ -1 +1 @@ -fd12ae24b4542cf2f0df1a34187c4b8c0a408e01 +3a4c634241f7271ddfbb840a42d6bf863b46ccea diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/dist/changes-5.13.0 new/qtsvg-everywhere-src-5.13.0/dist/changes-5.13.0 --- old/qtsvg-everywhere-src-5.12.3/dist/changes-5.13.0 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.0/dist/changes-5.13.0 2019-05-08 10:46:56.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp new/qtsvg-everywhere-src-5.13.0/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp --- old/qtsvg-everywhere-src-5.12.3/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp 2019-05-08 10:46:56.000000000 +0200 @@ -48,11 +48,11 @@ ** ****************************************************************************/ +#include <QScreen> #include <QXmlStreamReader> #include "fluidlauncher.h" - #define DEFAULT_INPUT_TIMEOUT 10000 #define SIZING_FACTOR_HEIGHT 6/10 #define SIZING_FACTOR_WIDTH 6/10 @@ -68,7 +68,7 @@ setCurrentWidget(pictureFlowWidget); pictureFlowWidget->setFocus(); - QRect screen_size = QApplication::desktop()->screenGeometry(); + QRect screen_size = QGuiApplication::primaryScreen()->geometry(); QObject::connect(pictureFlowWidget, SIGNAL(itemActivated(int)), this, SLOT(launchApplication(int))); QObject::connect(pictureFlowWidget, SIGNAL(inputReceived()), this, SLOT(resetInputTimeout())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/examples/svg/opengl/framebufferobject/glwidget.cpp new/qtsvg-everywhere-src-5.13.0/examples/svg/opengl/framebufferobject/glwidget.cpp --- old/qtsvg-everywhere-src-5.12.3/examples/svg/opengl/framebufferobject/glwidget.cpp 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/examples/svg/opengl/framebufferobject/glwidget.cpp 2019-05-08 10:46:56.000000000 +0200 @@ -228,8 +228,8 @@ const QString str1(tr("A simple OpenGL framebuffer object example.")); const QString str2(tr("Use the mouse wheel to zoom, press buttons and move mouse to rotate, double-click to flip.")); QFontMetrics fm(p.font()); - p.drawText(width()/2 - fm.width(str1)/2, 20, str1); - p.drawText(width()/2 - fm.width(str2)/2, 20 + fm.lineSpacing(), str2); + p.drawText(width()/2 - fm.horizontalAdvance(str1)/2, 20, str1); + p.drawText(width()/2 - fm.horizontalAdvance(str2)/2, 20 + fm.lineSpacing(), str2); } void GLWidget::mousePressEvent(QMouseEvent *e) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvgfont_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvgfont_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvgfont_p.h 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgfont_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvggraphics_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvggraphics_p.h 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvggraphics_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvghandler_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvghandler_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvghandler_p.h 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvghandler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvgnode_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvgnode_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvgnode_p.h 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvgstructure_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvgstructure_p.h 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgstructure_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvgstyle_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvgstyle_p.h 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgstyle_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qsvgtinydocument_p.h 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qtsvgglobal_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.12.3/QtSvg/private/qtsvgglobal_p.h 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.12.3/QtSvg/private/qtsvgglobal_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qtsvgglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvgfont_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgfont_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgfont_p.h 2019-05-08 10:46:56.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfont_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvggraphics_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvggraphics_p.h 2019-05-08 10:46:56.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvggraphics_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvghandler_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvghandler_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvghandler_p.h 2019-05-08 10:46:56.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvghandler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvgnode_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgnode_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgnode_p.h 2019-05-08 10:46:56.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvgstructure_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgstructure_p.h 2019-05-08 10:46:56.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstructure_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvgstyle_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgstyle_p.h 2019-05-08 10:46:56.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstyle_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgtinydocument_p.h 2019-05-08 10:46:56.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qtsvgglobal_p.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/5.13.0/QtSvg/private/qtsvgglobal_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qtsvgglobal_p.h 2019-05-08 10:46:56.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qtsvgglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/include/QtSvg/qtsvgversion.h new/qtsvg-everywhere-src-5.13.0/include/QtSvg/qtsvgversion.h --- old/qtsvg-everywhere-src-5.12.3/include/QtSvg/qtsvgversion.h 2019-04-11 20:20:29.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/include/QtSvg/qtsvgversion.h 2019-06-17 14:26:40.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTSVG_VERSION_H #define QT_QTSVG_VERSION_H -#define QTSVG_VERSION_STR "5.12.3" +#define QTSVG_VERSION_STR "5.13.0" -#define QTSVG_VERSION 0x050C03 +#define QTSVG_VERSION 0x050D00 #endif // QT_QTSVG_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp new/qtsvg-everywhere-src-5.13.0/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp --- old/qtsvg-everywhere-src-5.12.3/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp 2019-05-08 10:46:56.000000000 +0200 @@ -197,7 +197,7 @@ QPixmap pm; QString pmckey(d->pmcKey(size, mode, state)); - if (QPixmapCache::find(pmckey, pm)) + if (QPixmapCache::find(pmckey, &pm)) return pm; if (d->addedPixmaps) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/src/svg/qsvggraphics.cpp new/qtsvg-everywhere-src-5.13.0/src/svg/qsvggraphics.cpp --- old/qtsvg-everywhere-src-5.12.3/src/svg/qsvggraphics.cpp 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/src/svg/qsvggraphics.cpp 2019-05-08 10:46:56.000000000 +0200 @@ -41,11 +41,12 @@ #include "qsvgfont_p.h" -#include "qpainter.h" -#include "qtextdocument.h" -#include "qabstracttextdocumentlayout.h" -#include "qtextcursor.h" -#include "qdebug.h" +#include <qabstracttextdocumentlayout.h> +#include <qdebug.h> +#include <qpainter.h> +#include <qscopedvaluerollback.h> +#include <qtextcursor.h> +#include <qtextdocument.h> #include <math.h> #include <limits.h> @@ -458,14 +459,14 @@ } QSvgUse::QSvgUse(const QPointF &start, QSvgNode *parent, QSvgNode *node) - : QSvgNode(parent), m_link(node), m_start(start) + : QSvgNode(parent), m_link(node), m_start(start), m_recursing(false) { } void QSvgUse::draw(QPainter *p, QSvgExtraStates &states) { - if (Q_UNLIKELY(!m_link || isDescendantOf(m_link))) + if (Q_UNLIKELY(!m_link || isDescendantOf(m_link) || m_recursing)) return; applyStyle(p, states); @@ -473,7 +474,10 @@ if (!m_start.isNull()) { p->translate(m_start); } - m_link->draw(p, states); + { + QScopedValueRollback<bool> guard(m_recursing, true); + m_link->draw(p, states); + } if (!m_start.isNull()) { p->translate(-m_start); } @@ -556,7 +560,8 @@ QRectF QSvgUse::bounds(QPainter *p, QSvgExtraStates &states) const { QRectF bounds; - if (Q_LIKELY(m_link && !isDescendantOf(m_link))) { + if (Q_LIKELY(m_link && !isDescendantOf(m_link) && !m_recursing)) { + QScopedValueRollback<bool> guard(m_recursing, true); p->translate(m_start); bounds = m_link->transformedBounds(p, states); p->translate(-m_start); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/src/svg/qsvggraphics_p.h new/qtsvg-everywhere-src-5.13.0/src/svg/qsvggraphics_p.h --- old/qtsvg-everywhere-src-5.12.3/src/svg/qsvggraphics_p.h 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/src/svg/qsvggraphics_p.h 2019-05-08 10:46:56.000000000 +0200 @@ -251,6 +251,7 @@ QSvgNode *m_link; QPointF m_start; QString m_linkId; + mutable bool m_recursing; }; class QSvgVideo : public QSvgNode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/src/svg/qsvghandler.cpp new/qtsvg-everywhere-src-5.13.0/src/svg/qsvghandler.cpp --- old/qtsvg-everywhere-src-5.12.3/src/svg/qsvghandler.cpp 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/src/svg/qsvghandler.cpp 2019-05-08 10:46:56.000000000 +0200 @@ -2615,17 +2615,17 @@ parent = parent->parent(); } - if (parent) { + if (parent && !myId.isEmpty()) { QSvgTinyDocument *doc = static_cast<QSvgTinyDocument*>(parent); - QSvgFont *font = new QSvgFont(horizAdvX); - font->setFamilyName(myId); - if (!font->familyName().isEmpty()) { - if (!doc->svgFont(font->familyName())) - doc->addSvgFont(font); + QSvgFont *font = doc->svgFont(myId); + if (!font) { + font = new QSvgFont(horizAdvX); + font->setFamilyName(myId); + doc->addSvgFont(font); } return new QSvgFontStyle(font, doc); } - return 0; + return nullptr; } static bool parseFontFaceNode(QSvgStyleProperty *parent, @@ -3744,6 +3744,13 @@ case QSvgNode::DEFS: case QSvgNode::SWITCH: { + if (node->type() == QSvgNode::TSPAN) { + const QByteArray msg = QByteArrayLiteral("\'tspan\' element in wrong context."); + qCWarning(lcSvgHandler, "%s", prefixMessage(msg, xml).constData()); + delete node; + node = 0; + break; + } QSvgStructureNode *group = static_cast<QSvgStructureNode*>(m_nodes.top()); group->addChild(node, someId(attributes)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.12.3/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp new/qtsvg-everywhere-src-5.13.0/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp --- old/qtsvg-everywhere-src-5.12.3/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp 2019-04-05 14:40:07.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.0/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp 2019-05-08 10:46:56.000000000 +0200 @@ -485,15 +485,15 @@ QPainter painter(&image); QSvgRenderer renderer(data); - compareTransforms(QTransform(painter.worldMatrix()), QTransform(renderer.matrixForElement(QLatin1String("ichi")))); + compareTransforms(painter.worldTransform(), QTransform(renderer.matrixForElement(QLatin1String("ichi")))); painter.translate(-3, 1); - compareTransforms(QTransform(painter.worldMatrix()), QTransform(renderer.matrixForElement(QLatin1String("ni")))); + compareTransforms(painter.worldTransform(), QTransform(renderer.matrixForElement(QLatin1String("ni")))); painter.rotate(45); - compareTransforms(QTransform(painter.worldMatrix()), QTransform(renderer.matrixForElement(QLatin1String("san")))); + compareTransforms(painter.worldTransform(), QTransform(renderer.matrixForElement(QLatin1String("san")))); painter.scale(4, 2); - compareTransforms(QTransform(painter.worldMatrix()), QTransform(renderer.matrixForElement(QLatin1String("yon")))); - painter.setWorldMatrix(QMatrix(1, 2, 3, 4, 5, 6), true); - compareTransforms(QTransform(painter.worldMatrix()), QTransform(renderer.matrixForElement(QLatin1String("firkant")))); + compareTransforms(painter.worldTransform(), QTransform(renderer.matrixForElement(QLatin1String("yon")))); + painter.setWorldTransform(QTransform(1, 2, 3, 4, 5, 6), true); + compareTransforms(painter.worldTransform(), QTransform(renderer.matrixForElement(QLatin1String("firkant")))); } void tst_QSvgRenderer::boundsOnElement() const @@ -1423,6 +1423,16 @@ " <circle fill=\"#a6ce39\" cx=\"0\" cy=\"0\" r=\"33\" />" " </g>" " </defs>" + "</svg>", + // 17 - Indirect self referral + "<svg>" + " <defs>" + " <g id=\"g0\">" + " <g id=\"g1\"><use href=\"#g2\"/></g>" + " <g id=\"g2\"><use href=\"#g1\"/></g>" + " </g>" + " </defs>" + " <use xlink:href=\"#g0\" fill=\"black\"/>" "</svg>" };
