Commit fe62330c authored by hjk's avatar hjk Committed by hjk

debugger: rename 'Break on abort' to 'Break on raise'

Change-Id: I9e1751e890c42cc9f2d7f855b25c3d7e24b5501f
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 873b0805
......@@ -338,12 +338,12 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
insertItem(BreakOnFatal, item);
item = new SavedAction(this);
item->setText(tr("Break on \"abort\""));
item->setText(tr("Break on \"raise\""));
item->setCheckable(true);
item->setDefaultValue(false);
item->setValue(false);
item->setSettingsKey(debugModeGroup, QLatin1String("BreakOnAbort"));
insertItem(BreakOnAbort, item);
item->setSettingsKey(debugModeGroup, QLatin1String("BreakOnRaise"));
insertItem(BreakOnRaise, item);
//
// Settings
......
......@@ -155,7 +155,7 @@ enum DebuggerActionCode
BreakOnCatch,
BreakOnWarning,
BreakOnFatal,
BreakOnAbort,
BreakOnRaise,
// Registers
AlwaysAdjustRegistersColumnWidths,
......
......@@ -4947,8 +4947,7 @@ void GdbEngine::handleNamespaceExtraction(const GdbResponse &response)
if (startParameters().startMode == AttachCore) {
notifyInferiorSetupOk(); // No breakpoints in core files.
} else {
if (debuggerCore()->boolSetting(BreakOnAbort)
&& startParameters().toolChainAbi.os() == Abi::WindowsOS)
if (debuggerCore()->boolSetting(BreakOnRaise))
postCommand("-break-insert -f raise");
if (debuggerCore()->boolSetting(BreakOnWarning))
postCommand("-break-insert -f '" + qtNamespace() + "qWarning'");
......
......@@ -71,7 +71,7 @@ public:
QCheckBox *checkBoxAutoEnrichParameters;
QCheckBox *checkBoxBreakOnWarning;
QCheckBox *checkBoxBreakOnFatal;
QCheckBox *checkBoxBreakOnAbort;
QCheckBox *checkBoxBreakOnRaise;
QCheckBox *checkBoxEnableReverseDebugging;
QGroupBox *groupBoxStartupCommands;
......@@ -165,8 +165,8 @@ public:
checkBoxBreakOnFatal = new QCheckBox(groupBoxGeneral);
checkBoxBreakOnFatal->setText(GdbOptionsPage::tr("Stop when a qFatal is issued"));
checkBoxBreakOnAbort = new QCheckBox(groupBoxGeneral);
checkBoxBreakOnAbort->setText(GdbOptionsPage::tr("Stop when abort is called"));
checkBoxBreakOnRaise = new QCheckBox(groupBoxGeneral);
checkBoxBreakOnRaise->setText(GdbOptionsPage::tr("Stop when raise() is called"));
checkBoxEnableReverseDebugging = new QCheckBox(groupBoxGeneral);
checkBoxEnableReverseDebugging->setText(GdbOptionsPage::tr("Enable reverse debugging"));
......@@ -221,7 +221,7 @@ public:
formLayout->addRow(checkBoxAutoEnrichParameters);
formLayout->addRow(checkBoxBreakOnWarning);
formLayout->addRow(checkBoxBreakOnFatal);
formLayout->addRow(checkBoxBreakOnAbort);
formLayout->addRow(checkBoxBreakOnRaise);
formLayout->addRow(checkBoxEnableReverseDebugging);
QGridLayout *startLayout = new QGridLayout(groupBoxStartupCommands);
......@@ -298,8 +298,8 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent)
m_ui->checkBoxBreakOnWarning);
m_group.insert(debuggerCore()->action(BreakOnFatal),
m_ui->checkBoxBreakOnFatal);
m_group.insert(debuggerCore()->action(BreakOnAbort),
m_ui->checkBoxBreakOnAbort);
m_group.insert(debuggerCore()->action(BreakOnRaise),
m_ui->checkBoxBreakOnRaise);
m_group.insert(debuggerCore()->action(GdbWatchdogTimeout),
m_ui->spinBoxGdbWatchdogTimeout);
......
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