Debugger: Move modifyDebuggerEnvironment into DebuggerRunParameters

Amends a6e780782b

Change-Id: Ia127702955e1776a46f32b953521057368e17799
Reviewed-by: hjk <hjk@qt.io>

src/plugins/debugger/debuggerengine.h

@@ -194,6 +194,9 @@ public:
 
     bool runAsRoot() const { return m_runAsRoot; }
 
+    void modifyDebuggerEnvironment(const Utils::EnvironmentItems &items) {
+        m_debugger.environment.modify(items);
+    }
     Utils::ProcessRunData debugger() const { return m_debugger; }
 
     void setOverrideStartScript(const Utils::FilePath &script) { m_overrideStartScript = script; }

src/plugins/debugger/debuggerruncontrol.cpp

@@ -105,11 +105,6 @@ void DebuggerRunTool::addQmlServerInferiorCommandLineArgumentIfNeeded()
     d->addQmlServerInferiorCommandLineArgumentIfNeeded = true;
 }
 
-void DebuggerRunTool::modifyDebuggerEnvironment(const EnvironmentItems &items)
-{
-    m_runParameters.debugger().environment.modify(items);
-}
-
 void DebuggerRunTool::start()
 {
     startCoreFileSetupIfNeededAndContinueStartup();

src/plugins/debugger/debuggerruncontrol.h

@@ -36,8 +36,6 @@ public:
     void addQmlServerInferiorCommandLineArgumentIfNeeded();
     void setupPortsGatherer();
 
-    void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item);
-
     DebuggerRunParameters &runParameters() { return m_runParameters; }
 
 private:

src/plugins/qnx/qnxdebugsupport.cpp

@@ -210,7 +210,7 @@ public:
             rp.setSolibSearchPath(FileUtils::toFilePathList(searchPaths(k)));
             if (auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitAspect::qtVersion(k))) {
                 rp.setSysRoot(qtVersion->qnxTarget());
-                debugger->modifyDebuggerEnvironment(qtVersion->environment());
+                rp.modifyDebuggerEnvironment(qtVersion->environment());
             }
 
             return debugger;