Don't leak bindings.

Make sure we clean up bindings for a cancelled state change.

1 files changed, 14 insertions, 2 deletions

diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
index b2d9414..be082f8 100644
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ b/src/declarative/util/qmltransitionmanager.cpp
@@ -239,10 +239,10 @@ void QmlTransitionManager::transition(const QList<Action> &list,
         }
     }
     if (!transition)
-        d->applyBindings(); //### merge into above foreach?
+        d->applyBindings();
 
 }
-
+#include <QDebug>
 void QmlTransitionManager::cancel()
 {
     if (d->transition) {
@@ -251,6 +251,18 @@ void QmlTransitionManager::cancel()
         d->transition = 0;
     }
 
+    for(int i = 0; i < d->bindingsList.count(); ++i) {
+        Action action = d->bindingsList[i];
+        if (action.toBinding && action.deletableToBinding) {
+            action.property.setBinding(0);
+            delete action.toBinding;
+            action.toBinding = 0;
+            action.deletableToBinding = false;
+        } else if (action.event) {
+            //### what do we do here?
+        }
+
+    }
     d->bindingsList.clear();
     d->completeList.clear();