Revert "Qbs: Replace deprecated qbs.getEnv with Environment.getEnv"

We still need to support qbs 1.4.

This reverts commit 7c8744e6cd.

Change-Id: Ic8207a4994ec59665374a94bd8ee921b067856db
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

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) {

qtcreator.qbs

@@ -1,5 +1,4 @@
 import qbs 1.0
-import qbs.Environment
 import qbs.FileInfo
 
 Project {
@@ -52,7 +51,7 @@ Project {
     property string ide_bin_path: qbs.targetOS.contains("osx")
             ? ide_app_target + ".app/Contents/MacOS"
             : ide_app_path
-    property bool testsEnabled: Environment.getEnv("TEST") || qbs.buildVariant === "debug"
+    property bool testsEnabled: qbs.getEnv("TEST") || qbs.buildVariant === "debug"
     property stringList generalDefines: [
         "QT_CREATOR",
         'IDE_LIBRARY_BASENAME="' + libDirName + '"',

src/libs/qtcreatorcdbext/qtcreatorcdbext.qbs

@@ -1,5 +1,4 @@
 import qbs
-import qbs.Environment
 import qbs.File
 import qbs.FileInfo
 
@@ -9,18 +8,18 @@ QtcLibrary {
     targetName: name
     property string cdbPath: {
         var paths = [
-            Environment.getEnv("CDB_PATH"),
+            qbs.getEnv("CDB_PATH"),
-            Environment.getEnv("ProgramFiles") + "/Debugging Tools For Windows/sdk",
+            qbs.getEnv("ProgramFiles") + "/Debugging Tools For Windows/sdk",
-            Environment.getEnv("ProgramFiles") + "/Debugging Tools For Windows (x86)/sdk",
+            qbs.getEnv("ProgramFiles") + "/Debugging Tools For Windows (x86)/sdk",
-            Environment.getEnv("ProgramFiles") + "/Debugging Tools For Windows (x64)/sdk",
+            qbs.getEnv("ProgramFiles") + "/Debugging Tools For Windows (x64)/sdk",
-            Environment.getEnv("ProgramFiles") + "/Debugging Tools For Windows 64-bit/sdk",
+            qbs.getEnv("ProgramFiles") + "/Debugging Tools For Windows 64-bit/sdk",
-            Environment.getEnv("ProgramW6432") + "/Debugging Tools For Windows (x86)/sdk",
+            qbs.getEnv("ProgramW6432") + "/Debugging Tools For Windows (x86)/sdk",
-            Environment.getEnv("ProgramW6432") + "/Debugging Tools For Windows (x64)/sdk",
+            qbs.getEnv("ProgramW6432") + "/Debugging Tools For Windows (x64)/sdk",
-            Environment.getEnv("ProgramW6432") + "/Debugging Tools For Windows 64-bit/sdk",
+            qbs.getEnv("ProgramW6432") + "/Debugging Tools For Windows 64-bit/sdk",
-            Environment.getEnv("ProgramFiles") + "/Windows Kits/8.0/Debuggers",
+            qbs.getEnv("ProgramFiles") + "/Windows Kits/8.0/Debuggers",
-            Environment.getEnv("ProgramFiles") + "/Windows Kits/8.1/Debuggers",
+            qbs.getEnv("ProgramFiles") + "/Windows Kits/8.1/Debuggers",
-            Environment.getEnv("ProgramFiles(x86)") + "/Windows Kits/8.0/Debuggers/inc",
+            qbs.getEnv("ProgramFiles(x86)") + "/Windows Kits/8.0/Debuggers/inc",
-            Environment.getEnv("ProgramFiles(x86)") + "/Windows Kits/8.1/Debuggers/inc"
+            qbs.getEnv("ProgramFiles(x86)") + "/Windows Kits/8.1/Debuggers/inc"
         ];
         var c = paths.length;
         for (var i = 0; i < c; ++i) {

src/libs/ssh/ssh.qbs

@@ -1,5 +1,4 @@
 import qbs 1.0
-import qbs.Environment
 
 QtcLibrary {
     name: "QtcSsh"
@@ -47,7 +46,7 @@ QtcLibrary {
         "sshsendfacility.cpp", "sshsendfacility_p.h",
     ].concat(botanFiles)
 
-    property var useSystemBotan: Environment.getEnv("USE_SYSTEM_BOTAN") === "1"
+    property var useSystemBotan: qbs.getEnv("USE_SYSTEM_BOTAN") === "1"
     property var botanIncludes: {
         var result = ["../3rdparty"];
         if (useSystemBotan)

src/src.qbs

@@ -1,5 +1,4 @@
 import qbs
-import qbs.Environment
 import qbs.File
 import qbs.FileInfo
 
@@ -15,7 +14,7 @@ Project {
     ]
 
     property bool qbsSubModuleExists: File.exists(qbsProject.qbsBaseDir + "/qbs.qbs")
-    property path qbs_install_dir: Environment.getEnv("QBS_INSTALL_DIR")
+    property path qbs_install_dir: qbs.getEnv("QBS_INSTALL_DIR")
     property bool useExternalQbs: qbs_install_dir
     property bool buildQbsProjectManager: useExternalQbs || qbsSubModuleExists
     Project {

src/tools/cplusplustools.qbs

@@ -1,8 +1,6 @@
-import qbs.Environment
-
 Project {
     name: "CPlusPlus Tools"
-    condition: Environment.getEnv("BUILD_CPLUSPLUS_TOOLS")
+    condition: qbs.getEnv("BUILD_CPLUSPLUS_TOOLS")
     references: [
         "3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.qbs",
         "cplusplus-ast2png/cplusplus-ast2png.qbs",