diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-05 16:19:54 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-05 16:19:54 +0100 |
| commit | 15446fabdb5cf53deba23c5604dc8afe8e52e2ac (patch) | |
| tree | 87eb151afea9ed147db099c747b7d64ca7aa896e /src/plugins | |
| parent | 7eda6fa5829950a7db334da2626c9d9db45befa8 (diff) | |
| parent | 215a6642a48b1272a54ce2d125346fa0b8c89847 (diff) | |
| download | qtsvg-15446fabdb5cf53deba23c5604dc8afe8e52e2ac.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I4bbe7513984fe00c90e5fa897c9eebab61d1dc5e
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.h | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp index 6999d51..334c24b 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.cpp +++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp @@ -140,13 +140,6 @@ bool QSvgIOHandler::canRead() const return false; } -#if QT_DEPRECATED_SINCE(5, 13) -QByteArray QSvgIOHandler::name() const -{ - return "svg"; -} -#endif - bool QSvgIOHandler::read(QImage *image) { if (!d->readDone && d->load(device())) { diff --git a/src/plugins/imageformats/svg/qsvgiohandler.h b/src/plugins/imageformats/svg/qsvgiohandler.h index 5fdf6ee..5a952e1 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.h +++ b/src/plugins/imageformats/svg/qsvgiohandler.h @@ -58,9 +58,6 @@ 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; |