diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-23 04:05:23 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-23 04:05:23 (GMT) |
| commit | 1ba013feae994a40abe3835185cae211b136a0e8 (patch) | |
| tree | 98655d7af549f1b9099374ed86bdfac49719e449 /src/plugins | |
| parent | d7d0b1528fd200fc3110093244b8265fdf457238 (diff) | |
| parent | b1c412cefa51f0eea79dbf279f2a23414ccecc3d (diff) | |
| download | Qt-1ba013feae994a40abe3835185cae211b136a0e8.zip Qt-1ba013feae994a40abe3835185cae211b136a0e8.tar.gz Qt-1ba013feae994a40abe3835185cae211b136a0e8.tar.bz2 | |
Merge remote branch 'qt/4.7' into 4.7
Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
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(); |