WinRT: Base WinRTDebugSupport on ProjectExplorer::ToolRunner

Change-Id: Ic4985d5eeee1af74a6f42b2b1df890450936f6f9
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2017-03-29 08:01:14 +02:00
parent 246c33ccba
commit fd8df8cff2
2 changed files with 5 additions and 7 deletions

View File

@@ -49,14 +49,13 @@ namespace Internal {
using namespace ProjectExplorer; using namespace ProjectExplorer;
WinRtDebugSupport::WinRtDebugSupport(RunControl *runControl, WinRtRunnerHelper *runner) WinRtDebugSupport::WinRtDebugSupport(RunControl *runControl, WinRtRunnerHelper *runner)
: QObject(runControl) : ToolRunner(runControl)
, m_debugRunControl(runControl)
, m_runner(runner) , 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 = Debugger::DebuggerRunConfigurationAspect *extraAspect =
runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>(); runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();

View File

@@ -35,7 +35,7 @@ namespace Internal {
class WinRtRunConfiguration; class WinRtRunConfiguration;
class WinRtRunnerHelper; class WinRtRunnerHelper;
class WinRtDebugSupport : public QObject class WinRtDebugSupport : public ProjectExplorer::ToolRunner
{ {
Q_OBJECT Q_OBJECT
public: public:
@@ -49,10 +49,9 @@ private:
void finish(); void finish();
static bool useQmlDebugging(WinRtRunConfiguration *runConfig); static bool useQmlDebugging(ProjectExplorer::RunConfiguration *runConfig);
static bool getFreePort(Utils::Port &qmlDebuggerPort, QString *errorMessage); static bool getFreePort(Utils::Port &qmlDebuggerPort, QString *errorMessage);
ProjectExplorer::RunControl *m_debugRunControl;
WinRtRunnerHelper *m_runner; WinRtRunnerHelper *m_runner;
}; };