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

Utils: Keep "enabled" property of env variables when expanding

Browse Source 
Amends 529f835c11.

Change-Id: I5ed7aec708bbf473ac277b1a23fd338804374260
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2025-06-20 10:59:14 +02:00
parent 9ebc0f892a
commit e539d8e052
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/environmentaspect.cpp
View File

@@ -80,8 +80,8 @@ Utils::Environment EnvironmentAspect::environment() const
Environment EnvironmentAspect::expandedEnvironment(const Utils::MacroExpander &expander) const Environment EnvironmentAspect::expandedEnvironment(const Utils::MacroExpander &expander) const
{ {
Environment expandedEnv; Environment expandedEnv;
environment().forEachEntry([&](const QString &key, const QString &value, bool) { environment().forEachEntry([&](const QString &key, const QString &value, bool enabled) {
expandedEnv.set(key, expander.expand(value)); expandedEnv.set(key, expander.expand(value), enabled);
}); });
return expandedEnv; return expandedEnv;
} }