diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-06-26 10:32:13 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-06-27 16:35:00 +0000 |
| commit | 9edb9f9de409f488c920fb295a0674f2bad5ff17 (patch) | |
| tree | 78b4e6b9acc9bc3ad24dbf9ae595f318b6c767aa /share/qbs/modules/bundle/BundleModule.qbs | |
| parent | 7e0191856b3c76517a2654183b52192713ff5770 (diff) | |
Fix running bundled applications on Apple platforms
Previously, Qbs would attempt to run the temporary copy of the
application executable in the .tmp/ subdirectory of the product build
directory. This patch corrects it so that it is run via the copy in the
install root, or the actual bundle executable in the build directory.
Change-Id: I988081e3f70ec52965e798c8193b75c2dcc4fdf9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules/bundle/BundleModule.qbs')
| -rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index 0a0ecc6e3..306e7cb07 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -505,9 +505,11 @@ Module { var fp = inputs["bundle.input"][i].moduleProperty("bundle", "_bundleFilePath"); if (!fp) throw("Artifact " + inputs["bundle.input"][i].filePath + " has no associated bundle file path"); + var extraTags = inputs["bundle.input"][i].fileTags.contains("application") + ? ["bundle.application-executable"] : []; artifacts.push({ filePath: fp, - fileTags: ["bundle.content", "bundle.content.copied"] + fileTags: ["bundle.content", "bundle.content.copied"].concat(extraTags) }); } |