aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2015-07-01 10:37:24 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2015-07-10 15:15:40 +0000
commitf51c33a27f447c2a971b9b6886508c3777698663 (patch)
tree22bbefe5ef0a5733d9cd8501fa1b97d09ee33946 /doc
parentc404c7b9218a82c5bdb642b23560ec5f90661a3f (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 'doc')
-rw-r--r--doc/reference/jsextensions/jsextensions-general.qdoc7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/reference/jsextensions/jsextensions-general.qdoc b/doc/reference/jsextensions/jsextensions-general.qdoc
index c941363cc..54843f7bf 100644
--- a/doc/reference/jsextensions/jsextensions-general.qdoc
+++ b/doc/reference/jsextensions/jsextensions-general.qdoc
@@ -42,6 +42,13 @@
\section1 Available Operations
+ \section2 qbs.currentEnv
+ \code
+ qbs.currentEnv(): { [key: string]: string; }
+ \endcode
+ Returns the environment of \QBS in the current context as an object whose properties are
+ the environment variables.
+
\section2 qbs.getEnv
\code
qbs.getEnv(key: string): string