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

QmlDesigner: fixes crash

Browse Source 
See Bauhaus-584
There were some locks missing during setup

Reviewed-by: Kai Koehne
This commit is contained in:
Thomas Hartmann
2010-04-14 14:17:15 +02:00
parent 02250e1313
commit f612192464
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
View File

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