aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2016-04-11 22:24:26 +0300
committerOrgad Shaneh <orgads@gmail.com>2016-04-11 19:33:42 +0000
commit7c8744e6cde74a0d196d639d3ee1211043551ef8 (patch)
tree052386ffdaba4e24595e84e8bb4829f7d3baafc9 /qbs
parent5e7edfefbd6689a01111d963fb9b381febea2cf0 (diff)
Qbs: Replace deprecated qbs.getEnv with Environment.getEnv
Change-Id: Iebca0ae87bc3dee65fbc0f16c3c7f6f8afc0fead Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Diffstat (limited to 'qbs')
-rw-r--r--qbs/imports/QtcClangInstallation/functions.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/qbs/imports/QtcClangInstallation/functions.js b/qbs/imports/QtcClangInstallation/functions.js
index 5a342b3bae..4c2019f149 100644
--- a/qbs/imports/QtcClangInstallation/functions.js
+++ b/qbs/imports/QtcClangInstallation/functions.js
@@ -1,3 +1,4 @@
+var Environment = loadExtension("qbs.Environment")
var File = loadExtension("qbs.File")
var MinimumLLVMVersion = "3.6.2"
@@ -13,7 +14,7 @@ function isSuitableLLVMConfig(llvmConfigCandidate, qtcFunctions, processOutputRe
function llvmConfig(qbs, qtcFunctions, processOutputReader)
{
- var llvmInstallDirFromEnv = qbs.getEnv("LLVM_INSTALL_DIR")
+ var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR")
var llvmConfigVariants = [
"llvm-config", "llvm-config-3.2", "llvm-config-3.3", "llvm-config-3.4",
"llvm-config-3.5", "llvm-config-3.6", "llvm-config-4.0", "llvm-config-4.1"
@@ -30,7 +31,7 @@ function llvmConfig(qbs, qtcFunctions, processOutputReader)
}
// Find llvm-config* in PATH
- var pathListString = qbs.getEnv("PATH");
+ var pathListString = Environment.getEnv("PATH");
var separator = qbs.hostOS.contains("windows") ? ";" : ":";
var pathList = pathListString.split(separator);
for (var i = 0; i < llvmConfigVariants.length; ++i) {