From d6af336a7eae6cfcc06cabc4d15abaf08c2a7fd9 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 23 Apr 2018 15:38:53 +0200
Subject: [PATCH] RemoteLinux/Debugger: Use SymbolFileAspect

This is/will be optionally available independent of the concrete
run configuration type, so use it.

Change-Id: Ife0e906ff47e916d2f7a9df73af8cdd83635cd65
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/debugger/debuggerruncontrol.cpp         | 6 +++++-
 src/plugins/remotelinux/remotelinuxdebugsupport.cpp | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index b9c829a27d4..a58eb5b6c55 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -45,6 +45,7 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorericons.h>
 #include <projectexplorer/runnables.h>
+#include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
@@ -825,8 +826,11 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTer
                 QString(), QString(), optionalPrompt);
     });
 
-    if (runConfig)
+    if (runConfig) {
         m_runParameters.displayName = runConfig->displayName();
+        if (auto symbolsAspect = runConfig->extraAspect<SymbolFileAspect>())
+            m_runParameters.symbolFile = symbolsAspect->value();
+    }
 
     if (runConfig && !kit)
         kit = runConfig->target()->kit();
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index c92169cf7c6..71aff795568 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -48,10 +48,6 @@ LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl)
     setStartMode(AttachToRemoteServer);
     setCloseMode(KillAndExitMonitorAtClose);
     setUseExtendedRemote(true);
-
-    RunConfiguration *runConfig = runControl->runConfiguration();
-    if (auto aspect = runConfig->extraAspect<SymbolFileAspect>())
-        setSymbolFile(aspect->fileName().toString());
 }
 
 } // namespace Internal