Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	configure.exe
	mkspecs/features/qt.prf

7 files changed, 18 insertions, 9 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 728703f..38e955a 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -7,7 +7,7 @@ CONFIG			+= qt warn_on release incremental
 QT			+= core gui
 QMAKE_INCREMENTAL_STYLE = sublib
 
-DEFINES			+= UNICODE QT_KEYPAD_NAVIGATION
+DEFINES			+= UNICODE QT_KEYPAD_NAVIGATION QT_SOFTKEYS_ENABLED
 QMAKE_COMPILER_DEFINES  += SYMBIAN
 
 QMAKE_EXT_OBJ           = .o
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 8982d53..ac51c55 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -158,8 +158,12 @@ for(QTLIB, $$list($$lower($$unique(QT)))) {
    else:isEqual(QTLIB, scripttools):qlib = QtScriptTools
    else:isEqual(QTLIB, testlib):qlib = QtTest
    else:isEqual(QTLIB, dbus):qlib = QtDBus
-   else:isEqual(QTLIB, phonon):qlib = phonon
-   else:isEqual(QTLIB, webkit):qlib = QtWebKit
+   else:isEqual(QTLIB, phonon) {
+       qlib = phonon
+       INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat/phonon
+       INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat
+       INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon/Phonon
+   } else:isEqual(QTLIB, webkit):qlib = QtWebKit
    else:isEqual(QTLIB, declarative):qlib = QtDeclarative
    else:isEqual(QTLIB, multimedia):qlib = QtMultimedia
    else:message("Unknown QT: $$QTLIB"):qlib =
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 8956ef7..243a829 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -45,6 +45,10 @@ defineTest(qtAddLibrary) {
            }
        }
     }
+    symbian*:isEqual(LIB_NAME, QtGui) {
+        # Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h
+        INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
+    }
     isEmpty(LINKAGE) {
        CONFIG(debug, debug|release) {
            win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
index 4ab5ac2..525e7b2 100644
--- a/mkspecs/features/qttest_p4.prf
+++ b/mkspecs/features/qttest_p4.prf
@@ -4,7 +4,7 @@ CONFIG += qt warn_on console depend_includepath
 qtAddLibrary(QtTest)
 
 symbian:{
-# qt.prf sets TARGET.EPOCSTACKSIZE and TARGET.EPOCHEAPSIZE
+    TARGET.EPOCHEAPSIZE = 0x100000 0x2000000
 #    DEFINES += QTEST_NO_SPECIALIZATIONS
     TARGET.CAPABILITY="ALL -TCB"
     RSS_RULES ="group_name=\"QtTests\";" 
diff --git a/mkspecs/features/static.prf b/mkspecs/features/static.prf
index 21a532e..ef3af07 100644
--- a/mkspecs/features/static.prf
+++ b/mkspecs/features/static.prf
@@ -9,7 +9,6 @@ contains(TEMPLATE, ".*lib"):{
 
 mac {
     QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
-    CONFIG += hide_symbols
 }
 
 symbian {
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index 97b99a5..b0c1bb1 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -6,7 +6,7 @@ contains( CONFIG, no_icon ) {
     symbian:RSS_RULES ="hidden = KAppIsHidden;" 
     CONFIG -= no_icon
 } else {
-# There is no sense to compile MIF icon is no_icon CONFIGS is set
+# There is no point in compiling the MIF icon if no_icon CONFIGS is set
     !isEmpty(ICON) {
         
         !count(ICON, $$size(TRANSLATIONS)):!count(ICON, 1) {
@@ -36,4 +36,5 @@ contains( CONFIG, no_icon ) {
         RSS_RULES.number_of_icons = $$size(ICON)
         RSS_RULES.icon_file = $$replace( APP_RESOURCE_DIR, /, \\\\ )\\\\$${TARGET.UID3}.mif
     }
-}
\ No newline at end of file
+}
+
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
index 0abc7c4..7fada1e 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
@@ -12,9 +12,10 @@ include $(FLMHOME)/metaflm.mk
 STORE_BUILD_TARGET:=$(call sanitise,TSTORE_BUILD_$(PLATFORM_PATH)_$(CFG_PATH)_$(EXTENSION_ROOT))
 CACHE_FILENAME:=$(EXTENSION_ROOT)/.make.cache
 
-VISUAL_CFG:=RELEASE
-ifeq "$(CFG_PATH)" "UDEB"
+ifeq "$(CFG_PATH)" "udeb"
 VISUAL_CFG:=DEBUG
+else
+VISUAL_CFG:=RELEASE
 endif
 
 define qmake_store_build