AutoTest: Move TestCodeParser and TestTreeModel ownership to plugin pimpl

Change-Id: I01b32aae894a4b419c8a067f604d5f04a2b14dfe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 12 insertions, 1 deletions

diff --git a/src/plugins/autotest/itestframework.h b/src/plugins/autotest/itestframework.h
index bc3e5cb386..8d81b28289 100644
--- a/src/plugins/autotest/itestframework.h
+++ b/src/plugins/autotest/itestframework.h
@@ -38,7 +38,6 @@ public:
     explicit ITestFramework(bool activeByDefault) : m_active(activeByDefault) {}
     virtual ~ITestFramework()
     {
-        delete m_rootNode;
         delete m_testParser;
     }
 
@@ -50,6 +49,7 @@ public:
     TestTreeItem *rootNode()
     {   if (!m_rootNode)
             m_rootNode = createRootNode();
+        // These are stored in the TestTreeModel and destroyed on shutdown there.
         return m_rootNode;
     }
 
@@ -70,6 +70,17 @@ public:
     void setGrouping(bool group) { m_grouping = group; }
     // framework specific tool tip to be displayed on the general settings page
     virtual QString groupingToolTip() const { return QString(); }
+
+    void resetRootNode()
+    {
+        if (!m_rootNode)
+            return;
+        if (m_rootNode->model())
+            static_cast<TestTreeModel *>(m_rootNode->model())->takeItem(m_rootNode);
+        delete m_rootNode;
+        m_rootNode = nullptr;
+    }
+
 protected:
     virtual ITestParser *createTestParser() = 0;
     virtual TestTreeItem *createRootNode() const = 0;