diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-30 13:26:49 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-30 13:27:06 +0200 |
commit | c47bef4a01bad47fb904e174ce8ce269678fd682 (patch) | |
tree | d050f406ceb4690fc982d1d03649cd86a34ff12a /share/qbs/modules/bundle/BundleModule.qbs | |
parent | fbf8249a897596dc584ac44ad6a8d705017799ad (diff) | |
parent | fa9c21d6908e0dad805113f570ac883c1dc5067a (diff) |
Merge 1.8 into master
Change-Id: Ide2b95fba4d91a5fe755c2d7a8375f87552d2e20
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 edaf78724..e9f9128e2 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -500,9 +500,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) }); } |