summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprofiler
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-05-28 14:15:51 +0200
committerUlf Hermann <ulf.hermann@qt.io>2018-05-28 12:54:39 +0000
commitbd659b2b992d17ed374dba12ed18ed9cb4f716d1 (patch)
tree86916c68efbe49b871ee3acde8d1be578484f177 /src/plugins/qmlprofiler
parent491b057d14997c4133dfb2721b082e2fdbdea210 (diff)
downloadqt-creator-bd659b2b992d17ed374dba12ed18ed9cb4f716d1.tar.gz
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>
Diffstat (limited to 'src/plugins/qmlprofiler')
-rw-r--r--src/plugins/qmlprofiler/qmlprofilertool.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index 1dad4de1ee..750eabc9f3 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;
}