diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-03-13 10:34:46 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-03-24 07:23:32 +0000 |
| commit | d8323376670fdc65e4a4a654def8b78b650bdbe7 (patch) | |
| tree | 4dd93b6586ae75441709dec974ada2c734e5c763 /LICENSE.LGPLv3 | |
| parent | 2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e (diff) | |
Fix detection of QMAKE_DEFAULT{INC|LIB}DIRS for gcc cross-builds
The --sysroot flag is added to QMAKE_CXXFLAGS by the gcc-sysroot
feature. However, when the makespec is reloaded, it can overwrite
QMAKE_CXXFLAGS.
Save QMAKE_CXXFLAGS before re-loading the mkspec and add it to the
value from the makespec, like we do for CONFIG.
Fixes: QTBUG-74326
Change-Id: Ie1fb713e2ffc9641d6db8c682bc5175581cd5b5f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'LICENSE.LGPLv3')
0 files changed, 0 insertions, 0 deletions