diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-01 10:37:24 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-10 15:15:40 +0000 |
| commit | f51c33a27f447c2a971b9b6886508c3777698663 (patch) | |
| tree | 22bbefe5ef0a5733d9cd8501fa1b97d09ee33946 /src/lib/corelib/language/builtinvalue.h | |
| parent | c404c7b9218a82c5bdb642b23560ec5f90661a3f (diff) | |
Initialize qbs.commonRunEnvironment from the current environment.
We used to start with an empty map, which leads to modules'
setupRunEnvironment scripts overwriting the environment instead of
enriching it. For instance, when an application built with qbs was
run from Qt Creator, it did not get the environment specified by
the user, but only what qbs' scripts set up.
Change-Id: I13bcba8f051d773cc135dc7bb91440a88b2c18c4
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'src/lib/corelib/language/builtinvalue.h')
| -rw-r--r-- | src/lib/corelib/language/builtinvalue.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/corelib/language/builtinvalue.h b/src/lib/corelib/language/builtinvalue.h index c9b0791b3..a8e2d188f 100644 --- a/src/lib/corelib/language/builtinvalue.h +++ b/src/lib/corelib/language/builtinvalue.h @@ -43,6 +43,7 @@ public: { GetNativeSettingFunction, GetEnvFunction, + CurrentEnvFunction, CanonicalArchitectureFunction, Rfc1034IdentifierFunction }; |