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

Utils::Environment: Use expanded values

Browse Source 
The Environment class is supposed to support values with references to
other variables, but we failed to actually expand them in most places.

Fixes: QTCREATORBUG-22687
Change-Id: I108cb59d3b4571471423455240f6f4f1cf64bf05
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-08-19 14:29:14 +02:00
parent 30dc401429
commit 6d3f236aab
19 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/remotelinux/makeinstallstep.cpp
View File

@@ -140,7 +140,7 @@ bool MakeInstallStep::init()
Environment env = processParameters()->environment();
for (auto it = cmd.environment.constBegin(); it != cmd.environment.constEnd(); ++it) {
if (cmd.environment.isEnabled(it))
env.set(it.key(), cmd.environment.value(it));
env.set(it.key(), cmd.environment.expandedValueForKey(cmd.environment.key(it)));
}
processParameters()->setEnvironment(env);
}