diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-04 08:45:54 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-04 08:45:54 (GMT) |
commit | e22581675866cbf88e948eae2e83eb13a43a2d44 (patch) | |
tree | 782b173b702a48fca5f68d9622cad67d65d01d88 /src/gui/graphicsview/qgraphicsview.cpp | |
parent | 950cd9b3c1ae6a1b462d596a62aea92f9c231afb (diff) | |
parent | db997a02c1d306260d8bbfe4f13e8312efb6fa7c (diff) | |
download | Qt-e22581675866cbf88e948eae2e83eb13a43a2d44.zip Qt-e22581675866cbf88e948eae2e83eb13a43a2d44.tar.gz Qt-e22581675866cbf88e948eae2e83eb13a43a2d44.tar.bz2 |
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsview.cpp')
-rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index f72aa8a..c88f678 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -281,6 +281,7 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime < #include <QtGui/qstyleoption.h> #include <QtGui/qinputcontext.h> #ifdef Q_WS_X11 +#include <QtGui/qpaintengine.h> #include <private/qt_x11_p.h> #endif @@ -3294,7 +3295,12 @@ void QGraphicsView::paintEvent(QPaintEvent *event) backgroundPainter.setClipRegion(d->backgroundPixmapExposed, Qt::ReplaceClip); if (viewTransformed) backgroundPainter.setTransform(viewTransform); - backgroundPainter.setCompositionMode(QPainter::CompositionMode_Source); +#ifdef Q_WS_X11 +#undef X11 + if (backgroundPainter.paintEngine()->type() != QPaintEngine::X11) +#define X11 qt_x11Data +#endif + backgroundPainter.setCompositionMode(QPainter::CompositionMode_Source); drawBackground(&backgroundPainter, exposedSceneRect); d->backgroundPixmapExposed = QRegion(); } |