From 347de1dd25366015e3fbbc39ccd1a16ecb18eb2e Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 1 Jul 2019 16:01:32 +0200 Subject: Bump version Change-Id: I278f4280b8d088393e639e77eb9a51527a9560dd --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 48a283a..bbb67e5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.12.4 +MODULE_VERSION = 5.12.5 -- cgit v1.2.1 From 7c82edc2b8dbbd4a1ae2fb43e288c6e3ffe6b401 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Fri, 5 Jul 2019 16:59:02 +0200 Subject: Fix compilation with disabled deprecated APIs The QImageIOHandler::name() has been deprecated since 5.13, but its overrides weren't. Enabled compilation of the overrides only when the QImageIOHandler::name() is compiled. Task-number: QTBUG-76491 Change-Id: Ida625f19d61081cfd50ae11ab50cf7829aef80a5 Reviewed-by: Volker Hilsheimer --- src/plugins/imageformats/svg/qsvgiohandler.cpp | 4 ++-- src/plugins/imageformats/svg/qsvgiohandler.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) 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; -- cgit v1.2.1 From fe105d59b5f96e8881d059aed8f238358b68455e Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 3 Jul 2019 12:17:48 +0200 Subject: Doc: Replace example file lists with links to code.qt.io Task-number: QTBUG-74391 Change-Id: I398a01a5af7ef88c24886d1c5549bd1fdbe7784c Reviewed-by: Paul Wicking --- src/svg/doc/qtsvg.qdocconf | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.1