From dc7972b261f6302f5a346a19c89cb1cfb567cee0 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Wed, 4 Sep 2013 15:17:29 +0200
Subject: [PATCH] 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>
---
 src/gui/image/qpixmap_win.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index d66bc409e6..93efe2e696 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -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());