From 3d4260a88ab0f4e90c6785857445f0d11fbc37b0 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 23 Mar 2010 14:41:30 +0100
Subject: [PATCH] Show error in progress bar in case of symbian deploy error.
---
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index c3466ece484..f427645c444 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -714,6 +714,7 @@ static inline bool renameFile(const QString &sourceName, const QString &targetNa
void S60DeviceRunControlBase::makesisProcessFinished()
{
if (m_makesisProcess->exitCode() != 0) {
+ m_deployProgress->reportCanceled();
error(this, tr("An error occurred while creating the package."));
stop();
emit finished();
@@ -736,6 +737,7 @@ void S60DeviceRunControlBase::makesisProcessFinished()
if (ok) {
startDeployment();
} else {
+ m_deployProgress->reportCanceled();
errorMessage = tr("Failed to create '%1': %2").arg(m_signedPackage, errorMessage);
error(this, errorMessage);
stop();
@@ -846,6 +848,9 @@ void S60DeviceRunControlBase::printInstallingFinished()
void S60DeviceRunControlBase::printInstallFailed(const QString &filename, const QString &errorMessage)
{
+ QTC_ASSERT(m_deployProgress, ;)
+ if (m_deployProgress)
+ m_deployProgress->reportCanceled();
emit addToOutputWindow(this, tr("Could not install from package %1 on device: %2").arg(filename, errorMessage));
}
--
GitLab