diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-07 09:58:14 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-09 13:52:25 +0100 |
| commit | bfbf8ca4536fda39a8fb34dbf149794437f68dff (patch) | |
| tree | ae75cf296a82b5ac13178090f8212654c5f354f6 | |
| parent | 7b0f34187224fe754f4171f1d2fe5fa3f48baf82 (diff) | |
Silence deprecation warning about QImage::alphaChannel() in qpixmap.h
Amends aa542be4e005b1feedc2e17fd6ca2387bf2fea1b.
Change-Id: Id1a256a101cc16fa36d1254d3523cf0732c24045
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/gui/image/qpixmap.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 8c1395857e..8a06ebe603 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -227,7 +227,10 @@ inline bool QPixmap::loadFromData(const QByteArray &buf, const char *format, #if QT_DEPRECATED_SINCE(5, 0) inline QPixmap QPixmap::alphaChannel() const { + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED return QPixmap::fromImage(toImage().alphaChannel()); + QT_WARNING_POP } inline void QPixmap::setAlphaChannel(const QPixmap &p) |