Commit 85596e7b authored by con's avatar con
Browse files

Debug output from TRK might have windows style line endings

parent d680a7dd
......@@ -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)
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment