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

1 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
index 16ab7b0afe..f6a1478f70 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
         }