diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-17 14:20:24 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-17 12:52:43 +0000 |
| commit | 66774a8bdb64d428b7ff3b1bcbbd4d5ffe33bd36 (patch) | |
| tree | 56e1fcc80d79b6f48073c0d3e03eb00a1bfa150d | |
| parent | e69bb933e359432cc2c8c703a7c00eb27daf29f5 (diff) | |
| download | qt-creator-66774a8bdb64d428b7ff3b1bcbbd4d5ffe33bd36.tar.gz | |
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 <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | 5 |
1 files 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. |