Merge 1.24 into master

Change-Id: Ied52291353f95ac60a0456a700a7b77b1f5bdad1

3 files changed, 35 insertions, 21 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0c01ec534..0ca8517bd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -613,62 +613,63 @@ jobs:
       matrix:
         config:
         - {
-            name: 'Run macOS tests (Xcode 13.4)',
+            name: 'Run macOS tests (Xcode 14.1)',
             runner: 'macos-12',
             target: 'desktop',
             toolchain: 'clang_64',
-            xcodeVersion: '13.4.1',
-            testProfile: 'xcode_13_4_1-macosx-x86_64',
+            xcodeVersion: '14.1',
+            testProfile: 'xcode_14_1-macosx-x86_64',
             qtVersion: '5.15.2',
             script: './scripts/test-qbs.sh',
           }
         - {
-            name: 'Run macOS tests (Xcode 13.4, Qt 6.3)',
+            name: 'Run macOS tests (Xcode 14.1, Qt 6.3)',
             runner: 'macos-12',
             target: 'desktop',
             toolchain: 'clang_64',
-            xcodeVersion: '13.4.1',
-            testProfile: 'xcode_13_4_1-macosx-x86_64',
+            xcodeVersion: '14.1',
+            testProfile: 'xcode_14_1-macosx-x86_64',
             qtVersion: '6.3.1',
             script: './scripts/test-qt.sh',
           }
         - {
-            name: 'Run iOS tests (Xcode 13.4)',
+            name: 'Run iOS tests (Xcode 14.1)',
             runner: 'macos-12',
             target: 'ios',
             toolchain: 'ios',
-            xcodeVersion: '13.4.1',
-            testProfile: 'xcode_13_4_1-iphoneos-arm64',
+            xcodeVersion: '14.1',
+            testProfile: 'xcode_14_1-iphoneos-arm64',
             qtVersion: '5.15.2',
             script: './scripts/test-qbs.sh',
           }
         - {
-            name: 'Run iOS-sim tests (Xcode 13.4)',
+            name: 'Run iOS-sim tests (Xcode 14.1)',
             runner: 'macos-12',
             target: 'ios',
             toolchain: 'ios',
-            xcodeVersion: '13.4.1',
-            testProfile: 'xcode_13_4_1-iphonesimulator-x86_64',
+            xcodeVersion: '14.1',
+            testProfile: 'xcode_14_1-iphonesimulator-x86_64',
             qtVersion: '5.15.2',
             script: './scripts/test-qbs.sh',
           }
         - {
-            name: 'Run macOS tests (Xcode 12.5)',
-            runner: 'macos-11',
+            name: 'Run macOS tests (Xcode 13.4)',
+            runner: 'macos-12',
             target: 'desktop',
             toolchain: 'clang_64',
-            xcodeVersion: '12.5.1',
-            testProfile: 'xcode_12_5_1-macosx-x86_64',
+            xcodeVersion: '13.4.1',
+            testProfile: 'xcode_13_4_1-macosx-x86_64',
             qtVersion: '5.15.2',
             script: './scripts/test-qbs.sh',
           }
+
         - {
-            name: 'Run macOS tests (Xcode 11.7)',
+            name: 'Run macOS tests (Xcode 12.5)',
             runner: 'macos-11',
             target: 'desktop',
             toolchain: 'clang_64',
-            xcodeVersion: '11.7',
-            testProfile: 'xcode_11_7-macosx-x86_64',
+            xcodeVersion: '12.5.1',
+            testProfile: 'xcode_12_5_1-macosx-x86_64',
             qtVersion: '5.15.2',
             script: './scripts/test-qbs.sh',
           }
diff --git a/doc/reference/modules/bundle-module.qdoc b/doc/reference/modules/bundle-module.qdoc
index 4184672b4..fe9bf1354 100644
--- a/doc/reference/modules/bundle-module.qdoc
+++ b/doc/reference/modules/bundle-module.qdoc
@@ -465,6 +465,17 @@
 */
 
 /*!
+    \qmlproperty bool bundle::useBuiltinXcodeBuildSpecs
+
+    Set this property to \c true to use Xcode \c .xcspec files shipped with \QBS.
+
+    This property can be used as a workaround when using a new Xcode version that is not supported
+    by \QBS yet.
+
+    \default false
+*/
+
+/*!
     \qmlproperty string bundle::versionsFolderPath
     \readonly
     \since Qbs 1.5
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs
index 6526fa314..7432161a4 100644
--- a/share/qbs/modules/bundle/BundleModule.qbs
+++ b/share/qbs/modules/bundle/BundleModule.qbs
@@ -52,7 +52,7 @@ Module {
         property string xcodeDeveloperPath: xcode.developerPath
         property var xcodeArchSettings: xcode._architectureSettings
         property string productTypeIdentifier: _productTypeIdentifier
-        property bool useXcodeBuildSpecs: _useXcodeBuildSpecs
+        property bool useXcodeBuildSpecs: !useBuiltinXcodeBuildSpecs
         property bool isMacOs: qbs.targetOS.contains("macos")
         property bool xcodePresent: xcode.present
         property string xcodeVersion: xcode.version
@@ -187,11 +187,13 @@ Module {
     readonly property string unlocalizedResourcesFolderPath: bundleSettingsProbe.xcodeSettings["UNLOCALIZED_RESOURCES_FOLDER_PATH"]
     readonly property string versionsFolderPath: bundleSettingsProbe.xcodeSettings["VERSIONS_FOLDER_PATH"]
 
+    property bool useBuiltinXcodeBuildSpecs: !_useXcodeBuildSpecs // true to use ONLY the qbs build specs
+
     // private properties
     property string _productTypeIdentifier: Bundle.productTypeIdentifier(product.type)
     property stringList _productTypeIdentifierChain: bundleSettingsProbe.productTypeIdentifierChain
 
-    property bool _useXcodeBuildSpecs: true // false to use ONLY the qbs build specs
+    property bool _useXcodeBuildSpecs: true // TODO: remove in 1.25
 
     property var extraEnv: ({
         "PRODUCT_BUNDLE_IDENTIFIER": identifier