diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-19 16:03:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-19 16:03:31 (GMT) |
| commit | 30d8a101858e0e34aafe7252a8b37d05841494d2 (patch) | |
| tree | b38a694a62574331e008086ca11208b9de8c7df5 /src | |
| parent | 63bf7cd581d9f69fecae82921d5c2c5b5eddc04a (diff) | |
| parent | 2ba170cfdcfa8166b78bc2dbfa7ca5c402b13a29 (diff) | |
| download | Qt-30d8a101858e0e34aafe7252a8b37d05841494d2.zip Qt-30d8a101858e0e34aafe7252a8b37d05841494d2.tar.gz Qt-30d8a101858e0e34aafe7252a8b37d05841494d2.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp index 3d8cf50..9a94c30 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp @@ -365,10 +365,12 @@ void QDirectFBWindowSurface::flush(QWidget *widget, const QRegion ®ion, if (!win) return; -#ifndef QT_NO_QWS_PROXYSCREEN +#if !defined(QT_NO_QWS_PROXYSCREEN) && !defined(QT_NO_GRAPHICSVIEW) QWExtra *extra = qt_widget_private(widget)->extraData(); if (extra && extra->proxyWidget) return; +#else + Q_UNUSED(widget); #endif const quint8 windowOpacity = quint8(win->windowOpacity() * 0xff); |