move setting of _QMAKE_{SUPER,CONF,CACHE}_ to a more logical location
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Thu, 31 Oct 2013 17:01:29 +0000 (18:01 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 18 Nov 2013 11:12:07 +0000 (12:12 +0100)
commit0e5e10808de28025b1c3e198ef3b7c83a64c9394
treec5ba10cb92b6a265a62aeae8903b19397d0f627c
parent0bf84aa7873edd7bb411fabb94481b03d1501c68
move setting of _QMAKE_{SUPER,CONF,CACHE}_ to a more logical location

there is no point in setting the variables already when peeking into
the caches, as that is done in a separate evaluator anyway.
it also makes no sense to have them set while loading the spec itself,
as it's not permitted to do anything with the caches.
so set them at the next convenient point, which is right before actually
loading the caches.

Change-Id: I3717ddf94353dc04e12c52e542f16ed27b578e14
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/0f68222e9ebdf42778d4bb84260268764eb55b30)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
src/linguist/shared/qmakeevaluator.cpp