aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2015-02-19 20:51:15 -0800
committerJake Petroules <jake.petroules@petroules.com>2015-02-25 15:40:32 +0000
commit64cbb7c8cd0c5b4dacad94a88464f8c3b2e59fc1 (patch)
tree905c7d40d52d80424b9bf32332241d41f04f492e /src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
parent6c9de0488a8fcee5e88c00d1df07f9c11e8bacfc (diff)
Replace --show-command-lines with --command-echo-mode.
This allows users to hide command output entirely without changing the logging level. It is also used by the generator command to hide the dry run command "executions" it performs when creating the build graph for project generation. Change-Id: I27a64c8138521001f5b62473b4a3b4ff46d8ba25 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/abstractcommandexecutor.cpp')
-rw-r--r--src/lib/corelib/buildgraph/abstractcommandexecutor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp b/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
index 2f38b6c38..b9215a996 100644
--- a/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
@@ -40,6 +40,7 @@ namespace Internal {
AbstractCommandExecutor::AbstractCommandExecutor(const Logger &logger, QObject *parent)
: QObject(parent)
+ , m_echoMode(defaultCommandEchoMode())
, m_command(0)
, m_transformer(0)
, m_mainThreadScriptEngine(0)
@@ -58,7 +59,7 @@ void AbstractCommandExecutor::start(Transformer *transformer, const AbstractComm
void AbstractCommandExecutor::doReportCommandDescription()
{
- if (m_command->isSilent())
+ if (m_command->isSilent() || m_echoMode == CommandEchoModeSilent)
return;
if (m_command->description().isEmpty()) {