diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 22:58:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 22:58:07 (GMT) |
| commit | cbedbc4455eecea670988b635af4ee90d01cfab3 (patch) | |
| tree | 916be2bd6358a1d9a84c9285a6677e981391daad /src/plugins | |
| parent | 0cfa6daa4776cd78370e644fae3005ae432b83c7 (diff) | |
| parent | 5327f223b5087c0097f5c608ed753a150f6190ff (diff) | |
| download | Qt-cbedbc4455eecea670988b635af4ee90d01cfab3.zip Qt-cbedbc4455eecea670988b635af4ee90d01cfab3.tar.gz Qt-cbedbc4455eecea670988b635af4ee90d01cfab3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix compilation with Sun Studio 12.1.
Compile with QT_NO_PROXYSCREEN.
silence compiler warnings
Don't let posted events starve native dialogs (regression)
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(); |