aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/imports/qbs/Probes/NpmProbe.qbs
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-02-03 19:52:56 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2020-02-05 11:39:14 +0000
commitb2e405c2f00bc82419172bb164f0b8ad75427dfc (patch)
treebc142a885d824b97aa9ebfce2f7c1210161c3d31 /share/qbs/imports/qbs/Probes/NpmProbe.qbs
parente130e492ebe6ad266a74df7b7d5efdef55dc0ff7 (diff)
Assign allResults for all PathProbe child Probes
Despite the fact those probes do not use selectors property, it makes sense to assign the result into the allResults property Change-Id: Ieaf084b721a20e83c02bfdcdb706d8d98c7c16ed Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/Probes/NpmProbe.qbs')
-rw-r--r--share/qbs/imports/qbs/Probes/NpmProbe.qbs26
1 files changed, 16 insertions, 10 deletions
diff --git a/share/qbs/imports/qbs/Probes/NpmProbe.qbs b/share/qbs/imports/qbs/Probes/NpmProbe.qbs
index f6a99e826..3ca6a96c2 100644
--- a/share/qbs/imports/qbs/Probes/NpmProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/NpmProbe.qbs
@@ -57,18 +57,24 @@ NodeJsProbe {
hostOS.contains("windows"));
v.prepend(interpreterPath);
- var result = results.files[0];
- result.npmBin = results.found
- ? NodeJs.findLocation(result.filePath, "bin", v.value)
- : undefined;
- result.npmRoot = results.found
- ? NodeJs.findLocation(result.filePath, "root", v.value)
- : undefined;
- result.npmPrefix = results.found
- ? NodeJs.findLocation(result.filePath, "prefix", v.value)
- : undefined;
+ var resultsMapper = function(result) {
+ result.npmBin = result.found
+ ? NodeJs.findLocation(result.filePath, "bin", v.value)
+ : undefined;
+ result.npmRoot = result.found
+ ? NodeJs.findLocation(result.filePath, "root", v.value)
+ : undefined;
+ result.npmPrefix = result.found
+ ? NodeJs.findLocation(result.filePath, "prefix", v.value)
+ : undefined;
+ return result;
+ };
+ results.files = results.files.map(resultsMapper);
found = results.found;
+ allResults = results.files;
+
+ var result = results.files[0];
candidatePaths = result.candidatePaths;
path = result.path;
filePath = result.filePath;