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 /src/plugins/imageformats/svg/qsvgiohandler.cpp | |
| parent | 332f9d686a08948bde82c925701a48150f29c10d (diff) | |
| parent | 1bdd9b7bbc6d2ca83095c2f9a376ef6867674ca8 (diff) | |
| download | qtsvg-08a86661119ad69aae278a0fca2cd1b8efd98dc5.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I2c1925759a489dc23edba9d082025efc33418d18
Diffstat (limited to 'src/plugins/imageformats/svg/qsvgiohandler.cpp')
| -rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.cpp | 4 |
1 files changed, 2 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) { |