From 5bc9541e7a3a55849020d79ee7d7b4d0996ce2ff Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 19 Jul 2012 17:50:59 +0200
Subject: insert explicit library search paths before system search paths

... as the linker does.

Change-Id: I4a030d9e2f281b892b78ba25b11f6df6b0893712
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 qmake/generators/unix/unixmake.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 91ede21836..13ee57fae0 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -475,6 +475,7 @@ UnixMakefileGenerator::findLibraries()
     if (libArg == "-L")
         libArg.clear();
     QList<QMakeLocalFileName> libdirs;
+    int libidx = 0;
     foreach (const QString &dlib, project->values("QMAKE_DEFAULT_LIBDIRS"))
         libdirs.append(QMakeLocalFileName(dlib));
     const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() };
@@ -490,7 +491,7 @@ UnixMakefileGenerator::findLibraries()
                         it = l.erase(it);
                         continue;
                     }
-                    libdirs.append(f);
+                    libdirs.insert(libidx++, f);
                     if (!libArg.isEmpty())
                         *it = libArg + lib;
                 } else if(opt.startsWith("-l")) {
@@ -577,6 +578,7 @@ UnixMakefileGenerator::processPrlFiles()
 {
     const QString libArg = project->first("QMAKE_L_FLAG");
     QList<QMakeLocalFileName> libdirs, frameworkdirs;
+    int libidx = 0, fwidx = 0;
     foreach (const QString &dlib, project->values("QMAKE_DEFAULT_LIBDIRS"))
         libdirs.append(QMakeLocalFileName(dlib));
     frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks"));
@@ -590,7 +592,7 @@ UnixMakefileGenerator::processPrlFiles()
                 if (opt.startsWith(libArg)) {
                     QMakeLocalFileName l(opt.mid(libArg.length()));
                     if(!libdirs.contains(l))
-                       libdirs.append(l);
+                       libdirs.insert(libidx++, l);
                 } else if(opt.startsWith("-l")) {
                     QString lib = opt.right(opt.length() - 2);
                     for(int dep_i = 0; dep_i < libdirs.size(); ++dep_i) {
@@ -600,7 +602,7 @@ UnixMakefileGenerator::processPrlFiles()
                             if(exists(la) && QFile::exists(lfn.local() + Option::dir_sep + ".libs")) {
                                 QString dot_libs = lfn.real() + Option::dir_sep + ".libs";
                                 l.append("-L" + dot_libs);
-                                libdirs.append(QMakeLocalFileName(dot_libs));
+                                libdirs.insert(libidx++, QMakeLocalFileName(dot_libs));
                             }
                         }
 
@@ -617,7 +619,7 @@ UnixMakefileGenerator::processPrlFiles()
                 } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-F")) {
                     QMakeLocalFileName f(opt.right(opt.length()-2));
                     if(!frameworkdirs.contains(f))
-                        frameworkdirs.append(f);
+                        frameworkdirs.insert(fwidx++, f);
                 } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-framework")) {
                     if(opt.length() > 11)
                         opt = opt.mid(11);
-- 
cgit v1.2.3