diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-03-03 14:54:54 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-03-03 15:28:18 (GMT) |
| commit | 13e08bb43bc7c972e77fc7b77ae5de14235cb897 (patch) | |
| tree | 2cff57d81cce73f775780cf72591597386802727 /src/gui/graphicsview/qgraphicsview.cpp | |
| parent | 57b6629507e97c63cf2445eef12443dcb2639887 (diff) | |
| download | Qt-13e08bb43bc7c972e77fc7b77ae5de14235cb897.zip Qt-13e08bb43bc7c972e77fc7b77ae5de14235cb897.tar.gz Qt-13e08bb43bc7c972e77fc7b77ae5de14235cb897.tar.bz2 | |
Fixes wrong composition mode for cached backgrounds in Graphics View.
This change partially reverts commit a589005f and therefore fully reverts
68be6457. We cannot assume that only opaque pixels are painted in
drawBackground().
Regression against 4.5. Auto-test included.
Task-number: QTBUG-8168
Reviewed-by: trond
Diffstat (limited to 'src/gui/graphicsview/qgraphicsview.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 1ced3d7..a767987 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -3360,12 +3360,6 @@ void QGraphicsView::paintEvent(QPaintEvent *event) backgroundPainter.setClipRegion(d->backgroundPixmapExposed, Qt::ReplaceClip); if (viewTransformed) backgroundPainter.setTransform(viewTransform); -#ifdef Q_WS_X11 -#undef X11 - if (backgroundPainter.paintEngine()->type() != QPaintEngine::X11) -#define X11 qt_x11Data -#endif - backgroundPainter.setCompositionMode(QPainter::CompositionMode_Source); QRectF backgroundExposedSceneRect = mapToScene(d->backgroundPixmapExposed.boundingRect()).boundingRect(); drawBackground(&backgroundPainter, backgroundExposedSceneRect); d->backgroundPixmapExposed = QRegion(); |