From 39c2bf06503898d2aaa5e42c75f4f48002b904d4 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 10 Sep 2010 16:21:00 +0200
Subject: Added support for using -L notation in the LIBS variable.

Task:     QTBUG-13523
RevBy:    Thomas Zander
---
 mkspecs/features/symbian/symbian_building.prf | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index a9f195e..539609d 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -50,15 +50,21 @@ defineReplace(processSymbianLibrary) {
     return($$qt_library)
 }
 
+# This part turn "-llibc" into "libc.dso", and moves -L entries to QMAKE_LIBDIR.
 libsToProcess = LIBS QMAKE_LIBS
 for(libToProcess, libsToProcess) {
     qt_libraries = $$split($$libToProcess, " ")
     eval($$libToProcess =)
     for(qt_library, qt_libraries) {
-        qt_newLib = $$processSymbianLibrary($$qt_library)
-        contains(qt_newLib, ".*\\.dso$")|contains(qt_newLib, ".*\\.lib$"):PRE_TARGETDEPS += $$qt_newLib
-        linux-gcce:qt_newLib = "-l:$$qt_newLib"
-        eval($$libToProcess += \$\$qt_newLib)
+        contains(qt_library, "^-L.*") {
+            qt_library = $$replace(qt_library, "^-L", "")
+            QMAKE_LIBDIR += $$qt_library
+        } else {
+            qt_newLib = $$processSymbianLibrary($$qt_library)
+            contains(qt_newLib, ".*\\.dso$")|contains(qt_newLib, ".*\\.lib$"):PRE_TARGETDEPS += $$qt_newLib
+            linux-gcce:qt_newLib = "-l:$$qt_newLib"
+            eval($$libToProcess += \$\$qt_newLib)
+        }
     }
 }
 
-- 
cgit v0.12