diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-06 15:59:44 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-07 16:14:39 +0100 |
| commit | d9c0be935136b3e26e7d7a47d89d28541462d83a (patch) | |
| tree | 8b1dc82cfac94e35dd52c167ce374fb16d1c69cb /share | |
| parent | 1eef762389a803b176bef41b5d19c2b42250d0c8 (diff) | |
| download | qbs-d9c0be935136b3e26e7d7a47d89d28541462d83a.tar.gz | |
Rename getenv and putenv to getEnv and putEnv, respectively.
We use camel case everywhere else.
Change-Id: I8a67f1d44659d59e612c0eaced0628c6d34d5b47
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/PathProbe.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/Qt/core/core.qbs | 4 | ||||
| -rw-r--r-- | share/qbs/modules/utils.js | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/share/qbs/imports/qbs/Probes/PathProbe.qbs b/share/qbs/imports/qbs/Probes/PathProbe.qbs index 29a5a050d..26871dc22 100644 --- a/share/qbs/imports/qbs/Probes/PathProbe.qbs +++ b/share/qbs/imports/qbs/Probes/PathProbe.qbs @@ -29,7 +29,7 @@ Probe { // FIXME: Add getenv support var envs = Utils.concatAll(platformEnvironmentPaths, environmentPaths); for (var i = 0; i < envs.length; ++i) { - var value = qbs.getenv(envs[i]) || ''; + var value = qbs.getEnv(envs[i]) || ''; if (value.length > 0) _paths = _paths.concat(value.split(qbs.pathListSeparator)); } diff --git a/share/qbs/modules/Qt/core/core.qbs b/share/qbs/modules/Qt/core/core.qbs index 0c2ba0088..64742406e 100644 --- a/share/qbs/modules/Qt/core/core.qbs +++ b/share/qbs/modules/Qt/core/core.qbs @@ -169,11 +169,11 @@ Module { setupRunEnvironment: { if (qbs.targetOS.contains('windows')) { - var v = getenv('PATH') || ''; + var v = getEnv('PATH') || ''; if (v.length > 0 && v.charAt(0) != ';') v = ';' + v; v = FileInfo.toWindowsSeparators(binPath) + v; - putenv('PATH', v); + putEnv('PATH', v); } } diff --git a/share/qbs/modules/utils.js b/share/qbs/modules/utils.js index 9d187d01f..5b3349ca6 100644 --- a/share/qbs/modules/utils.js +++ b/share/qbs/modules/utils.js @@ -156,7 +156,7 @@ function EnvironmentVariable(name, separator, convertPathSeparators) if (!name) throw "EnvironmentVariable c'tor needs a name as first argument." this.name = name - this.value = getenv(name).toString() + this.value = getEnv(name).toString() this.separator = separator || '' this.convertPathSeparators = convertPathSeparators || false } @@ -181,6 +181,6 @@ EnvironmentVariable.prototype.append = function(v) EnvironmentVariable.prototype.set = function() { - putenv(this.name, this.value) + putEnv(this.name, this.value) } |