From 533d64c4b98106c8b734072db66679d99512d02b Mon Sep 17 00:00:00 2001 From: ck Date: Thu, 3 Dec 2009 13:01:45 +0100 Subject: [PATCH] Maemo: Take user-supplied private key file into account. Reviewed-by: kh1 --- .../qt4projectmanager/qt-maemo/maemorunconfiguration.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp index 345f164090b..63c2da4bd2a 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp @@ -1134,7 +1134,10 @@ const QStringList AbstractMaemoRunControl::options() const const bool usePassword = devConfig.authentication == MaemoDeviceConfigurations::DeviceConfig::Password; const QLatin1String opt("-o"); - return QStringList() << opt + QStringList optionList; + if (!usePassword) + optionList << QLatin1String("-i") << devConfig.keyFile; + return optionList << opt << QString::fromLatin1("PasswordAuthentication=%1"). arg(usePassword ? "yes" : "no") << opt << QString::fromLatin1("PubkeyAuthentication=%1").