diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-11-11 19:51:58 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-12-01 10:38:40 +0000 |
| commit | ddd37d1b881e02c87ca580336a5f12b4941bb093 (patch) | |
| tree | d30b03c5838aaa2b4d49c98976fc07d159ceb35d /share/qbs/imports/qbs/Probes/NodeJsProbe.qbs | |
| parent | d3897b2220d99fe2011972ea806c7433771f59fe (diff) | |
Roll the global getEnv and currentEnv functions into Environment.
Change-Id: Ife3f9c53ad3fb43364c53fe7c6c08aa3983b9221
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'share/qbs/imports/qbs/Probes/NodeJsProbe.qbs')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/NodeJsProbe.qbs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs b/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs index b0e2dfca0..ecaf91180 100644 --- a/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs +++ b/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs @@ -29,6 +29,7 @@ ****************************************************************************/ import qbs +import qbs.Environment import qbs.FileInfo BinaryProbe { @@ -36,8 +37,8 @@ BinaryProbe { platformPaths: { var paths = base; if (qbs.hostOS.contains("windows")) { - var env32 = qbs.getEnv("PROGRAMFILES(X86)"); - var env64 = qbs.getEnv("PROGRAMFILES"); + var env32 = Environment.getEnv("PROGRAMFILES(X86)"); + var env64 = Environment.getEnv("PROGRAMFILES"); if (env64 === env32 && env64.endsWith(" (x86)")) env64 = env64.slice(0, -(" (x86)".length)); // QTBUG-3845 paths.push(FileInfo.joinPaths(env64, "nodejs")); |