Fix qt_pixmapToWinHICON() not to return invalid HICON for null pixmaps
Change-Id: Ieda923bf27514a3daa8a5de7836511ab32346260 Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>bb10
parent
b855e57804
commit
dc7972b261
|
|
@ -279,6 +279,9 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat =
|
|||
|
||||
Q_GUI_EXPORT HICON qt_pixmapToWinHICON(const QPixmap &p)
|
||||
{
|
||||
if (p.isNull())
|
||||
return 0;
|
||||
|
||||
QBitmap maskBitmap = p.mask();
|
||||
if (maskBitmap.isNull()) {
|
||||
maskBitmap = QBitmap(p.size());
|
||||
|
|
|
|||
Loading…
Reference in New Issue