diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-12-08 16:55:42 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-12-08 16:55:42 (GMT) |
| commit | 33418800a5c78e06182bc0b41a2eabaf8aafc0fc (patch) | |
| tree | a5e30275f88c6f473b1e3d09f42c94799f7ac21e /src/gui/painting/qpainter.cpp | |
| parent | 74b0c482b1edf606e1326c9053c612a7e514dee4 (diff) | |
| parent | 971acc6d34559a2c5035888a5891ea29ad8628af (diff) | |
| download | Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.zip Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.tar.gz Qt-33418800a5c78e06182bc0b41a2eabaf8aafc0fc.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 443c9c5..30f8c9e 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -284,7 +284,7 @@ bool QPainterPrivate::attachPainterPrivate(QPainter *q, QPaintDevice *pdev) // Update matrix. if (q->d_ptr->state->WxF) { - q->d_ptr->state->redirectionMatrix *= q->d_ptr->state->worldMatrix; + q->d_ptr->state->redirectionMatrix = q->d_ptr->state->matrix; q->d_ptr->state->redirectionMatrix.translate(-offset.x(), -offset.y()); q->d_ptr->state->worldMatrix = QTransform(); q->d_ptr->state->WxF = false; |