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
J-P Nurmi 2013-09-04 15:17:29 +02:00 committed by The Qt Project
parent b855e57804
commit dc7972b261
1 changed files with 3 additions and 0 deletions

View File

@ -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());