From f4efd3f64fcf26e7d0e7b3dd083c17d313553595 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Thu, 11 Apr 2013 16:33:07 +0200
Subject: [PATCH] RC EnvironmentAspect: Add kit environment changes

If used in a project without a buildconfiguration, e.g. a qmlproject

Task-number: QTCREATORBUG-9114
Change-Id: I919a7a36b784c1956f1233adc7c5b69d531544aa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/plugins/projectexplorer/localenvironmentaspect.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/localenvironmentaspect.cpp b/src/plugins/projectexplorer/localenvironmentaspect.cpp
index 7b1cec55fa3..8e84bc3b470 100644
--- a/src/plugins/projectexplorer/localenvironmentaspect.cpp
+++ b/src/plugins/projectexplorer/localenvironmentaspect.cpp
@@ -32,6 +32,7 @@
 #include "buildconfiguration.h"
 #include "environmentaspectwidget.h"
 #include "localapplicationrunconfiguration.h"
+#include "kit.h"
 #include "target.h"
 
 #include <utils/qtcassert.h>
@@ -65,8 +66,12 @@ Utils::Environment LocalEnvironmentAspect::baseEnvironment() const
     int base = baseEnvironmentBase();
     Utils::Environment env;
     if (base == static_cast<int>(BuildEnvironmentBase)) {
-        if (BuildConfiguration *bc = runConfiguration()->target()->activeBuildConfiguration())
+        if (BuildConfiguration *bc = runConfiguration()->target()->activeBuildConfiguration()) {
             env = bc->environment();
+        } else { // Fallback for targets without buildconfigurations:
+            env = Utils::Environment::systemEnvironment();
+            runConfiguration()->target()->kit()->addToEnvironment(env);
+        }
     } else if (base == static_cast<int>(SystemEnvironmentBase)) {
         env = Utils::Environment::systemEnvironment();
     }