Use EnvironmentAspect to retrieve the environment

Change-Id: If878e22cc2715d05bb3e65ad908cd4fb5e21b03b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
index 3fc1626fad..429649df6c 100644
--- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp
+++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
@@ -30,6 +30,7 @@
 #include "localapplicationruncontrol.h"
 #include "localapplicationrunconfiguration.h"
 
+#include <projectexplorer/environmentaspect.h>
 #include <utils/qtcassert.h>
 #include <utils/environment.h>
 
@@ -72,7 +73,10 @@ RunControl *LocalApplicationRunControlFactory::create(RunConfiguration *runConfi
 LocalApplicationRunControl::LocalApplicationRunControl(LocalApplicationRunConfiguration *rc, RunMode mode)
     : RunControl(rc, mode), m_running(false)
 {
-    Utils::Environment env = rc->environment();
+    EnvironmentAspect *environment = rc->extraAspect<EnvironmentAspect>();
+    Utils::Environment env;
+    if (environment)
+        env = environment->environment();
     QString dir = rc->workingDirectory();
     m_applicationLauncher.setEnvironment(env);
     m_applicationLauncher.setWorkingDirectory(dir);