diff options
| -rw-r--r-- | plugins/autotest/testcodeparser.cpp | 2 | ||||
| -rw-r--r-- | plugins/autotest/testrunner.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/autotest/testcodeparser.cpp b/plugins/autotest/testcodeparser.cpp index 9270a6d4548..556fc735e2a 100644 --- a/plugins/autotest/testcodeparser.cpp +++ b/plugins/autotest/testcodeparser.cpp @@ -800,7 +800,7 @@ void TestCodeParser::scanForTests(const QStringList &fileList) return; } - QFuture<void> future = QtConcurrent::run(&performParse, list, this); + QFuture<void> future = Utils::runAsync<void>(&performParse, list, this); Core::FutureProgress *progress = Core::ProgressManager::addTask(future, isFullParse ? tr("Scanning for Tests") : tr("Refreshing Tests List"), diff --git a/plugins/autotest/testrunner.cpp b/plugins/autotest/testrunner.cpp index 67f9ead4f6a..cde0dde4bfb 100644 --- a/plugins/autotest/testrunner.cpp +++ b/plugins/autotest/testrunner.cpp @@ -109,6 +109,7 @@ static void performTestRun(QFutureInterface<void> &futureInterface, const QList<TestConfiguration *> selectedTests, const int timeout, const QString metricsOption) { + QEventLoop eventLoop; int testCaseCount = 0; foreach (TestConfiguration *config, selectedTests) { config->completeTestInformation(); @@ -198,7 +199,7 @@ static void performTestRun(QFutureInterface<void> &futureInterface, emitTestResultCreated(new FaultyTestResult(Result::MessageFatal, QObject::tr("Test run canceled by user."))); } - qApp->processEvents(); + eventLoop.processEvents(); } } @@ -274,8 +275,8 @@ void TestRunner::runTests() TestResultsPane::instance(), &TestResultsPane::addTestResult, Qt::QueuedConnection); - QFuture<void> future = QtConcurrent::run(&performTestRun, m_selectedTests, settings->timeout, - metricsOption); + QFuture<void> future = Utils::runAsync<void>(&performTestRun, m_selectedTests, settings->timeout, + metricsOption); Core::FutureProgress *progress = Core::ProgressManager::addTask(future, tr("Running Tests"), Autotest::Constants::TASK_INDEX); |