diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-10 01:00:41 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-10 10:39:33 +0200 |
| commit | 6fd20defb95f0f3a7d1162641bd4ae9e0ed91bcc (patch) | |
| tree | 2d8c70bc359810f926374ffebd649576345a9c7f /src/plugins/imageformats/jpeg | |
| parent | d72ea9cbd3c2bde4645745c5aeba7cc052d87f0d (diff) | |
| parent | 4bb975717b0ba2c7b41e1a44192c2d54c919cfee (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/time/qdatetime.cpp
src/widgets/widgets/qcombobox.h
Change-Id: Ib84352e8fe34aed2986a1c94e7346a46a71c803b
Diffstat (limited to 'src/plugins/imageformats/jpeg')
| -rw-r--r-- | src/plugins/imageformats/jpeg/qjpeghandler.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/jpeg/qjpeghandler_p.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp index 9d5ccc8a3d..0fb21df1d3 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp @@ -1136,9 +1136,11 @@ void QJpegHandler::setOption(ImageOption option, const QVariant &value) } } +#if QT_DEPRECATED_SINCE(5, 13) QByteArray QJpegHandler::name() const { return "jpeg"; } +#endif QT_END_NAMESPACE diff --git a/src/plugins/imageformats/jpeg/qjpeghandler_p.h b/src/plugins/imageformats/jpeg/qjpeghandler_p.h index d832bf82f3..fafa930c11 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler_p.h +++ b/src/plugins/imageformats/jpeg/qjpeghandler_p.h @@ -68,7 +68,9 @@ public: bool read(QImage *image) override; bool write(const QImage &image) override; +#if QT_DEPRECATED_SINCE(5, 13) QByteArray name() const override; +#endif static bool canRead(QIODevice *device); |