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

7 files changed, 40 insertions, 17 deletions

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index b3d6a5f..2b2a42c 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, multimedia):qlib = QtMultimedia
    else:message("Unknown QT: $$QTLIB"):qlib =
    !isEmpty(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 6e2b54f..ef3af07 100644
--- a/mkspecs/features/static.prf
+++ b/mkspecs/features/static.prf
@@ -6,4 +6,14 @@ contains(TEMPLATE, ".*lib"):{
         QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_STATIC_LIB
     }
 }
+
+mac {
+    QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
+}
+
+symbian {
+    # we don't care about exports from static libraries, as they don't end up in DEF files
+    MMP_RULES -= $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
+}
+
 !static_and_shared:fix_output_dirs:fixExclusiveOutputDirs(static, shared)
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/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf
index dd4a4d5..3b24355 100644
--- a/mkspecs/features/symbian/qt.prf
+++ b/mkspecs/features/symbian/qt.prf
@@ -6,6 +6,21 @@ CONFIG += qtmain
 
 load(qt)
 
+# Allow .pro files to specify include path(s) to be prepended to the list.
+#
+# This allows the project to override the default ordering, whereby paths
+# relative to $$QMAKE_INCDIR_QT always come first.  This ordering can cause
+# problems when both the epoc32/include tree and a Qt include directory
+# contain a header of the same name - in this case, the Qt header is always
+# included by virtue of its path appearing first in the SYSTEMINCLUDE
+# directives in the generated MMP file.
+#
+# To work around this situation, the following line can be added to the .pro
+# file:
+#	PREPEND_INCLUDEPATH = /epoc32/include
+#
+INCLUDEPATH = $$PREPEND_INCLUDEPATH $$INCLUDEPATH
+
 # Add dependency to QtLibs package to all other projects besides QtLibs.
 # Note: QtLibs with full capabilities has UID3 of 0x2001E61C, 
 #       while self-signed version typically has temporary UID3 of 0xE001E61C. 
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf
index b4dbc9c..8892d2a 100644
--- a/mkspecs/features/symbian/stl.prf
+++ b/mkspecs/features/symbian/stl.prf
@@ -18,19 +18,8 @@ INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off
 exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll ) {
     LIBS *= -llibstdcppv5.dll
 
-    # STDCPP turns on standard C++ new behaviour in SBSv2
+    # STDCPP turns on standard C++ new behaviour (ie. throwing new)
     MMP_RULES += "STDCPP"
-    
-    # defining __SYMBIAN_STDCPP_SUPPORT__ turns on standard C++ new behaviour pre SBSv2
-    DEFINES += "__SYMBIAN_STDCPP_SUPPORT__"
-
-    # operator new is actually supplied in stdnew.lib for hardware builds
-    eabiStdNewLibBlock = \
-        "$${LITERAL_HASH}ifdef EABI" \
-        "LIBRARY stdnew.lib" \
-        "$${LITERAL_HASH}endif"
-
-    MMP_RULES += eabiStdNewLibBlock
 } else {
     LIBS *= -llibstdcpp.dll
 }