diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-17 13:58:34 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-17 13:58:34 (GMT) |
| commit | 91b29b3b00ba9292cfcbeb2ac93c4b1f7bed2bd6 (patch) | |
| tree | d6f344c53c57fd0e990473addfe6d9c14322ade7 /src/gui | |
| parent | 1ebeb971d3382aec0fff927ce2d6ea7b0452584f (diff) | |
| parent | 6aba7215a0ac2092a7f00015df0d7a80681ef6bc (diff) | |
| download | Qt-91b29b3b00ba9292cfcbeb2ac93c4b1f7bed2bd6.zip Qt-91b29b3b00ba9292cfcbeb2ac93c4b1f7bed2bd6.tar.gz Qt-91b29b3b00ba9292cfcbeb2ac93c4b1f7bed2bd6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 4ee2301..6934abc 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -4285,6 +4285,12 @@ static void _q_paintIntoCache(QPixmap *pix, QGraphicsItem *item, const QRegion & if (!subPix.isNull()) { // Blit the subpixmap into the main pixmap. pixmapPainter.begin(pix); + if (item->cacheMode() == QGraphicsItem::DeviceCoordinateCache + && itemToPixmap.type() > QTransform::TxTranslate) { + pixmapPainter.setCompositionMode(QPainter::CompositionMode_SourceAtop); + } else { + pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source); + } pixmapPainter.setClipRegion(pixmapExposed); pixmapPainter.drawPixmap(br.topLeft(), subPix); pixmapPainter.end(); |