diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2016-04-12 07:37:01 +0000 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-04-12 07:40:04 +0000 |
| commit | 8dadafb9e0a2fbb49ab08b9eea0ff307088ba3f8 (patch) | |
| tree | 895fb834f88c8259a3559f9eeeb785be5c4137c8 /qbs | |
| parent | 017fddbc3f4c757679fe8f5bfd9ee2dc0d53fc5a (diff) | |
Revert "Qbs: Replace deprecated qbs.getEnv with Environment.getEnv"
We still need to support qbs 1.4.
This reverts commit 7c8744e6cde74a0d196d639d3ee1211043551ef8.
Change-Id: Ic8207a4994ec59665374a94bd8ee921b067856db
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcClangInstallation/functions.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qbs/imports/QtcClangInstallation/functions.js b/qbs/imports/QtcClangInstallation/functions.js index 4c2019f149..5a342b3bae 100644 --- a/qbs/imports/QtcClangInstallation/functions.js +++ b/qbs/imports/QtcClangInstallation/functions.js @@ -1,4 +1,3 @@ -var Environment = loadExtension("qbs.Environment") var File = loadExtension("qbs.File") var MinimumLLVMVersion = "3.6.2" @@ -14,7 +13,7 @@ function isSuitableLLVMConfig(llvmConfigCandidate, qtcFunctions, processOutputRe function llvmConfig(qbs, qtcFunctions, processOutputReader) { - var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") + var llvmInstallDirFromEnv = qbs.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" @@ -31,7 +30,7 @@ function llvmConfig(qbs, qtcFunctions, processOutputReader) } // Find llvm-config* in PATH - var pathListString = Environment.getEnv("PATH"); + var pathListString = qbs.getEnv("PATH"); var separator = qbs.hostOS.contains("windows") ? ";" : ":"; var pathList = pathListString.split(separator); for (var i = 0; i < llvmConfigVariants.length; ++i) { |