diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-04-17 14:38:19 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-04-17 14:38:19 (GMT) |
| commit | 36389c8d9e2bea2d72c9acfca60e1199c6d1818e (patch) | |
| tree | 7689d92e7d0f970b7589a3bd7c43f6a3c8d96f6e /src/gui | |
| parent | 198efeb27e5c2a87d0a2bb6859446cb1faf45ed8 (diff) | |
| download | Qt-36389c8d9e2bea2d72c9acfca60e1199c6d1818e.zip Qt-36389c8d9e2bea2d72c9acfca60e1199c6d1818e.tar.gz Qt-36389c8d9e2bea2d72c9acfca60e1199c6d1818e.tar.bz2 | |
Fix compilation after a merge error
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 7 |
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; |