Commit f62d6430 authored by hjk's avatar hjk Committed by hjk

debugger: remove gnutarget setting

Task-number: QTCREATORBUG-2950
Change-Id: Icfd2c61e0e77bff23c1bf1b38b8b670bd8fbc8c7
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 4d2d62a6
......@@ -653,27 +653,6 @@ QString StartRemoteDialog::remoteArchitecture() const
return m_ui->architectureComboBox->currentText();
}
QString StartRemoteDialog::gnuTarget() const
{
return m_ui->gnuTargetComboBox->currentText();
}
void StartRemoteDialog::setGnuTargets(const QStringList &gnuTargets)
{
m_ui->gnuTargetComboBox->clear();
if (!gnuTargets.isEmpty()) {
m_ui->gnuTargetComboBox->insertItems(0, gnuTargets);
m_ui->gnuTargetComboBox->setCurrentIndex(0);
}
}
void StartRemoteDialog::setGnuTarget(const QString &gnuTarget)
{
const int index = m_ui->gnuTargetComboBox->findText(gnuTarget);
if (index != -1)
m_ui->gnuTargetComboBox->setCurrentIndex(index);
}
QString StartRemoteDialog::overrideStartScript() const
{
return m_ui->overrideStartScriptPathChooser->path();
......
......@@ -183,15 +183,12 @@ public:
void setRemoteArchitecture(const QString &arch);
void setRemoteArchitectures(const QStringList &arches);
QString gnuTarget() const;
void setGnuTarget(const QString &gnuTarget);
void setGnuTargets(const QStringList &gnuTargets);
QString overrideStartScript() const;
void setOverrideStartScript(const QString &scriptName);
bool useServerStartScript() const;
void setUseServerStartScript(bool on);
QString serverStartScript() const;
void setServerStartScript(const QString &scriptName);
......
......@@ -1610,23 +1610,12 @@ bool DebuggerPluginPrivate::queryRemoteParameters(DebuggerStartParameters &sp, b
if (!arches.contains(lastUsed))
arches.prepend(lastUsed);
dlg.setRemoteArchitectures(arches);
QStringList gnuTargets;
gnuTargets.append(_("auto"));
gnuTargets.append(_("i686-linux-gnu"));
gnuTargets.append(_("x86_64-linux-gnu"));
gnuTargets.append(_("arm-none-linux-gnueabi"));
const QString lastUsedGnuTarget
= configValue(_("LastGnuTarget")).toString();
if (!gnuTargets.contains(lastUsedGnuTarget))
gnuTargets.prepend(lastUsedGnuTarget);
dlg.setGnuTargets(gnuTargets);
dlg.setRemoteChannel(
configValue(_("LastRemoteChannel")).toString());
dlg.setLocalExecutable(
configValue(_("LastLocalExecutable")).toString());
dlg.setDebugger(configValue(_("LastDebugger")).toString());
dlg.setRemoteArchitecture(lastUsed);
dlg.setGnuTarget(lastUsedGnuTarget);
dlg.setOverrideStartScript(configValue(_("LastRemoteStartScript")).toString());
dlg.setServerStartScript(
configValue(_("LastServerStartScript")).toString());
......@@ -1640,7 +1629,6 @@ bool DebuggerPluginPrivate::queryRemoteParameters(DebuggerStartParameters &sp, b
setConfigValue(_("LastLocalExecutable"), dlg.localExecutable());
setConfigValue(_("LastDebugger"), dlg.debugger());
setConfigValue(_("LastRemoteArchitecture"), dlg.remoteArchitecture());
setConfigValue(_("LastGnuTarget"), dlg.gnuTarget());
setConfigValue(_("LastRemoteStartScript"), dlg.overrideStartScript());
setConfigValue(_("LastServerStartScript"), dlg.serverStartScript());
setConfigValue(_("LastUseServerStartScript"), dlg.useServerStartScript());
......@@ -1648,7 +1636,6 @@ bool DebuggerPluginPrivate::queryRemoteParameters(DebuggerStartParameters &sp, b
setConfigValue(_("LastDebugInfoLocation"), dlg.debugInfoLocation());
sp.remoteChannel = dlg.remoteChannel();
sp.remoteArchitecture = dlg.remoteArchitecture();
sp.gnuTarget = dlg.gnuTarget();
sp.executable = dlg.localExecutable();
sp.displayName = tr("Remote: \"%1\"").arg(sp.remoteChannel);
sp.debuggerCommand = dlg.debugger(); // Override toolchain-detection.
......
......@@ -16,6 +16,9 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="debuggerLabel">
<property name="text">
......@@ -77,23 +80,6 @@
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="gnuTargetLabel">
<property name="text">
<string>&amp;GNU target:</string>
</property>
<property name="buddy">
<cstring>gnuTargetComboBox</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="gnuTargetComboBox">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="sysrootLabel">
<property name="text">
<string>Sys&amp;root:</string>
......@@ -103,10 +89,10 @@
</property>
</widget>
</item>
<item row="5" column="1">
<item row="4" column="1">
<widget class="Utils::PathChooser" name="sysrootPathChooser" native="true"/>
</item>
<item row="6" column="0">
<item row="5" column="0">
<widget class="QLabel" name="debuginfoLabel">
<property name="text">
<string>Location of debugging information:</string>
......@@ -116,10 +102,10 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="5" column="1">
<widget class="Utils::PathChooser" name="debuginfoPathChooser" native="true"/>
</item>
<item row="7" column="0">
<item row="6" column="0">
<widget class="QLabel" name="overrideStartScriptLabel">
<property name="text">
<string>Override host GDB s&amp;tart script:</string>
......@@ -129,10 +115,10 @@
</property>
</widget>
</item>
<item row="7" column="1">
<item row="6" column="1">
<widget class="Utils::PathChooser" name="overrideStartScriptPathChooser" native="true"/>
</item>
<item row="8" column="0">
<item row="7" column="0">
<widget class="QLabel" name="useServerStartScriptLabel">
<property name="text">
<string>&amp;Use server start script:</string>
......@@ -142,10 +128,10 @@
</property>
</widget>
</item>
<item row="8" column="1">
<item row="7" column="1">
<widget class="QCheckBox" name="useServerStartScriptCheckBox"/>
</item>
<item row="9" column="0">
<item row="8" column="0">
<widget class="QLabel" name="serverStartScriptLabel">
<property name="text">
<string>&amp;Server start script:</string>
......@@ -155,7 +141,7 @@
</property>
</widget>
</item>
<item row="9" column="1">
<item row="8" column="1">
<widget class="Utils::PathChooser" name="serverStartScriptPathChooser" native="true"/>
</item>
</layout>
......
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