Commit 02eba4fb authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

QmlDesigner.toolbar: avoid issues during setup

parent 2a90e47c
...@@ -77,6 +77,8 @@ void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document: ...@@ -77,6 +77,8 @@ void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document:
if (update && editor != m_editor) if (update && editor != m_editor)
return; //do not update for different editor return; //do not update for different editor
m_blockWriting = true;
LookupContext::Ptr lookupContext = LookupContext::create(doc, snapshot, QList<Node*>()); LookupContext::Ptr lookupContext = LookupContext::create(doc, snapshot, QList<Node*>());
const Interpreter::ObjectValue *scopeObject = doc->bind()->findQmlObject(node); const Interpreter::ObjectValue *scopeObject = doc->bind()->findQmlObject(node);
...@@ -148,11 +150,8 @@ void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document: ...@@ -148,11 +150,8 @@ void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document:
contextWidget()->activate(p3 , p1, p2); contextWidget()->activate(p3 , p1, p2);
else else
contextWidget()->rePosition(p3 , p1, p2); contextWidget()->rePosition(p3 , p1, p2);
m_blockWriting = true;
contextWidget()->setPath(doc->path()); contextWidget()->setPath(doc->path());
contextWidget()->setProperties(&propertyReader); contextWidget()->setProperties(&propertyReader);
m_blockWriting = false;
m_doc = doc; m_doc = doc;
m_node = node; m_node = node;
} else { } else {
...@@ -166,6 +165,8 @@ void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document: ...@@ -166,6 +165,8 @@ void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document:
contextWidget()->colorDialog()->hide(); contextWidget()->colorDialog()->hide();
} }
m_blockWriting = false;
} }
void QmlContextPane::setProperty(const QString &propertyName, const QVariant &value) void QmlContextPane::setProperty(const QString &propertyName, const QVariant &value)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment