forked from qt-creator/qt-creator
Utils: Keep "enabled" property of env variables when expanding
Amends 529f835c11
.
Change-Id: I5ed7aec708bbf473ac277b1a23fd338804374260
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -80,8 +80,8 @@ Utils::Environment EnvironmentAspect::environment() const
|
||||
Environment EnvironmentAspect::expandedEnvironment(const Utils::MacroExpander &expander) const
|
||||
{
|
||||
Environment expandedEnv;
|
||||
environment().forEachEntry([&](const QString &key, const QString &value, bool) {
|
||||
expandedEnv.set(key, expander.expand(value));
|
||||
environment().forEachEntry([&](const QString &key, const QString &value, bool enabled) {
|
||||
expandedEnv.set(key, expander.expand(value), enabled);
|
||||
});
|
||||
return expandedEnv;
|
||||
}
|
||||
|
Reference in New Issue
Block a user