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

Merge remote-tracking branch 'origin/4.3' into 4.4

Browse Source 
Change-Id: Ifb1dcc847ba4b32a79b349955fad5207e402cb7b
This commit is contained in:
Eike Ziller
2017-07-12 10:50:49 +02:00
parent cdca4bd9df ada1429594
commit 5a1a20f2ee
8 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmljseditor/qmljsoutline.cpp
View File

@@ -125,12 +125,12 @@ void QmlJSOutlineWidget::setEditor(QmlJSEditorWidget *editor)
m_filterModel->setSourceModel(m_editor->qmlJsEditorDocument()->outlineModel());
m_treeView->expandAll();
connect(m_editor->qmlJsEditorDocument()->outlineModel(), &QAbstractItemModel::modelAboutToBeReset, [this]() {
if (m_treeView && m_treeView->selectionModel())
connect(m_editor->qmlJsEditorDocument()->outlineModel(), &QAbstractItemModel::modelAboutToBeReset, m_treeView, [this]() {
if (m_treeView->selectionModel())
m_treeView->selectionModel()->blockSignals(true);
});
connect(m_editor->qmlJsEditorDocument()->outlineModel(), &QAbstractItemModel::modelReset, [this]() {
if (m_treeView && m_treeView->selectionModel())
connect(m_editor->qmlJsEditorDocument()->outlineModel(), &QAbstractItemModel::modelReset, m_treeView, [this]() {
if (m_treeView->selectionModel())
m_treeView->selectionModel()->blockSignals(false);
});