Debugger: Infrastructure for reworked native mixed debugging

- Remove old experimental native mixed approach.
- Move some common stack parsing to Stackhandler.
- Mark gdbbridge.py debug output explicitly to remove it
  from actual reponse handling

New native mixed needs QtDeclarative changes and
QTC_DEBUGGER_NATIVE_MIXED=1 for now.

Change-Id: I09eed1da51cea878636d36756015b7bfaed34203
Reviewed-by: Christian Stenger <[email protected]>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 44a0ad06f3b..b95d1965890 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -757,14 +757,15 @@ const BreakpointParameters &Breakpoint::parameters() const
 void Breakpoint::addToCommand(DebuggerCommand *cmd) const
 {
     cmd->arg("modelid", id().toByteArray());
+    cmd->arg("id", int(response().id.majorPart()));
     cmd->arg("type", type());
     cmd->arg("ignorecount", ignoreCount());
     cmd->arg("condition", condition().toHex());
     cmd->arg("function", functionName().toUtf8());
     cmd->arg("oneshot", isOneShot());
     cmd->arg("enabled", isEnabled());
-    cmd->arg("fileName", fileName().toUtf8());
-    cmd->arg("lineNumber", lineNumber());
+    cmd->arg("file", fileName().toUtf8());
+    cmd->arg("line", lineNumber());
     cmd->arg("address", address());
     cmd->arg("expression", expression());
 }