1 files changed, 6 insertions, 21 deletions
diff --git a/plugins/autotest/testnavigationwidget.cpp b/plugins/autotest/testnavigationwidget.cpp
index 0f1fca7a41..8338455623 100644
--- a/plugins/autotest/testnavigationwidget.cpp
+++ b/plugins/autotest/testnavigationwidget.cpp
@@ -26,12 +26,8 @@
 #include "testtreeitem.h"
 
 #include <coreplugin/find/itemviewfind.h>
-#include <projectexplorer/session.h>
-#include <cpptools/cppmodelmanager.h>
-#include <qmljstools/qmljsmodelmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
-#include <projectexplorer/project.h>
 #include <texteditor/texteditor.h>
 
 #include <QToolButton>
@@ -58,26 +54,14 @@ TestNavigationWidget::TestNavigationWidget(QWidget *parent) :
     layout->addWidget(Core::ItemViewFind::createSearchableWrapper(m_view));
     setLayout(layout);
 
-    TestCodeParser *parser = m_model->parser();
-    ProjectExplorer::SessionManager *sm = ProjectExplorer::SessionManager::instance();
-    connect(sm, &ProjectExplorer::SessionManager::startupProjectChanged,
-            parser, &TestCodeParser::emitUpdateTestTree);
-
-    CppTools::CppModelManager *cppMM = CppTools::CppModelManager::instance();
-    connect(cppMM, &CppTools::CppModelManager::documentUpdated,
-            parser, &TestCodeParser::onCppDocumentUpdated, Qt::QueuedConnection);
-    connect(cppMM, &CppTools::CppModelManager::aboutToRemoveFiles,
-            parser, &TestCodeParser::removeFiles, Qt::QueuedConnection);
-
-    QmlJS::ModelManagerInterface *qmlJsMM = QmlJSTools::Internal::ModelManager::instance();
-    connect(qmlJsMM, &QmlJS::ModelManagerInterface::documentUpdated,
-            parser, &TestCodeParser::onQmlDocumentUpdated, Qt::QueuedConnection);
-    connect(qmlJsMM, &QmlJS::ModelManagerInterface::aboutToRemoveFiles,
-            parser, &TestCodeParser::removeFiles, Qt::QueuedConnection);
-
     connect(m_view, &TestTreeView::activated, this, &TestNavigationWidget::onItemActivated);
 }
 
+TestNavigationWidget::~TestNavigationWidget()
+{
+    m_model->disableParsing();
+}
+
 void TestNavigationWidget::contextMenuEvent(QContextMenuEvent *event)
 {
     const bool enabled = !TestRunner::instance()->isTestRunning();
@@ -223,6 +207,7 @@ Core::NavigationView TestNavigationWidgetFactory::createWidget()
     Core::NavigationView view;
     view.widget = treeViewWidget;
     view.dockToolBarWidgets = treeViewWidget->createToolButtons();
+    TestTreeModel::instance()->enableParsing();
     return view;
 }