From 6313489e2c658030ed884b9626eff9fab9622dcb Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 13 May 2020 08:59:35 +0200
Subject: [PATCH] Debugger: And possibility to modify debugger process
 environment

Might be useful to set ANDROID_SERIAL to get hold of the right device
when multiple are connected.

Change-Id: I8f1f02552a9f57ee8a9ed35ae696d137cc85fe52
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/debugger/debuggerruncontrol.cpp | 5 +++++
 src/plugins/debugger/debuggerruncontrol.h   | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index db8fed7ee60..fb15e238413 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -508,6 +508,11 @@ void DebuggerRunTool::addQmlServerInferiorCommandLineArgumentIfNeeded()
     d->addQmlServerInferiorCommandLineArgumentIfNeeded = true;
 }
 
+void DebuggerRunTool::modifyDebuggerEnvironment(const EnvironmentItems &items)
+{
+    m_runParameters.debugger.environment.modify(items);
+}
+
 void DebuggerRunTool::setCrashParameter(const QString &event)
 {
     m_runParameters.crashParameter = event;
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index adc9de8fef6..199367cf93c 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -33,6 +33,8 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
 
+#include <utils/environmentfwd.h>
+
 namespace Debugger {
 
 namespace Internal {
@@ -78,7 +80,7 @@ public:
     void setRunControlName(const QString &name);
     void setStartMessage(const QString &msg);
     void addQmlServerInferiorCommandLineArgumentIfNeeded();
-
+    void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item);
     void setCrashParameter(const QString &event);
 
     void addExpectedSignal(const QString &signal);