diff options
| author | hjk <qtc-committer@nokia.com> | 2009-12-10 15:56:10 +0100 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-12-10 16:58:54 +0100 |
| commit | b3154e1b308219adda63dc6cbf244cb519bf29b3 (patch) | |
| tree | 5cbbf196bd6e26737f6d4003e5e4aadd8a87b457 /src | |
| parent | d0dfea5a8aa7ec34ebb08b42e0b7184ae83bb0c0 (diff) | |
| download | qt-creator-b3154e1b308219adda63dc6cbf244cb519bf29b3.tar.gz | |
debugger: make remote gdb architecture user editable
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/debugger/debuggerdialogs.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 6 | ||||
| -rw-r--r-- | 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 380852c7b4..e79a4a27c3 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 00bbd65024..e823fb8525 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 5d596e17e7..c72289f21b 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> |