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>

4 files changed, 11 insertions, 7 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() {
diff --git a/share/qbs/imports/qbs/ModUtils/utils.js b/share/qbs/imports/qbs/ModUtils/utils.js
index 262704da9..493316850 100644
--- a/share/qbs/imports/qbs/ModUtils/utils.js
+++ b/share/qbs/imports/qbs/ModUtils/utils.js
@@ -452,7 +452,8 @@ var BlackboxOutputArtifactTracker = (function () {
                                            "/B", "/S", "/A:-D"], true);
             else
                 proc.exec("find", [dir, "-type", "f"], true);
-            return proc.readStdOut().trim().split(/\r?\n/).map(FileInfo.fromWindowsSeparators);
+            return proc.readStdOut().trim().split(/\r?\n/).map(
+                        function(p) { return FileInfo.fromWindowsSeparators(p); });
         }
         finally {
             if (proc)
diff --git a/share/qbs/imports/qbs/Probes/path-probe.js b/share/qbs/imports/qbs/Probes/path-probe.js
index 53d43b1b1..53e04fa39 100644
--- a/share/qbs/imports/qbs/Probes/path-probe.js
+++ b/share/qbs/imports/qbs/Probes/path-probe.js
@@ -39,7 +39,7 @@ function configure(names, nameSuffixes, nameFilter, pathPrefixes, pathSuffixes,
         throw '"names" must be specified';
     var _names = ModUtils.concatAll(names);
     if (nameFilter)
-        _names = _names.map(nameFilter);
+        _names = _names.map(function(n) { return nameFilter(n); });
     _names = ModUtils.concatAll.apply(undefined, _names.map(function(name) {
         return (nameSuffixes || [""]).map(function(suffix) { return name + suffix; });
     }));
@@ -53,8 +53,8 @@ function configure(names, nameSuffixes, nameFilter, pathPrefixes, pathSuffixes,
             _paths = _paths.concat(value.split(pathListSeparator));
     }
     var _suffixes = ModUtils.concatAll('', pathSuffixes);
-    _paths = _paths.map(FileInfo.fromNativeSeparators);
-    _suffixes = _suffixes.map(FileInfo.fromNativeSeparators);
+    _paths = _paths.map(function(p) { return FileInfo.fromNativeSeparators(p); });
+    _suffixes = _suffixes.map(function(p) { return FileInfo.fromNativeSeparators(p); });
     for (i = 0; i < _names.length; ++i) {
         for (var j = 0; j < _paths.length; ++j) {
             for (var k = 0; k < _suffixes.length; ++k) {
diff --git a/share/qbs/modules/java/utils.js b/share/qbs/modules/java/utils.js
index c1104a138..9477125f0 100644
--- a/share/qbs/modules/java/utils.js
+++ b/share/qbs/modules/java/utils.js
@@ -119,7 +119,8 @@ function findJdkPath(hostOS, arch, environmentPaths, searchPaths) {
                 return FileInfo.joinPaths(searchPaths[i], "bin", tool);
             }
 
-            if (requiredTools.map(fullToolPath).every(File.exists)) {
+            if (requiredTools.map(function(p) { return fullToolPath(p); })
+                    .every(function(p) { return File.exists(p); })) {
                 return searchPaths[i];
             }
         }