summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-09-10 14:21:00 (GMT)
committeraxis <qt-info@nokia.com>2010-09-14 13:37:25 (GMT)
commit39c2bf06503898d2aaa5e42c75f4f48002b904d4 (patch)
tree937ebcff3debdf4d2648c96cc9548909d2a0d7d5 /mkspecs
parent6afce934726e9a7f3b191c59249649f5a3cce2dd (diff)
downloadQt-39c2bf06503898d2aaa5e42c75f4f48002b904d4.zip
Qt-39c2bf06503898d2aaa5e42c75f4f48002b904d4.tar.gz
Qt-39c2bf06503898d2aaa5e42c75f4f48002b904d4.tar.bz2
Added support for using -L notation in the LIBS variable.
Task: QTBUG-13523 RevBy: Thomas Zander
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/symbian/symbian_building.prf14
1 files 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)
+ }
}
}