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

Qbs: Use right path for Qt libraries

Browse Source 
Similar to 85206e216a for qmake.

Unify the lookup logic in BaseQtVersion.

Change-Id: Id0b0ff3127f0561ac36610ada16110b55252eb31
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2018-01-09 22:38:32 +02:00
committed by Orgad Shaneh
parent ade307d807
commit 8d523f1900
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -263,7 +263,7 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target()->kit()); QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target()->kit());
if (qtVersion) if (qtVersion)
env.prependOrSetLibrarySearchPath(qtVersion->qmakeProperty("QT_INSTALL_LIBS")); env.prependOrSetLibrarySearchPath(qtVersion->librarySearchPath().toString());
} }
QString QbsRunConfiguration::buildSystemTarget() const QString QbsRunConfiguration::buildSystemTarget() const

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

@@ -335,12 +335,8 @@ 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()) libraryPaths << qtVersion->librarySearchPath().toString();
libraryPaths << qtVersion->qmakeProperty("QT_INSTALL_BINS");
else
libraryPaths << qtVersion->qmakeProperty("QT_INSTALL_LIBS");
}
env.prependOrSetLibrarySearchPaths(libraryPaths); env.prependOrSetLibrarySearchPaths(libraryPaths);
} }

6
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -597,6 +597,12 @@ FileName BaseQtVersion::qmlBinPath() const
return FileName::fromUserInput(m_mkspecValues.value(QLatin1String("QT.qml.bins"))); 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 BaseQtVersion::directoriesToIgnoreInProjectTree() const
{ {
FileNameList result; FileNameList result;

1
src/plugins/qtsupport/baseqtversion.h
View File

@@ -215,6 +215,7 @@ public:
Utils::FileName binPath() const; Utils::FileName binPath() const;
Utils::FileName mkspecsPath() const; Utils::FileName mkspecsPath() const;
Utils::FileName qmlBinPath() const; Utils::FileName qmlBinPath() const;
Utils::FileName librarySearchPath() const;
Utils::FileNameList directoriesToIgnoreInProjectTree() const; Utils::FileNameList directoriesToIgnoreInProjectTree() const;