From 680222a37ef9a52fb8e19bcd7bd48012f7c6e02a Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Mon, 7 Dec 2009 15:05:15 +0100
Subject: [PATCH] Maemo: Fix ssh command line for Windows.
Reviewed-by: kh1
---
.../qt4projectmanager/qt-maemo/maemorunconfiguration.cpp | 9 ++++++++-
.../qt4projectmanager/qt-maemo/maemotoolchain.cpp | 4 ----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index ccf023bef79..f7ae389ffe5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -55,6 +55,7 @@
#include <QtGui/QComboBox>
#include <QtGui/QCheckBox>
+#include <QtGui/QDesktopServices>
#include <QtGui/QFormLayout>
#include <QtGui/QFrame>
#include <QtGui/QHBoxLayout>
@@ -1146,6 +1147,10 @@ const QStringList AbstractMaemoRunControl::options() const
devConfig.authentication == MaemoDeviceConfigurations::DeviceConfig::Password;
const QLatin1String opt("-o");
QStringList optionList;
+#ifdef Q_OS_WIN
+ optionList << opt << QString::fromLatin1("UserKnownHostsFile=%1/maemo_knownHosts").
+ arg(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
+#endif
if (!usePassword)
optionList << QLatin1String("-i") << devConfig.keyFile;
return optionList << opt
@@ -1153,7 +1158,9 @@ const QStringList AbstractMaemoRunControl::options() const
arg(usePassword ? "yes" : "no") << opt
<< QString::fromLatin1("PubkeyAuthentication=%1").
arg(usePassword ? "no" : "yes") << opt
- << QString::fromLatin1("ConnectTimeout=%1").arg(devConfig.timeout);
+ << QString::fromLatin1("ConnectTimeout=%1").arg(devConfig.timeout)
+ << opt << QLatin1String("CheckHostIP=no")
+ << opt << QLatin1String("StrictHostKeyChecking=no");
}
const QString AbstractMaemoRunControl::executableOnTarget() const
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
index e3ceb22939a..fd755e7b232 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
@@ -85,10 +85,6 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
.arg(targetRoot())));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(toolchainRoot())));
-#ifdef Q_OS_WIN
- env.set("HOME", QDir::toNativeSeparators(maddeRoot()
- + QLatin1String("/home/") + QDir::home().dirName()));
-#endif
}
QString MaemoToolChain::makeCommand() const
--
GitLab