From 7826ec7ed5c44cf6bc5c80f10c8588dff8372c5d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 9 Mar 2017 14:13:13 +0100
Subject: ProjectExplorer: Merge ApplicationLauncher and
 DeviceApplicationRunner

Treat ApplicationLauncher as a special case of a DeviceApplicationRunner
with an implicit desktop device.

As a first step, lump the two implementations together.

Change-Id: Ifa3ea3f38d320023050378555e2d256e762b6683
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/baremetal/baremetaldebugsupport.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/baremetal/baremetaldebugsupport.h')

diff --git a/src/plugins/baremetal/baremetaldebugsupport.h b/src/plugins/baremetal/baremetaldebugsupport.h
index 31aa1b5935..61f649ec65 100644
--- a/src/plugins/baremetal/baremetaldebugsupport.h
+++ b/src/plugins/baremetal/baremetaldebugsupport.h
@@ -30,7 +30,7 @@
 
 namespace Debugger { class DebuggerRunControl; }
 
-namespace ProjectExplorer { class DeviceApplicationRunner; }
+namespace ProjectExplorer { class ApplicationLauncher; }
 
 namespace BareMetal {
 namespace Internal {
@@ -64,7 +64,7 @@ private:
     void reset();
     void showMessage(const QString &msg, int channel);
 
-    ProjectExplorer::DeviceApplicationRunner *m_appRunner;
+    ProjectExplorer::ApplicationLauncher *m_appLauncher;
     const QPointer<Debugger::DebuggerRunControl> m_runControl;
     BareMetalDebugSupport::State m_state;
 };
-- 
cgit v1.2.1