feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Fix newlines in application output window.

Browse Source
This commit is contained in:
Christian Kandeler
2011-04-01 10:24:20 +02:00
parent c4c8676c08
commit ec34a9044e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
View File

@@ -338,7 +338,7 @@ void MaemoDebugSupport::handleRemoteErrorOutput(const QByteArray &output)
void MaemoDebugSupport::handleProgressReport(const QString &progressOutput) void MaemoDebugSupport::handleProgressReport(const QString &progressOutput)
{ {
showMessage(progressOutput, AppStuff); showMessage(progressOutput + QLatin1Char('\n'), AppStuff);
} }
void MaemoDebugSupport::handleAdapterSetupFailed(const QString &error) void MaemoDebugSupport::handleAdapterSetupFailed(const QString &error)

6
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
View File

@@ -98,7 +98,7 @@ void MaemoRunControl::handleSshError(const QString &error)
void MaemoRunControl::startExecution() 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") m_runner->startExecution(QString::fromLocal8Bit("%1 %2 %3 %4")
.arg(MaemoGlobal::remoteCommandPrefix(m_runner->remoteExecutable())) .arg(MaemoGlobal::remoteCommandPrefix(m_runner->remoteExecutable()))
.arg(MaemoGlobal::remoteEnvironment(m_runner->userEnvChanges())) .arg(MaemoGlobal::remoteEnvironment(m_runner->userEnvChanges()))
@@ -109,7 +109,7 @@ void MaemoRunControl::startExecution()
void MaemoRunControl::handleRemoteProcessFinished(qint64 exitCode) void MaemoRunControl::handleRemoteProcessFinished(qint64 exitCode)
{ {
if (exitCode != MaemoSshRunner::InvalidExitCode) { 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); .arg(exitCode), NormalMessageFormat);
} }
setFinished(); setFinished();
@@ -127,7 +127,7 @@ void MaemoRunControl::handleRemoteErrorOutput(const QByteArray &output)
void MaemoRunControl::handleProgressReport(const QString &progressString) void MaemoRunControl::handleProgressReport(const QString &progressString)
{ {
appendMessage(progressString, NormalMessageFormat); appendMessage(progressString + QLatin1Char('\n'), NormalMessageFormat);
} }
void MaemoRunControl::handleMountDebugOutput(const QString &output) void MaemoRunControl::handleMountDebugOutput(const QString &output)