Merge "Merge remote-tracking branch 'origin/11.0'"

src/plugins/autotest/qtest/qttestvisitors.h

@@ -34,7 +34,7 @@ public:
 private:
     CppEditor::SymbolFinder m_symbolFinder;
     QString m_className;
-    const CPlusPlus::Snapshot &m_snapshot;
+    CPlusPlus::Snapshot m_snapshot;
     QMap<QString, QtTestCodeLocationAndType> m_privSlots;
     bool m_valid = false;
     bool m_inherited = false;

src/plugins/autotest/testcodeparser.cpp

@@ -93,7 +93,7 @@ void TestCodeParser::syncTestFrameworks(const QList<ITestParser *> &parsers)
 {
     if (m_parserState != Idle) {
         // there's a running parse
-        m_postponedUpdateType = UpdateType::NoUpdate;
+        m_postponedUpdateType = UpdateType::FullUpdate;
         m_postponedFiles.clear();
         ProgressManager::cancelTasks(Constants::TASK_PARSE);
     }

src/plugins/autotest/testprojectsettings.cpp

@@ -4,7 +4,9 @@
 #include "testprojectsettings.h"
 
 #include "autotestconstants.h"
+#include "testcodeparser.h"
 #include "testframeworkmanager.h"
+#include "testtreemodel.h"
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>
@@ -49,7 +51,9 @@ void TestProjectSettings::activateFramework(const Id &id, bool activate)
 {
     ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
     m_activeTestFrameworks[framework] = activate;
-    if (!activate)
+    if (TestTreeModel::instance()->parser()->isParsing())
+        framework->rootNode()->markForRemoval(!activate);
+    else if (!activate)
         framework->resetRootNode();
 }
 

src/plugins/autotest/testtreeitem.cpp

@@ -214,12 +214,16 @@ bool TestTreeItem::modifyLineAndColumn(const TestParseResult *result)
 
 void TestTreeItem::markForRemoval(bool mark)
 {
-    m_status = mark ? MarkedForRemoval : Cleared;
+    if (type() == Root)
+        m_status = mark ? ForcedRootRemoval : NewlyAdded;
+    else
+        m_status = mark ? MarkedForRemoval : Cleared;
 }
 
 void TestTreeItem::markForRemovalRecursively(bool mark)
 {
-    markForRemoval(mark);
+    if (type() != Root)
+        markForRemoval(mark);
     for (int row = 0, count = childCount(); row < count; ++row)
         childItem(row)->markForRemovalRecursively(mark);
 }
@@ -231,7 +235,8 @@ void TestTreeItem::markForRemovalRecursively(const QSet<FilePath> &filePaths)
         child->markForRemovalRecursively(filePaths);
         mark &= child->markedForRemoval();
     });
-    markForRemoval(mark);
+    if (type() != Root)
+        markForRemoval(mark);
 }
 
 TestTreeItem *TestTreeItem::childItem(int at) const

src/plugins/autotest/testtreeitem.h

@@ -167,6 +167,7 @@ private:
     {
         NewlyAdded,
         MarkedForRemoval,
+        ForcedRootRemoval,      // only valid on rootNode
         Cleared
     };
 

src/plugins/autotest/testtreemodel.cpp

@@ -485,6 +485,10 @@ void TestTreeModel::markForRemoval(const QSet<Utils::FilePath> &filePaths)
 void TestTreeModel::sweep()
 {
     for (TestTreeItem *frameworkRoot : frameworkRootNodes()) {
+        if (frameworkRoot->m_status == TestTreeItem::ForcedRootRemoval) {
+            frameworkRoot->framework()->resetRootNode();
+            continue;
+        }
         sweepChildren(frameworkRoot);
         revalidateCheckState(frameworkRoot);
     }