Merge 2.0 into master

Change-Id: Iaedd4ecbe9e93b06e9613f2b332f393e234afd16

4 files changed, 22 insertions, 7 deletions

diff --git a/changelogs/changes-2.0.1.md b/changelogs/changes-2.0.1.md
new file mode 100644
index 000000000..8213c9eed
--- /dev/null
+++ b/changelogs/changes-2.0.1.md
@@ -0,0 +1,9 @@
+# Apple Support
+* Added support for Xcode 14.3
+
+# Build System
+* Fixed qbsbuildconfig module
+
+# Contributors
+* Christian Kandeler
+* Ivan Komissarov
diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
index 13e4c6985..4c22b5eb7 100644
--- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -81,7 +81,7 @@ Module {
     }
     Properties {
         condition: project.withCode && qbs.toolchain.contains("msvc") && product.Qt
-                && Utilities.versionCompare(Qt.core.version, "6.3") >= 0
+                && Utilities.versionCompare(product.Qt.core.version, "6.3") >= 0
                 && Utilities.versionCompare(cpp.compilerVersion, "19.10") >= 0
                 && Utilities.versionCompare(qbs.version, "1.23") < 0
         cpp.cxxFlags: "/permissive-"
diff --git a/share/qbs/modules/bundle/bundle.js b/share/qbs/modules/bundle/bundle.js
index ec0e30054..da23b7313 100644
--- a/share/qbs/modules/bundle/bundle.js
+++ b/share/qbs/modules/bundle/bundle.js
@@ -152,13 +152,15 @@ function _assign(target, source) {
 
 function macOSSpecsPaths(version, developerPath) {
     var result = [];
-    if (Utilities.versionCompare(version, "12.5") >= 0) {
+    if (Utilities.versionCompare(version, "14.3") >= 0) {
+        result.push(FileInfo.joinPaths(
+                    developerPath, "Library", "Xcode", "Plug-ins", "XCBSpecifications.ideplugin",
+                    "Contents", "Resources"));
+    } else if (Utilities.versionCompare(version, "12.5") >= 0) {
         result.push(FileInfo.joinPaths(
                     developerPath, "..", "PlugIns", "XCBSpecifications.ideplugin",
                     "Contents", "Resources"));
-    }
-
-    if (Utilities.versionCompare(version, "12") >= 0) {
+    } else if (Utilities.versionCompare(version, "12") >= 0) {
         result.push(FileInfo.joinPaths(
                     developerPath, "Platforms", "MacOSX.platform", "Developer", "Library", "Xcode",
                     "PrivatePlugIns", "IDEOSXSupportCore.ideplugin", "Contents", "Resources"));
diff --git a/share/qbs/modules/xcode/xcode.js b/share/qbs/modules/xcode/xcode.js
index 15afddb95..6bd37ad10 100644
--- a/share/qbs/modules/xcode/xcode.js
+++ b/share/qbs/modules/xcode/xcode.js
@@ -205,8 +205,12 @@ function boolFromSdkOrPlatform(varName, sdkProps, platformProps, defaultValue) {
 function archsSpecsPath(version, targetOS, platformType, platformPath, devicePlatformPath,
                         developerPath) {
     if (Utilities.versionCompare(version, "13.3") >= 0) {
-        var baseDir = FileInfo.joinPaths(developerPath, "..",
-                                         "PlugIns/XCBSpecifications.ideplugin/Contents/Resources");
+        var pluginsDir = Utilities.versionCompare(version, "14.3") >= 0
+            ? FileInfo.joinPaths(developerPath, "Library", "Xcode", "Plug-ins")
+            : FileInfo.joinPaths(developerPath, "..", "PlugIns");
+        var baseDir = FileInfo.joinPaths(pluginsDir,
+                                         "XCBSpecifications.ideplugin", "Contents", "Resources");
+
         var baseName = targetOS.includes("macos") ? "MacOSX Architectures"
                 : targetOS.includes("ios-simulator") ? "iOS Simulator"
                 : targetOS.includes("ios") ? "iOS Device"