From c1d24c6b87dcc4c6e2f6f258c0198fdb6b2795f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Mon, 5 Oct 2009 12:21:18 +0200
Subject: Made X11 QPixmap backend return proper pixmap in alphaChannel().

Reviewed-by: Gunnar
---
 src/gui/image/qpixmap_x11.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
index 6cde898..92a7e7d 100644
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/src/gui/image/qpixmap_x11.cpp
@@ -1252,8 +1252,11 @@ void QX11PixmapData::release()
 
 QPixmap QX11PixmapData::alphaChannel() const
 {
-    if (!hasAlphaChannel())
-        return QPixmap();
+    if (!hasAlphaChannel()) {
+        QPixmap pm(w, h);
+        pm.fill(Qt::white);
+        return pm;
+    }
     QImage im(toImage());
     return QPixmap::fromImage(im.alphaChannel(), Qt::OrderedDither);
 }
-- 
cgit v0.12