summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-04-20 09:24:57 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-04-20 09:24:57 (GMT)
commit5b985f0a33946e77b133ee761613858b1057bcdd (patch)
treef401cbdbcbbc4d5af96dafae9077b7a154453c80 /src
parentf2d10ae7b08e268ab619bddb698924629b3587dd (diff)
parent36389c8d9e2bea2d72c9acfca60e1199c6d1818e (diff)
downloadQt-5b985f0a33946e77b133ee761613858b1057bcdd.zip
Qt-5b985f0a33946e77b133ee761613858b1057bcdd.tar.gz
Qt-5b985f0a33946e77b133ee761613858b1057bcdd.tar.bz2
Merge branch 'kinetic-animations' into kinetic-statemachine
Diffstat (limited to 'src')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 95b2589..df140e3 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -2791,9 +2791,10 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine)
return;
// Notify the item that the transformation matrix is changing.
- QVariant variant;
- qVariantSetValue<QMatrix>(variant, newTransform.toAffine());
- newTransform = QTransform(qVariantValue<QMatrix>(itemChange(ItemMatrixChange, variant)));
+ // Notify the item that the matrix is changing.
+ QVariant newTransformVariant(itemChange(ItemMatrixChange,
+ qVariantFromValue<QMatrix>(newTransform.toAffine())));
+ newTransform = QTransform(qVariantValue<QMatrix>(newTransformVariant));
if (oldTransform == newTransform)
return;