From 0bbd8a85d3cb646b60ed7cff628a11df0679b867 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 22 Mar 2016 14:28:07 +0100 Subject: Fix project resolving with qbs master. Change-Id: Iee12398a4897d795ea5b8b6cadfec8f234ba069d Reviewed-by: Joerg Bornemann --- qbs/imports/QtcClangInstallation/functions.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'qbs/imports') diff --git a/qbs/imports/QtcClangInstallation/functions.js b/qbs/imports/QtcClangInstallation/functions.js index 5a342b3bae6..4c2019f149b 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) { -- cgit v1.2.3