forked from qt-creator/qt-creator
Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
This commit is contained in:
@@ -352,16 +352,16 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
|
||||
m_ui.checkBoxUseMessageBoxForSignals);
|
||||
m_group.insert(theDebuggerAction(SkipKnownFrames),
|
||||
m_ui.checkBoxSkipKnownFrames);
|
||||
m_group.insert(theDebuggerAction(UseToolTipsInMainEditor),
|
||||
m_group.insert(theDebuggerAction(UseToolTipsInMainEditor),
|
||||
m_ui.checkBoxUseToolTipsInMainEditor);
|
||||
m_group.insert(theDebuggerAction(AutoDerefPointers), 0);
|
||||
m_group.insert(theDebuggerAction(UseToolTipsInLocalsView), 0);
|
||||
m_group.insert(theDebuggerAction(UseToolTipsInBreakpointsView), 0);
|
||||
m_group.insert(theDebuggerAction(UseAddressInBreakpointsView), 0);
|
||||
m_group.insert(theDebuggerAction(UseAddressInStackView), 0);
|
||||
m_group.insert(theDebuggerAction(EnableReverseDebugging),
|
||||
m_group.insert(theDebuggerAction(EnableReverseDebugging),
|
||||
m_ui.checkBoxEnableReverseDebugging);
|
||||
m_group.insert(theDebuggerAction(MaximalStackDepth),
|
||||
m_group.insert(theDebuggerAction(MaximalStackDepth),
|
||||
m_ui.spinBoxMaximalStackDepth);
|
||||
m_group.insert(theDebuggerAction(GdbWatchdogTimeout), 0);
|
||||
m_group.insert(theDebuggerAction(ShowStdNamespace), 0);
|
||||
@@ -432,7 +432,7 @@ public:
|
||||
virtual bool matches(const QString &s) const;
|
||||
|
||||
private:
|
||||
Ui::DebuggingHelperOptionPage m_ui;
|
||||
Ui::DebuggingHelperOptionPage m_ui;
|
||||
Utils::SavedActionSet m_group;
|
||||
QString m_searchKeywords;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user