debugger: remove custom dumper location settings

Reviewed-by: con

src/plugins/debugger/commonoptionspage.cpp

@@ -214,12 +214,6 @@ bool CommonOptionsPage::matches(const QString &s) const
 //
 ///////////////////////////////////////////////////////////////////////
 
-static bool oxygenStyle()
-{
-    const ManhattanStyle *ms = qobject_cast<const ManhattanStyle *>(qApp->style());
-    return ms && !qstrcmp("OxygenStyle", ms->baseStyle()->metaObject()->className());
-}
-
 QString DebuggingHelperOptionPage::id() const
 {
     return _("Z.DebuggingHelper");
@@ -260,25 +254,11 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent)
     QWidget *w = new QWidget(parent);
     m_ui.setupUi(w);
 
-    m_ui.dumperLocationChooser->setExpectedKind(Utils::PathChooser::Command);
-    m_ui.dumperLocationChooser->setPromptDialogTitle(QCoreApplication::translate
-        ("Debugger", "Choose DebuggingHelper Location"));
-    m_ui.dumperLocationChooser->setInitialBrowsePathBackup(
-        ICore::instance()->resourcePath() + "../../lib");
-
     m_group.clear();
     DebuggerCore *dc = debuggerCore();
 
     m_group.insert(dc->action(UseDebuggingHelpers),
         m_ui.debuggingHelperGroupBox);
-    m_group.insert(dc->action(UseCustomDebuggingHelperLocation),
-        m_ui.customLocationGroupBox);
-    // Suppress Oxygen style's giving flat group boxes bold titles.
-    if (oxygenStyle())
-        m_ui.customLocationGroupBox->setStyleSheet(_("QGroupBox::title { font: ; }"));
-
-    m_group.insert(dc->action(CustomDebuggingHelperLocation),
-        m_ui.dumperLocationChooser);
 
     m_group.insert(dc->action(UseCodeModel),
         m_ui.checkBoxUseCodeModel);
@@ -299,8 +279,6 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent)
     if (m_searchKeywords.isEmpty()) {
         QTextStream(&m_searchKeywords)
                 << ' ' << m_ui.debuggingHelperGroupBox->title()
-                << ' ' << m_ui.customLocationGroupBox->title()
-                << ' ' << m_ui.dumperLocationLabel->text()
                 << ' ' << m_ui.checkBoxUseCodeModel->text()
                 << ' ' << m_ui.checkBoxShowThreadNames->text();
         m_searchKeywords.remove(QLatin1Char('&'));

src/plugins/debugger/debuggeractions.cpp

@@ -258,20 +258,6 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
     item->setValue(true);
     insertItem(UseDebuggingHelpers, item);
 
-    item = new SavedAction(this);
-    item->setSettingsKey(debugModeGroup, QLatin1String("UseCustomDebuggingHelperLocation"));
-    item->setCheckable(true);
-    item->setDefaultValue(false);
-    item->setValue(false);
-    insertItem(UseCustomDebuggingHelperLocation, item);
-
-    item = new SavedAction(this);
-    item->setSettingsKey(debugModeGroup, QLatin1String("CustomDebuggingHelperLocation"));
-    item->setCheckable(true);
-    item->setDefaultValue(QString());
-    item->setValue(QString());
-    insertItem(CustomDebuggingHelperLocation, item);
-
     item = new SavedAction(this);
     item->setSettingsKey(debugModeGroup, QLatin1String("UseCodeModel"));
     item->setText(tr("Use Code Model"));

src/plugins/debugger/debuggeractions.h

@@ -100,8 +100,6 @@ enum DebuggerActionCode
     SwitchModeOnExit,
 
     UseDebuggingHelpers,
-    UseCustomDebuggingHelperLocation,
-    CustomDebuggingHelperLocation,
 
     UseCodeModel,
     ShowThreadNames,

src/plugins/debugger/debuggerengine.cpp

@@ -646,13 +646,6 @@ bool DebuggerEngine::qtDumperLibraryEnabled() const
 
 QStringList DebuggerEngine::qtDumperLibraryLocations() const
 {
-    if (debuggerCore()->action(UseCustomDebuggingHelperLocation)->value().toBool()) {
-        const QString customLocation =
-            debuggerCore()->action(CustomDebuggingHelperLocation)->value().toString();
-        const QString location =
-            tr("%1 (explicitly set in the Debugger Options)").arg(customLocation);
-        return QStringList(location);
-    }
     return d->m_startParameters.dumperLibraryLocations;
 }
 
@@ -663,8 +656,6 @@ void DebuggerEngine::showQtDumperLibraryWarning(const QString &details)
 
 QString DebuggerEngine::qtDumperLibraryName() const
 {
-    if (debuggerCore()->action(UseCustomDebuggingHelperLocation)->value().toBool())
-        return debuggerCore()->action(CustomDebuggingHelperLocation)->value().toString();
     return startParameters().dumperLibrary;
 }
 

src/plugins/debugger/dumperoptionpage.ui

@@ -50,31 +50,6 @@
       <bool>true</bool>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QGroupBox" name="customLocationGroupBox">
-        <property name="title">
-         <string>Use debugging helper from custom location</string>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-        <layout class="QFormLayout" name="formLayout">
-         <item row="0" column="0">
-          <widget class="QLabel" name="dumperLocationLabel">
-           <property name="text">
-            <string>Location: </string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="Utils::PathChooser" name="dumperLocationChooser" native="true"/>
-         </item>
-        </layout>
-       </widget>
-      </item>
       <item>
        <widget class="QCheckBox" name="checkBoxUseCodeModel">
         <property name="toolTip">