summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2010-03-01 22:45:40 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2010-03-01 23:23:01 (GMT)
commit629b3e0d03875665a75a5a1c40d53dd478fdc982 (patch)
tree3f7c84374a258f319f4401042f55b11209452c23 /src/plugins
parent8b90fe35a737a71dbc15de48088fc100241f701c (diff)
downloadQt-629b3e0d03875665a75a5a1c40d53dd478fdc982.zip
Qt-629b3e0d03875665a75a5a1c40d53dd478fdc982.tar.gz
Qt-629b3e0d03875665a75a5a1c40d53dd478fdc982.tar.bz2
Don't disable alpha when filling with opaque color
Qt heuristics say that a QPixmap becomes an alpha pixmap when filled with a color with alpha != 255 but not that it returns to being opaque when filled with a color with alpha == 255 Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index ba50329..b5ac67d 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -425,7 +425,7 @@ void QDirectFBPixmapData::fill(const QColor &color)
Q_ASSERT(dfbSurface);
- alpha = (color.alpha() < 255);
+ alpha |= (color.alpha() < 255);
if (alpha && isOpaqueFormat(imageFormat)) {
QSize size;