forked from qt-creator/qt-creator
Qmake: Move Qt library path after other libraries
Paths are prepended, so the first one to be added is actually the last search path. On a debian machine with system-installed Qt and Qbs, if you execute Qtc from another instance of Qtc with "Add build library search path" checked, LD_LIBRARY_PATH has /usr/lib/x86_64-linux-gnu before $BUILD/lib/qtcreator. This means that the system's Qbs lib will be loaded instead of the one in RPATH, which is bad (i.e. qbs build fails because it cannot find $BUILD/lib/x86_64-linux-gnu/qbs/qbs_processlauncher). Change-Id: Ibe6778ba8a06da1680e034e31a8fee6d9a81c484 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
committed by
Orgad Shaneh
parent
80bd696270
commit
ade307d807
@@ -332,6 +332,13 @@ void Environment::prependOrSetLibrarySearchPath(const QString &value)
|
||||
}
|
||||
}
|
||||
|
||||
void Environment::prependOrSetLibrarySearchPaths(const QStringList &values)
|
||||
{
|
||||
Utils::reverseForeach(values, [this](const QString &value) {
|
||||
prependOrSetLibrarySearchPath(value);
|
||||
});
|
||||
}
|
||||
|
||||
Environment Environment::systemEnvironment()
|
||||
{
|
||||
return *staticSystemEnvironment();
|
||||
|
||||
Reference in New Issue
Block a user