feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux/Debugger: Use SymbolFileAspect

Browse Source 
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>
This commit is contained in:
hjk
2018-04-23 15:38:53 +02:00
parent 22428af750
commit d6af336a7e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -45,6 +45,7 @@
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorericons.h> #include <projectexplorer/projectexplorericons.h>
#include <projectexplorer/runnables.h> #include <projectexplorer/runnables.h>
#include <projectexplorer/runconfigurationaspects.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/taskhub.h> #include <projectexplorer/taskhub.h>
@@ -825,8 +826,11 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTer
QString(), QString(), optionalPrompt); QString(), QString(), optionalPrompt);
}); });
if (runConfig) if (runConfig) {
m_runParameters.displayName = runConfig->displayName(); m_runParameters.displayName = runConfig->displayName();
if (auto symbolsAspect = runConfig->extraAspect<SymbolFileAspect>())
m_runParameters.symbolFile = symbolsAspect->value();
}
if (runConfig && !kit) if (runConfig && !kit)
kit = runConfig->target()->kit(); kit = runConfig->target()->kit();

4
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
View File

@@ -48,10 +48,6 @@ LinuxDeviceDebugSupport::LinuxDeviceDebugSupport(RunControl *runControl)
setStartMode(AttachToRemoteServer); setStartMode(AttachToRemoteServer);
setCloseMode(KillAndExitMonitorAtClose); setCloseMode(KillAndExitMonitorAtClose);
setUseExtendedRemote(true); setUseExtendedRemote(true);
RunConfiguration *runConfig = runControl->runConfiguration();
if (auto aspect = runConfig->extraAspect<SymbolFileAspect>())
setSymbolFile(aspect->fileName().toString());
} }
} // namespace Internal } // namespace Internal