4 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 2858c56e7c..7095ee809a 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -352,7 +352,7 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
     insertItem(BreakOnFatal, item);
 
     item = new SavedAction(this);
-    item->setText(tr("Break on \"raise\""));
+    item->setText(tr("Break on \"abort\""));
     item->setCheckable(true);
 #ifdef Q_OS_WIN
     item->setDefaultValue(true);
@@ -361,8 +361,8 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
     item->setDefaultValue(false);
     item->setValue(false);
 #endif
-    item->setSettingsKey(debugModeGroup, QLatin1String("BreakOnRaise"));
-    insertItem(BreakOnRaise, item);
+    item->setSettingsKey(debugModeGroup, QLatin1String("BreakOnAbort"));
+    insertItem(BreakOnAbort, item);
 
     //
     // Settings
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index 1082ae8f2c..13f5135792 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -157,7 +157,7 @@ enum DebuggerActionCode
     BreakOnCatch,
     BreakOnWarning,
     BreakOnFatal,
-    BreakOnRaise,
+    BreakOnAbort,
 
     // Registers
     AlwaysAdjustRegistersColumnWidths,
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 627fceb4aa..d91f899514 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -5140,8 +5140,8 @@ void GdbEngine::handleNamespaceExtraction(const GdbResponse &response)
     if (startParameters().startMode == AttachCore) {
         notifyInferiorSetupOk(); // No breakpoints in core files.
     } else {
-        if (debuggerCore()->boolSetting(BreakOnRaise))
-            postCommand("-break-insert -f raise");
+        if (debuggerCore()->boolSetting(BreakOnAbort))
+            postCommand("-break-insert -f abort");
         if (debuggerCore()->boolSetting(BreakOnWarning))
             postCommand("-break-insert -f '" + qtNamespace() + "qWarning'");
         if (debuggerCore()->boolSetting(BreakOnFatal))
diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp
index bd378fe7ee..879cef5db9 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 *checkBoxBreakOnRaise;
+    QCheckBox *checkBoxBreakOnAbort;
     QCheckBox *checkBoxEnableReverseDebugging;
     QCheckBox *checkBoxAttemptQuickStart;
 
@@ -166,8 +166,8 @@ public:
         checkBoxBreakOnFatal = new QCheckBox(groupBoxGeneral);
         checkBoxBreakOnFatal->setText(GdbOptionsPage::tr("Stop when a qFatal is issued"));
 
-        checkBoxBreakOnRaise = new QCheckBox(groupBoxGeneral);
-        checkBoxBreakOnRaise->setText(GdbOptionsPage::tr("Stop when raise() is called"));
+        checkBoxBreakOnAbort = new QCheckBox(groupBoxGeneral);
+        checkBoxBreakOnAbort->setText(GdbOptionsPage::tr("Stop when abort() is called"));
 
         checkBoxEnableReverseDebugging = new QCheckBox(groupBoxGeneral);
         checkBoxEnableReverseDebugging->setText(GdbOptionsPage::tr("Enable reverse debugging"));
@@ -229,7 +229,7 @@ public:
         formLayout->addRow(checkBoxAutoEnrichParameters);
         formLayout->addRow(checkBoxBreakOnWarning);
         formLayout->addRow(checkBoxBreakOnFatal);
-        formLayout->addRow(checkBoxBreakOnRaise);
+        formLayout->addRow(checkBoxBreakOnAbort);
         formLayout->addRow(checkBoxEnableReverseDebugging);
         formLayout->addRow(checkBoxAttemptQuickStart);
 
@@ -307,8 +307,8 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent)
         m_ui->checkBoxBreakOnWarning);
     m_group.insert(debuggerCore()->action(BreakOnFatal),
         m_ui->checkBoxBreakOnFatal);
-    m_group.insert(debuggerCore()->action(BreakOnRaise),
-        m_ui->checkBoxBreakOnRaise);
+    m_group.insert(debuggerCore()->action(BreakOnAbort),
+        m_ui->checkBoxBreakOnAbort);
     m_group.insert(debuggerCore()->action(GdbWatchdogTimeout),
         m_ui->spinBoxGdbWatchdogTimeout);
     m_group.insert(debuggerCore()->action(AttemptQuickStart),