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

QmlDesigner: Fix crash for in document handling

Browse Source 
Detach rewriter for document switching.

Change-Id: I4cc710990d01b30da25609961b81b07e785a26eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-02-04 15:03:46 +01:00
parent 78076ed8f2
commit dc2b0c490f
3 changed files with 10 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -284,10 +284,10 @@ void QmlDesignerPlugin::activateAutoSynchronization()
// text editor -> visual editor
if (!currentDesignDocument()->isDocumentLoaded()) {
currentDesignDocument()->loadDocument(currentDesignDocument()->plainTextEdit());
} else {
currentDesignDocument()->activateCurrentModel();
}
currentDesignDocument()->activateDocumentModel();
resetModelSelection();
@@ -298,6 +298,7 @@ void QmlDesignerPlugin::activateAutoSynchronization()
selectModelNodeUnderTextCursor();
m_mainWidget->enableWidgets();
} else {
viewManager().detachRewriterView();
m_mainWidget->disableWidgets();
m_mainWidget->showErrorMessage(errors);
}
@@ -314,6 +315,8 @@ void QmlDesignerPlugin::deactivateAutoSynchronization()
{
viewManager().detachViewsExceptRewriterAndComponetView();
viewManager().detachComponentView();
viewManager().detachRewriterView();
documentManager().currentDesignDocument()->resetToDocumentModel();
disconnect(currentDesignDocument()->rewriterView(),
SIGNAL(errorsChanged(QList<RewriterView::Error>)),