From a0fe1d329b153981f1e01215f09889c9a865a447 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 13 Jan 2025 18:39:41 +0100 Subject: [PATCH] Debugger: Move modifyDebuggerEnvironment into DebuggerRunParameters Amends a6e780782b286dac11f811fe52a41d6617675532 Change-Id: Ia127702955e1776a46f32b953521057368e17799 Reviewed-by: hjk --- src/plugins/debugger/debuggerengine.h | 3 +++ src/plugins/debugger/debuggerruncontrol.cpp | 5 ----- src/plugins/debugger/debuggerruncontrol.h | 2 -- src/plugins/qnx/qnxdebugsupport.cpp | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 2964ba0c729..e475b65fc09 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/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; } diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 8611f017947..a8e940315c6 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/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(); diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h index be7d2bd6d70..2a3b11b2c40 100644 --- a/src/plugins/debugger/debuggerruncontrol.h +++ b/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: diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index b83d549198e..5834c1a22b0 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -210,7 +210,7 @@ public: rp.setSolibSearchPath(FileUtils::toFilePathList(searchPaths(k))); if (auto qtVersion = dynamic_cast(QtSupport::QtKitAspect::qtVersion(k))) { rp.setSysRoot(qtVersion->qnxTarget()); - debugger->modifyDebuggerEnvironment(qtVersion->environment()); + rp.modifyDebuggerEnvironment(qtVersion->environment()); } return debugger;