summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-09-14 10:16:55 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-09-14 10:16:55 (GMT)
commit21ca998de2d74c521ca060283946f25e369aad89 (patch)
treed85db6f5db161d4eafbd8c5a31df926b24e36e7a /src/gui/painting
parentab10c5b4be5c0d06edd79d8b4a8da090c1511d7e (diff)
parent9d075f383597f727b0c5c1e6bdbb9646e35c0fa0 (diff)
downloadQt-21ca998de2d74c521ca060283946f25e369aad89.zip
Qt-21ca998de2d74c521ca060283946f25e369aad89.tar.gz
Qt-21ca998de2d74c521ca060283946f25e369aad89.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qpainter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index a9257c7..beda9d6 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -475,7 +475,8 @@ void QPainterPrivate::draw_helper(const QPainterPath &originalPath, DrawOperatio
p.end();
q->save();
- q->resetMatrix();
+ state->matrix = QTransform();
+ state->dirtyFlags |= QPaintEngine::DirtyTransform;
updateState(state);
engine->drawImage(absPathRect,
image,