RemoteLinux: Use the optional PortGatherer from the DebuggerRunTool

Change-Id: I4a79abff197ea72df421fbafe11823480719f4a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 4 insertions, 14 deletions

diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index 1687eb1808..cf12971ec7 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -39,12 +39,11 @@ LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl)
 {
     setDisplayName("LinuxDeviceDebugSupport");
 
-    m_portsGatherer = new GdbServerPortsGatherer(runControl);
-    m_portsGatherer->setUseGdbServer(isCppDebugging());
-    m_portsGatherer->setUseQmlServer(isQmlDebugging());
+    setUsePortsGatherer(isCppDebugging(), isQmlDebugging());
+    addQmlServerInferiorCommandLineArgumentIfNeeded();
 
-    auto gdbServer = new GdbServerRunner(runControl, m_portsGatherer);
-    gdbServer->addStartDependency(m_portsGatherer);
+    auto gdbServer = new GdbServerRunner(runControl, portsGatherer());
+    gdbServer->addStartDependency(portsGatherer());
 
     addStartDependency(gdbServer);
 
@@ -59,14 +58,5 @@ LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl)
         setSymbolFile(rlrc->localExecutableFilePath());
 }
 
-void LinuxDeviceDebugSupport::start()
-{
-    setRemoteChannel(m_portsGatherer->gdbServerChannel());
-    setQmlServer(m_portsGatherer->qmlServer());
-    addQmlServerInferiorCommandLineArgumentIfNeeded();
-
-    DebuggerRunTool::start();
-}
-
 } // namespace Internal
 } // namespace RemoteLinux