From 43862f4cd4ce898a959f8aa0a841674ee079f32c Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Tue, 13 Jun 2023 09:00:09 +0200 Subject: [PATCH] Terminal: Fix setting environment for stub process The TerminalInterface was setting the environment of the target process for the stub, this is uneccessary. The ExternalTerminalProcessImpl was not using the environment of the stub process which will be important later. The TerminalProcessImpl was not setting the right environment either. Task-number: QTCREATORBUG-27519 Change-Id: I89238feedd755d1f1cbe2255b71711e0d5c149d0 Reviewed-by: Marcus Tillmanns --- src/libs/utils/externalterminalprocessimpl.cpp | 2 ++ src/libs/utils/terminalinterface.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/externalterminalprocessimpl.cpp b/src/libs/utils/externalterminalprocessimpl.cpp index 3f8636665db..2a316a22831 100644 --- a/src/libs/utils/externalterminalprocessimpl.cpp +++ b/src/libs/utils/externalterminalprocessimpl.cpp @@ -108,6 +108,8 @@ expected_str ProcessStubCreator::startStubProcess(const ProcessSetupData cmdLine.addCommandLineAsArgs(setupData.m_commandLine, CommandLine::Raw); process->setCommand(cmdLine); } + process->setEnvironment( + setupData.m_environment.appliedToEnvironment(Environment::systemEnvironment())); process->setEnvironment(setupData.m_environment); diff --git a/src/libs/utils/terminalinterface.cpp b/src/libs/utils/terminalinterface.cpp index 9b6e6457102..cd48de6bc03 100644 --- a/src/libs/utils/terminalinterface.cpp +++ b/src/libs/utils/terminalinterface.cpp @@ -384,7 +384,7 @@ void TerminalInterface::start() QTC_ASSERT(d->stubCreator, return); - ProcessSetupData stubSetupData = m_setup; + ProcessSetupData stubSetupData; stubSetupData.m_commandLine = cmd; if (m_setup.m_runAsRoot && !HostOsInfo::isWindowsHost()) {