diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:00:47 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:00:47 +0200 |
commit | 08a86661119ad69aae278a0fca2cd1b8efd98dc5 (patch) | |
tree | 8b7ff74c8541c093beb13860357992a3a756c4d4 | |
parent | 332f9d686a08948bde82c925701a48150f29c10d (diff) | |
parent | 1bdd9b7bbc6d2ca83095c2f9a376ef6867674ca8 (diff) | |
download | qtsvg-08a86661119ad69aae278a0fca2cd1b8efd98dc5.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I2c1925759a489dc23edba9d082025efc33418d18
-rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.cpp | 4 | ||||
-rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.h | 2 | ||||
-rw-r--r-- | src/svg/doc/qtsvg.qdocconf | 1 |
3 files changed, 5 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; 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 |