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

QtSupport: Do not prepend QT_HOST_BINS to PATH

Browse Source 
Do not unconditionally prepend QT_HOST_BINS to PATH as part of the Kit
setup.

Prepend this directory to PATH in the Qmake- and GenericBuildConfigurations
instead.

Task-number: QTCREATORBUG-18714
Change-Id: I1c1d1362105b82f9c369d989e90d4f7079c2c9a2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-10-17 13:48:24 +02:00
parent 813212396b
commit 613519c3d5
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
View File

@@ -37,6 +37,8 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>
#include <utils/mimetypes/mimedatabase.h>
#include <utils/pathchooser.h>
@@ -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());
}
////////////////////////////////////////////////////////////////////////////////////