From 23ef4f9c04ca2d14ea0a8bd90d46c3a5ec141983 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Mon, 12 Apr 2010 12:15:08 +0200
Subject: [PATCH] Maemo: Use deployment progress bar even when there's nothing
to deploy.
Otherwise, an outdated canceled progress bar will confuse users.
Reviewed-by: kh1
---
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
index 7f4e2127c4e..707196892ae 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
@@ -96,6 +96,9 @@ void AbstractMaemoRunControl::startDeployment(bool forDebugging)
void AbstractMaemoRunControl::deploy()
{
+ Core::ICore::instance()->progressManager()
+ ->addTask(m_progress.future(), tr("Deploying"),
+ QLatin1String("Maemo.Deploy"));
if (!deployables.isEmpty()) {
QList<SshDeploySpec> deploySpecs;
QStringList files;
@@ -113,15 +116,13 @@ void AbstractMaemoRunControl::deploy()
this, SLOT(deployProcessFinished()));
connect(sshDeployer.data(), SIGNAL(fileCopied(QString)),
this, SLOT(handleFileCopied()));
- Core::ICore::instance()->progressManager()
- ->addTask(m_progress.future(), tr("Deploying"),
- QLatin1String("Maemo.Deploy"));
m_progress.setProgressRange(0, deployables.count());
m_progress.setProgressValue(0);
m_progress.reportStarted();
emit started();
sshDeployer->start();
} else {
+ m_progress.reportFinished();
handleDeploymentFinished(true);
}
}
--
GitLab