aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-03-29 16:55:48 +0200
committerUlf Hermann <ulf.hermann@qt.io>2017-03-29 15:05:59 +0000
commit0683281b7b2552f0dc1351fc84f122d403293abe (patch)
tree4d0a7e0472f2c2c67cb6f3ee783ab6b86a4b7fee
parent68ac850fe674549b171c57ca1ba6d492c6deb556 (diff)
QmlProfiler: Load notes data only after models are availablev4.3.0-beta1
Change-Id: I1ee13c842a07962d9aec93aaab6959614d7d8a08 Task-number: QTCREATORBUG-17936 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp1
-rw-r--r--src/plugins/qmlprofiler/qmlprofilertraceview.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
index 4edfad3ee4..dc08e78b63 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 c8b9b3ec5f..22fad39df9 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;