Transition: properly remove QPropery based bindings

We need to use QQmlAnyBinding::removeBindingFrom instead of the
functionality in QQmlPropertyPrivate, as the latter does not correctly
handle QProperty based bindings.

Fixes: QTBUG-105535
Change-Id: Ifcd8d3a97ff6d62b365008768e6bf50cfa102a39
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit af5f853413c633c665696dc176677fdde196dd01)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/quick/util/qquicktransitionmanager.cpp b/src/quick/util/qquicktransitionmanager.cpp
index 6784ad83d6..854b7d83d7 100644
--- a/src/quick/util/qquicktransitionmanager.cpp
+++ b/src/quick/util/qquicktransitionmanager.cpp
@@ -140,8 +140,10 @@ void QQuickTransitionManager::transition(const QList<QQuickStateAction> &list,
     for (const QQuickStateAction &action : qAsConst(applyList)) {
         if (action.toBinding)
             d->bindingsList << action;
-        if (action.fromBinding)
-            QQmlPropertyPrivate::removeBinding(action.property); // Disable current binding
+        if (action.fromBinding) {
+            auto property = action.property;
+            QQmlAnyBinding::removeBindingFrom(property); // Disable current binding
+        }
         if (action.event && action.event->changesBindings()) {  //### assume isReversable()?
             d->bindingsList << action;
             action.event->clearBindings();
@@ -194,8 +196,10 @@ void QQuickTransitionManager::transition(const QList<QQuickStateAction> &list,
                 continue;
             }
 
-            if (action.toBinding)
-                QQmlPropertyPrivate::removeBinding(action.property); // Make sure this is disabled during the transition
+            if (action.toBinding) {
+                auto property = action.property;
+                QQmlAnyBinding::removeBindingFrom(property); // Make sure this is disabled during the transition
+            }
 
             QQmlPropertyPrivate::write(action.property, action.fromValue, QQmlPropertyData::BypassInterceptor | QQmlPropertyData::DontRemoveBinding);
         }
@@ -262,7 +266,8 @@ void QQuickTransitionManager::cancel()
 
     for (const QQuickStateAction &action : qAsConst(d->bindingsList)) {
         if (action.toBinding && action.deletableToBinding) {
-            QQmlPropertyPrivate::removeBinding(action.property);
+            auto property = action.property;
+            QQmlAnyBinding::removeBindingFrom(property);
         } else if (action.event) {
             //### what do we do here?
         }