diff --git a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp index 87d771eef98475cd566def316474c7fc1fe22f74..5207e8baacb2c1c02d81733af4799f817c617ced 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp @@ -190,9 +190,10 @@ void AbstractMaemoDeployStep::raiseError(const QString &errorString) emit error(); } -void AbstractMaemoDeployStep::writeOutput(const QString &text, OutputFormat format) +void AbstractMaemoDeployStep::writeOutput(const QString &text, OutputFormat format, + OutputNewlineSetting newlineSetting) { - emit addOutput(text, format); + emit addOutput(text, format, newlineSetting); } void AbstractMaemoDeployStep::stop() @@ -377,7 +378,7 @@ void AbstractMaemoDeployStep::handleRemoteStdout(const QString &output) switch (m_baseState) { case Deploying: case StopRequested: - writeOutput(output, NormalOutput); + writeOutput(output, NormalOutput, DontAppendNewline); break; default: break; @@ -391,7 +392,7 @@ void AbstractMaemoDeployStep::handleRemoteStderr(const QString &output) switch (m_baseState) { case Deploying: case StopRequested: - writeOutput(output, ErrorOutput); + writeOutput(output, ErrorOutput, DontAppendNewline); break; default: break; diff --git a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.h b/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.h index 6470e30f965286976e4454e9b5a5e24d1c2ff32a..47fe4bd3250d1733e88f1e54627f88ebf491316b 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.h +++ b/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.h @@ -89,7 +89,8 @@ protected: BaseState baseState() const { return m_baseState; } void raiseError(const QString &error); - void writeOutput(const QString &text, OutputFormat = MessageOutput); + void writeOutput(const QString &text, OutputFormat format = MessageOutput, + OutputNewlineSetting newlineSetting = DoAppendNewline); void setDeploymentFinished(); const AbstractMaemoPackageCreationStep *packagingStep() const; QString deployMountPoint() const; diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp index 33d0b069ce8fbb0dab998ed8493e8d44a0f69050..2dbe02bf820044b49f2e134efbb13e728fdab08f 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp @@ -147,7 +147,7 @@ void AbstractMaemoDeployByMountStep::handleMountDebugOutput(const QString &outpu ASSERT_BASE_STATE(QList<BaseState>() << Deploying << StopRequested); if (m_extendedState != Inactive) - writeOutput(output, ErrorOutput); + writeOutput(output, ErrorOutput, DontAppendNewline); } void AbstractMaemoDeployByMountStep::mount()