feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Break on raise() -> Break on abort()

Browse Source 
Win64 doesn't seem to have raise() at all, or at least it isn't
called on abort()

Change-Id: Ief7a97c321db0f91629848852719977d14094173
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Orgad Shaneh
2012-05-08 18:01:28 +03:00
committed by hjk
parent 4f169b2150
commit b3416a57d7
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/debuggeractions.cpp
View File

@@ -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

2
src/plugins/debugger/debuggeractions.h
View File

@@ -157,7 +157,7 @@ enum DebuggerActionCode
BreakOnCatch,
BreakOnWarning,
BreakOnFatal,
BreakOnRaise,
BreakOnAbort,
// Registers
AlwaysAdjustRegistersColumnWidths,

4
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -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))

12
src/plugins/debugger/gdb/gdboptionspage.cpp
View File

@@ -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),