Commit cd7ab5d3 authored by hjk's avatar hjk
Browse files

WinRt: Remove direct debugger dependency in WinRtRunner

Not needed anymore after d049a5be

.

Change-Id: If968ac763863b94274629fbfbbfe5c91b32d1488
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 19239e37
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <debugger/debuggerruncontrol.h>
#include <QDir> #include <QDir>
...@@ -49,7 +48,6 @@ using namespace WinRt::Internal; ...@@ -49,7 +48,6 @@ using namespace WinRt::Internal;
WinRtRunnerHelper::WinRtRunnerHelper(WinRtRunConfiguration *runConfiguration, QString *errormessage) WinRtRunnerHelper::WinRtRunnerHelper(WinRtRunConfiguration *runConfiguration, QString *errormessage)
: QObject() : QObject()
, m_messenger(0) , m_messenger(0)
, m_debugMessenger(0)
, m_runConfiguration(runConfiguration) , m_runConfiguration(runConfiguration)
, m_process(0) , m_process(0)
{ {
...@@ -59,7 +57,6 @@ WinRtRunnerHelper::WinRtRunnerHelper(WinRtRunConfiguration *runConfiguration, QS ...@@ -59,7 +57,6 @@ WinRtRunnerHelper::WinRtRunnerHelper(WinRtRunConfiguration *runConfiguration, QS
WinRtRunnerHelper::WinRtRunnerHelper(ProjectExplorer::RunControl *runControl) WinRtRunnerHelper::WinRtRunnerHelper(ProjectExplorer::RunControl *runControl)
: QObject(runControl) : QObject(runControl)
, m_messenger(runControl) , m_messenger(runControl)
, m_debugMessenger(0)
, m_runConfiguration(0) , m_runConfiguration(0)
, m_process(0) , m_process(0)
{ {
...@@ -111,13 +108,8 @@ bool WinRtRunnerHelper::init(WinRtRunConfiguration *runConfiguration, QString *e ...@@ -111,13 +108,8 @@ bool WinRtRunnerHelper::init(WinRtRunConfiguration *runConfiguration, QString *e
void WinRtRunnerHelper::appendMessage(const QString &message, Utils::OutputFormat format) void WinRtRunnerHelper::appendMessage(const QString &message, Utils::OutputFormat format)
{ {
if (m_debugMessenger && (format == Utils::StdOutFormat || format == Utils::StdErrFormat)){ if (m_messenger)
// We wan to filter out the waiting for connection message from the QML debug server
m_debugMessenger->showMessage(message, format == Utils::StdOutFormat ? Debugger::AppOutput
: Debugger::AppError);
} else if (m_messenger) {
m_messenger->appendMessage(message, format); m_messenger->appendMessage(message, format);
}
} }
void WinRtRunnerHelper::debug(const QString &debuggerExecutable, const QString &debuggerArguments) void WinRtRunnerHelper::debug(const QString &debuggerExecutable, const QString &debuggerArguments)
...@@ -148,7 +140,6 @@ bool WinRtRunnerHelper::waitForStarted(int msecs) ...@@ -148,7 +140,6 @@ bool WinRtRunnerHelper::waitForStarted(int msecs)
void WinRtRunnerHelper::setDebugRunControl(ProjectExplorer::RunControl *runControl) void WinRtRunnerHelper::setDebugRunControl(ProjectExplorer::RunControl *runControl)
{ {
m_debugMessenger = qobject_cast<Debugger::DebuggerRunTool *>(runControl->toolRunner());
m_messenger = runControl; m_messenger = runControl;
} }
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
namespace Utils { class QtcProcess; } namespace Utils { class QtcProcess; }
namespace ProjectExplorer { class RunControl; } namespace ProjectExplorer { class RunControl; }
namespace Debugger { class DebuggerRunTool; }
namespace WinRt { namespace WinRt {
namespace Internal { namespace Internal {
...@@ -76,7 +75,6 @@ private: ...@@ -76,7 +75,6 @@ private:
void appendMessage(const QString &message, Utils::OutputFormat format); void appendMessage(const QString &message, Utils::OutputFormat format);
ProjectExplorer::RunControl *m_messenger; ProjectExplorer::RunControl *m_messenger;
Debugger::DebuggerRunTool *m_debugMessenger;
WinRtRunConfiguration *m_runConfiguration; WinRtRunConfiguration *m_runConfiguration;
WinRtDevice::ConstPtr m_device; WinRtDevice::ConstPtr m_device;
Utils::Environment m_environment; Utils::Environment m_environment;
......
Markdown is supported
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