1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

findLibraries(): don't remove -L options for system paths

Browse Source 
the paths may be explicitly added before some other paths, so it would
be wrong to remove them.

Change-Id: I68ae93fd307afe14a07a0f24de952783950b5bea
Reviewed-by: Holger Freyther <holger+qt@freyther.de>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-02 12:11:13 +02:00 committed by Qt by Nokia
parent 20b7f028cf
commit e185f343e4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/generators/unix/unixmake.cpp
View File

@ -478,7 +478,8 @@ UnixMakefileGenerator::findLibraries()
if(opt.startsWith("-L")) { if(opt.startsWith("-L")) {
QString lib = opt.mid(2); QString lib = opt.mid(2);
QMakeLocalFileName f(lib); QMakeLocalFileName f(lib);
if (libdirs.contains(f)) { int idx = libdirs.indexOf(f);
if (idx >= 0 && idx < libidx) {
it = l.erase(it); it = l.erase(it);
continue; continue;
} }