From fd8df8cff24d2a3e7025ffb47789167bfe019245 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 29 Mar 2017 08:01:14 +0200
Subject: [PATCH] WinRT: Base WinRTDebugSupport on ProjectExplorer::ToolRunner

Change-Id: Ic4985d5eeee1af74a6f42b2b1df890450936f6f9
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/winrt/winrtdebugsupport.cpp | 7 +++----
 src/plugins/winrt/winrtdebugsupport.h   | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/plugins/winrt/winrtdebugsupport.cpp b/src/plugins/winrt/winrtdebugsupport.cpp
index 92c553796d0..1cd538dd4a0 100644
--- a/src/plugins/winrt/winrtdebugsupport.cpp
+++ b/src/plugins/winrt/winrtdebugsupport.cpp
@@ -49,14 +49,13 @@ namespace Internal {
 using namespace ProjectExplorer;
 
 WinRtDebugSupport::WinRtDebugSupport(RunControl *runControl, WinRtRunnerHelper *runner)
-    : QObject(runControl)
-    , m_debugRunControl(runControl)
+    : ToolRunner(runControl)
     , m_runner(runner)
 {
-    connect(m_debugRunControl, &RunControl::finished, this, &WinRtDebugSupport::finish);
+    connect(runControl, &RunControl::finished, this, &WinRtDebugSupport::finish);
 }
 
-bool WinRtDebugSupport::useQmlDebugging(WinRtRunConfiguration *runConfig)
+bool WinRtDebugSupport::useQmlDebugging(RunConfiguration *runConfig)
 {
     Debugger::DebuggerRunConfigurationAspect *extraAspect =
             runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
diff --git a/src/plugins/winrt/winrtdebugsupport.h b/src/plugins/winrt/winrtdebugsupport.h
index 32869bba3bb..630463d44c3 100644
--- a/src/plugins/winrt/winrtdebugsupport.h
+++ b/src/plugins/winrt/winrtdebugsupport.h
@@ -35,7 +35,7 @@ namespace Internal {
 class WinRtRunConfiguration;
 class WinRtRunnerHelper;
 
-class WinRtDebugSupport : public QObject
+class WinRtDebugSupport : public ProjectExplorer::ToolRunner
 {
     Q_OBJECT
 public:
@@ -49,10 +49,9 @@ private:
 
     void finish();
 
-    static bool useQmlDebugging(WinRtRunConfiguration *runConfig);
+    static bool useQmlDebugging(ProjectExplorer::RunConfiguration *runConfig);
     static bool getFreePort(Utils::Port &qmlDebuggerPort, QString *errorMessage);
 
-    ProjectExplorer::RunControl *m_debugRunControl;
     WinRtRunnerHelper *m_runner;
 };