Merge remote-tracking branch 'origin/5.0'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	src/plugins/android/androidconfigurations.cpp

Change-Id: If8dc2cdf131811e08ca147c6f58dbb3ed3bf7227

src/plugins/cmakeprojectmanager/fileapidataextractor.cpp

@@ -191,12 +191,14 @@ static bool isChildOf(const FilePath &path, const QStringList &prefixes)
 
 QList<CMakeBuildTarget> generateBuildTargets(const PreprocessedData &input,
                                              const FilePath &sourceDirectory,
-                                             const FilePath &buildDirectory)
+                                             const FilePath &buildDirectory,
+                                             bool haveLibrariesRelativeToBuildDirectory)
 {
     QDir sourceDir(sourceDirectory.toString());
 
     const QList<CMakeBuildTarget> result = transform<QList>(input.targetDetails,
-        [&sourceDir, &sourceDirectory, &buildDirectory](const TargetDetails &t) {
+        [&sourceDir, &sourceDirectory, &buildDirectory,
+         &haveLibrariesRelativeToBuildDirectory](const TargetDetails &t) {
             const FilePath currentBuildDir = buildDirectory.absoluteFilePath(t.buildDir);
 
             CMakeBuildTarget ct;
@@ -271,7 +273,8 @@ QList<CMakeBuildTarget> generateBuildTargets(const PreprocessedData &input,
                         if (part.startsWith("-"))
                             continue;
 
-                        FilePath tmp = currentBuildDir.absoluteFilePath(FilePath::fromUserInput(part));
+                        const FilePath buildDir = haveLibrariesRelativeToBuildDirectory ? buildDirectory : currentBuildDir;
+                        FilePath tmp = buildDir.absoluteFilePath(FilePath::fromUserInput(part));
 
                         if (f.role == "libraries")
                             tmp = tmp.parentDir();
@@ -707,7 +710,12 @@ FileApiQtcData extractData(FileApiData &input,
         return {};
     }
 
-    result.buildTargets = generateBuildTargets(data, sourceDirectory, buildDirectory);
+    // Ninja generator from CMake version 3.20.5 has libraries relative to build directory
+    const bool haveLibrariesRelativeToBuildDirectory =
+            input.replyFile.generator.startsWith("Ninja")
+         && input.replyFile.cmakeVersion >= QVersionNumber(3, 20, 5);
+
+    result.buildTargets = generateBuildTargets(data, sourceDirectory, buildDirectory, haveLibrariesRelativeToBuildDirectory);
     result.cmakeFiles = std::move(data.cmakeFiles);
     result.projectParts = generateRawProjectParts(data, sourceDirectory);
 

src/plugins/cmakeprojectmanager/fileapiparser.cpp

@@ -147,6 +147,13 @@ static ReplyFileContents readReplyFile(const FilePath &filePath, QString &errorM
                 result.generator = generator.value("name").toString();
                 result.isMultiConfig = generator.value("multiConfig").toBool();
             }
+            const QJsonObject version = cmakeObject.value("version").toObject();
+            {
+                int major = version.value("major").toInt();
+                int minor = version.value("minor").toInt();
+                int patch = version.value("patch").toInt();
+                result.cmakeVersion = QVersionNumber(major, minor, patch);
+            }
         }
     }
 

src/plugins/cmakeprojectmanager/fileapiparser.h

@@ -39,6 +39,7 @@
 #include <QFutureInterface>
 #include <QString>
 #include <QVector>
+#include <QVersionNumber>
 
 #include <vector>
 
@@ -65,6 +66,7 @@ public:
     QString cmakeRoot;
 
     QVector<ReplyObject> replies;
+    QVersionNumber cmakeVersion;
 
     Utils::FilePath jsonFile(const QString &kind, const Utils::FilePath &replyDir) const;
 };