From 6e64a75cb726dbabcec5e410ad3eb6babb4fef52 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Tue, 13 Jun 2023 16:01:47 +0200
Subject: [PATCH] Terminal: Fix base Environment

Change-Id: I509333df419f88b922dd69a4ee6484f2c809c31d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
---
 src/plugins/terminal/terminalwidget.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp
index 86171f1882e..4b6442753e1 100644
--- a/src/plugins/terminal/terminalwidget.cpp
+++ b/src/plugins/terminal/terminalwidget.cpp
@@ -146,8 +146,8 @@ void TerminalWidget::setupPty()
                     TerminalSettings::instance().shellArguments.value(),
                     CommandLine::Raw});
 
-    Environment env = m_openParameters.environment.value_or(
-        shellCommand.executable().deviceEnvironment());
+    Environment env = m_openParameters.environment.value_or(Environment{})
+                          .appliedToEnvironment(shellCommand.executable().deviceEnvironment());
 
     // For git bash on Windows
     env.prependOrSetPath(shellCommand.executable().parentDir());