From 1c110388ec405444f4d5106e7b94142c9d1f9b27 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 23 Mar 2009 13:02:50 +0100
Subject: [PATCH] debugger: work on using prebuilt dumpers
---
src/plugins/debugger/debuggeractions.cpp | 1 +
src/plugins/debugger/debuggerplugin.cpp | 7 ++++++-
src/plugins/debugger/dumperoptionpage.ui | 2 +-
tests/manual/gdbdebugger/simple/app.cpp | 1 -
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 7c42474b751..b336b638a3a 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -424,6 +424,7 @@ DebuggerSettings *theDebuggerSettings()
item = new DebuggerAction(instance);
instance->insertItem(BuildDumpersOnTheFly, item);
+ item->setDefaultValue(true);
item->setSettingsKey("DebugMode", "BuildDumpersOnTheFly");
item->setCheckable(true);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 76b3033d685..5f5aa0dd834 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -375,9 +375,13 @@ QWidget *DumperOptionPage::createPage(QWidget *parent)
m_ui.dumperLocationChooser->setExpectedKind(Core::Utils::PathChooser::Command);
m_ui.dumperLocationChooser->setPromptDialogTitle(tr("Choose Dumper Location"));
+ m_ui.dumperLocationChooser->setInitialBrowsePathBackup(
+ Core::ICore::instance()->resourcePath() + "../../lib");
theDebuggerAction(UsePrebuiltDumpers)
->connectWidget(m_ui.radioButtonUsePrebuiltDumpers);
+ theDebuggerAction(BuildDumpersOnTheFly)
+ ->connectWidget(m_ui.radioButtonBuildDumpersOnTheFly);
theDebuggerAction(PrebuiltDumpersLocation)
->connectWidget(m_ui.dumperLocationChooser);
@@ -410,6 +414,7 @@ void DumperOptionPage::apply()
theDebuggerAction(UseDumpers)->apply(s);
theDebuggerAction(UsePrebuiltDumpers)->apply(s);
+ theDebuggerAction(BuildDumpersOnTheFly)->apply(s);
theDebuggerAction(PrebuiltDumpersLocation)->apply(s);
theDebuggerAction(DebugDumpers)->apply(s);
}
@@ -1019,7 +1024,7 @@ void DebuggerPlugin::focusCurrentEditor(IMode *mode)
void DebuggerPlugin::showSettingsDialog()
{
- Core::ICore::instance()->showOptionsDialog("Debugger", "Gdb");
+ Core::ICore::instance()->showOptionsDialog("Debugger", "General");
}
#include "debuggerplugin.moc"
diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui
index f89cff0e38c..0219fe898b5 100644
--- a/src/plugins/debugger/dumperoptionpage.ui
+++ b/src/plugins/debugger/dumperoptionpage.ui
@@ -21,7 +21,7 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="QRadioButton" name="radioButtonDumpersOnTheFly">
+ <widget class="QRadioButton" name="radioButtonBuildDumpersOnTheFly">
<property name="toolTip">
<string>This is the slowest but safest option.</string>
</property>
diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp
index 50191f91d12..4115a49a508 100644
--- a/tests/manual/gdbdebugger/simple/app.cpp
+++ b/tests/manual/gdbdebugger/simple/app.cpp
@@ -702,7 +702,6 @@ void testStdVector()
void testQString()
{
- int i = 0;
QString str = "Hello ";
str += " big, ";
str += " fat ";
--
GitLab