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

Maemo: Add default value to device config wizard.

Browse Source 
Task-number: QTCREATORBUG-3782
This commit is contained in:
Christian Kandeler
2011-02-10 15:37:12 +01:00
parent de44d03895
commit 1b3f8c57b4
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,6 +326,11 @@ QString MaemoDeviceConfig::defaultPrivateKeyFilePath()
+ QLatin1String("/.ssh/id_rsa"); + QLatin1String("/.ssh/id_rsa");
} }
QString MaemoDeviceConfig::defaultPublicKeyFilePath()
{
return defaultPrivateKeyFilePath() + QLatin1String(".pub");
}
QString MaemoDeviceConfig::defaultUser(MaemoGlobal::MaemoVersion osVersion) QString MaemoDeviceConfig::defaultUser(MaemoGlobal::MaemoVersion osVersion)
{ {
switch (osVersion) { switch (osVersion) {

1
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
View File

@@ -87,6 +87,7 @@ public:
static QString portsRegExpr(); static QString portsRegExpr();
static QString defaultHost(DeviceType type); static QString defaultHost(DeviceType type);
static QString defaultPrivateKeyFilePath(); static QString defaultPrivateKeyFilePath();
static QString defaultPublicKeyFilePath();
static QString defaultUser(MaemoGlobal::MaemoVersion osVersion); static QString defaultUser(MaemoGlobal::MaemoVersion osVersion);
static int defaultSshPort(DeviceType type); static int defaultSshPort(DeviceType type);
static QString defaultQemuPassword(MaemoGlobal::MaemoVersion osVersion); static QString defaultQemuPassword(MaemoGlobal::MaemoVersion osVersion);

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

@@ -225,8 +225,8 @@ public:
virtual void initializePage() virtual void initializePage()
{ {
m_ui->dontReuseButton->setChecked(true); m_ui->dontReuseButton->setChecked(true);
m_ui->privateKeyFilePathChooser->setPath(QString()); m_ui->privateKeyFilePathChooser->setPath(MaemoDeviceConfig::defaultPrivateKeyFilePath());
m_ui->publicKeyFilePathChooser->setPath(QString()); m_ui->publicKeyFilePathChooser->setPath(MaemoDeviceConfig::defaultPublicKeyFilePath());
handleSelectionChanged(); handleSelectionChanged();
} }