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

Maemo: Fix new deployment algorithm.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2009-12-01 17:44:42 +01:00
parent 4e29b16f92
commit e9a20d33c7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1064,13 +1064,13 @@ void AbstractMaemoRunControl::startDeployment(bool forDebugging)
void AbstractMaemoRunControl::deploy() void AbstractMaemoRunControl::deploy()
{ {
if (!deployables.isEmpty()) { if (!deployables.isEmpty()) {
QPair<QString, QString> pair = deployables.at(0); QPair<QString, QString> pair = deployables.first();
emit addToOutputWindow(this, tr("File to deploy: %1.").arg(pair.first)); emit addToOutputWindow(this, tr("File to deploy: %1.").arg(pair.first));
QStringList cmdArgs; QStringList cmdArgs;
cmdArgs << "-P" << port() << options() << pair.first << (devConfig.uname cmdArgs << "-P" << port() << options() << pair.first << (devConfig.uname
+ "@" + devConfig.host + ":" + remoteDir()); + "@" + devConfig.host + ":" + remoteDir());
deployProcess.setWorkingDirectory(QFileInfo(pair.second).absolutePath()); deployProcess.setWorkingDirectory(pair.second);
deployProcess.start(runConfig->scpCmd(), cmdArgs); deployProcess.start(runConfig->scpCmd(), cmdArgs);
if (!deployProcess.waitForStarted()) { if (!deployProcess.waitForStarted()) {
@@ -1100,10 +1100,14 @@ void AbstractMaemoRunControl::deployProcessFinished()
if (deployProcess.exitCode() == 0) { if (deployProcess.exitCode() == 0) {
emit addToOutputWindow(this, tr("Target deployed.")); emit addToOutputWindow(this, tr("Target deployed."));
success = true; success = true;
if (deployingExecutable) if (deployingExecutable) {
runConfig->wasDeployed(); runConfig->wasDeployed();
if (deployingDumperLib) deployingExecutable = false;
}
if (deployingDumperLib) {
runConfig->debuggingHelpersDeployed(); runConfig->debuggingHelpersDeployed();
deployingDumperLib = false;
}
deployables.removeFirst(); deployables.removeFirst();
} else { } else {
emit error(this, tr("Deployment failed.")); emit error(this, tr("Deployment failed."));