diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-02 12:11:13 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-04 08:15:18 +0200 |
| commit | e185f343e468da482d50f4dfbd26cf217545a8e7 (patch) | |
| tree | 995d208c169235bf25d7747ea91fe61787da0bb7 /qmake | |
| parent | 20b7f028cf959c0853c51d72fd4da5d48cfaee67 (diff) | |
| download | qtbase-e185f343e468da482d50f4dfbd26cf217545a8e7.tar.gz | |
findLibraries(): don't remove -L options for system paths
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 31b1d0d1d2..01cfeb41b4 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -478,7 +478,8 @@ UnixMakefileGenerator::findLibraries() if(opt.startsWith("-L")) { QString lib = opt.mid(2); QMakeLocalFileName f(lib); - if (libdirs.contains(f)) { + int idx = libdirs.indexOf(f); + if (idx >= 0 && idx < libidx) { it = l.erase(it); continue; } |