qml debugger: make the application output work

src/plugins/debugger/debuggerengine.h

@@ -326,7 +326,7 @@ protected:
     void setState(DebuggerState state, bool forced = false);
     void setRunInWrapperEngine(bool value);
 
-private:
+protected:
     DebuggerRunControl *runControl() const;
 
 private:

src/plugins/debugger/debuggerrunner.h

@@ -47,6 +47,7 @@ class DebuggerStartParameters;
 
 namespace Internal {
 class DebuggerEngine;
+class QmlEngine;
 }
 
 //DEBUGGER_EXPORT QDebug operator<<(QDebug str, const DebuggerStartParameters &);
@@ -136,6 +137,7 @@ private:
     DebuggerEngineType m_enabledEngines;
     QString m_errorMessage;
     QString m_settingsIdHint;
+    friend class Internal::QmlEngine;
 };
 
 } // namespace Debugger

src/plugins/debugger/qml/qmlengine.cpp

@@ -35,6 +35,7 @@
 #include "debuggerdialogs.h"
 #include "debuggerstringutils.h"
 #include "debuggeruiswitcher.h"
+#include "debuggerrunner.h"
 
 #include "breakhandler.h"
 #include "moduleshandler.h"
@@ -129,7 +130,15 @@ void QmlEngine::setupInferior()
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
 
-    connect(&m_applicationLauncher, SIGNAL(processExited(int)), SLOT(disconnected()));
+    connect(&m_applicationLauncher, SIGNAL(processExited(int)),
+            this, SLOT(disconnected()));
+    connect(&m_applicationLauncher, SIGNAL(appendMessage(QString,bool)),
+            this, SLOT(slotMessage(QString, bool)));
+    connect(&m_applicationLauncher, SIGNAL(appendOutput(QString, bool)),
+            this, SLOT(slotAddToOutputWindow(QString, bool)));
+    connect(&m_applicationLauncher, SIGNAL(bringToForegroundRequested(qint64)),
+            runControl(), SLOT(bringApplicationToForeground(qint64)));
+
     m_applicationLauncher.setEnvironment(startParameters().environment);
     m_applicationLauncher.setWorkingDirectory(startParameters().workingDirectory);
 
@@ -638,6 +647,15 @@ void QmlEngine::disconnected()
     notifyInferiorExited();
 }
 
+void QmlEngine::slotAddToOutputWindow(QString line, bool onStdErr)
+{
+    emit runControl()->addToOutputWindowInline(runControl(), line, onStdErr);
+}
+
+void QmlEngine::slotMessage(QString err , bool isError)
+{
+    emit runControl()->appendMessage(runControl(), err, isError);
+}
 
 } // namespace Internal
 } // namespace Debugger

src/plugins/debugger/qml/qmlengine.h

@@ -123,6 +123,8 @@ private slots:
     void connectionStartupFailed();
     void connectionError();
 
+    void slotMessage(QString, bool);
+    void slotAddToOutputWindow(QString, bool);
 private:
     void expandObject(const QByteArray &iname, quint64 objectId);
     void sendPing();