Merge remote-tracking branch 'origin/4.5'

Change-Id: Ib6739725e6b251ea962880e4b72700c5be5a192c
2017-11-14 11:23:57 +01:00
parent e865261c49 b39687645d
commit 2d30d3ddd6
13 changed files with 67 additions and 21 deletions
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -437,6 +437,11 @@ void DebuggerRunTool::setInferiorEnvironment(const Utils::Environment &env)
    m_runParameters.inferior.environment = env;
 }

+void DebuggerRunTool::setInferiorDevice(IDevice::ConstPtr device)
+{
+    m_runParameters.inferior.device = device;
+}
+
 void DebuggerRunTool::setRunControlName(const QString &name)
 {
    m_runParameters.displayName = name;