diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-12-05 14:09:43 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2017-12-05 13:48:57 +0000 |
| commit | 85206e216afbb132d41bf7101fd9dc6446874ee2 (patch) | |
| tree | 51621d1e701d8ff4f5946cd708b6992d16835eee | |
| parent | 034e672509447ad99585b1c72323b8a019c91a4b (diff) | |
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 <david.schulz@qt.io>
| -rw-r--r-- | src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index c5330b749c..32922cb9f7 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 |