diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 7304c17662a..ee41a6d1c18 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -142,7 +142,6 @@ ProjectExplorer::IOutputParser *CMakeBuildConfiguration::createOutputParser() co Utils::Environment CMakeBuildConfiguration::baseEnvironment() const { Utils::Environment env = BuildConfiguration::baseEnvironment(); - target()->kit()->addToEnvironment(env); return env; } diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index f9387779b3d..cc628233bd8 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -36,6 +36,7 @@ #include "kitmanager.h" #include "target.h" #include "project.h" +#include "kit.h" #include #include @@ -203,6 +204,7 @@ Utils::Environment BuildConfiguration::baseEnvironment() const Utils::Environment result; if (useSystemEnvironment()) result = Utils::Environment::systemEnvironment(); + target()->kit()->addToEnvironment(result); return result; } diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index 1e6faa75f0a..a17fa4d4b6b 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -161,7 +161,6 @@ void Qt4BuildConfiguration::emitBuildDirectoryChanged() Utils::Environment Qt4BuildConfiguration::baseEnvironment() const { Utils::Environment env = BuildConfiguration::baseEnvironment(); - target()->kit()->addToEnvironment(env); return env; }