diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-08-30 10:55:43 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-08-30 10:55:43 +0200 |
| commit | fa53438f915157e152bc45bc79dfd70d25178b4c (patch) | |
| tree | 3b77a6104f0fb858ef16f2709d323c7c6a748941 /src/plugins/debugger/gdb/trkgdbadapter.cpp | |
| parent | 63bc8a0050bac5c4b5a108b8f3f1082e48086ba7 (diff) | |
| download | qt-creator-fa53438f915157e152bc45bc79dfd70d25178b4c.tar.gz | |
Debugger[TRK]: Make @sym@ hack work again.
Diffstat (limited to 'src/plugins/debugger/gdb/trkgdbadapter.cpp')
| -rw-r--r-- | src/plugins/debugger/gdb/trkgdbadapter.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp index 4807add6b8..fa2d30cdaa 100644 --- a/src/plugins/debugger/gdb/trkgdbadapter.cpp +++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp @@ -1492,10 +1492,12 @@ void TrkGdbAdapter::startAdapter() m_remoteExecutable = parameters.executable; m_remoteArguments = parameters.processArgs; m_symbolFile = parameters.symbolFileName; + QString remoteChannel = parameters.remoteChannel; // FIXME: testing hack, remove! - if (parameters.processArgs.size() == 3 && parameters.processArgs.at(0) == _("@sym@")) { - m_remoteExecutable = parameters.processArgs.at(1); - m_symbolFile = parameters.processArgs.at(2); + if (parameters.processArgs.size() >= 4 && parameters.processArgs.at(0) == _("@sym@")) { + remoteChannel = parameters.processArgs.at(1); + m_remoteExecutable = parameters.processArgs.at(2); + m_symbolFile = parameters.processArgs.at(3); m_remoteArguments.clear(); } // Unixish gdbs accept only forward slashes @@ -1507,7 +1509,7 @@ void TrkGdbAdapter::startAdapter() // Prompt the user to start communication QString message; - if (!initializeDevice(parameters.remoteChannel, &message)) { + if (!initializeDevice(remoteChannel, &message)) { if (message.isEmpty()) { m_engine->handleAdapterStartFailed(QString(), QString()); } else { |