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

QmakeDesktopRunConfiguration: Add correct entry to PATH on windows

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2017-12-05 14:09:43 +01:00
committed by David Schulz
parent 034e672509
commit 85206e216a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
View File

@@ -344,9 +344,13 @@ void DesktopQmakeRunConfiguration::addToBaseEnvironment(Environment &env) const
} // pro } // pro
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target()->kit()); QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target()->kit());
if (qtVersion && m_isUsingLibrarySearchPath) if (qtVersion && m_isUsingLibrarySearchPath) {
if (HostOsInfo::isWindowsHost())
env.prependOrSetLibrarySearchPath(qtVersion->qmakeProperty("QT_INSTALL_BINS"));
else
env.prependOrSetLibrarySearchPath(qtVersion->qmakeProperty("QT_INSTALL_LIBS")); env.prependOrSetLibrarySearchPath(qtVersion->qmakeProperty("QT_INSTALL_LIBS"));
} }
}
QString DesktopQmakeRunConfiguration::buildSystemTarget() const QString DesktopQmakeRunConfiguration::buildSystemTarget() const
{ {