diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index fe5a76ae82915bdfd023a9da91649b865da20df8..0712a37124fa9392bd58cb3c65ea901d707fc6f4 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 d35c9ba39ea7a7023aec9a824735d7bd0a3bf005..1bdc34c496fec4df59cfa622956d50a72a1533fe 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 a3031d5abfce39311cedee3147b7b14e550f57cf..5412d0427339e21348390689e489e148ca5f1b04 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 47da2f08fb323d3b0ebc063dd6b54ba2a3458fe8..9eb7b8a75e58fa147fb1aeb57143ee5a29e426c6 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);