summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-23 03:12:44 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-23 03:12:44 (GMT)
commite9dde8b58f6a741c10d8b28a463c467f256bdd8f (patch)
tree9014b1028ea1e7173db6d6b4e8a4256609777dad /src/declarative
parente823da3a9a09a2982b553f4c8dbe82acb87e8f29 (diff)
downloadQt-e9dde8b58f6a741c10d8b28a463c467f256bdd8f.zip
Qt-e9dde8b58f6a741c10d8b28a463c467f256bdd8f.tar.gz
Qt-e9dde8b58f6a741c10d8b28a463c467f256bdd8f.tar.bz2
Make sure action events are reversed when not part of a transition.
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/util/qmltransitionmanager.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
index 6f1a8e3..4609de8 100644
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ b/src/declarative/util/qmltransitionmanager.cpp
@@ -196,7 +196,10 @@ void QmlTransitionManager::transition(const QList<Action> &list,
// transition
foreach(const Action &action, applyList) {
if (action.event) {
- action.event->execute();
+ if (action.event->isReversable() && action.reverseEvent)
+ action.event->reverse();
+ else
+ action.event->execute();
} else {
action.property.write(action.toValue);
}