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

GDB: Always read init scripts after python dumpers

Browse Source 
If the user overrides a dumper function (e.g. threadnames), it is
not overridden when the target is a core dump, because the python
dumpers are re-read after loading the init scripts.

Change-Id: I8740228e754a4ed96352188bdfa4ffec95cdeaa0
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Orgad Shaneh
2011-12-05 08:53:51 +02:00
committed by hjk
parent 59ef5edcf5
commit 55714612a5
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4677,12 +4677,15 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &settingsIdHint)
loadPythonDumpers();
const QString script = sp.overrideStartScript;
return true;
}
void GdbEngine::loadInitScript()
{
const QString script = startParameters().overrideStartScript;
if (!script.isEmpty()) {
if (QFileInfo(script).isReadable()) {
postCommand("source " + script.toLocal8Bit());
// Re-do the setup, as the "source" might have changed something.
postCommand("bbsetup", ConsoleCommand, CB(handleHasPython));
} else {
showMessageBox(QMessageBox::Warning,
tr("Cannot find debugger initialization script"),
@@ -4693,14 +4696,9 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &settingsIdHint)
}
} else {
const QString commands = debuggerCore()->stringSetting(GdbStartupCommands);
if (!commands.isEmpty()) {
if (!commands.isEmpty())
postCommand(commands.toLocal8Bit());
// Re-do the setup, as the "source" might have changed something.
postCommand("bbsetup", ConsoleCommand, CB(handleHasPython));
}
}
return true;
}
void GdbEngine::loadPythonDumpers()
@@ -4714,6 +4712,9 @@ void GdbEngine::loadPythonDumpers()
ConsoleCommand|NonCriticalResponse);
postCommand("python execfile('" + dumperSourcePath + "qttypes.py')",
ConsoleCommand|NonCriticalResponse);
loadInitScript();
postCommand("bbsetup",
ConsoleCommand, CB(handleHasPython));
}