From b3154e1b308219adda63dc6cbf244cb519bf29b3 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 10 Dec 2009 15:56:10 +0100
Subject: [PATCH] debugger: make remote gdb architecture user editable
---
src/plugins/debugger/debuggerdialogs.cpp | 3 +--
src/plugins/debugger/debuggerplugin.cpp | 6 ++++--
src/plugins/debugger/startremotedialog.ui | 10 +++++++---
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 380852c7b44..e79a4a27c31 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -430,8 +430,7 @@ void StartRemoteDialog::setRemoteArchitecture(const QString &arch)
QString StartRemoteDialog::remoteArchitecture() const
{
- int index = m_ui->architectureComboBox->currentIndex();
- return m_ui->architectureComboBox->itemText(index);
+ return m_ui->architectureComboBox->currentText();
}
void StartRemoteDialog::setServerStartScript(const QString &scriptName)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 00bbd650247..e823fb85258 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1350,11 +1350,13 @@ void DebuggerPlugin::startRemoteApplication()
QStringList arches;
arches.append(_("i386:x86-64:intel"));
arches.append(_("i386"));
+ QString lastUsed = configValue(_("LastRemoteArchitecture")).toString();
+ if (!arches.contains(lastUsed))
+ arches.prepend(lastUsed);
dlg.setRemoteArchitectures(arches);
dlg.setRemoteChannel(
configValue(_("LastRemoteChannel")).toString());
- dlg.setRemoteArchitecture(
- configValue(_("LastRemoteArchitecture")).toString());
+ dlg.setRemoteArchitecture(lastUsed);
dlg.setServerStartScript(
configValue(_("LastServerStartScript")).toString());
dlg.setUseServerStartScript(
diff --git a/src/plugins/debugger/startremotedialog.ui b/src/plugins/debugger/startremotedialog.ui
index 5d596e17e7f..c72289f21b0 100644
--- a/src/plugins/debugger/startremotedialog.ui
+++ b/src/plugins/debugger/startremotedialog.ui
@@ -47,13 +47,17 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QComboBox" name="architectureComboBox"/>
+ <widget class="QComboBox" name="architectureComboBox">
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="useServerStartScriptCheckBox"/>
</item>
<item row="5" column="1">
- <widget class="Utils::PathChooser" name="serverStartScript"/>
+ <widget class="Utils::PathChooser" name="serverStartScript" native="true"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="serverStartScriptLabel">
@@ -77,7 +81,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="Utils::PathChooser" name="sysrootPathChooser"/>
+ <widget class="Utils::PathChooser" name="sysrootPathChooser" native="true"/>
</item>
</layout>
</item>
--
GitLab