From 490942822060320f28f26a7136b8b644b75ffdde Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Tue, 15 Apr 2014 16:31:27 +0200
Subject: [PATCH] qbs build: Adapt to function renaming.

Change-Id: Ia4cc4447e59aaa4f283a7818847633bb7cf9a8aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 qtcreator.qbs                                 | 2 +-
 src/libs/ssh/ssh.qbs                          | 2 +-
 src/plugins/clangcodemodel/clangcodemodel.qbs | 4 ++--
 src/src.qbs                                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qtcreator.qbs b/qtcreator.qbs
index 2ae730193af..52fa9feb855 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -45,7 +45,7 @@ Project {
     property string ide_bin_path: qbs.targetOS.contains("osx")
             ? ide_app_target + ".app/Contents/MacOS"
             : ide_app_path
-    property bool testsEnabled: qbs.getenv("TEST") || qbs.buildVariant === "debug"
+    property bool testsEnabled: qbs.getEnv("TEST") || qbs.buildVariant === "debug"
     property stringList generalDefines: [
         "QT_CREATOR",
         'IDE_LIBRARY_BASENAME="' + libDirName + '"',
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index e044ba16b6a..6c22cabfec7 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -44,7 +44,7 @@ QtcLibrary {
         "sshsendfacility.cpp", "sshsendfacility_p.h",
     ].concat(botanFiles)
 
-    property var useSystemBotan: qbs.getenv("USE_SYSTEM_BOTAN") === "1"
+    property var useSystemBotan: qbs.getEnv("USE_SYSTEM_BOTAN") === "1"
     property var botanIncludes: {
         var result = ["../3rdparty"];
         if (useSystemBotan)
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index 170b720c4b8..c2c8ed7034b 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -11,7 +11,7 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "Utils" }
 
-    property string llvmInstallDir: qbs.getenv("LLVM_INSTALL_DIR")
+    property string llvmInstallDir: qbs.getEnv("LLVM_INSTALL_DIR")
     condition: llvmInstallDir && !llvmInstallDir.isEmpty
 
     property bool clangCompletion: true
@@ -33,7 +33,7 @@ QtcPlugin {
         }
 
         // Find llvm-config* in PATH
-        var pathListString = qbs.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) {
diff --git a/src/src.qbs b/src/src.qbs
index bca1658abf6..71f1632d11b 100644
--- a/src/src.qbs
+++ b/src/src.qbs
@@ -12,7 +12,7 @@ Project {
     ]
 
     property bool qbsSubModuleExists: File.exists(qbsProject.qbsBaseDir + "/qbs.qbs")
-    property path qbs_install_dir: qbs.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 {