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

Maemo: Take user-supplied private key file into account.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2009-12-03 13:01:45 +01:00
parent 043695b7cf
commit 533d64c4b9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1134,7 +1134,10 @@ const QStringList AbstractMaemoRunControl::options() const
const bool usePassword = const bool usePassword =
devConfig.authentication == MaemoDeviceConfigurations::DeviceConfig::Password; devConfig.authentication == MaemoDeviceConfigurations::DeviceConfig::Password;
const QLatin1String opt("-o"); const QLatin1String opt("-o");
return QStringList() << opt QStringList optionList;
if (!usePassword)
optionList << QLatin1String("-i") << devConfig.keyFile;
return optionList << opt
<< QString::fromLatin1("PasswordAuthentication=%1"). << QString::fromLatin1("PasswordAuthentication=%1").
arg(usePassword ? "yes" : "no") << opt arg(usePassword ? "yes" : "no") << opt
<< QString::fromLatin1("PubkeyAuthentication=%1"). << QString::fromLatin1("PubkeyAuthentication=%1").