Merge remote-tracking branch 'origin/4.7'

Change-Id: Ifec1f8dc20a18f432ec6ccf68153f31fff3f8b29

src/plugins/qbsprojectmanager/qbskitinformation.cpp

@@ -72,6 +72,13 @@ private:
     QPushButton * const m_changeButton;
 };
 
+QbsKitInformation::QbsKitInformation()
+{
+    setObjectName(QLatin1String("QbsKitInformation"));
+    setId(QbsKitInformation::id());
+    setPriority(22000);
+}
+
 QString QbsKitInformation::displayName()
 {
     return tr("Additional Qbs Profile Settings");

src/plugins/qbsprojectmanager/qbskitinformation.h

@@ -35,6 +35,8 @@ class QbsKitInformation final : public ProjectExplorer::KitInformation
     Q_OBJECT
 
 public:
+    QbsKitInformation();
+
     static QString displayName();
     static QString representation(const ProjectExplorer::Kit *kit);
     static QVariantMap properties(const ProjectExplorer::Kit *kit);

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()