Commit 40c9b8f2 authored by hjk's avatar hjk

debugger: remove "debug debugging helper" option

Only useful for the compiled dumpers, and I have not used it for a while.
parent 78850785
......@@ -189,14 +189,6 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
item->setValue(QString());
insertItem(CustomDebuggingHelperLocation, item);
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("DebugDebuggingHelpers"));
item->setText(tr("Debug Debugging Helpers"));
item->setCheckable(true);
item->setDefaultValue(false);
item->setValue(false);
insertItem(DebugDebuggingHelpers, item);
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("UseCodeModel"));
item->setText(tr("Use Code Model"));
......
......@@ -85,7 +85,6 @@ enum DebuggerActionCode
UseDebuggingHelpers,
UseCustomDebuggingHelperLocation,
CustomDebuggingHelperLocation,
DebugDebuggingHelpers,
UseCodeModel,
......
......@@ -703,13 +703,6 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent)
m_group.insert(debuggerCore()->action(UseCodeModel),
m_ui.checkBoxUseCodeModel);
#ifdef QT_DEBUG
m_group.insert(debuggerCore()->action(DebugDebuggingHelpers),
m_ui.checkBoxDebugDebuggingHelpers);
#else
m_ui.checkBoxDebugDebuggingHelpers->hide();
#endif
#ifndef QT_DEBUG
#if 0
cmd = am->registerAction(m_manager->m_dumpLogAction,
......@@ -725,8 +718,7 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent)
<< ' ' << m_ui.debuggingHelperGroupBox->title()
<< ' ' << m_ui.customLocationGroupBox->title()
<< ' ' << m_ui.dumperLocationLabel->text()
<< ' ' << m_ui.checkBoxUseCodeModel->text()
<< ' ' << m_ui.checkBoxDebugDebuggingHelpers->text();
<< ' ' << m_ui.checkBoxUseCodeModel->text();
m_searchKeywords.remove(QLatin1Char('&'));
}
return w;
......
......@@ -70,16 +70,6 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxDebugDebuggingHelpers">
<property name="toolTip">
<string notr="true">This is an internal tool to make debugging the debugging helper code easier. Using this action is in general not needed unless you want do debug Qt Creator itself.</string>
</property>
<property name="text">
<string>Debug debugging helper</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
......
......@@ -586,27 +586,12 @@ void GdbEngine::updateAllClassic()
updateLocals();
}
void GdbEngine::setDebugDebuggingHelpersClassic(const QVariant &on)
{
PRECONDITION;
if (on.toBool()) {
showMessage(_("SWITCHING ON DUMPER DEBUGGING"));
postCommand("set unwindonsignal off");
//FIXME BP: breakByFunction(_("qDumpObjectData440"));
//updateLocals();
} else {
showMessage(_("SWITCHING OFF DUMPER DEBUGGING"));
postCommand("set unwindonsignal on");
}
}
void GdbEngine::setDebuggingHelperStateClassic(DebuggingHelperState s)
{
PRECONDITION;
m_debuggingHelperState = s;
}
void GdbEngine::handleStackListArgumentsClassic(const GdbResponse &response)
{
PRECONDITION;
......
......@@ -1769,9 +1769,6 @@ void GdbEngine::setupEngine()
connect(debuggerCore()->action(UseDebuggingHelpers),
SIGNAL(valueChanged(QVariant)),
SLOT(setUseDebuggingHelpers(QVariant)));
connect(debuggerCore()->action(DebugDebuggingHelpers),
SIGNAL(valueChanged(QVariant)),
SLOT(setDebugDebuggingHelpersClassic(QVariant)));
}
QTC_ASSERT(state() == EngineSetupRequested, /**/);
......@@ -3338,10 +3335,6 @@ void GdbEngine::setToolTipExpression(const QPoint &mousePos,
return;
}
// Minimize interference.
if (debuggerCore()->boolSetting(DebugDebuggingHelpers))
return;
m_toolTipPos = mousePos;
int line, column;
QString exp = cppExpressionAt(editor, cursorPos, &line, &column);
......@@ -3459,19 +3452,15 @@ bool GdbEngine::hasDebuggingHelperForType(const QByteArray &type) const
return false;
if (m_gdbAdapter->dumperHandling() == AbstractGdbAdapter::DumperNotAvailable) {
// "call" is not possible in gdb when looking at core files
// Inferior calls are not possible in gdb when looking at core files.
return type == "QString" || type.endsWith("::QString")
|| type == "QStringList" || type.endsWith("::QStringList");
}
if (debuggerCore()->boolSetting(DebugDebuggingHelpers)
&& stackHandler()->isDebuggingDebuggingHelpers())
return false;
if (m_debuggingHelperState != DebuggingHelperAvailable)
return false;
// simple types
// Simple types.
return m_dumperHelper.type(type) != QtDumperHelper::UnknownType;
}
......
......@@ -516,7 +516,6 @@ private: ////////// View & Data Stuff //////////
void setDebuggingHelperStateClassic(DebuggingHelperState);
void tryLoadDebuggingHelpersClassic();
void tryQueryDebuggingHelpersClassic();
Q_SLOT void setDebugDebuggingHelpersClassic(const QVariant &on);
Q_SLOT void setUseDebuggingHelpers(const QVariant &on);
DebuggingHelperState m_debuggingHelperState;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment