summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-21 06:44:40 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-21 06:44:40 (GMT)
commit513d6bd7388e27f32b2868ded6174ca84212cd1b (patch)
treed6222eee0521835d5788bb688114e453d76b8998
parentd53254780fd6b74e99ada90d5dd1e26c1c19e573 (diff)
parentf7a9d99a39a2d2f2936ca2fa2802721d4b56ed00 (diff)
downloadQt-513d6bd7388e27f32b2868ded6174ca84212cd1b.zip
Qt-513d6bd7388e27f32b2868ded6174ca84212cd1b.tar.gz
Qt-513d6bd7388e27f32b2868ded6174ca84212cd1b.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix semitransparent windows with DirectFB
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index cb9c921..6764e75 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -378,9 +378,6 @@ void QDirectFBWindowSurface::flush(QWidget *widget, const QRegion &region,
return;
}
screen->flipSurface(dfbSurface, flipFlags, region, offset);
- if (noSystemBackground) {
- dfbSurface->Clear(dfbSurface, 0, 0, 0, 0);
- }
#else
setOpaque(windowOpacity != 0xff);
if (mode == Offscreen) {