diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index b930cadc854..6df40c465de 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -198,10 +198,8 @@ void QmlEngine::setupInferior() } else { connect(&d->m_applicationLauncher, SIGNAL(processExited(int)), SLOT(disconnected())); - connect(&d->m_applicationLauncher, SIGNAL(appendMessage(QString,bool)), - SLOT(appendMessage(QString,bool))); - connect(&d->m_applicationLauncher, SIGNAL(appendOutput(QString,bool)), - SLOT(appendOutput(QString,bool))); + connect(&d->m_applicationLauncher, SIGNAL(appendMessage(QString,ProjectExplorer::OutputFormat)), + SLOT(appendMessage(QString,ProjectExplorer::OutputFormat))); connect(&d->m_applicationLauncher, SIGNAL(bringToForegroundRequested(qint64)), runControl(), SLOT(bringApplicationToForeground(qint64))); @@ -212,14 +210,9 @@ void QmlEngine::setupInferior() } } -void QmlEngine::appendMessage(const QString &msg, bool) +void QmlEngine::appendMessage(const QString &msg, ProjectExplorer::OutputFormat format) { - showMessage(msg, AppStuff); -} - -void QmlEngine::appendOutput(const QString &msg, bool) -{ - showMessage(msg, AppOutput); + showMessage(msg, AppStuff); // FIXME: Redirect to RunControl } void QmlEngine::connectionEstablished() diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index 4a37148509a..6df6629dcec 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -36,6 +36,8 @@ #include "debuggerengine.h" +#include + #include #include @@ -123,8 +125,7 @@ private slots: void connectionStartupFailed(); void connectionError(QAbstractSocket::SocketError error); void serviceConnectionError(const QString &service); - void appendMessage(const QString &msg, bool); - void appendOutput(const QString &msg, bool); + void appendMessage(const QString &msg, ProjectExplorer::OutputFormat); private: void expandObject(const QByteArray &iname, quint64 objectId);