summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-17 01:38:12 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-17 01:38:12 (GMT)
commiteb9f53486a999aa6e56b115e6ea2ff8b7b107259 (patch)
tree13f9311550f95a0afff8fbc6dd9c56d246130a0e /src/declarative/util
parent0e90936645f313153d15813c4e11620b93c797a6 (diff)
downloadQt-eb9f53486a999aa6e56b115e6ea2ff8b7b107259.zip
Qt-eb9f53486a999aa6e56b115e6ea2ff8b7b107259.tar.gz
Qt-eb9f53486a999aa6e56b115e6ea2ff8b7b107259.tar.bz2
Minor cleanup.
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmltransitionmanager.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
index 5e86b73..ba4e160 100644
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ b/src/declarative/util/qmltransitionmanager.cpp
@@ -109,13 +109,10 @@ void QmlTransitionManager::transition(const QList<Action> &list,
QmlStateOperation::ActionList applyList = list;
// Determine which actions are binding changes.
foreach(const Action &action, applyList) {
- if (action.toBinding) {
+ if (action.toBinding)
d->bindingsList << action;
- if (action.fromBinding)
- action.property.setBinding(0); // Disable current binding
- } else if (action.fromBinding) {
+ if (action.fromBinding)
action.property.setBinding(0); // Disable current binding
- }
}
// Animated transitions need both the start and the end value for
@@ -156,7 +153,7 @@ void QmlTransitionManager::transition(const QList<Action> &list,
continue;
if (action.toBinding)
- action.property.setBinding(0);
+ action.property.setBinding(0); // Make sure this is disabled during the transition
action.property.write(action.fromValue);
}