From 867357235ecfe12edd9940d5c8ef08f4e6ac559d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 8 Mar 2016 19:38:59 +0100 Subject: delay application of configure -D/-I/-L/-l/-R flags it is important that the flags coming from the current qt build appear first, as otherwise a pre-existing qt installation may interfere with the build. the windows configure does not have any of this magic to start with. Task-number: QTBUG-6351 Change-Id: Iacc1d9b5aa9eed9a5f0513baef9f6c6ffcef0735 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_build_config.prf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mkspecs/features/qt_build_config.prf') diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index b3081b960e..2d437e7f91 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -52,6 +52,9 @@ QMAKE_DIR_REPLACE_SANE = PRECOMPILED_DIR OBJECTS_DIR MOC_DIR RCC_DIR UI_DIR unset(modpath) } +# Apply extra compiler flags passed via configure last. +CONFIG = qt_build_extra $$CONFIG + # Don't actually try to install anything in non-prefix builds. # This is much easier and safer than making every single INSTALLS # assignment conditional. -- cgit v1.2.3