diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 18:02:23 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 18:24:13 +0200 |
| commit | 9cf98b08da79980017b1663f3603149f39a21513 (patch) | |
| tree | b286a4f90ffdb4e5f1c21b0388aa855ff77c641a /src/plugins/imageformats/jp2 | |
| parent | 981aa49d195ade2aed4ebd11e762653bc424d20b (diff) | |
| parent | 657f6d3c125d852c25c1233f473782eb81e03ab9 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: Idf48bddde98d108d3692eddb8971affcc691a614
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) |