From b00d8cd8f6c5466ee67f0058173db5f6fab1836c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 30 Mar 2023 15:03:24 +0200 Subject: Bump version Change-Id: I7c952ea53b009e0ce29c6e4824b5238f9ba70a41 Reviewed-by: Ivan Komissarov --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 227cea215..38f77a65b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 +2.0.1 -- cgit v1.2.1 From 9638d97d91fb64477e51cbd14a4aa6e09f4def0f Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 4 Apr 2023 13:10:46 +0200 Subject: qbs build: Fix qbsbuildconfig module This module does not have an explicit dependency on the Qt module, so there should be no "Qt" identifier in scope. Change-Id: Iafa7e95bdf53e873bb37c9408a1ed93e0b42dc20 Reviewed-by: Ivan Komissarov --- qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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-" -- cgit v1.2.1 From 13e84a58d6e01bc157e856566f06af4e8de63cb6 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Tue, 4 Apr 2023 17:43:56 +0300 Subject: xcode: add support for xcode 14.3 Change-Id: Id28155e06744e53f99fdbcdc9f5bf5231a3f511e Reviewed-by: Christian Kandeler --- changelogs/changes-2.0.1.md | 6 ++++++ share/qbs/modules/bundle/bundle.js | 10 ++++++---- share/qbs/modules/xcode/xcode.js | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 changelogs/changes-2.0.1.md diff --git a/changelogs/changes-2.0.1.md b/changelogs/changes-2.0.1.md new file mode 100644 index 000000000..53582c367 --- /dev/null +++ b/changelogs/changes-2.0.1.md @@ -0,0 +1,6 @@ +# Apple Support +* Added support for Xcode 14.3 + +# Contributors +* Christian Kandeler +* Ivan Komissarov 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" -- cgit v1.2.1 From 289aac0aa1cccb2ef66a17f572aeb59236c6bd29 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 6 Apr 2023 13:44:36 +0200 Subject: Update changelog Change-Id: I9c758dcc77aac7cd9e47e75a8c99d41b6f82afaa Reviewed-by: Ivan Komissarov --- changelogs/changes-2.0.1.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelogs/changes-2.0.1.md b/changelogs/changes-2.0.1.md index 53582c367..8213c9eed 100644 --- a/changelogs/changes-2.0.1.md +++ b/changelogs/changes-2.0.1.md @@ -1,6 +1,9 @@ # Apple Support * Added support for Xcode 14.3 +# Build System +* Fixed qbsbuildconfig module + # Contributors * Christian Kandeler * Ivan Komissarov -- cgit v1.2.1