From 95d385466dc367532b3da5e4e38533b20288ac28 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Feb 2015 18:00:57 +0100 Subject: 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 Reviewed-by: Joerg Bornemann --- mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf | 2 -- 1 file changed, 2 deletions(-) (limited to 'mkspecs/unsupported/vxworks-simpentium-dcc') diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf index c362d098db..49f0c21d4a 100644 --- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf +++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf @@ -86,8 +86,6 @@ QMAKE_RANLIB = QMAKE_STRIP = strip QMAKE_STRIPFLAGS_LIB += --strip-unneeded -QMAKE_INSTALL_FILE = install -m 644 -p -QMAKE_INSTALL_PROGRAM = install -m 755 -p include(../../common/unix.conf) load(qt_config) -- cgit v1.2.3