Commit fa53438f authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Debugger[TRK]: Make @sym@ hack work again.

parent 63bc8a00
...@@ -1492,10 +1492,12 @@ void TrkGdbAdapter::startAdapter() ...@@ -1492,10 +1492,12 @@ void TrkGdbAdapter::startAdapter()
m_remoteExecutable = parameters.executable; m_remoteExecutable = parameters.executable;
m_remoteArguments = parameters.processArgs; m_remoteArguments = parameters.processArgs;
m_symbolFile = parameters.symbolFileName; m_symbolFile = parameters.symbolFileName;
QString remoteChannel = parameters.remoteChannel;
// FIXME: testing hack, remove! // FIXME: testing hack, remove!
if (parameters.processArgs.size() == 3 && parameters.processArgs.at(0) == _("@sym@")) { if (parameters.processArgs.size() >= 4 && parameters.processArgs.at(0) == _("@sym@")) {
m_remoteExecutable = parameters.processArgs.at(1); remoteChannel = parameters.processArgs.at(1);
m_symbolFile = parameters.processArgs.at(2); m_remoteExecutable = parameters.processArgs.at(2);
m_symbolFile = parameters.processArgs.at(3);
m_remoteArguments.clear(); m_remoteArguments.clear();
} }
// Unixish gdbs accept only forward slashes // Unixish gdbs accept only forward slashes
...@@ -1507,7 +1509,7 @@ void TrkGdbAdapter::startAdapter() ...@@ -1507,7 +1509,7 @@ void TrkGdbAdapter::startAdapter()
// Prompt the user to start communication // Prompt the user to start communication
QString message; QString message;
if (!initializeDevice(parameters.remoteChannel, &message)) { if (!initializeDevice(remoteChannel, &message)) {
if (message.isEmpty()) { if (message.isEmpty()) {
m_engine->handleAdapterStartFailed(QString(), QString()); m_engine->handleAdapterStartFailed(QString(), QString());
} else { } else {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment