debugger: work on using prebuilt dumpers

3 files changed, 8 insertions, 2 deletions

diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 7c42474b75..b336b638a3 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 76b3033d68..5f5aa0dd83 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 f89cff0e38..0219fe898b 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>