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

RemoteGdb: Request remote setup also if no start script should be used

Browse Source 
Change-Id: I75ac2792b19cdb2f06ae07a59b6c9c2b2574084a
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Kai Koehne
2012-01-12 13:37:01 +01:00
committed by hjk
parent dac69143af
commit 9e8f935a03
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,17 +87,15 @@ void RemoteGdbServerAdapter::startAdapter()
{
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
showMessage(_("TRYING TO START ADAPTER"));
if (!startParameters().useServerStartScript) {
handleSetupDone();
return;
}
if (startParameters().serverStartScript.isEmpty()) {
showMessage(_("No server start script given. "), StatusBar);
m_engine->requestRemoteSetup();
} else {
m_uploadProc.start(_("/bin/sh ") + startParameters().serverStartScript);
m_uploadProc.waitForStarted();
if (startParameters().useServerStartScript) {
if (startParameters().serverStartScript.isEmpty()) {
showMessage(_("No server start script given. "), StatusBar);
} else {
m_uploadProc.start(_("/bin/sh ") + startParameters().serverStartScript);
m_uploadProc.waitForStarted();
}
}
m_engine->requestRemoteSetup();
}
void RemoteGdbServerAdapter::uploadProcError(QProcess::ProcessError error)