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>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/libs/clangsupport/processcreator.cpp b/src/libs/clangsupport/processcreator.cpp
index 22b52793e30..e0147bda6bd 100644
--- a/src/libs/clangsupport/processcreator.cpp
+++ b/src/libs/clangsupport/processcreator.cpp
@@ -173,8 +173,10 @@ QProcessEnvironment ProcessCreator::processEnvironment() const
     }
 
     const Utils::Environment &env = m_environment;
-    for (auto it = env.constBegin(); it != env.constEnd(); ++it)
-        processEnvironment.insert(it.key(), it.value());
+    for (auto it = env.constBegin(); it != env.constEnd(); ++it) {
+        if (env.isEnabled(it))
+            processEnvironment.insert(it.key(), env.value(it));
+    }
 
     return processEnvironment;
 }