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

debugger: merge notifyEngineRemoteSetup* and handleRemoteSetup*

Browse Source 
Change-Id: I89abcb0dcceef6767cb3e78f4e85c1cd718e78c1
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-06-13 11:29:26 +02:00
committed by hjk
parent d601e3799f
commit ceb575741c
17 changed files with 56 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/debuggerengine.cpp
View File

@@ -939,9 +939,10 @@ void DebuggerEngine::notifyEngineRequestRemoteSetup()
emit requestRemoteSetup();
}
void DebuggerEngine::notifyEngineRemoteSetupDone()
void DebuggerEngine::notifyEngineRemoteSetupDone(int gdbServerPort, int qmlPort)
{
showMessage(_("NOTE: REMOTE SETUP DONE"));
showMessage(_("NOTE: REMOTE SETUP DONE: GDB SERVER PORT: %1 QML PORT %2")
.arg(gdbServerPort).arg(qmlPort));
QTC_ASSERT(state() == EngineSetupRequested
|| state() == EngineSetupFailed
|| state() == DebuggerFinished, qDebug() << this << state());
@@ -956,9 +957,9 @@ void DebuggerEngine::notifyEngineRemoteSetupDone()
d->setRemoteSetupState(RemoteSetupSucceeded);
}
void DebuggerEngine::notifyEngineRemoteSetupFailed()
void DebuggerEngine::notifyEngineRemoteSetupFailed(const QString &message)
{
showMessage(_("NOTE: REMOTE SETUP FAILED"));
showMessage(_("NOTE: REMOTE SETUP FAILED: ") + message);
QTC_ASSERT(state() == EngineSetupRequested
|| state() == EngineSetupFailed
|| state() == DebuggerFinished, qDebug() << this << state());
@@ -1825,15 +1826,6 @@ void DebuggerEngine::openDisassemblerView(const Location &location)
agent->setLocation(location);
}
void DebuggerEngine::handleRemoteSetupDone(int /*gdbServerPort*/,
int /*qmlPort*/)
{
}
void DebuggerEngine::handleRemoteSetupFailed(const QString &/*message*/)
{
}
bool DebuggerEngine::isStateDebugging() const
{
return d->m_isStateDebugging;