Merge remote-tracking branch 'origin/4.5'

Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb

1 files changed, 3 insertions, 17 deletions

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index e5b8d8fdbe6..11d37635e28 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1987,15 +1987,11 @@ public:
     {
         IDevice::ConstPtr device = DeviceKitInformation::device(kit);
         setDisplayName("AttachToRunningProcess");
+        setUsePortsGatherer(true, false);
+        portsGatherer()->setDevice(device);
 
-        portsGatherer = new GdbServerPortsGatherer(runControl);
-        portsGatherer->setUseGdbServer(true);
-        portsGatherer->setUseQmlServer(false);
-        portsGatherer->setDevice(device);
-
-        auto gdbServer = new GdbServerRunner(runControl, portsGatherer);
+        auto gdbServer = new GdbServerRunner(runControl, portsGatherer());
         gdbServer->setUseMulti(false);
-        gdbServer->addStartDependency(portsGatherer);
         gdbServer->setDevice(device);
         gdbServer->setAttachPid(ProcessHandle(pid));
 
@@ -2008,14 +2004,6 @@ public:
         setUseContinueInsteadOfRun(true);
         setContinueAfterAttach(false);
     }
-
-    void start() final
-    {
-        setRemoteChannel(portsGatherer->gdbServerChannel());
-        DebuggerRunTool::start();
-    }
-
-    GdbServerPortsGatherer *portsGatherer;
 };
 
 void DebuggerPluginPrivate::attachToRunningApplication()
@@ -2945,8 +2933,6 @@ void DebuggerPluginPrivate::runControlStarted(DebuggerRunTool *runTool)
 
 void DebuggerPluginPrivate::runControlFinished(DebuggerRunTool *runTool)
 {
-    if (runTool && runTool->engine())
-        runTool->engine()->handleFinished();
     showStatusMessage(tr("Debugger finished."));
     m_snapshotHandler->removeSnapshot(runTool);
     if (m_snapshotHandler->size() == 0) {