AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix configure qtLog()

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2016-08-01 09:42:14 +02:00 committed by Lars Knoll
parent 615b9c1f06
commit f18cc7e3cc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/features/configure_base.prf
View File

@ -25,13 +25,12 @@ QMAKE_MAKE = "$${SETENV_PFX}MAKEFLAGS=$$SETENV_SFX $$QMAKE_MAKE"
isEmpty(QMAKE_CONFIG_VERBOSE): QMAKE_CONFIG_VERBOSE = false isEmpty(QMAKE_CONFIG_VERBOSE): QMAKE_CONFIG_VERBOSE = false
defineTest(qtLog) { defineTest(qtLog) {
msg = "+ $$1" write_file($$QMAKE_CONFIG_LOG, 1, append)
write_file($$QMAKE_CONFIG_LOG, msg, append) $$QMAKE_CONFIG_VERBOSE: log("$$1$$escape_expand(\\n)")
$$QMAKE_CONFIG_VERBOSE: log("$$msg$$escape_expand(\\n)")
} }
defineTest(qtRunLoggedCommand) { defineTest(qtRunLoggedCommand) {
qtLog($$1) qtLog("+ $$1")
output = $$system("( $$1 ) 2>&1", blob, result) output = $$system("( $$1 ) 2>&1", blob, result)
write_file($${QMAKE_CONFIG_LOG}, output, append) write_file($${QMAKE_CONFIG_LOG}, output, append)