Merge remote-tracking branch 'origin/3.5'

Change-Id: I889b93611d1762121548fb71d1d3493e4adba313
2015-09-25 10:35:42 +02:00
parent a5952658b2 f229f0dbe5
commit 0ba4781bfc
17 changed files with 164 additions and 45 deletions
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
@@ -303,8 +303,10 @@ void QmlProfilerModelManager::acquiringDone()
 void QmlProfilerModelManager::processingDone()
 {
    QTC_ASSERT(state() == ProcessingData, /**/);
-    d->notesModel->loadData();
+    // Load notes after the timeline models have been initialized ...
+    // which happens on stateChanged(Done).
    setState(Done);
+    d->notesModel->loadData();
    emit loadFinished();
 }