diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-07-05 16:49:01 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-07-08 09:58:59 +0200 |
| commit | 7ad0ef0f31afd89509dc2cb3c102b22c0e6c725c (patch) | |
| tree | 3e9d844b87eda4c723519aecad7206ffe546db39 /src/plugins/imageformats/jp2 | |
| parent | d2c5409c1a4994052fd0c470148f1cd38f908d1c (diff) | |
Fix compilation with disabled deprecated APIs
The QImageIOHandler::name() has been deprecated since 5.13, but its
overrides weren't. Enabled compilation of the overrides only when the
QImageIOHandler::name() is compiled.
Task-number: QTBUG-76491
Change-Id: I913f03f730969ea88864a5a08afe50c4eac533ca
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/imageformats/jp2')
| -rw-r--r-- | src/plugins/imageformats/jp2/qjp2handler.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/jp2/qjp2handler_p.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp index 17373fd..ce23480 100644 --- a/src/plugins/imageformats/jp2/qjp2handler.cpp +++ b/src/plugins/imageformats/jp2/qjp2handler.cpp @@ -308,6 +308,7 @@ bool QJp2Handler::supportsOption(ImageOption option) const return (option == Quality || option == SubType); } +#if QT_DEPRECATED_SINCE(5, 13) /*! Return the common identifier of the format. For JPEG 2000 this will return "jp2". @@ -316,6 +317,7 @@ QByteArray QJp2Handler::name() const { return QByteArrayLiteral("jp2"); } +#endif /*! Automatic resource handling for a jas_image_t*. diff --git a/src/plugins/imageformats/jp2/qjp2handler_p.h b/src/plugins/imageformats/jp2/qjp2handler_p.h index e81ec9e..16ddc8a 100644 --- a/src/plugins/imageformats/jp2/qjp2handler_p.h +++ b/src/plugins/imageformats/jp2/qjp2handler_p.h @@ -64,7 +64,9 @@ public: QVariant option(ImageOption option) const override; void setOption(ImageOption option, const QVariant &value) override; bool supportsOption(ImageOption option) const override; +#if QT_DEPRECATED_SINCE(5, 13) QByteArray name() const override; +#endif private: Q_DECLARE_PRIVATE(QJp2Handler) |