diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-09-04 15:17:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-04 17:24:51 +0200 |
| commit | dc7972b261f6302f5a346a19c89cb1cfb567cee0 (patch) | |
| tree | 49fa8e9854dbcfcfbf5646c95f749c594b34bf93 /src/gui/image/qpixmap_win.cpp | |
| parent | b855e578044e49b588b32085968c63a910b9daae (diff) | |
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>
Diffstat (limited to 'src/gui/image/qpixmap_win.cpp')
| -rw-r--r-- | src/gui/image/qpixmap_win.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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()); |