diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-07-20 16:03:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-15 10:55:31 +0000 |
| commit | ad70f2ed20406775e3044c1d22528049b81b9c73 (patch) | |
| tree | 644fcf61671ce54b7962f8a9e282f846c6d30495 | |
| parent | 190aa94be7f5e146bef44862b974d733755cec85 (diff) | |
configure: simplify construction of QMAKE_CONFIG_CACHE
there doesn't appear to be a reason for the former complexity.
QMAKE_CONFIG_LOG was already assigned the simple way.
Change-Id: I6b7e3b5b97c7647237841fa5e16c4959079edc16
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index c3ea334dd8..dd96fb1936 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -2028,10 +2028,7 @@ for (currentConfig, allConfigs) { } qtConfCheckErrors() -!isEmpty(_QMAKE_SUPER_CACHE_): \ - QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_SUPER_CACHE_)/config.cache -else: \ - QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_CACHE_)/config.cache +QMAKE_CONFIG_CACHE = $$OUT_PWD/config.cache QMAKE_CONFIG_CACHE_USE = $$eval(config.input.cache_use) isEmpty(QMAKE_CONFIG_CACHE_USE): \ QMAKE_CONFIG_CACHE_USE = all |