Commit b3154e1b authored by hjk's avatar hjk
Browse files

debugger: make remote gdb architecture user editable

parent d0dfea5a
......@@ -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)
......
......@@ -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(
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment