diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-22 19:38:01 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-22 19:38:01 (GMT) |
| commit | 55c25385032a700a44b5f34e6d191bb8a65ec972 (patch) | |
| tree | b4e0e629ef1b957b02f59a3ba450b7690015d90e /src/plugins | |
| parent | bcba1271a09c48e0bfd5477dd6cf0955ba55b077 (diff) | |
| parent | e0bd60f6c8a489c5703b648fe2e2470763f67e37 (diff) | |
| download | Qt-55c25385032a700a44b5f34e6d191bb8a65ec972.zip Qt-55c25385032a700a44b5f34e6d191bb8a65ec972.tar.gz Qt-55c25385032a700a44b5f34e6d191bb8a65ec972.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 2 |
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 ®ion, 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(); |