From be3fc0ef0bb03dec976b50e10bdbb122b29b7c31 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@theqtcompany.com>
Date: Mon, 20 Jul 2015 10:47:54 +0200
Subject: [PATCH] Qt Quick UI: Add "kit environment" as a base environment for
 run

Change-Id: Ica4e63b4b8e56ee6d2ead0ad3a5d1b57de20009c
Task-number: QTCREATORBUG-14701
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 .../qmlprojectenvironmentaspect.cpp              | 16 +++++++++++++---
 .../qmlprojectenvironmentaspect.h                |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
index bf8182f14e5..7fbce89c64e 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
@@ -30,6 +30,8 @@
 
 #include "qmlprojectenvironmentaspect.h"
 
+#include <projectexplorer/target.h>
+#include <projectexplorer/kit.h>
 #include <utils/qtcassert.h>
 
 namespace QmlProjectManager {
@@ -40,19 +42,27 @@ namespace QmlProjectManager {
 
 QList<int> QmlProjectEnvironmentAspect::possibleBaseEnvironments() const
 {
-    return QList<int>() << static_cast<int>(SystemEnvironmentBase);
+    return QList<int>() << static_cast<int>(KitEnvironmentBase)
+                        << static_cast<int>(SystemEnvironmentBase);
 }
 
 QString QmlProjectEnvironmentAspect::baseEnvironmentDisplayName(int base) const
 {
     if (base == static_cast<int>(SystemEnvironmentBase))
         return tr("System Environment");
+    if (base == static_cast<int>(KitEnvironmentBase))
+        return tr("Kit Environment");
     return QString();
 }
 
-Utils::Environment QmlProjectManager::QmlProjectEnvironmentAspect::baseEnvironment() const
+Utils::Environment QmlProjectEnvironmentAspect::baseEnvironment() const
 {
-    return Utils::Environment::systemEnvironment();
+    int base = baseEnvironmentBase();
+    Utils::Environment env = Utils::Environment::systemEnvironment();
+    if (base == static_cast<int>(KitEnvironmentBase))
+        runConfiguration()->target()->kit()->addToEnvironment(env);
+
+    return env;
 }
 
 QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) :
diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h
index e6697c2dcab..20b9707fb05 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h
@@ -51,7 +51,8 @@ public:
 
 private:
     enum BaseEnvironmentBase {
-        SystemEnvironmentBase = 0
+        SystemEnvironmentBase = 0,
+        KitEnvironmentBase
     };
 };