diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-18 08:01:52 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-18 08:01:52 +0000 |
| commit | 3a0764d625a18233006ca438226281bc3c6740c5 (patch) | |
| tree | b40076ee56d61cc4491a2326784e435e39ea6883 /mkspecs/features/configure_base.prf | |
| parent | dafd0955c601fc00f9164f9b955ec9f28b627565 (diff) | |
| parent | e5ac4afbf954a3e1616ce8543d46ddc668d0374f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/features/configure_base.prf')
| -rw-r--r-- | mkspecs/features/configure_base.prf | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mkspecs/features/configure_base.prf b/mkspecs/features/configure_base.prf index dc630a3528..dd1f4e5bfc 100644 --- a/mkspecs/features/configure_base.prf +++ b/mkspecs/features/configure_base.prf @@ -33,7 +33,10 @@ defineTest(qtRunLoggedCommand) { qtLog("+ $$1") output = $$system("( $$1 ) 2>&1", lines, result) - qtLog($$output) + lg = + for (l, output): \ + lg += "> $$l" + qtLog($$lg) !isEmpty(2) { $$2 = $$output export($$2) @@ -42,10 +45,3 @@ defineTest(qtRunLoggedCommand) { !equals(result, 0): return(false) return(true) } - -# Ensure that a cache is present. If none was found on startup, this will create -# one in the build directory of the project which loads this feature. -cache() - -QMAKE_CONFIG_LOG = $$dirname(_QMAKE_CACHE_)/config.log -write_file($$QMAKE_CONFIG_LOG, "") |