diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-26 12:17:37 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-31 12:57:43 +0000 |
| commit | d56d2e0cb25e8190d58594eb1c397715c94416a1 (patch) | |
| tree | 0bd94353f9179a936fe6f00f0752cc9318f6c3f4 | |
| parent | 1a004bf550c93aa2ddeeaaf22c8bedbb1bad6a92 (diff) | |
don't redirect licheck's stderr
it uses it for interaction.
Task-number: QTBUG-61017
Change-Id: I9edc0f9aa91793bc451fa78a8f6ad11d61e04b57
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| -rw-r--r-- | configure.pri | 2 | ||||
| -rw-r--r-- | mkspecs/features/configure_base.prf | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.pri b/configure.pri index 115277e057..45692d6b5c 100644 --- a/configure.pri +++ b/configure.pri @@ -153,7 +153,7 @@ defineReplace(qtConfFunc_licenseCheck) { $$system_quote($$eval(config.input.confirm-license)) \ $$system_quote($$QT_SOURCE_TREE) $$system_quote($$QT_BUILD_TREE) \ $$[QMAKE_SPEC] $$[QMAKE_XSPEC]", \ - LicheckOutput): \ + LicheckOutput, false): \ return(false) logn() for (o, LicheckOutput) { diff --git a/mkspecs/features/configure_base.prf b/mkspecs/features/configure_base.prf index a4464528b4..e870e2ee10 100644 --- a/mkspecs/features/configure_base.prf +++ b/mkspecs/features/configure_base.prf @@ -31,7 +31,9 @@ defineTest(qtLog) { defineTest(qtRunLoggedCommand) { qtLog("+ $$1") - output = $$system("( $$1 ) 2>&1", lines, result) + !equals(3, false): \ + 1 = "( $$1 ) 2>&1" + output = $$system("$$1", lines, result) lg = for (l, output): \ lg += "> $$l" |