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

RemoteLinux: Decentralize knowledge about specific devices.

Browse Source 
Also remove files again that somehow crept back in.

Change-Id: Ie77491c4cd872e2bb26b971c04137e7c25a903c7
Reviewed-on: http://codereview.qt.nokia.com/566
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-06-21 16:52:48 +02:00
parent 974d825bba
commit 7f0e2d64de
12 changed files with 122 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
View File

@@ -71,15 +71,19 @@ GenericLinuxDeviceConfigurationWizard::~GenericLinuxDeviceConfigurationWizard()
LinuxDeviceConfiguration::Ptr GenericLinuxDeviceConfigurationWizard::deviceConfiguration()
{
LinuxDeviceConfiguration::Ptr devConf;
if (m_d->setupPage.authenticationType() == SshConnectionParameters::AuthenticationByPassword) {
devConf = LinuxDeviceConfiguration::createGenericLinuxConfigUsingPassword(m_d->setupPage.configurationName(),
m_d->setupPage.hostName(), m_d->setupPage.userName(), m_d->setupPage.password());
} else {
devConf = LinuxDeviceConfiguration::createGenericLinuxConfigUsingKey(m_d->setupPage.configurationName(),
m_d->setupPage.hostName(), m_d->setupPage.userName(), m_d->setupPage.privateKeyFilePath());
}
Utils::SshConnectionParameters sshParams(SshConnectionParameters::NoProxy);
sshParams.host = m_d->setupPage.hostName();
sshParams.userName = m_d->setupPage.userName();
sshParams.port = 22;
sshParams.timeout = 10;
sshParams.authenticationType = m_d->setupPage.authenticationType();
if (sshParams.authenticationType == SshConnectionParameters::AuthenticationByPassword)
sshParams.password = m_d->setupPage.password();
else
sshParams.privateKeyFile = m_d->setupPage.privateKeyFilePath();
LinuxDeviceConfiguration::Ptr devConf = LinuxDeviceConfiguration::create(m_d->setupPage.configurationName(),
LinuxDeviceConfiguration::GenericLinuxOsType, LinuxDeviceConfiguration::Physical,
QLatin1String("10000-10100"), sshParams);
Internal::MaemoConfigTestDialog dlg(devConf, this);
dlg.exec();
return devConf;