diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-24 05:38:44 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-24 05:38:44 (GMT) |
| commit | 7e0711bd85d28204c1405928cfc68a2fd76f3d13 (patch) | |
| tree | a78c8bdfa364e54801b9a3382df4a96ff62eba1a /src/declarative/graphicsitems | |
| parent | 4b6b7361a6f8ba81b969134ca3251fad8543ddb0 (diff) | |
| parent | f59619a3a4de074d0557ce17f9580a242e4e6c16 (diff) | |
| download | Qt-7e0711bd85d28204c1405928cfc68a2fd76f3d13.zip Qt-7e0711bd85d28204c1405928cfc68a2fd76f3d13.tar.gz Qt-7e0711bd85d28204c1405928cfc68a2fd76f3d13.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflipable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp index 8b46039..0e2ae63 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp @@ -160,7 +160,7 @@ QDeclarativeFlipable::Side QDeclarativeFlipable::side() const { Q_D(const QDeclarativeFlipable); if (d->dirtySceneTransform) - const_cast<QDeclarativeFlipablePrivate *>(d)->updateSceneTransformFromParent(); + const_cast<QDeclarativeFlipablePrivate *>(d)->ensureSceneTransform(); return d->current; } |