From e9a20d33c7b7d43aac2aa7d37d2f47a03f47f0be Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 1 Dec 2009 17:44:42 +0100
Subject: [PATCH] Maemo: Fix new deployment algorithm.
Reviewed-by: kh1
---
.../qt-maemo/maemorunconfiguration.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 7b3ca0c888c..80da35337ad 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -1064,13 +1064,13 @@ void AbstractMaemoRunControl::startDeployment(bool forDebugging)
void AbstractMaemoRunControl::deploy()
{
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));
QStringList cmdArgs;
cmdArgs << "-P" << port() << options() << pair.first << (devConfig.uname
+ "@" + devConfig.host + ":" + remoteDir());
- deployProcess.setWorkingDirectory(QFileInfo(pair.second).absolutePath());
+ deployProcess.setWorkingDirectory(pair.second);
deployProcess.start(runConfig->scpCmd(), cmdArgs);
if (!deployProcess.waitForStarted()) {
@@ -1100,10 +1100,14 @@ void AbstractMaemoRunControl::deployProcessFinished()
if (deployProcess.exitCode() == 0) {
emit addToOutputWindow(this, tr("Target deployed."));
success = true;
- if (deployingExecutable)
+ if (deployingExecutable) {
runConfig->wasDeployed();
- if (deployingDumperLib)
+ deployingExecutable = false;
+ }
+ if (deployingDumperLib) {
runConfig->debuggingHelpersDeployed();
+ deployingDumperLib = false;
+ }
deployables.removeFirst();
} else {
emit error(this, tr("Deployment failed."));
--
GitLab