From 94356a07dda16d0a0b22730b244d999762f280a3 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Mon, 10 May 2010 21:23:25 +0200
Subject: [PATCH] Set a binding in states to zero if the target object is zero
If there is no target anymore you cannot create a new binding. There is
no need anyway so the binding is reset to zero.
Task-Number: BAUHAUS-642
Reviewed-by: kkoehne
---
.../qmlpropertychangesnodeinstance.cpp | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/instances/qmlpropertychangesnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmlpropertychangesnodeinstance.cpp
index ea2ea618217..d08891cdefc 100644
--- a/src/plugins/qmldesigner/designercore/instances/qmlpropertychangesnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/qmlpropertychangesnodeinstance.cpp
@@ -60,12 +60,16 @@ QDeclarativeStateOperation::ActionList QmlPropertyChangesObject::actions()
action.fromValue = action.property.read();
if (m_expressionHash.contains(action.specifiedProperty)) {
if(m_expressionHash[action.specifiedProperty].second.isNull()) {
- QDeclarativeBinding *binding = new QDeclarativeBinding(m_expressionHash[action.specifiedProperty].first, targetObject(), QDeclarativeEngine::contextForObject(targetObject()), this);
- binding->setTarget(action.property);
- binding->setNotifyOnValueChanged(true);
- action.toBinding = binding;
- action.toValue = binding->evaluate();
- m_expressionHash.insert(action.specifiedProperty, ExpressionPair(m_expressionHash[action.specifiedProperty].first, binding));
+ if (targetObject()) {
+ QDeclarativeBinding *binding = new QDeclarativeBinding(m_expressionHash[action.specifiedProperty].first, targetObject(), QDeclarativeEngine::contextForObject(targetObject()), this);
+ binding->setTarget(action.property);
+ binding->setNotifyOnValueChanged(true);
+ action.toBinding = binding;
+ action.toValue = binding->evaluate();
+ m_expressionHash.insert(action.specifiedProperty, ExpressionPair(m_expressionHash[action.specifiedProperty].first, binding));
+ } else {
+ action.toBinding = 0;
+ }
} else {
action.toBinding = m_expressionHash[action.specifiedProperty].second.data();
action.toValue = m_expressionHash[action.specifiedProperty].second->evaluate();
@@ -92,9 +96,10 @@ void QmlPropertyChangesObject::setTargetObject(QObject *object)
if (isActive()) {
QDeclarativePropertyPrivate::setBinding(qmlAction.property, 0, QDeclarativePropertyPrivate::DontRemoveBinding| QDeclarativePropertyPrivate::BypassInterceptor);
qmlAction.property.write(qmlAction.fromValue);
+ m_expressionHash[qmlAction.specifiedProperty].second.data()->destroy();
}
- m_expressionHash[qmlAction.specifiedProperty].second.data()->destroy();
+
qmlAction.toBinding = 0;
}
--
GitLab