Maemo: Fix ssh command line for Windows.

Reviewed-by: kh1
This commit is contained in:
ck
2009-12-07 15:05:15 +01:00
parent 47cf2cb7f5
commit 680222a37e
2 changed files with 8 additions and 5 deletions

View File

@@ -55,6 +55,7 @@
#include <QtGui/QComboBox> #include <QtGui/QComboBox>
#include <QtGui/QCheckBox> #include <QtGui/QCheckBox>
#include <QtGui/QDesktopServices>
#include <QtGui/QFormLayout> #include <QtGui/QFormLayout>
#include <QtGui/QFrame> #include <QtGui/QFrame>
#include <QtGui/QHBoxLayout> #include <QtGui/QHBoxLayout>
@@ -1146,6 +1147,10 @@ const QStringList AbstractMaemoRunControl::options() const
devConfig.authentication == MaemoDeviceConfigurations::DeviceConfig::Password; devConfig.authentication == MaemoDeviceConfigurations::DeviceConfig::Password;
const QLatin1String opt("-o"); const QLatin1String opt("-o");
QStringList optionList; QStringList optionList;
#ifdef Q_OS_WIN
optionList << opt << QString::fromLatin1("UserKnownHostsFile=%1/maemo_knownHosts").
arg(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
#endif
if (!usePassword) if (!usePassword)
optionList << QLatin1String("-i") << devConfig.keyFile; optionList << QLatin1String("-i") << devConfig.keyFile;
return optionList << opt return optionList << opt
@@ -1153,7 +1158,9 @@ const QStringList AbstractMaemoRunControl::options() const
arg(usePassword ? "yes" : "no") << opt arg(usePassword ? "yes" : "no") << opt
<< QString::fromLatin1("PubkeyAuthentication=%1"). << QString::fromLatin1("PubkeyAuthentication=%1").
arg(usePassword ? "no" : "yes") << opt 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 const QString AbstractMaemoRunControl::executableOnTarget() const

View File

@@ -85,10 +85,6 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
.arg(targetRoot()))); .arg(targetRoot())));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin") env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(toolchainRoot()))); .arg(toolchainRoot())));
#ifdef Q_OS_WIN
env.set("HOME", QDir::toNativeSeparators(maddeRoot()
+ QLatin1String("/home/") + QDir::home().dirName()));
#endif
} }
QString MaemoToolChain::makeCommand() const QString MaemoToolChain::makeCommand() const