forked from qt-creator/qt-creator
Debugger: Break on raise() -> Break on abort()
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:
@@ -352,7 +352,7 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
|
|||||||
insertItem(BreakOnFatal, item);
|
insertItem(BreakOnFatal, item);
|
||||||
|
|
||||||
item = new SavedAction(this);
|
item = new SavedAction(this);
|
||||||
item->setText(tr("Break on \"raise\""));
|
item->setText(tr("Break on \"abort\""));
|
||||||
item->setCheckable(true);
|
item->setCheckable(true);
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
item->setDefaultValue(true);
|
item->setDefaultValue(true);
|
||||||
@@ -361,8 +361,8 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
|
|||||||
item->setDefaultValue(false);
|
item->setDefaultValue(false);
|
||||||
item->setValue(false);
|
item->setValue(false);
|
||||||
#endif
|
#endif
|
||||||
item->setSettingsKey(debugModeGroup, QLatin1String("BreakOnRaise"));
|
item->setSettingsKey(debugModeGroup, QLatin1String("BreakOnAbort"));
|
||||||
insertItem(BreakOnRaise, item);
|
insertItem(BreakOnAbort, item);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Settings
|
// Settings
|
||||||
|
@@ -157,7 +157,7 @@ enum DebuggerActionCode
|
|||||||
BreakOnCatch,
|
BreakOnCatch,
|
||||||
BreakOnWarning,
|
BreakOnWarning,
|
||||||
BreakOnFatal,
|
BreakOnFatal,
|
||||||
BreakOnRaise,
|
BreakOnAbort,
|
||||||
|
|
||||||
// Registers
|
// Registers
|
||||||
AlwaysAdjustRegistersColumnWidths,
|
AlwaysAdjustRegistersColumnWidths,
|
||||||
|
@@ -5140,8 +5140,8 @@ void GdbEngine::handleNamespaceExtraction(const GdbResponse &response)
|
|||||||
if (startParameters().startMode == AttachCore) {
|
if (startParameters().startMode == AttachCore) {
|
||||||
notifyInferiorSetupOk(); // No breakpoints in core files.
|
notifyInferiorSetupOk(); // No breakpoints in core files.
|
||||||
} else {
|
} else {
|
||||||
if (debuggerCore()->boolSetting(BreakOnRaise))
|
if (debuggerCore()->boolSetting(BreakOnAbort))
|
||||||
postCommand("-break-insert -f raise");
|
postCommand("-break-insert -f abort");
|
||||||
if (debuggerCore()->boolSetting(BreakOnWarning))
|
if (debuggerCore()->boolSetting(BreakOnWarning))
|
||||||
postCommand("-break-insert -f '" + qtNamespace() + "qWarning'");
|
postCommand("-break-insert -f '" + qtNamespace() + "qWarning'");
|
||||||
if (debuggerCore()->boolSetting(BreakOnFatal))
|
if (debuggerCore()->boolSetting(BreakOnFatal))
|
||||||
|
@@ -71,7 +71,7 @@ public:
|
|||||||
QCheckBox *checkBoxAutoEnrichParameters;
|
QCheckBox *checkBoxAutoEnrichParameters;
|
||||||
QCheckBox *checkBoxBreakOnWarning;
|
QCheckBox *checkBoxBreakOnWarning;
|
||||||
QCheckBox *checkBoxBreakOnFatal;
|
QCheckBox *checkBoxBreakOnFatal;
|
||||||
QCheckBox *checkBoxBreakOnRaise;
|
QCheckBox *checkBoxBreakOnAbort;
|
||||||
QCheckBox *checkBoxEnableReverseDebugging;
|
QCheckBox *checkBoxEnableReverseDebugging;
|
||||||
QCheckBox *checkBoxAttemptQuickStart;
|
QCheckBox *checkBoxAttemptQuickStart;
|
||||||
|
|
||||||
@@ -166,8 +166,8 @@ public:
|
|||||||
checkBoxBreakOnFatal = new QCheckBox(groupBoxGeneral);
|
checkBoxBreakOnFatal = new QCheckBox(groupBoxGeneral);
|
||||||
checkBoxBreakOnFatal->setText(GdbOptionsPage::tr("Stop when a qFatal is issued"));
|
checkBoxBreakOnFatal->setText(GdbOptionsPage::tr("Stop when a qFatal is issued"));
|
||||||
|
|
||||||
checkBoxBreakOnRaise = new QCheckBox(groupBoxGeneral);
|
checkBoxBreakOnAbort = new QCheckBox(groupBoxGeneral);
|
||||||
checkBoxBreakOnRaise->setText(GdbOptionsPage::tr("Stop when raise() is called"));
|
checkBoxBreakOnAbort->setText(GdbOptionsPage::tr("Stop when abort() is called"));
|
||||||
|
|
||||||
checkBoxEnableReverseDebugging = new QCheckBox(groupBoxGeneral);
|
checkBoxEnableReverseDebugging = new QCheckBox(groupBoxGeneral);
|
||||||
checkBoxEnableReverseDebugging->setText(GdbOptionsPage::tr("Enable reverse debugging"));
|
checkBoxEnableReverseDebugging->setText(GdbOptionsPage::tr("Enable reverse debugging"));
|
||||||
@@ -229,7 +229,7 @@ public:
|
|||||||
formLayout->addRow(checkBoxAutoEnrichParameters);
|
formLayout->addRow(checkBoxAutoEnrichParameters);
|
||||||
formLayout->addRow(checkBoxBreakOnWarning);
|
formLayout->addRow(checkBoxBreakOnWarning);
|
||||||
formLayout->addRow(checkBoxBreakOnFatal);
|
formLayout->addRow(checkBoxBreakOnFatal);
|
||||||
formLayout->addRow(checkBoxBreakOnRaise);
|
formLayout->addRow(checkBoxBreakOnAbort);
|
||||||
formLayout->addRow(checkBoxEnableReverseDebugging);
|
formLayout->addRow(checkBoxEnableReverseDebugging);
|
||||||
formLayout->addRow(checkBoxAttemptQuickStart);
|
formLayout->addRow(checkBoxAttemptQuickStart);
|
||||||
|
|
||||||
@@ -307,8 +307,8 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent)
|
|||||||
m_ui->checkBoxBreakOnWarning);
|
m_ui->checkBoxBreakOnWarning);
|
||||||
m_group.insert(debuggerCore()->action(BreakOnFatal),
|
m_group.insert(debuggerCore()->action(BreakOnFatal),
|
||||||
m_ui->checkBoxBreakOnFatal);
|
m_ui->checkBoxBreakOnFatal);
|
||||||
m_group.insert(debuggerCore()->action(BreakOnRaise),
|
m_group.insert(debuggerCore()->action(BreakOnAbort),
|
||||||
m_ui->checkBoxBreakOnRaise);
|
m_ui->checkBoxBreakOnAbort);
|
||||||
m_group.insert(debuggerCore()->action(GdbWatchdogTimeout),
|
m_group.insert(debuggerCore()->action(GdbWatchdogTimeout),
|
||||||
m_ui->spinBoxGdbWatchdogTimeout);
|
m_ui->spinBoxGdbWatchdogTimeout);
|
||||||
m_group.insert(debuggerCore()->action(AttemptQuickStart),
|
m_group.insert(debuggerCore()->action(AttemptQuickStart),
|
||||||
|
Reference in New Issue
Block a user