diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-03 11:51:53 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-03 11:51:53 (GMT) |
| commit | fc4a3206fd89d28c0b0c6c36fa0c136a65e2e057 (patch) | |
| tree | 4fe485fe058ca52a185a28f4942a009a13884219 /src/gui/graphicsview/qgraphicsview.cpp | |
| parent | 2a0d6bf8d3f7c92667512d2222cf2304e06130b4 (diff) | |
| parent | 68be6457f6732437b485812ab2db11c147a24b51 (diff) | |
| download | Qt-fc4a3206fd89d28c0b0c6c36fa0c136a65e2e057.zip Qt-fc4a3206fd89d28c0b0c6c36fa0c136a65e2e057.tar.gz Qt-fc4a3206fd89d28c0b0c6c36fa0c136a65e2e057.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team 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 710c745..8945f51 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(); } |