diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-12 05:03:54 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-12 05:03:54 +1000 |
| commit | e54a124914e8d38fab4e9a01df15253dad8b3914 (patch) | |
| tree | c7ae9c956051ecbbb1d4d90a8f3461614779fcef /mkspecs | |
| parent | 008f571d35c199461922026526258e97e5258822 (diff) | |
| parent | 99f500838e4eaba9d99c3ea2cd6b4fc5efe0b8b4 (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove sqlite3_selfsigned.sis as it is no longer usable or needed.
Allow use of command line parameters with RApaLsSession::StartApp.
Fixed resource leak in Phonon MMF backend
Allow IAP to be selected in Phonon MMF backend
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 00cf0d78d9..ab94cfb7c5 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -66,8 +66,8 @@ QMAKE_LINK_OBJECT_MAX = QMAKE_LINK_OBJECT_SCRIPT= QMAKE_LIBS = -llibc -llibm -leuser -llibdl -QMAKE_LIBS_CORE = $$QMAKE_LIBS -lefsrv -lhal -lbafl -QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -lapparc -lcentralrepository +QMAKE_LIBS_CORE = $$QMAKE_LIBS -lefsrv -lhal -lbafl -lapparc +QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -lcentralrepository QMAKE_LIBS_NETWORK = QMAKE_LIBS_EGL = -llibEGL QMAKE_LIBS_OPENGL = -llibGLESv2 |