1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with disabled deprecated APIs

Browse Source 
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: I8fea0032427d25bb0de01be8920c723fc21f6b7a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
This commit is contained in:
Sona Kurazyan 2019-07-05 17:12:18 +02:00
parent 9c7ebd191b
commit e96cea51da
6 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/imageformats/gif/qgifhandler.cpp
View File

@ -1215,9 +1215,11 @@ int QGifHandler::currentImageNumber() const
return frameNumber; return frameNumber;
} }
#if QT_DEPRECATED_SINCE(5, 13)
QByteArray QGifHandler::name() const QByteArray QGifHandler::name() const
{ {
return "gif"; return "gif";
} }
#endif
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/plugins/imageformats/gif/qgifhandler_p.h
View File

@ -73,7 +73,9 @@ public:
bool read(QImage *image) override; bool read(QImage *image) override;
bool write(const QImage &image) override; bool write(const QImage &image) override;
#if QT_DEPRECATED_SINCE(5, 13)
QByteArray name() const override; QByteArray name() const override;
#endif
static bool canRead(QIODevice *device); static bool canRead(QIODevice *device);

3
src/plugins/imageformats/ico/qicohandler.cpp
View File

@ -818,6 +818,7 @@ bool QtIcoHandler::write(const QImage &image)
return ICOReader::write(device, imgs); return ICOReader::write(device, imgs);
} }
#if QT_DEPRECATED_SINCE(5, 13)
/*! /*!
* Return the common identifier of the format. * Return the common identifier of the format.
* For ICO format this will return "ico". * For ICO format this will return "ico".
@ -826,7 +827,7 @@ QByteArray QtIcoHandler::name() const
{ {
return "ico"; return "ico";
} }
#endif
/*! \reimp /*! \reimp

2
src/plugins/imageformats/ico/qicohandler.h
View File

@ -54,7 +54,9 @@ public:
bool read(QImage *image) override; bool read(QImage *image) override;
bool write(const QImage &image) override; bool write(const QImage &image) override;
#if QT_DEPRECATED_SINCE(5, 13)
QByteArray name() const override; QByteArray name() const override;
#endif
int imageCount() const override; int imageCount() const override;
bool jumpToImage(int imageNumber) override; bool jumpToImage(int imageNumber) override;

2
src/plugins/imageformats/jpeg/qjpeghandler.cpp
View File

@ -1124,9 +1124,11 @@ void QJpegHandler::setOption(ImageOption option, const QVariant &value)
} }
} }
#if QT_DEPRECATED_SINCE(5, 13)
QByteArray QJpegHandler::name() const QByteArray QJpegHandler::name() const
{ {
return "jpeg"; return "jpeg";
} }
#endif
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/plugins/imageformats/jpeg/qjpeghandler_p.h
View File

@ -68,7 +68,9 @@ public:
bool read(QImage *image) override; bool read(QImage *image) override;
bool write(const QImage &image) override; bool write(const QImage &image) override;
#if QT_DEPRECATED_SINCE(5, 13)
QByteArray name() const override; QByteArray name() const override;
#endif
static bool canRead(QIODevice *device); static bool canRead(QIODevice *device);