ios: always write out when a run ends

Currently normal end of an ios run is silent. This looks strange as
the startup writes a string.

Change-Id: I64d082153b11ff6db4d6b1d85bce1da143cf329d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

3 files changed, 14 insertions, 7 deletions

diff --git a/src/plugins/ios/iosanalyzesupport.cpp b/src/plugins/ios/iosanalyzesupport.cpp
index 585544011d..501e6b0db6 100644
--- a/src/plugins/ios/iosanalyzesupport.cpp
+++ b/src/plugins/ios/iosanalyzesupport.cpp
@@ -150,9 +150,11 @@ void IosAnalyzeSupport::handleGotInferiorPid(Q_PID pid, int qmlPort)
 
 void IosAnalyzeSupport::handleRemoteProcessFinished(bool cleanEnd)
 {
-    Q_UNUSED(cleanEnd)
     if (m_runControl) {
-        m_runControl->logApplicationMessage(tr("Run ended."), Utils::NormalMessageFormat);
+        if (!cleanEnd)
+            m_runControl->logApplicationMessage(tr("Run ended with error."), Utils::ErrorMessageFormat);
+        else
+            m_runControl->logApplicationMessage(tr("Run ended."), Utils::NormalMessageFormat);
         m_runControl->notifyRemoteFinished();
     }
 }
diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp
index d478a1a347..785fec6295 100644
--- a/src/plugins/ios/iosdebugsupport.cpp
+++ b/src/plugins/ios/iosdebugsupport.cpp
@@ -226,10 +226,13 @@ void IosDebugSupport::handleGotInferiorPid(Q_PID pid, int qmlPort)
 
 void IosDebugSupport::handleRemoteProcessFinished(bool cleanEnd)
 {
-    if (!cleanEnd && m_runControl)
-        m_runControl->showMessage(tr("Run failed unexpectedly."), AppStuff);
-    //m_runControl->engine()->notifyInferiorIll();
-    m_runControl->engine()->abortDebugger();
+    if (m_runControl) {
+        if (!cleanEnd)
+            m_runControl->showMessage(tr("Run ended with error."), AppStuff);
+        else
+            m_runControl->showMessage(tr("Run ended."), AppStuff);
+        m_runControl->engine()->abortDebugger();
+    }
 }
 
 void IosDebugSupport::handleRemoteOutput(const QString &output)
diff --git a/src/plugins/ios/iosruncontrol.cpp b/src/plugins/ios/iosruncontrol.cpp
index 491707e181..a0145b36a8 100644
--- a/src/plugins/ios/iosruncontrol.cpp
+++ b/src/plugins/ios/iosruncontrol.cpp
@@ -77,7 +77,9 @@ RunControl::StopResult IosRunControl::stop()
 void IosRunControl::handleRemoteProcessFinished(bool cleanEnd)
 {
     if (!cleanEnd)
-        appendMessage(tr("Run ended unexpectedly."), Utils::ErrorMessageFormat);
+        appendMessage(tr("Run ended with error."), Utils::ErrorMessageFormat);
+    else
+        appendMessage(tr("Run ended."), Utils::NormalMessageFormat);
     disconnect(m_runner, 0, this, 0);
     m_running = false;
     emit finished();