From 9dcbfc1c44099d2d510163cf16bbb72e6ea42cae Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 15 Feb 2013 18:15:18 +0100 Subject: refactor build config resolution the current approach of having "free-flying" prf files for such a core issue is rather insane. this was noticed early on, as evidenced by the forcible loading of debug/release/debug_and_release in default_post. however, things remained a mess, in particular static vs. shared. consequently, the commit merges all related feature files. the actual config resolution is put in a separate feature file, so it can be loaded by resolve_target if that happens to be loaded early on. Change-Id: Ie30e7c63cabe9409a3263ca1650e323a870926f2 Reviewed-by: Joerg Bornemann --- mkspecs/features/resolve_target.prf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mkspecs/features/resolve_target.prf') diff --git a/mkspecs/features/resolve_target.prf b/mkspecs/features/resolve_target.prf index c60faf22c0..8cd12b2a00 100644 --- a/mkspecs/features/resolve_target.prf +++ b/mkspecs/features/resolve_target.prf @@ -9,6 +9,8 @@ # We mean it. # +load(resolve_config) + QMAKE_RESOLVED_TARGET = $$absolute_path($$DESTDIR, $$OUT_PWD)/ win32 { -- cgit v1.2.3