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

debugger: compile fix

Browse Source
This commit is contained in:
hjk
2011-02-22 13:29:00 +01:00
parent 3fcf39a764
commit d652c21181
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/commonoptionspage.cpp
View File

@@ -96,6 +96,12 @@ QIcon CommonOptionsPage::categoryIcon() const
void CommonOptionsPage::apply() void CommonOptionsPage::apply()
{ {
m_group.apply(ICore::instance()->settings()); m_group.apply(ICore::instance()->settings());
if (m_ui.debuggerChooserWidget->isDirty()) {
//m_abiToDebuggerMap = m_ui.debuggerChooserWidget->debuggerMapping();
m_ui.debuggerChooserWidget->setDebuggerMapping(m_abiToDebuggerMap);
m_abiToDebuggerMapChanged = true;
}
} }
void CommonOptionsPage::finish() void CommonOptionsPage::finish()
@@ -196,7 +202,7 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
foreach (const QString &key, toRemove) foreach (const QString &key, toRemove)
m_abiToDebuggerMap.remove(key); m_abiToDebuggerMap.remove(key);
//m_ui->gdbChooserWidget->setGdbMapping(m_abiToDebuggerMap); m_ui.debuggerChooserWidget->setDebuggerMapping(m_abiToDebuggerMap);
return w; return w;
} }
@@ -416,16 +422,6 @@ QIcon DebuggingHelperOptionPage::categoryIcon() const
void DebuggingHelperOptionPage::apply() void DebuggingHelperOptionPage::apply()
{ {
m_group.apply(ICore::instance()->settings()); m_group.apply(ICore::instance()->settings());
/*
if (!m_ui) // page never shown
return;
if (m_ui->gdbChooserWidget->isDirty()) {
//m_abiToDebuggerMap = m_ui->gdbChooserWidget->gdbMapping();
m_ui->gdbChooserWidget->setGdbMapping(m_abiToDebuggerMap);
gdbMappingChanged = true;
}
*/
} }
void DebuggingHelperOptionPage::finish() void DebuggingHelperOptionPage::finish()

6
src/plugins/debugger/gdb/gdboptionspage.ui
View File

@@ -204,12 +204,6 @@ on slow machines. In this case, the value should be increased.</string>
<header location="global">utils/pathchooser.h</header> <header location="global">utils/pathchooser.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>Debugger::Internal::GdbChooserWidget</class>
<extends>QWidget</extends>
<header>gdb/gdbchooserwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>