summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-16 03:00:47 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-16 03:00:52 +0200
commitb80a1676c9f5cc0b428f15ac09f6648a80aacb26 (patch)
tree8b7ff74c8541c093beb13860357992a3a756c4d4
parent332f9d686a08948bde82c925701a48150f29c10d (diff)
parent08a86661119ad69aae278a0fca2cd1b8efd98dc5 (diff)
downloadqtsvg-b80a1676c9f5cc0b428f15ac09f6648a80aacb26.tar.gz
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
-rw-r--r--src/plugins/imageformats/svg/qsvgiohandler.cpp4
-rw-r--r--src/plugins/imageformats/svg/qsvgiohandler.h2
-rw-r--r--src/svg/doc/qtsvg.qdocconf1
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