From 85206e216afbb132d41bf7101fd9dc6446874ee2 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 5 Dec 2017 14:09:43 +0100 Subject: [PATCH] QmakeDesktopRunConfiguration: Add correct entry to PATH on windows When adding Qt to the PATH in the qmake desktop runconfiguration, creator added the INSTALL_LIBS on windows. This is not correct, use INSTALL_BINS instead. Change-Id: Idf3644085657f871870119126d2ab28721ff85d8 Reviewed-by: David Schulz --- .../qmakeprojectmanager/desktopqmakerunconfiguration.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index c5330b749c9..32922cb9f7d 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -344,8 +344,12 @@ void DesktopQmakeRunConfiguration::addToBaseEnvironment(Environment &env) const } // pro QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target()->kit()); - if (qtVersion && m_isUsingLibrarySearchPath) - env.prependOrSetLibrarySearchPath(qtVersion->qmakeProperty("QT_INSTALL_LIBS")); + if (qtVersion && m_isUsingLibrarySearchPath) { + if (HostOsInfo::isWindowsHost()) + env.prependOrSetLibrarySearchPath(qtVersion->qmakeProperty("QT_INSTALL_BINS")); + else + env.prependOrSetLibrarySearchPath(qtVersion->qmakeProperty("QT_INSTALL_LIBS")); + } } QString DesktopQmakeRunConfiguration::buildSystemTarget() const