From bd659b2b992d17ed374dba12ed18ed9cb4f716d1 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 28 May 2018 14:15:51 +0200
Subject: [PATCH] QmlProfiler: Clear the model manager before deleting it

We cannot have the model manager clear itself from the dtor, as the
order of deletion between the various other objects parented to the tool
is undefined. Make sure we get into a clean state before the model
manager disappears.

This fixes the soft asserts when the tests shut down.

Change-Id: I8fcd52a7c2d0703cbdd215d85aa1d80c2e3296a3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/qmlprofiler/qmlprofilertool.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index 1dad4de1eee..750eabc9f36 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -320,6 +320,7 @@ QmlProfilerTool::QmlProfilerTool()
 
 QmlProfilerTool::~QmlProfilerTool()
 {
+    d->m_profilerModelManager->clearAll();
     delete d;
 }