qmake: Evaluate extra configs before loading default_pre
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>
Tue, 8 Oct 2013 21:44:24 +0000 (23:44 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 30 Oct 2013 15:53:41 +0000 (16:53 +0100)
commit7eee2f66ef9e438565b9056e1f5ad73a62f15468
tree0659bc99cec66e78a85bc079b5e19a9364bf3961
parentacc73fd24430df8fd3b9eb8c0736f868064f2fa4
qmake: Evaluate extra configs before loading default_pre

Exclusive builds uses setExtraConfigs to apply the particular CONFIG
of each build pass. Unfortunately we were not applying these extra
configs early enough in QMakeEvaluator::visitProFile() for them to
be picked up/usable by default_pre, something that can be useful.

Change-Id: I423a4688250a15f0c1a2cc65a48f0bbc14ad4497
(cherry picked from qtbase/eea1c359c9663cec15e7373c065ee06cba151eed)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
src/linguist/shared/qmakeevaluator.cpp
src/linguist/shared/qmakeevaluator.h