diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-08-06 12:24:37 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-08-07 12:50:28 +0200 |
| commit | 05b90be3c5ce4709156178478abb2e7ba125a0be (patch) | |
| tree | a7c39b76c99f4887dbc6837be3a41afc7fdb29b4 /src/plugins/imageformats/ico/qicohandler.h | |
| parent | 7301e44161d8bb25410219a31405584c9492b83e (diff) | |
| parent | 6f357f50b4b72e3c5a6903a09624ade1d72d12c1 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'src/plugins/imageformats/ico/qicohandler.h')
| -rw-r--r-- | src/plugins/imageformats/ico/qicohandler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/imageformats/ico/qicohandler.h b/src/plugins/imageformats/ico/qicohandler.h index 435f036113..328dfce47e 100644 --- a/src/plugins/imageformats/ico/qicohandler.h +++ b/src/plugins/imageformats/ico/qicohandler.h @@ -54,7 +54,9 @@ public: bool read(QImage *image) override; bool write(const QImage &image) override; +#if QT_DEPRECATED_SINCE(5, 13) QByteArray name() const override; +#endif int imageCount() const override; bool jumpToImage(int imageNumber) override; |