diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp index 4ba1127ffe7..cc20c2e8608 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp @@ -37,6 +37,8 @@ #include #include #include +#include +#include #include #include @@ -199,6 +201,9 @@ BuildConfiguration::BuildType GenericBuildConfiguration::buildType() const void GenericBuildConfiguration::addToEnvironment(Utils::Environment &env) const { prependCompilerPathToEnvironment(env); + const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target()->kit()); + if (qt) + env.prependOrSetPath(qt->binPath().toString()); } //////////////////////////////////////////////////////////////////////////////////// diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index c4253f68e67..ec014c8fa9a 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -759,6 +759,9 @@ BuildConfiguration::BuildType QmakeBuildConfiguration::buildType() const void QmakeBuildConfiguration::addToEnvironment(Environment &env) const { prependCompilerPathToEnvironment(env); + const BaseQtVersion *qt = QtKitInformation::qtVersion(target()->kit()); + if (qt) + env.prependOrSetPath(qt->binPath().toString()); } QmakeBuildConfiguration::LastKitState::LastKitState() { } diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index e6c5517963d..459d3b4374c 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1313,7 +1313,6 @@ void BaseQtVersion::addToEnvironment(const Kit *k, Environment &env) const { Q_UNUSED(k); env.set(QLatin1String("QTDIR"), QDir::toNativeSeparators(qmakeProperty("QT_HOST_DATA"))); - env.prependOrSetPath(qmakeProperty("QT_HOST_BINS")); } // Some Qt versions may require environment settings for qmake to work