From cb0e37128b5652cbbca413341858dfcc411b397d Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 26 Aug 2013 12:06:04 +0200 Subject: [PATCH] QmlDesigner.QmlPuppet: fix for bindings and alias properties For alias properties a binding to the original property was not properly enabled. This means that if bindings were reseted the original value from the binding was overwriting any change to this property. Solution: We disable the binding of the alias property manually using the hash from resetBinding(). Task-number: QTCREATORBUG-9582 Change-Id: I7a891bbdd06154de8a4e1ff2d3c0939d4e8b4010 Reviewed-by: Marco Bubke --- .../qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp index 561fd77eb35..7da7543d576 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp @@ -453,6 +453,7 @@ void ObjectNodeInstance::setPropertyVariant(const PropertyName &name, const QVar if (hasValidResetBinding(name)) { QDeclarativePropertyPrivate::setBinding(property, 0, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding); + resetBinding(name)->setEnabled(false); } bool isWritten = property.write(convertSpecialCharacter(fixedValue));