diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-01 09:42:14 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-11 08:04:55 +0000 |
| commit | f18cc7e3cc21c6a318f28077294400d5b7fe90cf (patch) | |
| tree | 47792ae7b54f38f86c9f0ac8cab81cc24d82eb81 /mkspecs/features/configure_base.prf | |
| parent | 615b9c1f06c1d95da5bfad7dca2b27e4fbaaada8 (diff) | |
fix configure qtLog()
its actual function was qtLogCommand(), but all callers outside
configure_base.prf apparently didn't know that. adjust implementation.
Change-Id: I910d4ba33c6f31debc81c37e3bfff1a288190355
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs/features/configure_base.prf')
| -rw-r--r-- | mkspecs/features/configure_base.prf | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mkspecs/features/configure_base.prf b/mkspecs/features/configure_base.prf index 31e8116490..b19bbae51d 100644 --- a/mkspecs/features/configure_base.prf +++ b/mkspecs/features/configure_base.prf @@ -25,13 +25,12 @@ QMAKE_MAKE = "$${SETENV_PFX}MAKEFLAGS=$$SETENV_SFX $$QMAKE_MAKE" isEmpty(QMAKE_CONFIG_VERBOSE): QMAKE_CONFIG_VERBOSE = false defineTest(qtLog) { - msg = "+ $$1" - write_file($$QMAKE_CONFIG_LOG, msg, append) - $$QMAKE_CONFIG_VERBOSE: log("$$msg$$escape_expand(\\n)") + write_file($$QMAKE_CONFIG_LOG, 1, append) + $$QMAKE_CONFIG_VERBOSE: log("$$1$$escape_expand(\\n)") } defineTest(qtRunLoggedCommand) { - qtLog($$1) + qtLog("+ $$1") output = $$system("( $$1 ) 2>&1", blob, result) write_file($${QMAKE_CONFIG_LOG}, output, append) |