From d652c21181ce09c2429e64aa01356a0171bb489d Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 22 Feb 2011 13:29:00 +0100
Subject: [PATCH] debugger: compile fix
---
src/plugins/debugger/commonoptionspage.cpp | 18 +++++++-----------
src/plugins/debugger/gdb/gdboptionspage.ui | 6 ------
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp
index 19e2c52f2f7..77ce4ed567a 100644
--- a/src/plugins/debugger/commonoptionspage.cpp
+++ b/src/plugins/debugger/commonoptionspage.cpp
@@ -96,6 +96,12 @@ QIcon CommonOptionsPage::categoryIcon() const
void CommonOptionsPage::apply()
{
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()
@@ -196,7 +202,7 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
foreach (const QString &key, toRemove)
m_abiToDebuggerMap.remove(key);
- //m_ui->gdbChooserWidget->setGdbMapping(m_abiToDebuggerMap);
+ m_ui.debuggerChooserWidget->setDebuggerMapping(m_abiToDebuggerMap);
return w;
}
@@ -416,16 +422,6 @@ QIcon DebuggingHelperOptionPage::categoryIcon() const
void DebuggingHelperOptionPage::apply()
{
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()
diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui
index ccd3184740e..1584f134d13 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.ui
+++ b/src/plugins/debugger/gdb/gdboptionspage.ui
@@ -204,12 +204,6 @@ on slow machines. In this case, the value should be increased.</string>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
</customwidget>
- <customwidget>
- <class>Debugger::Internal::GdbChooserWidget</class>
- <extends>QWidget</extends>
- <header>gdb/gdbchooserwidget.h</header>
- <container>1</container>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
--
GitLab