Hello community, here is the log from the commit of package libqt5-qtsvg for openSUSE:Factory checked in at 2019-09-09 12:30:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtsvg (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtsvg" Mon Sep 9 12:30:48 2019 rev:40 rq:729221 version:5.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtsvg/libqt5-qtsvg.changes 2019-06-28 16:30:14.522270060 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new.7948/libqt5-qtsvg.changes 2019-09-09 12:30:50.645520887 +0200 @@ -1,0 +2,8 @@ +Fri Sep 6 08:04:32 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.13.1: + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtsvg.git/plain/dist/changes-5.13.1/?h=v5.13.1 + +------------------------------------------------------------------- Old: ---- qtsvg-everywhere-src-5.13.0.tar.xz New: ---- qtsvg-everywhere-src-5.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtsvg.spec ++++++ --- /var/tmp/diff_new_pack.0k5Azm/_old 2019-09-09 12:30:53.513517169 +0200 +++ /var/tmp/diff_new_pack.0k5Azm/_new 2019-09-09 12:30:53.549517123 +0200 @@ -21,16 +21,16 @@ %define libname libQt5Svg5 Name: libqt5-qtsvg -Version: 5.13.0 +Version: 5.13.1 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.13.0 -%define so_version 5.13.0 -%define tar_version qtsvg-everywhere-src-5.13.0 +%define real_version 5.13.1 +%define so_version 5.13.1 +%define tar_version qtsvg-everywhere-src-5.13.1 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} ++++++ qtsvg-everywhere-src-5.13.0.tar.xz -> qtsvg-everywhere-src-5.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/.qmake.conf new/qtsvg-everywhere-src-5.13.1/.qmake.conf --- old/qtsvg-everywhere-src-5.13.0/.qmake.conf 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/.qmake.conf 2019-08-09 11:55:40.000000000 +0200 @@ -3,4 +3,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.13.0 +MODULE_VERSION = 5.13.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/.tag new/qtsvg-everywhere-src-5.13.1/.tag --- old/qtsvg-everywhere-src-5.13.0/.tag 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/.tag 2019-08-09 11:55:40.000000000 +0200 @@ -1 +1 @@ -3a4c634241f7271ddfbb840a42d6bf863b46ccea +fe7d20286e50c5ac08fb153436580d985d7530ea diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/dist/changes-5.12.4 new/qtsvg-everywhere-src-5.13.1/dist/changes-5.12.4 --- old/qtsvg-everywhere-src-5.13.0/dist/changes-5.12.4 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.1/dist/changes-5.12.4 2019-08-09 11:55:40.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/dist/changes-5.13.1 new/qtsvg-everywhere-src-5.13.1/dist/changes-5.13.1 --- old/qtsvg-everywhere-src-5.13.0/dist/changes-5.13.1 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.1/dist/changes-5.13.1 2019-08-09 11:55:40.000000000 +0200 @@ -0,0 +1,20 @@ +Qt 5.13.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0. + +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.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgfont_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/QtSvg/private/qsvgfont_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgfont_p.h 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/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.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvggraphics_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvggraphics_p.h 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/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.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvghandler_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/QtSvg/private/qsvghandler_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvghandler_p.h 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/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.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgnode_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/QtSvg/private/qsvgnode_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgnode_p.h 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/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.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgstructure_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgstructure_p.h 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/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.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgstyle_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgstyle_p.h 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/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.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qsvgtinydocument_p.h 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/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.13.0/include/QtSvg/5.13.0/QtSvg/private/qtsvgglobal_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.0/QtSvg/private/qtsvgglobal_p.h 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.0/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.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvgfont_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvgfont_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvgfont_p.h 2019-08-09 11:55:40.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.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvggraphics_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvggraphics_p.h 2019-08-09 11:55:40.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.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvghandler_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvghandler_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvghandler_p.h 2019-08-09 11:55:40.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.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvgnode_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvgnode_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvgnode_p.h 2019-08-09 11:55:40.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.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvgstructure_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvgstructure_p.h 2019-08-09 11:55:40.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.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvgstyle_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvgstyle_p.h 2019-08-09 11:55:40.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.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.1/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qsvgtinydocument_p.h 2019-08-09 11:55:40.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.13.0/include/QtSvg/5.13.1/QtSvg/private/qtsvgglobal_p.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/5.13.1/QtSvg/private/qtsvgglobal_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/5.13.1/QtSvg/private/qtsvgglobal_p.h 2019-08-09 11:55:40.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.13.0/include/QtSvg/qtsvgversion.h new/qtsvg-everywhere-src-5.13.1/include/QtSvg/qtsvgversion.h --- old/qtsvg-everywhere-src-5.13.0/include/QtSvg/qtsvgversion.h 2019-06-17 14:26:40.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/include/QtSvg/qtsvgversion.h 2019-09-03 13:42:52.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTSVG_VERSION_H #define QT_QTSVG_VERSION_H -#define QTSVG_VERSION_STR "5.13.0" +#define QTSVG_VERSION_STR "5.13.1" -#define QTSVG_VERSION 0x050D00 +#define QTSVG_VERSION 0x050D01 #endif // QT_QTSVG_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/src/plugins/imageformats/svg/qsvgiohandler.cpp new/qtsvg-everywhere-src-5.13.1/src/plugins/imageformats/svg/qsvgiohandler.cpp --- old/qtsvg-everywhere-src-5.13.0/src/plugins/imageformats/svg/qsvgiohandler.cpp 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/src/plugins/imageformats/svg/qsvgiohandler.cpp 2019-08-09 11:55:40.000000000 +0200 @@ -140,12 +140,12 @@ return false; } - +#if QT_DEPRECATED_SINCE(5, 13) QByteArray QSvgIOHandler::name() const { return "svg"; } - +#endif bool QSvgIOHandler::read(QImage *image) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/src/plugins/imageformats/svg/qsvgiohandler.h new/qtsvg-everywhere-src-5.13.1/src/plugins/imageformats/svg/qsvgiohandler.h --- old/qtsvg-everywhere-src-5.13.0/src/plugins/imageformats/svg/qsvgiohandler.h 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/src/plugins/imageformats/svg/qsvgiohandler.h 2019-08-09 11:55:40.000000000 +0200 @@ -58,7 +58,9 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/src/svg/doc/qtsvg.qdocconf new/qtsvg-everywhere-src-5.13.1/src/svg/doc/qtsvg.qdocconf --- old/qtsvg-everywhere-src-5.13.0/src/svg/doc/qtsvg.qdocconf 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/src/svg/doc/qtsvg.qdocconf 2019-08-09 11:55:40.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/tests/auto/auto.pro new/qtsvg-everywhere-src-5.13.1/tests/auto/auto.pro --- old/qtsvg-everywhere-src-5.13.0/tests/auto/auto.pro 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/tests/auto/auto.pro 2019-08-09 11:55:40.000000000 +0200 @@ -3,12 +3,13 @@ SUBDIRS = \ qsvgdevice \ qsvggenerator \ - qsvgrenderer \ qsvgplugin \ qicon_svg \ cmake \ installed_cmake + !android: SUBDIRS += qsvgrenderer + installed_cmake.depends = cmake } !cross_compile: SUBDIRS += host.pro diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/tests/auto/qsvggenerator/qsvggenerator.pro new/qtsvg-everywhere-src-5.13.1/tests/auto/qsvggenerator/qsvggenerator.pro --- old/qtsvg-everywhere-src-5.13.0/tests/auto/qsvggenerator/qsvggenerator.pro 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/tests/auto/qsvggenerator/qsvggenerator.pro 2019-08-09 11:55:40.000000000 +0200 @@ -4,4 +4,5 @@ SOURCES += tst_qsvggenerator.cpp -DEFINES += SRCDIR=\\\"$$PWD/\\\" +RESOURCES += referenceSvgs/fileName_output.svg \ + referenceSvgs/radial_gradient.svg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/tests/auto/qsvggenerator/tst_qsvggenerator.cpp new/qtsvg-everywhere-src-5.13.1/tests/auto/qsvggenerator/tst_qsvggenerator.cpp --- old/qtsvg-everywhere-src-5.13.0/tests/auto/qsvggenerator/tst_qsvggenerator.cpp 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/tests/auto/qsvggenerator/tst_qsvggenerator.cpp 2019-08-09 11:55:40.000000000 +0200 @@ -122,7 +122,7 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/tests/auto/qsvgplugin/qsvgplugin.pro new/qtsvg-everywhere-src-5.13.1/tests/auto/qsvgplugin/qsvgplugin.pro --- old/qtsvg-everywhere-src-5.13.0/tests/auto/qsvgplugin/qsvgplugin.pro 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/tests/auto/qsvgplugin/qsvgplugin.pro 2019-08-09 11:55:40.000000000 +0200 @@ -5,4 +5,3 @@ SOURCES += tst_qsvgplugin.cpp RESOURCES += resources.qrc -DEFINES += SRCDIR=\\\"$$PWD/\\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-5.13.0/tests/auto/qsvgplugin/tst_qsvgplugin.cpp new/qtsvg-everywhere-src-5.13.1/tests/auto/qsvgplugin/tst_qsvgplugin.cpp --- old/qtsvg-everywhere-src-5.13.0/tests/auto/qsvgplugin/tst_qsvgplugin.cpp 2019-05-08 10:46:56.000000000 +0200 +++ new/qtsvg-everywhere-src-5.13.1/tests/auto/qsvgplugin/tst_qsvgplugin.cpp 2019-08-09 11:55:40.000000000 +0200 @@ -79,18 +79,18 @@ 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::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 @@ 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\""));
