diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-06 18:00:57 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-06 19:08:40 +0000 |
| commit | 95d385466dc367532b3da5e4e38533b20288ac28 (patch) | |
| tree | e7c8e79b6a4e1ec5eef112432bbdfaa7905d1939 /mkspecs/common/unix.conf | |
| parent | 6400e4bb10ad855bd62b019bf459b50aeac53468 (diff) | |
centralize setup of shell-related variables in spec_post.prf
it makes no sense to let every spec do that separately, as it's fixed
by the generator+shell.
putting it into a file which is loaded regardless of the spec also
allows us to remove the hardcoded fallbacks from qmake.
if somebody overrode the values in their spec for some weird reasons,
they'll need to override spec_post.prf.
shell-{unix,win32}.conf are now dummies and print warnings.
Task-number: QTBUG-37269
Change-Id: I66c24fb4072ce4d63fdbfc57618daa2a48fa1d80
Reviewed-by: Jochen Seemann <seemann.jochen@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs/common/unix.conf')
| -rw-r--r-- | mkspecs/common/unix.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mkspecs/common/unix.conf b/mkspecs/common/unix.conf index c0deafd141..2146b62f17 100644 --- a/mkspecs/common/unix.conf +++ b/mkspecs/common/unix.conf @@ -14,5 +14,3 @@ QMAKE_YACC_SOURCE = $base.tab.c QMAKE_PREFIX_SHLIB = lib QMAKE_PREFIX_STATICLIB = lib QMAKE_EXTENSION_STATICLIB = a - -include(shell-unix.conf) |