diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-11-11 19:51:58 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-12-01 10:38:40 +0000 |
| commit | ddd37d1b881e02c87ca580336a5f12b4941bb093 (patch) | |
| tree | d30b03c5838aaa2b4d49c98976fc07d159ceb35d /share/qbs/modules | |
| parent | d3897b2220d99fe2011972ea806c7433771f59fe (diff) | |
Roll the global getEnv and currentEnv functions into Environment.
Change-Id: Ife3f9c53ad3fb43364c53fe7c6c08aa3983b9221
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/qbs/common.qbs | 5 | ||||
| -rw-r--r-- | share/qbs/modules/xcode/xcode.qbs | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs index 733a3096f..c0c05e114 100644 --- a/share/qbs/modules/qbs/common.qbs +++ b/share/qbs/modules/qbs/common.qbs @@ -29,6 +29,7 @@ ****************************************************************************/ import qbs 1.0 +import qbs.Environment import qbs.FileInfo import qbs.ModUtils import qbs.PathTools @@ -120,10 +121,10 @@ Module { // private properties property string windowsRegistryKey: "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion" property path windowsSystemRoot: FileInfo.fromWindowsSeparators(Utilities.getNativeSetting(windowsRegistryKey, "SystemRoot")) - property path windowsShellPath: FileInfo.fromWindowsSeparators(getEnv("COMSPEC")) || FileInfo.joinPaths(windowsSystemRoot, "System32", "cmd.exe") + property path windowsShellPath: FileInfo.fromWindowsSeparators(Environment.getEnv("COMSPEC")) || FileInfo.joinPaths(windowsSystemRoot, "System32", "cmd.exe") property var commonRunEnvironment: { - var env = qbs.currentEnv(); + var env = Environment.currentEnv(); if (targetOS.contains("windows")) { var newEntry = FileInfo.toWindowsSeparators(FileInfo.joinPaths(installRoot, installPrefix)); diff --git a/share/qbs/modules/xcode/xcode.qbs b/share/qbs/modules/xcode/xcode.qbs index ad54b6cd2..f9b717867 100644 --- a/share/qbs/modules/xcode/xcode.qbs +++ b/share/qbs/modules/xcode/xcode.qbs @@ -1,5 +1,6 @@ import qbs import qbs.BundleTools +import qbs.Environment import qbs.File import qbs.FileInfo import qbs.DarwinTools @@ -108,7 +109,7 @@ Module { } property path provisioningProfilesPath: { - return FileInfo.joinPaths(qbs.getEnv("HOME"), "Library/MobileDevice/Provisioning Profiles"); + return FileInfo.joinPaths(Environment.getEnv("HOME"), "Library/MobileDevice/Provisioning Profiles"); } readonly property var _availableSdks: Utils.sdkInfoList(sdksPath) |