Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
	configure.exe
	src/imports/multimedia/qdeclarativeaudio.cpp
	src/imports/multimedia/qdeclarativeaudio_p.h
	src/multimedia/mediaservices/mediaservices.pro
	src/plugins/mediaservices/mediaservices.pro
	src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h
	src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h
	src/s60installs/s60installs.pro
	src/src.pro

6 files changed, 47 insertions, 30 deletions

diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
index 3801eff..2397c96 100644
--- a/mkspecs/common/symbian/symbian-makefile.conf
+++ b/mkspecs/common/symbian/symbian-makefile.conf
@@ -13,7 +13,13 @@ QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
-QMAKE_ELF2E32_FLAGS	+=
+QMAKE_ELF2E32_FLAGS	= --dlldata \
+                          --heap=0x00020000,0x00800000 \
+                          --stack=0x00014000 \
+                          --fpu=softvfp \
+                          --unfrozen \
+                          --compressionmethod bytepair \
+                          --unpaged
 
 include(../../common/unix.conf)
 
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 0bd0bf2..89034ca 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -66,7 +66,7 @@ QMAKE_LINK_OBJECT_MAX   =
 QMAKE_LINK_OBJECT_SCRIPT=
 
 QMAKE_LIBS		= -llibc -llibm -leuser -llibdl
-QMAKE_LIBS_CORE         = $$QMAKE_LIBS -lefsrv -lhal
+QMAKE_LIBS_CORE         = $$QMAKE_LIBS -lefsrv -lhal -lbafl
 QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lcentralrepository
 QMAKE_LIBS_NETWORK      = 
 QMAKE_LIBS_EGL          = -llibEGL
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
index e3faef1..d2011d0 100644
--- a/mkspecs/features/qttest_p4.prf
+++ b/mkspecs/features/qttest_p4.prf
@@ -6,7 +6,7 @@ qtAddLibrary(QtTest)
 symbian:{
     TARGET.EPOCHEAPSIZE = 0x100000 0x2000000
 #    DEFINES += QTEST_NO_SPECIALIZATIONS
-    TARGET.CAPABILITY="ALL -TCB"
+    TARGET.CAPABILITY="None"
     RSS_RULES ="group_name=\"QtTests\";" 
 }
 
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index b0cc6f2..802adde 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -100,13 +100,19 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
     # The comparison of dso files is to avoid extra building of modules that depend on this dso, in
     # case it has not changed.
     QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${TARGET}.dll $$symbianDestdir/$${TARGET}.sym \
-                      && elf2e32  --version=$$decVersion --sid=$$TARGET.SID  --uid1=0x10000079 \
-                      --uid2=$$TARGET.UID2 --uid3=$$TARGET.UID3 --dlldata --heap=0x00020000,0x00800000 \
-                      --stack=0x00014000 --fpu=softvfp --targettype=DLL \
-                      --elfinput=$${symbianDestdir}/$${TARGET}.sym --output=$${symbianDestdir}/$${TARGET}.dll \
-                      --dso=$$symbianObjdir/$${TARGET}.dso --defoutput=$$symbianObjdir/$${TARGET}.def \
-                      --unfrozen --linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll \
-                      --compressionmethod bytepair $$elf2e32_LIBPATH --unpaged $$capability \
+                      && elf2e32  --version=$$decVersion \
+                      --sid=$$TARGET.SID \
+                      --uid1=0x10000079 \
+                      --uid2=$$TARGET.UID2 \
+                      --uid3=$$TARGET.UID3 \
+                      --targettype=DLL \
+                      --elfinput=$${symbianDestdir}/$${TARGET}.sym \
+                      --output=$${symbianDestdir}/$${TARGET}.dll \
+                      --dso=$$symbianObjdir/$${TARGET}.dso \
+                      --defoutput=$$symbianObjdir/$${TARGET}.def \
+                      --linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll \
+                      $$elf2e32_LIBPATH \
+                      $$capability \
                       $$QMAKE_ELF2E32_FLAGS \
                       | tee elf2e32.log && test `grep -c 'Error:' elf2e32.log` = 0 && rm elf2e32.log \
                       && if ! diff -q $${symbianObjdir}/$${TARGET}.dso $${symbianDestdir}/$${TARGET}.dso \
@@ -120,9 +126,10 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
     QMAKE_CLEAN += $${symbianObjdir}/$${TARGET}.def
 
     linux-armcc: {
-        QMAKE_LIBS += -ledllstub.lib -ledll.lib\\(uc_dll_.o\\)
+        LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\)
+        LIBS += -ledllstub.lib -ledll.lib\\(uc_dll_.o\\)
     } else :linux-gcce {
-        QMAKE_LIBS += \
+        LIBS += \
             -l:edll.lib \
             -l:usrt2_2.lib \
             -l:dfpaeabi.dso \
@@ -144,12 +151,17 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") {
     }
     # the tee and grep at the end work around the issue that elf2e32 doesn't return non-null on error
     QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${TARGET} $$symbianDestdir/$${TARGET}.sym \
-                      && elf2e32  --version $$decVersion --sid=$$TARGET.SID  --uid1=0x1000007a \
-                      --uid2=$$TARGET.UID2 --uid3=$$TARGET.UID3 --dlldata --heap=0x00020000,0x00800000 \
-                      --stack=0x00014000 --fpu=softvfp --targettype=EXE \
-                      --elfinput=$${symbianDestdir}/$${TARGET}.sym --output=$${symbianDestdir}/$${TARGET}.exe \
-                      --unfrozen --linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe \
-                      --compressionmethod bytepair $$elf2e32_LIBPATH --unpaged $$capability \
+                      && elf2e32  --version $$decVersion \
+                      --sid=$$TARGET.SID \
+                      --uid1=0x1000007a \
+                      --uid2=$$TARGET.UID2 \
+                      --uid3=$$TARGET.UID3 \
+                      --targettype=EXE \
+                      --elfinput=$${symbianDestdir}/$${TARGET}.sym \
+                      --output=$${symbianDestdir}/$${TARGET}.exe \
+                      --linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe \
+                      $$elf2e32_LIBPATH \
+                      $$capability \
                       $$QMAKE_ELF2E32_FLAGS \
                       | tee elf2e32.log && test `grep -c 'Error:' elf2e32.log` = 0 && rm elf2e32.log \
                       && ln "$${symbianDestdir}/$${TARGET}.exe" "$${symbianDestdir}/$$TARGET" \
@@ -159,6 +171,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") {
     QMAKE_CLEAN += $${symbianDestdir}/$${TARGET}
 
     linux-armcc: {
+        QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\)
         QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
         contains(CONFIG, "qt"):contains(QT, "core") { #if linking with QtCore
             QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf
index 599e552..77fb1ea 100644
--- a/mkspecs/symbian/linux-armcc/qmake.conf
+++ b/mkspecs/symbian/linux-armcc/qmake.conf
@@ -6,8 +6,6 @@ include(../../common/symbian/symbian-makefile.conf)
 
 include(../../common/armcc.conf)
 
-QMAKE_LIBS           += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\)
-
 QMAKE_RVCT_LINKSTYLE = 1
 
 # notice that the middle part of the following set of vars matches the TARGET content of the libs
@@ -33,8 +31,8 @@ QMAKE_QtWebKit_CXXFLAGS	=  --arm
 # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
 QMAKE_QtWebKit_LFLAGS	=  --rw-base 0xE00000
 
-QMAKE_CFLAGS		+= --dllimport_runtime --preinclude rvct2_2.h  --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --export_all_vtbl --no_vfe --apcs /inter $$QMAKE_CFLAGS.ARMCC
-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS --no_parse_templates $$QMAKE_CXXFLAGS.ARMCC
+QMAKE_CFLAGS		+= --dllimport_runtime --preinclude rvct2_2.h  --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter $$QMAKE_CFLAGS.ARMCC
+QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS.ARMCC
 QMAKE_LFLAGS      	+=  --symver_soname --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --dll --no_scanlib
 QMAKE_LFLAGS_APP        += --entry _E32Startup
 QMAKE_LFLAGS_SHLIB      += --entry _E32Dll
diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf
index 57bb56a..faac2f1 100644
--- a/mkspecs/symbian/linux-gcce/qmake.conf
+++ b/mkspecs/symbian/linux-gcce/qmake.conf
@@ -83,13 +83,13 @@ for(line, QMAKE_GCC_SEARCH_DIRS) {
     }
 }
 
-QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib
-
-INCLUDEPATH = ${EPOCROOT}epoc32/include/ \
-    $${EPOCROOT}epoc32/include/variant \
-    $${EPOCROOT}epoc32/include/stdapis \
-    $${EPOCROOT}epoc32/include/gcce \
-    ${EPOCROOT}epoc32/include/stdapis/sys \
-    ${EPOCROOT}epoc32/include/stdapis/stlport \
+QMAKE_LIBDIR += $${EPOCROOT}/epoc32/release/armv5/lib
+
+INCLUDEPATH = ${EPOCROOT}/epoc32/include/ \
+    $${EPOCROOT}/epoc32/include/variant \
+    $${EPOCROOT}/epoc32/include/stdapis \
+    $${EPOCROOT}/epoc32/include/gcce \
+    ${EPOCROOT}/epoc32/include/stdapis/sys \
+    ${EPOCROOT}/epoc32/include/stdapis/stlport \
     $$INCLUDEPATH