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

Debugger: Simplify handling of requestRemoteSetup in QmlCppEngine

Browse Source 
Just emit the requestRemoteSetup on your own in QmlCppEngine. Also
properly check the related state transitions in DebuggerEngine.

Change-Id: I15dc4236303911126de7eee63ed996bdd8e5c5a8
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Kai Koehne
2012-01-31 13:23:05 +01:00
committed by hjk
parent 095946d441
commit 2a02841383
8 changed files with 119 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -5018,11 +5018,13 @@ void GdbEngine::resetCommandQueue()
void GdbEngine::handleRemoteSetupDone(int gdbServerPort, int qmlPort)
{
notifyEngineRemoteSetupDone();
m_gdbAdapter->handleRemoteSetupDone(gdbServerPort, qmlPort);
}
void GdbEngine::handleRemoteSetupFailed(const QString &message)
{
notifyEngineRemoteSetupFailed();
m_gdbAdapter->handleRemoteSetupFailed(message);
}

2
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
View File

@@ -96,7 +96,7 @@ void RemoteGdbServerAdapter::startAdapter()
}
}
if (startParameters().requestRemoteSetup)
m_engine->requestRemoteSetup();
m_engine->notifyEngineRequestRemoteSetup();
else
handleSetupDone();
}

2
src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
View File

@@ -61,7 +61,7 @@ void RemotePlainGdbAdapter::startAdapter()
m_gdbProc.setEnvironment(startParameters().environment.toStringList());
if (startParameters().requestRemoteSetup)
m_engine->requestRemoteSetup();
m_engine->notifyEngineRequestRemoteSetup();
else
handleRemoteSetupDone(startParameters().connParams.port, startParameters().qmlServerPort);
}