Make a process' environment configurable in a prepare script.

This is needed for applications that are configured via environment
variables rather than command-line arguments.

Change-Id: I114f2bcd65d8551175b35ffbd4912bd37699dc89
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/lib/buildgraph/processcommandexecutor.cpp b/src/lib/buildgraph/processcommandexecutor.cpp
index c61a8f700..122e1e993 100644
--- a/src/lib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/buildgraph/processcommandexecutor.cpp
@@ -72,11 +72,6 @@ ProcessCommandExecutor::ProcessCommandExecutor(const Logger &logger, QObject *pa
     connect(&m_process, SIGNAL(finished(int)), SLOT(onProcessFinished(int)));
 }
 
-void ProcessCommandExecutor::setProcessEnvironment(const QProcessEnvironment &processEnvironment)
-{
-    m_process.setProcessEnvironment(processEnvironment);
-}
-
 // returns an empty string or one that starts with a space!
 static QString commandArgsToString(const QStringList &args)
 {
@@ -106,6 +101,12 @@ void ProcessCommandExecutor::doStart()
         program = findProcessCommandInPath();
     }
 
+    QProcessEnvironment env = m_buildEnvironment;
+    const QProcessEnvironment &additionalVariables = cmd->environment();
+    foreach (const QString &key, additionalVariables.keys())
+        env.insert(key, additionalVariables.value(key));
+    m_process.setProcessEnvironment(env);
+
     QStringList arguments = cmd->arguments();
     QString argString = commandArgsToString(arguments);