diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-09 17:41:30 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-22 14:31:01 +0000 |
| commit | 4d71c0f13e5854849a9836186f534dfab1ef9869 (patch) | |
| tree | 3af786598de0a84221e20f9c3703bc8d8afee8c6 /src/plugins/remotelinux/makeinstallstep.cpp | |
| parent | b1dbd7e3580fb92879e0b3e0c9d21c1fd8dc4012 (diff) | |
| download | qt-creator-4d71c0f13e5854849a9836186f534dfab1ef9869.tar.gz | |
Let users disable environment entries
It's helpful to be able to temporarily disable environment variables, as
opposed to having to remove (and then re-add) them entirely.
Fixes: QTCREATORBUG-20984
Change-Id: Ib0d287035b9357507c4c19faaf3a1517382506b5
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/remotelinux/makeinstallstep.cpp')
| -rw-r--r-- | src/plugins/remotelinux/makeinstallstep.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp index 8af1a6aebd..283d9bff4a 100644 --- a/src/plugins/remotelinux/makeinstallstep.cpp +++ b/src/plugins/remotelinux/makeinstallstep.cpp @@ -138,8 +138,10 @@ bool MakeInstallStep::init() const MakeInstallCommand cmd = target()->makeInstallCommand(installRoot().toString()); if (cmd.environment.size() > 0) { Environment env = processParameters()->environment(); - for (auto it = cmd.environment.constBegin(); it != cmd.environment.constEnd(); ++it) - env.set(it.key(), it.value()); + for (auto it = cmd.environment.constBegin(); it != cmd.environment.constEnd(); ++it) { + if (cmd.environment.isEnabled(it)) + env.set(it.key(), cmd.environment.value(it)); + } processParameters()->setEnvironment(env); } m_noInstallTarget = false; |