Merge remote-tracking branch 'origin/4.14'

Conflicts: src/plugins/mesonprojectmanager/project/mesonprojectparser.h Change-Id: Id38d20ce20981dcdc322fe5d1d7647f4bec89d8a
2020-11-13 16:03:26 +01:00
parent 7a2e49435c b0d72fa952
commit 381c5656e7
125 changed files with 1246 additions and 847 deletions
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -72,6 +72,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QFileSystemWatcher>
+#include <QFuture>
 #include <QLoggingCategory>
 #include <QTimer>

--- a/src/plugins/qmakeprojectmanager/qmakeproject.h
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.h
@@ -36,7 +36,6 @@

 #include <QStringList>
 #include <QFutureInterface>
-#include <QFuture>

 QT_BEGIN_NAMESPACE
 class QMakeGlobals;