summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-01-26 13:53:12 (GMT)
committeraxis <qt-info@nokia.com>2010-01-26 13:53:12 (GMT)
commitfa81d43f8bba47286e3f16b7aa092822c7bd5f7e (patch)
tree2ae250485fa9191c07894a6bf02c8d154f3b0bd3 /src/plugins
parentd64407cf376c5723663ebe81f156a3da98d7df24 (diff)
parent9175f9e5bad0f77e5d53751a8e839c8ea7df4c23 (diff)
downloadQt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.zip
Qt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.tar.gz
Qt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts: mkspecs/common/symbian/symbian.conf src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'src/plugins')
-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) {