diff options
| author | axis <qt-info@nokia.com> | 2010-09-10 14:17:41 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-09-14 12:11:56 (GMT) |
| commit | 6afce934726e9a7f3b191c59249649f5a3cce2dd (patch) | |
| tree | 59194ae0ede2a58149b48adfbef3ee6444f24a52 | |
| parent | ec1b3016c26eadbb7b7392c9faab8fbbb77d7b69 (diff) | |
| download | Qt-6afce934726e9a7f3b191c59249649f5a3cce2dd.zip Qt-6afce934726e9a7f3b191c59249649f5a3cce2dd.tar.gz Qt-6afce934726e9a7f3b191c59249649f5a3cce2dd.tar.bz2 | |
Eliminated duplicated code from library handling.
RevBy: Trust me
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 0b621a3..a9f195e 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -50,22 +50,16 @@ defineReplace(processSymbianLibrary) { return($$qt_library) } -qt_libraries = $$split(LIBS, " ") -LIBS = -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" - LIBS += $$qt_newLib -} - -qt_libraries = $$split(QMAKE_LIBS, " ") -QMAKE_LIBS = -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" - QMAKE_LIBS += $$qt_newLib +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) + } } elf2e32_LIBPATH = |