From e307b7eecf15608a3beaa9e104a11bee377b6f24 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Tue, 2 Feb 2016 10:23:00 +0100
Subject: [PATCH] QmlProfiler: Avoid QtConcurrent

QtConcurrent runs everything on a global thread pool, which means that
calls of QtConcurrent::run/map/etc can block each other.

Change-Id: Ia7a61b5ae1e0919113205a83a43caa1f27015732
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
---
 src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
index 8fcefd0e455..0c3914b0831 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
@@ -338,7 +338,7 @@ void QmlProfilerModelManager::save(const QString &filename)
 
     d->notesModel->saveData();
 
-    QFuture<void> result = QtConcurrent::run<void>([this, file] (QFutureInterface<void> &future) {
+    QFuture<void> result = Utils::runAsync<void>([this, file] (QFutureInterface<void> &future) {
         QmlProfilerFileWriter writer;
         writer.setTraceTime(traceTime()->startTime(), traceTime()->endTime(),
                             traceTime()->duration());
@@ -367,7 +367,7 @@ void QmlProfilerModelManager::load(const QString &filename)
     clear();
     setState(AcquiringData);
 
-    QFuture<void> result = QtConcurrent::run<void>([this, file] (QFutureInterface<void> &future) {
+    QFuture<void> result = Utils::runAsync<void>([this, file] (QFutureInterface<void> &future) {
         QmlProfilerFileReader reader;
         reader.setFuture(&future);
         connect(&reader, &QmlProfilerFileReader::error, this, &QmlProfilerModelManager::error);