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

Symbian: Some small fixes in CODA debugging

Browse Source
This commit is contained in:
Pawel Polanski
2011-03-09 12:06:20 +01:00
parent 73dfb09131
commit eeec6711e8
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/gdb/codagdbadapter.cpp
View File

@@ -299,7 +299,7 @@ void CodaGdbAdapter::handleTargetRemote(const GdbResponse &record)
if (debug) if (debug)
qDebug() << "handleTargetRemote" << m_session.toString(); qDebug() << "handleTargetRemote" << m_session.toString();
} else { } else {
QString msg = tr("Connecting to TRK server adapter failed:\n") QString msg = tr("Connecting to CODA server adapter failed:\n")
+ QString::fromLocal8Bit(record.data.findChild("msg").data()); + QString::fromLocal8Bit(record.data.findChild("msg").data());
m_engine->notifyInferiorSetupFailed(msg); m_engine->notifyInferiorSetupFailed(msg);
} }
@@ -1232,7 +1232,7 @@ void CodaGdbAdapter::shutdownAdapter()
m_engine->notifyAdapterShutdownOk(); m_engine->notifyAdapterShutdownOk();
} else { } else {
// Something is wrong, gdb crashed. Kill debuggee (see handleDeleteProcess2) // Something is wrong, gdb crashed. Kill debuggee (see handleDeleteProcess2)
if (m_codaDevice->device()->isOpen()) { if (m_codaDevice && m_codaDevice->device()->isOpen()) {
logMessage("Emergency shutdown of CODA", LogError); logMessage("Emergency shutdown of CODA", LogError);
sendRunControlTerminateCommand(); sendRunControlTerminateCommand();
} }

3
src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
View File

@@ -144,9 +144,8 @@ bool CodaRunControl::setupLauncher()
codaSocket->connectToHost(m_address, m_port); codaSocket->connectToHost(m_address, m_port);
m_state = StateConnecting; m_state = StateConnecting;
appendMessage(tr("Connecting to %1:%2...").arg(m_address).arg(m_port), NormalMessageFormat); appendMessage(tr("Connecting to %1:%2...").arg(m_address).arg(m_port), NormalMessageFormat);
} }
QTimer::singleShot(4000, this, SLOT(checkForTimeout())); QTimer::singleShot(5000, this, SLOT(checkForTimeout()));
if (debug) if (debug)
m_codaDevice->setVerbose(debug); m_codaDevice->setVerbose(debug);