feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Terminal: Fix base Environment

Browse Source 
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>
This commit is contained in:
Marcus Tillmanns
2023-06-13 16:01:47 +02:00
parent 32c97a10d0
commit 6e64a75cb7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/terminal/terminalwidget.cpp
View File

@@ -146,8 +146,8 @@ void TerminalWidget::setupPty()
TerminalSettings::instance().shellArguments.value(), TerminalSettings::instance().shellArguments.value(),
CommandLine::Raw}); CommandLine::Raw});
Environment env = m_openParameters.environment.value_or( Environment env = m_openParameters.environment.value_or(Environment{})
shellCommand.executable().deviceEnvironment()); .appliedToEnvironment(shellCommand.executable().deviceEnvironment());
// For git bash on Windows // For git bash on Windows
env.prependOrSetPath(shellCommand.executable().parentDir()); env.prependOrSetPath(shellCommand.executable().parentDir());