diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-11-23 14:14:46 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-01-08 09:36:13 +0000 |
| commit | 282f15feaae4c525602d537ab65cb61987eb5f7f (patch) | |
| tree | 91b0b6ed14b7dc58f0f7f3e9c09a98cf0a7ab8d3 /.gitignore | |
| parent | c7797184f0813606c93fe7316b7b42e28b81b68b (diff) | |
| download | qtbase-282f15feaae4c525602d537ab65cb61987eb5f7f.tar.gz | |
rewrite qtAddToolEnv()
the primary purpose is making env var prepend mode work for unset
variables on windows. this is achieved by using a conditional and delayed
variable expansion. however, the latter is disabled by default and can
be locally enabled only in batch files. therefore, write wrapper scripts
and substitute them for the actual commands. we do this also on unix,
both for consistency and simply because the commands look much less
confusing.
this change is slightly backwards-incompatible, as invoking
qtAddToolEnv() multiple times on the same command will now make a total
mess. also, invoking it on a command that contains 'make' macro
expansions isn't a good idea, so testcase.prf needed an adjustment. the
function is an undocumented internal, so Nobody Should Care (TM).
this also reverts 80ebedecf9, as it's obsolete now.
Change-Id: I8394b77868b495abcf27b688996ca74c40b80994
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 5a23b64d69..1ecd8c1009 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,10 @@ pcviewer.cfg *_resource.rc .#* *.*# +*_wrapper.sh +*_wrapper.bat +wrapper.sh +wrapper.bat core .qmake.cache .qmake.vars |