From 66774a8bdb64d428b7ff3b1bcbbd4d5ffe33bd36 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 17 Sep 2015 14:20:24 +0200 Subject: QmlProfiler: Load notes after timeline models are finished Otherwise the notes cannot be associated with timeline events. Change-Id: I9a2f039fddd36c9a6bbaca3c0864c75e33cc479d Task-number: QTCREATORBUG-15077 Reviewed-by: Joerg Bornemann --- src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index 8b5f0b6ebf..759233ce6b 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -320,9 +320,10 @@ void QmlProfilerModelManager::complete() { switch (state()) { case QmlProfilerDataState::ProcessingData: - // Load notes after the timeline models have been initialized. - d->notesModel->loadData(); + // Load notes after the timeline models have been initialized ... + // which happens on stateChanged(Done). setState(QmlProfilerDataState::Done); + d->notesModel->loadData(); break; case QmlProfilerDataState::AcquiringData: // Make sure the trace fits into the time span. -- cgit v1.2.1