Make bindings refcounted

Refcounting our bindings greatly simplifies our memory management
of the objects and ensures we safely clean them all up. In addition,
it allows us to remove the m_mePtr and weak reference handling from
QQmlAbstractBinding as we can safely handle this through the same
mechanism.

Change-Id: If23ebc8be276096146952b0008b62018f5d57faf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

6 files changed, 91 insertions, 149 deletions

diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index 3ea1c0ecf1..15f8eeab7b 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -358,7 +358,7 @@ QQuickStateOperation::ActionList QQuickParentChange::actions()
             newBinding->setTarget(property);
             QQuickStateAction xa;
             xa.property = property;
-            xa.toBinding = QQmlAbstractBinding::getPointer(newBinding);
+            xa.toBinding = newBinding;
             xa.fromValue = xa.property.read();
             xa.deletableToBinding = true;
             actions << xa;
@@ -377,7 +377,7 @@ QQuickStateOperation::ActionList QQuickParentChange::actions()
             newBinding->setTarget(property);
             QQuickStateAction ya;
             ya.property = property;
-            ya.toBinding = QQmlAbstractBinding::getPointer(newBinding);
+            ya.toBinding = newBinding;
             ya.fromValue = ya.property.read();
             ya.deletableToBinding = true;
             actions << ya;
@@ -396,7 +396,7 @@ QQuickStateOperation::ActionList QQuickParentChange::actions()
             newBinding->setTarget(property);
             QQuickStateAction sa;
             sa.property = property;
-            sa.toBinding = QQmlAbstractBinding::getPointer(newBinding);
+            sa.toBinding = newBinding;
             sa.fromValue = sa.property.read();
             sa.deletableToBinding = true;
             actions << sa;
@@ -415,7 +415,7 @@ QQuickStateOperation::ActionList QQuickParentChange::actions()
             newBinding->setTarget(property);
             QQuickStateAction ra;
             ra.property = property;
-            ra.toBinding = QQmlAbstractBinding::getPointer(newBinding);
+            ra.toBinding = newBinding;
             ra.fromValue = ra.property.read();
             ra.deletableToBinding = true;
             actions << ra;
@@ -434,7 +434,7 @@ QQuickStateOperation::ActionList QQuickParentChange::actions()
             newBinding->setTarget(property);
             QQuickStateAction wa;
             wa.property = property;
-            wa.toBinding = QQmlAbstractBinding::getPointer(newBinding);
+            wa.toBinding = newBinding;
             wa.fromValue = wa.property.read();
             wa.deletableToBinding = true;
             actions << wa;
@@ -453,7 +453,7 @@ QQuickStateOperation::ActionList QQuickParentChange::actions()
             newBinding->setTarget(property);
             QQuickStateAction ha;
             ha.property = property;
-            ha.toBinding = QQmlAbstractBinding::getPointer(newBinding);
+            ha.toBinding = newBinding;
             ha.fromValue = ha.property.read();
             ha.deletableToBinding = true;
             actions << ha;
@@ -765,12 +765,7 @@ class QQuickAnchorChangesPrivate : public QQuickStateOperationPrivate
 {
 public:
     QQuickAnchorChangesPrivate()
-        : target(0), anchorSet(new QQuickAnchorSet),
-          leftBinding(0), rightBinding(0), hCenterBinding(0),
-          topBinding(0), bottomBinding(0), vCenterBinding(0), baselineBinding(0),
-          origLeftBinding(0), origRightBinding(0), origHCenterBinding(0),
-          origTopBinding(0), origBottomBinding(0), origVCenterBinding(0),
-          origBaselineBinding(0)
+        : target(0), anchorSet(new QQuickAnchorSet)
     {
 
     }
@@ -779,21 +774,21 @@ public:
     QQuickItem *target;
     QQuickAnchorSet *anchorSet;
 
-    QQmlBinding *leftBinding;
-    QQmlBinding *rightBinding;
-    QQmlBinding *hCenterBinding;
-    QQmlBinding *topBinding;
-    QQmlBinding *bottomBinding;
-    QQmlBinding *vCenterBinding;
-    QQmlBinding *baselineBinding;
-
-    QQmlAbstractBinding *origLeftBinding;
-    QQmlAbstractBinding *origRightBinding;
-    QQmlAbstractBinding *origHCenterBinding;
-    QQmlAbstractBinding *origTopBinding;
-    QQmlAbstractBinding *origBottomBinding;
-    QQmlAbstractBinding *origVCenterBinding;
-    QQmlAbstractBinding *origBaselineBinding;
+    QExplicitlySharedDataPointer<QQmlBinding> leftBinding;
+    QExplicitlySharedDataPointer<QQmlBinding> rightBinding;
+    QExplicitlySharedDataPointer<QQmlBinding> hCenterBinding;
+    QExplicitlySharedDataPointer<QQmlBinding> topBinding;
+    QExplicitlySharedDataPointer<QQmlBinding> bottomBinding;
+    QExplicitlySharedDataPointer<QQmlBinding> vCenterBinding;
+    QExplicitlySharedDataPointer<QQmlBinding> baselineBinding;
+
+    QQmlAbstractBinding::Ptr origLeftBinding;
+    QQmlAbstractBinding::Ptr origRightBinding;
+    QQmlAbstractBinding::Ptr origHCenterBinding;
+    QQmlAbstractBinding::Ptr origTopBinding;
+    QQmlAbstractBinding::Ptr origBottomBinding;
+    QQmlAbstractBinding::Ptr origVCenterBinding;
+    QQmlAbstractBinding::Ptr origBaselineBinding;
 
     QQuickAnchorLine rewindLeft;
     QQuickAnchorLine rewindRight;
@@ -831,8 +826,6 @@ public:
     qreal origX;
     qreal origY;
 
-    QList<QQmlAbstractBinding*> oldBindings;
-
     QQmlProperty leftProp;
     QQmlProperty rightProp;
     QQmlProperty hCenterProp;
@@ -849,29 +842,6 @@ QQuickAnchorChanges::QQuickAnchorChanges(QObject *parent)
 
 QQuickAnchorChanges::~QQuickAnchorChanges()
 {
-    /*
-        if the anchorchanges is active at destruction, any non-active orig
-        bindings need to be destroyed
-
-        the basic logic is that if both e.g. left and origLeft are present,
-        then we are active (otherwise left would have been destroyed), and
-        left is in use and origLeft needs to be cleaned up.
-    */
-    Q_D(QQuickAnchorChanges);
-    if (d->leftBinding && d->origLeftBinding)
-        d->origLeftBinding->destroy();
-    if (d->rightBinding && d->origRightBinding)
-        d->origRightBinding->destroy();
-    if (d->hCenterBinding && d->origHCenterBinding)
-        d->origHCenterBinding->destroy();
-    if (d->topBinding && d->origTopBinding)
-        d->origTopBinding->destroy();
-    if (d->bottomBinding && d->origBottomBinding)
-        d->origBottomBinding->destroy();
-    if (d->vCenterBinding && d->origVCenterBinding)
-        d->origVCenterBinding->destroy();
-    if (d->baselineBinding && d->origBaselineBinding)
-        d->origBaselineBinding->destroy();
 }
 
 QQuickAnchorChanges::ActionList QQuickAnchorChanges::actions()
@@ -969,6 +939,8 @@ void QQuickAnchorChanges::setObject(QQuickItem *target)
 
 void QQuickAnchorChanges::execute(Reason reason)
 {
+    Q_UNUSED(reason);
+
     Q_D(QQuickAnchorChanges);
     if (!d->target)
         return;
@@ -978,47 +950,37 @@ void QQuickAnchorChanges::execute(Reason reason)
     if (d->applyOrigLeft) {
         if (!d->origLeftBinding)
             targetPrivate->anchors()->resetLeft();
-        QQmlPropertyPrivate::setBinding(d->leftProp, d->origLeftBinding);
+        QQmlPropertyPrivate::setBinding(d->leftProp, d->origLeftBinding.data());
     }
     if (d->applyOrigRight) {
         if (!d->origRightBinding)
             targetPrivate->anchors()->resetRight();
-        QQmlPropertyPrivate::setBinding(d->rightProp, d->origRightBinding);
+        QQmlPropertyPrivate::setBinding(d->rightProp, d->origRightBinding.data());
     }
     if (d->applyOrigHCenter) {
         if (!d->origHCenterBinding)
             targetPrivate->anchors()->resetHorizontalCenter();
-        QQmlPropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding.data());
     }
     if (d->applyOrigTop) {
         if (!d->origTopBinding)
             targetPrivate->anchors()->resetTop();
-        QQmlPropertyPrivate::setBinding(d->topProp, d->origTopBinding);
+        QQmlPropertyPrivate::setBinding(d->topProp, d->origTopBinding.data());
     }
     if (d->applyOrigBottom) {
         if (!d->origBottomBinding)
             targetPrivate->anchors()->resetBottom();
-        QQmlPropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding);
+        QQmlPropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding.data());
     }
     if (d->applyOrigVCenter) {
         if (!d->origVCenterBinding)
             targetPrivate->anchors()->resetVerticalCenter();
-        QQmlPropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding.data());
     }
     if (d->applyOrigBaseline) {
         if (!d->origBaselineBinding)
             targetPrivate->anchors()->resetBaseline();
-        QQmlPropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding);
-    }
-
-    //destroy old bindings
-    if (reason == ActualChange) {
-        for (int i = 0; i < d->oldBindings.size(); ++i) {
-            QQmlAbstractBinding *binding = d->oldBindings.at(i);
-            if (binding)
-                binding->destroy();
-        }
-        d->oldBindings.clear();
+        QQmlPropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding.data());
     }
 
     //reset any anchors that have been specified as "undefined"
@@ -1053,19 +1015,19 @@ void QQuickAnchorChanges::execute(Reason reason)
 
     //set any anchors that have been specified
     if (d->leftBinding)
-        QQmlPropertyPrivate::setBinding(d->leftBinding);
+        QQmlPropertyPrivate::setBinding(d->leftBinding.data());
     if (d->rightBinding)
-        QQmlPropertyPrivate::setBinding(d->rightBinding);
+        QQmlPropertyPrivate::setBinding(d->rightBinding.data());
     if (d->hCenterBinding)
-        QQmlPropertyPrivate::setBinding(d->hCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->hCenterBinding.data());
     if (d->topBinding)
-        QQmlPropertyPrivate::setBinding(d->topBinding);
+        QQmlPropertyPrivate::setBinding(d->topBinding.data());
     if (d->bottomBinding)
-        QQmlPropertyPrivate::setBinding(d->bottomBinding);
+        QQmlPropertyPrivate::setBinding(d->bottomBinding.data());
     if (d->vCenterBinding)
-        QQmlPropertyPrivate::setBinding(d->vCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->vCenterBinding.data());
     if (d->baselineBinding)
-        QQmlPropertyPrivate::setBinding(d->baselineBinding);
+        QQmlPropertyPrivate::setBinding(d->baselineBinding.data());
 }
 
 bool QQuickAnchorChanges::isReversable()
@@ -1083,69 +1045,62 @@ void QQuickAnchorChanges::reverse(Reason reason)
     //reset any anchors set by the state
     if (d->leftBinding) {
         targetPrivate->anchors()->resetLeft();
-        QQmlPropertyPrivate::removeBinding(d->leftBinding);
-        if (reason == ActualChange) {
-            d->leftBinding->destroy(); d->leftBinding = 0;
-        }
+        QQmlPropertyPrivate::removeBinding(d->leftBinding.data());
+        if (reason == ActualChange)
+            d->leftBinding = 0;
     }
     if (d->rightBinding) {
         targetPrivate->anchors()->resetRight();
-        QQmlPropertyPrivate::removeBinding(d->rightBinding);
-        if (reason == ActualChange) {
-            d->rightBinding->destroy(); d->rightBinding = 0;
-        }
+        QQmlPropertyPrivate::removeBinding(d->rightBinding.data());
+        if (reason == ActualChange)
+            d->rightBinding = 0;
     }
     if (d->hCenterBinding) {
         targetPrivate->anchors()->resetHorizontalCenter();
-        QQmlPropertyPrivate::removeBinding(d->hCenterBinding);
-        if (reason == ActualChange) {
-            d->hCenterBinding->destroy(); d->hCenterBinding = 0;
-        }
+        QQmlPropertyPrivate::removeBinding(d->hCenterBinding.data());
+        if (reason == ActualChange)
+            d->hCenterBinding = 0;
     }
     if (d->topBinding) {
         targetPrivate->anchors()->resetTop();
-        QQmlPropertyPrivate::removeBinding(d->topBinding);
-        if (reason == ActualChange) {
-            d->topBinding->destroy(); d->topBinding = 0;
-        }
+        QQmlPropertyPrivate::removeBinding(d->topBinding.data());
+        if (reason == ActualChange)
+            d->topBinding = 0;
     }
     if (d->bottomBinding) {
         targetPrivate->anchors()->resetBottom();
-        QQmlPropertyPrivate::removeBinding(d->bottomBinding);
-        if (reason == ActualChange) {
-            d->bottomBinding->destroy(); d->bottomBinding = 0;
-        }
+        QQmlPropertyPrivate::removeBinding(d->bottomBinding.data());
+        if (reason == ActualChange)
+            d->bottomBinding = 0;
     }
     if (d->vCenterBinding) {
         targetPrivate->anchors()->resetVerticalCenter();
-        QQmlPropertyPrivate::removeBinding(d->vCenterBinding);
-        if (reason == ActualChange) {
-            d->vCenterBinding->destroy(); d->vCenterBinding = 0;
-        }
+        QQmlPropertyPrivate::removeBinding(d->vCenterBinding.data());
+        if (reason == ActualChange)
+            d->vCenterBinding = 0;
     }
     if (d->baselineBinding) {
         targetPrivate->anchors()->resetBaseline();
-        QQmlPropertyPrivate::removeBinding(d->baselineBinding);
-        if (reason == ActualChange) {
-            d->baselineBinding->destroy(); d->baselineBinding = 0;
-        }
+        QQmlPropertyPrivate::removeBinding(d->baselineBinding.data());
+        if (reason == ActualChange)
+            d->baselineBinding = 0;
     }
 
     //restore previous anchors
     if (d->origLeftBinding)
-        QQmlPropertyPrivate::setBinding(d->leftProp, d->origLeftBinding);
+        QQmlPropertyPrivate::setBinding(d->leftProp, d->origLeftBinding.data());
     if (d->origRightBinding)
-        QQmlPropertyPrivate::setBinding(d->rightProp, d->origRightBinding);
+        QQmlPropertyPrivate::setBinding(d->rightProp, d->origRightBinding.data());
     if (d->origHCenterBinding)
-        QQmlPropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding.data());
     if (d->origTopBinding)
-        QQmlPropertyPrivate::setBinding(d->topProp, d->origTopBinding);
+        QQmlPropertyPrivate::setBinding(d->topProp, d->origTopBinding.data());
     if (d->origBottomBinding)
-        QQmlPropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding);
+        QQmlPropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding.data());
     if (d->origVCenterBinding)
-        QQmlPropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding.data());
     if (d->origBaselineBinding)
-        QQmlPropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding);
+        QQmlPropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding.data());
 
     //restore any absolute geometry changed by the state's anchors
     QQuickAnchors::Anchors stateVAnchors = d->anchorSet->d_func()->usedAnchors & QQuickAnchors::Vertical_Mask;
@@ -1289,10 +1244,6 @@ void QQuickAnchorChanges::copyOriginals(QQuickStateActionEvent *other)
     d->origX = acp->origX;
     d->origY = acp->origY;
 
-    d->oldBindings.clear();
-    d->oldBindings << acp->leftBinding << acp->rightBinding << acp->hCenterBinding
-                << acp->topBinding << acp->bottomBinding << acp->vCenterBinding << acp->baselineBinding;
-
     //clear old values from other
     //### could this be generalized for all QQuickStateActionEvents, and called after copyOriginals?
     acp->leftBinding = 0;
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 707323f2e2..bb8b5250a0 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -464,10 +464,10 @@ QQuickPropertyChanges::ActionList QQuickPropertyChanges::actions()
                 // XXX TODO: add a static QQmlJavaScriptExpression::evaluate(QString)
                 // so that we can avoid creating then destroying the binding in this case.
                 a.toValue = newBinding->evaluate();
-                newBinding->destroy();
+                delete newBinding;
             } else {
                 newBinding->setTarget(prop);
-                a.toBinding = QQmlAbstractBinding::getPointer(newBinding);
+                a.toBinding = newBinding;
                 a.deletableToBinding = true;
             }
 
@@ -558,7 +558,7 @@ void QQuickPropertyChanges::changeValue(const QString &name, const QVariant &val
         if (entry.name == name) {
             expressionIterator.remove();
             if (state() && state()->isStateActive()) {
-                QQmlPropertyPrivate::removeBinding(d->property(name), QQmlPropertyPrivate::DestroyOldBinding);
+                QQmlPropertyPrivate::removeBinding(d->property(name));
                 d->property(name).write(value);
             }
 
@@ -656,10 +656,10 @@ void QQuickPropertyChanges::changeExpression(const QString &name, const QString
                 // XXX TODO: add a static QQmlJavaScriptExpression::evaluate(QString)
                 // so that we can avoid creating then destroying the binding in this case.
                 action.toValue = newBinding->evaluate();
-                newBinding->destroy();
+                delete newBinding;
             } else {
                 newBinding->setTarget(action.property);
-                action.toBinding = QQmlAbstractBinding::getPointer(newBinding);
+                action.toBinding = newBinding;
                 action.deletableToBinding = true;
 
                 state()->addEntryToRevertList(action);
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index 6c57bdc171..c018399396 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -157,11 +157,6 @@ QQuickState::~QQuickState()
     Q_D(QQuickState);
     if (d->group)
         d->group->removeState(this);
-
-    foreach (const QQuickSimpleAction &action, d->revertList) {
-        if (action.binding())
-            action.binding()->destroy();
-    }
 }
 
 /*!
@@ -362,7 +357,6 @@ void QQuickStateAction::deleteFromBinding()
 {
     if (fromBinding) {
         QQmlPropertyPrivate::removeBinding(property);
-        fromBinding->destroy();
         fromBinding = 0;
     }
 }
@@ -413,9 +407,6 @@ bool QQuickState::changeBindingInRevertList(QObject *target, const QString &name
         while (revertListIterator.hasNext()) {
             QQuickSimpleAction &simpleAction = revertListIterator.next();
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name) {
-                if (simpleAction.binding())
-                    simpleAction.binding()->destroy();
-
                 simpleAction.setBinding(binding);
                 return true;
             }
@@ -435,7 +426,7 @@ bool QQuickState::removeEntryFromRevertList(QObject *target, const QString &name
         while (revertListIterator.hasNext()) {
             QQuickSimpleAction &simpleAction = revertListIterator.next();
             if (simpleAction.property().object() == target && simpleAction.property().name() == name) {
-                QQmlPropertyPrivate::removeBinding(simpleAction.property(), QQmlPropertyPrivate::DestroyOldBinding);
+                QQmlPropertyPrivate::removeBinding(simpleAction.property());
 
                 simpleAction.property().write(simpleAction.value());
                 if (simpleAction.binding())
@@ -469,7 +460,7 @@ void QQuickState::removeAllEntriesFromRevertList(QObject *target)
          while (revertListIterator.hasNext()) {
              QQuickSimpleAction &simpleAction = revertListIterator.next();
              if (simpleAction.property().object() == target) {
-                 QQmlPropertyPrivate::removeBinding(simpleAction.property(), QQmlPropertyPrivate::DestroyOldBinding);
+                 QQmlPropertyPrivate::removeBinding(simpleAction.property());
 
                  simpleAction.property().write(simpleAction.value());
                  if (simpleAction.binding())
@@ -493,7 +484,7 @@ void QQuickState::addEntriesToRevertList(const QList<QQuickStateAction> &actionL
             const QQuickStateAction &action = actionListIterator.next();
             QQuickSimpleAction simpleAction(action);
             action.property.write(action.toValue);
-            if (!action.toBinding.isNull())
+            if (action.toBinding)
                 QQmlPropertyPrivate::setBinding(action.toBinding.data());
 
             simpleActionList.append(simpleAction);
@@ -608,7 +599,7 @@ void QQuickState::apply(QQuickTransition *trans, QQuickState *revert)
             for (int jj = 0; jj < d->revertList.count(); ++jj) {
                 if (d->revertList.at(jj).property() == action.property) {
                     found = true;
-                    if (d->revertList.at(jj).binding() != action.fromBinding) {
+                    if (d->revertList.at(jj).binding() != action.fromBinding.data()) {
                         action.deleteFromBinding();
                     }
                     break;
@@ -652,13 +643,13 @@ void QQuickState::apply(QQuickTransition *trans, QQuickState *revert)
         }
         if (!found) {
             QVariant cur = d->revertList.at(ii).property().read();
-            QQmlPropertyPrivate::removeBinding(d->revertList.at(ii).property(), QQmlPropertyPrivate::DestroyOldBinding);
+            QQmlPropertyPrivate::removeBinding(d->revertList.at(ii).property());
 
             QQuickStateAction a;
             a.property = d->revertList.at(ii).property();
             a.fromValue = cur;
             a.toValue = d->revertList.at(ii).value();
-            a.toBinding = QQmlAbstractBinding::getPointer(d->revertList.at(ii).binding());
+            a.toBinding = d->revertList.at(ii).binding();
             a.specifiedObject = d->revertList.at(ii).specifiedObject();
             a.specifiedProperty = d->revertList.at(ii).specifiedProperty();
             a.event = d->revertList.at(ii).event();
diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h
index 0c774635d8..26069caa34 100644
--- a/src/quick/util/qquickstate_p.h
+++ b/src/quick/util/qquickstate_p.h
@@ -39,13 +39,14 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qsharedpointer.h>
 #include <private/qtquickglobal_p.h>
+#include <private/qqmlabstractbinding_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickStateActionEvent;
-class QQmlAbstractBinding;
 class QQmlBinding;
 class QQmlExpression;
+
 class QQuickStateAction
 {
 public:
@@ -63,8 +64,8 @@ public:
     QVariant fromValue;
     QVariant toValue;
 
-    QQmlAbstractBinding *fromBinding;
-    QWeakPointer<QQmlAbstractBinding> toBinding;
+    QQmlAbstractBinding::Ptr fromBinding;
+    QQmlAbstractBinding::Ptr toBinding;
     QQuickStateActionEvent *event;
 
     //strictly for matching
diff --git a/src/quick/util/qquickstate_p_p.h b/src/quick/util/qquickstate_p_p.h
index fc589f0d2d..e6ecb424e5 100644
--- a/src/quick/util/qquickstate_p_p.h
+++ b/src/quick/util/qquickstate_p_p.h
@@ -71,7 +71,7 @@ public:
         if (state == StartState) {
             m_value = a.fromValue;
             if (QQmlPropertyPrivate::binding(m_property)) {
-                m_binding = QQmlAbstractBinding::getPointer(QQmlPropertyPrivate::binding(m_property));
+                m_binding = QQmlPropertyPrivate::binding(m_property);
             }
             m_reverseEvent = true;
         } else {
@@ -88,7 +88,7 @@ public:
     QQuickSimpleAction(const QQuickSimpleAction &other)
         :  m_property(other.m_property),
         m_value(other.m_value),
-        m_binding(QQmlAbstractBinding::getPointer(other.binding())),
+        m_binding(other.binding()),
         m_specifiedObject(other.m_specifiedObject),
         m_specifiedProperty(other.m_specifiedProperty),
         m_event(other.m_event),
@@ -100,7 +100,7 @@ public:
     {
         m_property = other.m_property;
         m_value = other.m_value;
-        m_binding = QQmlAbstractBinding::getPointer(other.binding());
+        m_binding = other.binding();
         m_specifiedObject = other.m_specifiedObject;
         m_specifiedProperty = other.m_specifiedProperty;
         m_event = other.m_event;
@@ -131,7 +131,7 @@ public:
 
     void setBinding(QQmlAbstractBinding *binding)
     {
-        m_binding = QQmlAbstractBinding::getPointer(binding);
+        m_binding = binding;
     }
 
     QQmlAbstractBinding *binding() const
@@ -162,7 +162,7 @@ public:
 private:
     QQmlProperty m_property;
     QVariant m_value;
-    QQmlAbstractBinding::Pointer m_binding;
+    QQmlAbstractBinding::Ptr m_binding;
     QObject *m_specifiedObject;
     QString m_specifiedProperty;
     QQuickStateActionEvent *m_event;
diff --git a/src/quick/util/qquicktransitionmanager.cpp b/src/quick/util/qquicktransitionmanager.cpp
index ac57ac20a4..14480ac1bf 100644
--- a/src/quick/util/qquicktransitionmanager.cpp
+++ b/src/quick/util/qquicktransitionmanager.cpp
@@ -101,7 +101,7 @@ void QQuickTransitionManager::complete()
 void QQuickTransitionManagerPrivate::applyBindings()
 {
     foreach(const QQuickStateAction &action, bindingsList) {
-        if (!action.toBinding.isNull()) {
+        if (action.toBinding) {
             QQmlPropertyPrivate::setBinding(action.toBinding.data());
         } else if (action.event) {
             if (action.reverseEvent)
@@ -155,7 +155,7 @@ void QQuickTransitionManager::transition(const QList<QQuickStateAction> &list,
         // Apply all the property and binding changes
         for (int ii = 0; ii < applyList.size(); ++ii) {
             const QQuickStateAction &action = applyList.at(ii);
-            if (!action.toBinding.isNull()) {
+            if (action.toBinding) {
                 QQmlPropertyPrivate::setBinding(action.toBinding.data(), QQmlPropertyPrivate::None, QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
             } else if (!action.event) {
                 QQmlPropertyPrivate::write(action.property, action.toValue, QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
@@ -175,7 +175,7 @@ void QQuickTransitionManager::transition(const QList<QQuickStateAction> &list,
                 continue;
             }
             const QQmlProperty &prop = action->property;
-            if (!action->toBinding.isNull() || !action->toValue.isValid()) {
+            if (action->toBinding || !action->toValue.isValid()) {
                 action->toValue = prop.read();
             }
         }
@@ -269,10 +269,9 @@ void QQuickTransitionManager::cancel()
 
     for(int i = 0; i < d->bindingsList.count(); ++i) {
         QQuickStateAction action = d->bindingsList[i];
-        if (!action.toBinding.isNull() && action.deletableToBinding) {
+        if (action.toBinding && action.deletableToBinding) {
             QQmlPropertyPrivate::removeBinding(action.property);
-            action.toBinding.data()->destroy();
-            action.toBinding.clear();
+            action.toBinding = 0;
             action.deletableToBinding = false;
         } else if (action.event) {
             //### what do we do here?