Commit f6121924 authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

QmlDesigner: fixes crash

See Bauhaus-584
There were some locks missing during setup

Reviewed-by: Kai Koehne
parent 02250e13
......@@ -671,6 +671,8 @@ void PropertyEditor::resetView()
if (m_collapseButton->isCollapsed())
return;
m_locked = true;
if (debug)
qDebug() << "________________ RELOADING PROPERTY EDITOR QML _______________________";
......@@ -686,8 +688,6 @@ void PropertyEditor::resetView()
if (m_selectedNode.isValid())
qmlSpecificsFile = fileToUrl(locateQmlFile(m_selectedNode.type() + "Specifics.qml"));
m_locked = true;
QString specificQmlData;
if (m_selectedNode.isValid() && !QFileInfo(qmlSpecificsFile.toLocalFile()).exists() && m_selectedNode.metaInfo().isValid()) {
......@@ -778,11 +778,15 @@ void PropertyEditor::modelAttached(Model *model)
if (debug)
qDebug() << Q_FUNC_INFO;
m_locked = true;
setupPane("Qt/Rectangle");
setupPane("Qt/Text");
setupPane("Qt/TextInput");
setupPane("Qt/TextEdit");
resetView();
m_locked = false;
}
void PropertyEditor::modelAboutToBeDetached(Model *model)
......
Supports Markdown
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