summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2012-06-08 13:37:44 +0200
committerJoerg Bornemann <joerg.bornemann@nokia.com>2012-06-09 10:02:07 +0200
commitde7779022abbafd57d02dcb45a7c27e8c15becb6 (patch)
tree336d204355379431306ecc06c3f3c5e13d1bebac
parent28235fb362e3b6eafbbff29bb7c552a353235fdb (diff)
output all commands when run with /n
The /n switch should output all commands, even those prefixed with @. Task-number: QTCREATORBUG-7170 Change-Id: I90d930276d4ee993ecdfc4528abfb5354b089651 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r--src/jomlib/commandexecutor.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/jomlib/commandexecutor.cpp b/src/jomlib/commandexecutor.cpp
index d44580b..49bc9fa 100644
--- a/src/jomlib/commandexecutor.cpp
+++ b/src/jomlib/commandexecutor.cpp
@@ -178,7 +178,9 @@ void CommandExecutor::executeCurrentCommandLine()
int jomCallIdx = commandLine.indexOf(m_pTarget->makefile()->options()->fullAppPath);
bool spawnJOM = (jomCallIdx >= 0);
- if (!cmd.m_silent && !m_pTarget->makefile()->options()->suppressExecutedCommandsDisplay) {
+ if (m_pTarget->makefile()->options()->dryRun
+ || (!cmd.m_silent && !m_pTarget->makefile()->options()->suppressExecutedCommandsDisplay))
+ {
QByteArray output = commandLine.toLocal8Bit();
output.prepend('\t');
output.append('\n');