Commit 3d4260a8 authored by con's avatar con
Browse files

Show error in progress bar in case of symbian deploy error.

parent ddcb6c08
...@@ -714,6 +714,7 @@ static inline bool renameFile(const QString &sourceName, const QString &targetNa ...@@ -714,6 +714,7 @@ static inline bool renameFile(const QString &sourceName, const QString &targetNa
void S60DeviceRunControlBase::makesisProcessFinished() void S60DeviceRunControlBase::makesisProcessFinished()
{ {
if (m_makesisProcess->exitCode() != 0) { if (m_makesisProcess->exitCode() != 0) {
m_deployProgress->reportCanceled();
error(this, tr("An error occurred while creating the package.")); error(this, tr("An error occurred while creating the package."));
stop(); stop();
emit finished(); emit finished();
...@@ -736,6 +737,7 @@ void S60DeviceRunControlBase::makesisProcessFinished() ...@@ -736,6 +737,7 @@ void S60DeviceRunControlBase::makesisProcessFinished()
if (ok) { if (ok) {
startDeployment(); startDeployment();
} else { } else {
m_deployProgress->reportCanceled();
errorMessage = tr("Failed to create '%1': %2").arg(m_signedPackage, errorMessage); errorMessage = tr("Failed to create '%1': %2").arg(m_signedPackage, errorMessage);
error(this, errorMessage); error(this, errorMessage);
stop(); stop();
...@@ -846,6 +848,9 @@ void S60DeviceRunControlBase::printInstallingFinished() ...@@ -846,6 +848,9 @@ void S60DeviceRunControlBase::printInstallingFinished()
void S60DeviceRunControlBase::printInstallFailed(const QString &filename, const QString &errorMessage) 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)); emit addToOutputWindow(this, tr("Could not install from package %1 on device: %2").arg(filename, errorMessage));
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment