6 files changed, 21 insertions, 27 deletions

diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index 41f0daa25d..b2e085e364 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -166,7 +166,7 @@ AndroidDebugSupport::AndroidDebugSupport(AndroidRunConfiguration *runConfig,
     connect(m_runner, &AndroidRunner::remoteProcessFinished,
         [this](const QString &errorMsg) {
             QTC_ASSERT(m_runControl, return);
-            m_runControl->showMessage(errorMsg, AppStuff);
+            m_runControl->appendMessage(errorMsg, Utils::DebugFormat);
         });
 
     connect(m_runner, &AndroidRunner::remoteErrorOutput,
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 7ae1079064..d9aa50c372 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -315,7 +315,6 @@ public:
     bool m_isStateDebugging;
 
     Utils::FileInProjectFinder m_fileFinder;
-
 };
 
 
@@ -495,10 +494,21 @@ void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) c
         consoleManager->printToConsolePane(QmlJS::ConsoleItem::UndefinedType, msg);
 
     debuggerCore()->showMessage(msg, channel, timeout);
-    if (d->m_runControl)
-        d->m_runControl->showMessage(msg, channel);
-    else
+    if (d->m_runControl) {
+        switch (channel) {
+            case AppOutput:
+                d->m_runControl->appendMessage(msg, Utils::StdOutFormatSameLine);
+                break;
+            case AppError:
+                d->m_runControl->appendMessage(msg, Utils::StdErrFormatSameLine);
+                break;
+            case AppStuff:
+                d->m_runControl->appendMessage(msg, Utils::DebugFormat);
+                break;
+        }
+    } else {
         qWarning("Warning: %s (no active run control)", qPrintable(msg));
+    }
 }
 
 void DebuggerEngine::startDebugger(DebuggerRunControl *runControl)
diff --git a/src/plugins/debugger/debuggerruncontrolfactory.h b/src/plugins/debugger/debuggerruncontrolfactory.h
index 472fbc9176..47eed9ea6c 100644
--- a/src/plugins/debugger/debuggerruncontrolfactory.h
+++ b/src/plugins/debugger/debuggerruncontrolfactory.h
@@ -31,6 +31,8 @@
 #ifndef DEBUGGERRUNCONTROLFACTORY_H
 #define DEBUGGERRUNCONTROLFACTORY_H
 
+#include "debuggerconstants.h"
+
 #include <projectexplorer/runconfiguration.h>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 8fee0983ba..74816da543 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -192,21 +192,6 @@ void DebuggerRunControl::handleFinished()
     debuggerCore()->runControlFinished(m_engine);
 }
 
-void DebuggerRunControl::showMessage(const QString &msg, int channel)
-{
-    switch (channel) {
-        case AppOutput:
-            appendMessage(msg, StdOutFormatSameLine);
-            break;
-        case AppError:
-            appendMessage(msg, StdErrFormatSameLine);
-            break;
-        case AppStuff:
-            appendMessage(msg, DebugFormat);
-            break;
-    }
-}
-
 bool DebuggerRunControl::promptToStop(bool *optionalPrompt) const
 {
     QTC_ASSERT(isRunning(), return true);
diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h
index 6487026733..ce164f6cae 100644
--- a/src/plugins/debugger/debuggerrunner.h
+++ b/src/plugins/debugger/debuggerrunner.h
@@ -32,7 +32,6 @@
 #define DEBUGGERRUNNER_H
 
 #include "debugger_global.h"
-#include "debuggerconstants.h"
 
 #include <projectexplorer/runconfiguration.h>
 
@@ -61,8 +60,6 @@ public:
     void debuggingFinished();
     DebuggerEngine *engine();
 
-    void showMessage(const QString &msg, int channel);
-
 signals:
     void engineRequestSetup();
 
diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp
index 37e151b035..c4024df523 100644
--- a/src/plugins/ios/iosdebugsupport.cpp
+++ b/src/plugins/ios/iosdebugsupport.cpp
@@ -230,9 +230,9 @@ void IosDebugSupport::handleRemoteProcessFinished(bool cleanEnd)
 {
     if (m_runControl) {
         if (!cleanEnd)
-            m_runControl->showMessage(tr("Run ended with error."), AppStuff);
+            m_runControl->appendMessage(tr("Run ended with error."), Utils::DebugFormat);
         else
-            m_runControl->showMessage(tr("Run ended."), AppStuff);
+            m_runControl->appendMessage(tr("Run ended."), Utils::DebugFormat);
         m_runControl->engine()->abortDebugger();
     }
 }
@@ -243,7 +243,7 @@ void IosDebugSupport::handleRemoteOutput(const QString &output)
         if (m_runControl->engine())
             m_runControl->engine()->showMessage(output, AppOutput);
         else
-            m_runControl->showMessage(output, AppOutput);
+            m_runControl->appendMessage(output, Utils::StdOutFormatSameLine);
     }
 }
 
@@ -253,7 +253,7 @@ void IosDebugSupport::handleRemoteErrorOutput(const QString &output)
         if (m_runControl->engine())
             m_runControl->engine()->showMessage(output, AppError);
         else
-            m_runControl->showMessage(output, AppError);
+            m_runControl->appendMessage(output, Utils::StdErrFormatSameLine);
     }
 }