summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@trolltech.com>2009-03-09 13:33:02 (GMT)
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-04-06 11:49:40 (GMT)
commit0985805ab3c7de5b15c115a98afb15944b6d93b9 (patch)
treedfcf1495ce1b04900fe58e8929f3b53faef184c5
parentd74f1a91b05b943c1a8ae7847de6ee50b2093b89 (diff)
downloadQt-0985805ab3c7de5b15c115a98afb15944b6d93b9.zip
Qt-0985805ab3c7de5b15c115a98afb15944b6d93b9.tar.gz
Qt-0985805ab3c7de5b15c115a98afb15944b6d93b9.tar.bz2
Fixes: Don't fill the pixmap because we will copy the cache into it.
RevBy: bnilsen AutoTest: All pass + plasma ok
-rw-r--r--src/gui/graphicsview/qgraphicsscene.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index b509507..8a67d24 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -4736,11 +4736,9 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte
if (newCacheIndent != deviceData->cacheIndent || deviceRect.size() != pix.size()) {
QPoint diff = newCacheIndent - deviceData->cacheIndent;
QPixmap newPix(deviceRect.size());
- // ### Investigate removing this fill (test with Plasma and
- // graphicssystem raster).
- newPix.fill(Qt::transparent);
if (!pix.isNull()) {
QPainter newPixPainter(&newPix);
+ newPixPainter.setCompositionMode(QPainter::CompositionMode_Source);
newPixPainter.drawPixmap(-diff, pix);
newPixPainter.end();
}