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

Silence deprecation warning about QImage::alphaChannel() in qpixmap.h

Browse Source 
Amends aa542be4e005b1feedc2e17fd6ca2387bf2fea1b.

Change-Id: Id1a256a101cc16fa36d1254d3523cf0732c24045
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Friedemann Kleint 2020-01-07 09:58:14 +01:00
parent 7b0f341872
commit bfbf8ca453
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/image/qpixmap.h
View File

@ -227,7 +227,10 @@ inline bool QPixmap::loadFromData(const QByteArray &buf, const char *format,
#if QT_DEPRECATED_SINCE(5, 0) #if QT_DEPRECATED_SINCE(5, 0)
inline QPixmap QPixmap::alphaChannel() const inline QPixmap QPixmap::alphaChannel() const
{ {
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
return QPixmap::fromImage(toImage().alphaChannel()); return QPixmap::fromImage(toImage().alphaChannel());
QT_WARNING_POP
} }
inline void QPixmap::setAlphaChannel(const QPixmap &p) inline void QPixmap::setAlphaChannel(const QPixmap &p)