Merge remote-tracking branch 'origin/4.14'

Change-Id: I2ae0eb18782224e48cd20d41907f9dfea6ee1771

9 files changed, 17 insertions, 7 deletions

diff --git a/src/tools/clangbackend/source/clangasyncjob.h b/src/tools/clangbackend/source/clangasyncjob.h
index 69befdcdac..9299658aa4 100644
--- a/src/tools/clangbackend/source/clangasyncjob.h
+++ b/src/tools/clangbackend/source/clangasyncjob.h
@@ -63,7 +63,7 @@ public:
         const QFuture<Result> future = Utils::runAsync(stackSize, m_runner);
         m_futureWatcher.setFuture(future);
 
-        return future;
+        return QFuture<void>(future);
     }
 
     void preventFinalization() final
diff --git a/src/tools/clangpchmanagerbackend/CMakeLists.txt b/src/tools/clangpchmanagerbackend/CMakeLists.txt
index cdbc111bab..dc42a23c34 100644
--- a/src/tools/clangpchmanagerbackend/CMakeLists.txt
+++ b/src/tools/clangpchmanagerbackend/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_subdirectory(source)
 
 add_qtc_executable(clangpchmanagerbackend
+  CONDITION TARGET ClangPchManager
   DEPENDS
     clangrefactoringbackend_lib clangpchmanagerbackend_lib
     Sqlite ClangSupport
diff --git a/src/tools/clangpchmanagerbackend/source/CMakeLists.txt b/src/tools/clangpchmanagerbackend/source/CMakeLists.txt
index d7276895ce..63f0a11acf 100644
--- a/src/tools/clangpchmanagerbackend/source/CMakeLists.txt
+++ b/src/tools/clangpchmanagerbackend/source/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_qtc_library(clangpchmanagerbackend_lib STATIC
+  CONDITION TARGET clangrefactoringbackend_lib
   DEPENDS clangrefactoringbackend_lib
   PUBLIC_DEPENDS libclang Qt5::Widgets # FIXME: change the way to get the gui pch to linkto
   DEFINES
diff --git a/src/tools/clangpchmanagerbackend/source/projectpartsmanager.cpp b/src/tools/clangpchmanagerbackend/source/projectpartsmanager.cpp
index 307041ed2e..48074f440c 100644
--- a/src/tools/clangpchmanagerbackend/source/projectpartsmanager.cpp
+++ b/src/tools/clangpchmanagerbackend/source/projectpartsmanager.cpp
@@ -31,9 +31,10 @@
 #include <filepathcachinginterface.h>
 #include <generatedfilesinterface.h>
 #include <projectpartcontainer.h>
-#include <set_algorithm.h>
 #include <usedmacrofilter.h>
 
+#include <utils/set_algorithm.h>
+
 #include <algorithm>
 #include <utils/algorithm.h>
 
@@ -163,7 +164,7 @@ ProjectPartsManagerInterface::UpToDataProjectParts ProjectPartsManager::checkDep
                                       newSources.end(),
                                       oldSources.begin(),
                                       oldSources.end(),
-                                      make_iterator([&](SourceEntry entry) {
+                                      Utils::make_iterator([&](SourceEntry entry) {
                                           change = changedSourceType(entry, change);
                                       }),
                                       [](SourceEntry first, SourceEntry second) {
@@ -185,7 +186,7 @@ ProjectPartsManagerInterface::UpToDataProjectParts ProjectPartsManager::checkDep
         }
 
         if (change == Change::No) {
-            Change change = mismatch_collect(
+            Change change = Utils::mismatch_collect(
                 newSources.begin(),
                 newSources.end(),
                 oldSources.begin(),
diff --git a/src/tools/clangrefactoringbackend/CMakeLists.txt b/src/tools/clangrefactoringbackend/CMakeLists.txt
index fdf1011cba..c368923d8f 100644
--- a/src/tools/clangrefactoringbackend/CMakeLists.txt
+++ b/src/tools/clangrefactoringbackend/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_subdirectory(source)
 
 add_qtc_executable(clangrefactoringbackend
+  CONDITION TARGET ClangRefactoring
   DEPENDS
     clangrefactoringbackend_lib Sqlite ClangSupport
   SOURCES
diff --git a/src/tools/clangrefactoringbackend/source/CMakeLists.txt b/src/tools/clangrefactoringbackend/source/CMakeLists.txt
index 0398ebf473..b7f266bd84 100644
--- a/src/tools/clangrefactoringbackend/source/CMakeLists.txt
+++ b/src/tools/clangrefactoringbackend/source/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_qtc_library(clangrefactoringbackend_lib STATIC
+  CONDITION WITH_TESTS OR TARGET ClangRefactoring OR TARGET ClangPchManager
   PUBLIC_DEPENDS
     Threads::Threads
     ${CLANG_TOOLING_LIBS}
diff --git a/src/tools/iostool/main.cpp b/src/tools/iostool/main.cpp
index b62b2a9b93..c8bf565816 100644
--- a/src/tools/iostool/main.cpp
+++ b/src/tools/iostool/main.cpp
@@ -186,7 +186,7 @@ private:
     void appOutput(const QString &output);
     void readStdin();
 
-    QMutex m_xmlMutex;
+    QRecursiveMutex m_xmlMutex;
     int maxProgress;
     int opLeft;
     bool debug;
@@ -507,7 +507,6 @@ void GenericRelayServer::newRelayConnection()
 
 IosTool::IosTool(QObject *parent):
     QObject(parent),
-    m_xmlMutex(QMutex::Recursive),
     maxProgress(0),
     opLeft(0),
     debug(false),
diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt
index 1dbdd5b7fa..fde5231276 100644
--- a/src/tools/qml2puppet/CMakeLists.txt
+++ b/src/tools/qml2puppet/CMakeLists.txt
@@ -121,7 +121,7 @@ extend_qtc_executable(qml2puppet
 find_package(Qt5 5.15.0 COMPONENTS Quick3D QUIET)
 extend_qtc_executable(qml2puppet
   CONDITION TARGET Qt5::Quick3D
-  FEATURE_INFO "Qt Quick 3D"
+  FEATURE_INFO "Qt Quick 3D support"
   DEPENDS Qt5::Quick3D Qt5::Quick3DPrivate
   DEFINES QUICK3D_MODULE
 
diff --git a/src/tools/qtcdebugger/main.cpp b/src/tools/qtcdebugger/main.cpp
index aa14dfe324..eb008868d7 100644
--- a/src/tools/qtcdebugger/main.cpp
+++ b/src/tools/qtcdebugger/main.cpp
@@ -371,7 +371,13 @@ bool startDefaultDebugger(QString *errorMessage)
     if (debug)
         qDebug() << "Default" << defaultDebugger;
     QProcess p;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    QStringList arguments = QProcess::splitCommand(defaultDebugger);
+    const QString executable = arguments.takeFirst();
+    p.start(executable, arguments, QIODevice::NotOpen);
+#else
     p.start(defaultDebugger, QIODevice::NotOpen);
+#endif
     if (!p.waitForStarted()) {
         *errorMessage = QString::fromLatin1("Unable to start %1!").arg(defaultDebugger);
         return false;