summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2012-03-16 11:30:58 +0100
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2012-03-16 11:50:53 +0100
commit86487d825035e55c6ef31e5f38acd53bc3428511 (patch)
tree403c318ba5f010f0a261681fe9b026ddd391a687 /src/plugins/qmldesigner
parent72e303862983d51ffd25fa454351c5e005514153 (diff)
downloadqt-creator-86487d825035e55c6ef31e5f38acd53bc3428511.tar.gz
QmlDesigner: crash fix
It was a very stupid idea to call QApplication::processEvents(); here to avoid hickups. The processEvents() forces the whole designDocumentController managment to be be reentrant which it clearly is not (and should not be). The reason is simply that resetView is called from there. Adding a "flag" for the processEvents is also not a reasonable option. This was just very bad style. So I remove it. Task-number: QTCREATORBUG-7120 Change-Id: I111cf9421f63b9ce44488f0d274624ff48777cef Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/plugins/qmldesigner')
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index a4c235aa6b..530a2d951b 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -224,7 +224,6 @@ void PropertyEditor::NodeType::setup(const QmlObjectNode &fxObjectNode, const QS
m_contextObject->setSpecificsUrl(qmlSpecificsFile);
m_contextObject->setStateName(stateName);
- QApplication::processEvents();
if (!fxObjectNode.isValid())
return;
ctxt->setContextProperty("propertyCount", QVariant(fxObjectNode.modelNode().properties().count()));