From f9fdb8a9a48b22afeaedb6ea4e032745da359704 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 21 Mar 2011 12:23:05 +0100 Subject: [PATCH] QmlDesigner.propertyEditor: bugfix Lock setting of properties during notification. --- .../qmldesigner/components/propertyeditor/propertyeditor.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp index 9e35e405ed..8f215a2862 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp @@ -532,6 +532,8 @@ void PropertyEditor::otherPropertyChanged(const QmlObjectNode &fxObjectNode, con if (!m_selectedNode.isValid()) return; + m_locked = true; + if (fxObjectNode.isValid() && m_currentType && fxObjectNode == m_selectedNode && fxObjectNode.currentState().isValid()) { AbstractProperty property = fxObjectNode.modelNode().property(propertyName); if (fxObjectNode == m_selectedNode || QmlObjectNode(m_selectedNode).propertyChangeForCurrentState() == fxObjectNode) { @@ -541,6 +543,8 @@ void PropertyEditor::otherPropertyChanged(const QmlObjectNode &fxObjectNode, con setValue(m_selectedNode, property.name(), QmlObjectNode(m_selectedNode).modelValue(property.name())); } } + + m_locked = false; } void PropertyEditor::transformChanged(const QmlObjectNode &fxObjectNode, const QString &propertyName) @@ -837,8 +841,10 @@ void PropertyEditor::instanceInformationsChange(const QVector &nodeLi if (!m_selectedNode.isValid()) return; + m_locked = true; if (nodeList.contains(m_selectedNode)) m_currentType->m_backendAnchorBinding.setup(QmlItemNode(m_selectedNode)); + m_locked = false; } void PropertyEditor::nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) -- 2.11.0