diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2023-08-14 00:21:09 +1100 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-08-22 08:47:19 +0000 |
commit | 49f347c37ebcfeb12d1b6222b888a972630cdb21 (patch) | |
tree | 05dfeae3ab2debfc91782a0128226b1bb0caa0cc /share/qbs/modules/bundle | |
parent | a42da661668c46491816d676591ff1d147cd3569 (diff) |
apple: Fix BundleModule when using xcode-less profile
Unlike Module itself, within the Rule.prepare script, we
cannot access properties of the non-present Module.
Fix this by adding helper properties in the Bundle module
that are set to 'undefined' if xcode is not present.
This amends 9cfd88b1b7cca084fabe8053d988aa0685f0cfb3.
Change-Id: I5f1c86bd093610f1de8ecb9f9732b2a1b0245baf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules/bundle')
-rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index 0c2d7ba6a..f640fd55f 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -193,6 +193,11 @@ Module { property string _productTypeIdentifier: Bundle.productTypeIdentifier(product.type) property stringList _productTypeIdentifierChain: bundleSettingsProbe.productTypeIdentifierChain + readonly property path _developerPath: xcode.developerPath + readonly property path _platformInfoPlist: xcode.platformInfoPlist + readonly property path _sdkSettingsPlist: xcode.sdkSettingsPlist + readonly property path _toolchainInfoPlist: xcode.toolchainInfoPlist + property bool _useXcodeBuildSpecs: true // TODO: remove in 1.25 property var extraEnv: ({ @@ -310,10 +315,10 @@ Module { // TODO: bundle module should know nothing about cpp module cmd.buildEnv = product.moduleProperty("cpp", "buildEnv"); - cmd.developerPath = product.xcode.developerPath; - cmd.platformInfoPlist = product.xcode.platformInfoPlist; - cmd.sdkSettingsPlist = product.xcode.sdkSettingsPlist; - cmd.toolchainInfoPlist = product.xcode.toolchainInfoPlist; + cmd.developerPath = product.bundle._developerPath; + cmd.platformInfoPlist = product.bundle._platformInfoPlist; + cmd.sdkSettingsPlist = product.bundle._sdkSettingsPlist; + cmd.toolchainInfoPlist = product.bundle._toolchainInfoPlist; cmd.osBuildVersion = product.qbs.hostOSBuildVersion; |