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

Debugger: Fix setting of Qt version fallback, again

Browse Source 
Change-Id: I6b6cd448884800cb6d08dbdce15cb99f4ea8ba2b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-11-10 11:44:40 +01:00
parent a0fba57508
commit a8afa5c65c
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/debugger/dumper.py
View File

@@ -253,8 +253,8 @@ class DumperBase():
#DumperBase.warn('WATCHERS: %s' % self.watchers) #DumperBase.warn('WATCHERS: %s' % self.watchers)
def setFallbackQtVersion(self, args): def setFallbackQtVersion(self, args):
version = int(args.get('version', '0x%x' % self.fallbackQtVersion), 16) version = int(args.get('version', self.fallbackQtVersion))
self.warn("got fallback qt version %x" % version) DumperBase.warn("got fallback qt version 0x%x" % version)
self.fallbackQtVersion = version self.fallbackQtVersion = version
def resetPerStepCaches(self): def resetPerStepCaches(self):

6
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -2832,8 +2832,10 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
runCommand({command, ScriptCommand}); runCommand({command, ScriptCommand});
} }
const QString qtVersion = QString::number(runParameters().fallbackQtVersion, 16); DebuggerCommand cmd0("theDumper.setFallbackQtVersion", ScriptCommand);
runCommand({"theDumper.setFallbackQtVersion(0x" + qtVersion + ")", ScriptCommand}); cmd0.arg("version", runParameters().fallbackQtVersion);
runCommand(cmd0);
runCommand({"theDumper.loadDumpers(None)", ScriptCommand, runCommand({"theDumper.loadDumpers(None)", ScriptCommand,
[this](const DebuggerResponse &response) { [this](const DebuggerResponse &response) {
watchHandler()->addDumpers(response.data["result"]["dumpers"]); watchHandler()->addDumpers(response.data["result"]["dumpers"]);

5
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -4007,7 +4007,10 @@ void GdbEngine::setupEngine()
if (!commands.isEmpty()) if (!commands.isEmpty())
runCommand({commands}); runCommand({commands});
runCommand({"setFallbackQtVersion(0x" + QString::number(rp.fallbackQtVersion, 16) + ")"}); DebuggerCommand cmd1("setFallbackQtVersion");
cmd1.arg("version", rp.fallbackQtVersion);
runCommand(cmd1);
runCommand({"loadDumpers", CB(handlePythonSetup)}); runCommand({"loadDumpers", CB(handlePythonSetup)});
// Reload peripheral register description. // Reload peripheral register description.

8
src/plugins/debugger/lldb/lldbengine.cpp
View File

@@ -264,10 +264,6 @@ void LldbEngine::setupEngine()
runCommand(cmd); runCommand(cmd);
} }
DebuggerCommand cmd0("setFallbackQtVersion");
cmd0.arg("version", "0x" + QString::number(rp.fallbackQtVersion, 16));
runCommand(cmd0);
DebuggerCommand cmd1("loadDumpers"); DebuggerCommand cmd1("loadDumpers");
cmd1.callback = [this](const DebuggerResponse &response) { cmd1.callback = [this](const DebuggerResponse &response) {
watchHandler()->addDumpers(response.data["dumpers"]); watchHandler()->addDumpers(response.data["dumpers"]);
@@ -343,6 +339,10 @@ void LldbEngine::setupEngine()
cmd2.flags = Silent; cmd2.flags = Silent;
runCommand(cmd2); runCommand(cmd2);
DebuggerCommand cmd0("setFallbackQtVersion");
cmd0.arg("version", rp.fallbackQtVersion);
runCommand(cmd0);
} }
void LldbEngine::runEngine() void LldbEngine::runEngine()