diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2019-11-05 11:30:22 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-11-11 09:52:08 +0000 |
commit | d10ce822ca7cf5bee8b199e99cc2ea67337d9ad4 (patch) | |
tree | b003cd7b4b1cd6631ea433f0e3bd0815f2f928f4 /src/plugins/projectexplorer/environmentaspect.cpp | |
parent | 62636b270d3c5a48a949a16cf1d9985c380a6cd1 (diff) | |
download | qt-creator-d10ce822ca7cf5bee8b199e99cc2ea67337d9ad4.tar.gz |
Run configurations: Let env widget reflect changes to lib search path
This broke in some refactoring.
Fixes: QTCREATORBUG-23165
Change-Id: Icb98234d83c6cb45a68562b88ee11fc9453bf6b3
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/environmentaspect.cpp')
-rw-r--r-- | src/plugins/projectexplorer/environmentaspect.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/environmentaspect.cpp b/src/plugins/projectexplorer/environmentaspect.cpp index 68eff43620..94dc0e12eb 100644 --- a/src/plugins/projectexplorer/environmentaspect.cpp +++ b/src/plugins/projectexplorer/environmentaspect.cpp @@ -73,11 +73,17 @@ void EnvironmentAspect::setUserEnvironmentChanges(const Utils::EnvironmentItems Utils::Environment EnvironmentAspect::environment() const { + Environment env = modifiedBaseEnvironment(); + env.modify(m_userChanges); + return env; +} + +Environment EnvironmentAspect::modifiedBaseEnvironment() const +{ QTC_ASSERT(m_base >= 0 && m_base < m_baseEnvironments.size(), return Environment()); Environment env = m_baseEnvironments.at(m_base).unmodifiedBaseEnvironment(); for (const EnvironmentModifier &modifier : m_modifiers) modifier(env); - env.modify(m_userChanges); return env; } |