diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-03-22 14:28:07 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-03-22 14:00:51 +0000 |
| commit | 0bbd8a85d3cb646b60ed7cff628a11df0679b867 (patch) | |
| tree | d217b9b72a383443d6b32b5bb2002123a51e82a2 /qbs/imports | |
| parent | 75bbd73b843b01c64314bbdc058ed7e366e2408d (diff) | |
Fix project resolving with qbs master.
Change-Id: Iee12398a4897d795ea5b8b6cadfec8f234ba069d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qbs/imports')
| -rw-r--r-- | qbs/imports/QtcClangInstallation/functions.js | 5 |
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) { |