feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Remove ability to change device type.

Browse Source 
It's a fundamental attribute of the device. It makes no sense to
change it.
This commit is contained in:
Christian Kandeler
2011-02-03 17:19:06 +01:00
parent 46b91942e8
commit 448f754ce9
3 changed files with 12 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
View File

@@ -132,9 +132,8 @@ QString MaemoDeviceConfigurationsSettingsWidget::searchKeywords() const
<< ' ' << m_ui->passwordButton->text()
<< ' ' << m_ui->authTypeLabel->text()
<< ' ' << m_ui->connectionTimeoutLabel->text()
<< ' ' << m_ui->deviceButton->text()
<< ' ' << m_ui->simulatorButton->text()
<< ' ' << m_ui->deviceTypeLabel->text()
<< ' ' << m_ui->deviceTypeValueLabel->text()
<< ' ' << m_ui->deviceNameLabel->text()
<< ' ' << m_ui->hostNameLabel->text()
<< ' ' << m_ui->keyLabel->text()
@@ -198,9 +197,9 @@ void MaemoDeviceConfigurationsSettingsWidget::displayCurrent()
m_ui->defaultDeviceButton->setEnabled(!current->isDefault());
const SshConnectionParameters &sshParams = current->sshParameters();
if (current->type() == MaemoDeviceConfig::Physical)
m_ui->deviceButton->setChecked(true);
m_ui->deviceTypeValueLabel->setText(tr("Physical Device"));
else
m_ui->simulatorButton->setChecked(true);
m_ui->deviceTypeValueLabel->setText(tr("Emulator (Qemu)"));
if (sshParams.authType == Core::SshConnectionParameters::AuthByPwd)
m_ui->passwordButton->setChecked(true);
else
@@ -257,15 +256,6 @@ void MaemoDeviceConfigurationsSettingsWidget::configNameEditingFinished()
m_nameValidator->setDisplayName(newName);
}
void MaemoDeviceConfigurationsSettingsWidget::deviceTypeChanged()
{
const MaemoDeviceConfig::DeviceType devType
= m_ui->deviceButton->isChecked()
? MaemoDeviceConfig::Physical : MaemoDeviceConfig::Simulator;
//m_devConfigs->setDeviceType(currentIndex(), devType);
fillInValues();
}
void MaemoDeviceConfigurationsSettingsWidget::authenticationTypeChanged()
{
SshConnectionParameters sshParams = currentConfig()->sshParameters();