aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2016-04-14 16:43:29 +0200
committerJake Petroules <jake.petroules@qt.io>2016-04-14 23:24:31 +0000
commitdd0c9ef83a92e40e29b6fac55dd744d8682793af (patch)
tree1be14f071cd3537706c03f34d91eace031dc5d21 /dist
parentadc4a32b23f8497322c7d4ad975dc9767486de51 (diff)
Work around QtScript bug.
That library has problems applying higher-order functions with MSVC/64 bit. Change-Id: Ib84d4ed3abd13371385079e1f990df6fad92f4ae Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'dist')
-rw-r--r--dist/dist.qbs6
1 files changed, 4 insertions, 2 deletions
diff --git a/dist/dist.qbs b/dist/dist.qbs
index a43f5820e..3278cd2c3 100644
--- a/dist/dist.qbs
+++ b/dist/dist.qbs
@@ -49,7 +49,7 @@ Product {
cmd.binaryFilePaths = inputs.installable.filter(function (artifact) {
return artifact.fileTags.contains("application")
|| artifact.fileTags.contains("dynamiclibrary");
- }).map(ModUtils.artifactInstalledFilePath);
+ }).map(function(a) { return ModUtils.artifactInstalledFilePath(a); });
cmd.sourceCode = function () {
var out;
var process;
@@ -90,7 +90,9 @@ Product {
prepare: {
var cmd = new JavaScriptCommand();
cmd.silent = true;
- cmd.inputFilePaths = inputs.installable.map(ModUtils.artifactInstalledFilePath);
+ cmd.inputFilePaths = inputs.installable.map(function(a) {
+ return ModUtils.artifactInstalledFilePath(a);
+ });
cmd.outputFilePath = output.filePath;
cmd.installRoot = product.moduleProperty("qbs", "installRoot");
cmd.sourceCode = function() {