diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2011-03-31 18:22:22 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@nokia.com> | 2011-03-31 18:33:27 +0200 |
| commit | 2407f4258fba0c603e2e11cfd840cf413412b728 (patch) | |
| tree | 8e17a640e49df844b8190ed6ac716413e4e3527f /src/plugins/projectexplorer/abstractprocessstep.cpp | |
| parent | fcbb38988bd8ba8f8e29b5051179ac6bf25904f6 (diff) | |
| download | qt-creator-2407f4258fba0c603e2e11cfd840cf413412b728.tar.gz | |
ProjectExplorer: Adapt output window clients to fixed newline handling.
Reviewed-by: dt
Diffstat (limited to 'src/plugins/projectexplorer/abstractprocessstep.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/abstractprocessstep.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index ddc37f12de..8fcf218f79 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -175,7 +175,7 @@ void AbstractProcessStep::run(QFutureInterface<bool> &fi) void AbstractProcessStep::processStarted() { - emit addOutput(tr("Starting: \"%1\" %2\n") + emit addOutput(tr("Starting: \"%1\" %2") .arg(QDir::toNativeSeparators(m_param.effectiveCommand()), m_param.prettyArguments()), BuildStep::MessageOutput); @@ -222,7 +222,7 @@ void AbstractProcessStep::stdOutput(const QString &line) { if (m_outputParserChain) m_outputParserChain->stdOutput(line); - emit addOutput(line, BuildStep::NormalOutput); + emit addOutput(line, BuildStep::NormalOutput, BuildStep::DontAppendNewline); } void AbstractProcessStep::processReadyReadStdError() @@ -238,7 +238,7 @@ void AbstractProcessStep::stdError(const QString &line) { if (m_outputParserChain) m_outputParserChain->stdError(line); - emit addOutput(line, BuildStep::ErrorOutput); + emit addOutput(line, BuildStep::ErrorOutput, BuildStep::DontAppendNewline); } void AbstractProcessStep::checkForCancel() @@ -301,7 +301,7 @@ void AbstractProcessStep::taskAdded(const ProjectExplorer::Task &task) void AbstractProcessStep::outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format) { - emit addOutput(string, format); + emit addOutput(string, format, BuildStep::DontAppendNewline); } void AbstractProcessStep::slotProcessFinished(int, QProcess::ExitStatus) |