diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-05-29 16:09:07 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-06-02 13:15:55 +0000 |
| commit | 4103cfcdc08107962ef838e6c33a89b73ff0fe0f (patch) | |
| tree | 7767862694039fda3830e334c582473fa8702bb7 | |
| parent | 2c90b47de45095bb2309294ef4367b5030eea89a (diff) | |
XCode: fix handling provisioning profiles in dry-run mode
Build in dry-run mode failed with "no such file..." because provisioning
profile is not copied to the build directory.
This amends 92970c2.
Change-Id: I7c278376425c9982b9b402fd6071fac7847d3d2e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/xcode/xcode.js | 2 | ||||
| -rw-r--r-- | share/qbs/modules/xcode/xcode.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/xcode/xcode.js b/share/qbs/modules/xcode/xcode.js index d20d9cf0c..48cf3d772 100644 --- a/share/qbs/modules/xcode/xcode.js +++ b/share/qbs/modules/xcode/xcode.js @@ -169,7 +169,7 @@ function findSigningIdentities(security, searchString) { } function provisioningProfilePlistContents(filePath) { - if (filePath === undefined) + if (filePath === undefined || !File.exists(filePath)) return undefined; var plist = new PropertyList(); diff --git a/share/qbs/modules/xcode/xcode.qbs b/share/qbs/modules/xcode/xcode.qbs index 500cdd0de..dceb7d4ca 100644 --- a/share/qbs/modules/xcode/xcode.qbs +++ b/share/qbs/modules/xcode/xcode.qbs @@ -328,7 +328,7 @@ Module { var dataFile = inputs["xcode.provisioningprofile.data"][i].filePath; var query = product.moduleProperty("xcode", "provisioningProfile"); var obj = Xcode.provisioningProfilePlistContents(dataFile); - if (obj.data && (obj.data.UUID === query || obj.data.Name === query)) { + if (obj && obj.data && (obj.data.UUID === query || obj.data.Name === query)) { console.log("Using provisioning profile: " + obj.filePath); artifacts.push({ |