aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2017-04-26 14:52:30 +0200
committerhjk <hjk@qt.io>2017-04-27 08:12:12 +0000
commitcd7ab5d3edec58c9362a010180059a62a5aabd67 (patch)
treed97628b43d6f36ae67671fbb60fb917244672d3c
parent19239e3770113af44b3bb319c2c6a3660656f7c8 (diff)
WinRt: Remove direct debugger dependency in WinRtRunner
Not needed anymore after d049a5be19f23. Change-Id: If968ac763863b94274629fbfbbfe5c91b32d1488 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/winrt/winrtrunnerhelper.cpp11
-rw-r--r--src/plugins/winrt/winrtrunnerhelper.h2
2 files changed, 1 insertions, 12 deletions
diff --git a/src/plugins/winrt/winrtrunnerhelper.cpp b/src/plugins/winrt/winrtrunnerhelper.cpp
index 73a36859f5..56006ac396 100644
--- a/src/plugins/winrt/winrtrunnerhelper.cpp
+++ b/src/plugins/winrt/winrtrunnerhelper.cpp
@@ -39,7 +39,6 @@
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>
#include <utils/qtcprocess.h>
-#include <debugger/debuggerruncontrol.h>
#include <QDir>
@@ -49,7 +48,6 @@ using namespace WinRt::Internal;
WinRtRunnerHelper::WinRtRunnerHelper(WinRtRunConfiguration *runConfiguration, QString *errormessage)
: QObject()
, m_messenger(0)
- , m_debugMessenger(0)
, m_runConfiguration(runConfiguration)
, m_process(0)
{
@@ -59,7 +57,6 @@ WinRtRunnerHelper::WinRtRunnerHelper(WinRtRunConfiguration *runConfiguration, QS
WinRtRunnerHelper::WinRtRunnerHelper(ProjectExplorer::RunControl *runControl)
: QObject(runControl)
, m_messenger(runControl)
- , m_debugMessenger(0)
, m_runConfiguration(0)
, m_process(0)
{
@@ -111,13 +108,8 @@ bool WinRtRunnerHelper::init(WinRtRunConfiguration *runConfiguration, QString *e
void WinRtRunnerHelper::appendMessage(const QString &message, Utils::OutputFormat format)
{
- if (m_debugMessenger && (format == Utils::StdOutFormat || format == Utils::StdErrFormat)){
- // 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) {
+ if (m_messenger)
m_messenger->appendMessage(message, format);
- }
}
void WinRtRunnerHelper::debug(const QString &debuggerExecutable, const QString &debuggerArguments)
@@ -148,7 +140,6 @@ bool WinRtRunnerHelper::waitForStarted(int msecs)
void WinRtRunnerHelper::setDebugRunControl(ProjectExplorer::RunControl *runControl)
{
- m_debugMessenger = qobject_cast<Debugger::DebuggerRunTool *>(runControl->toolRunner());
m_messenger = runControl;
}
diff --git a/src/plugins/winrt/winrtrunnerhelper.h b/src/plugins/winrt/winrtrunnerhelper.h
index b5b0536acc..88a5f76b2a 100644
--- a/src/plugins/winrt/winrtrunnerhelper.h
+++ b/src/plugins/winrt/winrtrunnerhelper.h
@@ -36,7 +36,6 @@
namespace Utils { class QtcProcess; }
namespace ProjectExplorer { class RunControl; }
-namespace Debugger { class DebuggerRunTool; }
namespace WinRt {
namespace Internal {
@@ -76,7 +75,6 @@ private:
void appendMessage(const QString &message, Utils::OutputFormat format);
ProjectExplorer::RunControl *m_messenger;
- Debugger::DebuggerRunTool *m_debugMessenger;
WinRtRunConfiguration *m_runConfiguration;
WinRtDevice::ConstPtr m_device;
Utils::Environment m_environment;