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

Maemo: Add key deployment feature to options page.

Browse Source
This commit is contained in:
ck
2010-01-07 16:42:01 +01:00
parent f209b06574
commit 60f97e5cff
7 changed files with 163 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
View File

@@ -123,8 +123,10 @@ void AbstractMaemoRunControl::deploy()
foreach (const Deployable &deployable, deployables) {
const QString srcFilePath
= deployable.dir % QDir::separator() % deployable.fileName;
const QString tgtFilePath
= remoteDir() % QDir::separator() % deployable.fileName;
files << srcFilePath;
deploySpecs << SshDeploySpec(srcFilePath, remoteDir());
deploySpecs << SshDeploySpec(srcFilePath, tgtFilePath);
}
emit addToOutputWindow(this, tr("Files to deploy: %1.").arg(files.join(" ")));
sshDeployer.reset(new MaemoSshDeployer(devConfig, deploySpecs));
@@ -249,9 +251,7 @@ const QString AbstractMaemoRunControl::executableFileName() const
const QString AbstractMaemoRunControl::remoteDir() const
{
return devConfig.uname == QString::fromLocal8Bit("root")
? QString::fromLocal8Bit("/root")
: QString::fromLocal8Bit("/home/") + devConfig.uname;
return homeDirOnDevice(devConfig.uname);
}
const QStringList AbstractMaemoRunControl::options() const