From 2a2e3b14171bf5c0507b16b1f90142f48815ef6d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Date: Wed, 28 Jan 2009 14:49:38 +0100 Subject: [PATCH] Revert "debugger: add configuariton to start the debugged process in a separate" This reverts commit 44add9f0bd4a104cf8f2697fe9f95a7f6f410494. This option is meant to be in "Run Settings" per run configuration. --- src/plugins/debugger/debuggermanager.cpp | 1 - src/plugins/debugger/debuggermanager.h | 1 - src/plugins/debugger/debuggerplugin.cpp | 4 ---- src/plugins/debugger/gdboptionpage.ui | 10 ---------- 4 files changed, 16 deletions(-) diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp index 8180c7cfd10..423321fc7ba 100644 --- a/src/plugins/debugger/debuggermanager.cpp +++ b/src/plugins/debugger/debuggermanager.cpp @@ -94,7 +94,6 @@ DebuggerSettings::DebuggerSettings() m_skipKnownFrames = false; m_debugDumpers = false; m_useToolTips = false; - m_useTerminal = false; m_useCustomDumpers = true; } diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h index e16941a79f5..1c12a731643 100644 --- a/src/plugins/debugger/debuggermanager.h +++ b/src/plugins/debugger/debuggermanager.h @@ -198,7 +198,6 @@ public: bool m_debugDumpers; bool m_useFastStart; bool m_useToolTips; - bool m_useTerminal; QString m_scriptFile; }; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 2874911c56a..82c48f37fb4 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -282,7 +282,6 @@ QWidget *GdbOptionPage::createPage(QWidget *parent) m_ui.checkBoxUseCustomDumpers->setChecked(m_settings.m_useCustomDumpers); m_ui.checkBoxFastStart->setChecked(m_settings.m_useFastStart); m_ui.checkBoxUseToolTips->setChecked(m_settings.m_useToolTips); - m_ui.checkBoxUseTerminal->setChecked(m_settings.m_useTerminal); #ifndef QT_DEBUG #if 0 @@ -325,7 +324,6 @@ void GdbOptionPage::apply() m_settings.m_useCustomDumpers = m_ui.checkBoxUseCustomDumpers->isChecked(); m_settings.m_useFastStart = m_ui.checkBoxFastStart->isChecked(); m_settings.m_useToolTips = m_ui.checkBoxUseToolTips->isChecked(); - m_settings.m_useTerminal = m_ui.checkBoxUseTerminal->isChecked(); *m_plugin->m_manager->settings() = m_settings; m_plugin->writeSettings(); @@ -892,7 +890,6 @@ void DebuggerPlugin::writeSettings() const s->setValue("UseFastStart", m->m_useFastStart); s->setValue("UseToolTips", m->m_useToolTips); - s->setValue("UseTerminal", m->m_useTerminal); s->setValue("UseCustomDumpers", m->m_useCustomDumpers); s->setValue("SkipKnowFrames", m->m_skipKnownFrames); s->setValue("DebugDumpers", m->m_debugDumpers); @@ -926,7 +923,6 @@ void DebuggerPlugin::readSettings() m->m_useCustomDumpers = s->value("UseCustomDumpers", true).toBool(); m->m_useFastStart = s->value("UseFastStart", false).toBool(); m->m_useToolTips = s->value("UseToolTips", false).toBool(); - m->m_useTerminal = s->value("UseTerminal", false).toBool(); s->endGroup(); m_manager->mainWindow()->restoreState(ba); diff --git a/src/plugins/debugger/gdboptionpage.ui b/src/plugins/debugger/gdboptionpage.ui index c0434461a91..ef485ccbf83 100644 --- a/src/plugins/debugger/gdboptionpage.ui +++ b/src/plugins/debugger/gdboptionpage.ui @@ -84,16 +84,6 @@ </property> </widget> </item> - <item> - <widget class="QCheckBox" name="checkBoxUseTerminal"> - <property name="toolTip"> - <string>Start debugged process in a separte terminal.</string> - </property> - <property name="text"> - <string>Start in terminal</string> - </property> - </widget> - </item> <item> <widget class="QCheckBox" name="checkBoxFastStart"> <property name="toolTip"> -- GitLab