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: (190 commits)
  Fixed Symbian applications with DESTDIR set.
  Removed a warning about generated rss files.
  Revert "Temporarily disable problematic dll."
  Fixed "Cannot install protected application" message on Symbian.
  Worked around a crash in the elf2e32 postlinker tool.
  Worked around case differences in Symbian^3 and Gnupoc.
  Enabled compilation of plugins again.
  Fixed a building bug where the DLL entry point was undefined.
  Moved UID2 processing from cpp code to profiles.
  Added rpp and rsg files to ignore filter.
  Moved two profiles to the correct directory.
  Fix build break caused by undefined symbol SetDialogPreference
  Temporarily disable problematic dll.
  Use the same concept for per-lib tweaks as armcc
  Consistently use the * in configure
  Symbian doesn't have large file support currently, just turn it off
  Remove largefile config test
  Make sure that we have all compile flags available always
  Enabled dependencies for .dso and .lib libraries only.
  Switched to using DEF_FILE, which is the official variable.
  ...

36 files changed, 152 insertions, 72 deletions

diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 5654a18..2095179 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -8,7 +8,7 @@ symbian: {
     TARGET.CAPABILITY = All -Tcb
     TARGET.UID3 = 0x200267C2
 
-    webkitlibs.sources = QtWebKit.dll
+    webkitlibs.sources = $$QMAKE_LIBDIR_QT/QtWebKit.dll
     webkitlibs.path = /sys/bin
     vendorinfo = \
         "; Localised Vendor name" \
@@ -24,9 +24,12 @@ symbian: {
 
     DEPLOYMENT += webkitlibs webkitbackup
 
-    # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
-    # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
-    MMP_RULES += "LINKEROPTION  armcc --rw-base 0xE00000"
+    symbian-abld:symbian-sbsv2 {
+        # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
+        # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
+        QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000
+        CONFIG += do_not_build_as_thumb
+    }
 }
 
 include($$PWD/../WebKit.pri)
@@ -3417,7 +3420,7 @@ CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4
 symbian {
     shared {
         contains(CONFIG, def_files) {
-            defFilePath=../WebKit/qt/symbian
+            DEF_FILE=../WebKit/qt/symbian
         }
     }
 }
diff --git a/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp b/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp
index cf69723..fd604a0 100644
--- a/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp
+++ b/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp
@@ -53,7 +53,7 @@
 #include "runtime_root.h"
 #include "QWebPageClient.h"
 #include <QKeyEvent>
-#include <QPixmap.h>
+#include <QPixmap>
 #include <QRegion>
 #include <QVector>
 #include <QWidget>
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index df9a463..500cde6 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -48,7 +48,7 @@ symbian: {
     pu_header = "; Partial upgrade package for testing QtCore changes without reinstalling everything" \
                 "$${LITERAL_HASH}{\"Qt corelib\"}, (0x2001E61C), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU"
     partial_upgrade.pkg_prerules = pu_header vendorinfo
-    partial_upgrade.sources = qtcore.dll
+    partial_upgrade.sources = $$QMAKE_LIBDIR_QT/QtCore.dll
     partial_upgrade.path = c:/sys/bin
     DEPLOYMENT = partial_upgrade $$DEPLOYMENT
 }
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index c8f836a..dfa2c17 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -58,6 +58,11 @@
 #include <stdarg.h>
 #include <string.h>
 
+#ifndef QT_NO_EXCEPTIONS
+#  include <string>
+#  include <exception>
+#endif
+
 #if !defined(Q_OS_WINCE)
 #  include <errno.h>
 #  if defined(Q_CC_MSVC)
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index 2ed0e46..ef448b1 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -74,7 +74,7 @@ win32 {
             SOURCES += io/qsettings_mac.cpp io/qfilesystemwatcher_fsevents.cpp
         }
 
-        linux-*:{
+        linux-*:!symbian {
             SOURCES += \
                     io/qfilesystemwatcher_inotify.cpp \
                     io/qfilesystemwatcher_dnotify.cpp
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 6df00d6..3dcc1ad 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -55,7 +55,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #if defined(Q_OS_SYMBIAN)
-# include <syslimits.h>
+# include <sys/syslimits.h>
 # include <f32file.h>
 # include <pathinfo.h>
 # include "private/qcore_symbian_p.h"
diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp
index adc87fb..8902f7d 100644
--- a/src/corelib/io/qprocess_symbian.cpp
+++ b/src/corelib/io/qprocess_symbian.cpp
@@ -66,7 +66,7 @@
 #include "qstring.h"
 #include "qprocess.h"
 #include "qprocess_p.h"
-#include "qeventdispatcher_symbian_p.h"
+#include "private/qeventdispatcher_symbian_p.h"
 
 #include <private/qthread_p.h>
 #include <qmutex.h>
diff --git a/src/corelib/kernel/qsystemsemaphore_symbian.cpp b/src/corelib/kernel/qsystemsemaphore_symbian.cpp
index c252dd5..8cef611 100644
--- a/src/corelib/kernel/qsystemsemaphore_symbian.cpp
+++ b/src/corelib/kernel/qsystemsemaphore_symbian.cpp
@@ -44,7 +44,7 @@
 #include "qcoreapplication.h"
 #include <qdebug.h>
 
-#include <qcore_symbian_p.h>
+#include "qcore_symbian_p.h"
 #include <e32cmn.h>
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/dialogs/qerrormessage.cpp b/src/gui/dialogs/qerrormessage.cpp
index 0bca811..7be7481 100644
--- a/src/gui/dialogs/qerrormessage.cpp
+++ b/src/gui/dialogs/qerrormessage.cpp
@@ -70,10 +70,10 @@ extern bool qt_wince_is_high_dpi();  //defined in qguifunctions_wince.cpp
 
 #if defined(QT_SOFTKEYS_ENABLED)
 #include <qaction.h>
+#endif
 #ifdef Q_WS_S60
 #include "private/qt_s60_p.h"
 #endif
-#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index d46f3b4..52531a3 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -51,12 +51,14 @@ contains(DEFINES,QT_EVAL):include($$QT_SOURCE_TREE/src/corelib/eval.pri)
 QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist
 
 DEFINES += Q_INTERNAL_QAPP_SRC
-symbian: {
+symbian {
     TARGET.UID3=0x2001B2DD
 
-    # ro-section in gui can exceed default allocated space, so move rw-section a little further
-    QMAKE_LFLAGS.ARMCC += --rw-base 0x800000
-    QMAKE_LFLAGS.GCCE += -Tdata 0xC00000
+    symbian-abld:symbian-sbsv2 {
+        # ro-section in gui can exceed default allocated space, so move rw-section a little further
+        QMAKE_LFLAGS.ARMCC += --rw-base 0x800000
+        QMAKE_LFLAGS.GCCE += -Tdata 0xC00000
+    }
 
     # Partial upgrade SIS file
     vendorinfo = \
@@ -70,7 +72,7 @@ symbian: {
     pu_header = "; Partial upgrade package for testing QtGui changes without reinstalling everything" \
                 "$${LITERAL_HASH}{\"Qt gui\"}, (0x2001E61C), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU"
     partial_upgrade.pkg_prerules = pu_header vendorinfo
-    partial_upgrade.sources = qtgui.dll
+    partial_upgrade.sources = $$QMAKE_LIBDIR_QT/QtGui.dll
     partial_upgrade.path = c:/sys/bin
     DEPLOYMENT = partial_upgrade $$DEPLOYMENT
 }
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 4a15cf2..573bac6 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -1254,11 +1254,13 @@ void qt_init(QApplicationPrivate * /* priv */, int)
     }
 #endif
 
+#ifdef QT_KEYPAD_NAVIGATION
     if (touch) {
         QApplicationPrivate::navigationMode = Qt::NavigationModeNone;
     } else {
         QApplicationPrivate::navigationMode = Qt::NavigationModeKeypadDirectional;
     }
+#endif
 
 #ifndef QT_NO_CURSOR
     //Check if window server pointer cursors are supported or not
diff --git a/src/gui/kernel/qcursor_s60.cpp b/src/gui/kernel/qcursor_s60.cpp
index 54a9176..68e079e 100644
--- a/src/gui/kernel/qcursor_s60.cpp
+++ b/src/gui/kernel/qcursor_s60.cpp
@@ -44,7 +44,7 @@
 #include <private/qapplication_p.h>
 #include <coecntrl.h>
 #include <qcursor.h>
-#include <qt_s60_p.h>
+#include <private/qt_s60_p.h>
 #include <qbitmap.h>
 #include <w32std.h>
 #include <qapplication.h>
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index d05c7e4..b25dce5 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -44,8 +44,8 @@
 #include <QtGui/qpaintdevice.h>
 #include <private/qwidget_p.h>
 #include "qwindowsurface_s60_p.h"
-#include "qpixmap_s60_p.h"
-#include "qt_s60_p.h"
+#include <private/qpixmap_s60_p.h>
+#include <private/qt_s60_p.h>
 #include "private/qdrawhelper_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/s60framework/s60framework.pri b/src/gui/s60framework/s60framework.pri
index 6080e6d..e177a33 100644
--- a/src/gui/s60framework/s60framework.pri
+++ b/src/gui/s60framework/s60framework.pri
@@ -9,6 +9,8 @@ minimalAppResource31 = \
     "END"
 MMP_RULES += minimalAppResource31
 
+SYMBIAN_RESOURCES += s60framework/s60main.rss
+
 SOURCES += s60framework/qs60mainapplication.cpp \
            s60framework/qs60mainappui.cpp \
            s60framework/qs60maindocument.cpp
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index dd9e69e..9b85c04 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -73,7 +73,7 @@
 #endif
 #endif
 #ifdef Q_OS_SYMBIAN
-#include "qt_s60_p.h"
+#include <private/qt_s60_p.h>
 #endif
 
 #include <QMutexLocker>
diff --git a/src/gui/text/qfont_s60.cpp b/src/gui/text/qfont_s60.cpp
index 52c77d6..ccd17a2 100644
--- a/src/gui/text/qfont_s60.cpp
+++ b/src/gui/text/qfont_s60.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qfont.h"
-#include "qt_s60_p.h"
-#include "qpixmap_s60_p.h"
+#include <private/qt_s60_p.h>
+#include <private/qpixmap_s60_p.h>
 #include "qmutex.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index 87a73df..621f666 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -45,8 +45,8 @@
 #include "qfontengine_s60_p.h"
 #include "qabstractfileengine.h"
 #include "qdesktopservices.h"
-#include "qpixmap_s60_p.h"
-#include "qt_s60_p.h"
+#include <private/qpixmap_s60_p.h>
+#include <private/qt_s60_p.h>
 #include "qendian.h"
 #include <private/qcore_symbian_p.h>
 #if defined(QT_NO_FREETYPE)
diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri
index 3074367..bd2af85 100644
--- a/src/gui/util/util.pri
+++ b/src/gui/util/util.pri
@@ -41,5 +41,12 @@ embedded {
 
 symbian {
     LIBS += -lsendas2 -letext -lapmime
-    contains(QT_CONFIG, s60): LIBS += -lplatformenv -lCommonUI
+    contains(QT_CONFIG, s60) {
+        LIBS += -lplatformenv
+        contains(CONFIG, is_using_gnupoc) {
+            LIBS += -lcommonui
+        } else {
+            LIBS += -lCommonUI
+        }
+    }
 }
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index 7224768..4a9cfed 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -48,7 +48,7 @@
 #include <private/qapplication_p.h>
 #include <private/qmenu_p.h>
 #include <private/qmenubar_p.h>
-#include <qt_s60_p.h>
+#include <private/qt_s60_p.h>
 #include <QtCore/qlibrary.h>
 
 #ifdef Q_WS_S60
diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri
index 6883dd8..937b8d6 100644
--- a/src/gui/widgets/widgets.pri
+++ b/src/gui/widgets/widgets.pri
@@ -164,6 +164,6 @@ wince*: {
     !static: QMAKE_WRITE_DEFAULT_RC = 1
 }
 
-symbian*: {
+symbian: {
     SOURCES += widgets/qmenu_symbian.cpp
 }
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.h b/src/plugins/bearer/symbian/qnetworksession_impl.h
index 30f51e1..98d4222 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.h
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.h
@@ -58,7 +58,7 @@
 #include <QDateTime>
 
 #include <e32base.h>
-#include <CommDbConnPref.h>
+#include <commdbconnpref.h>
 #include <es_sock.h>
 #include <rconnmon.h>
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
diff --git a/src/plugins/graphicssystems/trace/trace.pro b/src/plugins/graphicssystems/trace/trace.pro
index d548a6c..07472e2 100644
--- a/src/plugins/graphicssystems/trace/trace.pro
+++ b/src/plugins/graphicssystems/trace/trace.pro
@@ -4,6 +4,7 @@ include(../../qpluginbase.pri)
 QT += network
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems
+symbian:TARGET.UID3 = 0x2002130E
 
 SOURCES = main.cpp qgraphicssystem_trace.cpp
 
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index 85f618f..3cb64ad 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -58,7 +58,7 @@ contains(QT_CONFIG, system-tiff) {
                           ../../../3rdparty/libtiff/libtiff/tif_wince.c \
 			  ../../../3rdparty/libtiff/libtiff/tif_win32.c
             }
-            symbian*: {
+            symbian: {
                SOURCES += ../../../3rdparty/libtiff/port/lfind.c
             }
 }
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 730fdc5..42fbf9e 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS	*= accessible imageformats sqldrivers iconengines script bearer
+SUBDIRS	*= imageformats sqldrivers iconengines script bearer
 unix:!symbian {
         contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs
 } else {
@@ -9,6 +9,7 @@ unix:!symbian {
 !embedded:SUBDIRS *= graphicssystems
 embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
 !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods
+!symbian:SUBDIRS += accessible
 symbian:SUBDIRS += s60
 contains(QT_CONFIG, phonon): SUBDIRS *= phonon
 contains(QT_CONFIG, multimedia): SUBDIRS *= audio mediaservices
diff --git a/src/plugins/s60/3_2/3_2.pro b/src/plugins/s60/3_2/3_2.pro
index 468197d..7700677 100644
--- a/src/plugins/s60/3_2/3_2.pro
+++ b/src/plugins/s60/3_2/3_2.pro
@@ -10,7 +10,12 @@ contains(S60_VERSION, 3.1) {
     SOURCES += ../src/qlocale_3_2.cpp \
         ../src/qdesktopservices_3_2.cpp \
         ../src/qcoreapplication_3_2.cpp
-    LIBS += -lDirectoryLocalizer -lefsrv
+    contains(CONFIG, is_using_gnupoc) {
+        LIBS += -ldirectorylocalizer
+    } else {
+        LIBS += -lDirectoryLocalizer
+    }
+    LIBS += -lefsrv
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 }
 
diff --git a/src/plugins/s60/5_0/5_0.pro b/src/plugins/s60/5_0/5_0.pro
index 86e3dc9..164dfaa 100644
--- a/src/plugins/s60/5_0/5_0.pro
+++ b/src/plugins/s60/5_0/5_0.pro
@@ -10,7 +10,12 @@ contains(S60_VERSION, 3.1) {
     SOURCES += ../src/qlocale_3_2.cpp \
         ../src/qdesktopservices_3_2.cpp \
         ../src/qcoreapplication_3_2.cpp
-    LIBS += -lDirectoryLocalizer -lefsrv
+    contains(CONFIG, is_using_gnupoc) {
+        LIBS += -ldirectorylocalizer
+    } else {
+        LIBS += -lDirectoryLocalizer
+    }
+    LIBS += -lefsrv
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 }
 
diff --git a/src/plugins/s60/s60pluginbase.pri b/src/plugins/s60/s60pluginbase.pri
index c1aa4ef..1a6f4a2 100644
--- a/src/plugins/s60/s60pluginbase.pri
+++ b/src/plugins/s60/s60pluginbase.pri
@@ -4,6 +4,8 @@ include(../qpluginbase.pri)
 
 CONFIG  -= plugin
 
+QTDIR_build:DESTDIR	 = $$QT_BUILD_TREE/plugins/s60
+
 MMP_RULES += NOEXPORTLIBRARY
 
 defBlock = \
diff --git a/src/qbase.pri b/src/qbase.pri
index 835ed0e..4a75565 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -104,7 +104,7 @@ symbian {
         # built in this exact environment.  *Never* use this when building a version 
         # for release.
         contains(CONFIG, def_files) {
-            defFilePath=../s60installs
+            DEF_FILE=../s60installs
         }
     }
     load(armcc_warnings)
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 841fce4..b2e873f 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -11,26 +11,37 @@ symbian: {
     TARGET.UID3 = 0x2001E61C
     VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 
-    qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
+    symbian-abld|symbian-sbsv2 {
+        qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
+    } else {
+        qtresources.sources = $$QMAKE_LIBDIR_QT/s60main.rsc
+        DESTDIR = $$QMAKE_LIBDIR_QT
+    }
     qtresources.path = c:$$APP_RESOURCE_DIR
 
     qtlibraries.sources = \
-        QtCore.dll \
-        QtXml.dll \
-        QtGui.dll \
-        QtNetwork.dll \
-        QtTest.dll \
-        QtSql.dll
+        $$QMAKE_LIBDIR_QT/QtCore.dll \
+        $$QMAKE_LIBDIR_QT/QtXml.dll \
+        $$QMAKE_LIBDIR_QT/QtGui.dll \
+        $$QMAKE_LIBDIR_QT/QtNetwork.dll \
+        $$QMAKE_LIBDIR_QT/QtTest.dll \
+        $$QMAKE_LIBDIR_QT/QtSql.dll
+
+    symbian-abld|symbian-sbsv2 {
+        pluginLocations = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)
+    } else {
+        pluginLocations = $$QT_BUILD_TREE/plugins/s60
+    }
 
     qts60plugindeployment = \
         "IF package(0x1028315F)" \
-        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
+        "   \"$$pluginLocations/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
         "ELSEIF package(0x102752AE)" \
-        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_2.dll\" - \"c:\\sys\\bin\\qts60plugin_3_2.dll\"" \
+        "   \"$$pluginLocations/qts60plugin_3_2.dll\" - \"c:\\sys\\bin\\qts60plugin_3_2.dll\"" \
         "ELSEIF package(0x102032BE)" \
-        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_1.dll\" - \"c:\\sys\\bin\\qts60plugin_3_1.dll\"" \
+        "   \"$$pluginLocations/qts60plugin_3_1.dll\" - \"c:\\sys\\bin\\qts60plugin_3_1.dll\"" \
         "ELSE" \
-        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
+        "   \"$$pluginLocations/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
         "ENDIF"
     qtlibraries.pkg_postrules += qts60plugindeployment
 
@@ -61,18 +72,18 @@ symbian: {
     }
     qtlibraries.pkg_prerules += "(0x2002af5f), 0, 5, 0, {\"sqlite3\"}"
 
-    !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg.dll
-    !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += qgif.dll
-    !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += qmng.dll
-    !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += qtiff.dll
-    !contains(QT_CONFIG, no-ico):  imageformats_plugins.sources += qico.dll
+    !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += $$QT_BUILD_TREE/plugins/imageformats/qjpeg.dll
+    !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += $$QT_BUILD_TREE/plugins/imageformats/qgif.dll
+    !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += $$QT_BUILD_TREE/plugins/imageformats/qmng.dll
+    !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += $$QT_BUILD_TREE/plugins/imageformats/qtiff.dll
+    !contains(QT_CONFIG, no-ico):  imageformats_plugins.sources += $$QT_BUILD_TREE/plugins/imageformats/qico.dll
     imageformats_plugins.path = c:$$QT_PLUGINS_BASE_DIR/imageformats
 
-    codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
+    codecs_plugins.sources = $$QT_BUILD_TREE/plugins/codecs/qcncodecs.dll $$QT_BUILD_TREE/plugins/codecs/qjpcodecs.dll $$QT_BUILD_TREE/plugins/codecs/qtwcodecs.dll $$QT_BUILD_TREE/plugins/codecs/qkrcodecs.dll
     codecs_plugins.path = c:$$QT_PLUGINS_BASE_DIR/codecs
 
     contains(QT_CONFIG, phonon-backend) {
-        phonon_backend_plugins.sources += phonon_mmf.dll
+        phonon_backend_plugins.sources += $$QMAKE_LIBDIR_QT/phonon_mmf.dll
 
         phonon_backend_plugins.path = c:$$QT_PLUGINS_BASE_DIR/phonon_backend
         DEPLOYMENT += phonon_backend_plugins
@@ -83,7 +94,7 @@ symbian: {
     qtbackup.path = c:/private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,)
 
     bearer_plugins.path = c:$$QT_PLUGINS_BASE_DIR/bearer
-    bearer_plugins.sources += qsymbianbearer.dll
+    bearer_plugins.sources += $$QT_BUILD_TREE/plugins/bearer/qsymbianbearer.dll
 
     DEPLOYMENT += qtresources \
                   qtlibraries \
@@ -94,37 +105,37 @@ symbian: {
                   bearer_plugins
 
     contains(QT_CONFIG, svg): {
-       qtlibraries.sources += QtSvg.dll
-       imageformats_plugins.sources += qsvg.dll
-       iconengines_plugins.sources = qsvgicon.dll
+       qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtSvg.dll
+       imageformats_plugins.sources += $$QT_BUILD_TREE/plugins/imageformats/qsvg.dll
+       iconengines_plugins.sources = $$QT_BUILD_TREE/plugins/iconengines/qsvgicon.dll
        iconengines_plugins.path = c:$$QT_PLUGINS_BASE_DIR/iconengines
        DEPLOYMENT += iconengines_plugins
     }
 
     contains(QT_CONFIG, phonon): {
-       qtlibraries.sources += phonon.dll
+       qtlibraries.sources += $$QMAKE_LIBDIR_QT/phonon.dll
     }
 
     contains(QT_CONFIG, script): {
-        qtlibraries.sources += QtScript.dll
+        qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtScript.dll
     }
 
     contains(QT_CONFIG, xmlpatterns): {
-       qtlibraries.sources += QtXmlPatterns.dll
+       qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtXmlPatterns.dll
     }
 
     contains(QT_CONFIG, declarative): {
-        qtlibraries.sources += QtDeclarative.dll
+        qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtDeclarative.dll
     }
 
     graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems
     contains(QT_CONFIG, openvg) {
-        qtlibraries.sources += QtOpenVG.dll
-        graphicssystems_plugins.sources += qvggraphicssystem.dll
+        qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtOpenVG.dll
+        graphicssystems_plugins.sources += $$QT_BUILD_TREE/plugins/graphicssystems/qvggraphicssystem.dll
     }
 
     contains(QT_CONFIG, multimedia) {
-        qtlibraries.sources += QtMultimedia.dll
+        qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMultimedia.dll
     }
 
     BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index 25fb188..1ba105d 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -17,7 +17,7 @@ symbian {
                     qts60main_mcrt0.cpp
 
     # s60main needs to be built in ARM mode for GCCE to work.
-    MMP_RULES+="ALWAYS_BUILD_AS_ARM"
+    CONFIG += do_not_build_as_thumb
 
     # staticlib should not have any lib depencies in s60
     # This seems not to work, some hard coded libs are still added as dependency
diff --git a/src/s60main/s60main.rsg b/src/s60main/s60main.rsg
new file mode 100644
index 0000000..8cdf3ba
--- /dev/null
+++ b/src/s60main/s60main.rsg
@@ -0,0 +1,3 @@
+#define R_DEFAULT_DOCUMENT_NAME                   0x55567002
+#define R_QT_WRAPPERAPP_MENUBAR                   0x55567004
+#define R_QT_WRAPPERAPP_MENU                      0x55567005
diff --git a/src/src.pro b/src/src.pro
index 0fbce6b..0033942 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,7 +6,10 @@ win32:SRC_SUBDIRS += src_winmain
 wince*:{
   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_testlib
 } else:symbian {
-  SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib src_s60installs
+  SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib
+  !symbian-abld:!symbian-sbsv2 {
+    include(tools/tools.pro)
+  }
 } else {
     SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_testlib
     !vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
@@ -31,6 +34,10 @@ contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia
 SRC_SUBDIRS += src_plugins
 contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_imports
 
+# s60installs need to be at the end, because projects.pro does an ordered build,
+# and s60installs depends on all the others.
+symbian:SRC_SUBDIRS += src_s60installs
+
 src_s60main.subdir = $$QT_SOURCE_TREE/src/s60main
 src_s60main.target = sub-s60main
 src_s60installs.subdir = $$QT_SOURCE_TREE/src/s60installs
@@ -83,7 +90,7 @@ src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative
 src_declarative.target = sub-declarative
 
 #CONFIG += ordered
-!wince*:!symbian:!ordered {
+!wince*:!ordered {
    src_corelib.depends = src_tools_moc src_tools_rcc
    src_gui.depends = src_corelib src_tools_uic
    embedded: src_gui.depends += src_network
@@ -106,6 +113,7 @@ src_declarative.target = sub-declarative
    src_tools_activeqt.depends = src_tools_idc src_gui
    src_declarative.depends = src_xml src_gui src_script src_network src_svg
    src_plugins.depends = src_gui src_sql src_svg src_multimedia
+   src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
    src_imports.depends = src_gui src_declarative
    contains(QT_CONFIG, webkit)  {
       src_webkit.depends = src_gui src_sql src_network src_xml 
@@ -123,7 +131,7 @@ src_declarative.target = sub-declarative
    contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): src_plugins.depends += src_opengl
 }
 
-!symbian {
+
 # This creates a sub-src rule
 sub_src_target.CONFIG = recursive
 sub_src_target.recurse = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
@@ -170,6 +178,5 @@ for(subname, SRC_SUBDIRS) {
 debug.depends = $$EXTRA_DEBUG_TARGETS
 release.depends = $$EXTRA_RELEASE_TARGETS
 QMAKE_EXTRA_TARGETS += debug release
-}
 
 SUBDIRS += $$SRC_SUBDIRS
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
index b3ee948..15e746a 100644
--- a/src/tools/bootstrap/bootstrap.pri
+++ b/src/tools/bootstrap/bootstrap.pri
@@ -42,12 +42,12 @@ hpux-acc*|hpuxi-acc* {
 } else {
     contains(CONFIG, debug_and_release_target) {
         CONFIG(debug, debug|release) {
-            LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/debug
+            QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/debug
         } else {
-            LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/release
+            QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/release
         }
     } else {
-        LIBS += -L$$QT_BUILD_TREE/src/tools/bootstrap
+        QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap
     }
     LIBS += -lbootstrap
 }
@@ -62,3 +62,12 @@ mac {
     LIBS += -framework CoreServices
 }
 
+# Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working.
+sis_target.target = sis
+sis_target.commands =
+sis_target.depends = first
+QMAKE_EXTRA_TARGETS += sis_target
+freeze_target.target = freeze
+freeze_target.commands =
+freeze_target.depends = first
+QMAKE_EXTRA_TARGETS += freeze_target
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 0dbb90f..48dc444 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -113,3 +113,13 @@ contains(QT_CONFIG, zlib) {
 
 lib.CONFIG = dummy_install
 INSTALLS += lib
+
+# Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working.
+sis_target.target = sis
+sis_target.commands =
+sis_target.depends = first
+QMAKE_EXTRA_TARGETS += sis_target
+freeze_target.target = freeze
+freeze_target.commands =
+freeze_target.depends = first
+QMAKE_EXTRA_TARGETS += freeze_target
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 25527e3..cd7cd9b 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -20,7 +20,7 @@ src_tools_uic3.target = sub-uic3
 src_tools_idc.subdir = $$QT_SOURCE_TREE/src/tools/idc
 src_tools_idc.target = sub-idc
 
-!wince*:!symbian:!ordered {
+!wince*:!ordered {
     # Set dependencies for each subdir
     src_tools_moc.depends = src_tools_bootstrap
     src_tools_rcc.depends = src_tools_bootstrap
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 0150515..1267e7e 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -625,6 +625,11 @@ private:
     bool cdata;
     bool nsProcessing;
     QXmlLocator *locator;
+
+#ifdef Q_OS_SYMBIAN
+    // Workaround crash in elf2e32 under Wine.
+    virtual void dummy() {}
+#endif
 };
 
 /**************************************************************