From 85596e7b19769aa3a4828d63beff903fba74c831 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 4 Aug 2009 18:49:10 +0200
Subject: [PATCH] Debug output from TRK might have windows style line endings
---
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 4 ++--
tests/manual/trk/trkutils.cpp | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 583a041b9f7..13a145aedb2 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -591,7 +591,7 @@ void S60DeviceRunControl::signsisProcessFinished()
m_adapter->setCopyFileName(copySrc, copyDst);
m_adapter->setInstallFileName(copyDst);
m_adapter->setFileName(runFileName);
- emit addToOutputWindow(this, tr("Starting application on %1...").arg(m_serialPortFriendlyName));
+ emit addToOutputWindow(this, tr("Deploying application to %1...").arg(m_serialPortFriendlyName));
if (!m_adapter->startServer()) {
delete m_adapter;
m_adapter = 0;
@@ -613,7 +613,7 @@ void S60DeviceRunControl::printInstallingNotice()
void S60DeviceRunControl::printStartingNotice()
{
- emit addToOutputWindow(this, tr("Running application..."));
+ emit addToOutputWindow(this, tr("Starting application..."));
}
void S60DeviceRunControl::printRunNotice(uint pid)
diff --git a/tests/manual/trk/trkutils.cpp b/tests/manual/trk/trkutils.cpp
index 5b6ea12ce60..4f18be2ad9d 100644
--- a/tests/manual/trk/trkutils.cpp
+++ b/tests/manual/trk/trkutils.cpp
@@ -106,6 +106,7 @@ TrkResult extractResult(QByteArray *buffer)
if (buffer->at(4) != 0x7e) {
result.isDebugOutput = true;
result.data = buffer->mid(4, len);
+ result.data.replace("\r\n", "\n");
*buffer = buffer->mid(4 + len);
return result;
}
--
GitLab