From 0683281b7b2552f0dc1351fc84f122d403293abe Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 29 Mar 2017 16:55:48 +0200
Subject: [PATCH] QmlProfiler: Load notes data only after models are available
Change-Id: I1ee13c842a07962d9aec93aaab6959614d7d8a08
Task-number: QTCREATORBUG-17936
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | 1 -
src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
index 4edfad3ee45..dc08e78b635 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
@@ -511,7 +511,6 @@ void QmlProfilerModelManager::processingDone()
++d->numFinishedFinalizers;
}
- d->notesModel->loadData();
setState(Done);
}
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
index c8b9b3ec5f3..22fad39df91 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
@@ -108,6 +108,7 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag
case QmlProfilerModelManager::Empty:
d->m_modelProxy->setModels(d->m_suspendedModels);
d->m_suspendedModels.clear();
+ d->m_modelManager->notesModel()->loadData();
break;
case QmlProfilerModelManager::ProcessingData:
break;
--
GitLab