Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp

Change-Id: I26d6435a29cac3840bb567ade5149c2562a94bf9

1 files changed, 6 insertions, 2 deletions

diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
index a587188630..425543d27a 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
@@ -434,20 +434,24 @@ void QQmlProfilerServiceImpl::messageReceived(const QByteArray &message)
 void QQmlProfilerServiceImpl::flush()
 {
     QMutexLocker lock(&m_configMutex);
+    QList<QQmlAbstractProfilerAdapter *> reporting;
 
     foreach (QQmlAbstractProfilerAdapter *profiler, m_engineProfilers) {
         if (profiler->isRunning()) {
             m_startTimes.insert(-1, profiler);
-            profiler->reportData(m_useMessageTypes);
+            reporting.append(profiler);
         }
     }
 
     foreach (QQmlAbstractProfilerAdapter *profiler, m_globalProfilers) {
         if (profiler->isRunning()) {
             m_startTimes.insert(-1, profiler);
-            profiler->reportData(m_useMessageTypes);
+            reporting.append(profiler);
         }
     }
+
+    foreach (QQmlAbstractProfilerAdapter *profiler, reporting)
+        profiler->reportData(m_useMessageTypes);
 }
 
 QT_END_NAMESPACE