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

debugger: fix remote adapter startup

Browse Source
This commit is contained in:
hjk
2010-09-06 11:33:07 +02:00
parent 053f36c45d
commit 0e2a7608f2
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,6 +111,7 @@ DebuggerStartParameters::DebuggerStartParameters()
breakAtMain(false), breakAtMain(false),
qmlServerAddress("127.0.0.1"), qmlServerAddress("127.0.0.1"),
qmlServerPort(0), qmlServerPort(0),
useServerStartScript(false),
toolChainType(ToolChain::UNKNOWN), toolChainType(ToolChain::UNKNOWN),
startMode(NoStartMode), startMode(NoStartMode),
executableUid(0) executableUid(0)
@@ -144,6 +145,7 @@ QDebug operator<<(QDebug str, const DebuggerStartParameters &sp)
<< " remoteChannel=" << sp.remoteChannel << " remoteChannel=" << sp.remoteChannel
<< " remoteArchitecture=" << sp.remoteArchitecture << " remoteArchitecture=" << sp.remoteArchitecture
<< " symbolFileName=" << sp.symbolFileName << " symbolFileName=" << sp.symbolFileName
<< " useServerStartScript=" << sp.useServerStartScript
<< " serverStartScript=" << sp.serverStartScript << " serverStartScript=" << sp.serverStartScript
<< " toolchain=" << sp.toolChainType << '\n'; << " toolchain=" << sp.toolChainType << '\n';
return str; return str;

1
src/plugins/debugger/debuggerengine.h
View File

@@ -85,6 +85,7 @@ public:
QString remoteChannel; QString remoteChannel;
QString remoteArchitecture; QString remoteArchitecture;
QString symbolFileName; QString symbolFileName;
bool useServerStartScript;
QString serverStartScript; QString serverStartScript;
QString sysRoot; QString sysRoot;
QByteArray remoteDumperLib; QByteArray remoteDumperLib;

6
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1764,7 +1764,7 @@ void DebuggerPluginPrivate::attachExternalApplication
sp.displayName = tr("Process %1").arg(pid); sp.displayName = tr("Process %1").arg(pid);
sp.executable = binary; sp.executable = binary;
sp.crashParameter = crashParameter; sp.crashParameter = crashParameter;
sp.startMode = crashParameter.isEmpty() ? AttachExternal:AttachCrashedExternal; sp.startMode = crashParameter.isEmpty() ? AttachExternal : AttachCrashedExternal;
DebuggerRunControl *rc = createDebugger(sp); DebuggerRunControl *rc = createDebugger(sp);
startDebugger(rc); startDebugger(rc);
} }
@@ -1844,8 +1844,8 @@ void DebuggerPluginPrivate::startRemoteApplication()
if (!sp.debuggerCommand.isEmpty()) if (!sp.debuggerCommand.isEmpty())
sp.toolChainType = ToolChain::INVALID; sp.toolChainType = ToolChain::INVALID;
sp.startMode = AttachToRemote; sp.startMode = AttachToRemote;
if (dlg.useServerStartScript()) sp.useServerStartScript = dlg.useServerStartScript();
sp.serverStartScript = dlg.serverStartScript(); sp.serverStartScript = dlg.serverStartScript();
sp.sysRoot = dlg.sysRoot(); sp.sysRoot = dlg.sysRoot();
startDebugger(createDebugger(sp)); startDebugger(createDebugger(sp));
} }

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

@@ -88,6 +88,10 @@ void RemoteGdbServerAdapter::startAdapter()
{ {
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
showMessage(_("TRYING TO START ADAPTER")); showMessage(_("TRYING TO START ADAPTER"));
if (!startParameters().useServerStartScript) {
handleSetupDone();
return;
}
if (startParameters().serverStartScript.isEmpty()) { if (startParameters().serverStartScript.isEmpty()) {
showMessage(_("No server start script given. "), StatusBar); showMessage(_("No server start script given. "), StatusBar);
emit requestSetup(); emit requestSetup();