From 8d523f1900d0701763ce7addf13fc5dfaabbc528 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 9 Jan 2018 22:38:32 +0200 Subject: [PATCH] Qbs: Use right path for Qt libraries Similar to 85206e216afbb132d41bf7101fd9dc6446874ee2 for qmake. Unify the lookup logic in BaseQtVersion. Change-Id: Id0b0ff3127f0561ac36610ada16110b55252eb31 Reviewed-by: Tobias Hunger --- src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp | 2 +- .../qmakeprojectmanager/desktopqmakerunconfiguration.cpp | 8 ++------ src/plugins/qtsupport/baseqtversion.cpp | 6 ++++++ src/plugins/qtsupport/baseqtversion.h | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index e7c1b1b865b..3c0e2eceacf 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -263,7 +263,7 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target()->kit()); if (qtVersion) - env.prependOrSetLibrarySearchPath(qtVersion->qmakeProperty("QT_INSTALL_LIBS")); + env.prependOrSetLibrarySearchPath(qtVersion->librarySearchPath().toString()); } QString QbsRunConfiguration::buildSystemTarget() const diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index b3918b6a206..859fcb452da 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -335,12 +335,8 @@ void DesktopQmakeRunConfiguration::addToBaseEnvironment(Environment &env) const } // pro QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target()->kit()); - if (qtVersion && m_isUsingLibrarySearchPath) { - if (HostOsInfo::isWindowsHost()) - libraryPaths << qtVersion->qmakeProperty("QT_INSTALL_BINS"); - else - libraryPaths << qtVersion->qmakeProperty("QT_INSTALL_LIBS"); - } + if (qtVersion && m_isUsingLibrarySearchPath) + libraryPaths << qtVersion->librarySearchPath().toString(); env.prependOrSetLibrarySearchPaths(libraryPaths); } diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index dbf01874e7c..71471f1158f 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -597,6 +597,12 @@ FileName BaseQtVersion::qmlBinPath() const return FileName::fromUserInput(m_mkspecValues.value(QLatin1String("QT.qml.bins"))); } +FileName BaseQtVersion::librarySearchPath() const +{ + return HostOsInfo::isWindowsHost() + ? FileName::fromUserInput(qmakeProperty("QT_INSTALL_BINS")) : libraryPath(); +} + FileNameList BaseQtVersion::directoriesToIgnoreInProjectTree() const { FileNameList result; diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index aab9d7d016c..eeaa45b01d1 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -215,6 +215,7 @@ public: Utils::FileName binPath() const; Utils::FileName mkspecsPath() const; Utils::FileName qmlBinPath() const; + Utils::FileName librarySearchPath() const; Utils::FileNameList directoriesToIgnoreInProjectTree() const;