diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index 492ec4144aa..2e032bee0b7 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -253,12 +253,12 @@ class Dumper(DumperBase): self.useDynamicType = int(args.get("dyntype", "0")) self.useFancy = int(args.get("fancy", "0")) self.forceQtNamespace = int(args.get("forcens", "0")) - self.passExceptions = int(args.get("passexeptions", "0")) + self.passExceptions = int(args.get("passexceptions", "0")) self.nativeMixed = int(args.get("nativemixed", "0")) self.autoDerefPointers = int(args.get("autoderef", "0")) self.partialUpdate = int(args.get("partial", "0")) self.fallbackQtVersion = 0x50200 - self.sortStructMembers = bool(args.get("sortStructMembers", True)) + self.sortStructMembers = bool(args.get("sortstructs", True)) #warn("NAMESPACE: '%s'" % self.qtNamespace()) #warn("EXPANDED INAMES: %s" % self.expandedINames) @@ -355,7 +355,7 @@ class Dumper(DumperBase): def fetchVariables(self, args): self.prepare(args) - partialVariable = args.get("partialVariable", "") + partialVariable = args.get("partialvar", "") isPartial = len(partialVariable) > 0 (ok, res) = self.tryFetchInterpreterVariables(args) @@ -1763,7 +1763,7 @@ class CliDumper(Dumper): def fetchVariables(self, args): args['fancy'] = 1 - args['passException'] = 1 + args['passexception'] = 1 args['autoderef'] = 1 name = args['varlist'] self.prepare(args) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 093797e7ab4..d38e9d1f5da 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -654,14 +654,14 @@ class Dumper(DumperBase): error = lldb.SBError() self.executable_ = args['executable'] - self.startMode_ = args.get('startMode', 1) - self.breakOnMain_ = args.get('breakOnMain', 0) - self.useTerminal_ = args.get('useTerminal', 0) - self.processArgs_ = args.get('processArgs', []) + self.startMode_ = args.get('startmode', 1) + self.breakOnMain_ = args.get('breakonmain', 0) + self.useTerminal_ = args.get('useterminal', 0) + self.processArgs_ = args.get('processargs', []) self.processArgs_ = map(lambda x: self.hexdecode(x), self.processArgs_) - self.attachPid_ = args.get('attachPid', 0) - self.sysRoot_ = args.get('sysRoot', '') - self.remoteChannel_ = args.get('remoteChannel', '') + self.attachPid_ = args.get('attachpid', 0) + self.sysRoot_ = args.get('sysroot', '') + self.remoteChannel_ = args.get('remotechannel', '') self.platform_ = args.get('platform', '') self.nativeMixed = int(args.get('nativemixed', 0)) @@ -1152,13 +1152,13 @@ class Dumper(DumperBase): self.expandedINames = set(args.get('expanded', [])) self.autoDerefPointers = int(args.get('autoderef', '0')) - self.sortStructMembers = bool(args.get('sortStructMembers', True)); + self.sortStructMembers = bool(args.get('sortstructs', True)); self.useDynamicType = int(args.get('dyntype', '0')) self.useFancy = int(args.get('fancy', '0')) self.passExceptions = int(args.get('passexceptions', '0')) self.currentWatchers = args.get('watchers', {}) - self.typeformats = args.get("typeformats", {}) - self.formats = args.get("formats", {}) + self.typeformats = args.get('typeformats', {}) + self.formats = args.get('formats', {}) frame = self.currentFrame() if frame is None: @@ -1166,7 +1166,7 @@ class Dumper(DumperBase): return self.output = '' - partialVariable = args.get("partialVariable", "") + partialVariable = args.get('partialvar', "") isPartial = len(partialVariable) > 0 self.currentIName = 'local' diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 5303b65c9b5..b18d4fdccf6 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -4625,7 +4625,7 @@ void GdbEngine::doUpdateLocals(const UpdateParameters ¶ms) const static bool alwaysVerbose = !qgetenv("QTC_DEBUGGER_PYTHON_VERBOSE").isEmpty(); - cmd.arg("passExceptions", alwaysVerbose); + cmd.arg("passexceptions", alwaysVerbose); cmd.arg("fancy", boolSetting(UseDebuggingHelpers)); cmd.arg("autoderef", boolSetting(AutoDerefPointers)); cmd.arg("dyntype", boolSetting(UseDynamicType)); @@ -4635,12 +4635,12 @@ void GdbEngine::doUpdateLocals(const UpdateParameters ¶ms) cmd.arg("context", frame.context); cmd.arg("resultvarname", m_resultVarName); - cmd.arg("partialVariable", params.partialVariable); - cmd.arg("sortStructMembers", boolSetting(SortStructMembers)); + cmd.arg("partialvar", params.partialVariable); + cmd.arg("sortstructs", boolSetting(SortStructMembers)); cmd.callback = CB(handleFetchVariables); runCommand(cmd); - cmd.arg("passExceptions", true); + cmd.arg("passexceptions", true); m_lastDebuggableCommand = cmd; } diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index c9536e92c62..bb5fa23620e 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -332,15 +332,15 @@ void LldbEngine::setupInferior() DebuggerCommand cmd2("setupInferior"); cmd2.arg("executable", executable); - cmd2.arg("breakOnMain", rp.breakOnMain); - cmd2.arg("useTerminal", rp.useTerminal); - cmd2.arg("startMode", rp.startMode); + cmd2.arg("breakonmain", rp.breakOnMain); + cmd2.arg("useterminal", rp.useTerminal); + cmd2.arg("startmode", rp.startMode); cmd2.arg("nativemixed", isNativeMixedActive()); QJsonArray processArgs; foreach (const QString &arg, args.toUnixArgs()) processArgs.append(QLatin1String(arg.toUtf8().toHex())); - cmd2.arg("processArgs", processArgs); + cmd2.arg("processargs", processArgs); if (rp.useTerminal) { QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state()); @@ -350,18 +350,18 @@ void LldbEngine::setupInferior() ? QString::fromLatin1("Attaching to %1 (%2)").arg(attachedPID).arg(attachedMainThreadID) : QString::fromLatin1("Attaching to %1").arg(attachedPID); showMessage(msg, LogMisc); - cmd2.arg("attachPid", attachedPID); + cmd2.arg("attachpid", attachedPID); } else { - cmd2.arg("startMode", rp.startMode); + cmd2.arg("startmode", rp.startMode); // it is better not to check the start mode on the python sid (as we would have to duplicate the // enum values), and thus we assume that if the rp.attachPID is valid we really have to attach QTC_CHECK(rp.attachPID <= 0 || (rp.startMode == AttachCrashedExternal || rp.startMode == AttachExternal)); - cmd2.arg("attachPid", rp.attachPID); - cmd2.arg("sysRoot", rp.deviceSymbolsRoot.isEmpty() ? rp.sysRoot : rp.deviceSymbolsRoot); - cmd2.arg("remoteChannel", ((rp.startMode == AttachToRemoteProcess + cmd2.arg("attachpid", rp.attachPID); + cmd2.arg("sysroot", rp.deviceSymbolsRoot.isEmpty() ? rp.sysRoot : rp.deviceSymbolsRoot); + cmd2.arg("remotechannel", ((rp.startMode == AttachToRemoteProcess || rp.startMode == AttachToRemoteServer) ? rp.remoteChannel : QString())); cmd2.arg("platform", rp.platform); @@ -795,8 +795,8 @@ void LldbEngine::doUpdateLocals(const UpdateParameters ¶ms) cmd.arg("fancy", boolSetting(UseDebuggingHelpers)); cmd.arg("autoderef", boolSetting(AutoDerefPointers)); cmd.arg("dyntype", boolSetting(UseDynamicType)); - cmd.arg("partialVariable", params.partialVariable); - cmd.arg("sortStructMembers", boolSetting(SortStructMembers)); + cmd.arg("partialvar", params.partialVariable); + cmd.arg("sortstructs", boolSetting(SortStructMembers)); StackFrame frame = stackHandler()->currentFrame(); cmd.arg("context", frame.context); diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index c04d79b1dee..fe31eb3b354 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1282,7 +1282,7 @@ void tst_Dumpers::dumper() "python theDumper.setupDumpers()\n" "run " + nograb + "\n" "python theDumper.fetchVariables({'fancy':1,'forcens':1," - "'autoderef':1,'dyntype':1,'passExceptions':1," + "'autoderef':1,'dyntype':1,'passexceptions':1," "'expanded':[" + expandedq + "]})\n"; cmds += "quit\n";