feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.model: bugfix for states

Browse Source 
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
This commit is contained in:
Thomas Hartmann
2011-03-04 14:09:59 +01:00
parent 00df3b718e
commit 14b251eda0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
View File

@@ -115,10 +115,13 @@ static ModelNode resolveBinding(const QString &binding, ModelNode currentNode, A
else else
return ModelNode(); //binding not valid return ModelNode(); //binding not valid
} else if (currentNode.hasProperty(element)) { } else if (currentNode.hasProperty(element)) {
if (currentNode.property(element).isNodeProperty()) if (currentNode.property(element).isNodeProperty()) {
currentNode = currentNode.nodeProperty(element).modelNode(); currentNode = currentNode.nodeProperty(element).modelNode();
else } else {
currentNode = view->modelNodeForId(element); //id
if (!currentNode.isValid())
return ModelNode(); //binding not valid return ModelNode(); //binding not valid
}
} else { } else {
currentNode = view->modelNodeForId(element); //id currentNode = view->modelNodeForId(element); //id
} }