From 2f5c3d3cf073e2077bff42bc31f9f552db7f4091 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Thu, 21 Jun 2018 14:52:18 +0200
Subject: [PATCH] QbsProjectManager: Allow the user to cancel the project
 resolving phase

Support for this was either forgotten in the initial implementation or
accidentally removed.

Change-Id: I4e35b8063bd0b847459d630e7c8ca0d7b09835aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/plugins/qbsprojectmanager/qbsprojectparser.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
index d1481947ada..f823175d3d0 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
@@ -37,6 +37,7 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
+#include <QFutureWatcher>
 
 using namespace Utils;
 
@@ -55,6 +56,9 @@ QbsProjectParser::QbsProjectParser(QbsProject *project, QFutureInterface<bool> *
 {
     m_project = project->qbsProject();
     m_projectFilePath = project->projectFilePath().toString();
+    auto * const watcher = new QFutureWatcher<bool>(this);
+    connect(watcher, &QFutureWatcher<bool>::canceled, this, &QbsProjectParser::cancel);
+    watcher->setFuture(fi->future());
 }
 
 QbsProjectParser::~QbsProjectParser()