From 14b251eda064ff23d87065cd32b5a76c7aa5fb92 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 4 Mar 2011 14:09:59 +0100 Subject: [PATCH] QmlDesigner.model: bugfix for states Ids can have the same name as a property. We did not take care of this case. See task for details. Task-number: QTCREATORBUG-3699 --- .../qmldesigner/designercore/model/bindingproperty.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp index 16ab7b0afe9..f6a1478f704 100644 --- a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp @@ -115,10 +115,13 @@ static ModelNode resolveBinding(const QString &binding, ModelNode currentNode, A else return ModelNode(); //binding not valid } else if (currentNode.hasProperty(element)) { - if (currentNode.property(element).isNodeProperty()) + if (currentNode.property(element).isNodeProperty()) { currentNode = currentNode.nodeProperty(element).modelNode(); - else - return ModelNode(); //binding not valid + } else { + currentNode = view->modelNodeForId(element); //id + if (!currentNode.isValid()) + return ModelNode(); //binding not valid + } } else { currentNode = view->modelNodeForId(element); //id }