Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d

src/plugins/projectexplorer/buildconfiguration.cpp

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