From fe62330c9fa148d164770d96f051e1ac0966cdff Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 23 Feb 2012 18:49:09 +0100
Subject: [PATCH] debugger: rename 'Break on abort' to 'Break on raise'
Change-Id: I9e1751e890c42cc9f2d7f855b25c3d7e24b5501f
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/debugger/debuggeractions.cpp | 6 +++---
src/plugins/debugger/debuggeractions.h | 2 +-
src/plugins/debugger/gdb/gdbengine.cpp | 3 +--
src/plugins/debugger/gdb/gdboptionspage.cpp | 12 ++++++------
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index fe5a76ae829..0712a37124f 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -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
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index d35c9ba39ea..1bdc34c496f 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -155,7 +155,7 @@ enum DebuggerActionCode
BreakOnCatch,
BreakOnWarning,
BreakOnFatal,
- BreakOnAbort,
+ BreakOnRaise,
// Registers
AlwaysAdjustRegistersColumnWidths,
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index a3031d5abfc..5412d042733 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -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'");
diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp
index 47da2f08fb3..9eb7b8a75e5 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.cpp
+++ b/src/plugins/debugger/gdb/gdboptionspage.cpp
@@ -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);
--
GitLab