From c2bba5bbd4b48999a2c91e04afdcdd85f9ca5353 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 9 Jul 2018 14:11:21 +0200
Subject: [PATCH] Expand variables in external tool environment

Change-Id: I98fc942f25309bba1b4573b0544418d3b4b836c8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/coreplugin/externaltool.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index 58abcae5b16..08e3ecc29b0 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -35,6 +35,7 @@
 
 #include <app/app_version.h>
 
+#include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
@@ -574,7 +575,11 @@ bool ExternalToolRunner::resolve()
 
 
     MacroExpander *expander = globalMacroExpander();
-    m_resolvedEnvironment.modify(m_tool->environment());
+    QList<EnvironmentItem> expandedEnvironment
+        = Utils::transform(m_tool->environment(), [expander](const EnvironmentItem &item) {
+              return EnvironmentItem(item.name, expander->expand(item.value), item.operation);
+          });
+    m_resolvedEnvironment.modify(expandedEnvironment);
 
     {
         // executable