From 759732c89db1671a0cbfa53a6286c8edfea22a13 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Thu, 31 Mar 2011 18:23:01 +0200
Subject: [PATCH] Maemo: More adaptations to fixed outout window newline
handling.
---
.../qt-maemo/abstractmaemodeploystep.cpp | 9 +++++----
.../qt4projectmanager/qt-maemo/abstractmaemodeploystep.h | 3 ++-
.../qt-maemo/maemodeploybymountstep.cpp | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp
index 87d771eef98..5207e8baacb 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 6470e30f965..47fe4bd3250 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 33d0b069ce8..2dbe02bf820 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()
--
GitLab