From ec34a9044e328feb865dd1bc2901501bb8da04d0 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 1 Apr 2011 10:24:20 +0200
Subject: [PATCH] Maemo: Fix newlines in application output window.
---
.../qt4projectmanager/qt-maemo/maemodebugsupport.cpp | 2 +-
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
index 0a0c8096459..b1fd13077a9 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
@@ -338,7 +338,7 @@ void MaemoDebugSupport::handleRemoteErrorOutput(const QByteArray &output)
void MaemoDebugSupport::handleProgressReport(const QString &progressOutput)
{
- showMessage(progressOutput, AppStuff);
+ showMessage(progressOutput + QLatin1Char('\n'), AppStuff);
}
void MaemoDebugSupport::handleAdapterSetupFailed(const QString &error)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
index e5ffd635e77..4474d5a0e52 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
@@ -98,7 +98,7 @@ void MaemoRunControl::handleSshError(const QString &error)
void MaemoRunControl::startExecution()
{
- appendMessage(tr("Starting remote process ..."), NormalMessageFormat);
+ appendMessage(tr("Starting remote process ...\n"), NormalMessageFormat);
m_runner->startExecution(QString::fromLocal8Bit("%1 %2 %3 %4")
.arg(MaemoGlobal::remoteCommandPrefix(m_runner->remoteExecutable()))
.arg(MaemoGlobal::remoteEnvironment(m_runner->userEnvChanges()))
@@ -109,7 +109,7 @@ void MaemoRunControl::startExecution()
void MaemoRunControl::handleRemoteProcessFinished(qint64 exitCode)
{
if (exitCode != MaemoSshRunner::InvalidExitCode) {
- appendMessage(tr("Finished running remote process. Exit code was %1.")
+ appendMessage(tr("Finished running remote process. Exit code was %1.\n")
.arg(exitCode), NormalMessageFormat);
}
setFinished();
@@ -127,7 +127,7 @@ void MaemoRunControl::handleRemoteErrorOutput(const QByteArray &output)
void MaemoRunControl::handleProgressReport(const QString &progressString)
{
- appendMessage(progressString, NormalMessageFormat);
+ appendMessage(progressString + QLatin1Char('\n'), NormalMessageFormat);
}
void MaemoRunControl::handleMountDebugOutput(const QString &output)
--
GitLab