diff options
| author | axis <qt-info@nokia.com> | 2010-09-14 13:38:30 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-09-14 13:38:30 (GMT) |
| commit | 3b4b4eb7741863bb1876dcf1d9a4b7132b895b35 (patch) | |
| tree | 3d488e83b75339e857a4baee85b43087acf4e78e | |
| parent | 7ee144ed7d88d4de010608d3a433e1b47343cd17 (diff) | |
| parent | 48736d622a971816030c6a83f5922f698157db8f (diff) | |
| download | Qt-3b4b4eb7741863bb1876dcf1d9a4b7132b895b35.zip Qt-3b4b4eb7741863bb1876dcf1d9a4b7132b895b35.tar.gz Qt-3b4b4eb7741863bb1876dcf1d9a4b7132b895b35.tar.bz2 | |
Merge branch 'buildSystemFixes' into 4.7-s60
| -rw-r--r-- | config.tests/symbian/audio/audio.pro | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/sis_targets.prf (renamed from mkspecs/features/sis_targets.prf) | 0 | ||||
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 32 |
3 files changed, 18 insertions, 16 deletions
diff --git a/config.tests/symbian/audio/audio.pro b/config.tests/symbian/audio/audio.pro index abbde6e..b2a1986 100644 --- a/config.tests/symbian/audio/audio.pro +++ b/config.tests/symbian/audio/audio.pro @@ -3,5 +3,7 @@ SOURCES = audio.cpp INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/server INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/common +INCLUDEPATH += $${EPOCROOT}epoc32/include/platform LIBS += -lmmfdevsound +QT = diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf index 800a04c..800a04c 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/symbian/sis_targets.prf diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 0b621a3..539609d 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -50,22 +50,22 @@ 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 +# 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) { + 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) + } + } } elf2e32_LIBPATH = |