diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-26 04:19:40 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-26 04:19:40 (GMT) |
| commit | 6c40f725b4cefbb44b9f1004c40f6b2a3aa29f01 (patch) | |
| tree | 78f50334af27b910282fcea41cd4da320510a870 /src/gui/graphicsview | |
| parent | 60b8fc37ac04b9247481e5f03d1d7fa9ae059a07 (diff) | |
| parent | 35c8033ff51ab6d0567e786b790b8cc49852803b (diff) | |
| download | Qt-6c40f725b4cefbb44b9f1004c40f6b2a3aa29f01.zip Qt-6c40f725b4cefbb44b9f1004c40f6b2a3aa29f01.tar.gz Qt-6c40f725b4cefbb44b9f1004c40f6b2a3aa29f01.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicstransform.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp index a0b5493..93dc196 100644 --- a/src/gui/graphicsview/qgraphicstransform.cpp +++ b/src/gui/graphicsview/qgraphicstransform.cpp @@ -547,9 +547,7 @@ void QGraphicsRotation::applyTo(QMatrix4x4 *matrix) const return; matrix->translate(d->origin); - QMatrix4x4 m; - m.rotate(d->angle, d->axis.x(), d->axis.y(), d->axis.z()); - *matrix *= m.toTransform(1024.0f); // Project back to 2D. + matrix->projectedRotate(d->angle, d->axis.x(), d->axis.y(), d->axis.z()); matrix->translate(-d->origin); } |