diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-11 09:34:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-11 09:34:23 +0200 |
| commit | 093290a662c17cdbedee7e820ec51c3e5ba82aef (patch) | |
| tree | 9523faf19abf5f3d411a16e7758367a05efe8a76 /mkspecs/features/configure_base.prf | |
| parent | c7cbf216999cd833cae667b8c6fbfa65d33e8efd (diff) | |
| parent | 95c8f24b71445956651a5d1eade9475dceb16675 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/ios/quiview.mm
Change-Id: I0fd0adeca1590fffddd577873172f6d987a60412
Diffstat (limited to 'mkspecs/features/configure_base.prf')
| -rw-r--r-- | mkspecs/features/configure_base.prf | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/mkspecs/features/configure_base.prf b/mkspecs/features/configure_base.prf index e870e2ee10..73e0273f18 100644 --- a/mkspecs/features/configure_base.prf +++ b/mkspecs/features/configure_base.prf @@ -23,9 +23,29 @@ QMAKE_MAKE_NAME = $$basename(QMAKE_MAKE) # Make sure we don't inherit MAKEFLAGS - -i in particular is fatal. QMAKE_MAKE = "$${SETENV_PFX}MAKEFLAGS=$$SETENV_SFX $$QMAKE_MAKE" +QMAKE_PERSIST_LOG = false +QMAKE_PERSISTED_LOG = + defineTest(qtLog) { write_file($$QMAKE_CONFIG_LOG, 1, append) $$QMAKE_CONFIG_VERBOSE: for (l, 1): log("$$l$$escape_expand(\\n)") + $$QMAKE_PERSIST_LOG { + QMAKE_PERSISTED_LOG += $$1 + export(QMAKE_PERSISTED_LOG) + } +} + +defineTest(qtPersistLog) { + QMAKE_PERSIST_LOG = true + QMAKE_PERSISTED_LOG = + export(QMAKE_PERSIST_LOG) + export(QMAKE_PERSISTED_LOG) +} + +defineReplace(qtPersistedLog) { + QMAKE_PERSIST_LOG = false + export(QMAKE_PERSIST_LOG) + return($$QMAKE_PERSISTED_LOG) } defineTest(qtRunLoggedCommand) { |