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

Maemo: Device config improvements.

Browse Source
This commit is contained in:
Christian Kandeler
2011-04-11 11:50:40 +02:00
parent f61b8fd6a3
commit ddd4db6aaa
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
View File

@@ -71,8 +71,6 @@ namespace {
const int DefaultSshPortSim(6666); const int DefaultSshPortSim(6666);
const int DefaultGdbServerPortHW(10000); const int DefaultGdbServerPortHW(10000);
const int DefaultGdbServerPortSim(13219); const int DefaultGdbServerPortSim(13219);
const QString DefaultHostNameHW(QLatin1String("192.168.2.15"));
const QString DefaultHostNameSim(QLatin1String("localhost"));
const AuthType DefaultAuthType(Utils::SshConnectionParameters::AuthenticationByKey); const AuthType DefaultAuthType(Utils::SshConnectionParameters::AuthenticationByKey);
const int DefaultTimeout(30); const int DefaultTimeout(30);
const MaemoDeviceConfig::DeviceType DefaultDeviceType(MaemoDeviceConfig::Physical); const MaemoDeviceConfig::DeviceType DefaultDeviceType(MaemoDeviceConfig::Physical);
@@ -345,9 +343,17 @@ QString MaemoDeviceConfig::defaultPortsSpec(DeviceType type) const
QString MaemoDeviceConfig::defaultHost(DeviceType type, MaemoGlobal::OsVersion osVersion) QString MaemoDeviceConfig::defaultHost(DeviceType type, MaemoGlobal::OsVersion osVersion)
{ {
if (osVersion == MaemoGlobal::GenericLinux) switch (osVersion) {
case MaemoGlobal::Maemo5:
case MaemoGlobal::Maemo6:
case MaemoGlobal::Meego:
return QLatin1String(type == Physical ? "192.168.2.15" : "localhost");
case MaemoGlobal::GenericLinux:
return QString(); return QString();
return type == Physical ? DefaultHostNameHW : DefaultHostNameSim; default:
qFatal("%s: Missing case in switch", Q_FUNC_INFO);
return QString();
}
} }
QString MaemoDeviceConfig::defaultPrivateKeyFilePath() QString MaemoDeviceConfig::defaultPrivateKeyFilePath()

10
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
View File

@@ -176,9 +176,10 @@ class MaemoDeviceConfigWizardLoginDataPage : public QWizardPage
Q_OBJECT Q_OBJECT
public: public:
MaemoDeviceConfigWizardLoginDataPage(QWidget *parent) MaemoDeviceConfigWizardLoginDataPage(WizardData &wizardData, QWidget *parent)
: QWizardPage(parent), : QWizardPage(parent),
m_ui(new Ui::MaemoDeviceConfigWizardLoginDataPage) m_ui(new Ui::MaemoDeviceConfigWizardLoginDataPage),
m_wizardData(wizardData)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
setTitle(tr("Login Data")); setTitle(tr("Login Data"));
@@ -201,7 +202,7 @@ public:
virtual void initializePage() virtual void initializePage()
{ {
m_ui->userNameLineEdit->clear(); m_ui->userNameLineEdit->setText(MaemoDeviceConfig::defaultUser(m_wizardData.osVersion));
m_ui->passwordButton->setChecked(true); m_ui->passwordButton->setChecked(true);
m_ui->passwordLineEdit->clear(); m_ui->passwordLineEdit->clear();
m_ui->privateKeyPathChooser->setPath(MaemoDeviceConfig::defaultPrivateKeyFilePath()); m_ui->privateKeyPathChooser->setPath(MaemoDeviceConfig::defaultPrivateKeyFilePath());
@@ -228,6 +229,7 @@ private:
} }
const QScopedPointer<Ui::MaemoDeviceConfigWizardLoginDataPage> m_ui; const QScopedPointer<Ui::MaemoDeviceConfigWizardLoginDataPage> m_ui;
const WizardData &m_wizardData;
}; };
class MaemoDeviceConfigWizardPreviousKeySetupCheckPage : public QWizardPage class MaemoDeviceConfigWizardPreviousKeySetupCheckPage : public QWizardPage
@@ -592,7 +594,7 @@ struct MaemoDeviceConfigWizardPrivate
QWidget *parent) QWidget *parent)
: devConfigs(devConfigs), : devConfigs(devConfigs),
startPage(parent), startPage(parent),
loginDataPage(parent), loginDataPage(wizardData, parent),
previousKeySetupPage(parent), previousKeySetupPage(parent),
reuseKeysCheckPage(parent), reuseKeysCheckPage(parent),
keyCreationPage(parent), keyCreationPage(parent),