summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Magnuson <smagnuso@gmail.com>2010-11-19 10:24:58 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-11-19 10:26:13 (GMT)
commit4e9b721af573e7d1a16b35778059b374520cf055 (patch)
treedb3867db227208587715cbeb8fc8c22e0c791863
parentba4eafaa3bd46cfad891a4bbf1dd7dccefc4702e (diff)
downloadQt-4e9b721af573e7d1a16b35778059b374520cf055.zip
Qt-4e9b721af573e7d1a16b35778059b374520cf055.tar.gz
Qt-4e9b721af573e7d1a16b35778059b374520cf055.tar.bz2
Compile with QT_NO_PROXYSCREEN.
Merge-request: 931 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index 2eeee24..fbc539b 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -344,9 +344,11 @@ void QDirectFBWindowSurface::flush(QWidget *widget, const QRegion &region,
if (!win)
return;
+#ifndef QT_NO_QWS_PROXYSCREEN
QWExtra *extra = qt_widget_private(widget)->extraData();
if (extra && extra->proxyWidget)
return;
+#endif
const quint8 windowOpacity = quint8(win->windowOpacity() * 0xff);
const QRect windowGeometry = geometry();