feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Kits should affect all buildconfiguration environments

Browse Source 
Not just qt4 and cmake but also generic projects.

Change-Id: I4a7e86fb2dbf6c6e32b4da78953ad3199c554470
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-10-16 16:19:40 +02:00
parent 03a68e38b6
commit c3190f6e7f
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -142,7 +142,6 @@ ProjectExplorer::IOutputParser *CMakeBuildConfiguration::createOutputParser() co
Utils::Environment CMakeBuildConfiguration::baseEnvironment() const Utils::Environment CMakeBuildConfiguration::baseEnvironment() const
{ {
Utils::Environment env = BuildConfiguration::baseEnvironment(); Utils::Environment env = BuildConfiguration::baseEnvironment();
target()->kit()->addToEnvironment(env);
return env; return env;
} }

2
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -36,6 +36,7 @@
#include "kitmanager.h" #include "kitmanager.h"
#include "target.h" #include "target.h"
#include "project.h" #include "project.h"
#include "kit.h"
#include <coreplugin/variablemanager.h> #include <coreplugin/variablemanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
@@ -203,6 +204,7 @@ Utils::Environment BuildConfiguration::baseEnvironment() const
Utils::Environment result; Utils::Environment result;
if (useSystemEnvironment()) if (useSystemEnvironment())
result = Utils::Environment::systemEnvironment(); result = Utils::Environment::systemEnvironment();
target()->kit()->addToEnvironment(result);
return result; return result;
} }

1
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -161,7 +161,6 @@ void Qt4BuildConfiguration::emitBuildDirectoryChanged()
Utils::Environment Qt4BuildConfiguration::baseEnvironment() const Utils::Environment Qt4BuildConfiguration::baseEnvironment() const
{ {
Utils::Environment env = BuildConfiguration::baseEnvironment(); Utils::Environment env = BuildConfiguration::baseEnvironment();
target()->kit()->addToEnvironment(env);
return env; return env;
} }