1468 files changed, 60998 insertions, 4873 deletions

diff --git a/.gitignore b/.gitignore
index f088c691f9..f67874635c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,8 @@ tags
 .DS_Store
 *.debug
 Makefile*
+!qmake/Makefile.win32*
+!qmake/Makefile.unix
 *.prl
 *.app
 *.pro.user
@@ -64,6 +66,7 @@ bin/qhelpconverter*
 bin/qhelpgenerator*
 bin/qtconfig*
 bin/xmlpatterns*
+bin/cetest*
 bin/collectiongenerator
 bin/helpconverter
 bin/helpgenerator
@@ -170,6 +173,31 @@ doc/qch
 doc-build
 .rcc
 .pch
+
+# Symbian build system generated files
+# ---------------------
+
+ABLD.BAT
+bld.inf
+*.mmp
+*.mk
+*.rss
+*.loc
+!s60main.rss
+*.pkg
+plugin_commonU.def
+*.qtplugin
+*.sis
+*.sisx
+
+# Generated by abldfast.bat from devtools.
+.abldsteps.*
+
+# Carbide project files
+# ---------------------
+.project
+.cproject
+
 qtc-debugging-helper
 src/corelib/lib
 src/network/lib
diff --git a/bin/createpackage.bat b/bin/createpackage.bat
new file mode 100644
index 0000000000..116d52b7ec
--- /dev/null
+++ b/bin/createpackage.bat
@@ -0,0 +1,106 @@
+@echo off
+
+set installsigned_old=%installsigned%
+set pkgfile_old=%pkgfile%
+set basename_old=%basename%
+set signsis1_old=%signsis1%
+set signsis2_old=%signsis2%
+set signsis3_old=%signsis3%
+set unsigned_sis_name_old=%unsigned_sis_name%
+set signed_sis_name_old=%signed_sis_name%
+set scriptpath_old=%scriptpath%
+set certificate_old=%certificate%
+
+rem Help text
+if "%1"=="" (
+    echo Convenience script for creating signed packages you can install on your phone.
+    echo Usage: createpackage.bat [-i] myexample_armv5_udeb.pkg [certificate key [passphrase]]
+    echo.
+    echo If no certificate and key files are provided, either a RnD certificate or
+    echo a self-signed certificate from Qt installation root directory is used.
+    echo.
+    echo To install the package right away using PC suite, use -i argument. 
+    goto done
+)
+
+if "%1"=="-i" (
+    set installsigned=true
+    set pkgfile=%2
+    set basename=%~n2
+    set signsis1=%3
+    set signsis2=%4
+    set signsis3=%5
+) else (
+    set installsigned=false
+    set pkgfile=%1
+    set basename=%~n1
+    set signsis1=%2
+    set signsis2=%3
+    set signsis3=%4
+)
+
+set unsigned_sis_name=%basename%_unsigned.sis
+set signed_sis_name=%basename%.sis
+
+rem Get absolute path to this script
+set scriptpath=%~dp0
+
+rem Check the .pkg actually exists.
+if not exist %pkgfile% (
+    echo Error: Package description file '%pkgfile%' does not exist.
+    goto done
+)
+
+rem Remove any existing .sis packages
+if exist %signed_sis_name% del %signed_sis_name%
+if exist %unsigned_sis_name% del %unsigned_sis_name%
+
+rem Create .sis package
+makesis %pkgfile% %unsigned_sis_name%
+
+rem If no certificate is given, check default options
+if x%signsis1% == x (
+    rem If RnD certificate is not found, sign with self signed certificate
+    if not exist %scriptpath%..\rd.cer (
+        set certificate=Self signed
+        signsis %unsigned_sis_name% %signed_sis_name% %scriptpath%..\selfsigned.cer %scriptpath%..\selfsigned.key
+        goto install
+    )
+
+    rem Sign with RnD certificate
+    set certificate=RnD
+    signsis %unsigned_sis_name% %signed_sis_name% %scriptpath%..\rd.cer %scriptpath%..\rd-key.pem
+) else (
+    if x%signsis2% == x (
+       echo Custom certificate key file parameter missing.
+       goto cleanup
+    )
+
+    set certificate=%signsis1%
+    signsis %unsigned_sis_name% %signed_sis_name% %signsis1% %signsis2% %signsis3%
+)
+
+:install
+if exist %signed_sis_name% (
+    echo Successfully created %signed_sis_name% using certificate %certificate%
+    if "%installsigned%" == "true" (
+        echo Installing %signed_sis_name%...
+        call %signed_sis_name%
+    )
+)
+
+:cleanup
+if exist %unsigned_sis_name% del %unsigned_sis_name%
+
+:done
+
+set installsigned=%installsigned_old%
+set pkgfile=%pkgfile_old%
+set basename=%basename_old%
+set signsis1=%signsis1_old%
+set signsis2=%signsis2_old%
+set signsis3=%signsis3_old%
+set unsigned_sis_name=%unsigned_sis_name_old%
+set signed_sis_name=%signed_sis_name_old%
+set scriptpath=%scriptpath_old%
+set certificate=%certificate_old%
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
new file mode 100644
index 0000000000..4c4e67a663
--- /dev/null
+++ b/bin/patch_capabilities.pl
@@ -0,0 +1,107 @@
+#######################################################################
+#
+# A script for setting binary capabilities based on .pkg file contents.
+#
+# Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Contact: Qt Software Information (qt-info@nokia.com)
+#
+#######################################################################
+
+my @capabilitiesToSet = ("LocalServices", "NetworkServices", "ReadUserData", "UserEnvironment", "WriteUserData");
+
+# If arguments were given to the script,
+if (@ARGV)
+{
+    # Parse the first given script argument as a ".pkg" file name.
+    my $pkgFileName = shift(@ARGV);
+
+    # If the specified ".pkg" file exists (and can be read),
+    if (($pkgFileName =~ m|\.pkg$|i) && -r($pkgFileName))
+    {
+        # If there are more arguments given, parse them as capabilities.
+        if (@ARGV)
+        {
+            @capabilitiesToSet = ();
+            while (@ARGV)
+            {
+                push (@capabilitiesToSet, pop(@ARGV));
+            }
+        }
+
+        # Start with no binaries listed.
+        my @binaries = ();
+
+        my $tempPkgFileName = $pkgFileName."_@@TEMP@@";
+        unlink($tempPkgFileName);
+        open (NEW_PKG, ">>".$tempPkgFileName);
+        open (PKG, "<".$pkgFileName);
+
+        # Parse each line.
+        while (<PKG>)
+        {
+            my $line = $_;
+            my $newLine = $line;
+            if ( $line =~ m/^\#.*\(0x[0-9|a-f|A-F]*\).*$/)
+            {
+                $newLine =~ s/\(0x./\(0xE/;
+            }
+            print NEW_PKG $newLine;
+
+            chomp ($line);
+
+            # If the line specifies a file, parse the source and destination locations.
+            if ($line =~ m|\"([^\"]+)\"\s*\-\s*\"([^\"]+)\"|)
+            {
+                my $sourcePath = $1;
+                my $destinationPath = $2;
+
+                # If the given file is a binary, check the target and binary type (+ the actual filename) from its path.
+                if ($sourcePath =~ m:/epoc32/release/([^/]+)/(udeb|urel)/(\w+(\.dll|\.exe)):i)
+                {
+                    push (@binaries, $sourcePath);
+                }
+            }
+        }
+
+        close (PKG);
+        close (NEW_PKG);
+
+        unlink($pkgFileName);
+        rename($tempPkgFileName, $pkgFileName);
+
+        print ("\n");
+
+        my $baseCommandToExecute = "elftran -vid 0x0 -capability \"";
+        if (@capabilitiesToSet)
+        {
+            $baseCommandToExecute .= join(" ", @capabilitiesToSet);
+        }
+        $baseCommandToExecute .= "\" ";
+
+        # Actually set the capabilities of the listed binaries.
+        foreach my $binaryPath(@binaries)
+        {
+            # Create the command line for setting the capabilities.
+            my $commandToExecute = $baseCommandToExecute;
+            $commandToExecute .= $binaryPath;
+
+            # Actually execute the elftran command to set the capabilities.
+            system ($commandToExecute." > NUL");
+            print ("Executed ".$commandToExecute."\n");
+
+            ## Create another command line to check that the set capabilities are correct.
+            #$commandToExecute = "elftran -dump s ".$binaryPath;
+        }
+
+        print ("\n");
+    }
+}
+else
+{
+    print("This script can be used to set capabilities of all binaries\n");
+    print("specified for deployment in a .pkg file.\n");
+    print("If no capabilities are given, the binaries will be given the\n");
+    print("capabilities supported by self-signed certificates.\n");
+    print("\nUsage: patch_capabilities.pl pkg_filename [capability list]\n");
+    print("\nE.g. patch_capabilities.pl myapp_armv5_urel.pkg \"All -TCB\"\n");
+}
\ No newline at end of file
diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
index f069396f7d..377d6307c8 100644
--- a/config.tests/unix/openssl/openssl.pri
+++ b/config.tests/unix/openssl/openssl.pri
@@ -1,3 +1,10 @@
 # Empty file since Qt 4.6
 # I'm too lazy to find all places where this file is included
 
+symbian{
+    TRY_INCLUDEPATHS = $${EPOCROOT}epoc32 $${EPOCROOT}epoc32/include $${EPOCROOT}epoc32/include/stdapis $${EPOCROOT}epoc32/include/stdapis/sys $$OS_LAYER_LIBC_SYSTEMINCLUDE $$QMAKE_INCDIR $$INCLUDEPATH 
+    for(p, TRY_INCLUDEPATHS) {
+        pp = $$join(p, "", "", "/openssl")
+        exists($$pp):INCLUDEPATH *= $$pp
+    } 
+}
diff --git a/configure.exe b/configure.exe
index 322819ef2f..1019167046 100644..100755
--- a/configure.exe
+++ b/configure.exe
diff --git a/demos/affine/affine.pro b/demos/affine/affine.pro
index b92875313a..4973496915 100644
--- a/demos/affine/affine.pro
+++ b/demos/affine/affine.pro
@@ -18,6 +18,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
 sources.path = $$[QT_INSTALL_DEMOS]/affine
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
 wince*: {
     DEPLOYMENT_PLUGIN += qjpeg
 }
diff --git a/demos/arthurplugin/arthurplugin.pro b/demos/arthurplugin/arthurplugin.pro
index e9eb1f3672..d4827a150a 100644
--- a/demos/arthurplugin/arthurplugin.pro
+++ b/demos/arthurplugin/arthurplugin.pro
@@ -44,6 +44,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg *.png
 sources.path = $$[QT_INSTALL_DEMOS]/arthurplugin
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
 win32-msvc* {
 	QMAKE_CFLAGS += /Zm500
 	QMAKE_CXXFLAGS += /Zm500
diff --git a/demos/books/books.pro b/demos/books/books.pro
index a2cd33f86e..94b049a9f6 100644
--- a/demos/books/books.pro
+++ b/demos/books/books.pro
@@ -13,6 +13,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
 sources.path = $$[QT_INSTALL_DEMOS]/books
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
 wince*: {
     CONFIG(debug, debug|release):sqlPlugins.sources = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll
     CONFIG(release, debug|release):sqlPlugins.sources = $$QT_BUILD_TREE/plugins/sqldrivers/*[^d]4.dll
diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro
index 13e8a1dae0..ca000629d3 100644
--- a/demos/browser/browser.pro
+++ b/demos/browser/browser.pro
@@ -3,7 +3,7 @@ TARGET = browser
 QT += webkit network
 
 CONFIG += qt warn_on
-contains(QT_BUILD_PARTS, tools): CONFIG += uitools
+contains(QT_BUILD_PARTS, tools):!symbian: CONFIG += uitools
 else: DEFINES += QT_NO_UITOOLS
 
 FORMS += \
@@ -89,3 +89,7 @@ target.path = $$[QT_INSTALL_DEMOS]/browser
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.plist *.icns *.ico *.rc *.pro *.html *.doc images htmls data
 sources.path = $$[QT_INSTALL_DEMOS]/browser
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
+symbian:TARGET.UID3 = 0xA000CF70
diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp
index 0636f1d9c3..8dd59d5611 100644
--- a/demos/browser/browsermainwindow.cpp
+++ b/demos/browser/browsermainwindow.cpp
@@ -576,7 +576,7 @@ QUrl BrowserMainWindow::guessUrlFromString(const QString &string)
         int dotIndex = urlStr.indexOf(QLatin1Char('.'));
         if (dotIndex != -1) {
             QString prefix = urlStr.left(dotIndex).toLower();
-            QByteArray schema = (prefix == QLatin1String("ftp")) ? prefix.toLatin1() : "http";
+            QByteArray schema = (prefix == QLatin1String("ftp")) ? prefix.toLatin1() : QByteArray("http");
             QUrl url =
                 QUrl::fromEncoded(schema + "://" + urlStr.toUtf8(), QUrl::TolerantMode);
             if (url.isValid())
diff --git a/demos/browser/searchlineedit.cpp b/demos/browser/searchlineedit.cpp
index 0f38dd2a32..a450065f18 100644
--- a/demos/browser/searchlineedit.cpp
+++ b/demos/browser/searchlineedit.cpp
@@ -50,7 +50,9 @@
 ClearButton::ClearButton(QWidget *parent)
   : QAbstractButton(parent)
 {
+#ifndef QT_NO_CURSOR
     setCursor(Qt::ArrowCursor);
+#endif // QT_NO_CURSOR
     setToolTip(tr("Clear"));
     setVisible(false);
     setFocusPolicy(Qt::NoFocus);
@@ -103,7 +105,9 @@ SearchButton::SearchButton(QWidget *parent)
     m_menu(0)
 {
     setObjectName(QLatin1String("SearchButton"));
+#ifndef QT_NO_CURSOR
     setCursor(Qt::ArrowCursor);
+#endif //QT_NO_CURSOR
     setFocusPolicy(Qt::NoFocus);
 }
 
diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp
index 84ce5ef8b1..75e6d0617c 100644
--- a/demos/browser/webview.cpp
+++ b/demos/browser/webview.cpp
@@ -54,7 +54,9 @@
 
 #include <QtWebKit/QWebHitTestResult>
 
+#ifndef QT_NO_UITOOLS
 #include <QtUiTools/QUiLoader>
+#endif  //QT_NO_UITOOLS
 
 #include <QtCore/QDebug>
 #include <QtCore/QBuffer>
diff --git a/demos/chip/chip.pro b/demos/chip/chip.pro
index 53fa23b981..2c44e56f08 100644
--- a/demos/chip/chip.pro
+++ b/demos/chip/chip.pro
@@ -17,3 +17,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
 sources.path = $$[QT_INSTALL_DEMOS]/chip
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
diff --git a/demos/composition/composition.pro b/demos/composition/composition.pro
index d5c4a601b8..90562eb3b9 100644
--- a/demos/composition/composition.pro
+++ b/demos/composition/composition.pro
@@ -17,6 +17,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
 sources.path = $$[QT_INSTALL_DEMOS]/composition
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
 win32-msvc* {
     QMAKE_CXXFLAGS += /Zm500
     QMAKE_CFLAGS += /Zm500
diff --git a/demos/deform/deform.pro b/demos/deform/deform.pro
index db8484d4f0..31ba2e9bb7 100644
--- a/demos/deform/deform.pro
+++ b/demos/deform/deform.pro
@@ -17,3 +17,7 @@ target.path = $$[QT_INSTALL_DEMOS]/deform
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
 sources.path = $$[QT_INSTALL_DEMOS]/deform
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
+symbian:TARGET.UID3 = 0xA000A63D
diff --git a/demos/deform/pathdeform.cpp b/demos/deform/pathdeform.cpp
index cc5a3df37b..380d4a11cd 100644
--- a/demos/deform/pathdeform.cpp
+++ b/demos/deform/pathdeform.cpp
@@ -53,6 +53,10 @@
 #include <QDesktopWidget>
 #include <qmath.h>
 
+#if defined(Q_OS_SYMBIAN)
+// TODO: Remove all FONT_OUTLINE_TWEAK related code as soon as the S60FontEngine can deliver outlines
+#define FONT_OUTLINE_TWEAK
+#endif
 
 PathDeformControls::PathDeformControls(QWidget *parent, PathDeformRenderer* renderer, bool smallScreen)
       : QWidget(parent)
@@ -241,6 +245,14 @@ void PathDeformControls::layoutForSmallScreen()
 
     QRect screen_size = QApplication::desktop()->screenGeometry();
     radiusSlider->setValue(qMin(screen_size.width(), screen_size.height())/5);
+
+#ifdef FONT_OUTLINE_TWEAK
+    radiusSlider->setValue(qMin(screen_size.width(), screen_size.height())/7);
+    fontSizeLabel->setText("Qt Logo Size:");
+    m_renderer->setText("A"); // Any Letter would be fine
+    fontSizeSlider->setValue(100);
+#endif
+
     m_renderer->setText(tr("Qt"));
 }
 
diff --git a/demos/demobase.pri b/demos/demobase.pri
new file mode 100644
index 0000000000..c0bba64162
--- /dev/null
+++ b/demos/demobase.pri
@@ -0,0 +1 @@
+symbian:RSS_RULES = "group_name=\"QtDemos\";" 
\ No newline at end of file
diff --git a/demos/demos.pro b/demos/demos.pro
index eda04dc0bc..d734c05e92 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -1,27 +1,32 @@
 TEMPLATE    = subdirs
 SUBDIRS     = \
-	demos_shared \
-	demos_deform \
-	demos_gradients \
-	demos_pathstroke \
-	demos_affine \
-	demos_composition \
-        demos_books \
-        demos_interview \
-        demos_mainwindow \
-        demos_spreadsheet \
-        demos_textedit \
-        demos_chip \
-        demos_embeddeddialogs \
-        demos_undo \
-        demos_sub-attaq
+            demos_shared \
+            demos_deform \
+            demos_gradients \
+            demos_pathstroke \
+            demos_affine \
+            demos_composition \
+            demos_books \
+            demos_interview \
+            demos_mainwindow \
+            demos_spreadsheet \
+            demos_textedit \
+            demos_chip \
+            demos_embeddeddialogs \
+            demos_undo \
+            demos_sub-attaq
+
+symbian: SUBDIRS = \
+            demos_shared \
+            demos_deform \
+            demos_pathstroke
 
 contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):!contains(QT_CONFIG, opengles2):{
 SUBDIRS += demos_boxes
 }
 
 mac*: SUBDIRS += demos_macmainwindow
-wince*|embedded: SUBDIRS += embedded
+wince*|symbian|embedded: SUBDIRS += embedded
 
 !contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin
 
@@ -39,6 +44,8 @@ sources.files = README *.pro
 sources.path = $$[QT_INSTALL_DEMOS]
 INSTALLS += sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
 demos_chip.subdir = chip
 demos_embeddeddialogs.subdir = embeddeddialogs
 demos_shared.subdir = shared
diff --git a/demos/embedded/anomaly/README.TXT b/demos/embedded/anomaly/README.TXT
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/demos/embedded/anomaly/README.TXT
diff --git a/demos/embedded/anomaly/anomaly.pro b/demos/embedded/anomaly/anomaly.pro
new file mode 100644
index 0000000000..cf9277e4aa
--- /dev/null
+++ b/demos/embedded/anomaly/anomaly.pro
@@ -0,0 +1,32 @@
+QT += network \
+    webkit
+HEADERS += src/BrowserWindow.h \
+    src/BrowserView.h \
+    src/TitleBar.h \
+    src/HomeView.h \
+    src/AddressBar.h \
+    src/BookmarksView.h \
+    src/flickcharm.h \
+    src/ZoomStrip.h \
+    src/ControlStrip.h
+SOURCES += src/Main.cpp \
+    src/BrowserWindow.cpp \
+    src/BrowserView.cpp \
+    src/TitleBar.cpp \
+    src/HomeView.cpp \
+    src/AddressBar.cpp \
+    src/BookmarksView.cpp \
+    src/flickcharm.cpp \
+    src/ZoomStrip.cpp \
+    src/ControlStrip.cpp
+RESOURCES += src/anomaly.qrc
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
+symbian {
+    HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
+    LIBS += -lesock -lconnmon
+    TARGET.CAPABILITY = NetworkServices
+    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+    TARGET.UID3 = 0xA000CF71
+}
diff --git a/demos/embedded/anomaly/src/AddressBar.cpp b/demos/embedded/anomaly/src/AddressBar.cpp
new file mode 100644
index 0000000000..64734c87f0
--- /dev/null
+++ b/demos/embedded/anomaly/src/AddressBar.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include "AddressBar.h"
+
+#include <QtCore>
+#include <QtGui>
+
+class LineEdit: public QLineEdit
+{
+public:
+    LineEdit(QWidget *parent = 0): QLineEdit(parent) {}
+
+    void paintEvent(QPaintEvent *event) {
+        QLineEdit::paintEvent(event);
+        if (text().isEmpty()) {
+            QPainter p(this);
+            int flags = Qt::AlignLeft | Qt::AlignVCenter;
+            p.setPen(palette().color(QPalette::Disabled, QPalette::Text));
+            p.drawText(rect().adjusted(10, 0, 0, 0), flags, "Enter address or search terms");
+            p.end();
+        }
+    }
+};
+
+AddressBar::AddressBar(QWidget *parent)
+    : QWidget(parent)
+{
+    m_lineEdit = new LineEdit(parent);
+    connect(m_lineEdit, SIGNAL(returnPressed()), SLOT(processAddress()));
+    m_toolButton = new QToolButton(parent);
+    m_toolButton->setText("Go");
+    connect(m_toolButton, SIGNAL(clicked()), SLOT(processAddress()));
+}
+
+QSize AddressBar::sizeHint() const
+{
+    return m_lineEdit->sizeHint();
+}
+
+void AddressBar::processAddress()
+{
+    if (!m_lineEdit->text().isEmpty())
+        emit addressEntered(m_lineEdit->text());
+}
+
+void AddressBar::resizeEvent(QResizeEvent *event)
+{
+    int x, y, w, h;
+
+    m_toolButton->adjustSize();
+    x = width() - m_toolButton->width();
+    y = 0;
+    w = m_toolButton->width();
+    h = height() - 1;
+    m_toolButton->setGeometry(x, y, w, h);
+    m_toolButton->show();
+
+    x = 0;
+    y = 0;
+    w = width() - m_toolButton->width();
+    h = height() - 1;
+    m_lineEdit->setGeometry(x, y, w, h);
+    m_lineEdit->show();
+}
+
+void AddressBar::focusInEvent(QFocusEvent *event)
+{
+    m_lineEdit->setFocus();
+    QWidget::focusInEvent(event);
+}
diff --git a/demos/embedded/anomaly/src/AddressBar.h b/demos/embedded/anomaly/src/AddressBar.h
new file mode 100644
index 0000000000..632ae1f570
--- /dev/null
+++ b/demos/embedded/anomaly/src/AddressBar.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef ADDRESSBAR_H
+#define ADDRESSBAR_H
+
+#include <QWidget>
+
+class QLineEdit;
+class QToolButton;
+
+class AddressBar : public QWidget
+{
+    Q_OBJECT
+
+public:
+    AddressBar(QWidget *parent = 0);
+    QSize sizeHint() const;
+
+protected:
+    void resizeEvent(QResizeEvent *event);
+    void focusInEvent(QFocusEvent *event);
+
+signals:
+    void addressEntered(const QString &address);
+
+private slots:
+    void processAddress();
+
+private:
+    QLineEdit *m_lineEdit;
+    QToolButton *m_toolButton;
+};
+
+#endif // ADDRESSBAR_H
diff --git a/demos/embedded/anomaly/src/BookmarksView.cpp b/demos/embedded/anomaly/src/BookmarksView.cpp
new file mode 100644
index 0000000000..f705383a8a
--- /dev/null
+++ b/demos/embedded/anomaly/src/BookmarksView.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include "BookmarksView.h"
+
+#include <QtGui>
+
+BookmarksView::BookmarksView(QWidget *parent)
+    : QWidget(parent)
+{
+    QListWidget *m_iconView = new QListWidget(this);
+    connect(m_iconView, SIGNAL(itemActivated(QListWidgetItem*)), SLOT(activate(QListWidgetItem*)));
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    setLayout(layout);
+    layout->addWidget(m_iconView);
+
+    m_iconView->addItem("www.google.com");
+    m_iconView->addItem("doc.trolltech.com/4.5");
+    m_iconView->addItem("news.bbc.co.uk/text_only.stm");
+    m_iconView->addItem("mobile.wikipedia.org");
+    m_iconView->addItem("www.qtsoftware.com");
+    m_iconView->addItem("en.wikipedia.org");
+
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+}
+
+void BookmarksView::activate(QListWidgetItem *item)
+{
+    QUrl url = item->text().prepend("http://");
+    emit urlSelected(url);
+}
diff --git a/demos/embedded/anomaly/src/BookmarksView.h b/demos/embedded/anomaly/src/BookmarksView.h
new file mode 100644
index 0000000000..95abdd7c3d
--- /dev/null
+++ b/demos/embedded/anomaly/src/BookmarksView.h
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef BOOKMARKSVIEW_H
+#define BOOKMARKSVIEW_H
+
+#include <QWidget>
+
+class QListWidgetItem;
+class QUrl;
+
+class BookmarksView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    BookmarksView(QWidget *parent = 0);
+
+signals:
+    void urlSelected(const QUrl &url);
+
+private slots:
+    void activate(QListWidgetItem *item);
+};
+
+#endif // BOOKMARKSVIEW_H
diff --git a/demos/embedded/anomaly/src/BrowserView.cpp b/demos/embedded/anomaly/src/BrowserView.cpp
new file mode 100644
index 0000000000..4ef19203f6
--- /dev/null
+++ b/demos/embedded/anomaly/src/BrowserView.cpp
@@ -0,0 +1,167 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include "BrowserView.h"
+
+#include <QtGui>
+#include <QtNetwork>
+#include <QtWebKit>
+
+#include "ControlStrip.h"
+#include "TitleBar.h"
+#include "flickcharm.h"
+#include "ZoomStrip.h"
+
+#if defined (Q_OS_SYMBIAN)
+#include "sym_iap_util.h"
+#endif
+
+BrowserView::BrowserView(QWidget *parent)
+    : QWidget(parent)
+    , m_titleBar(0)
+    , m_webView(0)
+    , m_progress(0)
+    , m_currentZoom(100)
+{
+    m_titleBar = new TitleBar(this);
+    m_webView = new QWebView(this);
+    m_zoomStrip = new ZoomStrip(this);
+    m_controlStrip = new ControlStrip(this);
+
+    m_zoomLevels << 30 << 50 << 67 << 80 << 90;
+    m_zoomLevels << 100;
+    m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
+
+    QTimer::singleShot(0, this, SLOT(initialize()));
+}
+
+void BrowserView::initialize()
+{
+    connect(m_zoomStrip, SIGNAL(zoomInClicked()), SLOT(zoomIn()));
+    connect(m_zoomStrip, SIGNAL(zoomOutClicked()), SLOT(zoomOut()));
+
+    connect(m_controlStrip, SIGNAL(menuClicked()), SIGNAL(menuButtonClicked()));
+    connect(m_controlStrip, SIGNAL(backClicked()), m_webView, SLOT(back()));
+    connect(m_controlStrip, SIGNAL(forwardClicked()), m_webView, SLOT(forward()));
+
+    QPalette pal = m_webView->palette();
+    pal.setBrush(QPalette::Base, Qt::white);
+    m_webView->setPalette(pal);
+
+    FlickCharm *flickCharm = new FlickCharm(this);
+    flickCharm->activateOn(m_webView);
+
+    m_webView->setZoomFactor(static_cast<qreal>(m_currentZoom)/100.0);
+    connect(m_webView, SIGNAL(loadStarted()), SLOT(start()));
+    connect(m_webView, SIGNAL(loadProgress(int)), SLOT(setProgress(int)));
+    connect(m_webView, SIGNAL(loadFinished(bool)), SLOT(finish(bool)));
+    connect(m_webView, SIGNAL(urlChanged(QUrl)), SLOT(updateTitleBar()));
+
+    m_webView->setHtml("Will try to load page soon!");
+    m_webView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    m_webView->setFocus();
+#ifdef Q_OS_SYMBIAN
+    QTimer::singleShot(0, this, SLOT(setDefaultIap()));
+#endif
+}
+
+void BrowserView::start()
+{
+    m_progress = 0;
+    updateTitleBar();
+    //m_titleBar->setText(m_webView->url().toString());
+}
+
+void BrowserView::setProgress(int percent)
+{
+    m_progress = percent;
+    updateTitleBar();
+    //m_titleBar->setText(QString("Loading %1%").arg(percent));
+}
+
+void BrowserView::updateTitleBar()
+{
+    QUrl url = m_webView->url();
+    m_titleBar->setHost(url.host());
+    m_titleBar->setTitle(m_webView->title());
+    m_titleBar->setProgress(m_progress);
+}
+
+void BrowserView::finish(bool ok)
+{
+    m_progress = 0;
+    updateTitleBar();
+
+    // TODO: handle error
+    if (!ok) {
+        //m_titleBar->setText("Loading failed.");
+    }
+}
+
+void BrowserView::zoomIn()
+{
+    int i = m_zoomLevels.indexOf(m_currentZoom);
+    Q_ASSERT(i >= 0);
+    if (i < m_zoomLevels.count() - 1)
+        m_currentZoom = m_zoomLevels[i + 1];
+
+    m_webView->setZoomFactor(static_cast<qreal>(m_currentZoom)/100.0);
+}
+
+void BrowserView::zoomOut()
+{
+    int i = m_zoomLevels.indexOf(m_currentZoom);
+    Q_ASSERT(i >= 0);
+    if (i > 0)
+        m_currentZoom = m_zoomLevels[i - 1];
+
+    m_webView->setZoomFactor(static_cast<qreal>(m_currentZoom)/100.0);
+}
+
+void BrowserView::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+
+    int h1 = m_titleBar->sizeHint().height();
+    int h2 = m_controlStrip->sizeHint().height();
+
+    m_titleBar->setGeometry(0, 0, width(), h1);
+    m_controlStrip->setGeometry(0, height() - h2, width(), h2);
+    m_webView->setGeometry(0, h1, width(), height() - h1);
+
+    int zw = m_zoomStrip->sizeHint().width();
+    int zh = m_zoomStrip->sizeHint().height();
+    m_zoomStrip->move(width() - zw, (height() - zh) / 2);
+}
+#ifdef Q_OS_SYMBIAN
+void BrowserView::setDefaultIap()
+{
+    qt_SetDefaultIap();
+    m_webView->load(QUrl("http://news.bbc.co.uk/text_only.stm"));
+}
+#endif
+
+void BrowserView::navigate(const QUrl &url)
+{
+    m_webView->load(url);
+}
diff --git a/demos/embedded/anomaly/src/BrowserView.h b/demos/embedded/anomaly/src/BrowserView.h
new file mode 100644
index 0000000000..0dba14ed95
--- /dev/null
+++ b/demos/embedded/anomaly/src/BrowserView.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef BROWSERVIEW_H
+#define BROWSERVIEW_H
+
+#include <QWidget>
+#include <QVector>
+
+class QUrl;
+class QWebView;
+class TitleBar;
+class ControlStrip;
+class ZoomStrip;
+
+class BrowserView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    BrowserView(QWidget *parent = 0);
+
+public slots:
+    void navigate(const QUrl &url);
+    void zoomIn();
+    void zoomOut();
+#ifdef Q_OS_SYMBIAN
+    void setDefaultIap();
+#endif
+
+private slots:
+    void initialize();
+    void start();
+    void setProgress(int percent);
+    void finish(bool);
+    void updateTitleBar();
+
+signals:
+    void menuButtonClicked();
+
+protected:
+    void resizeEvent(QResizeEvent *event);
+
+private:
+    TitleBar *m_titleBar;
+    QWebView *m_webView;
+    ZoomStrip *m_zoomStrip;
+    ControlStrip *m_controlStrip;
+    int m_progress;
+    int m_currentZoom;
+    QVector<int> m_zoomLevels;
+};
+
+#endif // BROWSERVIEW_H
diff --git a/demos/embedded/anomaly/src/BrowserWindow.cpp b/demos/embedded/anomaly/src/BrowserWindow.cpp
new file mode 100644
index 0000000000..fd2f833506
--- /dev/null
+++ b/demos/embedded/anomaly/src/BrowserWindow.cpp
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include "BrowserWindow.h"
+
+#include <QtCore>
+#include <QtGui>
+
+#include "BrowserView.h"
+#include "HomeView.h"
+
+BrowserWindow::BrowserWindow()
+    : QWidget()
+    , m_homeView(0)
+    , m_browserView(0)
+{
+    m_timeLine = new QTimeLine(300, this);
+    m_timeLine->setCurveShape(QTimeLine::EaseInOutCurve);
+    QTimer::singleShot(0, this, SLOT(initialize()));
+}
+
+void BrowserWindow::initialize()
+{
+    m_homeView = new HomeView(this);
+    m_browserView = new BrowserView(this);
+
+    m_homeView->hide();
+    m_homeView->resize(size());
+    m_homeView->move(0, 0);
+
+    m_browserView->hide();
+    m_browserView->resize(size());
+    m_browserView->move(0, 0);
+
+    connect(m_homeView, SIGNAL(addressEntered(QString)), SLOT(gotoAddress(QString)));
+    connect(m_homeView, SIGNAL(urlActivated(QUrl)), SLOT(navigate(QUrl)));
+
+    connect(m_browserView, SIGNAL(menuButtonClicked()), SLOT(showHomeView()));
+
+    m_homeView->setVisible(false);
+    m_browserView->setVisible(false);
+    slide(0);
+
+    connect(m_timeLine, SIGNAL(frameChanged(int)), SLOT(slide(int)));
+}
+
+
+// from Demo Browser
+QUrl guessUrlFromString(const QString &string)
+{
+    QString urlStr = string.trimmed();
+    QRegExp test(QLatin1String("^[a-zA-Z]+\\:.*"));
+
+    // Check if it looks like a qualified URL. Try parsing it and see.
+    bool hasSchema = test.exactMatch(urlStr);
+    if (hasSchema) {
+        QUrl url = QUrl::fromEncoded(urlStr.toUtf8(), QUrl::TolerantMode);
+        if (url.isValid())
+            return url;
+    }
+
+    // Might be a file.
+    if (QFile::exists(urlStr)) {
+        QFileInfo info(urlStr);
+        return QUrl::fromLocalFile(info.absoluteFilePath());
+    }
+
+    // Might be a shorturl - try to detect the schema.
+    if (!hasSchema) {
+        int dotIndex = urlStr.indexOf(QLatin1Char('.'));
+        if (dotIndex != -1) {
+            QString prefix = urlStr.left(dotIndex).toLower();
+            QString schema = (prefix == QString("ftp")) ? prefix.toLatin1() : QString("http");
+            QString location = schema + "://" + urlStr;
+            QUrl url = QUrl::fromEncoded(location.toUtf8(), QUrl::TolerantMode);
+            if (url.isValid())
+                return url;
+        }
+    }
+
+    // Fall back to QUrl's own tolerant parser.
+    QUrl url = QUrl::fromEncoded(string.toUtf8(), QUrl::TolerantMode);
+
+    // finally for cases where the user just types in a hostname add http
+    if (url.scheme().isEmpty())
+        url = QUrl::fromEncoded("http://" + string.toUtf8(), QUrl::TolerantMode);
+    return url;
+}
+
+void BrowserWindow::gotoAddress(const QString &address)
+{
+    m_browserView->navigate(guessUrlFromString(address));
+    showBrowserView();
+}
+
+void BrowserWindow::navigate(const QUrl &url)
+{
+    m_browserView->navigate(url);
+    showBrowserView();
+}
+
+void BrowserWindow::slide(int pos)
+{
+    m_browserView->move(pos, 0);
+    m_homeView->move(pos - width(), 0);
+    m_browserView->show();
+    m_homeView->show();
+}
+
+void BrowserWindow::showHomeView()
+{
+    if (m_timeLine->state() != QTimeLine::NotRunning)
+        return;
+
+    m_timeLine->setFrameRange(0, width());
+    m_timeLine->start();
+    m_homeView->setFocus();
+}
+
+void BrowserWindow::showBrowserView()
+{
+    if (m_timeLine->state() != QTimeLine::NotRunning)
+        return;
+
+    m_timeLine->setFrameRange(width(), 0);
+    m_timeLine->start();
+    m_browserView->setFocus();
+}
+
+void BrowserWindow::keyReleaseEvent(QKeyEvent *event)
+{
+    QWidget::keyReleaseEvent(event);
+
+    if (event->key() == Qt::Key_F3) {
+        if (m_homeView->isVisible())
+            showBrowserView();
+        else
+            showHomeView();
+    }
+}
+
+void BrowserWindow::resizeEvent(QResizeEvent *event)
+{
+    if (m_homeView)
+        m_homeView->resize(size());
+
+    if (m_browserView)
+        m_browserView->resize(size());
+}
diff --git a/demos/embedded/anomaly/src/BrowserWindow.h b/demos/embedded/anomaly/src/BrowserWindow.h
new file mode 100644
index 0000000000..50a65080c6
--- /dev/null
+++ b/demos/embedded/anomaly/src/BrowserWindow.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+
+#ifndef BROWSERWINDOW_H
+#define BROWSERWINDOW_H
+
+#include <QWidget>
+class QTimeLine;
+class QUrl;
+
+class BrowserView;
+class HomeView;
+
+class BrowserWindow : public QWidget
+{
+    Q_OBJECT
+
+public:
+    BrowserWindow();
+
+private slots:
+    void initialize();
+    void navigate(const QUrl &url);
+    void gotoAddress(const QString &address);
+
+public slots:
+    void showBrowserView();
+    void showHomeView();
+    void slide(int);
+
+protected:
+    void keyReleaseEvent(QKeyEvent *event);
+    void resizeEvent(QResizeEvent *event);
+
+private:
+    HomeView *m_homeView;
+    BrowserView *m_browserView;
+    QTimeLine *m_timeLine;
+};
+
+#endif // BROWSERWINDOW_H
diff --git a/demos/embedded/anomaly/src/ControlStrip.cpp b/demos/embedded/anomaly/src/ControlStrip.cpp
new file mode 100644
index 0000000000..72bc485a12
--- /dev/null
+++ b/demos/embedded/anomaly/src/ControlStrip.cpp
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include "ControlStrip.h"
+
+#include <QtCore>
+#include <QtGui>
+
+ControlStrip::ControlStrip(QWidget *parent)
+    : QWidget(parent)
+{
+    menuPixmap.load(":/images/edit-find.png");
+    backPixmap.load(":/images/go-previous.png");
+    forwardPixmap.load(":/images/go-next.png");
+}
+
+QSize ControlStrip::sizeHint() const
+{
+    return minimumSizeHint();
+}
+
+QSize ControlStrip::minimumSizeHint() const
+{
+    return QSize(320, 48);
+}
+
+void ControlStrip::mousePressEvent(QMouseEvent *event)
+{
+    int h = height();
+    int x = event->pos().x();
+
+    if (x < h) {
+        emit menuClicked();
+        event->accept();
+        return;
+    }
+
+    if (x > width() - h) {
+        emit forwardClicked();
+        event->accept();
+        return;
+    }
+
+    if ((x < width() - 2 * h) && (x > width() - 3 * h)) {
+        emit backClicked();
+        event->accept();
+        return;
+    }
+}
+
+void ControlStrip::paintEvent(QPaintEvent *event)
+{
+    int h = height();
+    int s = (h - menuPixmap.height()) / 2;
+
+    QPainter p(this);
+    p.fillRect(event->rect(), QColor(32, 32, 32, 192));
+    p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+    p.drawPixmap(s, s, menuPixmap);
+    p.drawPixmap(width() - 3 * h + s, s, backPixmap);
+    p.drawPixmap(width() - h + s, s, forwardPixmap);
+    p.end();
+}
diff --git a/demos/embedded/anomaly/src/ControlStrip.h b/demos/embedded/anomaly/src/ControlStrip.h
new file mode 100644
index 0000000000..99fc58d165
--- /dev/null
+++ b/demos/embedded/anomaly/src/ControlStrip.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef CONTROLSTRIP_H
+#define CONTROLSTRIP_H
+
+#include <QWidget>
+
+class ControlStrip : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ControlStrip(QWidget *parent = 0);
+
+    QSize sizeHint() const;
+    QSize minimumSizeHint() const;
+
+signals:
+    void menuClicked();
+    void backClicked();
+    void forwardClicked();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+
+private:
+    QPixmap menuPixmap;
+    QPixmap backPixmap;
+    QPixmap forwardPixmap;
+};
+
+#endif // CONTROLSTRIP_H
diff --git a/demos/embedded/anomaly/src/HomeView.cpp b/demos/embedded/anomaly/src/HomeView.cpp
new file mode 100644
index 0000000000..0f59d54929
--- /dev/null
+++ b/demos/embedded/anomaly/src/HomeView.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include "HomeView.h"
+
+#include <QtCore>
+#include <QtGui>
+
+#include "AddressBar.h"
+#include "BookmarksView.h"
+
+HomeView::HomeView(QWidget *parent)
+    : QWidget(parent)
+    , m_addressBar(0)
+{
+    m_addressBar = new AddressBar(parent);
+    connect(m_addressBar, SIGNAL(addressEntered(QString)), SLOT(gotoAddress(QString)));
+
+    m_bookmarks = new BookmarksView(parent);
+    connect(m_bookmarks, SIGNAL(urlSelected(QUrl)), SIGNAL(urlActivated(QUrl)));
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->setMargin(4);
+    layout->setSpacing(4);
+    layout->addWidget(m_addressBar);
+    layout->addWidget(m_bookmarks);
+}
+
+void HomeView::gotoAddress(const QString &address)
+{
+    emit addressEntered(address);
+}
+
+void HomeView::focusInEvent(QFocusEvent *event)
+{
+    m_addressBar->setFocus();
+    QWidget::focusInEvent(event);
+}
diff --git a/demos/embedded/anomaly/src/HomeView.h b/demos/embedded/anomaly/src/HomeView.h
new file mode 100644
index 0000000000..b54f07e97b
--- /dev/null
+++ b/demos/embedded/anomaly/src/HomeView.h
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef HOMEVIEW_H
+#define HOMEVIEW_H
+
+#include <QWidget>
+
+class QUrl;
+
+class AddressBar;
+class BookmarksView;
+
+class HomeView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    HomeView(QWidget *parent);
+
+signals:
+    void urlActivated(const QUrl &url);
+    void addressEntered(const QString &address);
+
+private slots:
+    void gotoAddress(const QString &address);
+
+protected:
+    void focusInEvent(QFocusEvent *event);
+
+private:
+    AddressBar *m_addressBar;
+    BookmarksView *m_bookmarks;
+};
+
+#endif // HOMEVIEW_H
diff --git a/demos/embedded/anomaly/src/Main.cpp b/demos/embedded/anomaly/src/Main.cpp
new file mode 100644
index 0000000000..d861857e8f
--- /dev/null
+++ b/demos/embedded/anomaly/src/Main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <QtGui>
+#include <QtWebKit>
+
+#include "BrowserWindow.h"
+
+int main(int argc, char *argv[])
+{
+#if !defined(Q_WS_S60)
+    QApplication::setGraphicsSystem("raster");
+#endif
+
+    QApplication app(argc, argv);
+
+    app.setApplicationName("Anomaly");
+    app.setApplicationVersion("0.0.0");
+
+    BrowserWindow window;
+#ifdef Q_OS_SYMBIAN
+    window.showFullScreen();
+    QWebSettings::globalSettings()->setObjectCacheCapacities(128*1024, 1024*1024, 1024*1024);
+    QWebSettings::globalSettings()->setMaximumPagesInCache(3);
+#else
+    window.resize(360, 640);
+    window.show();
+    app.setStyle("windows");
+#endif
+
+    return app.exec();
+}
+
diff --git a/demos/embedded/anomaly/src/TitleBar.cpp b/demos/embedded/anomaly/src/TitleBar.cpp
new file mode 100644
index 0000000000..ff7837c393
--- /dev/null
+++ b/demos/embedded/anomaly/src/TitleBar.cpp
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include "TitleBar.h"
+
+#include <QtCore>
+#include <QtGui>
+
+TitleBar::TitleBar(QWidget *parent)
+    : QWidget(parent)
+    , m_progress(0)
+{
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+}
+
+void TitleBar::setHost(const QString &host)
+{
+    m_host = host;
+    update();
+}
+
+void TitleBar::setTitle(const QString &title)
+{
+    m_title = title;
+    update();
+}
+
+void TitleBar::setProgress(int percent)
+{
+    m_progress = percent;
+    update();
+}
+
+QSize TitleBar::sizeHint() const
+{
+    return minimumSizeHint();
+}
+
+QSize TitleBar::minimumSizeHint() const
+{
+    QFontMetrics fm = fontMetrics();
+    return QSize(100, fm.height());
+}
+
+void TitleBar::paintEvent(QPaintEvent *event)
+{
+    QString title = m_host;
+    if (!m_title.isEmpty())
+        title.append(": ").append(m_title);
+
+    QPalette pal = palette();
+    QPainter p(this);
+    p.fillRect(event->rect(), pal.color(QPalette::Highlight));
+
+    if (m_progress > 0) {
+
+        QRect box = rect();
+        box.setLeft(16);
+        box.setWidth(width() - box.left() - 110);
+
+        p.setPen(pal.color(QPalette::HighlightedText));
+        p.setOpacity(0.8);
+        p.drawText(box, Qt::AlignLeft + Qt::AlignVCenter, title);
+
+        int x = width() - 100 - 5;
+        int y = 1;
+        int h = height() - 4;
+
+        p.setOpacity(1.0);
+        p.setBrush(Qt::NoBrush);
+        p.setPen(pal.color(QPalette::HighlightedText));
+        p.drawRect(x, y, 100, h);
+        p.setPen(Qt::NoPen);
+        p.setBrush(pal.color(QPalette::HighlightedText));
+        p.drawRect(x, y, m_progress, h);
+    } else {
+
+        QRect box = rect();
+        box.setLeft(16);
+        box.setWidth(width() - box.left() - 5);
+        p.setPen(pal.color(QPalette::HighlightedText));
+        p.drawText(box, Qt::AlignLeft + Qt::AlignVCenter, title);
+    }
+
+    p.end();
+}
diff --git a/demos/embedded/anomaly/src/TitleBar.h b/demos/embedded/anomaly/src/TitleBar.h
new file mode 100644
index 0000000000..10ef2a87ac
--- /dev/null
+++ b/demos/embedded/anomaly/src/TitleBar.h
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef TITLEBAR_H
+#define TITLEBAR_H
+
+#include <QWidget>
+
+class TitleBar : public QWidget
+{
+    Q_OBJECT
+
+public:
+    TitleBar(QWidget *parent = 0);
+
+    void setHost(const QString &host);
+    void setTitle(const QString &title);
+    void setProgress(int percent);
+
+    QSize sizeHint() const;
+    QSize minimumSizeHint() const;
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private:
+    QString m_host;
+    QString m_title;
+    int m_progress;
+};
+
+#endif // TITLEBAR_H
diff --git a/demos/embedded/anomaly/src/ZoomStrip.cpp b/demos/embedded/anomaly/src/ZoomStrip.cpp
new file mode 100644
index 0000000000..80bfdea5ae
--- /dev/null
+++ b/demos/embedded/anomaly/src/ZoomStrip.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include "ZoomStrip.h"
+
+#include <QtCore>
+#include <QtGui>
+
+ZoomStrip::ZoomStrip(QWidget *parent)
+    : QWidget(parent)
+{
+    zoomInPixmap.load(":/images/list-add.png");
+    zoomOutPixmap.load(":/images/list-remove.png");
+}
+
+QSize ZoomStrip::sizeHint() const
+{
+    return minimumSizeHint();
+}
+
+QSize ZoomStrip::minimumSizeHint() const
+{
+    return QSize(48, 96);
+}
+
+void ZoomStrip::mousePressEvent(QMouseEvent *event)
+{
+    if (event->pos().y() < height() / 2)
+        emit zoomInClicked();
+    else
+        emit zoomOutClicked();
+}
+
+void ZoomStrip::paintEvent(QPaintEvent *event)
+{
+    int w = width();
+    int s = (w - zoomInPixmap.width()) / 2;
+
+    QPainter p(this);
+    p.fillRect(event->rect(), QColor(128, 128, 128, 128));
+    p.drawPixmap(s, s, zoomInPixmap);
+    p.drawPixmap(s, s + w, zoomOutPixmap);
+    p.end();
+}
diff --git a/demos/embedded/anomaly/src/ZoomStrip.h b/demos/embedded/anomaly/src/ZoomStrip.h
new file mode 100644
index 0000000000..fdf0328d30
--- /dev/null
+++ b/demos/embedded/anomaly/src/ZoomStrip.h
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Anomaly project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef ZOOMSTRIP_H
+#define ZOOMSTRIP_H
+
+#include <QWidget>
+
+class ZoomStrip : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ZoomStrip(QWidget *parent = 0);
+
+    QSize sizeHint() const;
+    QSize minimumSizeHint() const;
+
+signals:
+    void zoomInClicked();
+    void zoomOutClicked();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+
+private:
+    QPixmap zoomInPixmap;
+    QPixmap zoomOutPixmap;
+};
+
+#endif // ZOOMSTRIP_H
diff --git a/demos/embedded/anomaly/src/anomaly.qrc b/demos/embedded/anomaly/src/anomaly.qrc
new file mode 100644
index 0000000000..601a34e79f
--- /dev/null
+++ b/demos/embedded/anomaly/src/anomaly.qrc
@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>images/go-next.png</file>
+        <file>images/go-previous.png</file>
+        <file>images/edit-find.png</file>
+        <file>images/list-add.png</file>
+        <file>images/list-remove.png</file>
+    </qresource>
+</RCC>
diff --git a/demos/embedded/anomaly/src/flickcharm.cpp b/demos/embedded/anomaly/src/flickcharm.cpp
new file mode 100644
index 0000000000..620ef88843
--- /dev/null
+++ b/demos/embedded/anomaly/src/flickcharm.cpp
@@ -0,0 +1,309 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Graphics Dojo project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include "flickcharm.h"
+
+#include <QAbstractScrollArea>
+#include <QApplication>
+#include <QBasicTimer>
+#include <QEvent>
+#include <QHash>
+#include <QList>
+#include <QMouseEvent>
+#include <QScrollBar>
+#include <QWebFrame>
+#include <QWebView>
+
+#include <QDebug>
+
+struct FlickData {
+    typedef enum { Steady, Pressed, ManualScroll, AutoScroll, Stop } State;
+    State state;
+    QWidget *widget;
+    QPoint pressPos;
+    QPoint offset;
+    QPoint dragPos;
+    QPoint speed;
+    QList<QEvent*> ignored;
+};
+
+class FlickCharmPrivate
+{
+public:
+    QHash<QWidget*, FlickData*> flickData;
+    QBasicTimer ticker;
+};
+
+FlickCharm::FlickCharm(QObject *parent): QObject(parent)
+{
+    d = new FlickCharmPrivate;
+}
+
+FlickCharm::~FlickCharm()
+{
+    delete d;
+}
+
+void FlickCharm::activateOn(QWidget *widget)
+{
+    QAbstractScrollArea *scrollArea = dynamic_cast<QAbstractScrollArea*>(widget);
+    if (scrollArea) {
+        scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+        QWidget *viewport = scrollArea->viewport();
+
+        viewport->installEventFilter(this);
+        scrollArea->installEventFilter(this);
+
+        d->flickData.remove(viewport);
+        d->flickData[viewport] = new FlickData;
+        d->flickData[viewport]->widget = widget;
+        d->flickData[viewport]->state = FlickData::Steady;
+
+        return;
+    }
+
+    QWebView *webView = dynamic_cast<QWebView*>(widget);
+    if (webView) {
+        QWebFrame *frame = webView->page()->mainFrame();
+        frame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
+        frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+
+        webView->installEventFilter(this);
+
+        d->flickData.remove(webView);
+        d->flickData[webView] = new FlickData;
+        d->flickData[webView]->widget = webView;
+        d->flickData[webView]->state = FlickData::Steady;
+
+        return;
+    }
+
+    qWarning() << "FlickCharm only works on QAbstractScrollArea (and derived classes)";
+    qWarning() << "or QWebView (and derived classes)";
+}
+
+void FlickCharm::deactivateFrom(QWidget *widget)
+{
+    QAbstractScrollArea *scrollArea = dynamic_cast<QAbstractScrollArea*>(widget);
+    if (scrollArea) {
+        QWidget *viewport = scrollArea->viewport();
+
+        viewport->removeEventFilter(this);
+        scrollArea->removeEventFilter(this);
+
+        delete d->flickData[viewport];
+        d->flickData.remove(viewport);
+
+        return;
+    }
+
+    QWebView *webView = dynamic_cast<QWebView*>(widget);
+    if (webView) {
+        webView->removeEventFilter(this);
+
+        delete d->flickData[webView];
+        d->flickData.remove(webView);
+
+        return;
+    }
+}
+
+static QPoint scrollOffset(QWidget *widget)
+{
+    int x = 0, y = 0;
+
+    QAbstractScrollArea *scrollArea = dynamic_cast<QAbstractScrollArea*>(widget);
+    if (scrollArea) {
+        x = scrollArea->horizontalScrollBar()->value();
+        y = scrollArea->verticalScrollBar()->value();
+    }
+
+    QWebView *webView = dynamic_cast<QWebView*>(widget);
+    if (webView) {
+        QWebFrame *frame = webView->page()->mainFrame();
+        x = frame->evaluateJavaScript("window.scrollX").toInt();
+        y = frame->evaluateJavaScript("window.scrollY").toInt();
+    }
+
+    return QPoint(x, y);
+}
+
+static void setScrollOffset(QWidget *widget, const QPoint &p)
+{
+    QAbstractScrollArea *scrollArea = dynamic_cast<QAbstractScrollArea*>(widget);
+    if (scrollArea) {
+        scrollArea->horizontalScrollBar()->setValue(p.x());
+        scrollArea->verticalScrollBar()->setValue(p.y());
+    }
+
+    QWebView *webView = dynamic_cast<QWebView*>(widget);
+    QWebFrame *frame = webView ? webView->page()->mainFrame() : 0;
+    if (frame)
+        frame->evaluateJavaScript(QString("window.scrollTo(%1,%2);").arg(p.x()).arg(p.y()));
+}
+
+static QPoint deaccelerate(const QPoint &speed, int a = 1, int max = 64)
+{
+    int x = qBound(-max, speed.x(), max);
+    int y = qBound(-max, speed.y(), max);
+    x = (x == 0) ? x : (x > 0) ? qMax(0, x - a) : qMin(0, x + a);
+    y = (y == 0) ? y : (y > 0) ? qMax(0, y - a) : qMin(0, y + a);
+    return QPoint(x, y);
+}
+
+bool FlickCharm::eventFilter(QObject *object, QEvent *event)
+{
+    if (!object->isWidgetType())
+        return false;
+
+    QEvent::Type type = event->type();
+    if (type != QEvent::MouseButtonPress &&
+            type != QEvent::MouseButtonRelease &&
+            type != QEvent::MouseMove)
+        return false;
+
+    QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent*>(event);
+    if (!mouseEvent || mouseEvent->modifiers() != Qt::NoModifier)
+        return false;
+
+    QWidget *viewport = dynamic_cast<QWidget*>(object);
+    FlickData *data = d->flickData.value(viewport);
+    if (!viewport || !data || data->ignored.removeAll(event))
+        return false;
+
+    bool consumed = false;
+    switch (data->state) {
+
+    case FlickData::Steady:
+        if (mouseEvent->type() == QEvent::MouseButtonPress)
+            if (mouseEvent->buttons() == Qt::LeftButton) {
+                consumed = true;
+                data->state = FlickData::Pressed;
+                data->pressPos = mouseEvent->pos();
+                data->offset = scrollOffset(data->widget);
+            }
+        break;
+
+    case FlickData::Pressed:
+        if (mouseEvent->type() == QEvent::MouseButtonRelease) {
+            consumed = true;
+            data->state = FlickData::Steady;
+
+            QMouseEvent *event1 = new QMouseEvent(QEvent::MouseButtonPress,
+                                                  data->pressPos, Qt::LeftButton,
+                                                  Qt::LeftButton, Qt::NoModifier);
+            QMouseEvent *event2 = new QMouseEvent(*mouseEvent);
+
+            data->ignored << event1;
+            data->ignored << event2;
+            QApplication::postEvent(object, event1);
+            QApplication::postEvent(object, event2);
+        }
+        if (mouseEvent->type() == QEvent::MouseMove) {
+            consumed = true;
+            data->state = FlickData::ManualScroll;
+            data->dragPos = QCursor::pos();
+            if (!d->ticker.isActive())
+                d->ticker.start(20, this);
+        }
+        break;
+
+    case FlickData::ManualScroll:
+        if (mouseEvent->type() == QEvent::MouseMove) {
+            consumed = true;
+            QPoint delta = mouseEvent->pos() - data->pressPos;
+            setScrollOffset(data->widget, data->offset - delta);
+        }
+        if (mouseEvent->type() == QEvent::MouseButtonRelease) {
+            consumed = true;
+            data->state = FlickData::AutoScroll;
+        }
+        break;
+
+    case FlickData::AutoScroll:
+        if (mouseEvent->type() == QEvent::MouseButtonPress) {
+            consumed = true;
+            data->state = FlickData::Stop;
+            data->speed = QPoint(0, 0);
+            data->pressPos = mouseEvent->pos();
+            data->offset = scrollOffset(data->widget);
+        }
+        if (mouseEvent->type() == QEvent::MouseButtonRelease) {
+            consumed = true;
+            data->state = FlickData::Steady;
+            data->speed = QPoint(0, 0);
+        }
+        break;
+
+    case FlickData::Stop:
+        if (mouseEvent->type() == QEvent::MouseButtonRelease) {
+            consumed = true;
+            data->state = FlickData::Steady;
+        }
+        if (mouseEvent->type() == QEvent::MouseMove) {
+            consumed = true;
+            data->state = FlickData::ManualScroll;
+            data->dragPos = QCursor::pos();
+            if (!d->ticker.isActive())
+                d->ticker.start(20, this);
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    return consumed;
+}
+
+void FlickCharm::timerEvent(QTimerEvent *event)
+{
+    int count = 0;
+    QHashIterator<QWidget*, FlickData*> item(d->flickData);
+    while (item.hasNext()) {
+        item.next();
+        FlickData *data = item.value();
+
+        if (data->state == FlickData::ManualScroll) {
+            count++;
+            data->speed = QCursor::pos() - data->dragPos;
+            data->dragPos = QCursor::pos();
+        }
+
+        if (data->state == FlickData::AutoScroll) {
+            count++;
+            data->speed = deaccelerate(data->speed);
+            QPoint p = scrollOffset(data->widget);
+            setScrollOffset(data->widget, p - data->speed);
+            if (data->speed == QPoint(0, 0))
+                data->state = FlickData::Steady;
+        }
+    }
+
+    if (!count)
+        d->ticker.stop();
+
+    QObject::timerEvent(event);
+}
diff --git a/demos/embedded/anomaly/src/flickcharm.h b/demos/embedded/anomaly/src/flickcharm.h
new file mode 100644
index 0000000000..3b3831f25e
--- /dev/null
+++ b/demos/embedded/anomaly/src/flickcharm.h
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Graphics Dojo project on Qt Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef FLICKCHARM_H
+#define FLICKCHARM_H
+
+#include <QObject>
+
+class FlickCharmPrivate;
+class QWidget;
+
+class FlickCharm: public QObject
+{
+    Q_OBJECT
+public:
+    FlickCharm(QObject *parent = 0);
+    ~FlickCharm();
+    void activateOn(QWidget *widget);
+    void deactivateFrom(QWidget *widget);
+    bool eventFilter(QObject *object, QEvent *event);
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+private:
+    FlickCharmPrivate *d;
+};
+
+#endif // FLICKCHARM_H
diff --git a/demos/embedded/anomaly/src/images/edit-find.png b/demos/embedded/anomaly/src/images/edit-find.png
new file mode 100644
index 0000000000..5594785d10
--- /dev/null
+++ b/demos/embedded/anomaly/src/images/edit-find.png
diff --git a/demos/embedded/anomaly/src/images/go-next.png b/demos/embedded/anomaly/src/images/go-next.png
new file mode 100644
index 0000000000..a68e2db775
--- /dev/null
+++ b/demos/embedded/anomaly/src/images/go-next.png
diff --git a/demos/embedded/anomaly/src/images/go-previous.png b/demos/embedded/anomaly/src/images/go-previous.png
new file mode 100644
index 0000000000..c37bc0414c
--- /dev/null
+++ b/demos/embedded/anomaly/src/images/go-previous.png
diff --git a/demos/embedded/anomaly/src/images/list-add.png b/demos/embedded/anomaly/src/images/list-add.png
new file mode 100644
index 0000000000..2acdd8f514
--- /dev/null
+++ b/demos/embedded/anomaly/src/images/list-add.png
diff --git a/demos/embedded/anomaly/src/images/list-remove.png b/demos/embedded/anomaly/src/images/list-remove.png
new file mode 100644
index 0000000000..c5524f7284
--- /dev/null
+++ b/demos/embedded/anomaly/src/images/list-remove.png
diff --git a/demos/embedded/desktopservices/contenttab.cpp b/demos/embedded/desktopservices/contenttab.cpp
new file mode 100644
index 0000000000..bdc5e0325c
--- /dev/null
+++ b/demos/embedded/desktopservices/contenttab.cpp
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// EXTERNAL INCLUDES
+#include <QKeyEvent>
+#include <QMessageBox>
+#include <QListWidget>
+#include <QVBoxLayout>
+#include <QFileInfoList>
+#include <QListWidgetItem>
+
+// INTERNAL INCLUDES
+
+// CLASS HEADER
+#include "contenttab.h"
+
+
+// CONSTRUCTORS & DESTRUCTORS  
+ContentTab::ContentTab(QWidget *parent) : 
+    QListWidget(parent)
+{             
+    setDragEnabled(false);
+    setIconSize(QSize(45, 45));
+}
+        
+ContentTab::~ContentTab() 
+{
+}
+
+// NEW PUBLIC METHODS
+void ContentTab::init(const QDesktopServices::StandardLocation &location, 
+                      const QString &filter, 
+                      const QString &icon)
+{
+    setContentDir(location);
+    QStringList filterList;
+    filterList = filter.split(";");
+    m_ContentDir.setNameFilters(filterList); 
+    setIcon(icon);    
+    
+    connect(this, SIGNAL(itemClicked(QListWidgetItem *)),
+            this, SLOT(openItem(QListWidgetItem *)));            
+    
+    populateListWidget();
+}
+
+// NEW PROTECTED METHODS
+void ContentTab::setContentDir(const QDesktopServices::StandardLocation &location)
+{
+    m_ContentDir.setPath(QDesktopServices::storageLocation(location));
+}
+
+void ContentTab::setIcon(const QString &icon)
+{
+    m_Icon = QIcon(icon);
+}
+
+void ContentTab::populateListWidget()
+{
+    QFileInfoList fileList = m_ContentDir.entryInfoList(QDir::Files, QDir::Time);
+    foreach(QFileInfo item, fileList) {
+        new QListWidgetItem(m_Icon, itemName(item), this);
+    }   
+}
+
+QString ContentTab::itemName(const QFileInfo &item)
+{
+    return QString(item.baseName() + "." + item.completeSuffix());
+}
+
+QUrl ContentTab::itemUrl(QListWidgetItem *item)
+{
+    return QUrl("file:///" + m_ContentDir.absolutePath() + "/" + item->text());
+}
+
+void ContentTab::keyPressEvent(QKeyEvent *event)  
+{
+    switch(event->key()) {
+    case Qt::Key_Up:
+        if(currentRow() == 0) {
+            setCurrentRow(count()-1);
+        } else {
+            setCurrentRow(currentRow()-1);      
+        }
+        break;
+    case Qt::Key_Down:
+        if(currentRow() == (count()-1)) {
+            setCurrentRow(0);   
+        } else {
+            setCurrentRow(currentRow()+1);      
+        }
+        break;
+    case Qt::Key_Select:
+        openItem(currentItem());
+    default:
+        QListWidget::keyPressEvent(event);
+        break;
+    }
+}
+
+void ContentTab::handleErrorInOpen(QListWidgetItem *item)
+{
+    Q_UNUSED(item);    
+    QMessageBox::warning( this, tr("Operation Failed"), tr("Unkown error!"), QMessageBox::Close);
+}
+
+// NEW SLOTS
+void ContentTab::openItem(QListWidgetItem *item)
+{
+    bool ret = QDesktopServices::openUrl(itemUrl(item));
+    if(!ret)
+        handleErrorInOpen(item);
+}
+
+
+// End of File
diff --git a/demos/embedded/desktopservices/contenttab.h b/demos/embedded/desktopservices/contenttab.h
new file mode 100644
index 0000000000..8d37209e4a
--- /dev/null
+++ b/demos/embedded/desktopservices/contenttab.h
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CONTENTTAB_H_
+#define CONTENTTAB_H_
+
+// EXTERNAL INCLUDES
+#include <QDir>
+#include <QUrl>
+#include <QIcon>
+#include <QFileInfo>
+#include <QListWidget>
+#include <QDesktopServices>
+
+// INTERNAL INCLUDES
+
+// FORWARD DECLARATIONS
+QT_BEGIN_NAMESPACE
+class QListWidgetItem;
+QT_END_NAMESPACE
+
+// CLASS DECLARATION
+
+/**
+* ContentTab class.
+* 
+* This class implements general purpose tab for media files.
+*/
+class ContentTab : public QListWidget
+{
+    Q_OBJECT
+
+public:         // Constructors & Destructors          
+    ContentTab(QWidget *parent);
+    virtual ~ContentTab();
+    
+public:         // New Methods
+    virtual void init(const QDesktopServices::StandardLocation &location, 
+                      const QString &filter, 
+                      const QString &icon);    
+    
+protected:      // New Methods
+    virtual void setContentDir(const QDesktopServices::StandardLocation &location);
+    virtual void setIcon(const QString &icon);    
+    virtual void populateListWidget();
+    virtual QString itemName(const QFileInfo &item);
+    virtual QUrl itemUrl(QListWidgetItem *item);
+    virtual void handleErrorInOpen(QListWidgetItem *item);
+protected:
+    void keyPressEvent(QKeyEvent *event);   
+    
+public slots:   // New Slots
+    virtual void openItem(QListWidgetItem *item);  
+
+protected:     // Owned variables   
+    QDir m_ContentDir;
+    QIcon m_Icon;
+};
+
+
+#endif // CONTENTTAB_H_    
+
+// End of File
diff --git a/demos/embedded/desktopservices/data/Explosion.wav b/demos/embedded/desktopservices/data/Explosion.wav
new file mode 100644
index 0000000000..7b140b1c69
--- /dev/null
+++ b/demos/embedded/desktopservices/data/Explosion.wav
diff --git a/demos/embedded/desktopservices/data/designer.png b/demos/embedded/desktopservices/data/designer.png
new file mode 100644
index 0000000000..0988fcee3f
--- /dev/null
+++ b/demos/embedded/desktopservices/data/designer.png
diff --git a/demos/embedded/desktopservices/data/monkey_on_64x64.png b/demos/embedded/desktopservices/data/monkey_on_64x64.png
new file mode 100644
index 0000000000..990f604d98
--- /dev/null
+++ b/demos/embedded/desktopservices/data/monkey_on_64x64.png
diff --git a/demos/embedded/desktopservices/data/sax.mp3 b/demos/embedded/desktopservices/data/sax.mp3
new file mode 100644
index 0000000000..0a078b10ca
--- /dev/null
+++ b/demos/embedded/desktopservices/data/sax.mp3
diff --git a/demos/embedded/desktopservices/desktopservices.pro b/demos/embedded/desktopservices/desktopservices.pro
new file mode 100644
index 0000000000..32cb6d9b09
--- /dev/null
+++ b/demos/embedded/desktopservices/desktopservices.pro
@@ -0,0 +1,23 @@
+TEMPLATE = app
+TARGET = 
+INCLUDEPATH += .
+
+HEADERS += desktopwidget.h contenttab.h linktab.h
+SOURCES += desktopwidget.cpp contenttab.cpp linktab.cpp main.cpp
+
+RESOURCES += desktopservices.qrc
+
+music.sources = data/*.mp3 data/*.wav
+music.path = /data/sounds/
+
+image.sources = data/*.png
+image.path = /data/images/
+
+DEPLOYMENT += music image
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
+symbian {
+    TARGET.UID3 = 0xA000C611 
+    ICON = ./resources/heart.svg
+}
diff --git a/demos/embedded/desktopservices/desktopservices.qrc b/demos/embedded/desktopservices/desktopservices.qrc
new file mode 100644
index 0000000000..d36205dec4
--- /dev/null
+++ b/demos/embedded/desktopservices/desktopservices.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">  
+    <file>resources/music.png</file>    
+    <file>resources/photo.png</file>    
+    <file>resources/browser.png</file>  
+    <file>resources/message.png</file>                          
+</qresource>
+</RCC>
diff --git a/demos/embedded/desktopservices/desktopwidget.cpp b/demos/embedded/desktopservices/desktopwidget.cpp
new file mode 100644
index 0000000000..3abe591af2
--- /dev/null
+++ b/demos/embedded/desktopservices/desktopwidget.cpp
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// EXTERNAL INCLUDES
+#include <QTabWidget>
+#include <QVBoxLayout>
+#include <QDesktopServices>
+
+// INTERNAL INCLUDES
+#include "linktab.h"
+#include "contenttab.h"
+
+// CLASS HEADER
+#include "desktopwidget.h"
+
+// CONSTRUCTORS & DESTRUCTORS  
+DesktopWidget::DesktopWidget(QWidget *parent) : QWidget(parent)
+    
+{
+    QTabWidget *tabWidget = new QTabWidget(this);
+
+    // Images
+    ContentTab* imageTab = new ContentTab(tabWidget);
+    imageTab->init(QDesktopServices::PicturesLocation, 
+                   "*.png;*.jpg;*.jpeg;*.bmp;*.gif",
+                   ":/resources/photo.png");
+    tabWidget->addTab(imageTab, tr("Images")); 
+    
+    // Music
+    ContentTab* musicTab = new ContentTab(tabWidget);     
+    musicTab->init(QDesktopServices::MusicLocation, 
+                   "*.wav;*.mp3;*.mp4",        
+                   ":/resources/music.png");        
+    tabWidget->addTab(musicTab, tr("Music"));       
+    
+    // Links
+    LinkTab* othersTab = new LinkTab(tabWidget);;   
+    // Given icon file will be overriden by LinkTab
+    othersTab->init(QDesktopServices::PicturesLocation, "", "");    
+    tabWidget->addTab(othersTab, tr("Links"));       
+    
+    // Layout
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(tabWidget);
+    setLayout(layout);     
+}
+      
+DesktopWidget::~DesktopWidget()
+{
+}
+    
+// End of file
diff --git a/demos/embedded/desktopservices/desktopwidget.h b/demos/embedded/desktopservices/desktopwidget.h
new file mode 100644
index 0000000000..246ab18584
--- /dev/null
+++ b/demos/embedded/desktopservices/desktopwidget.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DESKTOPWIDGET_H_
+#define DESKTOPWIDGET_H_
+
+// EXTERNAL INCLUDES
+#include <QWidget>
+
+// INTERNAL INCLUDES
+
+// FORWARD DECLARATIONS
+QT_BEGIN_NAMESPACE
+class QTabWidget;
+QT_END_NAMESPACE
+
+// CLASS DECLARATION
+/**
+* DesktopWidget class.
+* 
+* Implements the main top level widget for QDesktopServices demo app.
+*/
+class DesktopWidget : public QWidget
+{
+    Q_OBJECT        
+        
+public:        // Constructors & Destructors  
+    DesktopWidget(QWidget *parent);
+    ~DesktopWidget();
+   
+};
+    
+#endif // DESKTOPWIDGET_H_    
+    
+// End of file
diff --git a/demos/embedded/desktopservices/linktab.cpp b/demos/embedded/desktopservices/linktab.cpp
new file mode 100644
index 0000000000..32411fe6ad
--- /dev/null
+++ b/demos/embedded/desktopservices/linktab.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// EXTERNAL INCLUDES
+#include <QUrl>
+#include <QMessageBox>
+#include <QListWidgetItem>
+
+// INTERNAL INCLUDES
+
+// CLASS HEADER
+#include "linktab.h"
+
+LinkTab::LinkTab(QWidget *parent) :
+    ContentTab(parent)
+{
+}
+
+LinkTab::~LinkTab()
+{
+}
+
+void LinkTab::populateListWidget()
+{
+    m_WebItem = new QListWidgetItem(QIcon(":/resources/browser.png"), tr("Launch Browser"), this);
+    m_MailToItem = new QListWidgetItem(QIcon(":/resources/message.png"), tr("New e-mail"), this);
+}
+
+QUrl LinkTab::itemUrl(QListWidgetItem *item)
+{
+    if(m_WebItem == item) {
+        return QUrl(tr("http://www.qtsoftware.com"));
+    } else if(m_MailToItem == item) {
+        return QUrl(tr("mailto:qts60-feedback@trolltech.com?subject=QtS60 feedback&body=Hello"));
+    } else {
+        // We should never endup here
+        Q_ASSERT(false);
+        return QUrl();
+    }
+}
+void LinkTab::handleErrorInOpen(QListWidgetItem *item)
+{
+    if(m_MailToItem == item) {
+        QMessageBox::warning( this, tr("Operation Failed"), tr("Please check that you have\ne-mail account defined."), QMessageBox::Close);
+    } else {
+        ContentTab::handleErrorInOpen(item);
+    }
+}
+
+// End of file
diff --git a/demos/embedded/desktopservices/linktab.h b/demos/embedded/desktopservices/linktab.h
new file mode 100644
index 0000000000..a9c986804c
--- /dev/null
+++ b/demos/embedded/desktopservices/linktab.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef LINKTAB_H_
+#define LINKTAB_H_
+
+// EXTERNAL INCLUDES
+
+// INTERNAL INCLUDES
+#include "contenttab.h"
+
+// FORWARD DECLARATIONS
+QT_BEGIN_NAMESPACE
+class QWidget;
+class QListWidgetItem;
+QT_END_NAMESPACE
+
+// CLASS DECLARATION
+
+/**
+* LinkTab class.
+* 
+* This class implements tab for opening http and mailto links.
+*/
+class LinkTab : public ContentTab
+{
+    Q_OBJECT
+    
+public:     // Constructors & Destructors   
+    LinkTab(QWidget *parent);
+    ~LinkTab();    
+    
+protected:  // Derived Methods  
+    virtual void populateListWidget();
+    virtual QUrl itemUrl(QListWidgetItem *item);    
+    virtual void handleErrorInOpen(QListWidgetItem *item);
+    
+private:    // Used variables  
+    QListWidgetItem *m_WebItem;
+    QListWidgetItem *m_MailToItem; 
+    
+private:    // Owned variables      
+    
+};
+
+#endif // CONTENTTAB_H_    
+    
+// End of File
diff --git a/demos/embedded/desktopservices/main.cpp b/demos/embedded/desktopservices/main.cpp
new file mode 100644
index 0000000000..ebbcf6312d
--- /dev/null
+++ b/demos/embedded/desktopservices/main.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "desktopwidget.h"
+
+int main(int argc, char *argv[])
+{
+    Q_INIT_RESOURCE(desktopservices);
+
+    QApplication app(argc, argv);
+    DesktopWidget* myWidget = new DesktopWidget(0);
+    myWidget->showMaximized(); 
+    
+    return app.exec();
+}
+
+// End of file
diff --git a/demos/embedded/desktopservices/resources/browser.png b/demos/embedded/desktopservices/resources/browser.png
new file mode 100644
index 0000000000..28561e13f1
--- /dev/null
+++ b/demos/embedded/desktopservices/resources/browser.png
diff --git a/demos/embedded/desktopservices/resources/heart.svg b/demos/embedded/desktopservices/resources/heart.svg
new file mode 100644
index 0000000000..ba5f050b00
--- /dev/null
+++ b/demos/embedded/desktopservices/resources/heart.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) --><svg viewBox="100 200 550 500" height="595.27559pt" id="svg1" inkscape:version="0.40+cvs" sodipodi:docbase="C:\Documents and Settings\Jon Phillips\My Documents\projects\clipart-project\submissions" sodipodi:docname="heart-left-highlight.svg" sodipodi:version="0.32" width="595.27559pt" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+<metadata>
+<rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<cc:Work rdf:about="">
+<dc:title>Heart Left-Highlight</dc:title>
+<dc:description>This is a normal valentines day heart.</dc:description>
+<dc:subject>
+<rdf:Bag>
+<rdf:li>holiday</rdf:li>
+<rdf:li>valentines</rdf:li>
+<rdf:li></rdf:li>
+<rdf:li>valentine</rdf:li>
+<rdf:li>hash(0x8a091c0)</rdf:li>
+<rdf:li>hash(0x8a0916c)</rdf:li>
+<rdf:li>signs_and_symbols</rdf:li>
+<rdf:li>hash(0x8a091f0)</rdf:li>
+<rdf:li>day</rdf:li>
+</rdf:Bag>
+</dc:subject>
+<dc:publisher>
+<cc:Agent rdf:about="http://www.openclipart.org">
+<dc:title>Jon Phillips</dc:title>
+</cc:Agent>
+</dc:publisher>
+<dc:creator>
+<cc:Agent>
+<dc:title>Jon Phillips</dc:title>
+</cc:Agent>
+</dc:creator>
+<dc:rights>
+<cc:Agent>
+<dc:title>Jon Phillips</dc:title>
+</cc:Agent>
+</dc:rights>
+<dc:date></dc:date>
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+<dc:language>en</dc:language>
+</cc:Work>
+<cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+<cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+<cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+<cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+</cc:License>
+</rdf:RDF>
+</metadata>
+<defs id="defs3"/>
+<sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="layer1" inkscape:cx="549.40674" inkscape:cy="596.00159" inkscape:document-units="px" inkscape:guide-bbox="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="615" inkscape:window-width="866" inkscape:window-x="88" inkscape:window-y="116" inkscape:zoom="0.35000000" pagecolor="#ffffff" showguides="true"/>
+<g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1">
+<path d="M 263.41570,235.14588 C 197.17570,235.14588 143.41575,288.90587 143.41575,355.14588 C 143.41575,489.90139 279.34890,525.23318 371.97820,658.45392 C 459.55244,526.05056 600.54070,485.59932 600.54070,355.14588 C 600.54070,288.90588 546.78080,235.14587 480.54070,235.14588 C 432.49280,235.14588 391.13910,263.51631 371.97820,304.33338 C 352.81740,263.51630 311.46370,235.14587 263.41570,235.14588 z " id="path7" sodipodi:nodetypes="ccccccc" style="fill:#e60000;fill-opacity:1.0000000;stroke:#000000;stroke-width:18.700001;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"/>
+<path d="M 265.00000,253.59375 C 207.04033,253.59375 160.00000,300.63407 160.00000,358.59375 C 160.00000,476.50415 278.91857,507.43251 359.96875,624.00000 C 366.52868,614.08205 220.00000,478.47309 220.00000,378.59375 C 220.00000,320.63407 267.04033,273.59375 325.00000,273.59375 C 325.50453,273.59375 325.99718,273.64912 326.50000,273.65625 C 309.22436,261.07286 288.00557,253.59374 265.00000,253.59375 z " id="path220" sodipodi:nodetypes="ccccccc" style="fill:#e6e6e6;fill-opacity:0.64556962;stroke:none;stroke-width:18.700001;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"/>
+</g>
+</svg>
diff --git a/demos/embedded/desktopservices/resources/message.png b/demos/embedded/desktopservices/resources/message.png
new file mode 100644
index 0000000000..e30052bfce
--- /dev/null
+++ b/demos/embedded/desktopservices/resources/message.png
diff --git a/demos/embedded/desktopservices/resources/music.png b/demos/embedded/desktopservices/resources/music.png
new file mode 100644
index 0000000000..11a57bbcd7
--- /dev/null
+++ b/demos/embedded/desktopservices/resources/music.png
diff --git a/demos/embedded/desktopservices/resources/photo.png b/demos/embedded/desktopservices/resources/photo.png
new file mode 100644
index 0000000000..5ba15c18cd
--- /dev/null
+++ b/demos/embedded/desktopservices/resources/photo.png
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro
index 4fd8f9f54d..469e5432d6 100644
--- a/demos/embedded/embedded.pro
+++ b/demos/embedded/embedded.pro
@@ -2,13 +2,19 @@ TEMPLATE  = subdirs
 SUBDIRS   = styledemo
 
 contains(QT_CONFIG, svg) {
-    SUBDIRS += embeddedsvgviewer
-    # no QProcess
+    SUBDIRS += embeddedsvgviewer \
+               desktopservices
     !vxworks:!qnx:SUBDIRS += fluidlauncher
 }
 
+contains(QT_CONFIG, webkit) {
+    SUBDIRS += anomaly
+}
+
 # install
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_DEMOS]/embedded
 INSTALLS += sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
index 2393c4eaeb..0359b139bb 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
@@ -143,7 +143,7 @@ void EmbeddedSvgViewer::updateImageScale()
 }
 
 
-void EmbeddedSvgViewer::resizeEvent ( QResizeEvent * event )
+void EmbeddedSvgViewer::resizeEvent ( QResizeEvent * /* event */ )
 {
     qreal origZoom = m_zoomLevel;
 
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
index 505e6078ca..51a04e7c5d 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -11,6 +11,11 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.svg files
 sources.path = $$[QT_INSTALL_DEMOS]/embedded/embeddedsvgviewer
 INSTALLS += target sources 
 
-wince*: {
+wince* {
    DEPLOYMENT_PLUGIN += qsvg
 }
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
+symbian:TARGET.UID3 = 0xA000A640
+
diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
new file mode 100644
index 0000000000..f6bac67b26
--- /dev/null
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<demolauncher>
+  <demos>
+    <example filename="embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer_s60.png" args="/data/images/qt/demos/embeddedsvgviewer/shapes.svg"/>
+    <example filename="styledemo" name="Stylesheets" image="screenshots/styledemo_s60.png"/>
+    <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
+    <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
+    <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly_s60.png" args="-small-screen"/>
+    <example filename="ftp" name="Ftp Client" image="screenshots/ftp_s60.png"/>
+    <example filename="context2d" name="Context2d" image="screenshots/context2d_s60.png"/>
+    <example filename="saxbookmarks" name="SaxBookmarks" image="screenshots/saxbookmarks_s60.png"/>
+    <example filename="desktopservices" name="Desktop Services" image="screenshots/desktopservices_s60.png"/>
+    <example filename="fridgemagnets" name="Fridge Magnets" image="screenshots/fridgemagnets_s60.png" args="-small-screen"/>
+    <example filename="drilldown" name="Drilldown" image="screenshots/drilldown_s60.png"/>
+    <example filename="softkeys" name="Softkeys" image="screenshots/softkeys_s60.png"/>
+    <example filename="anomaly" name="Anomaly Browser" image="screenshots/anomaly_s60.png"/>    
+  </demos>
+  <slideshow timeout="60000" interval="10000">
+    <imagedir dir="slides"/>
+  </slideshow>
+</demolauncher>
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.cpp b/demos/embedded/fluidlauncher/fluidlauncher.cpp
index 7035fb74e6..c9cb1704df 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.cpp
+++ b/demos/embedded/fluidlauncher/fluidlauncher.cpp
@@ -39,12 +39,14 @@
 **
 ****************************************************************************/
 
-#include <QtXml>
+#include <QXmlStreamReader>
 
 #include "fluidlauncher.h"
 
 
 #define DEFAULT_INPUT_TIMEOUT 10000
+#define SIZING_FACTOR_HEIGHT 6/10
+#define SIZING_FACTOR_WIDTH 6/10
 
 FluidLauncher::FluidLauncher(QStringList* args)
 {
@@ -62,7 +64,11 @@ FluidLauncher::FluidLauncher(QStringList* args)
     inputTimer->setSingleShot(true);
     inputTimer->setInterval(DEFAULT_INPUT_TIMEOUT);
 
-    pictureFlowWidget->setSlideSize(QSize( (screen_size.width()*2)/5, (screen_size.height()*2)/5 ));
+    const int h = screen_size.height() * SIZING_FACTOR_HEIGHT;
+    const int w = screen_size.width() * SIZING_FACTOR_WIDTH;
+    const int hh = qMin(h, w);
+    const int ww = hh / 3 * 2;
+    pictureFlowWidget->setSlideSize(QSize(ww, hh));
 
     bool success;
     int configIndex = args->indexOf("-config");
@@ -100,61 +106,97 @@ bool FluidLauncher::loadConfig(QString configPath)
 
     slideShowWidget->clearImages();
 
-    QDomDocument xmlDoc;
-    xmlDoc.setContent(&xmlFile, true);
+    xmlFile.open(QIODevice::ReadOnly);
+    QXmlStreamReader reader(&xmlFile);
+    while (!reader.atEnd()) {
+        reader.readNext();
 
-    QDomElement rootElement = xmlDoc.documentElement();
-
-    // Process the demos node:
-    QDomNodeList demoNodes = rootElement.firstChildElement("demos").elementsByTagName("example");
-    for (int i=0; i<demoNodes.size(); i++) {
-        QDomElement element = demoNodes.item(i).toElement();
-
-        if (element.hasAttribute("filename")) {
-            DemoApplication* newDemo = new DemoApplication( 
-                                                     element.attribute("filename"), 
-                                                     element.attribute("name", "Unamed Demo"),
-                                                     element.attribute("image"),
-                                                     element.attribute("args").split(" "));
-            demoList.append(newDemo);
+        if (reader.isStartElement()) {
+            if (reader.name() == "demos")
+                parseDemos(reader);
+            else if(reader.name() == "slideshow")
+                parseSlideshow(reader);
         }
     }
 
+    if (reader.hasError()) {
+       qDebug() << QString("Error parsing %1 on line %2 column %3: \n%4")
+                .arg(configPath)
+                .arg(reader.lineNumber())
+                .arg(reader.columnNumber())
+                .arg(reader.errorString());
+    }
 
-    // Process the slideshow node:
-    QDomElement slideshowElement = rootElement.firstChildElement("slideshow");
+    // Append an exit Item
+    DemoApplication* exitItem = new DemoApplication(QString(), QLatin1String("Exit Embedded Demo"), QString(), QStringList());
+    demoList.append(exitItem);
 
-    if (slideshowElement.hasAttribute("timeout")) {
-          bool valid;
-          int timeout = slideshowElement.attribute("timeout").toInt(&valid);
-          if (valid)
-            inputTimer->setInterval(timeout);
-    }
+    return true;
+}
 
-    if (slideshowElement.hasAttribute("interval")) {
-          bool valid;
-          int interval = slideshowElement.attribute("interval").toInt(&valid);
-          if (valid)
-            slideShowWidget->setSlideInterval(interval);
+
+void FluidLauncher::parseDemos(QXmlStreamReader& reader)
+{
+    while (!reader.atEnd()) {
+        reader.readNext();
+        if (reader.isStartElement() && reader.name() == "example") {
+            QXmlStreamAttributes attrs = reader.attributes();
+            QStringRef filename = attrs.value("filename");
+            if (!filename.isEmpty()) {
+                QStringRef name = attrs.value("name");
+                QStringRef image = attrs.value("image");
+                QStringRef args = attrs.value("args");
+
+                DemoApplication* newDemo = new DemoApplication(
+                        filename.toString(),
+                        name.isEmpty() ? "Unamed Demo" : name.toString(),
+                        image.toString(),
+                        args.toString().split(" "));
+                demoList.append(newDemo);
+            }
+        } else if(reader.isEndElement() && reader.name() == "demos") {
+            return;
+        }
     }
+}
 
-    for (QDomNode node=slideshowElement.firstChild(); !node.isNull(); node=node.nextSibling()) {
-        QDomElement element = node.toElement();
+void FluidLauncher::parseSlideshow(QXmlStreamReader& reader)
+{
+    QXmlStreamAttributes attrs = reader.attributes();
+
+    QStringRef timeout = attrs.value("timeout");
+    bool valid;
+    if (!timeout.isEmpty()) {
+        int t = timeout.toString().toInt(&valid);
+        if (valid)
+            inputTimer->setInterval(t);
+    }
 
-        if (element.tagName() == "imagedir")
-            slideShowWidget->addImageDir(element.attribute("dir"));
-        else if (element.tagName() == "image")
-            slideShowWidget->addImage(element.attribute("image"));
+    QStringRef interval = attrs.value("interval");
+    if (!interval.isEmpty()) {
+        int i = interval.toString().toInt(&valid);
+        if (valid)
+            slideShowWidget->setSlideInterval(i);
     }
 
-    // Append an exit Item
-    DemoApplication* exitItem = new DemoApplication(QString(), QLatin1String("Exit Embedded Demo"), QString(), QStringList());
-    demoList.append(exitItem);
+    while (!reader.atEnd()) {
+        reader.readNext();
+        if (reader.isStartElement()) {
+            QXmlStreamAttributes attrs = reader.attributes();
+            if (reader.name() == "imagedir") {
+                QStringRef dir = attrs.value("dir");
+                slideShowWidget->addImageDir(dir.toString());
+            } else if(reader.name() == "image") {
+                QStringRef image = attrs.value("image");
+                slideShowWidget->addImage(image.toString());
+            }
+        } else if(reader.isEndElement() && reader.name() == "slideshow") {
+            return;
+        }
+    }
 
-    return true;
 }
 
-
 void FluidLauncher::populatePictureFlow()
 {
     pictureFlowWidget->setSlideCount(demoList.count());
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.h b/demos/embedded/fluidlauncher/fluidlauncher.h
index 1167aefcf9..5adc662eae 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.h
+++ b/demos/embedded/fluidlauncher/fluidlauncher.h
@@ -44,6 +44,7 @@
 
 #include <QtGui>
 #include <QTimer>
+#include <QStringRef>
 
 #include "pictureflow.h"
 #include "slideshow.h"
@@ -73,7 +74,8 @@ private:
     bool loadConfig(QString configPath);
     void populatePictureFlow();
     void switchToSlideshow();
-
+    void parseDemos(QXmlStreamReader& reader);
+    void parseSlideshow(QXmlStreamReader& reader);
 
 };
 
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index 76d12adf84..0d83945e2a 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -2,7 +2,6 @@ TEMPLATE = app
 TARGET = 
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += xml
 
 # Input
 HEADERS += \
@@ -40,7 +39,8 @@ wince*{
         $$QT_BUILD_TREE/demos/pathstroke/$${BUILD_DIR}/pathstroke.exe \
         $$QT_BUILD_TREE/examples/graphicsview/elasticnodes/$${BUILD_DIR}/elasticnodes.exe \
         $$QT_BUILD_TREE/examples/widgets/wiggly/$${BUILD_DIR}/wiggly.exe \
-        $$QT_BUILD_TREE/examples/painting/concentriccircles/$${BUILD_DIR}/concentriccircles.exe
+        $$QT_BUILD_TREE/examples/painting/concentriccircles/$${BUILD_DIR}/concentriccircles.exe \
+        $$QT_BUILD_TREE/examples/draganddrop/$${BUILD_DIR}/fridgemagnets.exe
 
     executables.path = .
 
@@ -54,3 +54,96 @@ wince*{
 
     DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg
 }
+
+symbian {                    
+    load(data_caging_paths)
+    
+    TARGET.UID3 = 0xA000A641
+
+    executables.sources = \
+        embeddedsvgviewer.exe \
+        styledemo.exe \
+        deform.exe \
+        pathstroke.exe \
+        wiggly.exe \
+        ftp.exe \
+        context2d.exe \
+        saxbookmarks.exe \
+        desktopservices.exe \
+        fridgemagnets.exe \
+        drilldown.exe \
+        softkeys.exe
+    contains(QT_CONFIG, webkit) {        
+        executables.sources += anomaly.exe
+        }
+
+    executables.path = /sys/bin
+
+    reg_resource.sources = \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/embeddedsvgviewer_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/styledemo_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/deform_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/pathstroke_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/ftp_reg.rsc\
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/drilldown_reg.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc
+    contains(QT_CONFIG, webkit) {        
+        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
+        }                
+
+    reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
+
+    resource.sources = \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/ftp.rsc\
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/drilldown.rsc \
+         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc
+    contains(QT_CONFIG, webkit) {        
+        resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
+        }           
+
+    resource.path = $$APP_RESOURCE_DIR
+
+    mifs.sources = \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C611.mif
+    mifs.path = $$APP_RESOURCE_DIR
+
+    files.sources = $$PWD/screenshots $$PWD/slides
+    files.path = .
+
+    config.sources = $$PWD/config_s60/config.xml
+    config.path = .
+
+    viewerimages.sources = $$PWD/../embeddedsvgviewer/shapes.svg
+    viewerimages.path = /data/images/qt/demos/embeddedsvgviewer
+
+    desktopservices_music.sources = \
+        $$PWD/../desktopservices/data/*.mp3 \
+        $$PWD/../desktopservices/data/*.wav
+    desktopservices_music.path = /data/sounds
+    
+    desktopservices_images.sources = $$PWD/../desktopservices/data/*.png
+    desktopservices_images.path = /data/images    
+
+    saxbookmarks.sources = $$PWD/../../../examples/xml/saxbookmarks/frank.xbel
+    saxbookmarks.sources += $$PWD/../../../examples/xml/saxbookmarks/jennifer.xbel
+    saxbookmarks.path = /data/qt/saxbookmarks
+
+    DEPLOYMENT += config files executables viewerimages saxbookmarks reg_resource resource \
+        mifs desktopservices_music desktopservices_images
+
+    TARGET.EPOCHEAPSIZE = 100000 20000000
+}
diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/demos/embedded/fluidlauncher/pictureflow.cpp
index c8b01aea4a..8be5cd375d 100644
--- a/demos/embedded/fluidlauncher/pictureflow.cpp
+++ b/demos/embedded/fluidlauncher/pictureflow.cpp
@@ -105,6 +105,14 @@
 
 #include <QDebug>
 
+static const int captionFontSize =
+#ifdef Q_WS_S60
+    8;
+#else
+    14;
+#endif
+
+
 // uncomment this to enable bilinear filtering for texture mapping
 // gives much better rendering, at the cost of memory space
 // #define PICTUREFLOW_BILINEAR_FILTER
@@ -739,14 +747,14 @@ void PictureFlowPrivate::render()
     QPainter painter;
     painter.begin(&buffer);
 
-    QFont font("Arial", 14);
+    QFont font("Arial", captionFontSize);
     font.setBold(true);
     painter.setFont(font);
     painter.setPen(Qt::white);
     //painter.setPen(QColor(255,255,255,127));
 
     if (!captions.isEmpty())
-        painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
+        painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/4),
         Qt::AlignCenter, captions[centerIndex]);
 
     painter.end();
@@ -789,18 +797,18 @@ void PictureFlowPrivate::render()
     QPainter painter;
     painter.begin(&buffer);
 
-    QFont font("Arial", 14);
+    QFont font("Arial", captionFontSize);
     font.setBold(true);
     painter.setFont(font);
 
     int leftTextIndex = (step>0) ? centerIndex : centerIndex-1;
 
     painter.setPen(QColor(255,255,255, (255-fade) ));
-    painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
+    painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/4),
                       Qt::AlignCenter, captions[leftTextIndex]);
 
     painter.setPen(QColor(255,255,255, fade));
-    painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
+    painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/4),
                       Qt::AlignCenter, captions[leftTextIndex+1]);
 
 
@@ -1265,6 +1273,12 @@ void PictureFlow::keyPressEvent(QKeyEvent* event)
     return;
   }
 
+  if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Select) {
+    emit itemActivated(d->getTarget());
+    event->accept();
+    return;
+  }
+
   event->ignore();
 }
 
diff --git a/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png b/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png
new file mode 100644
index 0000000000..b9a73fddb5
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/context2d_s60.png b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png
new file mode 100644
index 0000000000..a53f5b0e45
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png
new file mode 100644
index 0000000000..f4aa1a20b6
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png
new file mode 100644
index 0000000000..50376c10c7
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
new file mode 100644
index 0000000000..11459dc768
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
new file mode 100644
index 0000000000..56da9dc99d
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/ftp_s60.png b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png
new file mode 100644
index 0000000000..ea6a3219bf
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
new file mode 100644
index 0000000000..c451198b0b
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png b/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png
new file mode 100644
index 0000000000..03989fb5e4
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png
new file mode 100644
index 0000000000..bad96920c0
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png
new file mode 100644
index 0000000000..690ab48a5e
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png
diff --git a/demos/embedded/styledemo/files/application.qss b/demos/embedded/styledemo/files/application.qss
index a632ad1c86..432fe6bc76 100644
--- a/demos/embedded/styledemo/files/application.qss
+++ b/demos/embedded/styledemo/files/application.qss
@@ -6,7 +6,7 @@ QWidget#StyleWidget
 
 QLabel, QAbstractButton 
 {
-	font: 18px bold;
+	font: bold;
 	color: beige;
 }
 
diff --git a/demos/embedded/styledemo/files/blue.qss b/demos/embedded/styledemo/files/blue.qss
index aa87277f8d..ac8671b5e4 100644
--- a/demos/embedded/styledemo/files/blue.qss
+++ b/demos/embedded/styledemo/files/blue.qss
@@ -5,7 +5,7 @@
 
 QLabel, QAbstractButton 
 {
-    font: 10pt bold;
+    font: bold;
 	color: yellow;
 }
 
@@ -28,7 +28,6 @@ QAbstractButton
     border-style: solid;
     border-radius: 5;
     padding: 3px;
-	qproperty-focusPolicy: NoFocus;
 }
 
 QAbstractButton:pressed
diff --git a/demos/embedded/styledemo/files/khaki.qss b/demos/embedded/styledemo/files/khaki.qss
index 9c0f77caa5..b0d4a0fa6f 100644
--- a/demos/embedded/styledemo/files/khaki.qss
+++ b/demos/embedded/styledemo/files/khaki.qss
@@ -16,7 +16,6 @@ QPushButton, QToolButton {
     padding: 3px;
     /* min-width: 96px; */
     /* min-height: 48px; */
-	qproperty-focusPolicy: NoFocus
 }
 
 QPushButton:hover, QToolButton:hover {
@@ -30,7 +29,7 @@ QPushButton:pressed, QToolButton:pressed {
 }
 
 QLabel, QAbstractButton {
-    font: italic 11pt "Times New Roman";
+    font: italic "Times New Roman";
 }
 
 QFrame, QLabel#title {
diff --git a/demos/embedded/styledemo/files/transparent.qss b/demos/embedded/styledemo/files/transparent.qss
index e3a991265c..b38eb366f4 100644
--- a/demos/embedded/styledemo/files/transparent.qss
+++ b/demos/embedded/styledemo/files/transparent.qss
@@ -6,7 +6,6 @@ QWidget#StyleWidget
 
 QLabel, QAbstractButton 
 {
-	font: 13pt;
 	color: beige;
 }
 
diff --git a/demos/embedded/styledemo/styledemo.pro b/demos/embedded/styledemo/styledemo.pro
index ee5e4d6cc2..e0ef202526 100644
--- a/demos/embedded/styledemo/styledemo.pro
+++ b/demos/embedded/styledemo/styledemo.pro
@@ -10,3 +10,7 @@ target.path = $$[QT_INSTALL_DEMOS]/embedded/styledemo
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html
 sources.path = $$[QT_INSTALL_DEMOS]/embedded/styledemo
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
+symbian:TARGET.UID3 = 0xA000A63F
diff --git a/demos/embedded/styledemo/stylewidget.ui b/demos/embedded/styledemo/stylewidget.ui
index 586faeac42..9c5f253dfc 100644
--- a/demos/embedded/styledemo/stylewidget.ui
+++ b/demos/embedded/styledemo/stylewidget.ui
@@ -5,16 +5,19 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>339</width>
-    <height>230</height>
+    <width>172</width>
+    <height>220</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" >
+   <property name="spacing" >
+    <number>4</number>
+   </property>
    <property name="margin" >
-    <number>3</number>
+    <number>4</number>
    </property>
    <item>
     <widget class="QGroupBox" name="groupBox" >
@@ -27,15 +30,15 @@
      <property name="title" >
       <string>Styles</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="spacing" >
-       <number>3</number>
-      </property>
+     <layout class="QGridLayout" name="gridLayout_2" >
       <property name="margin" >
-       <number>3</number>
+       <number>4</number>
       </property>
-      <item>
-       <widget class="QPushButton" name="noStyle" >
+      <property name="spacing" >
+       <number>4</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QPushButton" name="transparentStyle" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
           <horstretch>0</horstretch>
@@ -43,23 +46,23 @@
          </sizepolicy>
         </property>
         <property name="focusPolicy" >
-         <enum>Qt::NoFocus</enum>
+         <enum>Qt::StrongFocus</enum>
         </property>
         <property name="text" >
-         <string>No-Style</string>
+         <string>Transp.</string>
         </property>
         <property name="checkable" >
          <bool>true</bool>
         </property>
         <property name="checked" >
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
         <property name="autoExclusive" >
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0" >
        <widget class="QPushButton" name="blueStyle" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
@@ -68,7 +71,7 @@
          </sizepolicy>
         </property>
         <property name="focusPolicy" >
-         <enum>Qt::NoFocus</enum>
+         <enum>Qt::StrongFocus</enum>
         </property>
         <property name="text" >
          <string>Blue</string>
@@ -84,7 +87,7 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1" >
        <widget class="QPushButton" name="khakiStyle" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
@@ -93,7 +96,7 @@
          </sizepolicy>
         </property>
         <property name="focusPolicy" >
-         <enum>Qt::NoFocus</enum>
+         <enum>Qt::StrongFocus</enum>
         </property>
         <property name="text" >
          <string>Khaki</string>
@@ -109,8 +112,8 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QPushButton" name="transparentStyle" >
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="noStyle" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
           <horstretch>0</horstretch>
@@ -118,16 +121,16 @@
          </sizepolicy>
         </property>
         <property name="focusPolicy" >
-         <enum>Qt::NoFocus</enum>
+         <enum>Qt::StrongFocus</enum>
         </property>
         <property name="text" >
-         <string>Transparent</string>
+         <string>None</string>
         </property>
         <property name="checkable" >
          <bool>true</bool>
         </property>
         <property name="checked" >
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="autoExclusive" >
          <bool>true</bool>
@@ -166,7 +169,7 @@
      </property>
      <layout class="QVBoxLayout" name="frameLayout" >
       <property name="margin" >
-       <number>3</number>
+       <number>0</number>
       </property>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout" >
@@ -195,7 +198,7 @@
            </sizepolicy>
           </property>
           <property name="focusPolicy" >
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::WheelFocus</enum>
           </property>
           <property name="alignment" >
            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -209,6 +212,9 @@
       </item>
       <item>
        <layout class="QGridLayout" name="gridLayout" >
+        <property name="spacing" >
+         <number>4</number>
+        </property>
         <item row="0" column="0" >
          <widget class="QScrollBar" name="horizontalScrollBar" >
           <property name="sizePolicy" >
@@ -237,10 +243,10 @@
            </sizepolicy>
           </property>
           <property name="focusPolicy" >
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::StrongFocus</enum>
           </property>
           <property name="text" >
-           <string>Show Scroller</string>
+           <string>Show</string>
           </property>
           <property name="checkable" >
            <bool>true</bool>
@@ -275,10 +281,10 @@
            </sizepolicy>
           </property>
           <property name="focusPolicy" >
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::StrongFocus</enum>
           </property>
           <property name="text" >
-           <string>Enable Scroller</string>
+           <string>Enable</string>
           </property>
           <property name="checkable" >
            <bool>true</bool>
@@ -330,7 +336,7 @@
      <item>
       <widget class="QPushButton" name="close" >
        <property name="focusPolicy" >
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::StrongFocus</enum>
        </property>
        <property name="text" >
         <string>Close</string>
diff --git a/demos/embeddeddialogs/embeddeddialogs.pro b/demos/embeddeddialogs/embeddeddialogs.pro
index a38e3e8f9f..d9948a939b 100644
--- a/demos/embeddeddialogs/embeddeddialogs.pro
+++ b/demos/embeddeddialogs/embeddeddialogs.pro
@@ -15,3 +15,5 @@ target.path = $$[QT_INSTALL_DEMOS]/embeddeddialogs
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.png *.jpg *.plist *.icns *.ico *.rc *.pro *.html *.doc images
 sources.path = $$[QT_INSTALL_DEMOS]/embeddeddialogs
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
diff --git a/demos/gradients/gradients.pro b/demos/gradients/gradients.pro
index 167572bd4c..77898961ae 100644
--- a/demos/gradients/gradients.pro
+++ b/demos/gradients/gradients.pro
@@ -16,3 +16,5 @@ target.path = $$[QT_INSTALL_DEMOS]/gradients
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
 sources.path = $$[QT_INSTALL_DEMOS]/gradients
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
diff --git a/demos/interview/interview.pro b/demos/interview/interview.pro
index c013755205..19b2ca81dc 100644
--- a/demos/interview/interview.pro
+++ b/demos/interview/interview.pro
@@ -16,3 +16,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images
 sources.path = $$[QT_INSTALL_DEMOS]/interview
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
diff --git a/demos/macmainwindow/macmainwindow.pro b/demos/macmainwindow/macmainwindow.pro
index f5165a79c4..cab38455c7 100644
--- a/demos/macmainwindow/macmainwindow.pro
+++ b/demos/macmainwindow/macmainwindow.pro
@@ -20,4 +20,6 @@ target.path = $$[QT_INSTALL_DEMOS]/macmainwindow
 sources.files = $$SOURCES  *.pro *.html
 sources.path = $$[QT_INSTALL_DEMOS]/macmainwindow
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
 }
diff --git a/demos/mainwindow/mainwindow.pro b/demos/mainwindow/mainwindow.pro
index 9853a55a47..6e7d784e3b 100644
--- a/demos/mainwindow/mainwindow.pro
+++ b/demos/mainwindow/mainwindow.pro
@@ -14,3 +14,5 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro
 sources.path = $$[QT_INSTALL_DEMOS]/mainwindow
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/mediaplayer/mediaplayer.pro
index c64abd9b0d..ef07a3f6e1 100644
--- a/demos/mediaplayer/mediaplayer.pro
+++ b/demos/mediaplayer/mediaplayer.pro
@@ -25,4 +25,6 @@ wince*{
 DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout
 }
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
 
+symbian:TARGET.UID3 = 0xA000C613
\ No newline at end of file
diff --git a/demos/pathstroke/pathstroke.pro b/demos/pathstroke/pathstroke.pro
index 50b4de2496..ce6ab3d8b8 100644
--- a/demos/pathstroke/pathstroke.pro
+++ b/demos/pathstroke/pathstroke.pro
@@ -18,3 +18,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
 sources.path = $$[QT_INSTALL_DEMOS]/pathstroke
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
+symbian:TARGET.UID3 = 0xA000A63E
\ No newline at end of file
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro
index 163ed17f66..6d3cf7d9d8 100644
--- a/demos/qtdemo/qtdemo.pro
+++ b/demos/qtdemo/qtdemo.pro
@@ -6,6 +6,8 @@ DESTDIR = $$DEMO_DESTDIR/bin
 OBJECTS_DIR = .obj
 MOC_DIR = .moc
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
 QT += xml network
 
 contains(QT_CONFIG, opengl) {
diff --git a/demos/shared/shared.pri b/demos/shared/shared.pri
index b5515950a0..1541fa7248 100644
--- a/demos/shared/shared.pri
+++ b/demos/shared/shared.pri
@@ -16,5 +16,6 @@ contains(CONFIG, debug_and_release_target) {
 
 hpux-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
 hpuxi-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
-!hpuxi-acc*:!hpux-acc*:LIBS += -ldemo_shared
+symbian:LIBS += -ldemo_shared.lib
+!hpuxi-acc*:!hpux-acc*:!symbian:LIBS += -ldemo_shared
 
diff --git a/demos/shared/shared.pro b/demos/shared/shared.pro
index cabce25d1a..a5e0e700c9 100644
--- a/demos/shared/shared.pro
+++ b/demos/shared/shared.pro
@@ -29,5 +29,8 @@ target.path = $$[QT_INSTALL_DEMOS]/shared
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images
 sources.path = $$[QT_INSTALL_DEMOS]/shared
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
 !cross_compile:INSTALLS += target
 
+symbian:TARGET.UID3 = 0xA000A63C
diff --git a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro
index 6ed001658d..5cf251a7d2 100644
--- a/demos/spreadsheet/spreadsheet.pro
+++ b/demos/spreadsheet/spreadsheet.pro
@@ -31,3 +31,5 @@ sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS
 sources.path = $$[QT_INSTALL_DEMOS]/spreadsheet
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
diff --git a/demos/sqlbrowser/sqlbrowser.pro b/demos/sqlbrowser/sqlbrowser.pro
index 920e8a0011..1334bc1370 100644
--- a/demos/sqlbrowser/sqlbrowser.pro
+++ b/demos/sqlbrowser/sqlbrowser.pro
@@ -18,6 +18,8 @@ sources.files = $$SOURCES $$HEADERS $$FORMS *.pro
 sources.path = $$[QT_INSTALL_DEMOS]/sqlbrowser
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
 wince*: {
     DEPLOYMENT_PLUGIN += qsqlite
 }
diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
index d1e12bbf59..be740be823 100644
--- a/demos/textedit/textedit.cpp
+++ b/demos/textedit/textedit.cpp
@@ -128,7 +128,9 @@ TextEdit::TextEdit(QWidget *parent)
     connect(textEdit, SIGNAL(copyAvailable(bool)), actionCut, SLOT(setEnabled(bool)));
     connect(textEdit, SIGNAL(copyAvailable(bool)), actionCopy, SLOT(setEnabled(bool)));
 
+#ifndef QT_NO_CLIPBOARD
     connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardDataChanged()));
+#endif
 
     QString initialFile = ":/example.html";
     const QStringList args = QCoreApplication::arguments();
@@ -248,7 +250,9 @@ void TextEdit::setupEditActions()
     a->setShortcut(QKeySequence::Paste);
     tb->addAction(a);
     menu->addAction(a);
+#ifndef QT_NO_CLIPBOARD
     actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+#endif
 }
 
 void TextEdit::setupTextActions()
@@ -661,7 +665,9 @@ void TextEdit::cursorPositionChanged()
 
 void TextEdit::clipboardDataChanged()
 {
+#ifndef QT_NO_CLIPBOARD
     actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+#endif
 }
 
 void TextEdit::about()
diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro
index 1ef4256a73..6f15e70e2a 100644
--- a/demos/textedit/textedit.pro
+++ b/demos/textedit/textedit.pro
@@ -19,3 +19,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
 sources.path = $$[QT_INSTALL_DEMOS]/textedit
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
diff --git a/demos/undo/undo.pro b/demos/undo/undo.pro
index e26d07c4be..bf7017bf9f 100644
--- a/demos/undo/undo.pro
+++ b/demos/undo/undo.pro
@@ -15,3 +15,5 @@ sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS
 sources.path = $$[QT_INSTALL_DEMOS]/undo
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
diff --git a/dist/changes-4.4.4-temple b/dist/changes-4.4.4-temple
new file mode 100644
index 0000000000..25f1f0bcb6
--- /dev/null
+++ b/dist/changes-4.4.4-temple
@@ -0,0 +1,65 @@
+Qt for S60 4.4.4 Temple introduces new ported modules and few other improvements.
+It guarantees no source or binary compatibility between any other versions.
+
+Some of the changes listed in this file include internal issue tracking 
+numbers.
+
+This file only lists changes specific to Qt for S60.
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for S60
+----------
+   * Changes to qmake:
+      * [228860] Fixed bld.inf and .mmp generation when not under Qt src tree,
+        i.e. when the makespec is default.
+      * [231121] Added no_icon CONFIG keyword to suppress showing application
+        icon in the application menu.
+      * [233497] EPOCROOT is no longer required as environment variable as long
+        as a Symbian device can be determined. 
+      * [234551] Generated .pkg files no longer include Qt libraries directly, 
+        instead they have a dependency to a separate QtLibs package.
+      * [234555] Added support for generic mmp file content in form of 
+        MMP_RULES variable. Also, EXPORTUNFROZEN is now defined using this 
+        variable instead of being hardcoded.  
+      * [234557] Improved user ability to control include order via INCLUDEPATH
+        variable.
+      * [234557] Support for STDDLL, STDEXE and STDLIB Open C target types via
+        stdbinary CONFIG keyword.
+      * [235975] The -r switch is no longer required with qmake to recurse 
+        subdirs template.
+      * Fixed: Resources with similar basenames corrupted makefile.
+
+   * [230751] Improved Elastic Nodes application stability.
+   * [230752] Mouse drag events work now.
+   * [234558] Ported QSharedMemory.
+   * [234559] Ported QSystemSemaphore.
+   * [234560] Ported all of QtXml.
+   * [234561] Ported all of QtScript.
+   * [234562] Ported all of QtSvg.
+   * [234869] QFileDialog no longer uses desktop layout in Qt for S60.    
+   * QtNetwork now supports SSL.
+   * If current path returned by Open C doesn't exist when queried, it is 
+     created.
+   * All supported libs and plugins built under src dir now have proper UIDs.
+   * Fixed GCCE build breaking on atomics.
+   * Improved fonts support:
+      * Anti aliasing
+      * Italic/bold
+      * Higher text layout precision
+   * QPixmapCache size limited to 2MB.
+   * Createpackage script looks for RnD certs in Qt installation root instead 
+     of EPOCROOT.
+   * Iconengines plugins included in the default build.
+   * More examples and demos added in the default build to showcase newly 
+     ported modules.
+   * QFileSystemWatcher thread stack size increased to avoid crashing when
+     entering directories that need AllFiles capability.
+   * Createpackage will now support signing with custom certificates in 
+     addition to default ones.
+   * A perl script patch_capabilities.pl is provided for changing capabilities
+     of all binaries specified in a single .pkg file.
+   
\ No newline at end of file
diff --git a/dist/changes-4.5.0-garden b/dist/changes-4.5.0-garden
new file mode 100644
index 0000000000..1fae42ef1d
--- /dev/null
+++ b/dist/changes-4.5.0-garden
@@ -0,0 +1,241 @@
+Qt 4.5.0-garden
+---------------
+
+The Qt for S60 "Garden" release is the fourth pre-release from the
+Qt for S60 porting project. "Garden" is based on the Qt 4.5 codebase
+and release focus has been on proper GUI integration.
+
+Up to and including change: b7621555cb1d1c97967dd40d63dd7e85a418407c
+
+Lists just S60 fixes, for general 4.5.0 changes go to:
+
+  http://www.qtsoftware.com/developer/changes/changes-4.5.0
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://qtsoftware.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change. Sometimes the task is internal
+and cannot be viewed by the public, a lot of them are non-public for Qt for
+S60 at the moment.
+
+****************************************************************************
+*                          New features                                    *
+****************************************************************************
+
+New modules
+-----------
+
+- qtmain
+  * Added a small static library called qtmain which is linked in
+    automatically for Qt applications on S60. qtmain includes an
+    implementation of E32Main() that sets up Qt correctly for S60. This
+    means that Qt no longer links to libcrt0.lib but uses qtmain instead.
+    However, if you are not linking against QtGui, you'll still have to
+    link to libcrt0.
+
+New classes
+------------
+
+- QS60Style
+    * Native look for Qt applications on S60 3.1 and later versions. The
+      style picks up the current theme parts, palettes and font settings
+      through the skinserver and uses these when painting in Qt.
+      The layout data for different resolutions is considered.
+
+Ported classes
+--------------
+
+- QDesktopServices
+    * Provides methods for accessing common desktop services: Opening the
+      browser with an url, launching documents with the standard application
+      and getting default system directories.
+
+- QClipboard
+    * Provides access to the window system clipboard.
+
+- QSysInfo
+    * QSysInfo class provides information about the system.
+
+Features
+--------
+
+- Input methods
+    * QInputMethodEvent will now be generated by Qt.
+      To use it, widgets must set the attribute WA_InputMethodEnabled and
+      implement QWidget::inputMethodQuery(...).
+    * Qt will use the underlaying FEP framework from S60.
+    * Multitap and T9 supported.
+    * Virtual keyboard for touch phones is supported.
+    * Most of the Qt widgets already have support for input methods.
+
+- Drag-n-Drop
+  * At the moment works only within same Qt process.
+
+- STL support for QtS60
+  * use -stl switch when configuring Qt.
+
+Optimizations
+-------------
+
+
+****************************************************************************
+*                          Build issues                                    *
+****************************************************************************
+
+- Fixed compilation on private S60 platforms by adding neccessary include paths.
+- Fix compiler error if --gnu flag is given to RVCT.
+
+
+****************************************************************************
+*                          Changes to existing classes                     *
+****************************************************************************
+
+- qapplication_s60.cpp (non-public)
+    * Simplified by introduction of qtmain.
+    * added CCoeControl to be the native representation of QWidget.
+    * Use window group from CEikonEnv instead of creating our own.
+    * No need to create/destroy RWsSession, this is now done by the Avkon
+      application.
+    * Handle pointer events from QSymbianControl.
+    * Stopped using QETWidget for translation, now handled by
+      QSymbianControl.
+    * MouseButtonDblClick mapped to EModifierDoubleClick (after dblclick
+      Symbian will send mouseButtonRelease.
+
+- QApplication
+    * Implemented setDoubleClickInterval(...).
+    * Improved widgetAt().
+    * Added support for resizing widget's when the screen orientation
+      changes from portrait to landscape. For fullscreen and maximized
+      widgets this will ensure that they look correct in the new screen
+      layout.
+
+- qwindowsurface_s60.cpp (non-public)
+    * Stopped creating our own CWindowGc based on the RWindow and get
+      SystemGc from the CCoeControl we are currently painting on instead.
+
+- qeventdispatcher_s60.cpp
+    * Stopped using Active Objects to recieve events, we get them from
+      C*AppUi and CCoeControl instead.
+
+- QWidget
+    * Proper implementation for QDesktopWidget::availableGeometry.
+    * Improved raising and lowering widgets.
+    * Implemented setWindowTitle(...).
+    * Implemented QWidget::setWindowIcon(...) and made it to react to
+      different statuspane layouts.
+    * Improved focus handling (improved setFocus_sys).
+    * Fixed native window scrolling. Only use accelerated scroll if we are
+      scrolling a window owning widget.
+    * Improved setWindowState(...).
+    * Added implementation for createDefaultWindowSurface_sys().
+    * Added implementation for setMask_sys().
+    * Not creating a backing store for the top level widget (saves memory).
+    * winId() now returns a CCoeControl instead of RWindow.
+
+- QMenuBar
+    * Added support for using native S60 menues.
+    * Supported infinite level of menues inside menues.
+    * Supported checkboxes next to menu items).
+
+- QtCore and QtGui
+    * link to CONE and Uikon libraries and stop linking to glib and gthread.
+    * Renamed qt_deployment.pro to qt_libs.pro as it is more consistent.
+
+- Event loop / Event dispatcher
+    * We now integrate with the native loop, allowing CActiveScheduler and
+      QEventLoop to be used interchangably.
+    * Enabled posted events to work from the Symbian active scheduler too.
+    * Enable use of QEventLoop::ExcludeSocketEvents on Symbian.
+    * Improved handling of zero timers.
+
+- QColumnView
+    * Fixed a typo in one instance of QT_NO_QCOLUMNVIEW.
+
+- font rendering
+    * Speed increase
+    * Correctly render RTL text
+    * Proper shaping of complex writing systems
+    * Automatic font linking (aka merging) of different writing systems
+    * Rudimentary fallback glyph outline support
+    * Defaults to Symbians native (usually iType based) font rendering.
+      Alternatively, supports FreeType. Configure with -qt-freetype.
+
+- qcore_symbian_p.h (non-public)
+    * Added helper functions to convert QRect <-> TRect.
+    * Renamed qstringToTPtrC to qt_QString2TPtrC.
+    * Added helper function qt_TDisplayMode2Format.
+    * Added helper function to convert QSize <-> TSize.
+    * Added helper function to convert QString ->HBufC.
+    * Added helper function to convert TDesC -> QString.
+
+- QGraphicsSystem
+    * QRasterPixmapData(...) is specified as default pixmap data for S60.
+
+- QPixmap
+    * Improved grabWindow(...) when it comes to selecting client rect.
+
+- QDirModel
+    * Returns root dir name similary as done in Windows
+
+- QFSFileEngine
+    * copy(...) now uses Symbian native copy implementation which is more efficient
+      and doesn't leave temp files behind
+
+- QLocale
+    * Now has Symbian system locale support.
+
+****************************************************************************
+*                          Examples and demos                              *
+****************************************************************************
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- qmake
+    * Support for QMAKE_EXTRA_TARGETS and QMAKE_EXTRA_COMPILERS variables.
+    * Support BLD_INF_RULES variable. Adds entries to generated bld.inf file
+    * Added 'make' targets '<build>-<platform>' 'distclean' and 'run'
+    * New platform_paths.prf and data_caging_paths.prf contain several
+      variables and replacement functions for including known paths.
+    * The .pro file qt_libs.pro was moved to src/s60installs.
+    * Support for ICON variable for setting application icon.
+    * Support for RSS_RULES variable, which enables entries to be added to
+      generated application registration files.
+    * When bulding qmake and other bootstrapped tools we now use
+      "-warnings on" instead of "-warnings all".
+    * Improved error message if calls to $$system() fails.
+    * Fixed several issues when qmake is built for platform win32-mwc.
+    * Moved mocing step to the build step so it is not longer required to
+      do "abld build" or "abld makefile" to remoc.
+    * Improved "make clean".
+    * Increased max heap to 8Mb.
+    * Enabled __CC_ARM flag used by some versions of RVCT.
+    * Removed hard coded INCLUDEPATH from qmake - developer can control
+      the whole include path hierachy.
+    * Symbian export mechanism is no longer used for emulator deployment,
+      instead copy commands are generated to wrapper makefile and
+      executed during final phase of building, after post link.
+    * Removed -O1 flag from WINSCW builds.
+    * Added qmake function (size) to ask number of items in QStringList.
+    * Qt demos are now installed to QtDemos folder in S60 emulator.
+    * Qt examples are now installed to QtExamples folder in S60 emulator/HW.
+    * Plugin stubs suffix changed to ".qtplugin".
+    * Paths containing $${EPOCROOT}/epoc32 will now properly generate
+      absolute paths in mmps.
+
+
+-configure
+    * Defaults for FREETYPE and SCRIPTTOOLS set to "no".
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
diff --git a/dist/changes-4.5.2-tower b/dist/changes-4.5.2-tower
new file mode 100644
index 0000000000..eaf493da87
--- /dev/null
+++ b/dist/changes-4.5.2-tower
@@ -0,0 +1,436 @@
+Qt 4.5.2-tower
+---------------
+
+The Qt for S60 "Tower" release is the fifth pre-release from the Qt for
+S60 porting project. "Tower" is based on the Qt 4.5 codebase (mostly Qt 4.5.2).
+
+This list of changes lists S60 specific fixes only,
+for general 4.5.x changes go to:
+
+  http://www.qtsoftware.com/developer/changes/changes-4.5.0
+  http://www.qtsoftware.com/developer/changes/changes-4.5.1
+  http://www.qtsoftware.com/developer/changes/changes-4.5.2 (partially in Tower)
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://qtsoftware.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain
+more information about a particular change. Sometimes the task is internal
+and cannot be viewed by the public, a lot of them are non-public for Qt for
+S60 at the moment.
+
+****************************************************************************
+*                          New features                                    *
+****************************************************************************
+
+New modules
+-----------
+
+- Input methods
+    * Added events to support opening and closing the virtual keyboard, called
+      software input panel in Qt.
+    * Added an option to QApplication to choose between single or double click
+      input panel activation.
+    * Added input method hints API to Qt. These can be used to instruct input methods
+      to only allow certain characters or tailor their appearance.
+    * Added Qt::ImAnchorPosition to support querying for selections through input
+      methods.
+    * Added QInputMethodEvent::Selection to support setting the selection through
+      input methods.
+
+- Phonon
+    * The Phonon library is now part of Qt, but it comes without a backend.
+      This means that applications can build and run against the Phonon
+      library, but there is currently no S60 backend plugin providing actual
+      multimedia playback. Possible alternatives such as Helix and MMF are
+      being investigated.
+
+- QtSql
+    * Implemented QtSql module with sqlite3 backend. For now backend is
+      provided only in binary format.
+
+- QtWebkit
+    * Experimental webkit build for S60. Can be enabled by passing -webkit
+      to configure.
+
+New classes
+------------
+
+- QScopedPointer
+    * Smart pointer, which deletes pointer when destroyed.
+
+Ported classes
+--------------
+
+- QColormap
+    * Added basic implementation of QColormap for Symbian.
+
+- QLocalSocket and QLocalServer
+    * Added support for QLocalSocket and QLocalServer on Symbian.
+
+- QSound
+    * Implemented CMdaAudioPlayerUtility based Symbian backend for QSound.
+
+Features
+--------
+
+- QApplication
+    * Implemented QApplication::beep() for Symbian.
+
+- QPixmap
+    * Added supported for converting to/from CFbsBitmap
+
+- QSslSocket
+    * Added support for -openssl option i.e. runtime resolving of OpenSSL
+      symbols.
+
+- QWidget
+    * Basic widgets are now navigatable and usable via keypad on SDK 3
+      FP 1 and FP 2.
+    * Widgets can now be made semi-transparent on systems that support it
+      using Qt::WA_TranslucentBackground.
+
+- Exception safety
+    * Improving the exception safety of Qt, not yet complete.
+    * Added support for translating between Symbian leaves and standard C++
+      exceptions.
+
+Optimizations
+-------------
+
+- qdrawhelper
+    * Optimized drawing operations for RVCT builds, particulary for ARMV6.
+
+- QFont
+    * Use cached DPI for metrics.
+
+- qwidget_s60.cpp
+    * Avoid unnecessary calls to FocusChanged in Symbian.
+
+- qwindowsurface_s60.cpp
+    * Avoid updating raster buffer pointer on window hide
+    
+Documentation
+-------------
+
+- exceptionsafety.qdoc
+    * A guide to exception safety in Qt.
+    
+- symbian-exceptionsafety.qdoc
+    * A guide to integrating exception safety in Qt with Symbian.
+
+****************************************************************************
+*                          Code clean-up                                   *
+****************************************************************************
+
+- Cleanup qeventdispatcher_unix.cpp
+    * 247268: All qeventdispatcher_unix.cpp changes were reverted since
+    this file is not anymore used in Symbian OS branch.
+
+- Cleanup QtNetwork workarounds implemented earlier due to Open C bugs.
+    * 247287: Removed getaddrinfo workaround.
+    * 247288: Removed waitForConnected workaround.
+    * 247289: Removed qt_socket_accept workaround.
+    * 247290: Removed qt_socket_connect workaround.
+    * 247290: Removed E32IONREAD workaround.
+    * 247293: Removed nativeHasPendingDatagrams workaround.
+    * 247295: Removed QNativeSocketEnginePrivate::nativeRead EPIPE
+      workaround.
+
+- Other code clean-ups
+    * 247278: Removed unnecessary includes from qbackingstore.cpp.
+    * Fixed Q_OS_SYMBIAN ifdef usage in qfiledialog_p.h.
+    * 247272: Removed qtestnetworkservers.h dependency, used
+      network-settings.h.
+    * Revert "Work around compiler bug on Nokia Metrowerks compiler."
+    * Remove UI highlights being inverted colors based on highlight text 
+      colors.
+
+****************************************************************************
+*                          Build issues                                    *
+****************************************************************************
+
+- Macros
+    * QT_NO_DEBUG now properly defined in release mode.
+
+- QTest
+    * Fixed testlib export macros for RVCT builds.
+
+- Namespaces
+    * Now builds when -qtnamespace option is defined.
+
+****************************************************************************
+*                          Changes to existing classes                     *
+****************************************************************************
+
+- QApplication
+    * 252798: Fixed layout when orientation changed via
+      AknAppUi::SetOrientationL.
+    * Generating MouseEvents has gone through several changes.
+    * qt_init() has been changed: auto flush is always enabled for
+      window server sessions on 3.1 SDK for both UDEB and UREL.
+    * Added support for '-graphics-system' command line option
+
+- QCoeFepInputContext (non-public)
+    * Fixes FEP crash when changing the focused Qt widget to NULL.
+    * Fixed a bug where the virtual keyboard could not be opened if there
+      was only one input widget.
+    * Fixed a crash in FEP when exiting application.
+
+- QDebug
+    * Fixed debug printing (incl. qWarning, qFatal) for strings longer
+      than 256 characters.
+    * introduce a breakpoint to get the emulator to stop in the debugger 
+      when qFatal is called
+
+- QDesktopServices
+    * Fixed forwardslash/backslash usage as an path separator.
+    * Switched QDesktopServices mail-to URL handling to RSendAs in Symbian,
+      due to the fact that CSendUi requires extensive capabilities to work
+      correctly. Currently e-mail sending with qdesktopservices::openUrl
+      works in Symbian only if e-mail account already exists.
+
+- QDesktopWidget
+    * 253930: Implement proper resize behavior and emit necessary signals.
+
+- QEventDispatcherSymbian (non-public)
+    * Lowered the timeout for reprioritizing the process to 100ms.
+    * Fixed ASSERT panic in Symbian event dispatcher.
+    * 246600: Fix problem in eventdispatcher destructor / AO canceling.
+    * Fixed active scheduler removal when calling QThread::terminate.
+    * Fix to Open C bug: select sometimes returns -1 and errno is
+      ECONNREFUSED.
+    * Fix a crash when using QEventLoop::ExcludeSocketNotifiers flag.
+    * Changed to round robin scheduling for Qt's active objects. Other
+      active objects will still be scheduled like before.
+    * Fixed crash if events are posted before QApplication construction
+
+- QFontDataBase
+    * Now, also fonts from the user's /resources/fonts directories are
+      available.
+
+- QFontEngine
+    * Fix the vertical advance of glyph metrics.
+
+- QFontMetrics
+    * Fixed the boundingRect calculation for text.
+
+- QGraphicsView
+    * Added support for virtual keyboard to the the viewport.
+
+- QGraphicsTextItem
+    * Added support for virtual keyboard.
+
+- QHostInfo
+    * Added support for host lookups with multiple ipv4 addresses.
+
+- QInputContext
+    * Added QInputContext::s60FilterEvent().
+
+- QIoDevice
+    * Fixed compilation error when QIODEVICE_DEBUG is defined.
+
+- QKeyMapper (non-public)
+    * Fixed a broken keymapping where Enter key would be mapped to Tab.
+
+- QLocale
+    * Removed workaround for missing tzname symbol, fixes QLocal timeZone
+      implementation for Symbian.
+
+- QLocalSocket
+    * Connecting to QLocalServer is always done in blocking mode.
+
+- QMenuBar
+    * Native menus are handled properly even when application has multiple
+      QMainWindows.
+    * Fixed a bug causing both native and qt menu to be created.
+    * Fix for disappearing options menu after coming back from dialog.
+
+- QNativeSocketEnginePrivate (non-public)
+    * Socket connect and listen failure is indicated in exception set.
+      (Workaround to Open C bug)
+
+- QNetworkInterface
+    * Fixed R-handle leak in Symbian version of qnetworkinterface_unix.cpp.
+    * Introduced a new qnetworkinterface_symbian.cpp, because there wasn't
+      really anything common to UNIX equivalent.
+
+- QPixmap
+    * Added fromSymbianCFbsBitmap() and toSymbianCFbsBitmap().
+
+- QPlainTextEdit
+    * Added support for virtual keyboard.
+
+- QPluginLoader
+    * QPluginLoader will look for plugin stubs from the same folder on other
+      drives if it can't find them from the indicated drive.
+
+- QS60Style
+    * Added subElementRect implementation for SE_ItemViewItemCheckIndicator.
+    * Added support for E90 layouts.
+    * Added support for QScrollArea, QTextEditor, QGroupBox, QTreeView, 
+      QToolBar and QDial styling.
+    * Better support for theme and layout changes.
+    * Better support for themed palettes and themed text colors.
+    * Better support for multiselection in item views.
+    * Better theming for QTable and QPanel.
+    * Better support of highlight graphics and texts for QLists, QTreeViews, 
+      QCalendarWidgets and QComboBoxes.
+    * Support polishing fonts. Fonts are no longer changed within the drawing 
+      code.
+    * Draw spinbox arrowbuttons side-by-side, instead one on top of the other.
+    * Harmonize widget drawing so that widgets are of similar height.
+    * Support check states for QLists and QPushButtons.
+    * Support flat QPushButtons.
+    * Support busy indicator.
+    * Support QScrollBar pressed state.
+    * Support QPushButton disabled theme graphics.
+    * Separate theme background for QDialogs.
+    * Clarify QToolButton pressed state.
+    * Removed linedrawing of panels and groupboxes.
+    * Fix palette-polution for a style that is activated from an application 
+      after S60Style has been in use.
+    * Fix for frame masks with color depth other than EGrey2.
+    * Fix for squeezed QTabBars.
+    * Fix memory leak when color skinning graphics.
+    * Show focus/Editfocus visualization for KeyPad navigation on
+      SDK 3 FP 1 and FP 2.
+    * Fix for overwriting user specified palettes.
+
+- QSelectThread (non-public)
+    * We force monitoring sockets exception status as well, and not
+      just read/write.
+    * Notification related to the particular socket signaled via exception
+      fd_set will be mapped to the appropriate read/write notification.
+
+- QTemporaryFile
+    * Fixed temporary file rename in Symbian OS.
+
+- QTest
+    * Disable keypad navigation for autotests by default
+
+- QTextEdit
+    * Added support for virtual keyboard.
+
+- QThread
+    * Fixed thread termination in Symbian OS.
+
+- QUdpSocket
+    * Updated BindFlag documentation to reflect behaviour on Symbian OS.
+    * Wrote hack for QUdpSocket::writeDatagram return value in Symbian OS.
+
+- QWidget
+    * Added API for setting softkeys.
+    * Fixed background painting. Background can now be overwritten from
+      setting the respective palette role.
+    * Add support for Qt::WA_TranslucentBackground.
+
+- Many classes
+    * Improved exception safety.
+
+****************************************************************************
+*                          Examples and demos                              *
+****************************************************************************
+
+- Anomaly browser 
+    * Added to demonstrate QtWebkit usage.
+
+- Deform, Pathstroke, and Wiggly
+    * Removed Symbian specific animation timer fixes since more generic
+      fix was made to event dispatcher.
+
+- DesktopServices
+    * Implemented content filters for desktopservices example.
+    * Added error handling to qdesktopservices example when openUrl fails.
+
+- Drilldown
+    * Added to demonstrate QtSql usage in Symbian OS.
+
+- Fluidlauncher
+    * Removed ugly workaround to make emulator deployment work correctly,
+      since the issue has been fixed in qmake.
+    * Included drilldown to demonstrate QtSql usage.
+    * Updated screenshots to S60 style.
+    * Added softkeys example.
+    * Added Anomaly browser to fluidlauncher.
+
+- Ftp
+    * Enabled default IAP setting for FTP example.
+    * IAP dialog will show after FTP UI is on screen.
+    * If active IAP exist that one will be used.
+
+- SecureSocketClient
+    * Fixed build issue caused by lack of cursor.
+
+- Softkeys
+    * New example showing how to use softkeys API in QWidget.
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- configure
+    * -cetest is no longer a supported switch for configure.
+    * -stl option is enabled by default for Symbian OS
+    * -openssl option is enabled by default for Symbian OS.
+    * -fpu option enables vfpu type selection for ARM targets.
+
+- qmake
+    * Support for generating Symbian "test" targets: CONFIG += symbian_test.
+    * Support for Symbian Build System, version 2 (aka Raptor) via
+      symbian-sbsv2 mkspec.
+    * PAGED keyword is added to all MMP files by default, except in S60 3.1
+      builds.
+    * Read-only flag is no longer preserved when deploying files into
+      emulator environment.
+    * Changed the timestamp to ISO format in all files generated
+      by qmake for symbian-* mkspecs.
+    * Qt's VERSION variable will now generate VERSION keyword in mmp files.
+    * Made Open C include paths handling bit more robust.
+    * Support both Symbian Foundation header structure in /epoc32/include,
+      as well as old Symbian/S60 structure
+
+- Release package creation
+    * Removed the obsolete script to create release package.
+
+- Createpackage script
+    * Now creates packages with .sis suffix.
+
+- Patch_capabilities script
+    * Will now patch also vendor id in binaries and the UID in the pkg file.   
+
+
+****************************************************************************
+*                          Documentation                                   *
+****************************************************************************
+
+- qmake-manual
+    * 250370: Added documentation for ICON keyword.
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+- S60 version specific plugins
+    * Isolated S60 version dependent functionality to S60 version specific
+      plugins (qts60plugin_x_y.dll) to make it possible for single build to
+      run on any supported device, even if with reduced functionality on
+      some.
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
+- Qt libs
+    * Qt libs are now built with "All -Tcb" capabilities always. It is now
+      always necessary to run patch_capabilities.pl script if self-signing
+      of Qt libs is desired.
+    * QtCore and QtSql made UNPAGED when installed via SIS file as a 
+      workaround for an obscure crash when they are paged.
+    * qt_libs.pro updated to reflect Open C dependencies, as Qt requires
+      1.5.0 and newer release.
+    * Qt libs are now build with the "STDCPP" mmp flag. On platforms from 
+      TB9.2, Qt code will throw std::bad_alloc exceptions on allocation
+      failure.
diff --git a/doc/src/appicon.qdoc b/doc/src/appicon.qdoc
index 929eda8256..3c30b9de41 100644
--- a/doc/src/appicon.qdoc
+++ b/doc/src/appicon.qdoc
@@ -223,4 +223,19 @@
     installed in the appropriate locations for GNOME.
 
     The GNOME developer website is at \l{http://developer.gnome.org/}.
+    
+    \section1 Setting the Application Icon on S60 platforms
+    
+    In order to set application icon for S60 application you need SVG-T icon. 
+    How to create such SVG-T, please refer to 
+    \l{http://wiki.forum.nokia.com/index.php/How_to_create_application_icon(SVG)_in_S60_3rd_edition/}
+
+    Once you have icon in correct format and assuming you are using 
+    \c qmake to generate your makefiles, you only need to add a single
+    line to your \c .pro project file. For example, if the name of your
+    icon file is \c{myapp.svg}, and your project file is \c{myapp.pro},
+    add this line to \c{myapp.pro}:
+
+    \snippet doc/src/snippets/code/doc_src_appicon.qdoc 5
+    
 */
diff --git a/doc/src/classes/qnamespace.qdoc b/doc/src/classes/qnamespace.qdoc
index 59e0a95add..c398cf2a33 100644
--- a/doc/src/classes/qnamespace.qdoc
+++ b/doc/src/classes/qnamespace.qdoc
@@ -2418,15 +2418,47 @@
 */
 
 /*!
+    \enum Qt::InputMethodHint
+
+    \value ImhNone                   No hints.
+    \value ImhHiddenText             Characters should be hidden, as is typically used when entering passwords.
+                                     This is automatically set when setting QLineEdit::echoMode to \c Password.
+    \value ImhDigitsOnly             Only digit input is allowed.
+    \value ImhFormattedNumbersOnly   Only number input (including integers and real numbers) is allowed.
+    \value ImhUppercaseOnly          Only upper case letter input is allowed.
+    \value ImhLowercaseOnly          Only lower case letter input is allowed.
+    \value ImhNoAutoUppercase        The input method should not try to automatically switch to upper case
+                                     at the beginning of a sentence.
+    \value ImhPreferNumbers          Numbers are preferred (but not required). This can include only digits,
+                                     phone numbers, or all numbers, depending on which one of the
+                                     \c ImhDigitsOnly, \c ImhDialableCharactersOnly and
+                                     \c ImhFormattedNumbersOnly flags is given.
+    \value ImhPreferUppercase        Upper case letters are preferred (but not required).
+    \value ImhPreferLowercase        Lower case letters are preferred (but not required).
+    \value ImhNoPredictiveText       Do not use predictive text (i.e. dictionary lookup) while typing.
+    \value ImhDialableCharactersOnly Only characters suitable for phone dialling are allowed.
+
+    \value ImhExclusiveInputMask     A mask to test for the presence of any flags ending with \c Only.
+
+    \note If several flags ending with \c Only are ORed together, the resulting character set will
+          consist of the union of the specified sets. For instance specifying \c ImhNumbersOnly and
+          \c ImhUppercaseOnly would yield a set consisting of numbers and uppercase letters.
+
+    \note If several flags of the \c Prefer type are ORed together, the result is undefined.
+
+    \sa QWidget::inputMethodHints
+*/
+
+/*!
     \enum Qt::InputMethodQuery
 
     \value ImMicroFocus       The rectangle covering the area of the input cursor in widget coordinates.
     \value ImFont             The currently used font for text input.
-    \value ImCursorPosition   The logical position of the cursor within the text surrounding the input area (see ImSurroundingText).
-                              If any text is selected, the position returned will be at the logical end of the
-                              selection, even if the real cursor is located at the logical start.
+    \value ImCursorPosition   The logical position of the cursor within the text surrounding the input area (see \c ImSurroundingText).
     \value ImSurroundingText  The plain text around the input area, for example the current paragraph.
     \value ImCurrentSelection The currently selected text.
+    \value ImMaximumTextLength The maximum number of characters that the widget can hold. If there is no limit, QVariant() is returned.
+    \value ImAnchorPosition   The position of the selection anchor. This may be less or greater than \c ImCursorPosition, depending on which side of selection the cursor is. If there is no selection, it returns the same as \c ImCursorPosition.
 */
 
 /*!
diff --git a/doc/src/emb-install.qdoc b/doc/src/emb-install.qdoc
index c04d5231fe..f0f9790af5 100644
--- a/doc/src/emb-install.qdoc
+++ b/doc/src/emb-install.qdoc
@@ -42,10 +42,10 @@
 /*!
     \page qt-embedded-install.html
 
-    \title Installing Qt for Embedded Linux
+    \title Installing Qt on Embedded Linux
     \ingroup qt-embedded-linux
     \ingroup installation
-    \brief How to install Qt for Embedded Linux.
+    \brief How to install Qt on Embedded Linux.
 
     This document describes how to install \l{Qt for Embedded Linux} in your
     development environment:
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index e85acd1341..67f58c32c2 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -402,6 +402,7 @@
 
     \list
     \o \l{xml/dombookmarks}{DOM Bookmarks}
+    \o \l{xml/htmlinfo}{HTML Info}
     \o \l{xml/saxbookmarks}{SAX Bookmarks}
     \o \l{xml/streambookmarks}{QXmlStream Bookmarks}\raisedaster
     \o \l{xml/rsslisting}{RSS-Listing}
diff --git a/doc/src/examples/htmlinfo.qdoc b/doc/src/examples/htmlinfo.qdoc
new file mode 100644
index 0000000000..af236e1ae0
--- /dev/null
+++ b/doc/src/examples/htmlinfo.qdoc
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example xml/htmlinfo
+    \title XML HTML Info Example
+
+    The XML HTML Info example provides a simple command line utility that
+    scans the current directory for HTML files and prints statistics about
+    them to standard out.
+    
+    \note Standard out is redirected on some platforms. On Symbian using Open
+    C \c stdout is by default directed to the console window, but this window
+    may not always be visible. To redirect to a file instead, locate the \c
+    c:\\system\\data\\config.ini file (on either the emulator or the device)
+    and change \c STDOUT to point to \c MEDIA4. This will redirect the console
+    to \c c:\\system\\data\\out.txt.
+    
+    The files are parsed using a QXmlStreamReader object. If the file does
+    not contain a well-formed XML document, a description of the error is
+    printed to the standard error console.
+
+    \section1 Basic Operation
+
+    The main function of the example uses QDir to access files in the current
+    directory that match either "*.htm" or "*.html". For each file found,
+    the \c parseHtmlFile() function is called.
+
+    Reading XML is handled by an instance of the QXmlStreamReader class, which
+    operates on the input file object:
+
+    \snippet examples/xml/htmlinfo/main.cpp 0
+
+    The work of parsing and the XML and extracting statistics is done in a
+    while loop, and is driven by input from the reader:
+
+    \snippet examples/xml/htmlinfo/main.cpp 1
+
+    If more input is available, the next token from the input file is read
+    and parsed. The program then looks for the specific element types,
+    "title", "a", and "p", and stores information about them.
+
+    When there is no more input, the loop terminates. If an error occurred,
+    information is written to the standard out file via a stream, and the
+    example exits:
+
+    \snippet examples/xml/htmlinfo/main.cpp 2
+
+    If no error occurred, the example prints some statistics from the data
+    gathered in the loop, and then exits.
+*/
diff --git a/doc/src/exceptionsafety.qdoc b/doc/src/exceptionsafety.qdoc
new file mode 100644
index 0000000000..580cb17c75
--- /dev/null
+++ b/doc/src/exceptionsafety.qdoc
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page exceptionsafety.html
+    \title Exception Safety
+    \ingroup architecture
+    \brief A guide to exception safety in Qt.
+
+    \bold {Preliminary warning}: Exception safety is not feature complete!
+    Common cases should work, but classes might still leak or even crash.
+
+    Qt itself will not throw exceptions. Instead, error codes are used.
+    In addition, some classes have user visible error messages, for example
+    \l QIODevice::errorString() or \l QSqlQuery::lastError().
+    This has historical and practical reasons - turning on exceptions
+    can increase the library size by over 20%.
+
+    The following sections describe Qt's behavior if exception support is
+    enabled at compile time.
+
+    \tableofcontents
+
+    \section1 Exception safe modules
+
+    \section2 Containers
+    
+    Qt's \l{container classes} are generally exception neutral. They pass any
+    exception that happens within their contained type \c T to the user
+    while keeping their internal state valid.
+
+    Example:
+
+    \code
+    QList<QString> list;
+    ...
+    try {
+        list.append("hello");
+    } catch (...) {
+    }
+    // list is safe to use - the exception did not affect it.
+    \endcode
+
+    Exceptions to that rule are containers for types that can throw during assignment
+    or copy constructions. For those types, functions that modify the container as well as
+    returning a value, are unsafe to use:
+
+    \code
+    MyType s = list.takeAt(2);
+    \endcode
+
+    If an exception occurs during the assignment of \c s, the value at index 2 is already
+    removed from the container, but hasn't been assigned to \c s yet. It is lost
+    without chance of recovery.
+
+    The correct way to write it:
+
+    \code
+    MyType s = list.at(2);
+    list.removeAt(2);
+    \endcode
+
+    If the assignment throws, the container still contains the value, no data loss occured.
+
+    Note that implicitly shared Qt classes will not throw in their assignment
+    operators or copy constructors, so the limitation above does not apply.
+
+    \section1 Out of Memory Handling
+
+    Most desktop operating systems overcommit memory. This means that \c malloc()
+    or \c{operator new} return a valid pointer, even though there is not enough
+    memory available at allocation time. On such systems, no exception of type
+    \c std::bad_alloc is thrown.
+
+    On all other operating systems, Qt will throw an exception of type std::bad_alloc
+    if any allocation fails. Allocations can fail if the system runs out of memory or
+    doesn't have enough continuous memory to allocate the requested size.
+
+    Exceptions to that rule are documented. As an example, \l QImage::create()
+    returns false if not enough memory exists instead of throwing an exception.
+
+    \section1 Recovering from exceptions
+
+    Currently, the only supported use case for recovering from exceptions thrown
+    within Qt (for example due to out of memory) is to exit the event loop and do 
+    some cleanup before exiting the application.
+
+    Typical use case:
+
+    \code
+    QApplication app(argc, argv);
+    ...
+    try {
+        app.exec();
+    } catch (const std::bad_alloc &) {
+        // clean up here, e.g. save the session
+        // and close all config files.
+
+        return 0; // exit the application
+    }
+    \endcode
+
+    After an exception is thrown, the connection to the windowing server
+    might already be closed. It is not safe to call a GUI related function
+    after catching an exception.
+
+    \section1 Platform-Specific Exception Handling
+
+    \section2 Symbian (Qt for S60)
+
+    The Symbian platform implements its own exception system that differs from the standard
+    C++ mechanism. When using Qt for S60, and especially when writing code to access Symbian
+    functionality directly, it may be necessary to know about the underlying implementation
+    and how it interacts with Qt.
+
+    The \l{Exception Safety with Symbian} document shows how to use the facilities provided
+    by Qt to use exceptions as safely as possible.
+*/
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index d868069ba6..02c708f7f5 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -499,6 +499,146 @@ in the \l{Qt for Windows CE Requirements} document.
     We hope you will enjoy using Qt. Good luck!
 */
 
+/*! \page install-S60-installer.html
+
+\title Installing Qt on S60 using binary package
+\ingroup qts60
+\brief How to install Qt on S60 using the binary package.
+
+\note Qt for S60 has some requirements that are given in more detail
+in the \l{Qt for S60 Requirements} document.
+
+\list 1
+
+    \o  Install Qt
+
+        Run \c{qt-s60-%VERSION%.exe} and follow the instructions.
+
+        \note Qt must be installed on the same drive as the S60 SDK you are
+        using, and the install path must not contain any spaces.
+
+    \o  Running Qt demos
+
+        We've included a subset of the Qt demos in this package for you
+        to try out. An excellent starting point is the "fluidlauncher"
+        demo. To run the demo on a real device, you first have to install
+        \c{qt_libs.sis} and \c{fluidlauncher.sis} found in the Qt installation
+        directory. Begin by connecting your phone using the USB cable and
+        selecting "PC Suite mode". In Windows Explorer right click on the
+        \c{.sis} files and select "Install with Nokia Application Installer"
+        and follow the instructions.
+
+        To run the demos and examples on the emulator, you need to build them first.
+        Open the "Qt for S60 Command Prompt" from the Start menu and type:
+        
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 25
+        
+        To run the demos on the emulator simply navigate to the directory of the demo 
+        you want to see and run:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 27
+
+        For more information about building and running Qt programs on S60,
+        see \l{S60 - Introduction to using Qt}.
+
+    We hope you will enjoy using Qt.
+
+\endlist
+
+*/
+/*! \page install-S60.html
+
+\title Installing Qt on S60
+\ingroup installation
+\ingroup qts60
+\brief How to install Qt on S60
+
+\note Qt for S60 has some requirements that are given in more detail
+in the \l{Qt for S60 Requirements} document.
+
+\note \bold {This document describes how to install and configure Qt for S60 from scratch. 
+If you are using pre-built binaries, follow the instructions
+\l{Installing Qt on S60 using binary package}{here}.}
+
+\list 1
+
+    \o  Install Qt
+
+        Uncompress the package into the directory you want Qt installed,
+        e.g. \c{C:\Qt\%VERSION%}.
+
+        \note Qt must be installed on the same drive as the S60 SDK you are
+        using, and the install path must not contain any spaces.
+
+    \o  Environment variables
+
+        In order to build and use Qt, the \c PATH environment variable needs
+        to be extended:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
+
+        This is done by adding \c{c:\Qt\%VERSION%\bin} to the \c PATH variable.
+
+        On Windows the PATH can be extended by navigating to
+        "Control Panel->System->Advanced->Environment variables".
+
+        In addition, you must configure the environment for use with the S60
+        emulator. This is done by locating the Carbide.c++ submenu on the Start
+        menu, and choosing "Configure environment for WINSCW command line".
+
+    \o  Configure Qt
+
+        To configure Qt for S60, do:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 23
+
+        For other options, type \c{configure -help} to get a list of all available
+        options.
+
+    \o  Build Qt
+
+        To build Qt for the device, type:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 28
+        
+        To build Qt for the emulator, type:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 24
+
+        Congratulations, Qt is now ready to use.
+
+    \o  Running Qt demos
+
+        We've included a subset of the Qt demos in this package for you
+        to try out. An excellent starting point is the "fluidlauncher"
+        demo. To run the demo on a real device, you first have to install
+        the Qt libraries on the device:
+        
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 29
+
+        \note You will need to supply certificate that allows installation 
+        of binaries with "All -Tcb" capability to your device. 
+
+        Similarly, install fluidlauncher to the device:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 30
+
+        This will create a self-signed \c fluidlauncher_armv5_urel.sis and
+        install it to your device.
+        
+        To run the demos on the emulator simply navigate to the directory of the demo 
+        you want to see and run:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 27
+
+        For more information about building and running Qt programs on S60,
+        see \l{S60 - Introduction to using Qt}.
+
+    We hope you will enjoy using Qt.
+
+\endlist
+
+*/
 /*!
     \page requirements.html
     \title General Qt Requirements
@@ -525,6 +665,7 @@ in the \l{Qt for Windows CE Requirements} document.
     \list
     \o \l{Qt for Embedded Linux Requirements}
     \o \l{Qt for Mac OS X Requirements}
+    \o \l{Qt for S60 Requirements}
     \o \l{Qt for Windows CE Requirements}
     \o \l{Qt for Windows Requirements}
     \o \l{Qt for X11 Requirements}
@@ -792,3 +933,39 @@ in the \l{Qt for Windows CE Requirements} document.
     enables the use of the Record extension to the X protocol to be used in
     applications.
 */
+
+/*!
+    \page requirements-s60.html
+    \title Qt for S60 Requirements
+    \ingroup installation
+    \brief Setting up the S60 environment for Qt.
+    \previouspage General Qt Requirements
+
+    Qt for S60 requires the following software installed on your development PC:
+    \list
+        \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}           
+           \list
+           \o \bold{Note:} It may be necessary to update the Carbide compiler.
+              See \l{http://pepper.troll.no/s60prereleases/patches/}{here} for instructions how to check your
+              compiler version and how to patch it, if needed.
+           \endlist
+        \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/}{S60 Platform SDK 3rd Edition FP1 or higher}
+        \o \l{http://www.forum.nokia.com/main/resources/technologies/openc_cpp/}{Open C/C++ v1.6.0 or higher}. 
+           Install this to all S60 SDKs you plan to use Qt with.
+        \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 616] or later,
+           which is not available free of charge. 
+    \endlist
+
+    Running Qt on real device requires the following packages to be installed on your device.
+    The packages can be found in the S60 SDK where you installed Open C/C++:
+    \list
+        \o \c{nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis}
+        \o \c{nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis}
+        \o \c{nokia_plugin\opencpp\s60opencppsis\stdcpp_s60_<version>.sis}
+    \endlist
+
+    \note Users of \bold{S60 Platform SDK 3rd Edition FP1} also need special updates. The update can be found
+    \l{http://pepper.troll.no/s60prereleases/patches/}{here}.
+
+    \sa {Known Issues in %VERSION%}
+*/
diff --git a/doc/src/platform-notes.qdoc b/doc/src/platform-notes.qdoc
index 473892822d..d6f9328fbb 100644
--- a/doc/src/platform-notes.qdoc
+++ b/doc/src/platform-notes.qdoc
@@ -390,6 +390,19 @@
 */
 
 /*!
+    \page platform-notes-symbian.html
+    \title Platform Notes - Symbian
+    \contentspage Platform Notes
+
+    This page contains information about the Symbian platforms Qt is currently known
+    to run on. More information about the combinations of platforms and compilers
+    supported by Qt can be found on the \l{Supported Platforms} page.
+
+    For information about mixing exceptions with symbian leaves,
+    see \l{Exception Safety with Symbian}
+*/
+
+/*!
     \page platform-notes-embedded-linux.html
     \title Platform Notes - Embedded Linux
     \contentspage Platform Notes
diff --git a/doc/src/plugins-howto.qdoc b/doc/src/plugins-howto.qdoc
index 3e5cc931de..ab2e294d6f 100644
--- a/doc/src/plugins-howto.qdoc
+++ b/doc/src/plugins-howto.qdoc
@@ -186,6 +186,20 @@
     The \l{Style Plugin Example} shows how to implement a plugin
     that extends the QStylePlugin base class.
 
+    \note In Symbian all binaries must be located in the directory \\sys\\bin,
+    so each Qt plugin has a stub with the same basename as the plugin dll 
+    and suffix ".qtplugin" to make Qt extension plugins work similarly to
+    other platforms.
+    When trying to locate the plugin, Qt actually looks for the stub
+    instead of the plugin binary. While plugin stub files have the
+    suffix ".qtplugin", they can still be loaded also by specifying a filename
+    with the normal library suffix ".dll" for QPluginLoader, so normally application
+    developer doesn't need to care about the different suffix of the stub.
+    In Symbian the default plugin stubs path is \\resource\\qt\\plugins. 
+    Because of the way applications can be installed
+    on ROM or various other drives in Symbian, all available drives are 
+    searched for that path when looking for plugins.
+    
     \section1 The Lower-Level API: Extending Qt Applications
 
     Not only Qt itself but also Qt application can be extended
diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc
index 0921ae77e1..2985b89a6d 100644
--- a/doc/src/qmake-manual.qdoc
+++ b/doc/src/qmake-manual.qdoc
@@ -908,6 +908,89 @@
     This is discussed in more detail in the
     \l{Deploying an Application on Windows#Visual Studio 2005 Onwards}
     {deployment guide for Windows}.
+
+
+    \section1 S60
+
+    Features specific to this platform include handling of static data,
+    capabilities, stack and heap size, compiler specific options, and unique
+    identifiers for the application or library.
+
+    \section2 Handling of static data
+
+    If the application uses any static data, the build system needs to be
+    informed about it. This is because Symbian tries to save memory if no
+    static data is in use.
+
+    To specify that static data support is desired, add this to the project file:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 129
+
+    The default value is zero.
+
+    \section2 Stack and heap size
+
+    Symbian uses predefined sizes for stacks and heaps. If an
+    application exceeds either limit, it may crash or fail to complete its
+    task. Crashes that seem to have no reason can often be traced back to
+    insufficient stack and/or heap sizes.
+
+    The stack size has a maximum value, whereas the heap size has a
+    minimum and a maximum value, all specified in bytes. The minimum value
+    prevents the application from starting if that amount of memory is not available. The
+    minimum and maximum values are separated by a space. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 130
+
+    The default values depend on the version of the S60 SDK you're using.
+
+    \section2 Compiler specific options
+
+    General compiler options can as usual be set using \c QMAKE_CFLAGS and \c QMAKE_CXXFLAGS.
+    In order to set specific compiler options, \c QMAKE_CFLAGS.<compiler> and
+    \c QMAKE_CXXFLAGS.<compiler> can be used. \c <compiler> can be either \c CW for the WINSCW
+    architecture (emulator), or \c ARMCC for the ARMv5 architecture (hardware).
+
+    Here is an example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 131
+
+    \section2 Unique identifiers
+
+    Symbian applications may have unique identifiers attached to them.
+    Here is how to define them in a project file:
+
+    There are four types of IDs supported: \c UID2, \c UID3, \c SID, and \c VID. They
+    are specified like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 132
+
+    If \c UID2 is not specified, it defaults to the same value as \c UID3.
+    If \c UID3 is not specified, qmake will automatically generate a \c UID3
+    suitable for development and debugging. This value should be manually
+    specified for applications that are to be released. In order to optain
+    an official UID, please contact Nokia. Both \c SID and \c VID default to empty values.
+
+    For more information about unique identifiers and their meaning for
+    Symbian applications, please refer to the
+    \l{http://www.symbian.com/developer/techlib/v9.2docs/doc_source/ToolsAndUtilities/BuildTools/UsingUids.guide.html}{respective S60 SDK documentation}.
+
+    \section2 Capabilities
+
+    Capabilities define extra priviledges for the application, such as the
+    ability to list all files on the file system. Capabilities are defined
+    in the project file like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 133
+
+    It is also possible to specify which capabilities \e not to have,
+    by first specifying \c ALL and then list the unwanted capabilities
+    with a minus in front of them, like this:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 134
+
+    For more information about capabilities, please refer to the
+    \l{http://www.symbian.com/developer/techlib/v9.2docs/doc_source/guide/platsecsdk/index.html}{respective S60 SDK documentation}.
 */
 
 /*!
@@ -998,6 +1081,32 @@
 
     \tableofcontents{3}
 
+    \target BLD_INF_RULES
+    \section1 BLD_INF_RULES
+    
+    \e {This is only used on Symbian.}
+    
+    Generic \c bld.inf file content can be specified with \c BLD_INF_RULES variables. 
+    The section of \c bld.inf file where each rule goes is appended to 
+    \c BLD_INF_RULES with a dot.
+    
+    For example:
+    
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 146
+    
+    This will add the specified statements to the \c prj_exports section of the 
+    generated \c bld.inf file.
+    
+    It is also possible to add multiple rows in a single block. Each double
+    quoted string will be placed on a new row in the generated \c bld.inf file.
+    
+    For example: 
+    
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 143
+       
+    Any rules you define will be added after automatically generated
+    rules in each section.
+
     \target CONFIG
     \section1 CONFIG
 
@@ -1168,6 +1277,20 @@
     The build process for bundles is also influenced by
     the contents of the \l{#QMAKE_BUNDLE_DATA}{QMAKE_BUNDLE_DATA} variable.
 
+    These options only have an effect on Symbian:
+    
+    \table 95%
+    \header \o Option \o Description
+    \row \o stdbinary \o Builds an Open C binary (i.e. STDDLL, STDEXE, or STDLIB,
+         depending on the target binary type.)
+    \row \o no_icon \o Doesn't generate resources needed for displaying an icon
+         for executable in application menu (app only). 
+    \row \o symbian_test \o Places mmp files and extension makefiles under
+         test sections in generated bld.inf instead of their regular sections.
+         Note that this only affects automatically generated bld.inf content;
+         the content added via \c BLD_INF_RULES variable is not affected.
+    \endtable
+    
     These options have an effect on Linux/Unix platforms:
 
     \table 95%
@@ -1211,7 +1334,7 @@
     \target DEPLOYMENT
     \section1 DEPLOYMENT
 
-    \e {This is only used on Windows CE.}
+    \e {This is only used on Windows CE and Symbian.}
 
     Specifies which additional files will be deployed. Deployment means the
     transfer of files from the development system to the target device or
@@ -1229,7 +1352,8 @@
 
     The default deployment target path for Windows CE is
     \c{%CSIDL_PROGRAM_FILES%\target}, which usually gets expanded to
-    \c{\Program Files\target}.
+    \c{\Program Files\target}. For Symbian, the default target is the application
+    private directory on the drive it is installed to.
 
     It is also possible to specify multiple \c sources to be deployed on
     target \c paths. In addition, different variables can be used for
@@ -1239,24 +1363,63 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 29
 
-    \note All linked Qt libraries will be deployed to the path specified
-    by \c{myFiles.path}.
+    \note In Windows CE all linked Qt libraries will be deployed to the path
+    specified by \c{myFiles.path}. In Symbian all libraries and executables
+    will always be deployed to the \\sys\\bin of the installation drive.
+    
+    Since the Symbian build system automatically moves binaries to certain
+    directories under the epoc32 directory, custom plugins, executables or
+    dynamically loadable libraries need special handling. When deploying
+    extra executables or dynamically loadable libraries, the target path
+    must specify \\sys\\bin. For plugins, the target path must specify the
+    location where the plugin stub will be deployed to (see the 
+    \l{How to Create Qt Plugins} document for more information about plugins).
+    If the binary cannot be found from the indicated source path,
+    the directory Symbian build process moves the executables to is
+    searched, e.g. \\epoc32\\release\\armv5\\urel.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 128
 
+    In Symbian, dependencies to other packages can also be created using
+    this variable. The strings defined as dependencies are not parsed by 
+    qmake, so they should be in a format understood by Symbian package 
+    generation tools. Please consult Symbian documentation for correct syntax.
+    
+    For example: 
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 140
+    
+    In Symbian, the \c default_deployment item specifies 
+    default platform dependencies. It can be overwritten if a more 
+    restrictive set is needed - e.g. if a specific
+    device is required to run the application.
+    
+    For example:
+    
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 141
+    
     \target DEPLOYMENT_PLUGIN
     \section1 DEPLOYMENT_PLUGIN
 
-    \e {This is only used on Windows CE.}
+    \e {This is only used on Windows CE and Symbian.}
 
     This variable specifies the Qt plugins that will be deployed. All plugins
     available in Qt can be explicitly deployed to the device. See
     \l{Static Plugins}{Static Plugins} for a complete list.
 
-    \note No plugins will be deployed automatically. If the application
-    depends on plugins, these plugins have to be specified manually.
+    \note In Windows CE, No plugins will be deployed automatically. 
+    If the application depends on plugins, these plugins have to be specified 
+    manually.
+    
+    \note In Symbian, all plugins supported by this variable will be deployed
+    by default with Qt libraries, so generally using this variable is not 
+    needed.
 
     For example:
 
-    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 128
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 142
 
     This will upload the jpeg imageformat plugin to the plugins directory
     on the Windows CE device.
@@ -1356,7 +1519,14 @@
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 34
 
     See also \l{#SOURCES}{SOURCES}.
-
+    
+    \target ICON
+    \section1 ICON
+    
+    This variable is used only in MAC and S60 to set the application icon.
+    Please see \l{Setting the Application Icon}{the application icon documentation}
+    for more information.
+    
     \target INCLUDEPATH
     \section1 INCLUDEPATH
 
@@ -1412,9 +1582,9 @@
 
     This variable contains a list of libraries to be linked into the project.
     You can use the Unix \c -l (library) and -L (library path) flags and qmake
-    will do the correct thing with these libraries on Windows (namely this
-    means passing the full path of the library to the linker). The only
-    limitation to this is the library must exist, for qmake to find which
+    will do the correct thing with these libraries on Windows and Symbian
+    (namely this means passing the full path of the library to the linker). The
+    only limitation to this is the library must exist, for qmake to find which
     directory a \c -l lib lives in.
 
     For example:
@@ -1428,6 +1598,14 @@
     explicitly specify the library to be used by including the \c{.lib}
     file name suffix.
 
+    \bold{Note:} On S60, the build system makes a distinction between shared and
+    static libraries. In most cases, qmake will figure out which library you
+    are refering to, but in some cases you may have to specify it explicitly to
+    get the expected behavior. This typically happens if you are building a
+    library and using it in the same project. To specify that the library is
+    either shared or static, add a ".dll" or ".lib" suffix, respectively, to the
+    library name.
+
     By default, the list of libraries stored in \c LIBS is reduced to a list of
     unique names before it is used. To change this behavior, add the
     \c no_lflags_merge option to the \c CONFIG variable:
@@ -1463,6 +1641,37 @@
     when generating a Makefile.  The value of this variable is typically
     handled internally by \c qmake and rarely needs to be modified.
 
+    \target MMP_RULES
+    \section1 MMP_RULES
+    
+    \e {This is only used on Symbian.}
+    
+    Generic MMP file content can be specified with this variable. 
+    
+    For example:
+    
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 137
+    
+    This will add the specified statement to the end of the generated MMP file.
+    
+    It is also possible to add multiple rows in a single block. Each double
+    quoted string will be placed on a new row in the generated MMP file.
+    
+    For example: 
+    
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 138
+       
+    If you need to include a hash (\c{#}) character inside the
+    \c MMP_RULES statement, it can be done with the variable 
+    \c LITERAL_HASH as follows:
+    
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 139
+
+    \note You should not use this variable to add MMP statements that are
+    explicitly supported by their own variables, such as 
+    \c TARGET.EPOCSTACKSIZE. 
+    Doing so could result in duplicate statements in the MMP file.
+
     \target MOC_DIR
     \section1 MOC_DIR
 
@@ -1755,6 +1964,14 @@
     the \c QMAKE_CXXFLAGS_DEBUG and \c QMAKE_CXXFLAGS_RELEASE variables,
     respectively.
 
+    \bold{Note:} On S60, this variable can be used to pass architecture specific
+    options to each compiler in the Symbian build system. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 131
+
+    For more information, see
+    \l{qmake Platform Notes#Compiler specific options}{qmake Platform Notes}.
+
     \target QMAKE_CXXFLAGS_DEBUG
     \section1 QMAKE_CXXFLAGS_DEBUG
 
@@ -2542,6 +2759,49 @@
     This variable contains the name of the resource file for the application.
     The value of this variable is typically handled by \c qmake or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+     
+    \target RSS_RULES
+    \section1 RSS_RULES
+    
+    \e {This is only used on Symbian.}    
+    
+    Generic RSS file content can be specified with this variable. The syntax is 
+    similar to \c MMP_RULES and \c BLD_INF_RULES.
+    
+    For example:
+    
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 144
+    
+    This will add the specified statement to the end of the generated 
+    registration resource file. As an impact of this statement, the application
+    will not be visible in application shell.
+    
+    It is also possible to add multiple rows in a single block. Each double
+    quoted string will be placed on a new row in the registration resource file.
+    
+    For example: 
+    
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 145
+    
+    This example will install the application to MyFolder in S60 application
+    shell. In addition it will make the application to be launched in background.
+
+    For detailed list of possible RSS statements, please refer to Symbian OS help.    
+
+    \note You should not use \c RSS_RULES variable to set the following RSS statements:
+    
+    app_file
+    localisable_resource_file
+    localisable_resource_id
+
+    These statements are internally handled by qmake.     
+
+    \target S60_VERSION
+    \section1 S60_VERSION
+
+    \e {This is only used on Symbian.}
+    
+    Contains the version number of the underlying S60 SDK; e.g. "5.0".
 
     \target SIGNATURE_FILE
     \section1 SIGNATURE_FILE
@@ -2606,6 +2866,78 @@
     The project file above would produce an executable named \c myapp on
     unix and 'myapp.exe' on windows.
 
+    \target TARGET.CAPABILITY
+    \section1 TARGET.CAPABILITY
+
+    \e {This is only used on Symbian.}
+
+    Specifies which platform capabilities the application should have. For more
+    information, please refer to the S60 SDK documentation.
+
+    \target TARGET.EPOCALLOWDLLDATA
+    \section1 TARGET.EPOCALLOWDLLDATA
+
+    \e {This is only used on Symbian.}
+
+    Specifies whether static data should be allowed in the application. Symbian
+    disallows this by default in order to save memory. To use it, set this to 1.
+
+    \target TARGET.EPOCHEAPSIZE
+    \section1 TARGET.EPOCHEAPSIZE
+
+    \e {This is only used on Symbian.}
+
+    Specifies the minimum and maximum heap size of the application. The program
+    will refuse to run if the minimum size is not available when it starts. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 135
+
+    \target TARGET.EPOCSTACKSIZE
+    \section1 TARGET.EPOCSTACKSIZE
+
+    \e {This is only used on Symbian.}
+
+    Specifies the maximum stack size of the application. For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 136
+
+    \target TARGET.SID
+    \section1 TARGET.SID
+
+    \e {This is only used on Symbian.}
+
+    Specifies which secure identifier to use for the target application or
+    library. For more information, see the S60 SDK documentation.
+
+    \target TARGET.UID2
+    \section1 TARGET.UID2
+
+    \e {This is only used on Symbian.}
+
+    Specifies which unique identifier 2 to use for the target application or
+    library. If this variable is not specified, it defaults to the same value
+    as TARGET.UID3. For more information, see the S60 SDK documentation.
+
+    \target TARGET.UID3
+    \section1 TARGET.UID3
+
+    \e {This is only used on Symbian.}
+
+    Specifies which unique identifier 3 to use for the target application or
+    library. If this variable is not specified, a UID3 suitable for development
+    and debugging will be generated automatically. However, applications being
+    released should always define this variable. For more information, see the
+    S60 SDK documentation.
+
+    \target TARGET.VID
+    \section1 TARGET.VID
+
+    \e {This is only used on Symbian.}
+
+    Specifies which vendor identifier to use for the target application or
+    library. For more information, see the S60 SDK documentation.
+
     \section1 TARGET_EXT
 
     This variable specifies the target's extension.  The value of this variable
@@ -3421,22 +3753,70 @@
 
     \table
     \header
-        \o Member
-        \o Description
-    \row
-        \o combine
-        \o Indicates that all of the input files are combined into a single output file.
-    \row
-        \o target_predeps
-        \o Indicates that the output should be added to the list of PRE_TARGETDEPS.
-    \row
-        \o explicit_dependencies
-        \o The dependencies for the output only get generated from the depends member and from
-           nowhere else.
-    \row
-        \o no_link
-        \o Indicates that the output should not be added to the list of objects to be linked in
-    \endtable
+		\o Member
+		\o Description
+	\row
+		\o commands
+		\o The commands used for for generating the output from the input.
+	\row
+		\o CONFIG
+		\o Specific configuration options for the custom compiler.  See the CONFIG table for details.
+	\row
+		\o depend_command
+		\o Specifies a command used to generate the list of dependencies for the output.
+	\row
+		\o dependency_type
+		\o Specifies the type of file the output is, if it is a known type (such as TYPE_C, 
+		   TYPE_UI, TYPE_QRC) then it is handled as one of those type of files.
+	\row
+		\o depends
+		\o Specifies the dependencies of the output file.
+	\row 
+		\o input
+		\o The variable that contains the files that should be processed with the custom compiler.
+	\row 
+		\o name
+		\o A description of what the custom compiler is doing.  This is only used in some backends.
+	\row
+		\o output
+		\o The filename that is created from the custom compiler.
+	\row
+		\o output_function
+		\o Specifies a custom qmake function that is used to specify the filename to be created.
+	\row
+		\o variables
+		\o Indicates that the variables specified here are replaced with $(QMAKE_COMP_VARNAME) when refered to
+		   in the pro file as $(VARNAME).
+	\row
+		\o variable_out
+		\o The variable that the files created from the output should be added to. 
+	\endtable
+
+	List of members specific to the CONFIG option:
+
+	\table
+	\header
+		\o Member
+		\o Description
+	\row
+		\o combine
+		\o Indicates that all of the input files are combined into a single output file.
+	\row
+		\o target_predeps
+		\o Indicates that the output should be added to the list of PRE_TARGETDEPS.
+	\row
+		\o explicit_dependencies
+		\o The dependencies for the output only get generated from the depends member and from 
+		   nowhere else.
+	\row
+		\o no_link
+		\o Indicates that the output should not be added to the list of objects to be linked in.
+	\endtable
+
+    \note Symbian specific: Generating objects to be linked in is not supported in Symbian, 
+          so either the \c CONFIG option \c no_link or variable \c variable_out
+          should always be defined for extra compilers.
+    
 */
 
 /*!
diff --git a/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc
new file mode 100644
index 0000000000..537b37da7a
--- /dev/null
+++ b/doc/src/s60-introduction.qdoc
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page s60-with-qt-introduction.html
+
+    \title S60 - Introduction to using Qt
+    \brief An introduction to Qt for S60 developers.
+    \ingroup howto
+    \ingroup qts60
+
+    \tableofcontents
+
+    \section1 Required tools
+    
+    See \l{Qt for S60 Requirements} to see what tools are required to use Qt for S60.
+
+    \section1 Installing Qt and running demos
+    
+    Follow the instructions found in \l{Installing Qt on S60 using binary package} to learn how
+    to install Qt using binary package and how to build and run Qt demos.
+
+    Follow the instructions found in \l{Installing Qt on S60} to learn how to install Qt using
+    using source package and how to build and run the Qt demos.
+
+    \section1 Building your own applications
+
+    If you are new to Qt development, have a look at \l{How to Learn Qt}. 
+    In general, the difference between developing a
+    Qt application on S60 compared to any of the other platforms supported
+    by Qt is not that big.
+
+    Once you have crated a \c .pro file for your project, generate the
+    Carbide specific \c Bld.inf and \c .mmp files this way:
+
+    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 0
+
+    For more information on how to use qmake have a look at the \l
+    {qmake Tutorial}.
+
+    Now you can build the Qt on S60 application with standard build
+    tools. By default, running \c make will produce binaries for the
+    emulator. However, S60 comes with several alternative build targets,
+    as shown in the table below:
+
+    \table
+    \row \o \c debug-winscw  \o Build debug binaries for the emulator (default).
+                                It is currently not possible to build release
+                                binaries for the emulator.
+    \row \o \c debug-gcce    \o Build debug binaries for hardware using GCCE.
+    \row \o \c release-gcce  \o Build release binaries for hardware using GCCE.
+    \row \o \c debug-armv5   \o Build debug binaries for hardware using RVCT.
+    \row \o \c release-armv5 \o Build release binaries for hardware using RVCT.
+    \row \o \c run           \o Run the emulator binaries from the build directory.
+    \endtable
+
+    The following lines perform a debug build for the emulator
+    and deploy all the needed files:
+
+    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 1
+
+    To work on your project in Carbide, simply import the \c .pro file
+    by right clicking on the project explorer and executing "Import...".
+
+    \section1 Installing your own applications
+
+    To install your own applications on hardware, Qt comes with a tool called
+    \c createpackage. When used on the \c .pkg files created by qmake, it
+    will produce a signed \c .sis file that can be installed to the device. For
+    example:
+
+    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 2
+
+    If you want to install the program immediately, make sure that the device
+    is connected to the computer in "PC Suite" mode, and run \c createpackage
+    with the \c -i switch, like this:
+
+    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3
+*/
diff --git a/doc/src/snippets/code/doc_src_appicon.qdoc b/doc/src/snippets/code/doc_src_appicon.qdoc
index c8883fe388..c763a685e1 100644
--- a/doc/src/snippets/code/doc_src_appicon.qdoc
+++ b/doc/src/snippets/code/doc_src_appicon.qdoc
@@ -21,3 +21,7 @@ kde-config --path icon
 //! [4]
 gnome-config --datadir
 //! [4]
+
+//! [5]
+ICON = myapp.svg
+//! [5]
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index e35dad9f0b..489016d980 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -125,3 +125,41 @@ setcepaths wincewm50pocket-msvc2005
 //! [22]
 nmake
 //! [22]
+
+
+//! [23]
+cd \Qt\%VERSION%
+configure -platform win32-mwc -xplatform symbian-abld
+//! [23]
+
+
+//! [24]
+make debug-winscw
+//! [24]
+
+//! [25]
+cd examples
+qmake
+make
+cd ..\demos
+qmake
+make 
+//! [25]
+
+//! [27]
+make run
+//! [27]
+
+//! [28]
+make release-armv5
+//! [28]
+
+//! [29]
+cd src\s60installs
+createpackage -i qt_libs_armv5_urel.pkg <certificate file> <certificate key file>
+//! [29]
+
+//! [30]
+cd embedded\fluidlauncher
+createpackage -i fluidlauncher_armv5_urel.pkg
+//! [30]
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index 82c710d440..753d560480 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -809,5 +809,122 @@ CONFIG(debug, debug|release) {
 //! [127]
 
 //! [128]
-DEPLOYMENT_PLUGIN += qjpeg
+customplugin.sources = customimageplugin.dll
+customplugin.sources += c:\myplugins\othercustomimageplugin.dll
+customplugin.path = imageformats
+dynamiclibrary.sources = mylib.dll helper.exe
+dynamiclibrary.path = \sys\bin
+globalplugin.sources = someglobalimageplugin.dll
+globalplugin.path = \resource\qt\plugins\imageformats
+DEPLOYMENT += customplugin dynamiclibrary globalplugin
 //! [128]
+
+//! [129]
+TARGET.EPOCALLOWDLLDATA = 1
+//! [129]
+
+//! [130]
+TARGET.EPOCHEAPSIZE = 10000 10000000
+TARGET.EPOCSTACKSIZE = 0x8000
+//! [130]
+
+//! [131]
+QMAKE_CXXFLAGS.CW += -O2
+QMAKE_CXXFLAGS.ARMCC += -O0
+//! [131]
+
+//! [132]
+TARGET.UID2 = 0x00000001
+TARGET.UID3 = 0x00000002
+TARGET.SID = 0x00000003
+TARGET.VID = 0x00000004
+//! [132]
+
+//! [133]
+TARGET.CAPABILITY += AllFiles
+//! [133]
+
+//! [134]
+TARGET.CAPABILITY = ALL -TCB
+//! [134]
+
+//! [135]
+TARGET.EPOCHEAPSIZE = 10000 10000000
+//! [135]
+
+//! [136]
+TARGET.EPOCSTACKSIZE = 0x8000
+//! [136]
+
+//! [137]
+MMP_RULES += "DEFFILE hello.def"
+//! [137]
+
+//! [138]
+myBlock = \
+"START RESOURCE foo.rss" \
+"TARGET bar" \
+"TARGETPATH private\10001234" \
+"HEADER" \
+"LANG 01" \
+"UID 0x10002345 0x10003456" \
+"END"
+
+MMP_RULES += myBlock
+//! [138]
+
+//! [139]
+myIfdefBlock = \
+"$${LITERAL_HASH}ifdef WINSCW" \
+"DEFFILE hello_winscw.def" \
+"$${LITERAL_HASH}endif" 
+
+MMP_RULES += myIfdefBlock
+//! [139]
+
+//! [140]
+somelib.sources = somelib.dll
+somelib.path = \sys\bin
+somelib.depends = "(0x12345678), 2, 2, 0, {\"Some Package\"}" \
+                  "(0x87654321), 1, *, * ~ 2, 2, 0, {\"Some Other Package\"}"
+justdep.depends = "(0xAAAABBBB), 0, 2, 0, {\"My Framework\"}"                  
+DEPLOYMENT += somelib justdep
+//! [140]
+
+//! [141]
+default_deployment.depends = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}"
+//! [141]
+
+//! [142]
+DEPLOYMENT_PLUGIN += qjpeg
+//! [142]
+
+//! [143]
+myextension = \
+    "start extension myextension" \
+    "$${LITERAL_HASH}if defined(WINSCW)" \
+    "option MYOPTION foo" \
+    "$${LITERAL_HASH}endif" \
+    "option MYOPTION bar" \
+    "end"
+BLD_INF_RULES.prj_extensions += myextension
+//! [143]
+
+//! [144]
+RSS_RULES += "hidden = KAppIsHidden;" 
+//! [144]
+
+//! [145]
+myrssrules = \
+    "hidden = KAppIsHidden;" \
+    "launch = KAppLaunchInBackground;" \
+RSS_RULES += myrssrules
+//! [145]
+
+//! [146]
+BLD_INF_RULES.prj_exports += \
+    "$${LITERAL_HASH}include <platform_paths.hrh>" \
+    "rom/my.iby  APP_LAYER_PUBLIC_EXPORT_PATH(my.iby)" \
+    "inc/myheader.h mycomp/myheader.h" \
+    ":zip my_api.zip my_api"
+//! [146]
diff --git a/doc/src/snippets/code/doc_src_s60-introduction.qdoc b/doc/src/snippets/code/doc_src_s60-introduction.qdoc
new file mode 100644
index 0000000000..ff1d159c21
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_s60-introduction.qdoc
@@ -0,0 +1,16 @@
+//! [0]
+    qmake
+//! [0]
+
+
+//! [1]
+    make debug-winscw
+//! [1]
+
+//! [2]
+    createpackage wiggly_gcce_udeb.pkg
+//! [2]
+
+//! [3]
+    createpackage -i wiggly_gcce_udeb.pkg
+//! [3]
diff --git a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
new file mode 100644
index 0000000000..7de42b7caa
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
@@ -0,0 +1,82 @@
+//! [0]
+void myFunction(bool useSubClass)
+{
+    MyClass *p = useSubClass ? new MyClass() : new MySubClass;
+    QIODevice *device = handsOverOwnership();
+
+    if (m_value > 3) {
+        delete p;
+        delete device;
+        return;
+    }
+
+    try {
+        process(device);
+    }
+    catch (...) {
+        delete p;
+        delete device;
+        throw;
+    }
+
+    delete p;
+    delete device;
+}
+//! [0]
+
+//! [1]
+void myFunction(bool useSubClass)
+{
+    QScopedPointer<MyClass> p(useSubClass ? new MyClass() : new MySubClass);
+    QScopedPointer<QIODevice> device(handsOverOwnership());
+
+    if (m_value > 3)
+        return;
+
+    process(device);
+}
+//! [1]
+
+//! [2]
+    const QWidget *const p = new QWidget();
+    // is equivalent to:
+    const QScopedPointer<const QWidget> p(new QWidget());
+
+    QWidget *const p = new QWidget();
+    // is equivalent to:
+    const QScopedPointer<QWidget> p(new QWidget());
+
+    QWidget *const p = new QWidget();
+    // is equivalent to:
+    const QScopedPointer<QWidget> p(new QWidget());
+
+    const QWidget *p = new QWidget();
+    // is equivalent to:
+    QScopedPointer<const QWidget> p(new QWidget());
+
+//! [2]
+
+//! [3]
+if (scopedPointer) {
+    ...
+}
+//! [3]
+
+//! [4]
+class MyPrivateClass; // forward declare MyPrivateClass
+
+class MyClass
+{
+private:
+    QScopedPointer<MyPrivateClass> privatePtr; // QScopedPointer to forward declared class
+
+public:
+    MyClass(); // OK
+    inline ~MyClass() {} // VIOLATION - Destructor must not be inline
+
+private:
+    Q_DISABLE_COPY(MyClass) // OK - copy constructor and assignment operators
+                             // are now disabled, so the compiler won't implicitely
+                             // generate them.
+};
+//! [4]
diff --git a/doc/src/symbian-exceptionsafety.qdoc b/doc/src/symbian-exceptionsafety.qdoc
new file mode 100644
index 0000000000..56b28c9828
--- /dev/null
+++ b/doc/src/symbian-exceptionsafety.qdoc
@@ -0,0 +1,183 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page symbianexceptionsafety.html
+    \title Exception Safety with Symbian
+    \ingroup qts60
+    \brief A guide to integrating exception safety in Qt with Symbian.
+
+    The following sections describe how Qt code can interoperate with Symbian's
+    exception safety system.
+
+    \tableofcontents
+
+    \section1 What the problem is
+    
+    Qt and Symbian have different exception systems. Qt works with standard C++ 
+    exceptions, whereas Symbian has its TRAP/Leave/CleanupStack system. So, what would 
+    happen if you mix the two systems? It could go wrong in a number of ways.
+
+    Clean-up ordering would be different between the two. When Symbian code 
+    leaves, the clean-up stack is cleaned up before anything else happens. After 
+    that, the objects on the call stack would be cleaned up as with a normal 
+    exception. So if there are any dependencies between stack-based and  
+    objects owned by the clean-up stack, there could be problems due to this
+    ordering.
+
+    Symbian's \c XLeaveException, which is used when Symbian implements leaves as 
+    exceptions, is not derived from \c std::exception, so would not be caught in 
+    Qt catch statements designed to catch \c std::exception. 
+
+    Qt's and standard C++'s \c std::exception derived exceptions result in program 
+    termination if they fall back to a Symbian TRAP. 
+
+	These problems can be solved with barrier macros and helper functions that 
+	will translate between the two exception systems. Use them, in Qt code, 
+	whenever calling into or being called from Symbian code.
+
+    \section1 Qt calls to Symbian
+
+    When calling Symbian leaving functions from Qt code, we want to translate 
+    Symbian leaves to standard C++ exceptions. The following help is provided:
+
+    \list
+        \o \l qt_translateSymbianErrorToException() takes a Symbian
+        error code and throws an appropriate exception to represent it. 
+        This will do nothing if the error code is not in fact an error. The 
+        function is equivalent to Symbian's \c User::LeaveIfError.
+        \o \l QT_TRANSLATE_SYMBIAN_LEAVE_TO_EXCEPTION() takes a Symbian leaving
+        code fragment f and runs it under a trap harness converting any resulting 
+        error into an exception.
+        \o \c TRAP and \c TRAPD from the Symbian libraries can be used to convert 
+        leaves to error codes. 
+    \endlist
+
+    \code
+    HBufC* buf=0;
+    // this will throw a std::bad_alloc because we've asked for too much memory
+    QT_TRANSLATE_SYMBIAN_LEAVE_TO_EXCEPTION(buf = HBufC::NewL(100000000));
+
+    _LIT(KStr,"abc");
+    TInt pos = KStr().Locate('c');
+    // pos is a good value, >= 0, so no exception is thrown
+    qt_translateSymbianErrorToException(pos);
+    
+    pos = KStr().Locate('d');
+    // pos == KErrNotFound, so this throws an exception
+    qt_translateSymbianErrorToException(pos);
+    \endcode
+    
+    \section1 Qt called from Symbian
+
+    When Qt code is called from Symbian, we want to translate standard C++ 
+    exceptions to Symbian leaves or error codes. The following help is 
+    provided:
+
+    \list
+        \o \l qt_translateExceptionToSymbianError() -
+        this takes a standard exception and gives an appropriate Symbian 
+        error code. If no mapping is known for the exception type, 
+        \c KErrGeneral is returned.
+        \o \l qt_translateExceptionToSymbianErrorL() -
+        this takes a standard exception and generates an appropriate Symbian 
+        leave.
+        \o \l QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_ERROR() - this macro
+        takes the standard C++ code fragment \c f, catches any std::exceptions 
+        thrown from it, and sets err to the corresponding Symbian error code. 
+        err is set to \c KErrNone otherwise.
+        \o \l QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE() - this macro takes the
+        standard C++ code fragment \c f, catches any std::exceptions thrown from 
+        it, and throws a corresponding Symbian leave. 
+    \endlist
+    
+    \code
+    TInt DoTickL() // called from an active object RunL, ie Symbian leaves expected
+        {
+        // without the translation to Symbian Leave, we get a USER:0 panic
+        QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE({
+            int* x = new int[100000000];            // compiled as Qt code, will throw std::bad_alloc
+            delete [] x;
+        });
+        return 0;
+        }
+    \endcode
+
+    \section1 Common sense things
+
+    Try to minimise the interleaving of Symbian and Qt code, every switch 
+    requires a barrier. Grouping the code styles in different blocks will 
+    minimise the problems. For instance, examine the following code.
+
+    \code
+    1.    TRAPD(err, m_playUtility = CMdaAudioPlayerUtility::NewL(*this);
+    2.               QString filepath = QFileInfo( m_sound->fileName() ).absoluteFilePath();
+    3.               filepath = QDir::toNativeSeparators(filepath);
+    4.               m_playUtility->OpenFileL(qt_QString2TPtrC(filepath)));
+    \endcode
+
+    Line 1 starts a Symbian leave handling block, which is good because it 
+    also uses a Symbian leave generating function.
+
+    Line 2 creates a \l QString, uses \l QFileInfo and various member functions. 
+    These could all throw exceptions, which is not good inside a \c TRAP block.
+
+    Line 3 is unclear as to whether it might throw an exception, but since 
+    it's dealing with strings it probably does, again bad.
+
+    Line 4 is tricky, it calls a leaving function which is ok within a \c TRAP, 
+    but it also uses a helper function to convert string types. In this case
+    the helper function may cause an unwelcome exception.
+
+    We could rewrite this with nested exception translations, but it's much 
+    easier to refactor it. 
+
+    \code
+    QString filepath = QFileInfo( m_sound->fileName() ).absoluteFilePath();
+    filepath = QDir::toNativeSeparators(filepath);
+    TPtrC filepathPtr(qt_QString2TPtrC(filepath));
+    TRAPD(err, m_playUtility = CMdaAudioPlayerUtility::NewL(*this);
+               m_playUtility->OpenFileL(filepathPtr));
+    \endcode
+
+    Now the exception generating functions are separated from the leaving 
+    functions.
+*/
diff --git a/doc/src/topics.qdoc b/doc/src/topics.qdoc
index 15be0ade2e..0fe5c5f7c6 100644
--- a/doc/src/topics.qdoc
+++ b/doc/src/topics.qdoc
@@ -288,3 +288,18 @@ including ARM, Intel x86, MIPS and SH-4.
 \endlist
 \endtable
 */
+
+/*!
+\group qts60
+\title Qt for S60
+\ingroup topics
+\ingroup qt-embedded
+\brief Documents related to Qt for S60
+
+Qt for S60 is a C++ framework for GUI and application development
+for embedded devices running Symbian.
+
+\list
+    \o \l {Exception Safety with Symbian}
+\endlist
+*/
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index 262e1a1506..1cd05f61d6 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -18,3 +18,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/activeqt
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS activeqt.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/activeqt/comapp/comapp.pro b/examples/activeqt/comapp/comapp.pro
index 84ce072b10..29aebae58e 100644
--- a/examples/activeqt/comapp/comapp.pro
+++ b/examples/activeqt/comapp/comapp.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/comapp
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS comapp.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/comapp
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/examples/activeqt/hierarchy/hierarchy.pro
index abe5f1bb2b..d0ebbcd206 100644
--- a/examples/activeqt/hierarchy/hierarchy.pro
+++ b/examples/activeqt/hierarchy/hierarchy.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/hierarchy
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hierarchy.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/hierarchy
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/activeqt/menus/menus.pro b/examples/activeqt/menus/menus.pro
index c962b6b718..8963bad405 100644
--- a/examples/activeqt/menus/menus.pro
+++ b/examples/activeqt/menus/menus.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/menus
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS menus.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/menus
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/activeqt/multiple/multiple.pro b/examples/activeqt/multiple/multiple.pro
index 7b86950a30..97acc9a4aa 100644
--- a/examples/activeqt/multiple/multiple.pro
+++ b/examples/activeqt/multiple/multiple.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/multiple
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multiple.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/multiple
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/activeqt/opengl/opengl.pro b/examples/activeqt/opengl/opengl.pro
index 8eb81beaf5..4979dc09cb 100644
--- a/examples/activeqt/opengl/opengl.pro
+++ b/examples/activeqt/opengl/opengl.pro
@@ -17,3 +17,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/opengl
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/opengl
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/activeqt/qutlook/qutlook.pro b/examples/activeqt/qutlook/qutlook.pro
index c1154e0ddd..0387735e8c 100644
--- a/examples/activeqt/qutlook/qutlook.pro
+++ b/examples/activeqt/qutlook/qutlook.pro
@@ -21,3 +21,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/qutlook
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qutlook.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/qutlook
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/activeqt/simple/simple.pro b/examples/activeqt/simple/simple.pro
index d0f201947a..4d8480eebc 100644
--- a/examples/activeqt/simple/simple.pro
+++ b/examples/activeqt/simple/simple.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simple
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS simple.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simple
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro
index 32eac71869..c3e6e1ee4f 100644
--- a/examples/activeqt/webbrowser/webbrowser.pro
+++ b/examples/activeqt/webbrowser/webbrowser.pro
@@ -15,3 +15,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/webbrowser
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS webbrowser.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/webbrowser
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/activeqt/wrapper/wrapper.pro b/examples/activeqt/wrapper/wrapper.pro
index 4eb6baf6cb..e109dba93c 100644
--- a/examples/activeqt/wrapper/wrapper.pro
+++ b/examples/activeqt/wrapper/wrapper.pro
@@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/wrapper
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wrapper.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/activeqt/wrapper
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/assistant/assistant.pro b/examples/assistant/assistant.pro
index 14771788e0..b724bcb6f5 100644
--- a/examples/assistant/assistant.pro
+++ b/examples/assistant/assistant.pro
@@ -6,3 +6,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/assistant
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS assistant.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/assistant
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/assistant/simpletextviewer/simpletextviewer.pro b/examples/assistant/simpletextviewer/simpletextviewer.pro
index 4b66edb3cc..4bbdaf1a9d 100644
--- a/examples/assistant/simpletextviewer/simpletextviewer.pro
+++ b/examples/assistant/simpletextviewer/simpletextviewer.pro
@@ -14,3 +14,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES documentation *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/assistant/simpletextviewer
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
diff --git a/examples/dbus/complexpingpong/complexping.pro b/examples/dbus/complexpingpong/complexping.pro
index 4b37b038a8..7c46533f9a 100644
--- a/examples/dbus/complexpingpong/complexping.pro
+++ b/examples/dbus/complexpingpong/complexping.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dbus/complexpingpong/complexpong.pro b/examples/dbus/complexpingpong/complexpong.pro
index e62fb8569a..b4d4d1aa9e 100644
--- a/examples/dbus/complexpingpong/complexpong.pro
+++ b/examples/dbus/complexpingpong/complexpong.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dbus/dbus-chat/dbus-chat.pro b/examples/dbus/dbus-chat/dbus-chat.pro
index a094048850..e04c641c5a 100644
--- a/examples/dbus/dbus-chat/dbus-chat.pro
+++ b/examples/dbus/dbus-chat/dbus-chat.pro
@@ -17,3 +17,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dbus/chat
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
 sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/chat
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro
index 36bdc1a552..e4a4f70f88 100644
--- a/examples/dbus/dbus.pro
+++ b/examples/dbus/dbus.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dbus
 sources.files = *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dbus
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dbus/listnames/listnames.pro b/examples/dbus/listnames/listnames.pro
index e2096a7c06..b8a648ee3d 100644
--- a/examples/dbus/listnames/listnames.pro
+++ b/examples/dbus/listnames/listnames.pro
@@ -15,3 +15,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
diff --git a/examples/dbus/pingpong/ping.pro b/examples/dbus/pingpong/ping.pro
index 5e5f07afef..e28060f6f2 100644
--- a/examples/dbus/pingpong/ping.pro
+++ b/examples/dbus/pingpong/ping.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dbus/pingpong/pong.pro b/examples/dbus/pingpong/pong.pro
index f377a71f28..ed06d222e2 100644
--- a/examples/dbus/pingpong/pong.pro
+++ b/examples/dbus/pingpong/pong.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dbus/remotecontrolledcar/car/car.pro b/examples/dbus/remotecontrolledcar/car/car.pro
index d4a97fa65a..600c3f2e8b 100644
--- a/examples/dbus/remotecontrolledcar/car/car.pro
+++ b/examples/dbus/remotecontrolledcar/car/car.pro
@@ -18,3 +18,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml
 sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.pro b/examples/dbus/remotecontrolledcar/controller/controller.pro
index 3015127cb9..b31d418421 100644
--- a/examples/dbus/remotecontrolledcar/controller/controller.pro
+++ b/examples/dbus/remotecontrolledcar/controller/controller.pro
@@ -19,3 +19,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
 sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
index 73bfa37d00..0df8e1ff2d 100644
--- a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
+++ b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
@@ -6,3 +6,5 @@ SUBDIRS = car \
 sources.files = *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/designer/calculatorbuilder/calculatorbuilder.pro b/examples/designer/calculatorbuilder/calculatorbuilder.pro
index 1d69cc856f..e08220a0a3 100644
--- a/examples/designer/calculatorbuilder/calculatorbuilder.pro
+++ b/examples/designer/calculatorbuilder/calculatorbuilder.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/designer/calculatorbuilder
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.ui *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/designer/calculatorbuilder
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/designer/calculatorform/calculatorform.pro b/examples/designer/calculatorform/calculatorform.pro
index 73f4351325..5a133a9cce 100644
--- a/examples/designer/calculatorform/calculatorform.pro
+++ b/examples/designer/calculatorform/calculatorform.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/designer/calculatorform
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/designer/calculatorform
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro
index 6a2cb58d12..9b2b8bc959 100644
--- a/examples/designer/containerextension/containerextension.pro
+++ b/examples/designer/containerextension/containerextension.pro
@@ -24,3 +24,5 @@ target.path = $$[QT_INSTALL_PLUGINS]/designer
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/designer/containerextension
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro
index 4feee59f6a..6cc376f0c7 100644
--- a/examples/designer/customwidgetplugin/customwidgetplugin.pro
+++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro
@@ -19,3 +19,5 @@ target.path = $$[QT_INSTALL_PLUGINS]/designer
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/designer/customwidgetplugin
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
index 0f30421aca..b7eacc086a 100644
--- a/examples/designer/designer.pro
+++ b/examples/designer/designer.pro
@@ -17,3 +17,5 @@ solaris-cc*:SUBDIRS -= calculatorbuilder \
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/designer
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro
index 83dd8788c3..89c0c44f2c 100644
--- a/examples/designer/taskmenuextension/taskmenuextension.pro
+++ b/examples/designer/taskmenuextension/taskmenuextension.pro
@@ -23,3 +23,5 @@ target.path = $$[QT_INSTALL_PLUGINS]/designer
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/designer/taskmenuextension
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
index 2690921673..0123fd13b3 100644
--- a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
+++ b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/designer/worldtimeclockbuilder
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.ui *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/designer/worldtimeclockbuilder
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
index cd117dc05d..5eb133f1fa 100644
--- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
+++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
@@ -19,3 +19,5 @@ target.path = $$[QT_INSTALL_PLUGINS]/designer
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/designer/worldtimeclockplugin
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/desktop/desktop.pro b/examples/desktop/desktop.pro
index b65f4f2d8b..61108e509c 100644
--- a/examples/desktop/desktop.pro
+++ b/examples/desktop/desktop.pro
@@ -2,10 +2,12 @@ TEMPLATE      = subdirs
 CONFIG       += ordered
 SUBDIRS       = screenshot
 
-contains(QT_CONFIG, svg): SUBDIRS += systray
+!symbian:contains(QT_CONFIG, svg): SUBDIRS += systray
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/desktop
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/desktop
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/desktop/screenshot/screenshot.pro b/examples/desktop/screenshot/screenshot.pro
index 3ecbf8f50a..b610812c82 100644
--- a/examples/desktop/screenshot/screenshot.pro
+++ b/examples/desktop/screenshot/screenshot.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/desktop/screenshot
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/desktop/screenshot
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/desktop/systray/systray.pro b/examples/desktop/systray/systray.pro
index c73a48e9b9..3c0862636a 100644
--- a/examples/desktop/systray/systray.pro
+++ b/examples/desktop/systray/systray.pro
@@ -10,6 +10,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS systray.pro resources im
 sources.path = $$[QT_INSTALL_EXAMPLES]/desktop/systray
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 wince* {
 	CONFIG(debug, release|debug) {
 		addPlugins.sources = $$QT_BUILD_TREE/plugins/imageformats/qsvgd4.dll
diff --git a/examples/dialogs/classwizard/classwizard.pro b/examples/dialogs/classwizard/classwizard.pro
index 15b602988f..0515a8a9f1 100644
--- a/examples/dialogs/classwizard/classwizard.pro
+++ b/examples/dialogs/classwizard/classwizard.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/classwizard
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/classwizard
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dialogs/configdialog/configdialog.pro b/examples/dialogs/configdialog/configdialog.pro
index 344a394e6c..5ef381049c 100644
--- a/examples/dialogs/configdialog/configdialog.pro
+++ b/examples/dialogs/configdialog/configdialog.pro
@@ -10,5 +10,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/configdialog
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/configdialog
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
 
diff --git a/examples/dialogs/dialogs.pro b/examples/dialogs/dialogs.pro
index b9f029a0e1..6d0ed8dc6e 100644
--- a/examples/dialogs/dialogs.pro
+++ b/examples/dialogs/dialogs.pro
@@ -5,7 +5,7 @@ SUBDIRS       = classwizard \
                 tabdialog \
                 trivialwizard
 
-!wince*: SUBDIRS += licensewizard \
+!symbian:!wince*: SUBDIRS += licensewizard \
                     extension \
                     findfiles
 
@@ -15,3 +15,5 @@ wince*: SUBDIRS += sipdialog
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dialogs/extension/extension.pro b/examples/dialogs/extension/extension.pro
index 3e56cb9984..7f80f9c0a9 100644
--- a/examples/dialogs/extension/extension.pro
+++ b/examples/dialogs/extension/extension.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/extension
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/extension
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dialogs/findfiles/findfiles.pro b/examples/dialogs/findfiles/findfiles.pro
index 99be394186..6820c173ea 100644
--- a/examples/dialogs/findfiles/findfiles.pro
+++ b/examples/dialogs/findfiles/findfiles.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/findfiles
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/findfiles
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dialogs/licensewizard/licensewizard.pro b/examples/dialogs/licensewizard/licensewizard.pro
index fd5e37ccff..789dae0462 100644
--- a/examples/dialogs/licensewizard/licensewizard.pro
+++ b/examples/dialogs/licensewizard/licensewizard.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/licensewizard
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/licensewizard
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/dialogs/sipdialog/sipdialog.pro b/examples/dialogs/sipdialog/sipdialog.pro
index 69667eba01..3d5503f616 100644
--- a/examples/dialogs/sipdialog/sipdialog.pro
+++ b/examples/dialogs/sipdialog/sipdialog.pro
@@ -7,6 +7,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/sipdialog
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/sipdialog
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
 
 
diff --git a/examples/dialogs/standarddialogs/standarddialogs.pro b/examples/dialogs/standarddialogs/standarddialogs.pro
index 6bfa6bfc38..9b06e5cf3e 100644
--- a/examples/dialogs/standarddialogs/standarddialogs.pro
+++ b/examples/dialogs/standarddialogs/standarddialogs.pro
@@ -7,5 +7,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/standarddialogs
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/standarddialogs
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
 
diff --git a/examples/dialogs/tabdialog/tabdialog.pro b/examples/dialogs/tabdialog/tabdialog.pro
index 3239a72a58..f3fa95df4b 100644
--- a/examples/dialogs/tabdialog/tabdialog.pro
+++ b/examples/dialogs/tabdialog/tabdialog.pro
@@ -7,4 +7,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/tabdialog
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/tabdialog
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
diff --git a/examples/dialogs/trivialwizard/trivialwizard.pro b/examples/dialogs/trivialwizard/trivialwizard.pro
index 970e12f250..27bb8d9a7a 100644
--- a/examples/dialogs/trivialwizard/trivialwizard.pro
+++ b/examples/dialogs/trivialwizard/trivialwizard.pro
@@ -5,3 +5,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/trivialwizard
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/trivialwizard
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/draganddrop/delayedencoding/delayedencoding.pro b/examples/draganddrop/delayedencoding/delayedencoding.pro
index c7b95b6ed5..7315ac59a7 100644
--- a/examples/draganddrop/delayedencoding/delayedencoding.pro
+++ b/examples/draganddrop/delayedencoding/delayedencoding.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/delayedencoding
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/delayedencoding
 INSTALLS += target sources
+
+symbian:TARGET.UID3 = 0xA000C614
\ No newline at end of file
diff --git a/examples/draganddrop/draganddrop.pro b/examples/draganddrop/draganddrop.pro
index 0cd881ac2d..fa857db14c 100644
--- a/examples/draganddrop/draganddrop.pro
+++ b/examples/draganddrop/draganddrop.pro
@@ -8,7 +8,7 @@ SUBDIRS     = draggableicons \
 contains(QT_CONFIG, svg): SUBDIRS += delayedencoding
 
 wince*: SUBDIRS -= dropsite
-
+symbian: SUBDIRS -= dropsite
 # install
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop
diff --git a/examples/draganddrop/draggableicons/draggableicons.pro b/examples/draganddrop/draggableicons/draggableicons.pro
index 74cfda9e36..6d53baab93 100644
--- a/examples/draganddrop/draggableicons/draggableicons.pro
+++ b/examples/draganddrop/draggableicons/draggableicons.pro
@@ -8,3 +8,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/draggableicons
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/draggableicons
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C615
\ No newline at end of file
diff --git a/examples/draganddrop/draggabletext/draggabletext.pro b/examples/draganddrop/draggabletext/draggabletext.pro
index 07c7c24b46..15d909d4a5 100644
--- a/examples/draganddrop/draggabletext/draggabletext.pro
+++ b/examples/draganddrop/draggabletext/draggabletext.pro
@@ -10,3 +10,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/draggabletext
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.txt *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/draggabletext
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000CF64
\ No newline at end of file
diff --git a/examples/draganddrop/dropsite/dropsite.pro b/examples/draganddrop/dropsite/dropsite.pro
index 29dd0fdb4d..268e2478b0 100644
--- a/examples/draganddrop/dropsite/dropsite.pro
+++ b/examples/draganddrop/dropsite/dropsite.pro
@@ -10,3 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/dropsite
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
diff --git a/examples/draganddrop/fridgemagnets/dragwidget.cpp b/examples/draganddrop/fridgemagnets/dragwidget.cpp
index a9a0b41695..81dbc00705 100644
--- a/examples/draganddrop/fridgemagnets/dragwidget.cpp
+++ b/examples/draganddrop/fridgemagnets/dragwidget.cpp
@@ -75,9 +75,12 @@ DragWidget::DragWidget(QWidget *parent)
 //! [1]
 
 //! [2]
+    #ifndef Q_WS_S60
+    //Fridge magnets is used for demoing Qt on S60 and themed backgrounds look better than white 
     QPalette newPalette = palette();
     newPalette.setColor(QPalette::Window, Qt::white);
     setPalette(newPalette);
+    #endif
 
     setMinimumSize(400, qMax(200, y));
     setWindowTitle(tr("Fridge Magnets"));
diff --git a/examples/draganddrop/fridgemagnets/fridgemagnets.pro b/examples/draganddrop/fridgemagnets/fridgemagnets.pro
index f1baaefdac..b452746dfd 100644
--- a/examples/draganddrop/fridgemagnets/fridgemagnets.pro
+++ b/examples/draganddrop/fridgemagnets/fridgemagnets.pro
@@ -10,3 +10,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/fridgemagnets
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
 sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/fridgemagnets
 INSTALLS += target sources
+TARGET.UID3 = 0xA000C610
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/draganddrop/fridgemagnets/main.cpp b/examples/draganddrop/fridgemagnets/main.cpp
index fa37e86724..28bd8c9d39 100644
--- a/examples/draganddrop/fridgemagnets/main.cpp
+++ b/examples/draganddrop/fridgemagnets/main.cpp
@@ -45,9 +45,16 @@
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(fridgemagnets);
+    bool smallScreen = false;
+    for (int i=0; i<argc; i++)
+        if (QString(argv[i]) == "-small-screen")
+            smallScreen = true;
 
     QApplication app(argc, argv);
     DragWidget window;
-    window.show();
+    if (smallScreen)
+        window.showFullScreen();
+    else
+        window.show();
     return app.exec();
 }
diff --git a/examples/draganddrop/puzzle/puzzle.pro b/examples/draganddrop/puzzle/puzzle.pro
index 26d2350e3d..ecaf706614 100644
--- a/examples/draganddrop/puzzle/puzzle.pro
+++ b/examples/draganddrop/puzzle/puzzle.pro
@@ -13,6 +13,14 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
 sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/puzzle
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:{
+   addFile.sources = example.jpg
+   addFile.path = .
+   DEPLOYMENT += addFile
+   TARGET.UID3 = 0xA000CF65
+}
 wince*: {
    addFile.sources = example.jpg
    addFile.path = .
diff --git a/examples/examplebase.pri b/examples/examplebase.pri
new file mode 100644
index 0000000000..eff6588df6
--- /dev/null
+++ b/examples/examplebase.pri
@@ -0,0 +1 @@
+symbian:RSS_RULES ="group_name=\"QtExamples\";" 
\ No newline at end of file
diff --git a/examples/examples.pro b/examples/examples.pro
index 5855e4f38f..27d6709b8b 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -26,10 +26,22 @@ SUBDIRS       = \
                 multitouch \
                 gestures
 
+symbian: SUBDIRS = \
+                graphicsview \
+                itemviews \
+                network \
+                painting \
+                widgets \
+                draganddrop \
+                mainwindows \
+                script \
+                sql \
+                xml
+
 contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
 contains(QT_CONFIG, webkit): SUBDIRS += webkit
 embedded:SUBDIRS += qws
-!wince*: {
+!wince*:!symbian: {
 	!contains(QT_EDITION, Console):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer
 	contains(QT_BUILD_PARTS, tools):SUBDIRS += assistant qtestlib help
 } else {
@@ -46,3 +58,5 @@ contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
index a166882adb..956f5c27ac 100644
--- a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
+++ b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
@@ -10,3 +10,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/basicgraphicslayouts
 sources.files = $$SOURCES $$HEADERS $$RESOURCES basicgraphicslayouts.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/basicgraphicslayouts
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A645
\ No newline at end of file
diff --git a/examples/graphicsview/collidingmice/collidingmice.pro b/examples/graphicsview/collidingmice/collidingmice.pro
index 77543b5c85..a434efcf34 100644
--- a/examples/graphicsview/collidingmice/collidingmice.pro
+++ b/examples/graphicsview/collidingmice/collidingmice.pro
@@ -12,3 +12,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/collidingmice
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS collidingmice.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/collidingmice
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A643
\ No newline at end of file
diff --git a/examples/graphicsview/diagramscene/diagramscene.pro b/examples/graphicsview/diagramscene/diagramscene.pro
index fe261bd80f..9e90e0d534 100644
--- a/examples/graphicsview/diagramscene/diagramscene.pro
+++ b/examples/graphicsview/diagramscene/diagramscene.pro
@@ -18,3 +18,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/diagramscene
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
diff --git a/examples/graphicsview/dragdroprobot/dragdroprobot.pro b/examples/graphicsview/dragdroprobot/dragdroprobot.pro
index 769e54ad04..756a9c8d42 100644
--- a/examples/graphicsview/dragdroprobot/dragdroprobot.pro
+++ b/examples/graphicsview/dragdroprobot/dragdroprobot.pro
@@ -16,3 +16,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/dragdroprobot
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/dragdroprobot
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/graphicsview/elasticnodes/elasticnodes.pro b/examples/graphicsview/elasticnodes/elasticnodes.pro
index 77ca706ba5..800eaae7b7 100644
--- a/examples/graphicsview/elasticnodes/elasticnodes.pro
+++ b/examples/graphicsview/elasticnodes/elasticnodes.pro
@@ -9,8 +9,14 @@ SOURCES += \
         node.cpp \
         graphwidget.cpp
 
+TARGET.EPOCHEAPSIZE = 0x200000 0xA00000
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/elasticnodes
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS elasticnodes.pro 
 sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/elasticnodes
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A642
\ No newline at end of file
diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro
index 66eb0b41f5..e955725b15 100644
--- a/examples/graphicsview/graphicsview.pro
+++ b/examples/graphicsview/graphicsview.pro
@@ -1,18 +1,22 @@
-TEMPLATE      = \
-              subdirs
+TEMPLATE      = subdirs
 SUBDIRS       = \
               elasticnodes \
               collidingmice \
+              padnavigator \
+	      basicgraphicslayouts
+
+!symbian: SUBDIRS += \
               diagramscene \
               dragdroprobot \
-              padnavigator \
               basicgraphicslayouts
 
 contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids
-contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= dragdroprobot
+contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/graphicsview/padnavigator/main.cpp b/examples/graphicsview/padnavigator/main.cpp
index 7501773871..c325375adb 100644
--- a/examples/graphicsview/padnavigator/main.cpp
+++ b/examples/graphicsview/padnavigator/main.cpp
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
 
     Panel panel(3, 3);
     panel.setFocus();
-    panel.show();
+    panel.showFullScreen();
 
     return app.exec();
 }
diff --git a/examples/graphicsview/padnavigator/padnavigator.pro b/examples/graphicsview/padnavigator/padnavigator.pro
index 0d094c620a..7fa85072c3 100644
--- a/examples/graphicsview/padnavigator/padnavigator.pro
+++ b/examples/graphicsview/padnavigator/padnavigator.pro
@@ -22,3 +22,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/padnavigator
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS padnavigator.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/padnavigator
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+CONFIG += console
+
+symbian:TARGET.UID3 = 0xA000A644
\ No newline at end of file
diff --git a/examples/graphicsview/padnavigator/panel.h b/examples/graphicsview/padnavigator/panel.h
index 3d17b421a7..aebf7b0720 100644
--- a/examples/graphicsview/padnavigator/panel.h
+++ b/examples/graphicsview/padnavigator/panel.h
@@ -44,7 +44,7 @@
 QT_BEGIN_NAMESPACE
 class QTimeLine;
 class Ui_BackSide;
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class RoundRectItem;
 
diff --git a/examples/graphicsview/padnavigator/roundrectitem.h b/examples/graphicsview/padnavigator/roundrectitem.h
index 5ff437ce7b..21b3ba4d40 100644
--- a/examples/graphicsview/padnavigator/roundrectitem.h
+++ b/examples/graphicsview/padnavigator/roundrectitem.h
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 class QGraphicsProxyWidget;
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class RoundRectItem : public QObject, public QGraphicsRectItem
 {
diff --git a/examples/graphicsview/portedasteroids/portedasteroids.pro b/examples/graphicsview/portedasteroids/portedasteroids.pro
index 1452e91d7d..99dc042657 100644
--- a/examples/graphicsview/portedasteroids/portedasteroids.pro
+++ b/examples/graphicsview/portedasteroids/portedasteroids.pro
@@ -17,3 +17,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/portedasteroids
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS portedasteroids.pro bg.png sounds sprites
 sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/portedasteroids
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/graphicsview/portedcanvas/portedcanvas.pro b/examples/graphicsview/portedcanvas/portedcanvas.pro
index 71e3d8481f..7c3946bc0d 100644
--- a/examples/graphicsview/portedcanvas/portedcanvas.pro
+++ b/examples/graphicsview/portedcanvas/portedcanvas.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/portedcanvas
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS portedcanvas.pro *.png *.xpm *.doc
 sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/portedcanvas
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.pro b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
index 5a8c0b105a..03a26fa157 100644
--- a/examples/help/contextsensitivehelp/contextsensitivehelp.pro
+++ b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
@@ -16,3 +16,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/help/contextsensitivehelp
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.doc doc
 sources.path = $$[QT_INSTALL_EXAMPLES]/help/contextsensitivehelp
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/help/help.pro b/examples/help/help.pro
index 1ce6322d84..293e511ae8 100644
--- a/examples/help/help.pro
+++ b/examples/help/help.pro
@@ -9,3 +9,5 @@ SUBDIRS += contextsensitivehelp \
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/help
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/help/remotecontrol/remotecontrol.pro b/examples/help/remotecontrol/remotecontrol.pro
index 05fc14c24e..e97af6d5e8 100644
--- a/examples/help/remotecontrol/remotecontrol.pro
+++ b/examples/help/remotecontrol/remotecontrol.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/help/remotecontrol
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.doc doc
 sources.path = $$[QT_INSTALL_EXAMPLES]/help/remotecontrol
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/help/simpletextviewer/simpletextviewer.pro b/examples/help/simpletextviewer/simpletextviewer.pro
index e9e7ea2700..a8504e13a6 100644
--- a/examples/help/simpletextviewer/simpletextviewer.pro
+++ b/examples/help/simpletextviewer/simpletextviewer.pro
@@ -14,3 +14,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES documentation *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/help/simpletextviewer
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro
index 90989368e8..e70fc38ccb 100644
--- a/examples/ipc/ipc.pro
+++ b/examples/ipc/ipc.pro
@@ -7,3 +7,5 @@ TEMPLATE      = subdirs
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ipc.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/ipc
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/ipc/localfortuneclient/localfortuneclient.pro b/examples/ipc/localfortuneclient/localfortuneclient.pro
index 906cc8a91d..a394169822 100644
--- a/examples/ipc/localfortuneclient/localfortuneclient.pro
+++ b/examples/ipc/localfortuneclient/localfortuneclient.pro
@@ -9,4 +9,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneclient.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneclient
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 
diff --git a/examples/ipc/localfortuneserver/localfortuneserver.pro b/examples/ipc/localfortuneserver/localfortuneserver.pro
index fca9a0ad93..db20791dc8 100644
--- a/examples/ipc/localfortuneserver/localfortuneserver.pro
+++ b/examples/ipc/localfortuneserver/localfortuneserver.pro
@@ -9,4 +9,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneserver.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneserver
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 
diff --git a/examples/ipc/sharedmemory/sharedmemory.pro b/examples/ipc/sharedmemory/sharedmemory.pro
index 48330905e4..4dad1d1073 100644
--- a/examples/ipc/sharedmemory/sharedmemory.pro
+++ b/examples/ipc/sharedmemory/sharedmemory.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/ipc/sharedmemory
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/sharedmemory
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/addressbook/addressbook.pro b/examples/itemviews/addressbook/addressbook.pro
index 6f6a72d9f7..a03e3b6564 100644
--- a/examples/itemviews/addressbook/addressbook.pro
+++ b/examples/itemviews/addressbook/addressbook.pro
@@ -15,3 +15,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/addressbook
 sources.files = $$SOURCES $$HEADERS $$RESOURCES addressbook.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/addressbook
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A646
\ No newline at end of file
diff --git a/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro b/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
index 7870b39679..a2c8751e08 100644
--- a/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
+++ b/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/basicsortfiltermodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/basicsortfiltermodel
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro
index 7a9d197850..32901705a5 100644
--- a/examples/itemviews/chart/chart.pro
+++ b/examples/itemviews/chart/chart.pro
@@ -4,10 +4,16 @@ RESOURCES   = chart.qrc
 SOURCES     = main.cpp \
               mainwindow.cpp \
               pieview.cpp
-unix:!mac:!vxworks:LIBS+= -lm
+unix:!mac:!symbian:!vxworks:LIBS+= -lm
+
+TARGET.EPOCHEAPSIZE = 0x200000 0x800000
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/chart
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.cht
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/chart
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A647
diff --git a/examples/itemviews/coloreditorfactory/coloreditorfactory.pro b/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
index ebb3b8e507..f668e6a7e8 100644
--- a/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
+++ b/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/coloreditorfactory
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/coloreditorfactory
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro b/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
index 5a9b9f9a19..091cd9db21 100644
--- a/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
+++ b/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/customsortfiltermodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/customsortfiltermodel
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/dirview/dirview.pro b/examples/itemviews/dirview/dirview.pro
index 5865d3ca85..77290a8ad0 100644
--- a/examples/itemviews/dirview/dirview.pro
+++ b/examples/itemviews/dirview/dirview.pro
@@ -5,3 +5,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/dirview
 sources.files = $$SOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/dirview
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/editabletreemodel/editabletreemodel.pro b/examples/itemviews/editabletreemodel/editabletreemodel.pro
index 2b7b7def8c..4213cd7a9f 100644
--- a/examples/itemviews/editabletreemodel/editabletreemodel.pro
+++ b/examples/itemviews/editabletreemodel/editabletreemodel.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/editabletreemodel
 sources.files = $$FORMS $$HEADERS $$RESOURCES $$SOURCES *.pro *.txt
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/editabletreemodel
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/itemviews.pro b/examples/itemviews/itemviews.pro
index 7dcf0f6bb0..253549f3d8 100644
--- a/examples/itemviews/itemviews.pro
+++ b/examples/itemviews/itemviews.pro
@@ -17,7 +17,13 @@ SUBDIRS       = addressbook \
                 spinboxdelegate \
                 stardelegate
 
+symbian: SUBDIRS = \
+                addressbook \
+                chart
+
 # install
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/pixelator/pixelator.pro b/examples/itemviews/pixelator/pixelator.pro
index dc052966a7..8a139d414a 100644
--- a/examples/itemviews/pixelator/pixelator.pro
+++ b/examples/itemviews/pixelator/pixelator.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/pixelator
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/pixelator
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/puzzle/puzzle.pro b/examples/itemviews/puzzle/puzzle.pro
index 4f5aaad0c8..de17a69957 100644
--- a/examples/itemviews/puzzle/puzzle.pro
+++ b/examples/itemviews/puzzle/puzzle.pro
@@ -13,6 +13,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/puzzle
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 wince* {
    DEPLOYMENT_PLUGIN += qjpeg qgif qtiff
 }
diff --git a/examples/itemviews/simpledommodel/simpledommodel.pro b/examples/itemviews/simpledommodel/simpledommodel.pro
index bc9b1cafa3..cc7b4de94c 100644
--- a/examples/itemviews/simpledommodel/simpledommodel.pro
+++ b/examples/itemviews/simpledommodel/simpledommodel.pro
@@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simpledommodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simpledommodel
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/simpletreemodel/simpletreemodel.pro b/examples/itemviews/simpletreemodel/simpletreemodel.pro
index 9db74d4483..b1dd37a264 100644
--- a/examples/itemviews/simpletreemodel/simpletreemodel.pro
+++ b/examples/itemviews/simpletreemodel/simpletreemodel.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simpletreemodel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simpletreemodel
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro b/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
index b2940d7780..8bbfef9e61 100644
--- a/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
+++ b/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simplewidgetmapper
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/simplewidgetmapper
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/spinboxdelegate/spinboxdelegate.pro b/examples/itemviews/spinboxdelegate/spinboxdelegate.pro
index a202748d37..31b55d4f32 100644
--- a/examples/itemviews/spinboxdelegate/spinboxdelegate.pro
+++ b/examples/itemviews/spinboxdelegate/spinboxdelegate.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/spinboxdelegate
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/spinboxdelegate
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/itemviews/stardelegate/stardelegate.pro b/examples/itemviews/stardelegate/stardelegate.pro
index 4e1ef45497..a55b55d368 100644
--- a/examples/itemviews/stardelegate/stardelegate.pro
+++ b/examples/itemviews/stardelegate/stardelegate.pro
@@ -12,3 +12,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/stardelegate
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
diff --git a/examples/layouts/basiclayouts/basiclayouts.pro b/examples/layouts/basiclayouts/basiclayouts.pro
index 8fa73ffc5a..4ffc8c0aad 100644
--- a/examples/layouts/basiclayouts/basiclayouts.pro
+++ b/examples/layouts/basiclayouts/basiclayouts.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/layouts/basiclayouts
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/layouts/basiclayouts
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/layouts/borderlayout/borderlayout.pro b/examples/layouts/borderlayout/borderlayout.pro
index e327574ebc..18b5e6cff4 100644
--- a/examples/layouts/borderlayout/borderlayout.pro
+++ b/examples/layouts/borderlayout/borderlayout.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/layouts/borderlayout
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/layouts/borderlayout
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/layouts/dynamiclayouts/dynamiclayouts.pro b/examples/layouts/dynamiclayouts/dynamiclayouts.pro
index c169dd0fd6..dce1e29d84 100644
--- a/examples/layouts/dynamiclayouts/dynamiclayouts.pro
+++ b/examples/layouts/dynamiclayouts/dynamiclayouts.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/layouts/dynamiclayouts
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/layouts/dynamiclayouts
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/layouts/flowlayout/flowlayout.pro b/examples/layouts/flowlayout/flowlayout.pro
index 0e9782459c..ece314f9ce 100644
--- a/examples/layouts/flowlayout/flowlayout.pro
+++ b/examples/layouts/flowlayout/flowlayout.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/layouts/flowlayout
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/layouts/flowlayout
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/layouts/layouts.pro b/examples/layouts/layouts.pro
index 9676f4b690..81c15f24f1 100644
--- a/examples/layouts/layouts.pro
+++ b/examples/layouts/layouts.pro
@@ -8,3 +8,5 @@ SUBDIRS       = basiclayouts \
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/layouts
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/linguist/arrowpad/arrowpad.pro b/examples/linguist/arrowpad/arrowpad.pro
index c8a6fb2fee..7e409a6f2a 100644
--- a/examples/linguist/arrowpad/arrowpad.pro
+++ b/examples/linguist/arrowpad/arrowpad.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/linguist/arrowpad
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/arrowpad
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/linguist/hellotr/hellotr.pro b/examples/linguist/hellotr/hellotr.pro
index c0065a4e37..ecd480bf93 100644
--- a/examples/linguist/hellotr/hellotr.pro
+++ b/examples/linguist/hellotr/hellotr.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr
 sources.files = $$SOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/linguist/linguist.pro b/examples/linguist/linguist.pro
index 921667df47..ad3f772a23 100644
--- a/examples/linguist/linguist.pro
+++ b/examples/linguist/linguist.pro
@@ -7,3 +7,5 @@ SUBDIRS       = arrowpad \
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/linguist
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/linguist/trollprint/trollprint.pro b/examples/linguist/trollprint/trollprint.pro
index 9f3aaeb002..27cb38ed4a 100644
--- a/examples/linguist/trollprint/trollprint.pro
+++ b/examples/linguist/trollprint/trollprint.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/linguist/trollprint
 sources.files = $$SOURCES $$HEADERS $$TRANSLATIONS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/trollprint
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/mainwindows/application/application.pro b/examples/mainwindows/application/application.pro
index ad1168a2e4..fc022fc53f 100644
--- a/examples/mainwindows/application/application.pro
+++ b/examples/mainwindows/application/application.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/application
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS application.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/application
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/mainwindows/application/mainwindow.cpp b/examples/mainwindows/application/mainwindow.cpp
index 16b18b4505..43dfe14fd4 100644
--- a/examples/mainwindows/application/mainwindow.cpp
+++ b/examples/mainwindows/application/mainwindow.cpp
@@ -328,9 +328,13 @@ void MainWindow::loadFile(const QString &fileName)
     }
 
     QTextStream in(&file);
+#ifndef QT_NO_CURSOR
     QApplication::setOverrideCursor(Qt::WaitCursor);
+#endif
     textEdit->setPlainText(in.readAll());
+#ifndef QT_NO_CURSOR
     QApplication::restoreOverrideCursor();
+#endif
 
     setCurrentFile(fileName);
     statusBar()->showMessage(tr("File loaded"), 2000);
@@ -351,9 +355,13 @@ bool MainWindow::saveFile(const QString &fileName)
     }
 
     QTextStream out(&file);
+#ifndef QT_NO_CURSOR
     QApplication::setOverrideCursor(Qt::WaitCursor);
+#endif
     out << textEdit->toPlainText();
+#ifndef QT_NO_CURSOR
     QApplication::restoreOverrideCursor();
+#endif
 
     setCurrentFile(fileName);
     statusBar()->showMessage(tr("File saved"), 2000);
diff --git a/examples/mainwindows/dockwidgets/dockwidgets.pro b/examples/mainwindows/dockwidgets/dockwidgets.pro
index afc8aaa243..ea8594d703 100644
--- a/examples/mainwindows/dockwidgets/dockwidgets.pro
+++ b/examples/mainwindows/dockwidgets/dockwidgets.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/dockwidgets
 sources.files = $$SOURCES $$HEADERS $$RESOURCES dockwidgets.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/dockwidgets
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/mainwindows/mainwindows.pro b/examples/mainwindows/mainwindows.pro
index 90ff3a5260..e310e3db84 100644
--- a/examples/mainwindows/mainwindows.pro
+++ b/examples/mainwindows/mainwindows.pro
@@ -6,8 +6,14 @@ SUBDIRS       = application \
                 recentfiles \
                 sdi
 
+symbian: SUBDIRS = \
+                menus
+
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/mainwindows/mdi/mdi.pro b/examples/mainwindows/mdi/mdi.pro
index 4601f1c9f0..b0db42cd8c 100644
--- a/examples/mainwindows/mdi/mdi.pro
+++ b/examples/mainwindows/mdi/mdi.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/mdi
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mdi.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/mdi
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/mainwindows/menus/menus.pro b/examples/mainwindows/menus/menus.pro
index 7b0a2ecc88..8cf60bf33f 100644
--- a/examples/mainwindows/menus/menus.pro
+++ b/examples/mainwindows/menus/menus.pro
@@ -7,3 +7,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/menus
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS menus.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/menus
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000CF66
\ No newline at end of file
diff --git a/examples/mainwindows/recentfiles/recentfiles.pro b/examples/mainwindows/recentfiles/recentfiles.pro
index 7c62cdfe7d..8f7ddafd3a 100644
--- a/examples/mainwindows/recentfiles/recentfiles.pro
+++ b/examples/mainwindows/recentfiles/recentfiles.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/recentfiles
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS recentfiles.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/recentfiles
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/mainwindows/sdi/sdi.pro b/examples/mainwindows/sdi/sdi.pro
index 3283334c00..c033e195b4 100644
--- a/examples/mainwindows/sdi/sdi.pro
+++ b/examples/mainwindows/sdi/sdi.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/sdi
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sdi.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/sdi
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.pro b/examples/network/blockingfortuneclient/blockingfortuneclient.pro
index fa146fa0e8..96fbc1f173 100644
--- a/examples/network/blockingfortuneclient/blockingfortuneclient.pro
+++ b/examples/network/blockingfortuneclient/blockingfortuneclient.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/blockingfortuneclient
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blockingfortuneclient.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/blockingfortuneclient
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/broadcastreceiver/broadcastreceiver.pro b/examples/network/broadcastreceiver/broadcastreceiver.pro
index ad04e2c01f..36ad0960bb 100644
--- a/examples/network/broadcastreceiver/broadcastreceiver.pro
+++ b/examples/network/broadcastreceiver/broadcastreceiver.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastreceiver
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastreceiver.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastreceiver
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/broadcastsender/broadcastsender.pro b/examples/network/broadcastsender/broadcastsender.pro
index b300a505f7..84e65936a2 100644
--- a/examples/network/broadcastsender/broadcastsender.pro
+++ b/examples/network/broadcastsender/broadcastsender.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastsender
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastsender.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastsender
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro
index 254c356cf5..f0db3402c0 100644
--- a/examples/network/download/download.pro
+++ b/examples/network/download/download.pro
@@ -17,3 +17,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/download
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/download
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/downloadmanager/downloadmanager.pro b/examples/network/downloadmanager/downloadmanager.pro
index 1b979cafcb..ef7052c2de 100644
--- a/examples/network/downloadmanager/downloadmanager.pro
+++ b/examples/network/downloadmanager/downloadmanager.pro
@@ -18,3 +18,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/downloadmanager
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/downloadmanager
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/fortuneclient/client.cpp b/examples/network/fortuneclient/client.cpp
index f3947e2a2b..9828d865b7 100644
--- a/examples/network/fortuneclient/client.cpp
+++ b/examples/network/fortuneclient/client.cpp
@@ -44,6 +44,10 @@
 
 #include "client.h"
 
+#ifdef Q_OS_SYMBIAN
+#include "sym_iap_util.h"
+#endif
+
 //! [0]
 Client::Client(QWidget *parent)
     : QDialog(parent)
@@ -102,6 +106,10 @@ Client::Client(QWidget *parent)
 
     setWindowTitle(tr("Fortune Client"));
     portLineEdit->setFocus();
+
+#ifdef Q_OS_SYMBIAN
+    isDefaultIapSet = false;
+#endif
 //! [5]
 }
 //! [5]
@@ -110,6 +118,12 @@ Client::Client(QWidget *parent)
 void Client::requestNewFortune()
 {
     getFortuneButton->setEnabled(false);
+#ifdef Q_OS_SYMBIAN
+    if(!isDefaultIapSet) {
+        qt_SetDefaultIap();
+        isDefaultIapSet = true;
+    }
+#endif
     blockSize = 0;
     tcpSocket->abort();
 //! [7]
diff --git a/examples/network/fortuneclient/client.h b/examples/network/fortuneclient/client.h
index c8b8b2605f..714d871918 100644
--- a/examples/network/fortuneclient/client.h
+++ b/examples/network/fortuneclient/client.h
@@ -80,6 +80,9 @@ private:
     QTcpSocket *tcpSocket;
     QString currentFortune;
     quint16 blockSize;
+#ifdef Q_OS_SYMBIAN
+    bool isDefaultIapSet;
+#endif
 };
 //! [0]
 
diff --git a/examples/network/fortuneclient/fortuneclient.pro b/examples/network/fortuneclient/fortuneclient.pro
index 1c7b0a81ab..4765208173 100644
--- a/examples/network/fortuneclient/fortuneclient.pro
+++ b/examples/network/fortuneclient/fortuneclient.pro
@@ -8,3 +8,12 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneclient
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneclient.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneclient
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian {
+    HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
+    LIBS += -lesock
+    TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData"
+    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+}
diff --git a/examples/network/fortuneclient/main.cpp b/examples/network/fortuneclient/main.cpp
index 0cc7378f68..4db555cdee 100644
--- a/examples/network/fortuneclient/main.cpp
+++ b/examples/network/fortuneclient/main.cpp
@@ -40,13 +40,17 @@
 ****************************************************************************/
 
 #include <QApplication>
-
 #include "client.h"
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     Client client;
+#ifdef Q_OS_SYMBIAN
+    // Make application better looking and more usable on small screen
+    client.showMaximized();
+#else
     client.show();
+#endif
     return client.exec();
 }
diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro
index e98385aa22..ea37b583b3 100644
--- a/examples/network/fortuneserver/fortuneserver.pro
+++ b/examples/network/fortuneserver/fortuneserver.pro
@@ -8,3 +8,13 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneserver.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian {
+    HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
+    LIBS += -lesock
+    TARGET.UID3 = 0xA000CF71
+    TARGET.CAPABILITY = "All -TCB"
+    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+}
\ No newline at end of file
diff --git a/examples/network/fortuneserver/main.cpp b/examples/network/fortuneserver/main.cpp
index d742fb1a4d..3394c1c74d 100644
--- a/examples/network/fortuneserver/main.cpp
+++ b/examples/network/fortuneserver/main.cpp
@@ -46,11 +46,22 @@
 
 #include "server.h"
 
+#ifdef Q_OS_SYMBIAN
+#include "sym_iap_util.h"
+#endif
+
 int main(int argc, char *argv[])
 {
+#ifdef Q_OS_SYMBIAN
+    qt_SetDefaultIap();
+#endif
     QApplication app(argc, argv);
     Server server;
+#ifdef Q_OS_SYMBIAN
+    server.showMaximized();
+#else
     server.show();
+#endif
     qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
     return server.exec();
 }
diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp
index a102ef2c89..5da43ab608 100644
--- a/examples/network/fortuneserver/server.cpp
+++ b/examples/network/fortuneserver/server.cpp
@@ -63,10 +63,15 @@ Server::Server(QWidget *parent)
         return;
     }
 //! [0]
+    QList<QHostAddress> ipAddresseList = QNetworkInterface::allAddresses();
+    QString ipAddresses;
+    for (int i = 0; i < ipAddresseList.size(); ++i) {
+        ipAddresses.append(ipAddresseList.at(i).toString()).append("\n");
+    }
 
-    statusLabel->setText(tr("The server is running on port %1.\n"
+    statusLabel->setText(tr("The server is running on \n IP: \n%1 PORT: \n%2\n"
                             "Run the Fortune Client example now.")
-                         .arg(tcpServer->serverPort()));
+                         .arg(ipAddresses).arg(tcpServer->serverPort()));
 //! [1]
 
 //! [2]
diff --git a/examples/network/ftp/ftp.pro b/examples/network/ftp/ftp.pro
index cabc00332b..ac3d3e623d 100644
--- a/examples/network/ftp/ftp.pro
+++ b/examples/network/ftp/ftp.pro
@@ -9,3 +9,13 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/ftp
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ftp.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/ftp
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian {
+    HEADERS +=  sym_iap_util.h
+    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+    TARGET.CAPABILITY="NetworkServices ReadUserData WriteUserData"
+    TARGET.UID3 = 0xA000A648
+    LIBS+=-lesock -lcommdb # For IAP selection
+}
\ No newline at end of file
diff --git a/examples/network/ftp/ftpwindow.cpp b/examples/network/ftp/ftpwindow.cpp
index 3e4a12856f..ffab8b4b9e 100644
--- a/examples/network/ftp/ftpwindow.cpp
+++ b/examples/network/ftp/ftpwindow.cpp
@@ -44,6 +44,10 @@
 
 #include "ftpwindow.h"
 
+#ifdef Q_OS_SYMBIAN
+#include "sym_iap_util.h"
+#endif
+
 FtpWindow::FtpWindow(QWidget *parent)
     : QDialog(parent), ftp(0)
 {
@@ -52,6 +56,10 @@ FtpWindow::FtpWindow(QWidget *parent)
     ftpServerLabel->setBuddy(ftpServerLineEdit);
 
     statusLabel = new QLabel(tr("Please enter the name of an FTP server."));
+#ifdef Q_OS_SYMBIAN    
+    // Use word wrapping to fit the text on screen    
+    statusLabel->setWordWrap( true );
+#endif    
 
     fileList = new QTreeWidget;
     fileList->setEnabled(false);
@@ -90,16 +98,31 @@ FtpWindow::FtpWindow(QWidget *parent)
     QHBoxLayout *topLayout = new QHBoxLayout;
     topLayout->addWidget(ftpServerLabel);
     topLayout->addWidget(ftpServerLineEdit);
+#ifndef Q_OS_SYMBIAN
     topLayout->addWidget(cdToParentButton);
     topLayout->addWidget(connectButton);
+#else
+    // Make app better lookin on small screen
+    QHBoxLayout *topLayout2 = new QHBoxLayout;
+    topLayout2->addWidget(cdToParentButton);
+    topLayout2->addWidget(connectButton);    
+#endif
     
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(topLayout);
+#ifdef Q_OS_SYMBIAN    
+    // Make app better lookin on small screen
+    mainLayout->addLayout(topLayout2);
+#endif    
     mainLayout->addWidget(fileList);
     mainLayout->addWidget(statusLabel);
     mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);
 
+#ifdef Q_OS_SYMBIAN
+    bDefaultIapSet = false;
+#endif
+
     setWindowTitle(tr("FTP"));
 }
 
@@ -111,6 +134,12 @@ QSize FtpWindow::sizeHint() const
 //![0]
 void FtpWindow::connectOrDisconnect()
 {
+#ifdef Q_OS_SYMBIAN
+   if(!bDefaultIapSet) {
+       qt_SetDefaultIap();
+       bDefaultIapSet = true;
+   }
+#endif
     if (ftp) {
         ftp->abort();
         ftp->deleteLater();
@@ -124,6 +153,7 @@ void FtpWindow::connectOrDisconnect()
 #ifndef QT_NO_CURSOR
         setCursor(Qt::ArrowCursor);
 #endif
+        statusLabel->setText(tr("Please enter the name of an FTP server."));
         return;
     }
 
diff --git a/examples/network/ftp/ftpwindow.h b/examples/network/ftp/ftpwindow.h
index 4f4b4803c5..17736a8959 100644
--- a/examples/network/ftp/ftpwindow.h
+++ b/examples/network/ftp/ftpwindow.h
@@ -98,6 +98,10 @@ private:
     QString currentPath;
     QFtp *ftp;
     QFile *file;
+
+#ifdef Q_OS_SYMBIAN
+    bool bDefaultIapSet;
+#endif
 //![1]
 };
 
diff --git a/examples/network/ftp/main.cpp b/examples/network/ftp/main.cpp
index 8488dd0f63..f928bcbc0c 100644
--- a/examples/network/ftp/main.cpp
+++ b/examples/network/ftp/main.cpp
@@ -40,15 +40,28 @@
 ****************************************************************************/
 
 #include <QApplication>
-
 #include "ftpwindow.h"
 
+#ifdef Q_OS_SYMBIAN
+#include <QDir>
+#include <QDesktopWidget>
+#endif
+
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(ftp);
-
-    QApplication app(argc, argv);
+#ifdef Q_OS_SYMBIAN
+    // Change current directory from default private to c:\data
+    // in order that user can access the downloaded content
+    QDir::setCurrent( "c:\\data" );
+#endif
+    QApplication app(argc, argv);  
     FtpWindow ftpWin;
+#ifdef Q_OS_SYMBIAN    
+    // Make application better looking and more usable on small screen
+    ftpWin.showMaximized();
+#else    
     ftpWin.show();
+#endif
     return ftpWin.exec();
 }
diff --git a/examples/network/ftp/sym_iap_util.h b/examples/network/ftp/sym_iap_util.h
new file mode 100644
index 0000000000..6d52b1d232
--- /dev/null
+++ b/examples/network/ftp/sym_iap_util.h
@@ -0,0 +1,318 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QSYM_IAP_UTIL_H
+#define QSYM_IAP_UTIL_H
+
+// Symbian
+#include <es_sock.h>
+#include <es_enum.h>
+#include <commdbconnpref.h>
+
+// OpenC
+#include <sys/socket.h>
+#include <net/if.h>
+
+//Qt
+#include <QSettings>
+#include <QStringList>
+
+_LIT(KIapNameSetting, "IAP\\Name");             // text - mandatory
+_LIT(KIapDialogPref, "IAP\\DialogPref");        // TUnit32 - optional
+_LIT(KIapService, "IAP\\IAPService");           // TUnit32 - mandatory
+_LIT(KIapServiceType, "IAP\\IAPServiceType");   // text - mandatory
+_LIT(KIapBearer, "IAP\\IAPBearer");             // TUint32 - optional
+_LIT(KIapBearerType, "IAP\\IAPBearerType");     // text - optional
+_LIT(KIapNetwork, "IAP\\IAPNetwork");           // TUint32 - optional
+
+const QLatin1String qtOrganizationTag("Trolltech");
+const QLatin1String qtNetworkModuleTag("QtNetwork");
+const QLatin1String iapGroupTag("IAP");
+const QLatin1String iapNamesArrayTag("Names");
+const QLatin1String iapNameItemTag("Name");
+
+void clearIapNamesSettings(QSettings &settings) {
+    settings.beginGroup(qtNetworkModuleTag);
+        settings.beginGroup(iapGroupTag);
+           settings.remove(iapNamesArrayTag);
+        settings.endGroup();
+    settings.endGroup();
+}
+
+void writeIapNamesSettings(QSettings &settings, const QStringList& iapNames) {
+    clearIapNamesSettings(settings);
+    settings.beginGroup(qtNetworkModuleTag);
+        settings.beginGroup(iapGroupTag);
+            settings.beginWriteArray(iapNamesArrayTag);
+            for (int index = 0; index < iapNames.size(); ++index) {
+                settings.setArrayIndex(index);
+                settings.setValue(iapNameItemTag, iapNames.at(index));
+            }
+            settings.endArray();
+        settings.endGroup();
+    settings.endGroup();
+}
+
+void readIapNamesSettings(QSettings &settings, QStringList& iapNames) {
+    settings.beginGroup(qtNetworkModuleTag);
+        settings.beginGroup(iapGroupTag);
+            int last = settings.beginReadArray(iapNamesArrayTag);
+            for (int index = 0; index < last; ++index) {
+                settings.setArrayIndex(index);
+                iapNames.append(settings.value(iapNameItemTag).toString());
+            }
+            settings.endArray();
+        settings.endGroup();
+    settings.endGroup();
+}
+
+QString qt_TDesC2QStringL(const TDesC& aDescriptor) 
+{
+#ifdef QT_NO_UNICODE
+    return QString::fromLocal8Bit(aDescriptor.Ptr(), aDescriptor.Length());
+#else
+    return QString::fromUtf16(aDescriptor.Ptr(), aDescriptor.Length());
+#endif
+}
+
+static bool qt_SetDefaultIapName(const QString &iapName, int &error) {
+    struct ifreq ifReq;
+    // clear structure
+    memset(&ifReq, 0, sizeof(struct ifreq));
+    // set IAP name value
+    // make sure it is in UTF8
+    strcpy(ifReq.ifr_name, iapName.toUtf8().data());
+
+    if(setdefaultif(&ifReq) == 0) {
+        // OK
+        error = 0;
+        return true;
+    } else {
+        error = errno;
+        return false;
+    }
+
+}
+static bool qt_SetDefaultSnapId(const int snapId, int &error) {
+    struct ifreq ifReq;
+    // clear structure
+    memset(&ifReq, 0, sizeof(struct ifreq));
+    // set SNAP ID value
+    ifReq.ifr_ifru.snap_id = snapId;
+
+    if(setdefaultif(&ifReq) == 0) {
+        // OK
+        error = 0;
+        return true;
+    } else {
+        error = errno;
+        return false;
+    }
+
+}
+
+static void qt_SaveIapName(QSettings& settings, QStringList& iapNames, QString& iapNameValue) {
+    if(iapNames.contains(iapNameValue) && iapNames.first() == iapNameValue) {
+        // no need to update
+    } else {
+        if(iapNameValue != QString("Easy WLAN")) {
+            // new selection alway on top
+            iapNames.removeAll(iapNameValue);
+            iapNames.prepend(iapNameValue);
+            writeIapNamesSettings(settings, iapNames);
+        } else {
+            // Unbeliveable ... if IAP dodn't exist before
+            // no matter what you choose from IAP selection list
+            // you will get "Easy WLAN" as IAP name value
+
+            // somehow commsdb is not in sync
+        }
+    }
+}
+
+static QString qt_OfferIapDialog() {
+    TBuf8<256> iapName;
+
+    RSocketServ socketServ;
+    CleanupClosePushL(socketServ);
+
+    RConnection connection;
+    CleanupClosePushL(connection);
+
+    socketServ.Connect();
+    connection.Open(socketServ);
+    connection.Start();
+
+    connection.GetDesSetting(TPtrC(KIapNameSetting), iapName);
+
+    //connection.Stop();
+
+    iapName.ZeroTerminate();
+    QString strIapName((char*)iapName.Ptr());
+
+    int error = 0;
+    if(!qt_SetDefaultIapName(strIapName, error)) {
+        //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error);
+        strIapName = QString("");
+    }
+
+    CleanupStack::PopAndDestroy(&connection);
+    CleanupStack::PopAndDestroy(&socketServ);
+
+    return strIapName;
+}
+
+static QString qt_CheckForActiveConnection() {
+    TUint count;
+
+    RSocketServ serv;
+    CleanupClosePushL(serv);
+
+    RConnection conn;
+    CleanupClosePushL(conn);
+
+    serv.Connect();
+    conn.Open(serv);
+
+    TConnectionInfoBuf connInfo;
+
+    TBuf8<256> iapName;
+    TBuf8<256> iapServiceType;
+
+    QString strIapName;
+
+    if (conn.EnumerateConnections(count) == KErrNone) {
+        if(count > 0) {
+            for (TUint i = 1; i <= count; i++) {
+                if (conn.GetConnectionInfo(i, connInfo) == KErrNone) {
+                    RConnection tempConn;
+                    CleanupClosePushL(tempConn);
+                    tempConn.Open(serv);
+                    if (tempConn.Attach(connInfo, RConnection::EAttachTypeNormal) == KErrNone) {
+                       tempConn.GetDesSetting(TPtrC(KIapNameSetting), iapName);
+                       tempConn.GetDesSetting(TPtrC(KIapServiceType), iapServiceType);
+                       //tempConn.Stop();
+                       iapName.ZeroTerminate();
+		       iapServiceType.ZeroTerminate();
+
+//                        if(iapServiceType.Find(_L8("LANService")) != KErrNotFound) {
+//                            activeLanConnectionFound = ETrue;
+//                            break;
+//                        }
+			strIapName = QString((char*)iapName.Ptr());
+                        int error = 0;
+                        if(!qt_SetDefaultIapName(strIapName, error)) {
+                            //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error);
+                            strIapName = QString("");
+                        }
+
+                        CleanupStack::PopAndDestroy(&tempConn);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    //conn.Stop();
+
+    CleanupStack::PopAndDestroy(&conn);
+    CleanupStack::PopAndDestroy(&serv);
+
+    return strIapName;
+}
+
+static QString qt_CheckSettingsForConnection(QStringList& iapNames) {
+    QString strIapName;
+    for(int index = 0; index < iapNames.size(); ++index) {
+        strIapName = iapNames.at(index);
+        int error = 0;
+        if(!qt_SetDefaultIapName(strIapName, error)) {
+            //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error);
+            strIapName = QString("");
+        } else {
+            return strIapName;
+        }
+    }
+    return strIapName;
+}
+
+static void qt_SetDefaultIapL()
+{
+    // settings @ /c/data/.config/Trolltech.com
+    QSettings settings(QSettings::UserScope, qtOrganizationTag);
+    // populate iap name list
+    QStringList iapNames;
+    readIapNamesSettings(settings, iapNames);
+
+    QString iapNameValue;
+
+    iapNameValue = qt_CheckForActiveConnection();
+
+    if(!iapNameValue.isEmpty()) {
+        qt_SaveIapName(settings, iapNames, iapNameValue);
+        return;
+    }
+
+    iapNameValue = qt_CheckSettingsForConnection(iapNames);
+
+    if(!iapNameValue.isEmpty()) {
+        qt_SaveIapName(settings, iapNames, iapNameValue);
+        return;
+    }
+
+    /*
+     * no active LAN connections yet
+     * no IAP in settings
+     * offer IAP dialog to user
+     */
+    iapNameValue = qt_OfferIapDialog();
+    qt_SaveIapName(settings, iapNames, iapNameValue);
+    return;
+
+}
+
+static int qt_SetDefaultIap()
+{
+    TRAPD(err, qt_SetDefaultIapL());
+    return err;
+}
+
+#endif // QSYM_IAP_UTIL_H
diff --git a/examples/network/http/http.pro b/examples/network/http/http.pro
index 7f58d9fffb..99aa717e71 100644
--- a/examples/network/http/http.pro
+++ b/examples/network/http/http.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/http
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS http.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/http
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/loopback/loopback.pro b/examples/network/loopback/loopback.pro
index 88b7a8bf05..0a09e34048 100644
--- a/examples/network/loopback/loopback.pro
+++ b/examples/network/loopback/loopback.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/loopback
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS loopback.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/loopback
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/network-chat/network-chat.pro b/examples/network/network-chat/network-chat.pro
index 5d5efea537..6967228440 100644
--- a/examples/network/network-chat/network-chat.pro
+++ b/examples/network/network-chat/network-chat.pro
@@ -17,3 +17,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network-chat.pro *.chat
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/network.pro b/examples/network/network.pro
index adf998fa47..69b460e62f 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -1,9 +1,9 @@
 TEMPLATE      = subdirs
 SUBDIRS       = blockingfortuneclient \
- 		broadcastreceiver \
+                broadcastreceiver \
                 broadcastsender \
-		download \
-		downloadmanager \
+                download \
+                downloadmanager \
                 fortuneclient \
                 fortuneserver \
                 ftp \
@@ -11,8 +11,9 @@ SUBDIRS       = blockingfortuneclient \
                 loopback \
                 threadedfortuneserver \
                 googlesuggest \
- 		torrent
+                torrent
 
+symbian: SUBDIRS = ftp
 # no QProcess
 !vxworks:!qnx:SUBDIRS += network-chat
 
@@ -22,3 +23,5 @@ contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/network
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/securesocketclient/securesocketclient.pro b/examples/network/securesocketclient/securesocketclient.pro
index 4d70a718ac..2e9141d2a6 100644
--- a/examples/network/securesocketclient/securesocketclient.pro
+++ b/examples/network/securesocketclient/securesocketclient.pro
@@ -14,3 +14,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.jpg images
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000CF67
\ No newline at end of file
diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp
index e0543cfba0..986af85630 100644
--- a/examples/network/securesocketclient/sslclient.cpp
+++ b/examples/network/securesocketclient/sslclient.cpp
@@ -145,7 +145,9 @@ void SslClient::socketEncrypted()
     if (!padLock) {
         padLock = new QToolButton;
         padLock->setIcon(QIcon(":/encrypted.png"));
+#ifndef QT_NO_CURSOR
         padLock->setCursor(Qt::ArrowCursor);
+#endif
         padLock->setToolTip(tr("Display encryption details."));
 
         int extent = form->hostNameEdit->height() - 2;
diff --git a/examples/network/threadedfortuneserver/threadedfortuneserver.pro b/examples/network/threadedfortuneserver/threadedfortuneserver.pro
index 0867dac72b..94543bfb30 100644
--- a/examples/network/threadedfortuneserver/threadedfortuneserver.pro
+++ b/examples/network/threadedfortuneserver/threadedfortuneserver.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/network/threadedfortuneserver
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threadedfortuneserver.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/threadedfortuneserver
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro
index 10b267242f..bfd576776e 100644
--- a/examples/network/torrent/torrent.pro
+++ b/examples/network/torrent/torrent.pro
@@ -35,3 +35,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES torrent.pro *.torrent
 sources.files += icons forms 3rdparty
 sources.path = $$[QT_INSTALL_EXAMPLES]/network/torrent
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro
index c45b764e12..01df1da6bd 100644
--- a/examples/opengl/2dpainting/2dpainting.pro
+++ b/examples/opengl/2dpainting/2dpainting.pro
@@ -15,3 +15,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/2dpainting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2dpainting.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/2dpainting
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/opengl/framebufferobject/bubbles.svg b/examples/opengl/framebufferobject/bubbles.svg
index 65867da2d8..3d7971d547 100644
--- a/examples/opengl/framebufferobject/bubbles.svg
+++ b/examples/opengl/framebufferobject/bubbles.svg
@@ -78,10 +78,6 @@
       <!-- Define a shadow for each sphere. -->
       <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
       <g id="bubble">
-        <circle fill="black" cx="0" cy="0" r="50" />
-        <circle fill="#a6ce39" cx="0" cy="0" r="33" />
-        <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
-                              L -11,22 L -1,12 Z" />
         <circle cx="0" cy="0" r="100" />
       </g>
     </defs>
@@ -180,15 +176,6 @@
     </g>
   </g>
     <g transform="translate(200,0)" >
-    <g transform="translate(200,490) scale(2.0,1.0) rotate(45)" >
-      <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
-      <circle fill="black" cx="0" cy="0" r="50" />
-      <circle fill="#a6ce39" cx="0" cy="0" r="33" />
-      <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
-                            L -11,22 L -1,12 Z" />
-      <animateTransform attributeName="transform"  type="rotate" values="0; 360"
-	         begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" />
-    </g>
     <g transform="translate(200,375)">
       <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
       <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
diff --git a/examples/opengl/framebufferobject/framebufferobject.pro b/examples/opengl/framebufferobject/framebufferobject.pro
index 4bc667c6d0..a5927ec120 100644
--- a/examples/opengl/framebufferobject/framebufferobject.pro
+++ b/examples/opengl/framebufferobject/framebufferobject.pro
@@ -20,3 +20,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.png *.svg
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
diff --git a/examples/opengl/framebufferobject2/framebufferobject2.pro b/examples/opengl/framebufferobject2/framebufferobject2.pro
index 9f1644c7a1..076f98c9b9 100644
--- a/examples/opengl/framebufferobject2/framebufferobject2.pro
+++ b/examples/opengl/framebufferobject2/framebufferobject2.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES framebufferobject2.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/opengl/grabber/grabber.pro b/examples/opengl/grabber/grabber.pro
index 15eaf0250a..23a0c4a4b6 100644
--- a/examples/opengl/grabber/grabber.pro
+++ b/examples/opengl/grabber/grabber.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grabber.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/opengl/hellogl/glwidget.cpp b/examples/opengl/hellogl/glwidget.cpp
index 81e63c3a05..e93cb1583d 100644
--- a/examples/opengl/hellogl/glwidget.cpp
+++ b/examples/opengl/hellogl/glwidget.cpp
@@ -183,46 +183,30 @@ GLuint GLWidget::makeObject()
 
     glBegin(GL_QUADS);
 
-    GLdouble x1 = +0.06;
-    GLdouble y1 = -0.14;
-    GLdouble x2 = +0.14;
-    GLdouble y2 = -0.06;
-    GLdouble x3 = +0.08;
-    GLdouble y3 = +0.00;
-    GLdouble x4 = +0.30;
-    GLdouble y4 = +0.22;
-
-    quad(x1, y1, x2, y2, y2, x2, y1, x1);
-    quad(x3, y3, x4, y4, y4, x4, y3, x3);
-
-    extrude(x1, y1, x2, y2);
-    extrude(x2, y2, y2, x2);
-    extrude(y2, x2, y1, x1);
-    extrude(y1, x1, x1, y1);
-    extrude(x3, y3, x4, y4);
-    extrude(x4, y4, y4, x4);
-    extrude(y4, x4, y3, x3);
-
     const double Pi = 3.14159265358979323846;
     const int NumSectors = 200;
 
-    for (int i = 0; i < NumSectors; ++i) {
-        double angle1 = (i * 2 * Pi) / NumSectors;
-        GLdouble x5 = 0.30 * sin(angle1);
-        GLdouble y5 = 0.30 * cos(angle1);
-        GLdouble x6 = 0.20 * sin(angle1);
-        GLdouble y6 = 0.20 * cos(angle1);
+    for (int j = 0; j < 2; ++j) {
+        double r = 0.1 + (j * 0.2);
+
+        for (int i = 0; i < NumSectors; ++i) {
+            double angle1 = (i * 2 * Pi) / NumSectors;
+            GLdouble x5 = (r + 0.1) * sin(angle1);
+            GLdouble y5 = (r + 0.1) * cos(angle1);
+            GLdouble x6 = r * sin(angle1);
+            GLdouble y6 = r * cos(angle1);
 
-        double angle2 = ((i + 1) * 2 * Pi) / NumSectors;
-        GLdouble x7 = 0.20 * sin(angle2);
-        GLdouble y7 = 0.20 * cos(angle2);
-        GLdouble x8 = 0.30 * sin(angle2);
-        GLdouble y8 = 0.30 * cos(angle2);
+            double angle2 = ((i + 1) * 2 * Pi) / NumSectors;
+            GLdouble x7 = r * sin(angle2);
+            GLdouble y7 = r * cos(angle2);
+            GLdouble x8 = (r + 0.1) * sin(angle2);
+            GLdouble y8 = (r + 0.1) * cos(angle2);
 
-        quad(x5, y5, x6, y6, x7, y7, x8, y8);
+            quad(x5, y5, x6, y6, x7, y7, x8, y8);
 
-        extrude(x6, y6, x7, y7);
-        extrude(x8, y8, x5, y5);
+            extrude(x6, y6, x7, y7);
+            extrude(x8, y8, x5, y5);
+        }
     }
 
     glEnd();
diff --git a/examples/opengl/hellogl/hellogl.pro b/examples/opengl/hellogl/hellogl.pro
index ce9c8e8e34..77034cc1f0 100644
--- a/examples/opengl/hellogl/hellogl.pro
+++ b/examples/opengl/hellogl/hellogl.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
index a4c2a22365..7b76d86c36 100644
--- a/examples/opengl/opengl.pro
+++ b/examples/opengl/opengl.pro
@@ -27,3 +27,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/opengl/overpainting/overpainting.pro b/examples/opengl/overpainting/overpainting.pro
index b8e79eb651..3603260258 100644
--- a/examples/opengl/overpainting/overpainting.pro
+++ b/examples/opengl/overpainting/overpainting.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS overpainting.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/opengl/pbuffers/pbuffers.pro b/examples/opengl/pbuffers/pbuffers.pro
index c1060e2361..72f20f8690 100644
--- a/examples/opengl/pbuffers/pbuffers.pro
+++ b/examples/opengl/pbuffers/pbuffers.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers
 sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/opengl/pbuffers2/bubbles.svg b/examples/opengl/pbuffers2/bubbles.svg
index 65867da2d8..3d7971d547 100644
--- a/examples/opengl/pbuffers2/bubbles.svg
+++ b/examples/opengl/pbuffers2/bubbles.svg
@@ -78,10 +78,6 @@
       <!-- Define a shadow for each sphere. -->
       <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
       <g id="bubble">
-        <circle fill="black" cx="0" cy="0" r="50" />
-        <circle fill="#a6ce39" cx="0" cy="0" r="33" />
-        <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
-                              L -11,22 L -1,12 Z" />
         <circle cx="0" cy="0" r="100" />
       </g>
     </defs>
@@ -180,15 +176,6 @@
     </g>
   </g>
     <g transform="translate(200,0)" >
-    <g transform="translate(200,490) scale(2.0,1.0) rotate(45)" >
-      <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
-      <circle fill="black" cx="0" cy="0" r="50" />
-      <circle fill="#a6ce39" cx="0" cy="0" r="33" />
-      <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
-                            L -11,22 L -1,12 Z" />
-      <animateTransform attributeName="transform"  type="rotate" values="0; 360"
-	         begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" />
-    </g>
     <g transform="translate(200,375)">
       <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
       <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
diff --git a/examples/opengl/pbuffers2/pbuffers2.pro b/examples/opengl/pbuffers2/pbuffers2.pro
index cbd0cb514e..7f12483157 100644
--- a/examples/opengl/pbuffers2/pbuffers2.pro
+++ b/examples/opengl/pbuffers2/pbuffers2.pro
@@ -19,3 +19,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers2.pro *.png *.svg
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/opengl/samplebuffers/glwidget.cpp b/examples/opengl/samplebuffers/glwidget.cpp
index 725dae9ff7..8dbb693fbe 100644
--- a/examples/opengl/samplebuffers/glwidget.cpp
+++ b/examples/opengl/samplebuffers/glwidget.cpp
@@ -109,44 +109,28 @@ void GLWidget::makeObject()
     QColor trolltechGreen(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0));
     const double Pi = 3.14159265358979323846;
     const int NumSectors = 15;
-    GLdouble x1 = +0.06;
-    GLdouble y1 = -0.14;
-    GLdouble x2 = +0.14;
-    GLdouble y2 = -0.06;
-    GLdouble x3 = +0.08;
-    GLdouble y3 = +0.00;
-    GLdouble x4 = +0.30;
-    GLdouble y4 = +0.22;
 
     list = glGenLists(1);
     glNewList(list, GL_COMPILE);
     {
         for (int i = 0; i < NumSectors; ++i) {
             double angle1 = (i * 2 * Pi) / NumSectors;
-            GLdouble x5 = 0.30 * sin(angle1);
-            GLdouble y5 = 0.30 * cos(angle1);
-            GLdouble x6 = 0.20 * sin(angle1);
-            GLdouble y6 = 0.20 * cos(angle1);
+            GLdouble x1 = 0.30 * sin(angle1);
+            GLdouble y1 = 0.30 * cos(angle1);
+            GLdouble x2 = 0.20 * sin(angle1);
+            GLdouble y2 = 0.20 * cos(angle1);
 
             double angle2 = ((i + 1) * 2 * Pi) / NumSectors;
-            GLdouble x7 = 0.20 * sin(angle2);
-            GLdouble y7 = 0.20 * cos(angle2);
-            GLdouble x8 = 0.30 * sin(angle2);
-            GLdouble y8 = 0.30 * cos(angle2);
+            GLdouble x3 = 0.20 * sin(angle2);
+            GLdouble y3 = 0.20 * cos(angle2);
+            GLdouble x4 = 0.30 * sin(angle2);
+            GLdouble y4 = 0.30 * cos(angle2);
 
             qglColor(trolltechGreen);
-            quad(GL_QUADS, x5, y5, x6, y6, x7, y7, x8, y8);
+            quad(GL_QUADS, x1, y1, x2, y2, x3, y3, x4, y4);
             qglColor(Qt::black);
-            quad(GL_LINE_LOOP, x5, y5, x6, y6, x7, y7, x8, y8);
+            quad(GL_LINE_LOOP, x1, y1, x2, y2, x3, y3, x4, y4);
         }
-
-        qglColor(trolltechGreen);
-        quad(GL_QUADS, x1, y1, x2, y2, y2, x2, y1, x1);
-        quad(GL_QUADS, x3, y3, x4, y4, y4, x4, y3, x3);
-
-        qglColor(Qt::black);
-        quad(GL_LINE_LOOP, x1, y1, x2, y2, y2, x2, y1, x1);
-        quad(GL_LINE_LOOP, x3, y3, x4, y4, y4, x4, y3, x3);
     }
     glEndList();
 }
diff --git a/examples/opengl/samplebuffers/samplebuffers.pro b/examples/opengl/samplebuffers/samplebuffers.pro
index 9eb5f58b15..de09a71e61 100644
--- a/examples/opengl/samplebuffers/samplebuffers.pro
+++ b/examples/opengl/samplebuffers/samplebuffers.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers
 sources.files = $$SOURCES $$HEADERS samplebuffers.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/opengl/textures/textures.pro b/examples/opengl/textures/textures.pro
index cd98a6880a..086c9ac413 100644
--- a/examples/opengl/textures/textures.pro
+++ b/examples/opengl/textures/textures.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS textures.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/painting/basicdrawing/basicdrawing.pro b/examples/painting/basicdrawing/basicdrawing.pro
index 401126055e..df845d9395 100644
--- a/examples/painting/basicdrawing/basicdrawing.pro
+++ b/examples/painting/basicdrawing/basicdrawing.pro
@@ -10,3 +10,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/painting/basicdrawing
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basicdrawing.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/painting/basicdrawing
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A649
\ No newline at end of file
diff --git a/examples/painting/concentriccircles/concentriccircles.pro b/examples/painting/concentriccircles/concentriccircles.pro
index 093ea1c9d2..bf8398feab 100644
--- a/examples/painting/concentriccircles/concentriccircles.pro
+++ b/examples/painting/concentriccircles/concentriccircles.pro
@@ -9,3 +9,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/painting/concentriccircles
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS concentriccircles.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/painting/concentriccircles
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A64A
\ No newline at end of file
diff --git a/examples/painting/fontsampler/fontsampler.pro b/examples/painting/fontsampler/fontsampler.pro
index 8b63752feb..bc7e0a2dba 100644
--- a/examples/painting/fontsampler/fontsampler.pro
+++ b/examples/painting/fontsampler/fontsampler.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/painting/fontsampler
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/painting/fontsampler
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/painting/imagecomposition/imagecomposition.pro b/examples/painting/imagecomposition/imagecomposition.pro
index 935a1d47c1..66fcf6ad20 100644
--- a/examples/painting/imagecomposition/imagecomposition.pro
+++ b/examples/painting/imagecomposition/imagecomposition.pro
@@ -9,3 +9,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES images *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/painting/imagecomposition
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A64B
\ No newline at end of file
diff --git a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro
index 98b9bd1408..fbf2ba928d 100644
--- a/examples/painting/painterpaths/painterpaths.pro
+++ b/examples/painting/painterpaths/painterpaths.pro
@@ -3,10 +3,14 @@ HEADERS       = renderarea.h \
 SOURCES       = main.cpp \
                 renderarea.cpp \
                 window.cpp
-unix:!mac:!vxworks:LIBS += -lm
+unix:!mac:!symbian:!vxworks:LIBS += -lm
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painterpaths.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A64C
diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro
index 6d00720534..59ca54e3a8 100644
--- a/examples/painting/painting.pro
+++ b/examples/painting/painting.pro
@@ -5,7 +5,7 @@ SUBDIRS       = basicdrawing \
                 painterpaths \
                 transformations
 
-!wince*: SUBDIRS += fontsampler
+!wince*:!symbian: SUBDIRS += fontsampler
 
 contains(QT_CONFIG, svg): SUBDIRS += svggenerator svgviewer
 
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/painting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/painting
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/painting/svggenerator/displaywidget.cpp b/examples/painting/svggenerator/displaywidget.cpp
index 75ec02d123..bad6d3ad84 100644
--- a/examples/painting/svggenerator/displaywidget.cpp
+++ b/examples/painting/svggenerator/displaywidget.cpp
@@ -63,7 +63,7 @@ DisplayWidget::DisplayWidget(QWidget *parent)
 }
 
 //! [paint event]
-void DisplayWidget::paintEvent(QPaintEvent *event)
+void DisplayWidget::paintEvent(QPaintEvent * /* event */)
 {
     QPainter painter;
     painter.begin(this);
diff --git a/examples/painting/svggenerator/svggenerator.pro b/examples/painting/svggenerator/svggenerator.pro
index 4d08ba4e53..11346192ef 100644
--- a/examples/painting/svggenerator/svggenerator.pro
+++ b/examples/painting/svggenerator/svggenerator.pro
@@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/painting/svggenerator
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS svggenerator.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/painting/svggenerator
 INSTALLS += target sources
+
+symbian:TARGET.UID3 = 0xA000CF68
\ No newline at end of file
diff --git a/examples/painting/svgviewer/files/bubbles.svg b/examples/painting/svgviewer/files/bubbles.svg
index 65867da2d8..3d7971d547 100644
--- a/examples/painting/svgviewer/files/bubbles.svg
+++ b/examples/painting/svgviewer/files/bubbles.svg
@@ -78,10 +78,6 @@
       <!-- Define a shadow for each sphere. -->
       <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
       <g id="bubble">
-        <circle fill="black" cx="0" cy="0" r="50" />
-        <circle fill="#a6ce39" cx="0" cy="0" r="33" />
-        <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
-                              L -11,22 L -1,12 Z" />
         <circle cx="0" cy="0" r="100" />
       </g>
     </defs>
@@ -180,15 +176,6 @@
     </g>
   </g>
     <g transform="translate(200,0)" >
-    <g transform="translate(200,490) scale(2.0,1.0) rotate(45)" >
-      <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
-      <circle fill="black" cx="0" cy="0" r="50" />
-      <circle fill="#a6ce39" cx="0" cy="0" r="33" />
-      <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
-                            L -11,22 L -1,12 Z" />
-      <animateTransform attributeName="transform"  type="rotate" values="0; 360"
-	         begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" />
-    </g>
     <g transform="translate(200,375)">
       <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
       <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
diff --git a/examples/painting/svgviewer/svgviewer.pro b/examples/painting/svgviewer/svgviewer.pro
index b29e2184a4..523dcf68a7 100644
--- a/examples/painting/svgviewer/svgviewer.pro
+++ b/examples/painting/svgviewer/svgviewer.pro
@@ -16,8 +16,17 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES svgviewer.pro files
 sources.path = $$[QT_INSTALL_EXAMPLES]/painting/svgviewer
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 wince*: {
      addFiles.sources = files\*.svg
      addFiles.path = \My Documents
      DEPLOYMENT += addFiles
 }
+
+symbian: {
+     TARGET.UID3 = 0xA000A64E
+     addFiles.sources = files\*.svg
+     addFiles.path = .
+     DEPLOYMENT += addFiles     
+}
diff --git a/examples/painting/transformations/transformations.pro b/examples/painting/transformations/transformations.pro
index a8ff61099d..6e4fe4f0b3 100644
--- a/examples/painting/transformations/transformations.pro
+++ b/examples/painting/transformations/transformations.pro
@@ -9,3 +9,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/painting/transformations
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS transformations.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/painting/transformations
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A64D
\ No newline at end of file
diff --git a/examples/phonon/capabilities/capabilities.pro b/examples/phonon/capabilities/capabilities.pro
index 52b6b1bd0d..7f1ca76239 100644
--- a/examples/phonon/capabilities/capabilities.pro
+++ b/examples/phonon/capabilities/capabilities.pro
@@ -10,7 +10,4 @@ sources.files = $$SOURCES $$HEADERS capabilities.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/phonon/capabilities
 INSTALLS += target sources
 
-wince*{
-DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout
-}
-
+symbian:TARGET.UID3 = 0xA000CF69
\ No newline at end of file
diff --git a/examples/phonon/musicplayer/mainwindow.cpp b/examples/phonon/musicplayer/mainwindow.cpp
index a587b07a30..f123d2907d 100644
--- a/examples/phonon/musicplayer/mainwindow.cpp
+++ b/examples/phonon/musicplayer/mainwindow.cpp
@@ -184,7 +184,7 @@ void MainWindow::metaStateChanged(Phonon::State newState, Phonon::State /* oldSt
         QMessageBox::warning(this, tr("Error opening files"),
             metaInformationResolver->errorString());
         while (!sources.isEmpty() &&
-               !(sources.takeLast() == metaInformationResolver->currentSource()));
+               !(sources.takeLast() == metaInformationResolver->currentSource())) {}
         return;
     }
 
diff --git a/examples/phonon/musicplayer/musicplayer.pro b/examples/phonon/musicplayer/musicplayer.pro
index 0a93dc26aa..e17d29cb46 100644
--- a/examples/phonon/musicplayer/musicplayer.pro
+++ b/examples/phonon/musicplayer/musicplayer.pro
@@ -14,3 +14,4 @@ wince*{
 DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout
 }
 
+symbian:TARGET.UID3 = 0xA000CF6A
\ No newline at end of file
diff --git a/examples/phonon/phonon.pro b/examples/phonon/phonon.pro
index 0dea7669aa..7bb58227ff 100644
--- a/examples/phonon/phonon.pro
+++ b/examples/phonon/phonon.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/phonon
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS phonon.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/phonon
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro
index 0a25efb189..180571ca91 100644
--- a/examples/qtconcurrent/imagescaling/imagescaling.pro
+++ b/examples/qtconcurrent/imagescaling/imagescaling.pro
@@ -12,4 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 wince*: DEPLOYMENT_PLUGIN += qgif qjpeg qtiff
diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro
index f20267bc3b..cc80704399 100644
--- a/examples/qtconcurrent/map/map.pro
+++ b/examples/qtconcurrent/map/map.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro
index 12ba0bf386..aa6a118aba 100644
--- a/examples/qtconcurrent/progressdialog/progressdialog.pro
+++ b/examples/qtconcurrent/progressdialog/progressdialog.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/progressdialog
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/progressdialog
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro
index 5d73533dc1..a30c0bd536 100644
--- a/examples/qtconcurrent/qtconcurrent.pro
+++ b/examples/qtconcurrent/qtconcurrent.pro
@@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro
index 90344766c7..58a1375cfe 100644
--- a/examples/qtconcurrent/runfunction/runfunction.pro
+++ b/examples/qtconcurrent/runfunction/runfunction.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/runfunction
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/runfunction
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro
index fba95ee260..581e6c7309 100644
--- a/examples/qtconcurrent/wordcount/wordcount.pro
+++ b/examples/qtconcurrent/wordcount/wordcount.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/wordcount
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/wordcount
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/qtestlib/qtestlib.pro b/examples/qtestlib/qtestlib.pro
index 8addbcba63..70115e27aa 100644
--- a/examples/qtestlib/qtestlib.pro
+++ b/examples/qtestlib/qtestlib.pro
@@ -6,3 +6,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtestlib.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/qtestlib/tutorial1/tutorial1.pro b/examples/qtestlib/tutorial1/tutorial1.pro
index baa15b29f6..5191a3d59b 100644
--- a/examples/qtestlib/tutorial1/tutorial1.pro
+++ b/examples/qtestlib/tutorial1/tutorial1.pro
@@ -6,3 +6,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1
 sources.files = $$SOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C60B
\ No newline at end of file
diff --git a/examples/qtestlib/tutorial2/tutorial2.pro b/examples/qtestlib/tutorial2/tutorial2.pro
index 44211d8fc4..ae66cace1d 100644
--- a/examples/qtestlib/tutorial2/tutorial2.pro
+++ b/examples/qtestlib/tutorial2/tutorial2.pro
@@ -6,3 +6,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2
 sources.files = $$SOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C60C
\ No newline at end of file
diff --git a/examples/qtestlib/tutorial3/tutorial3.pro b/examples/qtestlib/tutorial3/tutorial3.pro
index b494ba8c6a..9fdda2aca1 100644
--- a/examples/qtestlib/tutorial3/tutorial3.pro
+++ b/examples/qtestlib/tutorial3/tutorial3.pro
@@ -6,3 +6,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3
 sources.files = $$SOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C60D
\ No newline at end of file
diff --git a/examples/qtestlib/tutorial4/tutorial4.pro b/examples/qtestlib/tutorial4/tutorial4.pro
index 0777d4841f..4cb7bf8a99 100644
--- a/examples/qtestlib/tutorial4/tutorial4.pro
+++ b/examples/qtestlib/tutorial4/tutorial4.pro
@@ -6,3 +6,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4
 sources.files = $$SOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C60E
\ No newline at end of file
diff --git a/examples/qtestlib/tutorial5/tutorial5.pro b/examples/qtestlib/tutorial5/tutorial5.pro
index 0310916ebd..f98890436f 100644
--- a/examples/qtestlib/tutorial5/tutorial5.pro
+++ b/examples/qtestlib/tutorial5/tutorial5.pro
@@ -6,3 +6,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5
 sources.files = $$SOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C60F
\ No newline at end of file
diff --git a/examples/qws/ahigl/ahigl.pro b/examples/qws/ahigl/ahigl.pro
index 1ee8e6e150..c8313351e2 100644
--- a/examples/qws/ahigl/ahigl.pro
+++ b/examples/qws/ahigl/ahigl.pro
@@ -7,6 +7,8 @@ TARGET	 = qahiglscreen
 target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers
 INSTALLS += target
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 HEADERS	= qwindowsurface_ahigl_p.h \
           qscreenahigl_qws.h
 
diff --git a/examples/qws/dbscreen/dbscreen.pro b/examples/qws/dbscreen/dbscreen.pro
index 172a02a5e7..86152ab6ce 100644
--- a/examples/qws/dbscreen/dbscreen.pro
+++ b/examples/qws/dbscreen/dbscreen.pro
@@ -5,6 +5,8 @@ TARGET      = dbscreen
 target.path += $$[QT_INSTALL_PLUGINS]/gfxdrivers
 INSTALLS    += target
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 HEADERS     = dbscreen.h 
 SOURCES     = dbscreendriverplugin.cpp \
               dbscreen.cpp 
diff --git a/examples/qws/framebuffer/framebuffer.pro b/examples/qws/framebuffer/framebuffer.pro
index f9fe850aa9..0379908499 100644
--- a/examples/qws/framebuffer/framebuffer.pro
+++ b/examples/qws/framebuffer/framebuffer.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qws/framebuffer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS framebuffer.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qws/framebuffer
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/qws/mousecalibration/mousecalibration.pro b/examples/qws/mousecalibration/mousecalibration.pro
index bd318537a3..6f60b6dce9 100644
--- a/examples/qws/mousecalibration/mousecalibration.pro
+++ b/examples/qws/mousecalibration/mousecalibration.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qws/mousecalibration
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qws/mousecalibration
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/qws/qws.pro b/examples/qws/qws.pro
index 95e1b44a7d..34b1d2c918 100644
--- a/examples/qws/qws.pro
+++ b/examples/qws/qws.pro
@@ -7,3 +7,5 @@ SUBDIRS      += mousecalibration simpledecoration
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qws
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/qws/svgalib/svgalib.pro b/examples/qws/svgalib/svgalib.pro
index 8a47c1d1d0..3ab5a1931a 100644
--- a/examples/qws/svgalib/svgalib.pro
+++ b/examples/qws/svgalib/svgalib.pro
@@ -7,6 +7,8 @@ TARGET = svgalibscreen
 target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers
 INSTALLS += target
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 HEADERS	= svgalibscreen.h \
           svgalibpaintengine.h \
           svgalibsurface.h \
diff --git a/examples/richtext/calendar/calendar.pro b/examples/richtext/calendar/calendar.pro
index bf032f57fc..fb85d96286 100644
--- a/examples/richtext/calendar/calendar.pro
+++ b/examples/richtext/calendar/calendar.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/richtext/calendar
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/richtext/calendar
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/richtext/orderform/orderform.pro b/examples/richtext/orderform/orderform.pro
index 63739b0501..3875ea0684 100644
--- a/examples/richtext/orderform/orderform.pro
+++ b/examples/richtext/orderform/orderform.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/richtext/orderform
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS orderform.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/richtext/orderform
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro
index ef8f09453a..d48602ef24 100644
--- a/examples/richtext/richtext.pro
+++ b/examples/richtext/richtext.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/richtext
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/richtext
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
index b861970396..4b90aa379e 100644
--- a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
+++ b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
@@ -10,6 +10,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS syntaxhighlighter.pro ex
 sources.path = $$[QT_INSTALL_EXAMPLES]/richtext/syntaxhighlighter
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 wince*: {
    addFiles.sources = main.cpp mainwindow.cpp
    addFiles.path = .
diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro
index 226d5f4212..734078ced2 100644
--- a/examples/script/calculator/calculator.pro
+++ b/examples/script/calculator/calculator.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/script/calculator
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.js *.ui
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/calculator
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro
index 30ec9a76ba..be14272b96 100644
--- a/examples/script/context2d/context2d.pro
+++ b/examples/script/context2d/context2d.pro
@@ -21,3 +21,12 @@ target.path = $$[QT_INSTALL_EXAMPLES]/script/context2d
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS context2d.pro scripts
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/context2d
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+symbian:{
+    TARGET.UID3 = 0xA000C608
+    TARGET.EPOCHEAPSIZE = 0x200000 0xA00000
+    contextScripts.path = .
+    contextScripts.sources = scripts
+    DEPLOYMENT += contextScripts
+}
\ No newline at end of file
diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp
index dedaa4ab7c..977cd45fa7 100644
--- a/examples/script/context2d/main.cpp
+++ b/examples/script/context2d/main.cpp
@@ -48,6 +48,7 @@ int main(int argc, char **argv)
 
     QApplication app(argc, argv);
     Window win;
-    win.show();
+    //win.show();
+    win.showFullScreen();
     return app.exec();
 }
diff --git a/examples/script/context2d/qcontext2dcanvas.cpp b/examples/script/context2d/qcontext2dcanvas.cpp
index 5e97242761..f73590864c 100644
--- a/examples/script/context2d/qcontext2dcanvas.cpp
+++ b/examples/script/context2d/qcontext2dcanvas.cpp
@@ -85,6 +85,11 @@ void QContext2DCanvas::contentsChanged(const QImage &image)
 void QContext2DCanvas::paintEvent(QPaintEvent *e)
 {
     QPainter p(this);
+#ifdef Q_WS_S60
+// Draw white rect first since in with some themes the js-file content will produce black-on-black.
+    QBrush whiteBgBrush(Qt::white);
+    p.fillRect(e->rect(), whiteBgBrush);
+#endif
     p.setClipRect(e->rect());
     p.drawImage(0, 0, m_image);
 }
diff --git a/examples/script/customclass/customclass.pro b/examples/script/customclass/customclass.pro
index ba7f69d9a3..bb263d2709 100644
--- a/examples/script/customclass/customclass.pro
+++ b/examples/script/customclass/customclass.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/script/customclass
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.pri
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/customclass
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/script/defaultprototypes/defaultprototypes.pro b/examples/script/defaultprototypes/defaultprototypes.pro
index b9a6765ef5..21328e6060 100644
--- a/examples/script/defaultprototypes/defaultprototypes.pro
+++ b/examples/script/defaultprototypes/defaultprototypes.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/script/defaultprototypes
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.js defaultprototypes.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/defaultprototypes
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/script/helloscript/helloscript.pro b/examples/script/helloscript/helloscript.pro
index d94a318067..5b04f84ee2 100644
--- a/examples/script/helloscript/helloscript.pro
+++ b/examples/script/helloscript/helloscript.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/script/helloscript
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloscript.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/helloscript
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/script/marshal/marshal.pro b/examples/script/marshal/marshal.pro
index 46b33b9019..69fc578640 100644
--- a/examples/script/marshal/marshal.pro
+++ b/examples/script/marshal/marshal.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/script/marshal
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS marshal.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/marshal
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/script/qscript/qscript.pro b/examples/script/qscript/qscript.pro
index 759eedf2bf..3c03545177 100644
--- a/examples/script/qscript/qscript.pro
+++ b/examples/script/qscript/qscript.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/script/qscript
 sources.files = $$RESOURCES $$FORMS main.cpp qscript.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/qscript
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/script/qsdbg/qsdbg.pro b/examples/script/qsdbg/qsdbg.pro
index c1991230e3..77b55a2c96 100644
--- a/examples/script/qsdbg/qsdbg.pro
+++ b/examples/script/qsdbg/qsdbg.pro
@@ -16,4 +16,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qsdbg.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/script/qsdbg
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 
diff --git a/examples/script/script.pro b/examples/script/script.pro
index ae3542e145..c5a37ef601 100644
--- a/examples/script/script.pro
+++ b/examples/script/script.pro
@@ -4,8 +4,12 @@ SUBDIRS = helloscript context2d defaultprototypes customclass
 !wince*:SUBDIRS += qscript marshal
 !wince*:!cross_compile:SUBDIRS += calculator qstetrix
 
+symbian: SUBDIRS = context2d
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/script
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS script.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/script
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/sql/cachedtable/cachedtable.pro b/examples/sql/cachedtable/cachedtable.pro
index a14aa42d8f..89e97aece0 100644
--- a/examples/sql/cachedtable/cachedtable.pro
+++ b/examples/sql/cachedtable/cachedtable.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/cachedtable
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS cachedtable.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql/cachedtable
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/sql/drilldown/drilldown.pro b/examples/sql/drilldown/drilldown.pro
index e15a4ada6b..7907bd2393 100644
--- a/examples/sql/drilldown/drilldown.pro
+++ b/examples/sql/drilldown/drilldown.pro
@@ -14,3 +14,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/drilldown
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS drilldown.pro *.png *.jpg images
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql/drilldown
 INSTALLS += target sources
+
+symbian:TARGET.UID3 = 0xA000C612 
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/sql/drilldown/informationwindow.cpp b/examples/sql/drilldown/informationwindow.cpp
index b9dacd2ac9..b01b753779 100644
--- a/examples/sql/drilldown/informationwindow.cpp
+++ b/examples/sql/drilldown/informationwindow.cpp
@@ -101,7 +101,9 @@ InformationWindow::InformationWindow(int id, QSqlRelationalTableModel *offices,
     setWindowFlags(Qt::Window);
     enableButtons(false);
     setWindowTitle(tr("Office: %1").arg(locationText->text()));
+#ifndef Q_OS_SYMBIAN    
     resize(320, sizeHint().height());
+#endif    
 }
 //! [4]
 
diff --git a/examples/sql/drilldown/main.cpp b/examples/sql/drilldown/main.cpp
index 2bc521b495..432849d480 100644
--- a/examples/sql/drilldown/main.cpp
+++ b/examples/sql/drilldown/main.cpp
@@ -54,6 +54,10 @@ int main(int argc, char *argv[])
         return 1;
 
     View view("offices", "images");
+#ifndef Q_OS_SYMBIAN    
     view.show();
+#else    
+    view.showFullScreen();    
+#endif        
     return app.exec();
 }
diff --git a/examples/sql/drilldown/view.cpp b/examples/sql/drilldown/view.cpp
index 07eb04710c..e288ac6d55 100644
--- a/examples/sql/drilldown/view.cpp
+++ b/examples/sql/drilldown/view.cpp
@@ -62,10 +62,15 @@ View::View(const QString &offices, const QString &images, QWidget *parent)
 
     QGraphicsPixmapItem *logo = scene->addPixmap(QPixmap(":/logo.png"));
     logo->setPos(30, 515);
-
+    
+#ifndef Q_OS_SYMBIAN
     setMinimumSize(470, 620);
-    setMaximumSize(470, 620);
-    setWindowTitle(tr("Offices World Wide"));
+    setMaximumSize(470, 620);    
+#else
+    setDragMode(QGraphicsView::ScrollHandDrag);  
+#endif    
+
+   setWindowTitle(tr("Offices World Wide"));   
 }
 //! [1]
 
@@ -126,7 +131,11 @@ void View::showInformation(ImageItem *image)
         window->raise();
         window->activateWindow();
     } else if (window && !window->isVisible()) {
+#ifndef Q_OS_SYMBIAN
         window->show();
+#else
+        window->showFullScreen();
+#endif        
     } else {
         InformationWindow *window;
         window = new InformationWindow(id, officeTable, this);
@@ -134,8 +143,12 @@ void View::showInformation(ImageItem *image)
         connect(window, SIGNAL(imageChanged(int, QString)),
                 this, SLOT(updateImage(int, QString)));
 
+#ifndef Q_OS_SYMBIAN
         window->move(pos() + QPoint(20, 40));
         window->show();
+#else
+        window->showFullScreen();
+#endif    
         informationWindows.append(window);
     }
 }
diff --git a/examples/sql/masterdetail/masterdetail.pro b/examples/sql/masterdetail/masterdetail.pro
index 205c54405c..2363e5450c 100644
--- a/examples/sql/masterdetail/masterdetail.pro
+++ b/examples/sql/masterdetail/masterdetail.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/masterdetail
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS masterdetail.pro *.xml images
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql/masterdetail
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/sql/querymodel/querymodel.pro b/examples/sql/querymodel/querymodel.pro
index e0e0813890..f20898cc9d 100644
--- a/examples/sql/querymodel/querymodel.pro
+++ b/examples/sql/querymodel/querymodel.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/querymodel
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS querymodel.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql/querymodel
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/sql/relationaltablemodel/relationaltablemodel.pro b/examples/sql/relationaltablemodel/relationaltablemodel.pro
index 38f1e210cc..e57729ef91 100644
--- a/examples/sql/relationaltablemodel/relationaltablemodel.pro
+++ b/examples/sql/relationaltablemodel/relationaltablemodel.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/relationaltablemodel
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS relationaltablemodel.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql/relationaltablemodel
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro
index 6d0d4026f3..7bdff69fd7 100644
--- a/examples/sql/sql.pro
+++ b/examples/sql/sql.pro
@@ -1,12 +1,18 @@
 TEMPLATE      = subdirs
-SUBDIRS       = cachedtable \
-                drilldown \
-                relationaltablemodel \
-                sqlwidgetmapper
 
-!wince*: SUBDIRS += querymodel tablemodel masterdetail
+SUBDIRS             =   drilldown
+!symbian: SUBDIRS   +=  cachedtable \
+                        relationaltablemodel \
+                        sqlwidgetmapper
+
+!wince*:!symbian: SUBDIRS += \
+                        querymodel \
+                        tablemodel \
+                        masterdetail
 
 # install
 sources.files = connection.h sql.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/sql/tablemodel/tablemodel.pro b/examples/sql/tablemodel/tablemodel.pro
index 4d099d09cf..7adf40c10b 100644
--- a/examples/sql/tablemodel/tablemodel.pro
+++ b/examples/sql/tablemodel/tablemodel.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/tablemodel
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS tablemodel.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql/tablemodel
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro
index 7870ca818f..cf95ea0089 100644
--- a/examples/threads/mandelbrot/mandelbrot.pro
+++ b/examples/threads/mandelbrot/mandelbrot.pro
@@ -4,10 +4,12 @@ SOURCES       = main.cpp \
                 mandelbrotwidget.cpp \
                 renderthread.cpp
 
-unix:!mac:!vxworks:LIBS += -lm
+unix:!mac:!symbian:!vxworks:LIBS += -lm
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mandelbrot.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/threads/semaphores/semaphores.pro b/examples/threads/semaphores/semaphores.pro
index 2e468b7992..5331383e06 100644
--- a/examples/threads/semaphores/semaphores.pro
+++ b/examples/threads/semaphores/semaphores.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/threads/semaphores
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS semaphores.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/threads/semaphores
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/threads/threads.pro b/examples/threads/threads.pro
index a2ccfa7412..a0e69c81b1 100644
--- a/examples/threads/threads.pro
+++ b/examples/threads/threads.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/threads
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threads.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/threads
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/threads/waitconditions/waitconditions.pro b/examples/threads/waitconditions/waitconditions.pro
index 8c34cecdb8..49fe318537 100644
--- a/examples/threads/waitconditions/waitconditions.pro
+++ b/examples/threads/waitconditions/waitconditions.pro
@@ -10,11 +10,13 @@ INCLUDEPATH += .
 # Input
 SOURCES += waitconditions.cpp
 CONFIG += qt warn_on create_prl link_prl console
-OBJECTS_DIR=.obj/debug-shared
-MOC_DIR=.moc/debug-shared
+OBJECTS_DIR=obj/debug-shared
+MOC_DIR=moc/debug-shared
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/threads/waitconditions
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS waitconditions.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/threads/waitconditions
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/codecs/codecs.pro b/examples/tools/codecs/codecs.pro
index 6ae225a295..7cc0ae836c 100644
--- a/examples/tools/codecs/codecs.pro
+++ b/examples/tools/codecs/codecs.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/codecs
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS encodedfiles codecs.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/codecs
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/completer/completer.pro b/examples/tools/completer/completer.pro
index 4ac50844e8..4f3145438d 100644
--- a/examples/tools/completer/completer.pro
+++ b/examples/tools/completer/completer.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/completer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS completer.pro resources
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/completer
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/customcompleter/customcompleter.pro b/examples/tools/customcompleter/customcompleter.pro
index ebaa8313a5..8a11cf15d7 100644
--- a/examples/tools/customcompleter/customcompleter.pro
+++ b/examples/tools/customcompleter/customcompleter.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro resources
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/echoplugin/echoplugin.pro b/examples/tools/echoplugin/echoplugin.pro
index 998f25cab1..6146b4901f 100644
--- a/examples/tools/echoplugin/echoplugin.pro
+++ b/examples/tools/echoplugin/echoplugin.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echoplugin.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/echoplugin/echowindow/echowindow.pro b/examples/tools/echoplugin/echowindow/echowindow.pro
index fb1cea9f8c..142438bac0 100644
--- a/examples/tools/echoplugin/echowindow/echowindow.pro
+++ b/examples/tools/echoplugin/echowindow/echowindow.pro
@@ -16,3 +16,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echowindow.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/echowindow
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/echoplugin/plugin/plugin.pro b/examples/tools/echoplugin/plugin/plugin.pro
index 5c0c5af0a6..d943425f24 100644
--- a/examples/tools/echoplugin/plugin/plugin.pro
+++ b/examples/tools/echoplugin/plugin/plugin.pro
@@ -13,3 +13,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/plugin
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/plugin
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.EPOCALLOWDLLDATA = 1
diff --git a/examples/tools/i18n/i18n.pro b/examples/tools/i18n/i18n.pro
index 0ef9a0b1e9..a065611c87 100644
--- a/examples/tools/i18n/i18n.pro
+++ b/examples/tools/i18n/i18n.pro
@@ -24,3 +24,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/i18n
 sources.files = $$SOURCES $$HEADERS $$RESOURCES translations i18n.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/i18n
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/plugandpaint/plugandpaint.pro b/examples/tools/plugandpaint/plugandpaint.pro
index 15bc21e4a7..fef1b86f7c 100644
--- a/examples/tools/plugandpaint/plugandpaint.pro
+++ b/examples/tools/plugandpaint/plugandpaint.pro
@@ -7,7 +7,11 @@ SOURCES        = main.cpp \
                  mainwindow.cpp \
                  paintarea.cpp \
                  plugindialog.cpp
-LIBS           = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools
+symbian {
+    LIBS           = -lpnp_basictools.lib
+} else {
+    LIBS           = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools
+}
 
 if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
    mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)_debug
@@ -20,3 +24,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugandpaint.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/plugandpaintplugins/basictools/basictools.pro b/examples/tools/plugandpaintplugins/basictools/basictools.pro
index f015fdc3ea..f9cd4a6a85 100644
--- a/examples/tools/plugandpaintplugins/basictools/basictools.pro
+++ b/examples/tools/plugandpaintplugins/basictools/basictools.pro
@@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint/plugins
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basictools.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins/basictools
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
index 3cf2b662b6..7fbb6d1787 100644
--- a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
+++ b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
@@ -13,3 +13,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint/plugins
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extrafilters.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins/extrafilters
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.EPOCALLOWDLLDATA = 1
diff --git a/examples/tools/plugandpaintplugins/plugandpaintplugins.pro b/examples/tools/plugandpaintplugins/plugandpaintplugins.pro
index 89e8b7e6f1..ccc042c307 100644
--- a/examples/tools/plugandpaintplugins/plugandpaintplugins.pro
+++ b/examples/tools/plugandpaintplugins/plugandpaintplugins.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugandpaintplugins.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/regexp/regexp.pro b/examples/tools/regexp/regexp.pro
index 15ca9a4959..bbb3fd390e 100644
--- a/examples/tools/regexp/regexp.pro
+++ b/examples/tools/regexp/regexp.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/regexp
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS regexp.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/regexp
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/settingseditor/settingseditor.pro b/examples/tools/settingseditor/settingseditor.pro
index 321c2bb24c..c6838bc73f 100644
--- a/examples/tools/settingseditor/settingseditor.pro
+++ b/examples/tools/settingseditor/settingseditor.pro
@@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/settingseditor
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS settingseditor.pro inifiles
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/settingseditor
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/styleplugin/plugin/plugin.pro b/examples/tools/styleplugin/plugin/plugin.pro
index 1e84e3c5c4..2a36d51b34 100644
--- a/examples/tools/styleplugin/plugin/plugin.pro
+++ b/examples/tools/styleplugin/plugin/plugin.pro
@@ -19,3 +19,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/styles
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/plugin
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.EPOCALLOWDLLDATA = 1
diff --git a/examples/tools/styleplugin/styleplugin.pro b/examples/tools/styleplugin/styleplugin.pro
index bf4fa5c639..74f77b5883 100644
--- a/examples/tools/styleplugin/styleplugin.pro
+++ b/examples/tools/styleplugin/styleplugin.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styleplugin.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/styleplugin/stylewindow/stylewindow.pro b/examples/tools/styleplugin/stylewindow/stylewindow.pro
index 7c5266df3b..df68168387 100644
--- a/examples/tools/styleplugin/stylewindow/stylewindow.pro
+++ b/examples/tools/styleplugin/stylewindow/stylewindow.pro
@@ -15,3 +15,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stylewindow.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/stylewindow
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro
index c694dd8a6d..b1509dc374 100644
--- a/examples/tools/tools.pro
+++ b/examples/tools/tools.pro
@@ -21,3 +21,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tools.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.pro b/examples/tools/treemodelcompleter/treemodelcompleter.pro
index 8631e2b920..ef5c0cb38b 100644
--- a/examples/tools/treemodelcompleter/treemodelcompleter.pro
+++ b/examples/tools/treemodelcompleter/treemodelcompleter.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/treemodelcompleter
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS treemodelcompleter.pro resources
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/treemodelcompleter
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tools/undoframework/undoframework.pro b/examples/tools/undoframework/undoframework.pro
index 42010f5499..f797eb501c 100644
--- a/examples/tools/undoframework/undoframework.pro
+++ b/examples/tools/undoframework/undoframework.pro
@@ -14,3 +14,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tools/undoframework
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS undoframework.pro README images
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/undoframework
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tutorials/addressbook/addressbook.pro b/examples/tutorials/addressbook/addressbook.pro
index 4607c25c35..8e9859301d 100644
--- a/examples/tutorials/addressbook/addressbook.pro
+++ b/examples/tutorials/addressbook/addressbook.pro
@@ -6,3 +6,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tutorials/addressbook/part1/part1.pro b/examples/tutorials/addressbook/part1/part1.pro
index bb181dd392..505f814f4e 100644
--- a/examples/tutorials/addressbook/part1/part1.pro
+++ b/examples/tutorials/addressbook/part1/part1.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part1
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part1
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tutorials/addressbook/part2/part2.pro b/examples/tutorials/addressbook/part2/part2.pro
index 01ce34465f..fdc0079086 100644
--- a/examples/tutorials/addressbook/part2/part2.pro
+++ b/examples/tutorials/addressbook/part2/part2.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part2
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tutorials/addressbook/part3/part3.pro b/examples/tutorials/addressbook/part3/part3.pro
index 128c0380e9..6e33cb84f0 100644
--- a/examples/tutorials/addressbook/part3/part3.pro
+++ b/examples/tutorials/addressbook/part3/part3.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part3
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part3
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tutorials/addressbook/part4/part4.pro b/examples/tutorials/addressbook/part4/part4.pro
index 23ce3e6008..0cfb546993 100644
--- a/examples/tutorials/addressbook/part4/part4.pro
+++ b/examples/tutorials/addressbook/part4/part4.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part4
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part4
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tutorials/addressbook/part5/part5.pro b/examples/tutorials/addressbook/part5/part5.pro
index 95123d000e..92e3d51db5 100644
--- a/examples/tutorials/addressbook/part5/part5.pro
+++ b/examples/tutorials/addressbook/part5/part5.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part5
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part5
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tutorials/addressbook/part6/part6.pro b/examples/tutorials/addressbook/part6/part6.pro
index dc8956132a..1b57b1670a 100644
--- a/examples/tutorials/addressbook/part6/part6.pro
+++ b/examples/tutorials/addressbook/part6/part6.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part6
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part6
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tutorials/addressbook/part7/part7.pro b/examples/tutorials/addressbook/part7/part7.pro
index a726d91003..fc47fae4c6 100644
--- a/examples/tutorials/addressbook/part7/part7.pro
+++ b/examples/tutorials/addressbook/part7/part7.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part7
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/addressbook/part7
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
index 8b3f41fd7c..427dc03f87 100644
--- a/examples/tutorials/tutorials.pro
+++ b/examples/tutorials/tutorials.pro
@@ -6,3 +6,5 @@ SUBDIRS       = \
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials
 INSTALLS += sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro
index 92dda2ee08..5340ac513a 100644
--- a/examples/uitools/multipleinheritance/multipleinheritance.pro
+++ b/examples/uitools/multipleinheritance/multipleinheritance.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/uitools/multipleinheritance
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/uitools/multipleinheritance
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/uitools/textfinder/textfinder.pro b/examples/uitools/textfinder/textfinder.pro
index 9d2a96dcf4..f4f14e1418 100644
--- a/examples/uitools/textfinder/textfinder.pro
+++ b/examples/uitools/textfinder/textfinder.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/uitools/textfinder
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro forms
 sources.path = $$[QT_INSTALL_EXAMPLES]/uitools/textfinder
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/uitools/uitools.pro b/examples/uitools/uitools.pro
index ddec822a4f..78c15fa00f 100644
--- a/examples/uitools/uitools.pro
+++ b/examples/uitools/uitools.pro
@@ -1,10 +1,12 @@
 TEMPLATE      = subdirs
 SUBDIRS       = multipleinheritance
 
-!wince*:contains(QT_BUILD_PARTS, tools): SUBDIRS += textfinder
+!wince*:!symbian:contains(QT_BUILD_PARTS, tools): SUBDIRS += textfinder
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/uitools
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS uitools.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/uitools
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro
index 3de3036284..e496241cde 100644
--- a/examples/webkit/fancybrowser/fancybrowser.pro
+++ b/examples/webkit/fancybrowser/fancybrowser.pro
@@ -1,4 +1,4 @@
-QT      +=  webkit
+QT      +=  webkit network
 HEADERS =   mainwindow.h
 SOURCES =   main.cpp \
             mainwindow.cpp
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webkit/fancybrowser
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/fancybrowser
 INSTALLS += target sources
+
+symbian:TARGET.UID3 = 0xA000CF6C
diff --git a/examples/webkit/formextractor/formextractor.pro b/examples/webkit/formextractor/formextractor.pro
index d2cb240d59..33e2267a13 100644
--- a/examples/webkit/formextractor/formextractor.pro
+++ b/examples/webkit/formextractor/formextractor.pro
@@ -1,4 +1,4 @@
-QT          +=  webkit
+QT          +=  webkit network
 TARGET       =  formExtractor
 TEMPLATE     =  app
 SOURCES     +=  main.cpp \
@@ -14,3 +14,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webkit/formextractor
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro form.html images
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/formextractor
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000CF6D
diff --git a/examples/webkit/googlechat/googlechat.pro b/examples/webkit/googlechat/googlechat.pro
index 14b7085a82..8e4f9a6fc8 100644
--- a/examples/webkit/googlechat/googlechat.pro
+++ b/examples/webkit/googlechat/googlechat.pro
@@ -1,4 +1,4 @@
-QT      +=  webkit
+QT      +=  webkit network
 HEADERS =   googlechat.h
 SOURCES =   main.cpp \
             googlechat.cpp
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlechat
 sources.files = $$SOURCES $$HEADERS $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlechat
 INSTALLS += target sources
+
+symbian:TARGET.UID3 = 0xA000CF6E
diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro
index 75ab6fbaaa..cc7fb73ee8 100644
--- a/examples/webkit/previewer/previewer.pro
+++ b/examples/webkit/previewer/previewer.pro
@@ -1,4 +1,4 @@
-QT      +=  webkit
+QT      +=  webkit network
 HEADERS =   previewer.h \
             mainwindow.h
 SOURCES =   main.cpp \
@@ -11,3 +11,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webkit/previewer
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/previewer
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000CF6F
diff --git a/examples/webkit/webkit.pro b/examples/webkit/webkit.pro
index 225816adac..5c954c22ec 100644
--- a/examples/webkit/webkit.pro
+++ b/examples/webkit/webkit.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webkit
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS webkit.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/analogclock/analogclock.pro b/examples/widgets/analogclock/analogclock.pro
index 62a1806d33..9865a1134b 100644
--- a/examples/widgets/analogclock/analogclock.pro
+++ b/examples/widgets/analogclock/analogclock.pro
@@ -7,3 +7,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/analogclock
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS analogclock.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/analogclock
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000A64F
\ No newline at end of file
diff --git a/examples/widgets/calculator/calculator.pro b/examples/widgets/calculator/calculator.pro
index a9a50d65a6..178f43e77c 100644
--- a/examples/widgets/calculator/calculator.pro
+++ b/examples/widgets/calculator/calculator.pro
@@ -9,3 +9,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/calculator
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calculator.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/calculator
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C602
\ No newline at end of file
diff --git a/examples/widgets/calendarwidget/calendarwidget.pro b/examples/widgets/calendarwidget/calendarwidget.pro
index 9326989f66..63c154b5e4 100644
--- a/examples/widgets/calendarwidget/calendarwidget.pro
+++ b/examples/widgets/calendarwidget/calendarwidget.pro
@@ -7,3 +7,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/calendarwidget
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendarwidget.pro resources
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/calendarwidget
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C603
\ No newline at end of file
diff --git a/examples/widgets/charactermap/charactermap.pro b/examples/widgets/charactermap/charactermap.pro
index fe0733d539..97632875b9 100644
--- a/examples/widgets/charactermap/charactermap.pro
+++ b/examples/widgets/charactermap/charactermap.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/charactermap
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS charactermap.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/charactermap
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/digitalclock/digitalclock.pro b/examples/widgets/digitalclock/digitalclock.pro
index b87b4a0ee1..b7c8e09f1b 100644
--- a/examples/widgets/digitalclock/digitalclock.pro
+++ b/examples/widgets/digitalclock/digitalclock.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/digitalclock
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS digitalclock.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/digitalclock
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/groupbox/groupbox.pro b/examples/widgets/groupbox/groupbox.pro
index 7175f66b28..8d09f5f3b4 100644
--- a/examples/widgets/groupbox/groupbox.pro
+++ b/examples/widgets/groupbox/groupbox.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/groupbox
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS groupbox.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/groupbox
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/icons/icons.pro b/examples/widgets/icons/icons.pro
index 3b432d93ec..ea9c848573 100644
--- a/examples/widgets/icons/icons.pro
+++ b/examples/widgets/icons/icons.pro
@@ -14,6 +14,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS icons.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/icons
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 wince*: {
     imageFiles.sources = images/*
     wincewm*: {
diff --git a/examples/widgets/imageviewer/imageviewer.pro b/examples/widgets/imageviewer/imageviewer.pro
index 31c9d470a8..597d95bc3f 100644
--- a/examples/widgets/imageviewer/imageviewer.pro
+++ b/examples/widgets/imageviewer/imageviewer.pro
@@ -8,6 +8,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS imageviewer.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/imageviewer
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 wince*: {
    DEPLOYMENT_PLUGIN += qjpeg qmng qgif
 }
diff --git a/examples/widgets/lineedits/lineedits.pro b/examples/widgets/lineedits/lineedits.pro
index e96302442a..534714805c 100644
--- a/examples/widgets/lineedits/lineedits.pro
+++ b/examples/widgets/lineedits/lineedits.pro
@@ -7,3 +7,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/lineedits
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lineedits.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/lineedits
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C604
\ No newline at end of file
diff --git a/examples/widgets/movie/movie.pro b/examples/widgets/movie/movie.pro
index 6aa5780600..fe011d2d09 100644
--- a/examples/widgets/movie/movie.pro
+++ b/examples/widgets/movie/movie.pro
@@ -8,6 +8,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro animation.mng
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/movie
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 wince*: {
    addFiles.sources += *.mng
    addFiles.path = .
diff --git a/examples/widgets/scribble/scribble.pro b/examples/widgets/scribble/scribble.pro
index 21f24ccf85..a9190f7664 100644
--- a/examples/widgets/scribble/scribble.pro
+++ b/examples/widgets/scribble/scribble.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/scribble
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS scribble.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/scribble
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/shapedclock/shapedclock.pro b/examples/widgets/shapedclock/shapedclock.pro
index 6ef5dd0b29..c4d48f6d84 100644
--- a/examples/widgets/shapedclock/shapedclock.pro
+++ b/examples/widgets/shapedclock/shapedclock.pro
@@ -7,3 +7,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/shapedclock
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS shapedclock.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/shapedclock
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C605
\ No newline at end of file
diff --git a/examples/widgets/sliders/sliders.pro b/examples/widgets/sliders/sliders.pro
index b8455542c9..742fc27309 100644
--- a/examples/widgets/sliders/sliders.pro
+++ b/examples/widgets/sliders/sliders.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/sliders
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sliders.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/sliders
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/softkeys/main.cpp b/examples/widgets/softkeys/main.cpp
new file mode 100644
index 0000000000..a544b28e2a
--- /dev/null
+++ b/examples/widgets/softkeys/main.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "softkeys.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    MainWindow mw;
+    mw.showMaximized();
+    return app.exec();
+}
diff --git a/examples/widgets/softkeys/softkeys.cpp b/examples/widgets/softkeys/softkeys.cpp
new file mode 100644
index 0000000000..110f2e6722
--- /dev/null
+++ b/examples/widgets/softkeys/softkeys.cpp
@@ -0,0 +1,161 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "softkeys.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    central = new QWidget(this);
+    central->setContextMenuPolicy(Qt::NoContextMenu); // explicitly forbid usage of context menu so actions item is not shown menu
+    setCentralWidget(central);
+
+    // Create text editor and set softkeys to it
+    textEditor= new QTextEdit(tr("Navigate in UI to see context sensitive softkeys in action"), this);
+    QAction* menu = new QAction(tr("Menu"), this);
+    menu->setSoftKeyRole(QAction::MenuSoftKey);
+    QAction* clear = new QAction(tr("Clear"), this);
+    clear->setSoftKeyRole(QAction::CancelSoftKey);
+
+    QList<QAction*> textEditorSoftKeys;
+    textEditorSoftKeys.append(menu);
+    textEditorSoftKeys.append(clear);
+    textEditor->setSoftKeys(textEditorSoftKeys);
+
+    infoLabel = new QLabel(tr(""), this);
+    infoLabel->setContextMenuPolicy(Qt::NoContextMenu);
+
+    toggleButton = new QPushButton(tr("Custom softkeys"), this);
+    toggleButton->setContextMenuPolicy(Qt::NoContextMenu);
+    toggleButton->setCheckable(true); 
+
+    pushButton = new QPushButton(tr("Open File Dialog"), this);
+    pushButton->setContextMenuPolicy(Qt::NoContextMenu);
+
+    QComboBox* comboBox = new QComboBox(this);
+    comboBox->setContextMenuPolicy(Qt::NoContextMenu);
+    comboBox->insertItems(0, QStringList()
+     << QApplication::translate("MainWindow", "Selection1", 0, QApplication::UnicodeUTF8)
+     << QApplication::translate("MainWindow", "Selection2", 0, QApplication::UnicodeUTF8)
+     << QApplication::translate("MainWindow", "Selection3", 0, QApplication::UnicodeUTF8)
+    );
+
+    layout = new QVBoxLayout;
+    layout->addWidget(textEditor);
+    layout->addWidget(infoLabel);
+    layout->addWidget(toggleButton);
+    layout->addWidget(pushButton);
+    layout->addWidget(comboBox);
+    central->setLayout(layout);
+
+    fileMenu = menuBar()->addMenu(tr("&File"));
+    exit = new QAction(tr("&Exit"), this);
+    fileMenu->addAction(exit);
+
+    connect(clear, SIGNAL(triggered()), this, SLOT(clearTextEditor()));
+    connect(pushButton, SIGNAL(clicked()), this, SLOT(openDialog()));
+    connect(exit, SIGNAL(triggered()), this, SLOT(exitApplication()));
+    connect(toggleButton, SIGNAL(clicked()), this, SLOT(setCustomSoftKeys()));
+    pushButton->setFocus();
+}
+
+MainWindow::~MainWindow()
+{
+}
+
+void MainWindow::clearTextEditor()
+{
+    textEditor->setText(tr(""));
+}
+
+void MainWindow::openDialog()
+{
+    QFileDialog::getOpenFileName(this);
+}
+
+void MainWindow::addSoftKeys()
+{
+    ok = new QAction(tr("Ok"), this);
+    ok->setSoftKeyRole(QAction::OkSoftKey);
+    connect(ok, SIGNAL(triggered()), this, SLOT(okPressed()));
+
+    cancel = new QAction(tr("Cancel"), this);
+    cancel->setSoftKeyRole(QAction::CancelSoftKey);
+    connect(cancel, SIGNAL(triggered()), this, SLOT(cancelPressed()));
+
+    QList<QAction*> softkeys;
+    softkeys.append(ok);
+    softkeys.append(cancel);
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget)
+        focusWidget->setSoftKeys(softkeys);
+}
+
+void MainWindow::setCustomSoftKeys()
+{
+    if (toggleButton->isChecked()) {
+        infoLabel->setText(tr("Custom softkeys set"));
+        addSoftKeys();
+        }
+    else {
+        infoLabel->setText(tr("Custom softkeys removed"));
+        QWidget* focusWidget = QApplication::focusWidget();
+        if (focusWidget)
+            focusWidget->setSoftKey(0);
+    }
+}
+
+void MainWindow::exitApplication()
+{
+    qApp->exit();
+}
+
+void MainWindow::okPressed()
+{
+    infoLabel->setText(tr("OK pressed"));
+}
+
+void MainWindow::cancelPressed()
+{
+    infoLabel->setText(tr("Cancel pressed"));
+}
+
+
diff --git a/examples/widgets/softkeys/softkeys.h b/examples/widgets/softkeys/softkeys.h
new file mode 100644
index 0000000000..da56eae0b9
--- /dev/null
+++ b/examples/widgets/softkeys/softkeys.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SOFTKEYS_H
+#define SOFTKEYS_H
+
+#include <QtGui>
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+public:
+
+private slots:
+    void clearTextEditor();
+    void openDialog();
+    void addSoftKeys();
+    void exitApplication();
+    void okPressed();
+    void cancelPressed();
+    void setCustomSoftKeys();
+public:
+    MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+private:
+    QVBoxLayout *layout;
+    QWidget *central;
+    QTextEdit* textEditor;
+    QLabel *infoLabel;
+    QPushButton* toggleButton;
+    QPushButton* pushButton;
+    QMenu* fileMenu;
+    QAction* addSoftKeysAct;
+    QAction* exit;
+    QAction* ok;
+    QAction* cancel;
+};
+
+//! [0]
+class SoftKey : public QWidget
+{
+    Q_OBJECT
+public:
+    SoftKey(QWidget *parent = 0);
+};
+//! [0]
+
+#endif
diff --git a/examples/widgets/softkeys/softkeys.pro b/examples/widgets/softkeys/softkeys.pro
new file mode 100644
index 0000000000..9a0feea787
--- /dev/null
+++ b/examples/widgets/softkeys/softkeys.pro
@@ -0,0 +1,14 @@
+HEADERS =   softkeys.h
+SOURCES += \
+            main.cpp \
+            softkeys.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/softkeys
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS softkeys.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/softkeys
+INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000CF6B
diff --git a/examples/widgets/spinboxes/spinboxes.pro b/examples/widgets/spinboxes/spinboxes.pro
index 4edb79afb8..b859ab7330 100644
--- a/examples/widgets/spinboxes/spinboxes.pro
+++ b/examples/widgets/spinboxes/spinboxes.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/spinboxes
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spinboxes.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/spinboxes
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/styles/styles.pro b/examples/widgets/styles/styles.pro
index 4c6c682b17..8918d21f39 100644
--- a/examples/widgets/styles/styles.pro
+++ b/examples/widgets/styles/styles.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/styles
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styles.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/styles
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/stylesheet/stylesheet.pro b/examples/widgets/stylesheet/stylesheet.pro
index 9a64c005cd..71dfc6d1dd 100644
--- a/examples/widgets/stylesheet/stylesheet.pro
+++ b/examples/widgets/stylesheet/stylesheet.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/stylesheet
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images layouts qss
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/stylesheet
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/tablet/tablet.pro b/examples/widgets/tablet/tablet.pro
index 27d8d2cd3c..ee25888942 100644
--- a/examples/widgets/tablet/tablet.pro
+++ b/examples/widgets/tablet/tablet.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tablet
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tablet.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tablet
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/tetrix/tetrix.pro b/examples/widgets/tetrix/tetrix.pro
index 59392fa521..2223b8619f 100644
--- a/examples/widgets/tetrix/tetrix.pro
+++ b/examples/widgets/tetrix/tetrix.pro
@@ -11,3 +11,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tetrix
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tetrix.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tetrix
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C606
\ No newline at end of file
diff --git a/examples/widgets/tooltips/tooltips.pro b/examples/widgets/tooltips/tooltips.pro
index 9f0bf41e9a..0eca4c8a19 100644
--- a/examples/widgets/tooltips/tooltips.pro
+++ b/examples/widgets/tooltips/tooltips.pro
@@ -10,3 +10,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tooltips
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tooltips.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tooltips
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/validators/validators.pro b/examples/widgets/validators/validators.pro
index 8e7884d56e..d7f9dde851 100644
--- a/examples/widgets/validators/validators.pro
+++ b/examples/widgets/validators/validators.pro
@@ -19,3 +19,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/validators
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/validators
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro
index 0af83c7030..399a3ac035 100644
--- a/examples/widgets/widgets.pro
+++ b/examples/widgets/widgets.pro
@@ -22,6 +22,16 @@ SUBDIRS       = analogclock \
                 wiggly \
                 windowflags
 
+symbian: SUBDIRS = \
+                analogclock \
+                calculator \
+                calendarwidget \
+                lineedits \
+                shapedclock \
+                tetrix \
+                wiggly \
+                softkeys
+
 contains(styles, motif): SUBDIRS += styles
 
 # install
@@ -29,3 +39,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS widgets.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/widgets/wiggly/dialog.cpp b/examples/widgets/wiggly/dialog.cpp
index f4fa4028ed..8af1789444 100644
--- a/examples/widgets/wiggly/dialog.cpp
+++ b/examples/widgets/wiggly/dialog.cpp
@@ -45,7 +45,7 @@
 #include "wigglywidget.h"
 
 //! [0]
-Dialog::Dialog(QWidget *parent)
+Dialog::Dialog(QWidget *parent, bool smallScreen)
     : QDialog(parent)
 {
     WigglyWidget *wigglyWidget = new WigglyWidget;
@@ -58,9 +58,12 @@ Dialog::Dialog(QWidget *parent)
 
     connect(lineEdit, SIGNAL(textChanged(QString)),
             wigglyWidget, SLOT(setText(QString)));
-
-    lineEdit->setText(tr("Hello world!"));
-
+    if (!smallScreen){
+        lineEdit->setText(tr("Hello world!"));
+    }
+    else{
+        lineEdit->setText(tr("Hello!"));
+    }
     setWindowTitle(tr("Wiggly"));
     resize(360, 145);
 }
diff --git a/examples/widgets/wiggly/dialog.h b/examples/widgets/wiggly/dialog.h
index 4286741b96..8f54a028fc 100644
--- a/examples/widgets/wiggly/dialog.h
+++ b/examples/widgets/wiggly/dialog.h
@@ -50,7 +50,7 @@ class Dialog : public QDialog
     Q_OBJECT
 
 public:
-    Dialog(QWidget *parent = 0);
+    Dialog(QWidget *parent = 0, bool smallScreen = false);
 };
 //! [0]
 
diff --git a/examples/widgets/wiggly/main.cpp b/examples/widgets/wiggly/main.cpp
index 2e19fedd89..eb55c69e28 100644
--- a/examples/widgets/wiggly/main.cpp
+++ b/examples/widgets/wiggly/main.cpp
@@ -46,8 +46,16 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-
-    Dialog dialog;
-    dialog.show();
+    bool smallScreen = false;
+    for (int i=0; i<argc; i++)
+        if (QString(argv[i]) == "-small-screen")
+            smallScreen = true;
+    Dialog dialog(0,smallScreen);
+    if (!smallScreen){
+        dialog.show();
+    }
+    else{
+        dialog.showFullScreen();
+    }
     return app.exec();
 }
diff --git a/examples/widgets/wiggly/wiggly.pro b/examples/widgets/wiggly/wiggly.pro
index 5288dd38e9..42407655ba 100644
--- a/examples/widgets/wiggly/wiggly.pro
+++ b/examples/widgets/wiggly/wiggly.pro
@@ -9,3 +9,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/wiggly
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wiggly.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/wiggly
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C607
\ No newline at end of file
diff --git a/examples/widgets/windowflags/windowflags.pro b/examples/widgets/windowflags/windowflags.pro
index fa8a5674f4..007c10a9b4 100644
--- a/examples/widgets/windowflags/windowflags.pro
+++ b/examples/widgets/windowflags/windowflags.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/windowflags
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowflags.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/windowflags
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro
index e55754fd5b..f38321f45c 100644
--- a/examples/xml/dombookmarks/dombookmarks.pro
+++ b/examples/xml/dombookmarks/dombookmarks.pro
@@ -11,6 +11,8 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dombookmarks.pro *.xbel
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 wince*: {
      addFiles.sources = frank.xbel jennifer.xbel
      addFiles.path = \My Documents
diff --git a/examples/xml/htmlinfo/apache_org.html b/examples/xml/htmlinfo/apache_org.html
new file mode 100644
index 0000000000..9e5e4d3a68
--- /dev/null
+++ b/examples/xml/htmlinfo/apache_org.html
@@ -0,0 +1,281 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License. 
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+   <!--
+      XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+            This file is generated from XML source: DO NOT EDIT!
+      XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+   -->
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<link rel="stylesheet" href="./style/compressed.css" type="text/css" media="screen, projection"/>
+	<link rel="stylesheet" href="./style/style.css" type="text/css" media="screen, projection"/>
+	<!--[if IE]><link rel="stylesheet" href="./style/ie.css" type="text/css" media="screen, projection"/><![endif]-->
+<link rel="alternate" title="announce@apache.org Archives" type="application/atom+xml" href="http://mail-archives.apache.org/mod_mbox/www-announce/?format=atom" />
+     <meta name="author" content="The Apache Software Foundation" /><meta name="email" content="apache.AT.apache.DOT.org" />
+    <title>Welcome! - The Apache Software Foundation</title>
+ </head>
+ <body>
+ 	<div class="navigation">
+		<ul>
+			<li><a href="./foundation" title="About the Foundation">Foundation</a></li>
+			<li><a href="http://projects.apache.org" title="Apache Projects">Projects</a></li>
+			<li><a href="http://people.apache.org" title="Apache People">People</a></li>
+			<li><a href="./foundation/getinvolved.html" title="Get involved in Apache">Get Involved</a></li>
+			<li><a href="./foundation/sponsorship.html" title="Support the mission of Apache">Support Apache</a></li>			
+			<li class="dlink"><a href="./dyn/closer.cgi" title="Download Apache projects">Download</a></li>
+		</ul>
+	</div>
+	<div class="container">
+	<hr class="space col"/>
+	<div class="block">
+		<div class="column span-24">
+      <div id="header">
+                          <h1>The Apache Software Foundation<br />
+  <span class="alt"><small>Meritocracy in Action.</small></span></h1><p class="blurb">The Apache Software Foundation provides support for the Apache 				community of open-source software projects.  The <a href="http://projects.apache.org/">Apache projects</a> are characterized by a collaborative, consensus based development process, an open and pragmatic software license, and a desire to create high quality software that leads the way in its field.</p><p class="highlight">We consider ourselves not simply a group of projects sharing a server, but rather a <em>community of developers and users</em>.</p>
+               </div>
+      </div>
+	</div>
+	<hr/>
+	<div class="block">
+    		<div class="column span-15 first append-1">
+			<h3>
+                          Latest News
+              </h3>
+		</div>
+		<div class="column span-8 las search">
+    			<form action="http://www.google.com/search" method="get">
+		         <input value="*.apache.org" name="sitesearch" type="hidden"/>
+		         <input size="10" name="q" id="query" type="text"/>
+		         <input name="Search" value="Go" type="submit"/>
+	       </form>
+		</div>
+	</div>
+	<div class="block content">
+		<div class="column span-15 colborder">
+                            
+<div class="section-content">
+<p><em>If you would like to keep up with news and announcements from the
+foundation and all its projects, you can subscribe to the
+<a href="foundation/mailinglists.html#foundation-announce">Apache
+Announcements List</a></em>.</p>
+
+<h4 id="apachecon-eu">
+   Free Video Streams from ApacheCon Europe 2008
+</h4>
+<div class="section-content">
+<a href="http://www.eu.apachecon.com/"><img src="images/eu_2008_logo.jpg" alt="ApacheCon Europe 2008" title="ApacheCon Europe 2008" border="0" align="right" /></a>
+<p>
+ApacheCon Europe 2008 held in Amsterdam was a great success, and attracted higher
+than ever attendance figures, with about 500 registered attendees. This
+figure represents an increase of more than 40% over the previous year,
+demonstrating the rapidly growing interest in Apache and Open Source software
+amongst European businesses.
+
+If you have not been able to attend ApacheCon Europe, you can still watch
+<a href="http://streaming.linux-magazin.de/en/archive_apachecon08eu.htm">videos of all keynotes and select talks online</a>. Keynote sessions
+and the opening plenary are available <b>free of charge</b>:</p>
+<ul>
+<li><a href="http://streaming.linux-magazin.de/events/apacheconfree/archive/jjagielski/frames-java.htm" onclick="window.open(this.href, '_blank', 'width=1024, height=768'); return false;">State of the Feather</a>
+   by Jim Jagielski, Chairman of the Apache Software Foundation</li>
+<li><a href="http://streaming.linux-magazin.de/events/apacheconfree/archive/cschmidt/frames-java.htm" onclick="window.open(this.href, '_blank', 'width=1024, height=768'); return false;">Using Audio Technology and Open Content to Reduce Global Illiteracy, Poverty and Disease</a>
+   by Cliff Schmidt, Executive Director of Literacy Bridge</li>
+<li><a href="http://streaming.linux-magazin.de/events/apacheconfree/archive/rghosh/frames-java.htm" onclick="window.open(this.href, '_blank', 'width=1024, height=768'); return false;">Apache and Steam Engines: the Magic of Collaborative Innovation</a>
+   by Rishab Aiyer Ghosh, Open Source Initiative Board Member</li>
+<li><a href="http://streaming.linux-magazin.de/events/apacheconfree/archive/rfielding/frames-java.htm" onclick="window.open(this.href, '_blank', 'width=1024, height=768'); return false;">Apache 3.0 (a Tall Tale)</a>
+   by Roy Fielding, Co-founder of The Apache Software Foundation,
+   and Vice President, Apache HTTP Server</li>
+</ul>
+<p>The talks of the following select ApacheCon Europe tracks are
+available for just 49 Euro:
+<a href="http://streaming.linux-magazin.de/en/archive_apachecon08eu.htm#wednesday">System Administration</a>, 
+<a href="http://streaming.linux-magazin.de/en/archive_apachecon08eu.htm#thursday">Web Security</a>,
+<a href="http://streaming.linux-magazin.de/en/archive_apachecon08eu.htm#friday">Web Services and Web 2.0</a>.
+</p>
+<hr />
+</div>
+
+<h4 id="apachecon-us">
+   ApacheCon US 2008 in New Orleans!
+</h4>
+<div class="section-content">
+<p>
+    ApacheCon US 2008 will be held 3 November through 7 November in
+    New Orleans, Louisiana.
+    The Call for Papers has already closed and the program and further
+    information will be made available soon on the ApacheCon US 2008
+    Web site <a href="http://www.us.apachecon.com/us2008/"><strong>www.us.apachecon.com</strong></a>.
+    If you would like to receive information about ApacheCon US 2008, please
+    <a href="mailto:announce-subscribe@apachecon.com">subscribe to
+    the ApacheCon announcement mailing list</a>.
+  </p>
+<hr />
+</div>
+
+<h4 id="sun_jck_letter">
+   Notice regarding open letter to Sun Microsystems
+</h4>
+<div class="section-content">
+<p>
+         The Apache Software Foundation has written an <a href="jcp/sunopenletter.html">open letter</a>
+         to Sun Microsystems regarding our inabillity to acquire an acceptable license for the test kit
+         for Java SE needed by <a href="http://harmony.apache.org">Apache Harmony</a>.  For futher information
+         please see the <a href="jcp/sunopenletterfaq.html">FAQ</a> and direct all questions to Apache's VP
+         for JCP issues,  geirm at apache dot org, or our regular press inquiry address, press at apache dot org.
+      </p>
+</div>
+</div>
+         </div>
+    <div class="column span-8 last">
+      <div class="block">
+        <div class="nav column span-11">
+          <div>
+               <div class="menuheader"><a 
+href="http://projects.apache.org/">Apache Projects</a></div> 
+  <ul>
+          <li><a href="http://httpd.apache.org/" title="Apache Web Server (httpd)">HTTP Server</a></li> 
+          <li><a href="http://activemq.apache.org/" title="Distributed Messaging System">ActiveMQ</a></li> 
+          <li><a href="http://ant.apache.org/" title="Java-based build tool">Ant</a></li> 
+          <li><a href="http://apr.apache.org/" title="Apache Portable Runtime libraries">APR</a></li> 
+          <li><a href="http://archiva.apache.org/" title="Build Artifact Repository Manager">Archiva</a></li> 
+          <li><a href="http://beehive.apache.org/" title="Metadata frameworks for enterprise applications">Beehive</a></li> 
+          <li><a href="http://cayenne.apache.org/" title="User-friendly Java ORM with Tools">Cayenne</a></li> 
+          <li><a href="http://cocoon.apache.org/" title="Web development framework: separation of concerns, component-based">Cocoon</a></li> 
+          <li><a href="http://commons.apache.org/" title="Reusable Java components">Commons</a></li> 
+          <li><a href="http://continuum.apache.org/" title="Continuous Integration and Build Server">Continuum</a></li> 
+          <li><a href="http://cxf.apache.org/" title="Service Framework">CXF</a></li> 
+          <li><a href="http://db.apache.org/" title="Database access">DB</a></li> 
+          <li><a href="http://directory.apache.org/" title="Apache Directory Server">Directory</a></li> 
+          <li><a href="http://excalibur.apache.org/" title="Embeddable software libraries related to component and service management access">Excalibur</a></li> 
+          <li><a href="http://felix.apache.org/" title="OSGi Framework and components.">Felix</a></li> 
+          <li><a href="http://forrest.apache.org/" title="Aggregated multi-channel documentation, separation of concerns">Forrest</a></li> 
+          <li><a href="http://geronimo.apache.org/" title="Java2, Enterprise Edition (J2EE) container">Geronimo</a></li> 
+          <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
+          <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
+          <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hivemind.apache.org/" title="A services and configuration microkernel">HiveMind</a></li> 
+          <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
+          <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
+          <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
+          <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
+          <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
+          <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
+          <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
+          <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
+          <li><a href="http://maven.apache.org/" title="Java project management and comprehension tools">Maven</a></li> 
+          <li><a href="http://mina.apache.org/" title="Multipurpose Infrastructure for Network Application">Mina</a></li> 
+          <li><a href="http://myfaces.apache.org/" title="JavaServer(tm) Faces implementation and components">MyFaces</a></li> 
+          <li><a href="http://ode.apache.org/" title="Orchestration Director Engine: Business Process Management (BPM), Process Orchestration and Workflow through service compositioni.">ODE</a></li> 
+          <li><a href="http://ofbiz.apache.org/" title="Open for Business: enterprise automation software">OFBiz</a></li> 
+          <li><a href="http://openejb.apache.org/" title="OpenEJB: a modular, configurable, and extendable EJB Container System and Server">OpenEJB</a></li> 
+          <li><a href="http://openjpa.apache.org/" title="OpenJPA: Object Relational Mapping for Java">OpenJPA</a></li> 
+          <li><a href="http://perl.apache.org/" title="Dynamic websites using Perl">Perl</a></li> 
+          <li><a href="http://poi.apache.org/" title="Java API for OLE 2 Compound Documents">POI</a></li> 
+          <li><a href="http://portals.apache.org/" title="Portal technology">Portals</a></li> 
+          <li><a href="http://roller.apache.org/" title="Java blog server">Roller</a></li> 
+          <li><a href="http://santuario.apache.org/" title="XML Security in Java and C++">Santuario</a></li> 
+          <li><a href="http://servicemix.apache.org/" title="Enterprise Service Bus">ServiceMix</a></li> 
+          <li><a href="http://shale.apache.org/" title="Web application framework based on JavaServer(tm) Faces">Shale</a></li> 
+          <li><a href="http://spamassassin.apache.org/" title="Mail filter to identify spam">SpamAssassin</a></li> 
+          <li><a href="http://stdcxx.apache.org/" title="Apache C++ Standard Library">STDCXX</a></li> 
+          <li><a href="http://struts.apache.org/" title="Model 2 framework for building Java web applications">Struts</a></li> 
+          <li><a href="http://synapse.apache.org/" title="Enterprise Service Bus and Mediation Framework">Synapse</a></li> 
+          <li><a href="http://tapestry.apache.org/" title="Component-based Java Web Application Framework">Tapestry</a></li> 
+          <li><a href="http://tcl.apache.org/" title="Dynamic websites using TCL">TCL</a></li> 
+          <li><a href="http://tiles.apache.org/" title="A templating framework for web application user interfaces">Tiles</a></li> 
+          <li><a href="http://tomcat.apache.org/" title="A Java Servlet and JSP Container">Tomcat</a></li> 
+          <li><a href="http://turbine.apache.org/" title="A Java Servlet Web Application Framework and associated component library">
+         Turbine</a></li> 
+          <li><a href="http://velocity.apache.org/" title="A Java Templating Engine">Velocity</a></li> 
+          <li><a href="http://wicket.apache.org/" title="Component-based Java Web Application Framework.">Wicket</a></li> 
+          <li><a href="http://ws.apache.org/">Web Services</a></li> 
+          <li><a href="http://xalan.apache.org/" title="XSLT processors in Java and C++">Xalan</a></li> 
+          <li><a href="http://xerces.apache.org/" title="XML parsers in Java, C++ and Perl">Xerces</a></li> 
+          <li><a href="http://xml.apache.org/" title="XML solutions focused on the web">XML</a></li> 
+          <li><a href="http://xmlbeans.apache.org/" title="XML-Java binding tool">XMLBeans</a></li> 
+          <li><a href="http://xmlgraphics.apache.org/" title="Conversion from XML to graphical output">XML Graphics</a></li> 
+      </ul>
+          </div>
+        </div>
+        <div class="nav column prepend-1 span-12 last">
+               <h6><a 
+href="/foundation/">Foundation</a></h6>
+  <ul>
+          <li><a href="/foundation/faq.html">FAQ</a></li> 
+          <li><a href="/licenses/">Licenses</a></li> 
+          <li><a href="/foundation/news.html">News</a></li> 
+          <li><a href="/foundation/records/">Public Records</a></li> 
+          <li><a href="/foundation/sponsorship.html">Sponsorship</a></li> 
+          <li><a href="/foundation/contributing.html">Donations</a></li> 
+          <li><a href="/foundation/thanks.html">Thanks</a></li> 
+          <li><a href="/foundation/contact.html">Contact</a></li> 
+      </ul>
+      <h6>Foundation Projects</h6>
+  <ul>
+          <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
+          <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+      </ul>
+      <h6>How it works</h6>
+  <ul>
+          <li><a href="/foundation/how-it-works.html">Introduction</a></li> 
+          <li><a href="/foundation/how-it-works.html#meritocracy">Meritocracy</a></li> 
+          <li><a href="/foundation/how-it-works.html#structure">Structure</a></li> 
+          <li><a href="/foundation/how-it-works.html#roles">Roles</a></li> 
+          <li><a href="/foundation/how-it-works.html#management">Collaboration</a></li> 
+          <li><a href="/foundation/how-it-works.html#infrastructure">Infrastructure</a></li> 
+          <li><a href="/foundation/how-it-works.html#incubator">Incubator</a></li> 
+          <li><a href="/foundation/how-it-works.html#other">Other entities</a></li> 
+          <li><a href="/foundation/glossary.html">Glossary</a></li> 
+          <li><a href="/foundation/voting.html">Voting</a></li> 
+      </ul>
+      <h6><a 
+href="/foundation/getinvolved.html">Get Involved</a></h6>
+  <ul>
+          <li><a href="/foundation/mailinglists.html">Mailing Lists</a></li> 
+          <li><a href="/dev/version-control.html">Version Control</a></li> 
+          <li><a href="/dev/">Developer Info</a></li> 
+      </ul>
+      <h6>Download</h6>
+  <ul>
+          <li><a href="/dyn/closer.cgi">from a mirror</a></li> 
+      </ul>
+      <h6>Related Sites</h6>
+  <ul>
+          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
+          <li><a href="http://apachebookstore.com/" title="Apache Books">Bookstore</a></li> 
+          <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://planetapache.org/" title="Apache Community Blogs">PlanetApache</a></li> 
+      </ul>
+        </div>
+      </div>
+    </div>
+    <div class="column span-24 footer">
+      <hr/>
+        <p>Copyright &#169; 2008 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+      </div>
+    </div>
+  </div>
+</body>
+</html>
+
diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro
new file mode 100644
index 0000000000..d8285184d4
--- /dev/null
+++ b/examples/xml/htmlinfo/htmlinfo.pro
@@ -0,0 +1,18 @@
+SOURCES += main.cpp
+QT -= gui
+
+wince*|symbian:{
+   htmlfiles.sources = *.html
+   htmlfiles.path = .
+   DEPLOYMENT += htmlfiles
+}
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.html htmlinfo.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo
+INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+symbian:TARGET.UID3 = 0xA000C609
diff --git a/examples/xml/htmlinfo/main.cpp b/examples/xml/htmlinfo/main.cpp
new file mode 100644
index 0000000000..72aef81903
--- /dev/null
+++ b/examples/xml/htmlinfo/main.cpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+
+void parseHtmlFile(QTextStream &out, const QString &fileName) {
+    QFile file(fileName);
+
+    out << "Analysis of HTML file: " << fileName << endl;
+
+    if (!file.open(QIODevice::ReadOnly)) {
+        out << "  Couldn't open the file." << endl << endl << endl;
+        return;
+    }
+
+//! [0]
+    QXmlStreamReader reader(&file);
+//! [0]
+
+//! [1]
+    int paragraphCount = 0;
+    QStringList links;
+    QString title;
+    while (!reader.atEnd()) {
+        reader.readNext();
+        if (reader.isStartElement()) {
+            if (reader.name() == "title")
+                title = reader.readElementText();
+            else if(reader.name() == "a")
+                links.append(reader.attributes().value("href").toString());
+            else if(reader.name() == "p")
+                ++paragraphCount;
+        }
+    }
+//! [1]
+
+//! [2]
+    if (reader.hasError()) {
+        out << "  The HTML file isn't well-formed: " << reader.errorString()
+            << endl << endl << endl;
+        return;
+    }
+//! [2]
+
+    out << "  Title: \"" << title << "\"" << endl
+        << "  Number of paragraphs: " << paragraphCount << endl
+        << "  Number of links: " << links.size() << endl
+        << "  Showing first few links:" << endl;
+
+    while(links.size() > 5)
+        links.removeLast();
+
+    foreach(QString link, links)
+        out << "    " << link << endl;
+    out << endl << endl;
+}
+
+int main(int argc, char **argv)
+{
+    // intialize QtCore application
+    QCoreApplication app(argc, argv);
+
+    // get a list of all html files in the current directory
+    QStringList filter;
+    filter << "*.htm";
+    filter << "*.html";
+    QStringList htmlFiles = QDir::current().entryList(filter, QDir::Files);
+
+    QTextStream out(stdout);
+
+    if (htmlFiles.isEmpty()) {
+        out << "No html files available.";
+        return 1;
+    }
+
+    // parse each html file and write the result to file/stream
+    foreach(QString file, htmlFiles)
+        parseHtmlFile(out, file);
+
+    return 0;
+}
diff --git a/examples/xml/htmlinfo/nokia_com.html b/examples/xml/htmlinfo/nokia_com.html
new file mode 100644
index 0000000000..46d4c95ee6
--- /dev/null
+++ b/examples/xml/htmlinfo/nokia_com.html
@@ -0,0 +1,215 @@
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+   "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+
+
+    <!--startindex-->
+    <title>Nokia - Nokia on the Web</title>
+    
+        
+    <meta name="description" content="Nokia is the world's leading mobile phone supplier and a leading supplier of mobile and fixed telecom networks including related customer services."/>
+    <meta name="keywords" content="Nokia,mobile phones,cellular,telecommunications,wireless networks,datacom,GSM,multimedia terminals,handsets,customer services,press releases,financial information,student exchange,open positions,employment opportunities,career opportunities"/>
+    <meta name="modified" content=""/>
+    <meta name="category" content="Landing Page Global Flash"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="siteid" content="101"/>
+    
+    <!--stopindex-->
+    <link href="/css/style_46.css" rel="stylesheet" type="text/css">
+    
+    <link href="/NOKIA_COM_1/Home/Landing_page_2007/wayfinder.css" rel="stylesheet" type="text/css"/>
+    
+<script type="text/javascript">
+	var useHbx = true;
+</script>
+
+
+<!--WEBSIDESTORY CODE HBX1.0 (Universal)-->
+<!--COPYRIGHT 1997-2005 WEBSIDESTORY,INC. ALL RIGHTS RESERVED. U.S.PATENT No. 6,393,479B1. MORE INFO:http://websidestory.com/privacy-->
+<script language="javascript">
+var _hbEC=0,_hbE=new Array;function _hbEvent(a,b){b=_hbE[_hbEC++]=new Object();b._N=a;b._C=0;return b;}
+var hbx=_hbEvent("pv");hbx.vpc="HBX0100u";hbx.gn="ehg-nokiafin.hitbox.com";
+
+//BEGIN EDITABLE SECTION
+//CONFIGURATION VARIABLES
+hbx.acct="DM550514HPNZ";//ACCOUNT NUMBER(S)
+hbx.pn="Home";//PAGE NAME(S)
+hbx.mlc="/Home";//MULTI-LEVEL CONTENT CATEGORY
+hbx.pndef="title";//DEFAULT PAGE NAME
+hbx.ctdef="full";//DEFAULT CONTENT CATEGORY
+
+//OPTIONAL PAGE VARIABLES
+//ACTION SETTINGS
+hbx.fv="";//FORM VALIDATION MINIMUM ELEMENTS OR SUBMIT FUNCTION NAME
+hbx.lt="none";//LINK TRACKING
+hbx.dlf="n";//DOWNLOAD FILTER
+hbx.dft="n";//DOWNLOAD FILE NAMING
+hbx.elf="n";//EXIT LINK FILTER
+
+//SEGMENTS AND FUNNELS
+hbx.seg="";//VISITOR SEGMENTATION
+hbx.fnl="";//FUNNELS
+
+//CAMPAIGNS
+hbx.cmp="";//CAMPAIGN ID
+hbx.cmpn="";//CAMPAIGN ID IN QUERY
+hbx.dcmp="";//DYNAMIC CAMPAIGN ID
+hbx.dcmpn="";//DYNAMIC CAMPAIGN ID IN QUERY
+hbx.dcmpe="";//DYNAMIC CAMPAIGN EXPIRATION
+hbx.dcmpre="";//DYNAMIC CAMPAIGN RESPONSE EXPIRATION
+hbx.hra="";//RESPONSE ATTRIBUTE
+hbx.hqsr="";//RESPONSE ATTRIBUTE IN REFERRAL QUERY
+hbx.hqsp="";//RESPONSE ATTRIBUTE IN QUERY
+hbx.hlt="";//LEAD TRACKING
+hbx.hla="";//LEAD ATTRIBUTE
+hbx.gp="";//CAMPAIGN GOAL
+hbx.gpn="";//CAMPAIGN GOAL IN QUERY
+hbx.hcn="";//CONVERSION ATTRIBUTE
+hbx.hcv="";//CONVERSION VALUE
+hbx.cp="null";//LEGACY CAMPAIGN
+hbx.cpd="";//CAMPAIGN DOMAIN
+
+//CUSTOM VARIABLES
+hbx.ci="";//CUSTOMER ID
+hbx.hc1="";//CUSTOM 1
+hbx.hc2="";//CUSTOM 2
+hbx.hc3="";//CUSTOM 3
+hbx.hc4="";//CUSTOM 4
+hbx.hrf="";//CUSTOM REFERRER
+hbx.pec="";//ERROR CODES
+
+
+var cookieName = 'MyNokia';
+var nameEQ = cookieName + "=";
+var ca = document.cookie.split(';');
+for(var i=0;i < ca.length;i++) {
+    var c = ca[i];
+    while (c.charAt(0)==' ') c = c.substring(1,c.length);
+    if (c.indexOf(nameEQ) == 0) {
+        hbx.ci = c.substring(nameEQ.length,c.length);
+    }
+}
+
+//INSERT CUSTOM EVENTS
+hbx.acct="DM550514HPNZ";
+hbx.mlc="/Home";
+hbx.pn="Home";
+hbx.lt="auto";
+
+
+//END EDITABLE SECTION
+
+//REQUIRED SECTION. CHANGE "YOURSERVER" TO VALID LOCATION ON YOUR WEB SERVER (HTTPS IF FROM SECURE SERVER)
+</script><script language="javascript1.1" defer src="/Hitbox/hbx_5.js"></script>
+<script language="javascript">if(navigator.appName!='Netscape'&&parseInt(navigator.appVersion)==4)document.write("<\!"+"--")</script><noscript>
+<img src="http://ehg-nokiafin.hitbox.com/HG?hc=we88&cd=1&hv=6&ce=u&hb=DM550514HPNZ&n=Home&vcon=/Home&seg=&cmp=&gp=&fnl=&pec=&dcmp=&ra=&gn=&cv=&ld=&la=&c1=&c2=&c3=&c4=&vpc=090101rn" border="0" width="1" height="1">
+</noscript><!--//-->
+
+<!--END WEBSIDESTORY CODE-->
+        
+        
+
+
+
+</head>
+<body  lang='en'
+    style="margin: 0 0 0 0;" bgcolor="#FFFFFF" link="#0033cc" text="#000000" alink="#0033cc" vlink="#800080">
+    <div class="pagecontainer">
+
+
+<!-- start page template [Generated JSP Servlet: class=jsp_servlet._templates._page.__template6layout] -->
+
+
+
+
+
+
+
+
+
+    
+    <!--startindex-->
+    
+
+
+<!-- Begin template '/templates/content/plain.jsp' -->
+
+<div id="wayfinderContainer">
+	<div id="branding">
+                                 <img src="/NOKIA_COM_1/Home/Landing_page_2007/noflash_img/nokia_connecting_people.png" alt="Nokia - Connecting people" />  
+                               
+                </div>
+
+	<div id="flashcontent">
+	
+	<!-- main page noflash content -->
+	<div id="mainContentGlobal">
+		<div id="mainHdr"><h1>Welcome to Nokia</h1></div>
+		<div id="selectContainer">
+			<h2>Where would you like to go?</h2>
+			<div id="selectLinks">
+				<ul class="mainpage">
+					<li><a href="/A4176248">Africa</a></li>
+					<li><a href="/A4138125">Asia Pacific</a></li>
+					<li><a href="/A4138121">Europe</a></li>
+					<li><a href="/A4138127">Latin America</a></li>
+					<li><a href="/A4176245">Middle East</a></li>
+					<li><a href="/A4138126">North America</a></li>
+				</ul>
+			</div>
+		</div>
+                              <!--  <a id="banner" href="http://www.nokia.com/seasonsgreetings/">Seasons Greetings</a> -->
+	</div>
+	<div id="navi">
+		<ul>
+			<li><a href="http://www.nokiaforbusiness.com/">Nokia for Business</a></li>
+			<li><a href="http://www.nokia.com/aboutnokia">About Nokia</a></li>
+			<li><a href="http://www.nokia.com/developers">Developers</a></li>
+			<li><a href="http://www.nokia.com/press">Press</a></li>
+			<li class="lastitem"><a href="http://www.nokia.com/investors">Investors</a></li>
+			<!-- <li class="lastitem"><a href="http://www.nokia.com/environment">Environment</a></li> -->
+		</ul>
+	</div>
+	<!-- noflash content ends -->
+	
+	</div>
+	
+	<div id="footer">
+		<ul>
+			<li><a href="http://www.nokia.com/siteterms">Site Terms</a></li>
+			<li class="lastitem"><a href="http://www.nokia.com/privacypolicy">Privacy Policy</a></li>
+			<span>Copyright &copy; 2008 Nokia. All rights reserved</span>
+		</ul>
+		<br /><br />
+	</div>
+</div>
+
+<script type="text/javascript" src="/NOKIA_COM_1/javascript/flash_detection_main.js"></script> <!-- for redirection to mobile site -->
+<script type="text/javascript" src="/EUROPE_NOKIA_COM_3/flash/swfobject.js"></script>
+<script type="text/javascript" src="/NOKIA_COM_1/javascript/cookies.js"></script>
+<script type="text/javascript" >
+    // <![CDATA[
+	var so = new SWFObject("/NOKIA_COM_1/Home/Landing_page_2007/wayfinder_assets.swf", "wayfinder", "736", "560", "7");
+    so.addParam("allowscriptaccess", "always");
+	so.addParam("base", "/NOKIA_COM_1/Home/Landing_page_2007/");
+	so.write("flashcontent");
+    // ]]>
+</script>
+
+<!-- End template '/templates/content/plain.jsp' --> 
+    <!--stopindex-->      
+
+
+
+
+
+  </div>
+</body>
+
+
+  </html>
+
diff --git a/examples/xml/htmlinfo/simpleexample.html b/examples/xml/htmlinfo/simpleexample.html
new file mode 100644
index 0000000000..87ccf36e27
--- /dev/null
+++ b/examples/xml/htmlinfo/simpleexample.html
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html>
+    <head>
+        <title>Qt is cute! Frans is too!</title>
+    </head>
+    <body>
+        <p>A paragraph.</p>
+        <p>A second paragraph. Check out our <a href="http://labs.trolltech.com/">developer blogs</a></p>
+        <p>And the last paragraph. Or our <a href="http://doc.trolltech.com/">online documentation</a>.</p>
+    </body>
+</html>
diff --git a/examples/xml/htmlinfo/trolltech_com.html b/examples/xml/htmlinfo/trolltech_com.html
new file mode 100644
index 0000000000..180eb74358
--- /dev/null
+++ b/examples/xml/htmlinfo/trolltech_com.html
@@ -0,0 +1,955 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      lang="en">
+
+  <head>
+    <meta http-equiv="Content-Type"
+          content="text/html;charset=utf-8" />
+
+    <title>
+        Code Less. Create More. Deploy Everywhere.
+        &mdash;
+        Trolltech
+    </title>
+
+    
+    <!-- ADD ON UPDATE -->
+    
+        <meta name="author" content="Trolltech" />
+        <meta name="description"
+              content="Trolltech creates application development platforms for desktop and mobile device innovation." />
+        <meta name="keywords" content="" />
+    
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"><!-- &nbsp;--></script>
+<script type="text/javascript">
+    <!-- Urchin script
+                _uacct = "UA-4457116-1";
+                urchinTracker();
+    -->
+	</script>
+      
+        <base href="http://trolltech.com/homepage" />
+      
+    
+
+    <meta name="generator" content="Plone - http://plone.org" />
+
+
+    <!-- Plone ECMAScripts -->
+    
+      
+        
+            
+                <script type="text/javascript"
+                        src="http://trolltech.com/portal_javascripts/TTSkin/ploneScripts2804.js">
+                </script>
+                
+            
+            
+                <script type="text/javascript"
+                        src="http://trolltech.com/portal_javascripts/TTSkin/ploneScripts0445.js">
+                </script>
+                
+            
+            
+                <script type="text/javascript"
+                        src="http://trolltech.com/portal_javascripts/TTSkin/ploneScripts5940.js">
+                </script>
+                
+            
+            
+                <script type="text/javascript"
+                        src="http://trolltech.com/portal_javascripts/TTSkin/linkpopper.js">
+                </script>
+                
+            
+            
+                <script type="text/javascript"
+                        src="http://trolltech.com/portal_javascripts/TTSkin/ploneScripts7743.js">
+                </script>
+                
+            
+        
+    
+    
+
+    
+	
+          
+        
+            
+                
+                    
+                    
+                        <style type="text/css"><!-- @import url(http://trolltech.com/portal_css/TTSkin/ploneStyles1145.css); --></style>
+                    
+                    
+                
+            
+            
+                
+                    
+                    
+                        <style type="text/css"
+    media="screen"><!-- @import url(http://trolltech.com/portal_css/TTSkin/ploneStyles8707.css); --></style>
+                    
+                    
+                
+            
+        
+    
+        
+        
+    
+
+    <!-- Internet Explorer CSS Fixes -->
+    <!--[if IE]>
+        <style type="text/css" media="all">@import url(http://trolltech.com/IEFixes.css);</style>
+    <![endif]-->
+
+    <link rel="shortcut icon" type="image/x-icon"
+          href="http://trolltech.com/favicon.ico" />
+
+    <link rel="home" href="http://trolltech.com"
+          title="Front page" />
+    <link rel="search"
+          href="http://trolltech.com/search_form"
+          title="Search this site" />
+    <link rel="author"
+          href="http://trolltech.com/author/admin"
+          title="Author information" />
+    <link rel="contents" href="http://trolltech.com/sitemap"
+          title="Site Map" />
+
+    
+
+    
+
+    
+
+    
+
+    <!-- Disable IE6 image toolbar -->
+    <meta http-equiv="imagetoolbar" content="no" />
+    
+    
+
+    
+      
+      
+    
+
+    
+
+      
+    
+    
+    
+    
+    
+
+
+      
+      
+    
+
+    
+      
+      
+    
+
+  </head>
+
+  <body class="section-homepage" dir="ltr">
+    <div id="visual-portal-wrapper">
+      <div id="portal-top">
+
+        <div id="portal-header">
+          <a class="hiddenStructure" accesskey="2"
+             href="http://trolltech.com/#documentContent">Skip to content.</a>
+
+          <a class="hiddenStructure" accesskey="6"
+             href="http://trolltech.com/#portlet-navigation-tree">Skip to navigation</a>
+
+            <div class="middlesex">
+                 <ul id="portal-siteactions">
+
+    <li id="siteaction-sitemap"><a
+    href="http://trolltech.com/sitemap" accesskey="3"
+    title="Site Map">Site Map</a></li>
+    <li id="siteaction-accessibility"><a
+    href="http://trolltech.com/accessibility-info"
+    accesskey="0" title="Accessibility">Accessibility</a></li>
+    <li id="siteaction-contact"><a
+    href="http://trolltech.com/contact" accesskey="9"
+    title="Contact">Contact</a></li>
+
+</ul>
+
+                 <div id="portal-searchbox">
+    <form name="searchform"
+          action="http://trolltech.com/search"
+          style="white-space:nowrap"
+          onsubmit="return liveSearchSubmit()">
+
+        <label for="searchGadget" class="hiddenStructure">Search Site</label>
+
+        <div class="LSBox">
+        <input id="searchGadget" name="SearchableText"
+               type="text" size="15" title="Search Site"
+               accesskey="4" class="visibility:visible" />
+
+        <input class="searchButton" type="submit"
+               value="Search" />
+
+        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
+        </div>
+    </form>
+
+    <div id="portal-advanced-search" class="hiddenStructure">
+        <a href="http://trolltech.com/search_form"
+           accesskey="5">
+            Advanced Search&hellip;
+        </a>
+    </div>
+
+</div>
+
+                 <div id="country-flags">
+                    <a href="/lang/cn/"><img class="flag"
+    border="0" width="30" height="20" src="chineseflag.png" /></a>
+                    <a href="/lang/japanese/"><img
+    class="flag" border="0" width="30" height="20"
+    src="japaneseflag.png" /></a>
+                 </div>
+                 <h1 id="portal-logo">
+    <a href="http://trolltech.com" accesskey="1">Trolltech</a>
+</h1>
+
+                 <div id="portal-skinswitcher">
+  
+</div>
+             </div>
+
+             
+    <h5 class="hiddenStructure">Sections</h5>
+    <div id="portal-globalnav">
+        <div class="middlesex">
+            <ul>
+            <li id="portaltab-index_html"
+                class="selected indextab"><a
+    href="http://trolltech.com">Home</a></li>
+            
+                    <li id="portaltab-products"
+                        class="plain"><a
+    href="http://trolltech.com/products" title="">Products and Services</a></li>
+            
+            
+                    <li id="portaltab-solutions"
+                        class="plain"><a
+    href="http://trolltech.com/solutions" title="">Solutions</a></li>
+            
+            
+                    <li id="portaltab-developer"
+                        class="plain"><a
+    href="http://trolltech.com/developer" title="">Developer Resources</a></li>
+            
+            
+                    <li id="portaltab-company" class="plain"><a
+    href="http://trolltech.com/company" title="">Company</a></li>
+            
+            
+                    <li id="portaltab-downloads"
+                        class="plain"><a
+    href="http://trolltech.com/downloads" title="">Downloads</a></li>
+            
+            
+                    
+            
+            </ul>
+        </div>
+    </div>
+
+          </div>
+          <div id="portal-personaltools-wrapper">
+
+<h5 class="hiddenStructure">Personal tools</h5>
+
+
+</div>
+
+           <div class="middlesex">
+               <div id="portal-breadcrumbs">
+
+    <span id="breadcrumbs-you-are-here">You
+are here:</span>
+    <a href="http://trolltech.com">Home</a>
+    
+
+</div>
+           </div>
+      </div>
+
+      <div class="visualClear"><!-- --></div>
+
+      
+      <table id="portal-columns">
+        <tbody>
+          <tr>
+            
+            
+            
+
+            
+            <td id="portal-column-content">
+
+              
+                <div id="content" class="">
+
+                  
+
+                  <div class="documentContent" id="region-content">
+
+                    <a name="documentContent"></a>
+
+                    
+
+    
+
+
+
+                    
+
+                    
+    
+        <!-- <table id="frontpagetable" cellpadding="0"  cellspacing="0" tal:attributes="width pagew"> --> <!--  tal:on-error="string:replace with error template" Fetch image width here -->
+        <table id="frontpagetable" cellpadding="0"
+               cellspacing="0" width="712">
+            <tr>
+                <td colspan="2">
+                    
+                    <h2>Trolltech provides cross-platform software solutions for:</h2>           
+                    <table id="fpSolutions" class="solutions" cellpadding="0" cellspacing="6" width="100%"> 
+                         <tbody>                                  
+                            <tr>
+                                <td>
+                                    <!-- GRANTHAM STYLE -->
+                                    <a class="roundedButton"
+    title=""
+    href="http://trolltech.com/solutions/managing-development">
+                                    <span class="buttonTop"><span class="roundedButtonTL"><span class="roundedButtonTR"></span></span></span>
+                                            <span class="buttonLeft">
+                                                    <span class="buttonRight"><span
+    class="buttonArrow">Software Development Managers</span></span>
+                                            </span>
+                                    <span class="buttonBottom"><span class="roundedButtonBL"><span class="roundedButtonBR"></span></span></span>
+                                    </a>
+                                    <!-- OLD STYLE
+                                    <div class="roundedBlock"
+                                         tal:attributes="title python:solution.Description();
+                                                         class python:test(repeat['solution'].odd(), 'roundedBlock odd', 'roundedBlock')">                 
+                                    <span class="portletTopLeft"></span> 
+                                    <span class="portletTopRight"></span>
+                                        <div class="innerRoundedBlock">
+                                            <a href="#" 
+                                               tal:attributes="href python:solution.absolute_url()">
+                                               <span class="arrow"></span>
+                                                <strong tal:content="python:solution.Title()">
+                                                    Title
+                                                </strong>
+                                            </a>
+                                        </div>
+                                    <span class="portletBottomLeft"></span>
+                                    <span class="portletBottomRight"></span>
+                                    </div>
+                                    -->
+                                </td>
+                                <td>
+                                    <!-- GRANTHAM STYLE -->
+                                    <a class="roundedButton"
+    title=""
+    href="http://trolltech.com/solutions/industrial-embedded-development">
+                                    <span class="buttonTop"><span class="roundedButtonTL"><span class="roundedButtonTR"></span></span></span>
+                                            <span class="buttonLeft">
+                                                    <span class="buttonRight"><span
+    class="buttonArrow">Embedded Developers</span></span>
+                                            </span>
+                                    <span class="buttonBottom"><span class="roundedButtonBL"><span class="roundedButtonBR"></span></span></span>
+                                    </a>
+                                    <!-- OLD STYLE
+                                    <div class="roundedBlock"
+                                         tal:attributes="title python:solution.Description();
+                                                         class python:test(repeat['solution'].odd(), 'roundedBlock odd', 'roundedBlock')">                 
+                                    <span class="portletTopLeft"></span> 
+                                    <span class="portletTopRight"></span>
+                                        <div class="innerRoundedBlock">
+                                            <a href="#" 
+                                               tal:attributes="href python:solution.absolute_url()">
+                                               <span class="arrow"></span>
+                                                <strong tal:content="python:solution.Title()">
+                                                    Title
+                                                </strong>
+                                            </a>
+                                        </div>
+                                    <span class="portletBottomLeft"></span>
+                                    <span class="portletBottomRight"></span>
+                                    </div>
+                                    -->
+                                </td>
+                                
+                            </tr>
+                            <tr>
+                                <td>
+                                    <!-- GRANTHAM STYLE -->
+                                    <a class="roundedButton"
+    title=""
+    href="http://trolltech.com/solutions/ce-mobile-vendors">
+                                    <span class="buttonTop"><span class="roundedButtonTL"><span class="roundedButtonTR"></span></span></span>
+                                            <span class="buttonLeft">
+                                                    <span class="buttonRight"><span
+    class="buttonArrow">Consumer Electronics Vendors</span></span>
+                                            </span>
+                                    <span class="buttonBottom"><span class="roundedButtonBL"><span class="roundedButtonBR"></span></span></span>
+                                    </a>
+                                    <!-- OLD STYLE
+                                    <div class="roundedBlock"
+                                         tal:attributes="title python:solution.Description();
+                                                         class python:test(repeat['solution'].odd(), 'roundedBlock odd', 'roundedBlock')">                 
+                                    <span class="portletTopLeft"></span> 
+                                    <span class="portletTopRight"></span>
+                                        <div class="innerRoundedBlock">
+                                            <a href="#" 
+                                               tal:attributes="href python:solution.absolute_url()">
+                                               <span class="arrow"></span>
+                                                <strong tal:content="python:solution.Title()">
+                                                    Title
+                                                </strong>
+                                            </a>
+                                        </div>
+                                    <span class="portletBottomLeft"></span>
+                                    <span class="portletBottomRight"></span>
+                                    </div>
+                                    -->
+                                </td>
+                                <td>
+                                    <!-- GRANTHAM STYLE -->
+                                    <a class="roundedButton"
+    title=""
+    href="http://trolltech.com/solutions/mobile-application-development">
+                                    <span class="buttonTop"><span class="roundedButtonTL"><span class="roundedButtonTR"></span></span></span>
+                                            <span class="buttonLeft">
+                                                    <span class="buttonRight"><span
+    class="buttonArrow">Mobile Application Developers</span></span>
+                                            </span>
+                                    <span class="buttonBottom"><span class="roundedButtonBL"><span class="roundedButtonBR"></span></span></span>
+                                    </a>
+                                    <!-- OLD STYLE
+                                    <div class="roundedBlock"
+                                         tal:attributes="title python:solution.Description();
+                                                         class python:test(repeat['solution'].odd(), 'roundedBlock odd', 'roundedBlock')">                 
+                                    <span class="portletTopLeft"></span> 
+                                    <span class="portletTopRight"></span>
+                                        <div class="innerRoundedBlock">
+                                            <a href="#" 
+                                               tal:attributes="href python:solution.absolute_url()">
+                                               <span class="arrow"></span>
+                                                <strong tal:content="python:solution.Title()">
+                                                    Title
+                                                </strong>
+                                            </a>
+                                        </div>
+                                    <span class="portletBottomLeft"></span>
+                                    <span class="portletBottomRight"></span>
+                                    </div>
+                                    -->
+                                </td>
+                                
+                            </tr>
+                            <tr>
+                                <td>
+                                    <!-- GRANTHAM STYLE -->
+                                    <a class="roundedButton"
+    title=""
+    href="http://trolltech.com/solutions/application-development">
+                                    <span class="buttonTop"><span class="roundedButtonTL"><span class="roundedButtonTR"></span></span></span>
+                                            <span class="buttonLeft">
+                                                    <span class="buttonRight"><span
+    class="buttonArrow">Cross-Platform Developers</span></span>
+                                            </span>
+                                    <span class="buttonBottom"><span class="roundedButtonBL"><span class="roundedButtonBR"></span></span></span>
+                                    </a>
+                                    <!-- OLD STYLE
+                                    <div class="roundedBlock"
+                                         tal:attributes="title python:solution.Description();
+                                                         class python:test(repeat['solution'].odd(), 'roundedBlock odd', 'roundedBlock')">                 
+                                    <span class="portletTopLeft"></span> 
+                                    <span class="portletTopRight"></span>
+                                        <div class="innerRoundedBlock">
+                                            <a href="#" 
+                                               tal:attributes="href python:solution.absolute_url()">
+                                               <span class="arrow"></span>
+                                                <strong tal:content="python:solution.Title()">
+                                                    Title
+                                                </strong>
+                                            </a>
+                                        </div>
+                                    <span class="portletBottomLeft"></span>
+                                    <span class="portletBottomRight"></span>
+                                    </div>
+                                    -->
+                                </td>
+                                <td>
+                                    <!-- GRANTHAM STYLE -->
+                                    <a class="roundedButton"
+    title=""
+    href="http://trolltech.com/solutions/solutions-opensource">
+                                    <span class="buttonTop"><span class="roundedButtonTL"><span class="roundedButtonTR"></span></span></span>
+                                            <span class="buttonLeft">
+                                                    <span class="buttonRight"><span
+    class="buttonArrow">Open Source Developers</span></span>
+                                            </span>
+                                    <span class="buttonBottom"><span class="roundedButtonBL"><span class="roundedButtonBR"></span></span></span>
+                                    </a>
+                                    <!-- OLD STYLE
+                                    <div class="roundedBlock"
+                                         tal:attributes="title python:solution.Description();
+                                                         class python:test(repeat['solution'].odd(), 'roundedBlock odd', 'roundedBlock')">                 
+                                    <span class="portletTopLeft"></span> 
+                                    <span class="portletTopRight"></span>
+                                        <div class="innerRoundedBlock">
+                                            <a href="#" 
+                                               tal:attributes="href python:solution.absolute_url()">
+                                               <span class="arrow"></span>
+                                                <strong tal:content="python:solution.Title()">
+                                                    Title
+                                                </strong>
+                                            </a>
+                                        </div>
+                                    <span class="portletBottomLeft"></span>
+                                    <span class="portletBottomRight"></span>
+                                    </div>
+                                    -->
+                                </td>
+                                
+                            </tr>
+                        </tbody>
+                    </table>
+                    
+                </td>
+            </tr>
+                   
+            <!-- BANNER -->
+            
+                <tr class="minspacerow">
+                    <td colspan="2">
+                        
+                            <div id="flashcontent">
+                                
+                                
+                                <!-- In case of no imagemap -->
+                                    <a
+    href="http://trolltech.com/products/qt/learnmore/whitepapers">
+                                        <img border="0"
+    src="http://trolltech.com/include/features/frontpage/whitepaper-feature/mainsplash"
+    alt="Code Less. Create More. Deploy Everywhere."
+    height="100" width="700" />
+                                    </a>
+                                
+                                
+                            </div>
+                            
+                        
+                        
+                    </td>
+                </tr>
+            
+            <!-- Product Feature rows -->
+            <tr id="productfeatures" class="minspacerow">
+                <td style="width:350px;">
+                    <div class="viewlet productviewlet">
+<p class="discreet"><a title="Downloads" href="downloads/index"><img class="image-right" src="images/frontpage/qt_download_90.png" alt="Download Qt Button: Grey BG" /></a></p>
+<h2>Qt</h2>
+<p>Qt is a cross-platform application framework.&nbsp; It includes:</p>
+<ul><li>An <a title="C++ Class Library" href="products/qt/features/library/index">intuitive class library</a></li><li>Integrated <a title="Development Tools" href="products/qt/features/tools/index">development tools</a></li><li>Support for <a title="C++ and Java Support" href="products/qt/features/language-support/index">C++ and Java development</a></li><li><a title="Cross-Platform Development" href="products/qt/features/platforms/index">Desktop and embedded</a> development support</li></ul>
+<p>&nbsp;</p>
+<p><strong><a title="Qt Cross-Platform Application Framework" href="products/qt/index"><span class="button">Learn More</span></a></strong> <strong><a title="How to order" href="products/qt/orderform"><span class="button">Buy Now</span></a></strong></p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</div>
+                </td>
+                <td style="width:350px;">
+                    <div class="viewlet productviewlet">
+<p><a title="Qtopia" href="products/qtopia"><img class="image-right" src="images/frontpage/qtopia_learn_more_90.png" alt="Qtopia Learn More button 90px" /></a></p>
+<h2>Qtopia</h2>
+<p><a title="The Qtopia application platform for embedded Linux" href="products/qtopia/index">Qtopia</a> is an application platform and UI for Linux-based <a title="Qtopia Phone Edition" href="products/qtopia/qtopia-product-family/qtopia-phone-edition">mobile</a>, <a title="Qtopia Platform" href="products/qtopia/qtopia-product-family/qtopia-platform">consumer electronics</a> and <a title="Qtopia Platform" href="products/qtopia/qtopia-product-family/qtopia-platform">embedded devices</a>. Qtopia offers:</p>
+<ul><li>Rich <a href="products/qt/features/tools/index">toolkit</a> and intuitive API</li><li>Fully customizable user interface</li><li>Highly efficient development framework</li></ul>
+<p>&nbsp;</p>
+<p><strong><a title="Customer Devices" href="company/customers/customer-devices"><span class="button">Customer Devices</span></a></strong>&nbsp;<strong><a title="Purchasing Qtopia" href="products/qtopia/orderinfo"><span class="button">Buy Now</span></a></strong></p>
+</div>
+                </td>    
+            </tr>
+        </table>
+    
+
+
+                    
+                      
+                 
+    
+        
+    
+
+                    
+
+                  </div>
+
+                </div>
+
+              
+            </td>
+            
+
+            
+            
+    <!-- News/events -->
+    <td id="frontpage-column-two">
+        
+            <div class="viewlet">
+            <h3>Quick Links</h3>
+            
+            
+            <!-- Smart folders -->
+            
+            <!-- Links -->
+            
+                <p class="smallerExtendedLink">
+                    <a href="http://trolltech.com/company/careers"
+                       title="Quick Links">Careers at Trolltech</a>
+                </p>
+            
+            
+                <p class="smallerExtendedLink">
+                    <a href="http://trolltech.com/products/qt/learnmore/whitepapers"
+                       title="Quick Links">Whitepapers</a>
+                </p>
+            
+            
+                <p class="smallerExtendedLink">
+                    <a href="http://trolltech.com/products/qt/learnmore/webinars-videos"
+                       title="Quick Links">Webinars and Videos</a>
+                </p>
+            
+        </div>
+        
+        
+            <div class="viewlet">
+            <h3>Nokia Acquisition</h3>
+            
+            <div class="viewletBody">
+<p class="smallerExtendedLink"><a title="Nokia Acquires Trolltech" href="../../../28012008/28012008">Learn more about Nokia's acquisition of Trolltech<br /></a></p>
+</div>
+            <!-- Smart folders -->
+            
+            <!-- Links -->
+            
+            
+            
+        </div>
+        
+        
+            <div class="viewlet">
+            <h3>News</h3>
+            
+            
+            <!-- Smart folders -->
+            
+                <p class="smallerFont">
+                    <span>
+                        <a href="http://trolltech.com/company/newsroom/announcements/press.2008-06-03.1419977468">Trolltech Releases Qt Jambi 4.3.5</a>
+                        <!-- Dates for press release -->
+                        
+                            
+                                (Jun&nbsp;03)
+                                <!--(<tal:date tal:content="item_pressmonth"/>&nbsp;<tal:date tal:content="item_pressday"/>)-->
+                            
+                        
+                        <!-- Dates for events -->
+                        
+                        <!-- Dates for training -->
+                        
+                    </span>
+                </p>
+                <p class="smallerFont">
+                    <span>
+                        <a href="http://trolltech.com/company/newsroom/announcements/press.2008-05-28.9662742780">Trolltech releases Qt 4.3.5</a>
+                        <!-- Dates for press release -->
+                        
+                            
+                                (May&nbsp;28)
+                                <!--(<tal:date tal:content="item_pressmonth"/>&nbsp;<tal:date tal:content="item_pressday"/>)-->
+                            
+                        
+                        <!-- Dates for events -->
+                        
+                        <!-- Dates for training -->
+                        
+                    </span>
+                </p>
+                <p class="smallerFont">
+                    <span>
+                        <a href="http://trolltech.com/company/newsroom/announcements/press.2008-05-14.1108908046">Award From Qt Developers Recognizes Best Open Source Development Tools</a>
+                        <!-- Dates for press release -->
+                        
+                            
+                                (May&nbsp;14)
+                                <!--(<tal:date tal:content="item_pressmonth"/>&nbsp;<tal:date tal:content="item_pressday"/>)-->
+                            
+                        
+                        <!-- Dates for events -->
+                        
+                        <!-- Dates for training -->
+                        
+                    </span>
+                </p>
+                <p class="smallerFont">
+                    <span>
+                        <a href="http://trolltech.com/company/newsroom/announcements/press.2008-05-08.1819339587">Trolltech Delivered Revenues of NOK 55.6 Million</a>
+                        <!-- Dates for press release -->
+                        
+                            
+                                (May&nbsp;08)
+                                <!--(<tal:date tal:content="item_pressmonth"/>&nbsp;<tal:date tal:content="item_pressday"/>)-->
+                            
+                        
+                        <!-- Dates for events -->
+                        
+                        <!-- Dates for training -->
+                        
+                    </span>
+                </p>
+            
+            <!-- Links -->
+            
+            
+            
+        </div>
+        
+        
+            <div class="viewlet">
+            <h3>Events</h3>
+            
+            <div class="viewletBody">
+<p>&nbsp;</p>
+</div>
+            <!-- Smart folders -->
+            
+                <p class="smallerFont">
+                    <span>
+                        <a href="http://trolltech.com/company/newsroom/events/allevents/event.2008-05-15.0963129132">Qt Open Enrollment Training Class</a>
+                        <!-- Dates for press release -->
+                        
+                        <!-- Dates for events -->
+                        
+                            
+                                (Jun&nbsp;09&nbsp;-&nbsp;Jun&nbsp;13)
+                            
+                        
+                        <!-- Dates for training -->
+                        
+                    </span>
+                </p>
+                <p class="smallerFont">
+                    <span>
+                        <a href="http://trolltech.com/company/newsroom/events/allevents/event.2008-02-22.1032431617">Israel Qt User Group</a>
+                        <!-- Dates for press release -->
+                        
+                        <!-- Dates for events -->
+                        
+                            
+                                (Jun&nbsp;16)
+                            
+                        
+                        <!-- Dates for training -->
+                        
+                    </span>
+                </p>
+                <p class="smallerFont">
+                    <span>
+                        <a href="http://trolltech.com/company/newsroom/events/allevents/event.2008-05-19.5707721007">Webinar: Building Tomorrow’s Virtual Driver Control Center</a>
+                        <!-- Dates for press release -->
+                        
+                        <!-- Dates for events -->
+                        
+                            
+                                (Jun&nbsp;24)
+                            
+                        
+                        <!-- Dates for training -->
+                        
+                    </span>
+                </p>
+            
+            <!-- Links -->
+            
+                <p class="smallerExtendedLink">
+                    <a href="http://trolltech.com/company/newsroom/events"
+                       title="Events">More events</a>
+                </p>
+            
+            
+            
+        </div>
+        
+    </td>
+
+            
+          </tr>
+        </tbody>
+      </table>
+      
+
+      <div class="visualClear"><!-- --></div>
+
+
+      <hr class="netscape4" />
+
+      
+
+        <div id="portal-footer">
+
+
+<p id="bottom-navigation">
+    Trolltech&reg; - Code Less. Create More. Deploy Everywhere.
+
+    <br />
+
+    <a href="http://trolltech.com/company/contact-us/locations"
+       title="Trolltech ASA">
+        Trolltech ASA
+    </a>
+    <a href="http://trolltech.com/company/contact-us/locations"
+       title="Address: Sandakerveien 116, Oslo">
+        Sandakerveien 116, Oslo
+    </a>
+    <a href="http://trolltech.com/company/contact-us/locations"
+       class="lastNavItem" title="Phone: +47 21 60 48 00">
+        +47 21 60 48 00
+    </a>
+
+    <br />
+
+    <a href="http://trolltech.com/company/contact-us/locations"
+       title="International locations">
+        International locations
+    </a>
+    <a href="/trolltech/privacypolicy" title="Privacy policy">
+        Privacy Policy
+    </a>
+    <a href="/trolltech/copyright" title="Trolltech" class="lastNavItem"><span>2008</span> &copy; Trolltech ASA</a>
+</p>
+
+
+</div>
+
+        <div id="portal-colophon">
+      
+
+      <a href="http://plone.org"
+         class="colophonIcon colophonIconPlone"
+         title="This Plone site was built using Plone CMS, the Open Source Content Management System. Click for more information.">
+        Powered by Plone CMS, the Open Source Content Management System
+      </a>
+
+      
+
+      <p class="discreet">
+        This site conforms to the following standards:
+      </p>
+
+      <div class="colophonWrapper">
+      <ul>
+    <li>
+      <a href="http://www.section508.gov"
+         class="colophonIcon colophonIcon508"
+         title="This Plone site conforms to the US Government Section 508 Accessibility Guidelines.">
+        Section 508
+      </a>
+    </li>
+    <li>
+      <a href="http://www.w3.org/WAI/WCAG1AA-Conformance"
+         class="colophonIcon colophonIconWAI"
+         title="This Plone site conforms to the W3C-WAI Web Content Accessibility Guidelines.">
+        WCAG
+      </a>
+    </li>
+    <li>
+      <a href="http://validator.w3.org/check/referer"
+         class="colophonIcon colophonIconXHTML"
+         title="This Plone site is valid XHTML.">
+        Valid XHTML
+      </a>
+    </li>
+    <li>
+      <a href="http://jigsaw.w3.org/css-validator/check/referer&amp;warning=no&amp;profile=css3&amp;usermedium=all"
+         class="colophonIcon colophonIconCSS"
+         title="This Plone site was built with valid CSS.">
+        Valid CSS
+      </a>
+    </li>
+    <li>
+      <a href="http://plone.org/browsersupport"
+         class="colophonIcon colophonIconAnyBrowser"
+         title="This Plone site is usable in any web browser.">
+        Usable in any browser
+      </a>
+    </li>
+      </ul>
+      </div>
+
+    </div>
+      
+    </div>
+<!-- ProspectXtractor tracker script -->
+<script type="text/javascript"><!--
+function _pxPar()
+{
+var p="";
+p+="&ref="+escape(top.document.referrer);
+p+="&dt="+escape(document.title);
+p+="&sr="+screen.width+"x"+screen.height;
+p+="&sd="+screen.colorDepth;
+p+="&fv="+_pxFV();
+return p;
+}
+function _pxFV()
+{
+var f=0,n=navigator;
+if (n.plugins && n.mimeTypes.length) {
+var x=n.plugins["Shockwave Flash"];
+if(x && x.description) {
+var y=x.description;
+f=y.charAt(y.indexOf('.')-1);
+}
+} else {
+r=false;
+for(var i=15;i>=3&&r!=true;i-=1){
+execScript('on error resume next: r=IsObject(CreateObject("ShockwaveFlash.ShockwaveFlash.'+i+'"))','VBScript');
+f=i;
+}
+}
+return f;
+}
+document.write('<img src="http://pxreg.onlineservicesas.com/pxreg/?id=50C9FD2F-61D5-4824-B726-50D6B1F89999'+_pxPar()+'" width="1" heigth="1" />');
+//-->
+</script>
+<noscript>
+<div><img src="http://pxreg.onlineservicesas.com/pxreg/?id=50C9FD2F-61D5-4824-B726-50D6B1F89999" width="1" height="1" alt="" /></div>
+</noscript>
+<!-- END ProspectXtractor tracker script -->
+</body>
+</html>
+
diff --git a/examples/xml/htmlinfo/w3c_org.html b/examples/xml/htmlinfo/w3c_org.html
new file mode 100644
index 0000000000..0fcce48e4a
--- /dev/null
+++ b/examples/xml/htmlinfo/w3c_org.html
@@ -0,0 +1,507 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
+<head profile="http://www.w3.org/2000/08/w3c-synd/#"><meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 1st March 2004), see www.w3.org" />
+
+<meta name="keywords" content="W3C, World Wide Web, Web, WWW, Consortium, computer, access, accessibility, semantic, worldwide, W3, HTML, XML, standard, language, technology, link, CSS, RDF, XSL, Berners-Lee, Berners, Lee, style sheet, cascading, schema, XHTML, mobile, SVG, PNG, PICS, DOM, SMIL, MathML, markup, Amaya, Jigsaw, free, open source, software" />
+<meta name="description" content="The World Wide Web Consortium (W3C) is an international consortium where Member organizations, a full-time staff, and the public work together to develop Web standards. W3C primarily pursues its mission through the creation of Web standards and guidelines designed to ensure long-term growth for the Web. Over 400 organizations are Members of the Consortium. W3C is jointly run by the MIT Computer Science and Artificial Intelligence Laboratory (MIT CSAIL) in the USA, the European Research Consortium for Informatics and Mathematics (ERCIM) headquartered in France, Keio University in Japan, and has additional Offices worldwide." />
+
+<title>World Wide Web Consortium - Web Standards</title>
+<link rel="meta" href="/Overview-about.rdf" />
+<link rel="stylesheet" type="text/css" href="/StyleSheets/home.css" />
+<link rel="bookmark" href="#technologies" title="Technologies |" />
+<link rel="bookmark" href="#news" title="News |" />
+<link rel="bookmark" href="#search" title="Search |" />
+<link rel="contents" href="#contents" title="Contents |" />
+<link rel="bookmark" href="#Offices" title="Offices |" />
+<link rel="bookmark" href="#systems" title="Systems |" />
+<link rel="bookmark" href="#donors" title="Supporters |" />
+<link rel="bookmark" href="#footnotes" title="Footnotes |" />
+<link rel="alternate" type="application/rss+xml" title="W3C Home Page News RSS Channel" href="http://www.w3.org/2000/08/w3c-synd/home.rss" />
+
+<style type="text/css">
+/**/
+   div.spot-image img {
+      margin-bottom: 20px;
+   }
+/**/
+</style>
+</head>
+
+<body>
+<h1 id="logo"><img alt="The World Wide Web Consortium (W3C)" height="48" width="315" src="/Icons/w3c_main" /></h1>
+
+<h2 id="slogan">Leading the Web to Its Full Potential...</h2>
+
+<div>
+<map name="introLinks" id="introLinks" title="Introductory Links">
+<div class="banner">
+<span class="invisible"><a class="bannerLink" title="Skip introductory links and the mission statement" href="#technologies">Skip to Technologies</a> |</span> <a class="bannerLink" title="W3C Activities" accesskey="A" href="/Consortium/activities">Activities</a> | <a class="bannerLink" title="Technical Reports and Recommendations" accesskey="T" href="/TR/">Technical Reports</a> | <a class="bannerLink" title="Alphabetical Site Index" accesskey="S" href="/Consortium/siteindex">Site Index</a> | <a class="bannerLink" title="Help for new visitors" accesskey="N" href="/Consortium/new-to-w3c">New
+Visitors</a> | <a class="bannerLink" title="About W3C" accesskey="B" href="/Consortium/">About W3C</a> | <a class="bannerLink" title="Join W3C" accesskey="J" href="/Consortium/join">Join W3C</a> |
+<a class="bannerLink" title="Contact W3C" accesskey="C" href="/Consortium/contact">Contact W3C</a>
+</div>
+</map>
+</div>
+
+<p class="small">The World Wide Web Consortium (<acronym title="World Wide Web Consortium">W3C</acronym>) develops interoperable
+technologies (specifications, guidelines, software, and tools) to lead
+the Web to its full potential. W3C is a forum for information,
+commerce, communication, and collective understanding. On this page,
+you'll find <a href="#news">W3C news</a>, links to <a href="#technologies">W3C technologies</a> and ways to <a href="#contents">get involved</a>. New visitors can find help in
+<cite><a href="/Consortium/new-to-w3c">Finding Your Way at
+W3C</a></cite>. We encourage organizations to learn more <a href="/Consortium/">about W3C</a> and <a href="/Consortium/membership">about
+W3C Membership</a>.</p>
+
+<div class="navBlock">
+<h2 class="spot-head">XML10</h2>
+
+<div class="spot">
+<div class="spot-image">
+<a href="/2008/xml10/">
+<img src="/2008/xml10/xml-10.png" width="106" height="48" alt="XML 10" />
+</a>
+</div>
+<p class="spot-block">
+To celebrate
+<a href="/2008/xml10/">ten years of XML</a>,
+W3C invites you to 
+<a href="/2008/xml10/card/greeting-form">send a greeting</a>
+and tell us about an XML-related blog or article.
+Many thanks to the FLWOR Foundation for their
+generous sponsorship of XML10.
+</p>
+</div>
+
+<h2 class="spot-head">W3C Supporters</h2>
+<div class="spot">
+<p class="spot-block">Help W3C by making a donation through the
+<a href="/Consortium/sup">W3C Supporters Program</a>.</p>
+</div>
+
+
+
+<h2 class="spot-head">Employment</h2>
+
+<div class="spot">
+<p class="spot-block">Current <a href="/Consortium/Recruitment/">job
+opportunities</a> at W3C: <a href="http://www.ercim.org/jobs/wai_consultant.html">Web Accessibility and Ageing Consultant</a>. Current <a href="/Consortium/Recruitment/Fellows#openings">W3C Fellows Program
+openings</a> are <a href="/2007/01/comm-fellow1">Business and
+Technology Communications Specialist</a>, <a href="/2007/01/comm-fellow2">Web / Graphic Designer</a>, and <a href="/2007/01/SysteamFellowsPosition">Software Engineer</a>.</p>
+</div>
+
+<h2 class="navhead"><a name="technologies" id="technologies">W3C A to
+Z</a></h2>
+
+<ul>
+<li class="invisible"><a class="navlink" title="Skip W3C A-Z" href="#news">Skip to News</a></li>
+
+<li><a href="/WAI/" class="navlink">Accessibility</a></li>
+
+<li><a href="/Amaya/" class="navlink">Amaya</a></li>
+
+<li><a href="/Mobile/CCPP/" class="navlink"><abbr title="Composite Capability/Preference Profiles">CC/PP</abbr></a></li>
+
+<li><a href="/2004/CDF/" class="navlink">Compound Document Formats
+(CDF)</a></li>
+
+<li><a href="/Style/CSS/" class="navlink"><abbr title="Cascading Style Sheets">CSS</abbr></a></li>
+
+<li><a href="http://jigsaw.w3.org/css-validator/" class="navlink"><abbr title="Cascading Style Sheets">CSS</abbr>
+Validator</a></li>
+
+<li><a href="/2002/ws/databinding/" class="navlink">Databinding</a></li>
+
+<li><a href="/DOM/" class="navlink"><acronym title="Document Object Model">DOM</acronym></a></li>
+
+<li><a href="/XML/EXI" class="navlink">Efficient XML
+Interchange</a></li>
+
+<li><a href="/2007/eGov/" class="navlink">eGovernment</a></li>
+
+<li><a href="/2001/sw/grddl-wg/" class="navlink"><acronym title="Gleaning Resource Descriptions from Dialects of Languages">GRDDL</acronym></a></li>
+
+<li><a href="/2001/sw/hcls/" class="navlink">Health Care and Life
+Sciences</a></li>
+
+<li><a href="/html/" class="navlink"><abbr title="HyperText Markup Language">HTML</abbr></a></li>
+
+<li><a href="/People/Raggett/tidy/" class="navlink"><abbr title="HyperText Markup Language">HTML</abbr> Tidy</a></li>
+
+<li><a href="http://validator.w3.org/" class="navlink"><abbr title="HyperText Markup Language">HTML</abbr> Validator</a></li>
+
+<li><a href="/Protocols/" class="navlink"><abbr title="Hypertext Transfer Protocol">HTTP</abbr></a></li>
+
+<li><a href="/2005/Incubator/" class="navlink">Incubator</a></li>
+
+<li><a href="/2002/mmi/ink" class="navlink">InkML</a></li>
+
+<li><a href="/International/" class="navlink">Internationalization</a></li>
+
+<li><a href="/Jigsaw/" class="navlink">Jigsaw</a></li>
+
+<li><a href="/Library/" class="navlink">Libwww</a></li>
+
+<li><a href="/Math/" class="navlink">MathML</a></li>
+
+<li><a href="/Mobile/" class="navlink">Mobile Web Initiative
+(W3C-MWI)</a></li>
+
+<li><a href="/2002/mmi/" class="navlink">Multimodal
+Interaction</a></li>
+
+<li><a href="/2004/OWL/" class="navlink"><acronym title="OWL Web Ontology Language">OWL</acronym></a></li>
+
+<li><a href="/2004/pp/" class="navlink">Patent Policy</a></li>
+
+<li><a href="/PICS/" class="navlink"><acronym title="Platform for Internet Content Selection">PICS</acronym></a></li>
+
+<li><a href="/Graphics/PNG/" class="navlink"><acronym title="Portable Network Graphics">PNG</acronym></a></li>
+
+<li><a href="/2007/powder/" class="navlink"><acronym title="Protocol for Web Description Resources">POWDER</acronym></a></li>
+
+<li><a href="/P3P/" class="navlink">Privacy and <abbr title="Platform for Privacy Preferences">P3P</abbr></a></li>
+
+<li><a href="/RDF/" class="navlink"><abbr title="Resource Description Framework">RDF</abbr></a></li>
+
+<li><a href="/2006/rwc/" class="navlink">Rich Web Clients</a></li>
+
+<li><a href="/2005/rules/" class="navlink">Rules</a></li>
+
+<li><a href="/Security/" class="navlink">Security</a></li>
+
+<li><a href="/2001/sw/" class="navlink">Semantic Web</a></li>
+
+<li><a href="/XML/SML" class="navlink">Service Modeling Language
+(<abbr title="Service Modeling Language">SML</abbr>)</a></li>
+
+<li><a href="/AudioVideo/" class="navlink"><acronym title="Synchronized Multimedia Integration Language">SMIL</acronym></a></li>
+
+<li><a href="/2000/xp/Group/" class="navlink"><acronym title="Soap">SOAP</acronym>/<abbr title="XML Protocol">XMLP</abbr></a></li>
+
+<li><a href="/2002/ws/soapjms/" class="navlink"><acronym title="Soap">SOAP-JMS</acronym></a></li>
+
+<li><a href="/2001/sw/DataAccess/" class="navlink"><acronym title="Simple Protocol and RDF Query Language">SPARQL</acronym></a></li>
+
+<li><a href="/Style/" class="navlink">Style</a></li>
+
+<li><a href="/Graphics/SVG/" class="navlink"><abbr title="Scalable Vector Graphics">SVG</abbr></a></li>
+
+<li><a href="/2001/tag/" class="navlink"><abbr title="Technical   Architecture Group">TAG</abbr></a></li>
+
+<li><a href="/AudioVideo/TT/" class="navlink">Timed Text</a></li>
+
+<li><a href="/Addressing/" class="navlink"><abbr title="Uniform Resource Identifiers">URI/URL</abbr></a></li>
+
+<li><a href="/QA/Tools/#validators" class="navlink">Validators</a></li>
+
+<li><a href="/Voice/" class="navlink">Voice</a></li>
+
+<li><a href="/2007/uwa/" class="navlink">Ubiquitous Web
+Applications</a></li>
+
+<li><a href="/WAI/" class="navlink"><acronym title="Web Accessibility Initiative">WAI</acronym></a></li>
+
+<li><a href="/2006/webapi/" class="navlink">Web API</a></li>
+
+<li><a href="/2006/appformats/" class="navlink">Web Application
+Formats</a></li>
+
+<li><a href="/2001/tag/" class="navlink">Web Architecture
+(<acronym title="Technical Architecture Group">TAG</acronym>)</a></li>
+
+<li><a href="/Graphics/WebCGM/WG/" class="navlink"><abbr title="Web Computer Graphics Metafile">WebCGM</abbr></a></li>
+
+<li><a href="/2002/ws/" class="navlink">Web Services</a></li>
+
+<li><a href="/2002/ws/addr/" class="navlink"><abbr title="Web Services">WS</abbr>-Addressing</a></li>
+
+<li><a href="/2002/ws/chor/" class="navlink"><abbr title="Web Services Choreography Description Language">WS-CDL</abbr></a></li>
+
+<li><a href="/2002/ws/desc/" class="navlink"><acronym title="Web Services Description Language">WSDL</acronym></a></li>
+
+<li><a href="/2002/ws/policy/" class="navlink"><abbr title="Web Services">WS</abbr>-Policy</a></li>
+
+<li><a href="/MarkUp/Forms/" class="navlink"><acronym title="Next Generation Web Forms">XForms</acronym></a></li>
+
+<li><a href="/MarkUp/" class="navlink"><abbr title="Extensible HyperText Markup Language">XHTML</abbr></a></li>
+
+<li><a href="/MarkUp/" class="navlink"><abbr title="Extensible HyperText Markup Language">XHTML2</abbr></a></li>
+
+<li><a href="/XML/Linking" class="navlink"><acronym title="XML Link">XLink</acronym></a></li>
+
+<li><a href="/XML/" class="navlink"><abbr title="Extensible Markup Language">XML</abbr></a></li>
+
+<li><a href="/TR/xmlbase/" class="navlink"><abbr title="Extensible Markup Language">XML</abbr> Base</a></li>
+
+<li><a href="/2001/XKMS/" class="navlink"><abbr title="Extensible Markup Language">XML</abbr> Key Management</a></li>
+
+<li><a href="/XML/Processing/" class="navlink"><abbr title="Extensible Markup Language">XML</abbr> Processing</a></li>
+
+<li><a href="/XML/Query" class="navlink"><abbr title="Extensible Markup Language">XML</abbr> Query</a></li>
+
+<li><a href="/XML/Schema" class="navlink"><abbr title="Extensible Markup Language">XML</abbr> Schema</a></li>
+
+<li><a href="/2008/xmlsec/" class="navlink"><abbr title="Extensible Markup Language">XML</abbr> Signature
+and Encryption</a></li>
+
+<li><a href="/Style/XSL/" class="navlink">XPath</a></li>
+
+<li><a href="/XML/Linking" class="navlink">XPointer</a></li>
+
+<li><a href="/Style/XSL/" class="navlink"><acronym title="Extensible Stylesheet Language">XSL</acronym> and <acronym title="XSL Transformations">XSLT</acronym></a></li>
+</ul>
+
+<p><a href="/Consortium/siteindex" class="navlink">More
+topics...</a></p>
+</div>
+
+<div class="newsBlock">
+<h2 class="newsHeading"><a name="news" id="news">News</a></h2>
+
+<p class="invisible"><a title="Skip News" href="#search">Skip to
+Search</a></p>
+
+<div id="item103" class="item"><h3 class="headline">New eGovernment Activity to Help Improve Government through Better Use of the Web</h3>
+<p><a href="/2007/eGov/"><img class="newsImage" width="300" height="75" src="/2008/06/03-egov" alt="Crowd scene" /></a></p>
+<p><span class="date">2008-06-03:</span> W3C launches today a <a href="/2007/eGov/">new forum</a> for governments, citizens, researchers, and other stakeholders to investigate how best to use Web technology for good governance and citizen participation. "Open Standards, and in particular Semantic Web Standards, can help lower the cost of government, make it easier for independent agencies to work together, and increase flexibility in the face of change," said Tim Berners-Lee, W3C Director. W3C invites participation in the new <a href="/2007/eGov/IG/">eGovernment Interest Group</a>, which is open to the public. The group will identify best practices and guidelines in this area, document where current technology does not adequately address stakeholder needs, and suggest improvements via the standards process. Read the <a href="/2007/eGov/IG/faq">W3C eGovernment FAQ</a> and <a href="/2008/06/egov-pressrelease">press release</a>, and learn more about the <a href="/2007/eGov/">W3C eGovernment Activity</a>.<span class="archive">  (<a title="New eGovernment Activity to Help Improve Government through Better Use of the Web" href="/News/2008#item103" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item105" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />Two Group Notes Published About Semantic Web and Life Sciences</h3><p><span class="date">2008-06-05:</span> The <a href="/2001/sw/hcls/">Semantic Web Health Care and Life Sciences Interest Group</a> has published two Group Notes: <a href="/TR/2008/NOTE-hcls-kb-20080604/">A Prototype Knowledge Base for the Life Sciences</a> and <a href="/TR/2008/NOTE-hcls-senselab-20080604/">Experiences with the conversion of SenseLab databases to RDF/OWL</a>. The former describes a prototype of a biomedical knowledge base that integrates 15 distinct data sources using currently available Semantic Web technologies including RDF and OWL. The Note outlines which resources were integrated, how the knowledge base was constructed using free and open source triple store technology, how it can be queried using SPARQL, and what resources and inferences are involved in answering complex queries. While the utility of the knowledge base is illustrated by identifying a set of genes involved in Alzheimer's Disease, the approach described here can be applied to any use case that integrates data from multiple domains. The second document describe the experience of converting SenseLab databases into OWL, an important step towards realizing the benefits of Semantic Web in integrative neuroscience research. Learn more about the <a href="/2001/sw/">Semantic Web Activity</a>.<span class="archive">  (<a title="Two Group Notes Published About Semantic Web and Life Sciences" href="/News/2008#item105" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item104" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />Offline Web Applications Published as W3C Note</h3><p><span class="date">2008-06-03:</span> The <a href="/html/wg/">HTML Working Group</a> has published the <a href="/TR/2008/NOTE-offline-webapps-20080530/">Offline Web Applications</a> Group Note. <a href="/TR/html5/">HTML 5</a> contains several features that address the challenge of building Web applications that work while offline. This document highlights these features (SQL, offline application caching APIs as well as online/offline events, status, and the localStorage API) from HTML 5 and provides brief tutorials on how these features might be used to create Web applications that work offline. Learn more about the <a href="/MarkUp/Activity">HTML Activity</a>.<span class="archive">  (<a title="Offline Web Applications Published as W3C Note" href="/News/2008#item104" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item102" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />W3C Advisory Committee Elects Advisory Board</h3><p><span class="date">2008-06-02:</span> The W3C Advisory Committee has filled six open seats on the <a href="/2002/ab/">W3C Advisory Board</a>. Created in 1998, the Advisory Board provides guidance to the Team on issues of strategy, management, legal matters, process, and conflict resolution. Beginning 1 July, the nine Advisory Board participants are Jean-François Abramatic (ILOG), Ann Bassetti (The Boeing Company), Jim Bell (HP), Don Deutsch (Oracle), Eduardo Gutentag (Sun Microsystems), Steve Holbrook (IBM), Ken Laskey (MITRE), Ora Lassila (Nokia), and Arun Ranganathan (Mozilla Foundation). Steve Zilles continues as interim Advisory Board Chair. Read more about the <a href="/2002/ab/">Advisory Board</a>.<span class="archive">  (<a title="W3C Advisory Committee Elects Advisory Board" href="/News/2008#item102" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item101" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />W3C Talks in June</h3><p><span class="date">2008-06-02:</span> Browse <a href="/Talks/">W3C presentations and events</a> also available as an <abbr title="RDF Site Summary"><a href="/2004/08/TalkFiles/Talks.rss">RSS channel</a></abbr>. <span class="archive">  (<a title="W3C Talks in June" href="/News/2008#item101" rel="details">Permalink</a>) </span></p><ul><li><span class="talkstart">2 June, Västerås, Sweden: </span><span class="talktitle" lang="sv" xml:lang="sv">Framtidssäkra eFörvaltningen<span class="hide noprint">.</span></span><span class="talkdesc">Olle Olsson participates in a panel at <a href="http://www.offentligarummet.se/" lang="sv" xml:lang="sv">Offentliga Rummet 2008</a>. </span></li><li><span class="talkstart">4 June, Sao Paulo, Brazil: </span><span class="talktitle">Towards eGovernment 2.0 through better use of the Web<span class="hide noprint">.</span></span><span class="talkdesc">José Manuel Alonso presents at <a href="http://www.w3c.br/2008/launch/">W3C Brazil Office Public Launch</a>. </span></li><li><span class="talkstart">4 June, Sao Paolo, Brazil: </span><span class="talktitle">W3C - Web Open Standards<span class="hide noprint">.</span></span><span class="talkdesc">Daniel Dardailler presents at <a href="http://www.w3c.br/2008/lancamento/">W3C Brazil Office Launch event </a>. </span></li><li><span class="talkstart">10 June, Buenos Aires, Argentina: </span><span class="talktitle">Web Accessibility: People with Disabilities and Elderly Citizens<span class="hide noprint">.</span></span><span class="talkdesc">Shadi Abou-Zahra presents at <a href="http://www.isoc.org.ar/accesibilidad.html" lang="es" xml:lang="es">Web Sin Barreras</a>. </span></li><li><span class="talkstart">11 June, Nashville, TN, USA: </span><span class="talktitle">Color for the Global Web<span class="hide noprint">.</span></span><span class="talkdesc">Molly E Holzschlag presents at <a href="http://www.voicesthatmatter.com/webdesign2008/index.aspx">Voices That Matter</a>. </span></li><li><span class="talkstart">12 June, Nashville, TN, USA: </span><span class="talktitle">Designing for Today's Browsers<span class="hide noprint">.</span></span><span class="talkdesc">Molly E Holzschlag presents at <a href="http://www.voicesthatmatter.com/webdesign2008/index.aspx">Voices That Matter</a>. </span></li><li><span class="talkstart">17 June, New York, NY, USA: </span><span class="talktitle">Web of Data<span class="hide noprint">.</span></span><span class="talkdesc">Tim Berners-Lee presents at <a href="http://www.linkeddataplanet.com/index.php">LinkedData Planet Conference: exploring the new web of linked data</a>. </span></li><li><span class="talkstart">19 June, Tokyo, Japan: </span><span class="talktitle">Update on W3C/WAI Guidelines including WCAG 2.0<span class="hide noprint">.</span></span><span class="talkdesc">Judy Brewer presents at <a>Open Seminar of Information Accessibility</a>. </span></li><li><span class="talkstart">19 June, Nancy, France: </span><span class="talktitle" lang="fr" xml:lang="fr">États des lieux du Web sémantique<span class="hide noprint">.</span></span><span class="talkdesc">Ivan Herman gives a keynote at <a href="http://ic2008.loria.fr/" lang="fr" xml:lang="fr">19èmes Journées Francophones d'Ingénierie des Connaissances (IC2008)</a>. </span></li><li><span class="talkstart">19 June, Baltimore, Maryland, USA: </span><span class="talktitle">How New Web Accessibility Standards Impact User Experience Design<span class="hide noprint">.</span></span><span class="talkdesc">Shawn Henry presents at <a href="http://www.usabilityprofessionals.org/conference/2008/">Usability Professionals' Association International Conference 2008</a>. </span></li><li><span class="talkstart">26 June, Frankfurt, Germany: </span><span class="talktitle">Mobile Internet - the Way Forward<span class="hide noprint">.</span></span><span class="talkdesc">Steve Bratt participates in a panel at <a href="http://www.amiando.com/ngmn-2008">2nd NGMN Industry Conference 2008</a>. </span></li><li class="noprint showuris">View <a href="http://www.w3.org/2004/08/W3CTalks?date=Recent+and+upcoming&amp;countryListing=yes&amp;submit=Submit">upcoming talks by country</a></li><li class="noprint showuris"><a href="/Talks/">More talks...</a></li></ul></div>
+
+<div id="item100" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />W3C Launches Group to Help Bridge the Digital Divide</h3><p><a href="/2008/MW4D/"><img class="newsImage" alt="Phone bikes" src="/2008/05/voiturette-sb.png" /></a><span class="date">2008-05-27:</span> As part of the growing set of W3C initiatives related to social development, W3C invites participation in the new <a href="/2008/MW4D/">Mobile Web for Development (MW4D) interest Group</a>, chartered to explore the potential of mobile technology to help bridge the digital divide. "We need to solve important challenges, such as lack of standards in end-user devices, network constraints, service cost, issues of literacy, and an understanding of the real information needs of rural communities," said Ken Banks, kiwanja.net, who Chairs the group. "To do so requires an multidisciplinary approach, a step we take through the creation of this new group." Read more in the <a href="/2008/05/mw4dig-pressrelease">press release</a>. This launch is part of <a href="/Mobile">W3C's Mobile Web Initiative (MWI)</a>, which aims to identify and resolve challenges and issues of accessing the Web when on the move. This work takes place under the auspices of the <a href="http://cordis.europa.eu/fp7/ict/">European Union's 7th Research Framework Programme (FP7)</a>, part of the <a href="http://digitalworld.ercim.org/">Digital World Forum</a> project.<span class="archive">  (Photo credit: Stéphane Boyera. <a title="W3C Launches Group to Help Bridge the Digital Divide" href="/News/2008#item100" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item99" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />Last Call: XHTML Access Module</h3><p><span class="date">2008-05-26:</span> The <a href="/MarkUp/">XHTML 2 Working Group</a> has published the Last Call Working Draft of <a href="/TR/2008/WD-xhtml-access-20080526/">XHTML Access Module</a>. This document is intended to help make XHTML-family markup languages more effective at supporting the needs of the accessibility community. It does so by providing a generic mechanism for defining the relationship between document components and well-known accessibility taxonomies. Comments are welcome through 16 June. Learn more about the <a href="/MarkUp/Activity">HTML Activity</a>. <span class="archive">  (<a title="Last Call: XHTML Access Module" href="/News/2008#item99" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item98" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />W3C Invites Implementations of CSS Namespaces Module (Candidate Recommendation)</h3><p><span class="date">2008-05-23:</span> The <a href="/Style/CSS/members">Cascading Style Sheets (CSS) Working Group</a> has published the Candidate Recommendation of <a href="/TR/2008/CR-css3-namespace-20080523/">CSS Namespaces Module</a>. This CSS Namespaces module defines the syntax for using namespaces in CSS. It defines the @namespace rule for declaring the default namespace and binding namespaces to namespace prefixes, and it also defines a syntax that other specifications can adopt for using those prefixes in namespace-qualified names. Learn more about the <a href="/Style/">Style Activity</a>.<span class="archive">  (<a title="W3C Invites Implementations of CSS Namespaces Module (Candidate Recommendation)" href="/News/2008#item98" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item97" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />Progress Events 1.0</h3><p><span class="date">2008-05-22:</span> The <a href="/2006/webapi/">Web API Working Group</a> has published a Working Draft of <a href="/TR/2008/WD-progress-events-20080521/">Progress Events 1.0</a>.This document describes event types that can be used for monitoring the progress of an operation. It is primarily intended for contexts such as data transfer operations specified by <a href="/TR/XMLHttpRequest">XMLHTTPRequest</a>, or <a href="/TR/MediaAccessEvents/">Media Access Events</a>. Learn more about the <a href="/2006/rwc/">Rich Web Client Activity</a>.<span class="archive">  (<a title="Progress Events 1.0" href="/News/2008#item97" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item96" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />XML Security Working Group to Take Next Steps on XML Signature, Encryption</h3><p><span class="date">2008-05-21:</span> W3C is pleased to announce the creation of the <a href="/2008/xmlsec/">XML Security Working Group</a>, whose mission is to evaluate and act on <a href="/2007/xmlsec/ws/report">recommendations</a> from the <a href="/2007/xmlsec/ws/agenda.html">September 2007 Workshop on XML Signature and XML Encryption</a> regarding next steps for XML Security specifications. The group's <a href="/2008/02/xmlsec-charter.html#deliverables">deliverables</a> include new work on XML Signature Syntax and Processing and XML Encryption Syntax and Processing, as well as maintenance of related specifications. Frederick Hirsch (Nokia) will Chair the group, with Thomas Roessler (W3C) as Team Contact. Learn more about the <a href="/Security/">W3C Security Activity</a>. <span class="archive"> (<a title="XML Security Working Group to Take Next Steps on XML Signature, Encryption" href="/News/2008#item96" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item94" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />Last Call: Cascading Style Sheets (CSS) Snapshot 2007</h3><p><span class="date">2008-05-16:</span> The <a href="/Style/CSS/members">Cascading Style Sheets (CSS) Working Group</a> has published the Last Call Working Draft of <a href="/TR/2008/WD-css-beijing-20080516/">Cascading Style Sheets (CSS) Snapshot 2007</a>. This document collects together into one definition all the specifications that together form the current state of Cascading Style Sheets (CSS). The primary audience is CSS implementors, not CSS authors, as this definition includes modules by specification stability, not Web browser adoption rate. Comments are welcome through 09 June. Learn more about the <a href="/Style/">Style Activity</a>.<span class="archive">  (<a title="Last Call: Cascading Style Sheets (CSS) Snapshot 2007" href="/News/2008#item94" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item93" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />W3C Invites Implementations of XQuery and XPath Full Text 1.0 (Candidate Recommendation); Requirements and Use Cases Drafts Available</h3><p><span class="date">2008-05-16:</span> The W3C <a href="http://www.w3.org/XML/Query/">XML Query Working Group</a> and the W3C <a href="http://www.w3.org/Style/XSL/">XSL Working Group</a> jointly published today a Candidate Recommendation of <a href="/TR/2008/CR-xpath-full-text-10-20080516/">XQuery and XPath Full Text 1.0</a>. This document defines the syntax and formal semantics of XQuery and XPath Full Text 1.0 which is a language that extends XQuery 1.0 [XQuery 1.0: An XML Query Language] and XPath 2.0 [XML Path Language (XPath) 2.0] with full-text search capabilities. Implementors are encouraged to run the groups' <a href="http://dev.w3.org:/cvsweb/2007/xpath-full-text-10-test-suite/">test suite</a> and report their results. The Groups also published Working Drafts of <a href="/TR/2008/WD-xpath-full-text-10-requirements-20080516/">XQuery and XPath Full Text 1.0 Requirements</a> and <a href="/TR/2008/WD-xpath-full-text-10-use-cases-20080516/">Use Cases</a>. Learn more about the <a href="/XML/">XML Activity</a>.<span class="archive"> (<a title="W3C Invites Implementations of XQuery and XPath Full Text 1.0 (Candidate Recommendation); Requirements and Use Cases Drafts Available" href="/News/2008#item93" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item95" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />State Chart XML (SCXML) Working Draft Published</h3><p><span class="date">2008-05-16:</span> The <a href="/Voice/">Voice Browser Working Group</a> has published an updated Working Draft of <a href="/TR/2008/WD-scxml-20080516/">State Chart XML (SCXML): State Machine Notation for Control Abstraction</a>. <abbr title="State Chart eXtensible Markup Language">SCXML</abbr> is an execution environment based on <a href="http://www.uml.org/#UML1.5"><abbr title="Unified Modeling Language">UML</abbr></a> Harel State Tables and <a href="/TR/ccxml/"><abbr title="Call Control eXtensible Markup Language">CCXML</abbr></a>. The main differences from the previous draft are (1) the modularization of the language, (2) the introduction of profiles and (3) a revision of the algorithm for document interpretation; the document as a whole has changed significantly and the group welcomes review. Learn more about the <a href="/Voice/">Voice Browser Activity</a>.<span class="archive">  (<a title="State Chart XML (SCXML) Working Draft Published" href="/News/2008#item95" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item92" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />"Web Accessibility for Older Users: A Literature Review"; Comments Welcome on First Public Draft</h3><p><span class="date">2008-05-14:</span> The Web Accessibility Initiative (WAI) <a href="/WAI/EO/">Education and Outreach Working Group Working Group (EOWG)</a> has published <a href="/TR/2008/WD-wai-age-literature-20080514/">Web Accessibility for Older Users: A Literature Review</a> as a First Public Working Draft. The document includes reviews and analysis of guidelines and articles covering the requirements of people with Web accessibility needs related to ageing. This literature review will inform WAI efforts to promote accessibility solutions for older Web users and potentially to develop profiles or extensions to WAI guidelines. The literature review is a deliverable of the <a href="/WAI/WAI-AGE/">WAI-AGE Project</a> (Ageing Education and Harmonisation). See the <a href="http://lists.w3.org/Archives/Public/w3c-wai-ig/2008AprJun/0083.html">call for review and participation</a> for an introduction to the project and an invitation to contribute to the literature review and other WAI-AGE work; and about the <a href="/WAI/">Web Accessibility Initiative</a>.<span class="archive">  (<a title="Web Accessibility for Older Users: A Literature Review; Comments Welcome on First Public Draft" href="/News/2008#item92" rel="details">Permalink</a>) </span></p></div>
+
+<div id="item91" class="item"><h3><img alt="" width="17" height="11" src="/Icons/right" />Last Call: CURIE Syntax 1.0</h3><p><span class="date">2008-05-08:</span> The <a href="/MarkUp/">XHTML2 Working Group</a> has published the Last Call Working Draft of <a href="/TR/2008/WD-curie-20080506">CURIE Syntax 1.0</a>, which outlines a syntax for expressing URIs in a generic, abbreviated syntax ("Compact URI"). The specification targets language designers who need a mechanism to permit the use of extensible value collections. Any language designer considering the use of QNames in attribute values should consider instead using CURIEs, since CURIEs are designed for this purpose, while QNames are not. Comments are welcome through 10 June. Learn more about the <a href="/MarkUp/Activity">HTML Activity</a>.<span class="archive">  (<a title="Last Call: CURIE Syntax 1.0" href="/News/2008#item91" rel="details">Permalink</a>) </span></p></div>
+
+
+
+<h3 class="pastNews"><a href="/News/2008">Past News</a></h3>
+</div>
+
+<div class="navBlock">
+<h2 class="navhead"><a name="search" id="search">Search</a></h2>
+
+<p class="invisible"><a class="navlink" title="Skip search" href="#contents">Skip to Contents</a></p>
+
+<form method="get" action="http://www.google.com/custom" enctype="application/x-www-form-urlencoded">
+<div>
+<a class="navlink" href="http://www.google.com"><img src="/Icons/Logo_25wht.gif" width="75" height="32" alt="Google" /></a><br />
+<label for="inputField">Search W3C<br />
+<input type="text" size="15" id="inputField" name="q" accesskey="E" maxlength="255" /></label> <input type="submit" value="Go" id="goButton" name="sa" accesskey="G" /><br />
+<input type="hidden" name="cof" value="T:black;LW:72;ALC:#ff3300;L:http://www.w3.org/Icons/w3c_home;LC:#000099;LH:48;BGC:white;AH:left;VLC:#660066;GL:0;AWFID:0b9847e42caf283e;" />
+ <input type="hidden" id="searchW3C" name="sitesearch" checked="checked" value="www.w3.org" /><input type="hidden" name="domains" value="www.w3.org" />
+</div>
+</form>
+
+<p><a class="navlink" href="/Search/Mail/Public/">Search W3C Mailing
+Lists</a></p>
+
+<h2 class="navhead"><a name="contents" id="contents">Testimonials</a></h2>
+
+<div class="hpmt"><div class="hpmt-name">Fraunhofer Gesellschaft</div><div class="hpmt-logo"><a rel="nofollow" href="http://www.fraunhofer.de/"><img alt="Fraunhofer Gesellschaft" src="http://www.w3.org/Consortium/Member/Testimonial/Logo/119" /></a></div><p class="hpmt-testimonial">The Fraunhofer-Gesellschaft undertakes applied contract research in all fields of engineering sciences. Fraunhofer works with W3C to contribute to the development of Web technologies which are the base of many of our research activities. Fraunhofer hosts the W3C Office in Germany and Austria. <a class="hpmt-more" href="http://www.w3.org/Consortium/Member/Testimonial/List">(Member testimonials)</a></p></div>
+
+<h2 class="navhead">Members</h2>
+
+<ul>
+<li><a href="/Member/" class="navlink">Member Home Page</a></li>
+
+<li><a href="/Submission/" class="navlink">Member Submissions</a></li>
+
+<li><a href="/Consortium/Member/List" class="navlink">Current
+Members</a></li>
+
+<li><a href="/Consortium/meetings" class="navlink">Meetings</a></li>
+
+<li><a href="/Consortium/Recruitment/Fellows" class="navlink">Fellows</a> (<a href="/Consortium/Recruitment/Fellows#openings">New Openings</a>)</li>
+</ul>
+
+<h2 class="navhead">Get Involved</h2>
+
+<ul>
+<li><a href="/Consortium/membership-benefits" class="navlink">W3C
+Membership Benefits</a></li>
+
+<li><a href="/Consortium/membership#bizcase" class="navlink">Reasons to
+Join W3C</a></li>
+
+<li><a href="/Mail/" class="navlink">Mailing Lists</a></li>
+
+<li><a href="http://lists.w3.org/Archives/Public/public-new-work/latest">Potential
+New Work</a></li>
+
+<li><a href="/Consortium/Translation/" class="navlink">Translations</a></li>
+
+<li><a href="/2003/08/Workshops/" class="navlink">Workshops</a></li>
+
+<li><a href="/2001/11/StdLiaison" class="navlink">Liaisons</a></li>
+
+<li><a href="/Status" class="navlink">Open Source Software</a></li>
+
+<li><a href="/QA/" class="navlink">Q&amp;A Blog</a></li>
+
+<li><a href="/Consortium/Recruitment/" class="navlink">Employment</a></li>
+
+<li><span class="navText">More ways to</span> <a href="/Consortium/org#public" class="navlink">participate</a></li>
+</ul>
+
+<h2 class="navhead">Introduction</h2>
+
+<ul>
+<li><a href="/Consortium/" class="navlink">About W3C</a></li>
+
+<li><a href="/Consortium/faq" class="navlink">Frequently Asked
+Questions (FAQ)</a></li>
+
+<li><a href="/2003/glossary/" class="navlink">Glossary</a></li>
+
+<li><a href="/Consortium/Process/" class="navlink">Process
+Document</a></li>
+
+<li><a href="/2002/03/tutorials" class="navlink">Tutorials</a></li>
+
+<li><a href="/2002/03/new-to-w3c" class="navlink">More...</a></li>
+</ul>
+
+<h2 class="navhead">W3C Team</h2>
+
+<ul>
+<li><a href="/People/" class="navlink">People</a></li>
+
+<li><a href="/TeamSubmission/" class="navlink">Team
+Submissions</a></li>
+</ul>
+
+<h2 class="navhead">Presentations</h2>
+
+<ul>
+<li><a href="/Talks/" class="navlink">Public Presentations</a></li>
+</ul>
+
+<h2 class="navhead">News Room</h2>
+
+<ul>
+<li><a href="/News/" class="navlink">W3C News Archive</a> <span class="navText">(</span><a href="/2000/08/w3c-synd/home.rss" class="navlink">RSS</a><span class="navText">)</span></li>
+
+<li><a href="/News/Public/" class="navlink">Weekly Public Newsletter</a></li>
+
+<li><a href="/Press/" class="navlink">Press Releases</a></li>
+
+<li><a href="/Press/#rss" class="navlink">Multilingual Press Release
+RSS</a></li>
+
+<li><a href="/Press/Articles" class="navlink">W3C in the Press</a></li>
+</ul>
+
+<h2 class="navhead"><a name="Offices" id="Offices">World
+Offices</a></h2>
+
+<p class="navPara">The <a href="/Consortium/Offices/" class="navlink">W3C Offices</a>, part of the <a href="/2007/IntlRel.html">W3C
+International Relations team</a> translate many W3C home page news
+items. W3C Offices are located in these parts of the world:</p>
+
+<ul>
+<li><a href="http://www.w3c.org.au/" class="navlink" title="Australia">Australia</a></li>
+
+<li><a href="http://www.w3c.nl/index.shtml.nl" class="navlink" hreflang="nl" title="Benelux"><span xml:lang="nl" lang="nl">Benelux</span></a>/<a href="http://www.w3c.nl/index.shtml.fr" class="navlink" title="Benelux" hreflang="fr"><span xml:lang="fr" lang="fr">Bénélux</span></a></li>
+
+<li><a href="http://www.w3c.br/" class="navlink" title="Brazil" hreflang="pt-br"><span xml:lang="pt-br" lang="pt-br">Brasil</span>
+(Brazil)</a></li>
+
+<li><a href="http://www.chinaw3c.org/" class="navlink" title="China" hreflang="zh-hans"><span xml:lang="zh-hans" lang="zh-hans">中国</span>
+(China)</a></li>
+
+<li><a href="http://www.w3c.tut.fi/" class="navlink" title="Finland" hreflang="fi"><span xml:lang="fi" lang="fi">Suomi</span>
+(Finland)</a></li>
+
+<li><a href="http://www.w3c.de/" class="navlink" title="German and Austria" hreflang="de"><span xml:lang="de" lang="de">Deutschland und Österreich</span> (Germany and Austria)</a></li>
+
+<li><a href="http://www.w3c.gr/" class="navlink" title="Greece" hreflang="el"><span xml:lang="el" lang="el">Ελλάδα</span>
+(Greece)</a></li>
+
+<li><a href="http://www.w3c.hu/" class="navlink" title="Hungary" hreflang="hu"><span xml:lang="hu" lang="hu">Magyarország</span>
+(Hungary)</a></li>
+
+<li><a href="http://www.w3cindia.in/" class="navlink" title="India" hreflang="en"><span xml:lang="hi" lang="hi">भारत</span>
+(India)</a></li>
+
+<li><a href="http://www.w3c.org.il/" class="navlink" title="Israel" hreflang="he"><span xml:lang="he" lang="he">ישר�ל</span>
+(Israel)</a></li>
+
+<li><a href="http://www.w3c.it/" class="navlink" title="Italy" hreflang="it"><span xml:lang="it" lang="it">Italia</span>
+(Italy)</a></li>
+
+<li><a href="http://www.w3c.or.kr/" class="navlink" title="Korea" hreflang="ko"><span xml:lang="ko" lang="ko">한국</span> (Korea)</a></li>
+
+<li><a href="http://www.w3c.org.ma/" class="navlink" title="Morocco" hreflang="ar"><span xml:lang="ar" lang="ar">المغرب</span>
+(Morocco)</a></li>
+
+<li><a href="http://www.w3c.org.za/" class="navlink" title="Southern Africa" hreflang="en">Southern Africa</a></li>
+
+<li><a href="http://www.w3c.es/" class="navlink" title="Spain" hreflang="es"><span xml:lang="es" lang="es">España</span>
+(Spain)</a></li>
+
+<li><a href="http://www.w3c.se" class="navlink" title="Sweden" hreflang="sv"><span xml:lang="sv" lang="sv">Sverige</span>
+(Sweden)</a></li>
+
+<li><a href="http://www.w3c.rl.ac.uk/" class="navlink" title="UK and Ireland" hreflang="en-uk">United Kingdom and Ireland</a></li>
+</ul>
+
+<h2 class="navhead"><a name="systems" id="systems">Systems</a></h2>
+
+<ul>
+<li><a href="/Help/Account/" class="navlink">Get Password</a></li>
+
+<li><a href="/2003/08/system-status" class="navlink">System
+Status</a></li>
+</ul>
+</div>
+<hr class="hide" />
+
+<p class="small">W3C would like to thank the <a name="donors" id="donors" href="/Consortium/sup">Supporters</a> who have contributed
+financially or through a donation of goods to W3C.</p>
+
+<p class="small"><a name="footnotes" id="footnotes">Read</a> <a href="/2002/11/homepage">about the layout</a> and <a href="http://lists.w3.org/Archives/Public/site-comments/">send comments</a>
+about this page. <a href="/2000/08/w3c-synd/home.rss">Syndicate</a>
+this page with <a href="http://purl.org/rss/1.0/">RSS 1.0</a>, an
+<a href="/RDF/">RDF</a> vocabulary used for <a href="/2000/08/w3c-synd/#">site summaries</a>. </p>
+
+<address class="small">
+<a href="/Help/Webmaster">Webmaster</a> · Last modified: 
+ $Date: 2008/06/05 17:06:19 $
+ <span class="whiteout">|</span><br />
+<a href="http://validator.w3.org/check?uri=referer"><img src="/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a> <span class="whiteout">|</span> <a href="http://jigsaw.w3.org/css-validator/"><img src="/Icons/valid-css" alt="Valid CSS!" height="31" width="88" /></a> <span class="whiteout">|</span> <a href="/WAI/WCAG1AA-Conformance" title="Explanation of Level Double-A Conformance"><img class="conform" height="31" width="88" src="/WAI/wcag1AA" alt="Level Double-A conformance icon, W3C-WAI Web Content Accessibility Guidelines 1.0" />
+</a> <span class="whiteout">|</span>
+</address>
+
+<p class="copyright"><a rel="Copyright" href="/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © 1994-2007
+<a href="/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>,
+<a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C
+<a href="/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
+<a href="/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>,
+<a rel="Copyright" href="/Consortium/Legal/copyright-documents">document use</a> and <a rel="Copyright" href="/Consortium/Legal/copyright-software">software
+licensing</a> rules apply. Your interactions with this site are in
+accordance with our <a href="/Consortium/Legal/privacy-statement#Public">public</a> and <a href="/Consortium/Legal/privacy-statement#Members">Member</a> privacy
+statements.</p>
+</body>
+</html>
diff --git a/examples/xml/htmlinfo/youtube_com.html b/examples/xml/htmlinfo/youtube_com.html
new file mode 100644
index 0000000000..1de65a3aa5
--- /dev/null
+++ b/examples/xml/htmlinfo/youtube_com.html
@@ -0,0 +1,1585 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
+
+
+	<html lang="en">
+
+<!-- machid: 519 -->
+<head>
+	
+	<title>YouTube - Broadcast Yourself.</title>
+
+	<link rel="stylesheet" href="http://s.ytimg.com/yt/css/base_all-vfl42327.css" type="text/css">
+
+	<link rel="search" type="application/opensearchdescription+xml" href="/opensearch?locale=en_US" title="YouTube Video Search">
+	<link rel="icon" href="http://s.ytimg.com/yt/favicon-vfl1123.ico" type="image/x-icon">
+	<link rel="shortcut icon" href="http://s.ytimg.com/yt/favicon-vfl1123.ico" type="image/x-icon">
+	
+
+	<meta name="description" content="Share your videos with friends and family">
+	<meta name="keywords" content="video,sharing,camera phone,video phone,free">
+
+	<link rel="alternate" type="application/rss+xml" title="YouTube - [RSS]" href="/rssls">
+
+	<link rel="alternate" media="handheld" href="http://m.youtube.com/index?desktop_uri=%2F&">
+
+	<script type="text/javascript">
+			window.google={kHL:"en"};
+	</script>
+
+	<script type="text/javascript" src="http://s.ytimg.com/yt/js/base_all_with_bidi-vfl42302.js"></script>
+
+	<script type="text/javascript">
+
+			function _hbLink (a,b) { return false; }
+			function urchinTracker (a,b) { }
+
+		
+	var gXSRF_token = '';
+	var gXSRF_field_name = '';
+	var gXSRF_ql_pair = '';
+
+		gXSRF_token = 'fZg-xPKpfj11aUrz_5__moOGiAp8MTIxMjg1OTQ4OA==';
+		gXSRF_field_name = 'session_token';
+		onLoadFunctionList.push(populate_session_token);
+
+		gXSRF_ql_pair = 'session_token=kVjpl8qnfp7RPuqnTrIu6Q8BT5d8MA==';
+
+
+		var gQuickListTooltipText = 'Add Video to QuickList';
+		var gPartnerVideoText = 'Partner Video';
+		var gGoogleSuggest = true;
+		var gPixelGif = 'http://s.ytimg.com/yt/img/pixel-vfl73.gif';
+		
+		var gInQuickListText = 'in <a href="/watch_queue?all">QuickList</a>';
+		var gIsResultsPage = false;
+	</script>
+
+
+
+<script type="text/javascript">
+
+function swapVideoList(linkObj)
+{
+	var linkId = linkObj.id;
+	var queryData = '';
+	var newDivId = '';
+	var headlineObj = document.getElementById('hpVideoListHead');
+	var moreLinkObj = document.getElementById('homepage-featured-more-top');
+	var bottomMoreLinkObj = document.getElementById('homepage-featured-more-bottom');
+
+	if (linkId == 'hpMostViewedLink') {
+		queryData = 'videoListType=mostViewed';
+		newDivId = 'hpMostViewed';
+		headlineObj.innerHTML = "Most Viewed Videos";
+		moreLinkObj.innerHTML = "<a href=\"/browse?s=mp\">See More Most Viewed Videos</a>";
+		bottomMoreLinkObj.innerHTML = "<a href=\"/browse?s=mp\">See More Most Viewed Videos</a>";
+	}
+	else if (linkId == 'hpMostDiscussedLink') {
+		queryData = 'videoListType=mostDiscussed';
+		newDivId = 'hpMostDiscussed';
+		headlineObj.innerHTML = "Most Discussed Videos";
+		moreLinkObj.innerHTML = "<a href=\"/browse?s=md\">See More Most Discussed Videos</a>";
+		bottomMoreLinkObj.innerHTML = "<a href=\"/browse?s=md\">See More Most Discussed Videos</a>";
+	}
+	else if (linkId == 'hpTopFavoritesLink') {
+		queryData = 'videoListType=topFavorites';
+		newDivId = 'hpTopFavorites';
+		headlineObj.innerHTML = "Top Favorites";
+		moreLinkObj.innerHTML = "<a href=\"/browse?s=mf\">See More Top Favorites</a>";
+		bottomMoreLinkObj.innerHTML = "<a href=\"/browse?s=mf\">See More Top Favorites</a>";
+	}
+	else if (linkId == 'hpFeaturedLink') {
+		newDivId = 'hpFeatured';
+		headlineObj.innerHTML = "Featured Videos";
+		moreLinkObj.innerHTML = "<a href=\"/browse?s=rf\">See More Featured Videos</a>";
+		bottomMoreLinkObj.innerHTML = "<a href=\"/browse?s=rf\">See More Featured Videos</a>";
+	} 
+	self.containerDiv = 'homepage-video-list'
+	self.fillDiv = fillDiv
+	self.linkId = linkId
+	self.newDivId = newDivId
+	addClass(_gel(newDivId + 'Link'), 'hilite');
+	if (newDivId != 'hpMostViewed') {
+		removeClass(_gel('hpMostViewedLink'), 'hilite');
+	}
+	if (newDivId != 'hpMostDiscussed') {
+		removeClass(_gel('hpMostDiscussedLink'), 'hilite');
+	}
+	if (newDivId != 'hpTopFavorites') {
+		removeClass(_gel('hpTopFavoritesLink'), 'hilite');
+	}
+	if (newDivId != 'hpFeatured') {
+		removeClass(_gel('hpFeaturedLink'), 'hilite');
+	}
+	if (document.getElementById(newDivId))
+	{
+		document.getElementById(newDivId).style.display = 'block';
+		if (newDivId != 'hpMostViewed' && document.getElementById('hpMostViewed')) document.getElementById('hpMostViewed').style.display = 'none';
+		if (newDivId != 'hpMostDiscussed' && document.getElementById('hpMostDiscussed')) document.getElementById('hpMostDiscussed').style.display = 'none';
+		if (newDivId != 'hpTopFavorites' && document.getElementById('hpTopFavorites')) document.getElementById('hpTopFavorites').style.display = 'none';
+		if (newDivId != 'hpFeatured' && document.getElementById('hpFeatured')) document.getElementById('hpFeatured').style.display = 'none';
+	}
+	else if (queryData != '') {
+		postUrlXMLResponse('/ajax_video_list',queryData,self.fillDiv);
+	}
+}
+function fillDiv(req)
+{
+	if (document.getElementById('hpMostViewed')) document.getElementById('hpMostViewed').style.display = 'none';
+	if (document.getElementById('hpMostDiscussed')) document.getElementById('hpMostDiscussed').style.display = 'none';
+	if (document.getElementById('hpTopFavorites')) document.getElementById('hpTopFavorites').style.display = 'none';
+	if (document.getElementById('hpFeatured')) document.getElementById('hpFeatured').style.display = 'none';
+	var newContent = getNodeValue(req.responseXML, "html_content");
+	var newdiv = document.createElement('div');
+	newdiv.setAttribute("id",self.newDivId);
+	newdiv.innerHTML = newContent;
+	var container = document.getElementById(self.containerDiv);
+	container.appendChild(newdiv);
+	addQLIcons(container);
+}
+
+function hide_active_sharing() {
+	hideDiv("active_sharing_div");
+}
+</script>
+
+</head>
+
+
+<body onload="performOnLoadFunctions();" class="en_US is-english">
+
+<div id="baseDiv" class="date-20080606">
+	
+		<div id="masthead">
+		<a href="/" class="logo"><img src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" width="132" height="63" border="0" alt=""/></a>
+		<div class="user-info">
+				
+	<div id="loginBoxZ">
+		<div class="contentBox">
+			<div>
+				<div id="loginBoxZ-signup">
+					<a href="/signup">Sign Up</a>
+				| <a href="http://help.youtube.com/support/youtube/bin/topic.py?topic=10546&amp;hl=en_US">Help</a>
+				</div>
+				<div id="loginBoxZ-login">
+					 Login 
+				</div>
+				<div class="clear"></div>
+			</div>
+
+			<form method="post" name="loginForm" id="loginFormZ" action="/signup">
+				<input type="hidden" name="next" value="/" id="loginNextZ"/>
+				<input type="hidden" name="current_form" value="loginForm" />
+				<input type="hidden" name="action_login" value="1">
+				<div id="loginBoxZ-container">
+					<div id="loginBoxZ-labels" class="floatL">
+						<label for="loginUserZ" class="nowrap">Username:</label>
+						<label for="loginPassZ" class="nowrap">Password:</label>
+					</div>
+					<div class="floatL">
+						<input id="loginUserZ" class="loginBoxZ-input" type="text" size="16" name="username" value=""><br/>
+						<input id="loginPassZ" class="loginBoxZ-input" type="password" size="16" name="password"><br/>
+						<input type="submit" class="smallText" value="Login">
+					</div>
+					<div class="clearL"></div>
+				</div>
+			</form>
+			<div id="loginBoxZ-forgot">
+				<a href="/forgot_username?next=/">Forgot Username</a>
+			| <wbr><nobr><a href="/forgot?next=/">Forgot Password</a></nobr>
+			</div>
+			<div id="loginBoxZ-gaia">
+				<a href="https://www.google.com/accounts/ServiceLogin?service=youtube&amp;hl=en_US&amp;continue=http%3A//www.youtube.com/signup%3Fhl%3Den_US&amp;passive=true">Login with your Google account</a>&nbsp;
+				<a href="#" onClick="window.open('/t/help_gaia','login_help','width=580,height=480,resizable=yes,scrollbars=yes,status=0').focus();" rel="nofollow"><img src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" border="0" class="alignMid gaiaHelpBtn" alt=""></a>
+			</div>
+		</div>
+	</div>
+
+					<div id="localePickerBox">
+	<div id="flagDiv">
+			<script type="text/javascript">
+				var gLocales = [
+				['ru_RU','&#x420;&#x43E;&#x441;&#x441;&#x438;&#x44F;']									,				['zh_TW','&#x53F0;&#x7063;']									,				['ja_JP','&#x65E5;&#x672C;']									,				['zh_HK','&#x9999;&#x6E2F;']									,				['ko_KR','&#xD55C;&#xAD6D;']									,				['en_AU','Australia']									,				['pt_BR','Brasil']									,				['en_CA','Canada']									,				['de_DE','Deutschland']									,				['es_ES','Espa&#xF1;a']									,				['fr_FR','France']									,				['en_US','Global']									,				['en_IN','India']									,				['en_IE','Ireland']									,				['it_IT','Italia']									,				['es_MX','M&#xE9;xico']									,				['nl_NL','Nederland']									,				['en_NZ','New Zealand']									,				['pl_PL','Polska']									,				['en_GB','United Kingdom']				
+				];
+			</script>
+			<div id="flagDivInner">
+			</div>
+
+		<div class="alignR smallText"><a href="#" onclick="closeLocalePicker(); return false;">Close</a></div>
+	</div>
+	</div>
+
+					
+
+
+
+
+	<div id="util-links" class="normal-utility-links">
+
+		<span class="util-item first"><b><a  href="/signup" onclick="_hbLink('SignUp','UtilityLinks');">Sign Up</a></b></span>
+		<span class="util-item"><a  href="/watch_queue?all">QuickList</a> (<span id="quicklist-utility">0</span>)</span>
+		<span class="util-item"><a  href="http://help.youtube.com/support/youtube/bin/static.py?page=start.cs&amp;hl=en_US">Help</a></span>
+		<span class="util-item"><a  href="#" class="loginBoxZ eLink" onclick="return openLoginBox(event);">Log In</a></span>
+		<span class="util-item"><a href="#" class="localePickerLink eLink" onclick="loadFlagImgs();toggleDisplay('localePickerBox');return false;">Site:</a></span>
+		<span class="util-item first">&nbsp;<a href="#" class="localePickerLink" onclick="loadFlagImgs();toggleDisplay('localePickerBox');return false;"><img src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" class="currentFlag  globalFlag" alt="Site:"></a></span>
+	</div>
+
+	<form name="logoutForm" method="post" target="_top" action="/index">
+		<input type="hidden" name="action_logout" value="1">
+	</form>
+
+
+		</div>
+		<div class="nav">
+			<div class="nav-item first selected" id="nav-item-home">
+				<span class="leftcap"></span>
+				<a class="content" href="/">Home</a>
+				<span class="rightcap"></span>
+			</div>
+			<div class="nav-item" id="nav-item-videos">
+				<div class="nav-tab">
+					<span class="leftcap"></span>
+					<a class="content" href="/browse?s=mp">Videos</a>
+					<span class="rightcap"></span>
+				</div>
+			</div>
+			<div class="nav-item" id="nav-item-channels">
+				<div class="nav-tab">
+					<span class="leftcap"></span>
+					<a class="content" href="/members">Channels</a>
+					<span class="rightcap"></span>
+				</div>
+			</div>
+			<div class="nav-item" id="nav-item-community">
+				<div class="nav-tab">
+					<span class="leftcap"></span>
+					<a class="content" href="/community">Community</a>
+					<span class="rightcap"></span>
+				</div>
+			</div>
+		</div>
+		
+		<form autocomplete="off" action="/results" method="get" name="searchForm" onsubmit="return submitRegularSearchRequest()">
+
+		<div class="bar">
+			<span class="leftcap"></span>
+			<div class="search-bar">
+				<a href="/my_videos_upload" id="upload-button" class="action-button">
+					<span class="action-button-leftcap"></span>
+					<span class="action-button-text">Upload</span>
+					<span class="action-button-rightcap"></span>
+				</a>
+				<div id="search-form">
+					<input id="search-term" name="search_query" type="text" tabindex="1" onkeyup="goog.i18n.bidi.setDirAttribute(event,this)"  value="" maxlength="128" />
+					<select class="search-type" name="search_type">
+						<option value="">Videos</option>
+						<option value="search_users" >Channels</option>
+					</select>
+					<input id="search-button" type="submit" value="Search" />
+				</div>
+				<div class="search-settings-link">
+				<a href="#" class="eLink" onClick="return toggleAdvSearch('', '', '', '', '', '')">
+					advanced
+				</a></div>
+			</div>
+			<span class="rightcap"></span>
+		</div>
+
+		</form>
+
+		<div id="search-advanced-form" class="hid">
+			<div class="search-setting-inner alignC">Loading...</div>
+		</div>
+
+		<div class="clear"></div>
+	</div> 
+	<div id="search-settings-clr" class="hid"></div> 
+
+	
+	
+	
+	
+
+<div id="homepage-main-content"> 
+		<div>
+	<div id="active_sharing_div" name="active_sharing_div" style="display:block"></div>
+	<script type="text/javascript">
+		// <![CDATA[
+		var fo = new SWFObject("active_sharing.swf", "active_sharing", "550", "115", 7, "#FFFFFF");
+		var showstr = "Videos being watched right now...";
+		fo.addParam('wmode', 'opaque');
+		fo.addVariable("t", showstr);
+		fo.write("active_sharing_div");
+		// ]]>
+	</script>
+</div>
+
+			<div class="homepage-content-block" style="margin-left:18px; border:0px #CCC solid;">
+		<div class="homepage-block-heading homepage-block-heading-gray">Promoted Videos</div>
+		<div>
+			<div class="homepage-sponsored-video marB0">
+				<div class="videoIconWrapperOuter">
+					<div class="videoIconWrapperInner">
+					<div class="vstill"><a href="/cthru?key=YSqt3w6VDhuNgxUzVZsryt0JX30ll7tCIrBT--_pvAtRC3KmvsBYFaUNR1qT0d0BnBJYjHz_G7LIr21ufG7W6gJL7zPdHNbcmuIxaafL1yry8cdcqeEOTitWLXkpm2q2QnTAlp4chC1jus7JLVCnCdacl0xUeDk4Vk8e6q9htmGbDZPN9QMnHsrX2RZnvDMx-3Im14C3GKi4jI8ee-jnOQ==" name="&lid=DV+-+BasiaBulatInTheNight+-+beggars&lpos=hp-s0"><img src="http://i.ytimg.com/vi/CebHAvPHyyU/default.jpg" class="vimg120"></a></div>
+					</div>
+					</div>
+
+				<div class="vtitle smallText">
+					<a href="/cthru?key=YSqt3w6VDhuNgxUzVZsryt0JX30ll7tCIrBT--_pvAtRC3KmvsBYFaUNR1qT0d0BnBJYjHz_G7LIr21ufG7W6gJL7zPdHNbcmuIxaafL1yry8cdcqeEOTitWLXkpm2q2QnTAlp4chC1jus7JLVCnCdacl0xUeDk4Vk8e6q9htmGbDZPN9QMnHsrX2RZnvDMx-3Im14C3GKi4jI8ee-jnOQ==" name="&lid=DV+-+BasiaBulatInTheNight+-+beggars&lpos=hp-s0">Basia Bulat - In Th...</a>
+				</div>
+				<div class="vfacets" style="margin-bottom: 0px;">
+				<a href="/user/beggars" class="dg">beggars</a>
+				</div>
+			</div>
+			<div class="homepage-sponsored-video marB0">
+				<div class="videoIconWrapperOuter">
+					<div class="videoIconWrapperInner">
+					<div class="vstill"><a href="/cthru?key=FIUXMxdvOKhDw2_wpR7bE9L-XUsHMZBHRpS_s21B0Kq0RTWlGXSqQ8bjw6tBQOUczUtO8b6_mktukdd5ChseYAl10dE5JQrlpiOQE6HNMOAsszaA0M9qhzFnOkWPrkFGMDW5vvaAOkIwas6ksi4e_R8wkiIhlNYPDiqi2f4LpVzB2jpe0LobjIEF9czWjFx9ymrPg8wx2x6w00jF-BzRfQ==" name="&lid=DV+-+Perfection+-+corporalcadet&lpos=hp-s1"><img src="http://i.ytimg.com/vi/Np4bhsmr3iE/default.jpg" class="vimg120"></a></div>
+					</div>
+					</div>
+
+				<div class="vtitle smallText">
+					<a href="/cthru?key=FIUXMxdvOKhDw2_wpR7bE9L-XUsHMZBHRpS_s21B0Kq0RTWlGXSqQ8bjw6tBQOUczUtO8b6_mktukdd5ChseYAl10dE5JQrlpiOQE6HNMOAsszaA0M9qhzFnOkWPrkFGMDW5vvaAOkIwas6ksi4e_R8wkiIhlNYPDiqi2f4LpVzB2jpe0LobjIEF9czWjFx9ymrPg8wx2x6w00jF-BzRfQ==" name="&lid=DV+-+Perfection+-+corporalcadet&lpos=hp-s1">Perfection</a>
+				</div>
+				<div class="vfacets" style="margin-bottom: 0px;">
+				<a href="/user/corporalcadet" class="dg">corporalcadet</a>
+				</div>
+			</div>
+			<div class="homepage-sponsored-video marB0">
+				<div class="videoIconWrapperOuter">
+					<div class="videoIconWrapperInner">
+					<div class="vstill"><a href="/cthru?key=1W2J508g9g7Bjsvodsvq3GHZo25JkqX7Js5JSHnyP1yZYB96KDh2LTC2pCKjeHc7LEiTUU4uhuwsrTzZfns_IR2dsA7leCUYMtvgq3noBHy-G0jTHmgiQtFUVTDU3jT2EkS39J6Ur2qxtHwAmybMcU83hK1guqpPdryKOfcbHovo-Kbwglzbbl28LrK1iNdz5E6NZ5CZCVZrYxldbWyjEA==" name="&lid=DV+-+WhatmatterstoyoumeVFS+-+Jr0canest&lpos=hp-s2"><img src="http://i.ytimg.com/vi/KExoP97KUnY/default.jpg" class="vimg120"></a></div>
+					</div>
+					</div>
+
+				<div class="vtitle smallText">
+					<a href="/cthru?key=1W2J508g9g7Bjsvodsvq3GHZo25JkqX7Js5JSHnyP1yZYB96KDh2LTC2pCKjeHc7LEiTUU4uhuwsrTzZfns_IR2dsA7leCUYMtvgq3noBHy-G0jTHmgiQtFUVTDU3jT2EkS39J6Ur2qxtHwAmybMcU83hK1guqpPdryKOfcbHovo-Kbwglzbbl28LrK1iNdz5E6NZ5CZCVZrYxldbWyjEA==" name="&lid=DV+-+WhatmatterstoyoumeVFS+-+Jr0canest&lpos=hp-s2">What matters to you...</a>
+				</div>
+				<div class="vfacets" style="margin-bottom: 0px;">
+				<a href="/user/Jr0canest" class="dg">Jr0canest</a>
+				</div>
+			</div>
+			<div class="homepage-sponsored-video marB0">
+				<div class="videoIconWrapperOuter">
+					<div class="videoIconWrapperInner">
+					<div class="vstill"><a href="/cthru?key=idL1slcMKbuzX2MFZaS-nifq5PWrCKLUZMXEPqCthRVET6PQSkxlmKQVMNmQvlYpQlFISkRprfO113rH-ER0ytYh0zSMWI4XbaO74zcrIZiSpB3oISku9zIGUwS5WI03Y0ZiHbGAC9GIYziEcRcgzcEYuizlUwNvTWDgNSvrCJHcyPYokMUjLjcwqD2wEEAe7jfIfcJRNl3sW7ODuiN_MA==" name="&lid=DV+-+LIfeisaMasquerade+-+bananaruthy&lpos=hp-s3"><img src="http://i.ytimg.com/vi/l9gjk5hHiGM/default.jpg" class="vimg120"></a></div>
+					</div>
+					</div>
+
+				<div class="vtitle smallText">
+					<a href="/cthru?key=idL1slcMKbuzX2MFZaS-nifq5PWrCKLUZMXEPqCthRVET6PQSkxlmKQVMNmQvlYpQlFISkRprfO113rH-ER0ytYh0zSMWI4XbaO74zcrIZiSpB3oISku9zIGUwS5WI03Y0ZiHbGAC9GIYziEcRcgzcEYuizlUwNvTWDgNSvrCJHcyPYokMUjLjcwqD2wEEAe7jfIfcJRNl3sW7ODuiN_MA==" name="&lid=DV+-+LIfeisaMasquerade+-+bananaruthy&lpos=hp-s3">LIfe is a Masquerade.</a>
+				</div>
+				<div class="vfacets" style="margin-bottom: 0px;">
+				<a href="/user/bananaruthy" class="dg">bananaruthy</a>
+				</div>
+			</div>
+		<div class="clearL" style="height: 1px;"></div>
+		</div>
+	</div>
+
+
+	<div id="homepage-featured-heading">
+			<div id="homepage-featured-more-top"><a id="hpVideoListMoreLink" href="/browse?s=rf">See More Featured Videos</a></div>
+		<h1 id="hpVideoListHead">Featured Videos</h1>
+	</div>
+
+	<div id="homepage-featured-tabs">
+		<a href="#" id="hpTopFavoritesLink" name="&lid=hpTopFavoritesTab&lpos=hpTabs" onclick="swapVideoList(this); return false;">Top Favorites</a>
+		<a href="#" id="hpMostDiscussedLink" name="&lid=hpMostDiscussedTab&lpos=hpTabs" onclick="swapVideoList(this); return false;">Most Discussed</a>
+		<a href="#" id="hpMostViewedLink" name="&lid=hpMostViewedTab&lpos=hpTabs" onclick="swapVideoList(this); return false;">Most Viewed</a>
+		<a href="#" id="hpFeaturedLink" name="&lid=hpFeaturedTab&lpos=hpTabs" onclick="swapVideoList(this); return false;" class="first hilite">Featured</a>
+		<div class="clear"></div>
+	</div>
+
+
+
+	<div id="homepage-video-list" class="browseListView">
+		<div id="hpFeatured">
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=uu-NTSZ27b0"><img src="http://i.ytimg.com/vi/uu-NTSZ27b0/default.jpg" class="vimg120" title="Caribbean PVC Marimba Children's Orchestra" qliconalt="uu-NTSZ27b0"  alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=uu-NTSZ27b0" title="Caribbean PVC Marimba Children's Orchestra" onclick="_hbLink('CaribbeanPVCMarimbaChildrensOrchestra','VidVert');">Caribbean PVC Marimba Children's...</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=uu-NTSZ27b0" title="Caribbean PVC Marimba Children's Orchestra" onclick="_hbLink('CaribbeanPVCMarimbaChildrensOrchestra','VidVert');">Caribbean PVC Marimba Children's Orchestra</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDescuuNTSZ27b0">
+	Michael Greiner who is a neighbor and good friend of mine asked me to upload several Marim
+	</span>
+
+			<span  id="RemainvidDescuuNTSZ27b0" style="display: none">Michael Greiner who is a neighbor and good friend of mine asked me to upload several Marimba videos for him (that's him on the left in the middle row).  He currently teaches the music program at Aveson Charter School http://aveson.org/ and constructs musical instruments in classes with students' participation.<br/><br/>Michael Greiner created this set of plastic pipe marimbas.  On this clip are three generations of prototypes designed to be low cost for use by childrens' programming. The top one bass version costs around $200 in materials.   The mallets are home made using foam flip-flops mounted to sticks. Filmed at Norma Coombs primary school in Altadena CA in 2007.<br/><br/>*** Edited to Add ****<br/>Wow, it looks like this video's hit YouTube's front page.  Thank you for all the wonderfully kind and supportive comments!</span>
+			<span id="MorevidDescuuNTSZ27b0" class="smallText">(<a href="#" class="eLink" onclick="showDiv('RemainvidDescuuNTSZ27b0'); hideDiv('MorevidDescuuNTSZ27b0'); hideDiv('BeginvidDescuuNTSZ27b0'); showDiv('LessvidDescuuNTSZ27b0'); return false;">more</a>)</span>
+			<span id="LessvidDescuuNTSZ27b0" style="display: none" class="smallText">(<a href="#" class="eLink" onclick="hideDiv('RemainvidDescuuNTSZ27b0'); hideDiv('LessvidDescuuNTSZ27b0'); showDiv('BeginvidDescuuNTSZ27b0'); showDiv('MorevidDescuuNTSZ27b0'); return false;">less</a>)</span>
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/PlayHanghang">PlayHanghang</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 3,853<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-5.0" alt="4.84814814815" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">01:46</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=24">Entertainment</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=CFJRn7akXeQ"><img src="http://i.ytimg.com/vi/CFJRn7akXeQ/default.jpg" class="vimg120" title="&quot;Sharp Teeth&quot; Excerpt #1" qliconalt="CFJRn7akXeQ"  alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=CFJRn7akXeQ" title="&quot;Sharp Teeth&quot; Excerpt #1" onclick="_hbLink('SharpTeethExcerpt1','VidVert');">&quot;Sharp Teeth&quot; Excerpt #1</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=CFJRn7akXeQ" title="&quot;Sharp Teeth&quot; Excerpt #1" onclick="_hbLink('SharpTeethExcerpt1','VidVert');">&quot;Sharp Teeth&quot; Excerpt #1</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDescCFJRn7akXeQ">
+	Check out the book "Sharp Teeth" on Amazon:<br/>http://www.amazon.com/Sharp-Teeth-Toby-Barlow
+	</span>
+
+			<span  id="RemainvidDescCFJRn7akXeQ" style="display: none">Check out the book "Sharp Teeth" on Amazon:<br/>http://www.amazon.com/Sharp-Teeth-Toby-Barlow/dp/0061430226/ ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1212767529&sr=8-1<br/><br/>Animation directed by Limbert Fabian. Produced by Matt Thunell.  For more information go to sharpteeththebook.com</span>
+			<span id="MorevidDescCFJRn7akXeQ" class="smallText">(<a href="#" class="eLink" onclick="showDiv('RemainvidDescCFJRn7akXeQ'); hideDiv('MorevidDescCFJRn7akXeQ'); hideDiv('BeginvidDescCFJRn7akXeQ'); showDiv('LessvidDescCFJRn7akXeQ'); return false;">more</a>)</span>
+			<span id="LessvidDescCFJRn7akXeQ" style="display: none" class="smallText">(<a href="#" class="eLink" onclick="hideDiv('RemainvidDescCFJRn7akXeQ'); hideDiv('LessvidDescCFJRn7akXeQ'); showDiv('BeginvidDescCFJRn7akXeQ'); showDiv('MorevidDescCFJRn7akXeQ'); return false;">less</a>)</span>
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/tobybarlowny">tobybarlowny</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 67,438<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-4.5" alt="4.39928057554" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">01:33</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=1">Film & Animation</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=sNROaXA6OSI"><img src="http://i.ytimg.com/vi/sNROaXA6OSI/default.jpg" class="vimg120" title="Touring to Alaska on Vegetable Oil!" qliconalt="sNROaXA6OSI"  alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=sNROaXA6OSI" title="Touring to Alaska on Vegetable Oil!" onclick="_hbLink('TouringtoAlaskaonVegetableOil','VidVert');">Touring to Alaska on Vegetable Oil!</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=sNROaXA6OSI" title="Touring to Alaska on Vegetable Oil!" onclick="_hbLink('TouringtoAlaskaonVegetableOil','VidVert');">Touring to Alaska on Vegetable Oil!</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDescsNROaXA6OSI">
+	This video is for Mrs. Aderman's 1st Period Environmental Science Class.<br/><br/>We are Mose Gi
+	</span>
+
+			<span  id="RemainvidDescsNROaXA6OSI" style="display: none">This video is for Mrs. Aderman's 1st Period Environmental Science Class.<br/><br/>We are Mose Giganticus and The Emotron and this year we are touring to Alaska on Vegetable Oil.</span>
+			<span id="MorevidDescsNROaXA6OSI" class="smallText">(<a href="#" class="eLink" onclick="showDiv('RemainvidDescsNROaXA6OSI'); hideDiv('MorevidDescsNROaXA6OSI'); hideDiv('BeginvidDescsNROaXA6OSI'); showDiv('LessvidDescsNROaXA6OSI'); return false;">more</a>)</span>
+			<span id="LessvidDescsNROaXA6OSI" style="display: none" class="smallText">(<a href="#" class="eLink" onclick="hideDiv('RemainvidDescsNROaXA6OSI'); hideDiv('LessvidDescsNROaXA6OSI'); showDiv('BeginvidDescsNROaXA6OSI'); showDiv('MorevidDescsNROaXA6OSI'); return false;">less</a>)</span>
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/kylemotron">kylemotron</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 122,748<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-4.5" alt="4.44329896907" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">04:02</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=27">Education</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=6iC3b5JnSIE"><img src="http://i.ytimg.com/vi/6iC3b5JnSIE/default.jpg" class="vimg120" title="JCJC" qliconalt="6iC3b5JnSIE"  alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=6iC3b5JnSIE" title="JCJC" onclick="_hbLink('JCJC','VidVert');">JCJC</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=6iC3b5JnSIE" title="JCJC" onclick="_hbLink('JCJC','VidVert');">JCJC</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDesc6iC3b5JnSIE">
+	His name is Okotanpe. <br/>His mail addless is fuseloopa@hotmail.com <br/><br/>The name of this son
+	</span>
+
+			<span  id="RemainvidDesc6iC3b5JnSIE" style="display: none">His name is Okotanpe. <br/>His mail addless is fuseloopa@hotmail.com <br/><br/>The name of this song is 300ml(milk).<br/>An artist name is Rei harakami. <br/>Check it out!</span>
+			<span id="MorevidDesc6iC3b5JnSIE" class="smallText">(<a href="#" class="eLink" onclick="showDiv('RemainvidDesc6iC3b5JnSIE'); hideDiv('MorevidDesc6iC3b5JnSIE'); hideDiv('BeginvidDesc6iC3b5JnSIE'); showDiv('LessvidDesc6iC3b5JnSIE'); return false;">more</a>)</span>
+			<span id="LessvidDesc6iC3b5JnSIE" style="display: none" class="smallText">(<a href="#" class="eLink" onclick="hideDiv('RemainvidDesc6iC3b5JnSIE'); hideDiv('LessvidDesc6iC3b5JnSIE'); showDiv('BeginvidDesc6iC3b5JnSIE'); showDiv('MorevidDesc6iC3b5JnSIE'); return false;">less</a>)</span>
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/YoneyaYu">YoneyaYu</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 532,447<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-5.0" alt="4.83995523223" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">05:26</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=24">Entertainment</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=L9Wu1V1JAHw"><img src="http://i.ytimg.com/vi/L9Wu1V1JAHw/default.jpg" class="vimg120" title="Certainty In Freedom ~ A Song for Burma (Original Song)" qliconalt="L9Wu1V1JAHw" partner="true" alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=L9Wu1V1JAHw" title="Certainty In Freedom ~ A Song for Burma (Original Song)" onclick="_hbLink('CertaintyInFreedomASongforBurmaOriginalSong','VidVert');">Certainty In Freedom ~ A Song fo...</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=L9Wu1V1JAHw" title="Certainty In Freedom ~ A Song for Burma (Original Song)" onclick="_hbLink('CertaintyInFreedomASongforBurmaOriginalSong','VidVert');">Certainty In Freedom ~ A Song for Burma (Original Song)</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDescL9Wu1V1JAHw">
+	I'm not a particularly political person, by which I mean I'd sooner just not get involved 
+	</span>
+
+			<span  id="RemainvidDescL9Wu1V1JAHw" style="display: none">I'm not a particularly political person, by which I mean I'd sooner just not get involved in conflict, but I realise that, at times, things happen outside your control which will you to say something or do something.<br/><br/>I got a comment on my last song from 'gersing' asking me if I'd sing a song for the monks and people of Burma. At first I misunderstood the comment but then it clicked and I felt compelled to offer something.. anything. <br/><br/>I know this song is going to change nothing; and I'm cautious calling it a protest song as I don't understand the situation fully (and I wouldn't want to upset anyone), but this is a tune I wrote in response to being repressed (I'm whatever guise) and how beautiful 'freedom' really is. I don't think anyone will ever understand that term fully but by singing and writing and thinking and speaking we can come somewhere close I'm sure. <br/><br/>As a disclaimer, I'd say that, personally, the chords and melody are arbitrary; merely the carrier of the sentiment...<br/><br/>Changing the subject ever so slightly I just wanted to say a big thank you to everyone that's shown support; it's overwhelming. An apology to anyone I've not yet responded to.. I've never been very good at juggling my time but I will be in touch.<br/><br/>Thanks again...<br/><br/>_________________<br/>Certainty In Freedom<br/><br/>If I had the will to talk<br/>I wonder if you'd give a thought <br/>To what I had to say - help make it go away<br/><br/>Cos there's certainty in freedom<br/>And in that we must believe in<br/>Cos I saw on the news today<br/><br/>If I saw you in the street now<br/>Would I look the other way?<br/>I hope I'm strong enough to say - help make it go away<br/><br/>When all you see is hatred<br/>Spirits crushed and souls deflated<br/>Easy to leave it for another day<br/><br/>Peace is pushing for love<br/>Love is leading the way<br/>You should follow its path<br/>Darkness leads you astray<br/>Peace is pushing for love<br/>Love is leading the way<br/><br/>So this, my only voice to speak<br/>My message strong, my tone is weak<br/>I find it hard to say - help make it go away<br/><br/>And if I come across obtuse<br/>I urge you now to cut the noose<br/>Don't leave it for another day<br/><br/>Peace is pushing for love<br/>Love is leading the way<br/>You should follow its path<br/>Darkness leads you astray<br/>Peace is pushing for love<br/>Love is leading the way<br/><br/>If I had the will to talk<br/>I wonder if you'd give a thought <br/>To what I had to say - help make it go away<br/><br/>Cos there's certainty in freedom<br/>And in that we must believe in<br/>Cos I saw on the news today<br/><br/>Peace is pushing for love<br/>Love is leading the way<br/>You should follow its path<br/>Darkness leads you astray<br/>Peace is pushing for love<br/>Love is leading the way<br/><br/>_____________________<br/>Peace<br/><br/>Available on the 'Unequal Measures', available through http://www.krisrowley.com<br/>© Kris Rowley 2007</span>
+			<span id="MorevidDescL9Wu1V1JAHw" class="smallText">(<a href="#" class="eLink" onclick="showDiv('RemainvidDescL9Wu1V1JAHw'); hideDiv('MorevidDescL9Wu1V1JAHw'); hideDiv('BeginvidDescL9Wu1V1JAHw'); showDiv('LessvidDescL9Wu1V1JAHw'); return false;">more</a>)</span>
+			<span id="LessvidDescL9Wu1V1JAHw" style="display: none" class="smallText">(<a href="#" class="eLink" onclick="hideDiv('RemainvidDescL9Wu1V1JAHw'); hideDiv('LessvidDescL9Wu1V1JAHw'); showDiv('BeginvidDescL9Wu1V1JAHw'); showDiv('MorevidDescL9Wu1V1JAHw'); return false;">less</a>)</span>
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/zzzzzzzzap">zzzzzzzzap</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 136,222<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-4.5" alt="4.65044814341" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">03:55</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=10">Music</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=gQNY7Sti8FY"><img src="http://s4.ytimg.com/vi/gQNY7Sti8FY/default.jpg" class="vimg120" title="the world is at your fingertips" qliconalt="gQNY7Sti8FY" partner="true" alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=gQNY7Sti8FY" title="the world is at your fingertips" onclick="_hbLink('theworldisatyourfingertips','VidVert');">the world is at your fingertips</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=gQNY7Sti8FY" title="the world is at your fingertips" onclick="_hbLink('theworldisatyourfingertips','VidVert');">the world is at your fingertips</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDescgQNY7Sti8FY">
+	for the taking.
+	</span>
+
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/SupaDupaFlyGirl">SupaDupaFlyGirl</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 509,825<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-4.0" alt="3.91057134971" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">05:15</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=28">Science & Technology</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=rGUt7ropzNA"><img src="http://i.ytimg.com/vi/rGUt7ropzNA/default.jpg" class="vimg120" title="Aimee Mann Freeway Video Contest" qliconalt="rGUt7ropzNA"  alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=rGUt7ropzNA" title="Aimee Mann Freeway Video Contest" onclick="_hbLink('AimeeMannFreewayVideoContest','VidVert');">Aimee Mann Freeway Video Contest</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=rGUt7ropzNA" title="Aimee Mann Freeway Video Contest" onclick="_hbLink('AimeeMannFreewayVideoContest','VidVert');">Aimee Mann Freeway Video Contest</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDescrGUt7ropzNA">
+	Want a chance to sing with Aimee Mann live? Go to http://www.youtube.com/group/aimeemannco
+	</span>
+
+			<span  id="RemainvidDescrGUt7ropzNA" style="display: none">Want a chance to sing with Aimee Mann live? Go to http://www.youtube.com/group/aimeemanncontest and upload a video of yourself singing Aimee Mann's new song "Freeway."<br/><br/>Aimee Mann and SuperEgo Records will pick their favorite entry to be featured on YouTube and www.aimeemann.com. The winner will have an opportunity to sing live with Aimee at one of her upcoming shows. Ten runners-up will receive an autographed copy of Aimee's new CD, @#%&*! Smilers.<br/><br/>Entrants can get the lyrics, the instrumental version of "Freeway" and contest details at: http://www.aimeemann.com/freewaycontest/<br/>Submissions must be received by July 7th 2008</span>
+			<span id="MorevidDescrGUt7ropzNA" class="smallText">(<a href="#" class="eLink" onclick="showDiv('RemainvidDescrGUt7ropzNA'); hideDiv('MorevidDescrGUt7ropzNA'); hideDiv('BeginvidDescrGUt7ropzNA'); showDiv('LessvidDescrGUt7ropzNA'); return false;">more</a>)</span>
+			<span id="LessvidDescrGUt7ropzNA" style="display: none" class="smallText">(<a href="#" class="eLink" onclick="hideDiv('RemainvidDescrGUt7ropzNA'); hideDiv('LessvidDescrGUt7ropzNA'); showDiv('BeginvidDescrGUt7ropzNA'); showDiv('MorevidDescrGUt7ropzNA'); return false;">less</a>)</span>
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/aimeemann">aimeemann</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 283,776<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-4.0" alt="3.79036827195" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">02:22</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=10">Music</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=tbEei0I3kMQ"><img src="http://i.ytimg.com/vi/tbEei0I3kMQ/default.jpg" class="vimg120" title="Interactive card trick" qliconalt="tbEei0I3kMQ"  alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=tbEei0I3kMQ" title="Interactive card trick" onclick="_hbLink('Interactivecardtrick','VidVert');">Interactive card trick</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=tbEei0I3kMQ" title="Interactive card trick" onclick="_hbLink('Interactivecardtrick','VidVert');">Interactive card trick</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDesctbEei0I3kMQ">
+	This is the first interactive video on YouTube!<br/>Have fun and enjoy the show<br/>you can see 
+	</span>
+
+			<span  id="RemainvidDesctbEei0I3kMQ" style="display: none">This is the first interactive video on YouTube!<br/>Have fun and enjoy the show<br/>you can see our magician site:<br/>orenshalom.co.il</span>
+			<span id="MorevidDesctbEei0I3kMQ" class="smallText">(<a href="#" class="eLink" onclick="showDiv('RemainvidDesctbEei0I3kMQ'); hideDiv('MorevidDesctbEei0I3kMQ'); hideDiv('BeginvidDesctbEei0I3kMQ'); showDiv('LessvidDesctbEei0I3kMQ'); return false;">more</a>)</span>
+			<span id="LessvidDesctbEei0I3kMQ" style="display: none" class="smallText">(<a href="#" class="eLink" onclick="hideDiv('RemainvidDesctbEei0I3kMQ'); hideDiv('LessvidDesctbEei0I3kMQ'); showDiv('BeginvidDesctbEei0I3kMQ'); showDiv('MorevidDesctbEei0I3kMQ'); return false;">less</a>)</span>
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/werneroi">werneroi</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 3,155,063<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-3.5" alt="3.41263230956" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">01:10</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=22">People & Blogs</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=irDEzQovftM"><img src="http://i.ytimg.com/vi/irDEzQovftM/default.jpg" class="vimg120" title="Biggest drawing in the world" qliconalt="irDEzQovftM"  alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=irDEzQovftM" title="Biggest drawing in the world" onclick="_hbLink('Biggestdrawingintheworld','VidVert');">Biggest drawing in the world</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=irDEzQovftM" title="Biggest drawing in the world" onclick="_hbLink('Biggestdrawingintheworld','VidVert');">Biggest drawing in the world</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDescirDEzQovftM">
+	making the biggest drawing in the world
+	</span>
+
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/erikbjgn">erikbjgn</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 971,773<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-4.5" alt="4.54770783066" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">04:04</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=1">Film & Animation</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=iAKJKBCyPUY"><img src="http://i.ytimg.com/vi/iAKJKBCyPUY/default.jpg" class="vimg120" title="Checkmate" qliconalt="iAKJKBCyPUY"  alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=iAKJKBCyPUY" title="Checkmate" onclick="_hbLink('Checkmate','VidVert');">Checkmate</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=iAKJKBCyPUY" title="Checkmate" onclick="_hbLink('Checkmate','VidVert');">Checkmate</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDesciAKJKBCyPUY">
+	The Internets Celebrities Dallas Penn and Rafi Kam go in for an investigative report on Ch
+	</span>
+
+			<span  id="RemainvidDesciAKJKBCyPUY" style="display: none">The Internets Celebrities Dallas Penn and Rafi Kam go in for an investigative report on Check-Cashing. Themes explored include usury, economic instability, commercial banks and their profit line, and the cycle of poverty. <br/><br/>Oh yeah, it's a comedy.<br/><br/>The video is shot on location in Bushwick and Carroll Gardens in Brooklyn, New York. Also stars special guest Internets Celebrity Ben Popken of Consumerist.com.<br/><br/>Directed by Casimir Nozkowski<br/>Shot by Ian Savage, Josh Weisbrot<br/>Music by El Keter; instrumental from song "The Bottom Line" off Sankofa's album The Tortoise Hustle. Used with full permission.<br/><br/>http://www.internetscelebrities.com</span>
+			<span id="MorevidDesciAKJKBCyPUY" class="smallText">(<a href="#" class="eLink" onclick="showDiv('RemainvidDesciAKJKBCyPUY'); hideDiv('MorevidDesciAKJKBCyPUY'); hideDiv('BeginvidDesciAKJKBCyPUY'); showDiv('LessvidDesciAKJKBCyPUY'); return false;">more</a>)</span>
+			<span id="LessvidDesciAKJKBCyPUY" style="display: none" class="smallText">(<a href="#" class="eLink" onclick="hideDiv('RemainvidDesciAKJKBCyPUY'); hideDiv('LessvidDesciAKJKBCyPUY'); showDiv('BeginvidDesciAKJKBCyPUY'); showDiv('MorevidDesciAKJKBCyPUY'); return false;">less</a>)</span>
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/InternetsCelebrities">InternetsCel...</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 412,830<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-4.5" alt="4.52936962751" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">09:45</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=25">News & Politics</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=yLCl0xIg5-0"><img src="http://i.ytimg.com/vi/yLCl0xIg5-0/default.jpg" class="vimg120" title="Stories from the Front lines, Part 1" qliconalt="yLCl0xIg5-0"  alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=yLCl0xIg5-0" title="Stories from the Front lines, Part 1" onclick="_hbLink('StoriesfromtheFrontlinesPart1','VidVert');">Stories from the Front lines, Pa...</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=yLCl0xIg5-0" title="Stories from the Front lines, Part 1" onclick="_hbLink('StoriesfromtheFrontlinesPart1','VidVert');">Stories from the Front lines, Part 1</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDescyLCl0xIg50">
+	Stories from the men and women of the miltary, stationed in the Al Anbar Province. Right f
+	</span>
+
+			<span  id="RemainvidDescyLCl0xIg50" style="display: none">Stories from the men and women of the miltary, stationed in the Al Anbar Province. Right from the mouths of the troops themselves. Part 1 of 4</span>
+			<span id="MorevidDescyLCl0xIg50" class="smallText">(<a href="#" class="eLink" onclick="showDiv('RemainvidDescyLCl0xIg50'); hideDiv('MorevidDescyLCl0xIg50'); hideDiv('BeginvidDescyLCl0xIg50'); showDiv('LessvidDescyLCl0xIg50'); return false;">more</a>)</span>
+			<span id="LessvidDescyLCl0xIg50" style="display: none" class="smallText">(<a href="#" class="eLink" onclick="hideDiv('RemainvidDescyLCl0xIg50'); hideDiv('LessvidDescyLCl0xIg50'); showDiv('BeginvidDescyLCl0xIg50'); showDiv('MorevidDescyLCl0xIg50'); return false;">less</a>)</span>
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/3rdID8487">3rdID8487</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 367,189<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-4.0" alt="4.2188365651" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">10:35</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=25">News & Politics</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+
+				
+
+
+	<div class="vlentry" >
+
+		<div class="vlcontainer"><div class="v120WideEntry"><div class="v120WrapperOuter"><div class="v120WrapperInner"><a href="/watch?v=rFItE14EeSU"><img src="http://i.ytimg.com/vi/rFItE14EeSU/default.jpg" class="vimg120" title="Amazing video of multiple tornadoes in Northwest Kansas" qliconalt="rFItE14EeSU" partner="true" alt="video"></a></div></div>			</div>
+
+			<div class="vldescbox">
+				<div  class="vltitle">
+					<div class="vlshortTitle">
+						<a href="/watch?v=rFItE14EeSU" title="Amazing video of multiple tornadoes in Northwest Kansas" onclick="_hbLink('AmazingvideoofmultipletornadoesinNorthwestKansas','VidVert');">Amazing video of multiple tornad...</a>
+					</div>
+					<div class="vllongTitle">
+						<a href="/watch?v=rFItE14EeSU" title="Amazing video of multiple tornadoes in Northwest Kansas" onclick="_hbLink('AmazingvideoofmultipletornadoesinNorthwestKansas','VidVert');">Amazing video of multiple tornadoes in Northwest Kansas</a>
+					</div>
+				</div>
+
+				<div  class="vldesc">
+										
+		
+	<span  id="BeginvidDescrFItE14EeSU">
+	Video from TornadoVideos.net Live Stream Unit 3 of several tornadoes from close range.. In
+	</span>
+
+			<span  id="RemainvidDescrFItE14EeSU" style="display: none">Video from TornadoVideos.net Live Stream Unit 3 of several tornadoes from close range.. Including one beautiful but strong rope and a large wedge tornado from within 1/2 mile.  Check out TornadoVdeos.net for live streaming   video, breaking weather news, and more extreme tornado footage.</span>
+			<span id="MorevidDescrFItE14EeSU" class="smallText">(<a href="#" class="eLink" onclick="showDiv('RemainvidDescrFItE14EeSU'); hideDiv('MorevidDescrFItE14EeSU'); hideDiv('BeginvidDescrFItE14EeSU'); showDiv('LessvidDescrFItE14EeSU'); return false;">more</a>)</span>
+			<span id="LessvidDescrFItE14EeSU" style="display: none" class="smallText">(<a href="#" class="eLink" onclick="hideDiv('RemainvidDescrFItE14EeSU'); hideDiv('LessvidDescrFItE14EeSU'); showDiv('BeginvidDescrFItE14EeSU'); showDiv('MorevidDescrFItE14EeSU'); return false;">less</a>)</span>
+
+
+
+				</div>
+			</div>
+
+			<div class="vlclearaltl"></div>
+
+
+		</div>
+
+		<div class="vlfacets">
+			<div class="vladded">
+			</div>
+				<div><span class="grayText vlfromlbl">From:</span><span class="vlfrom"><a href="/user/TornadoVideosdotnet">TornadoVideo...</a></span></div>
+				<div class="clearL"></div>
+			<span class="grayText">Views:</span> 797,370<br/>
+
+			<div class="video-thumb-duration-rating">
+								
+
+	<div>
+
+	<img class="ratingVS ratingVS-4.5" alt="4.28912552436" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+
+
+
+	</div>
+
+
+
+				<div class="runtime">07:10</div>
+			</div>
+
+				<div class="clear"></div>
+				<div class="vlcategory">
+					<span class="smgrayText">More in</span> <a href="/results?search_query=None&search_category=25">News & Politics</a>
+				</div>
+		</div>
+
+		<div class="vlclearaltl"></div>
+
+
+		
+	</div> <!-- end vEntry -->
+
+
+		</div>
+	</div> <!-- end Video List -->
+	<div id="homepage-featured-more-bottom">
+		<div class="floatR"><a href="/browse?s=rf">See More Featured Videos</a></div>
+		<div class="clear"></div>
+	</div>
+</div>
+
+
+<div id="homepage-side-content" style="white-space: normal;">
+	<div>
+	
+
+
+
+	<!-- Begin ad tag -->
+
+			<input type="hidden" id="pvaHl" value="en"/>
+	<input type="hidden" id="pvaTag" value="http://n4061ad.doubleclick.net/adj/com.ythome/_default;sz=399x299;kl=N;kga=-1;kgg=-1;tile=1;dcopt=ist;"/>
+	<input type="hidden" id="burl" value="http://www.youtube.com/pva/"/>
+	<input type="hidden" id="canv" value="False"/>
+	<div id="myAd_banner" style="visibility:hidden;height:35px;"></div>
+	<div id="myAd_pva">
+
+
+		
+	
+	<script type="text/javascript">
+		ord=Math.random()*10000000000000000 + 3;
+		if (false) {
+			ord = 1234567890;
+		}
+		document.write('<script language="JavaScript" src="http://n4061ad.doubleclick.net/adj/com.ythome/_default;sz=399x299;kl=N;kga=-1;kgg=-1;tile=1;dcopt=ist;ord=' + ord + '?" type="text/javascript"><\/script>');
+	</script>
+	<noscript><a
+		href="http://n4061ad.doubleclick.net/jump/_default;sz=399x299;ord=123456789?" target="_blank"><img
+		src="http://n4061ad.doubleclick.net/ad/_default;sz=399x299;ord=123456789?" width="399" height="299" border="0" alt=""></a>
+	</noscript>
+
+			</div>
+
+
+	<!-- End ad tag -->
+
+	</div>
+
+		<div class="homepage-content-block">
+			<div class="contentBox">
+				<div>
+					<div class="floatR"><span class="smallText"><b><a href="/signup">Sign Up</a> | <a href="http://help.youtube.com/support/youtube/bin/topic.py?topic=10546&amp;hl=en_US">Help</a></b></div>
+					<div class="floatL">
+						<span class="headerTitle homepage-block-heading-gray"> Login </span>
+					</div>
+					<div class="clear"></div>
+				</div>
+
+				<form method="post" name="loginForm" id="loginForm" action="signup">
+				<input type="hidden" name="action_login" value="1">
+				<table width="270">
+					<tr>
+						<td align="right"><label for="homeUsername"><span class="smallText"><b>Username:</b></span></label></td>
+						<td align="left"><input id="homeUsername" tabindex="101" class="smallText" type="text" size="16" name="username" value=""></td>
+					</tr>
+					<tr>
+						<td align="right"><label for="homePassword"><span class="smallText"><b>Password:</b></span></label></td>
+						<td align="left"><input id="homePassword" tabindex="102" class="smallText" type="password" size="16" name="password">
+					</tr>
+					<tr>
+						<td></td>
+						<td align="left">
+							<span><input type="submit" class="smallText" value="Login"></span>	
+						</td>
+					</tr>
+				</table>
+				</form>
+				<div class="padT10 smallText">
+					<p align="center" class="marT0 marB0"><a href="/forgot_username?next=/">Forgot Username</a> | <a href="/forgot?next=/">Forgot Password</a></p>
+				</div>
+				<div class="homepage-border-dotted"></div>
+				<div class="alignC"><span class="smallText"><b><a href="
+https://www.google.com/accounts/ServiceLogin?service=youtube&hl=en_US&continue=http%3A//www.youtube.com/signup%3Fhl%3Den_US&passive=true">Login with your Google account</a>&nbsp; <a href="#" onClick="window.open('/t/help_gaia','login_help','width=580,height=480,resizable=yes,scrollbars=yes,status=0').focus();" rel="nofollow"><img src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" border="0" class="alignMid gaiaHelpBtn" alt=""></a></b></span></div>
+			</div>
+		</div> <!-- end homepage-content-block -->
+
+
+	<div class="homepage-content-block padT10">
+		
+
+
+
+	<!-- Begin ad tag -->
+
+
+	
+	<script type="text/javascript">
+		ord=Math.random()*10000000000000000 + 6;
+		if (false) {
+			ord = 1234567890;
+		}
+		document.write('<script language="JavaScript" src="http://n4061ad.doubleclick.net/adj/com.ythome/promo1;sz=300x50;kl=N;kga=-1;kgg=-1;tile=2;ord=' + ord + '?" type="text/javascript"><\/script>');
+	</script>
+	<noscript><a
+		href="http://n4061ad.doubleclick.net/jump/promo1;sz=300x50;ord=123456789?" target="_blank"><img
+		src="http://n4061ad.doubleclick.net/ad/promo1;sz=300x50;ord=123456789?" width="300" height="50" border="0" alt=""></a>
+	</noscript>
+
+
+	<!-- End ad tag -->
+
+	</div>
+
+	<div class="homepage-content-block padT10">
+		
+
+
+
+	<!-- Begin ad tag -->
+
+
+	
+	<script type="text/javascript">
+		ord=Math.random()*10000000000000000 + 6;
+		if (false) {
+			ord = 1234567890;
+		}
+		document.write('<script language="JavaScript" src="http://n4061ad.doubleclick.net/adj/com.ythome/promo3;sz=300x50;kl=N;kga=-1;kgg=-1;tile=4;ord=' + ord + '?" type="text/javascript"><\/script>');
+	</script>
+	<noscript><a
+		href="http://n4061ad.doubleclick.net/jump/promo3;sz=300x50;ord=123456789?" target="_blank"><img
+		src="http://n4061ad.doubleclick.net/ad/promo3;sz=300x50;ord=123456789?" width="300" height="50" border="0" alt=""></a>
+	</noscript>
+
+
+	<!-- End ad tag -->
+
+	</div>
+
+	<div class="homepage-side-block padT10">
+	<div class="homepage-yellow-block">
+		<div class="homepage-block-heading" style="color:#CC6600">What's New</div>
+
+		<div class="homepage-whatsnew-entry">
+			<div class="homepage-whatsnew-image"><a href="/t/annotations_about"><img src="http://s.ytimg.com/yt/img/whats_new/annotation-vfl42087.gif" border="0" width="30" height="37"/></a></div>
+			<div class="homepage-whatsnew-desc">
+				<b><a href="/t/annotations_about">Video Annotations</a></b><br/>Add interactive commentary and links to your videos
+			</div>
+		</div><div class="clear"></div>
+
+		<div class="homepage-whatsnew-entry">
+			<div class="homepage-whatsnew-image"><a href="/address_book"><img src="http://s.ytimg.com/yt/img/whats_new/addybook-vfl39351.gif" border="0" width="30" height="37"/></a></div>
+			<div class="homepage-whatsnew-desc">
+				<b><a href="/address_book">New Address Book</a></b><br/>Organizing your YouTube friends and contacts just got a lot simpler
+			</div>
+		</div><div class="clear"></div>
+
+		<div class="homepage-whatsnew-entry">
+			<div class="homepage-whatsnew-image"><a href="/inbox"><img src="http://s.ytimg.com/yt/img/whats_new/inbox-vfl39351.gif" border="0" width="30" height="37"/></a></div>
+			<div class="homepage-whatsnew-desc">
+				<b><a href="/inbox">Updated Inbox</a></b><br/>Manage your messages and invites with ease
+			</div>
+		</div><div class="clear"></div>
+
+		
+		<div class="homepage-whatsnew-entry">
+			<div class="homepage-whatsnew-image"><a href="/mobile"><img src="http://s.ytimg.com/yt/img/whats_new/pic_home_mobile_30x37-vfl37458.gif" border="0" width="30" height="37"/></a></div>
+			<div class="homepage-whatsnew-desc">
+				<b><a href="/mobile">YouTube Mobile</a></b><br/> Watch and upload YouTube videos on your mobile device.
+			</div>
+		</div><div class="clear"></div>
+
+				<div class="bottomBorderDotted"></div>
+				<b><a href="/blog" style="color:#CC6600">Hear Ye, Hear Ye: Calling all Reporters</a></b><br>
+				Today we announce the launch of a new type of YouTube account: the Reporter.  Reporter channels are just like the other YouTube channel types, but are specifically intended for citizens and profess...
+			<div class="alignR padT5">
+				<a href="/blog" style="color:#CC6600">Read more in our Blog</a>
+			</div>
+		<div style="font-size: 1px; height: 1px;"><br/></div>
+	</div><img class="homepage-yellow-block-bot" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" />
+</div> 
+
+
+		<div class="homepage-side-block">
+		
+
+
+
+	<!-- Begin ad tag -->
+
+
+	
+	<script type="text/javascript">
+		ord=Math.random()*10000000000000000 + 6;
+		if (false) {
+			ord = 1234567890;
+		}
+		document.write('<script language="JavaScript" src="http://n4061ad.doubleclick.net/adj/com.ythome/promo2;sz=300x50;kl=N;kga=-1;kgg=-1;tile=3;ord=' + ord + '?" type="text/javascript"><\/script>');
+	</script>
+	<noscript><a
+		href="http://n4061ad.doubleclick.net/jump/promo2;sz=300x50;ord=123456789?" target="_blank"><img
+		src="http://n4061ad.doubleclick.net/ad/promo2;sz=300x50;ord=123456789?" width="300" height="50" border="0" alt=""></a>
+	</noscript>
+
+
+	<!-- End ad tag -->
+
+		</div>
+
+
+</div> <!-- end homepage-side-content -->
+
+<div class="clear"></div>
+
+
+
+		<div class="clear"></div>
+	<div id="footer">
+		<div class="search">
+			<div class="promo">
+				<a href="/youchoose" onclick="_hbLink('FooterPromo','Footer');"><img id="debates_footer_img" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" alt="footer-promo" /></a>
+				<a href="/youchoose" onclick="_hbLink('FooterPromo','Footer');">Face The Candidates</a>
+			</div>
+			<form autocomplete="off" name="footer-search-form" method="get" action="/results" style="width: 73.5%;">
+					<a href="http://www.google.com/webmasters/igoogle/youtube.html"><img id="igoogle_footer_img" src="http://s.ytimg.com/yt/img/pixel-vfl73.gif" alt=""/> <em id="igoogle_footer_text">Add to iGoogle</em></a>
+				<input  type="text" name="search_query" maxlength="128" class="query" onkeyup="goog.i18n.bidi.setDirAttribute(event,this)" value="" id="footer-search-term">
+				<select class="search-type" name="search_type">
+					<option value="">Videos</option>
+					<option value="search_users" >Channels</option>
+				</select>
+				<input type="submit" name="search" value="Search" class="submit-button">
+			</form>
+		</div>
+		<div class="links">
+			<table cellpadding="0" cellspacing="0">
+				<tr>
+					<th colspan="2">Your Account</th>
+					<th class="separator" colspan="2">Help &amp; Info</th>
+					<th class="separator" colspan="2">YouTube</th>
+				</tr>
+				<tr>
+					<td><a href="/my_videos">Videos</a></td>
+					<td><a href="/inbox">Inbox</a></td>
+					<td class="separator"><a href="http://help.youtube.com/support/youtube/bin/static.py?page=start.cs&amp;hl=en_US">Help Resources</a></td>
+					<td><a href="/t/safety">Safety Tips</a></td>
+					<td class="separator"><a href="/t/about">Company Info</a></td>
+					<td><a href="/press_room">Press</a></td>
+				</tr>
+				<tr>
+					<td><a href="/my_favorites">Favorites</a></td>
+					<td><a href="/subscription_center">Subscriptions</a></td>
+					<td class="separator"><a href="/t/video_toolbox">Video Toolbox</a></td>
+					<td><a href="/t/dmca_policy">Copyright Notices</a></td>
+					<td class="separator"><a href="/testtube">TestTube</a></td>
+					<td><a href="/t/contact_us">Contact</a></td>
+				</tr>
+				<tr>
+					<td><a href="/my_playlists">Playlists</a></td>
+					<td><a href="/my_account">more...</a></td>
+					<td class="separator"><a href="/dev">Developer APIs</a></td>
+					<td><a href="/t/community_guidelines">Community Guidelines</a></td>
+					<td class="separator"><a href="/t/terms">Terms of Use</a></td>
+					<td>
+						<a href="/blog">Blog</a>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2">&nbsp;</td>
+						<td class="separator"><a href="/advertise">Advertising</a></td>
+						<td><a href="/youtubeonyoursite">YouTube On Your Site</a></td>
+					<td class="separator"><a href="/t/privacy">Privacy Policy</a></td>
+					<td>
+						<a href="http://www.google.com/jobs/youtube">Jobs</a><br/>
+					</td>
+				</tr>
+
+
+
+							</table>
+		</div>
+	</div>
+	<div id="copyright">
+		&copy; 2008 YouTube, LLC
+	</div>
+
+
+</div> <!-- end baseDiv -->
+
+</body>
+<script type="text/javascript">
+	window.setTimeout('window.google.ac.install(document.searchForm,document.searchForm.search_query,"yt",true,"close",true,"Suggestions")',100);
+</script>
+
+
+
+</html>
\ No newline at end of file
diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/xml/rsslisting/rsslisting.pro
index 95a23e9ff2..c0a1ad33ed 100644
--- a/examples/xml/rsslisting/rsslisting.pro
+++ b/examples/xml/rsslisting/rsslisting.pro
@@ -8,3 +8,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS rsslisting.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/rsslisting
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
diff --git a/examples/xml/saxbookmarks/main.cpp b/examples/xml/saxbookmarks/main.cpp
index b7cafd4fda..dcae1a57ac 100644
--- a/examples/xml/saxbookmarks/main.cpp
+++ b/examples/xml/saxbookmarks/main.cpp
@@ -47,7 +47,11 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     MainWindow mainWin;
+#if defined(Q_OS_SYMBIAN)
+    mainWin.showFullScreen();
+#else
     mainWin.show();
+#endif
     mainWin.open();
     return app.exec();
 }
diff --git a/examples/xml/saxbookmarks/mainwindow.cpp b/examples/xml/saxbookmarks/mainwindow.cpp
index 241fde2a39..6876cac79b 100644
--- a/examples/xml/saxbookmarks/mainwindow.cpp
+++ b/examples/xml/saxbookmarks/mainwindow.cpp
@@ -66,6 +66,9 @@ MainWindow::MainWindow()
 
 void MainWindow::open()
 {
+#if defined(Q_OS_SYMBIAN)
+    QDir::setCurrent("/Data/qt/saxbookmarks");
+#endif
     QString fileName =
             QFileDialog::getOpenFileName(this, tr("Open Bookmark File"),
                                          QDir::currentPath(),
diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro
index d0eec444b2..3556c117ef 100644
--- a/examples/xml/saxbookmarks/saxbookmarks.pro
+++ b/examples/xml/saxbookmarks/saxbookmarks.pro
@@ -13,8 +13,17 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS saxbookmarks.pro *.xbel
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks
 INSTALLS += target sources
 
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
 wince*: {
      addFiles.sources = frank.xbel jennifer.xbel
      addFiles.path = \My Documents
      DEPLOYMENT += addFiles
 }
+
+symbian: {
+     TARGET.UID3 = 0xA000C60A
+     addFiles.sources = frank.xbel jennifer.xbel
+     addFiles.path = /data/qt/saxbookmarks
+     DEPLOYMENT += addFiles
+}
\ No newline at end of file
diff --git a/examples/xml/streambookmarks/streambookmarks.pro b/examples/xml/streambookmarks/streambookmarks.pro
index e66b95aa4d..f16a02ebaf 100644
--- a/examples/xml/streambookmarks/streambookmarks.pro
+++ b/examples/xml/streambookmarks/streambookmarks.pro
@@ -12,3 +12,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/xml/streambookmarks
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS streambookmarks.pro *.xbel
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/streambookmarks
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/xml/xml.pro b/examples/xml/xml.pro
index 866b0cc800..2b6415c0cf 100644
--- a/examples/xml/xml.pro
+++ b/examples/xml/xml.pro
@@ -1,12 +1,17 @@
 TEMPLATE      = subdirs
 SUBDIRS       = dombookmarks \
+                htmlinfo \
                 rsslisting \
                 saxbookmarks \
                 streambookmarks \
                 xmlstreamlint
 
+symbian: SUBDIRS = htmlinfo saxbookmarks
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/xml
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xml.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/xml/xmlstreamlint/xmlstreamlint.pro b/examples/xml/xmlstreamlint/xmlstreamlint.pro
index 7034e7bbbb..4f97387dfc 100644
--- a/examples/xml/xmlstreamlint/xmlstreamlint.pro
+++ b/examples/xml/xmlstreamlint/xmlstreamlint.pro
@@ -8,3 +8,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/xml/xmlstreamlint
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xmlstreamlint.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/xmlstreamlint
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/xmlpatterns/filetree/filetree.pro b/examples/xmlpatterns/filetree/filetree.pro
index 469ee8d45b..e30f2cf117 100644
--- a/examples/xmlpatterns/filetree/filetree.pro
+++ b/examples/xmlpatterns/filetree/filetree.pro
@@ -11,3 +11,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/filetree
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xq *.html
 sources.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/filetree
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/xmlpatterns/recipes/recipes.pro b/examples/xmlpatterns/recipes/recipes.pro
index 87708a99f3..cee7b6d730 100644
--- a/examples/xmlpatterns/recipes/recipes.pro
+++ b/examples/xmlpatterns/recipes/recipes.pro
@@ -9,3 +9,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/recipes
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xq *.html forms files
 sources.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/recipes
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/xmlpatterns/xmlpatterns.pro b/examples/xmlpatterns/xmlpatterns.pro
index 3ff3e35af9..d5b349843d 100644
--- a/examples/xmlpatterns/xmlpatterns.pro
+++ b/examples/xmlpatterns/xmlpatterns.pro
@@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xmlpatterns.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro b/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro
index 8ca900b149..0016c41f33 100644
--- a/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro
+++ b/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro
@@ -7,3 +7,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/xquery/globalVariables
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.cpp *.pro *.xq *.html globals.gccxml
 sources.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/xquery/globalVariables
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/xmlpatterns/xquery/xquery.pro b/examples/xmlpatterns/xquery/xquery.pro
index f7ac5efe92..2a911889cf 100644
--- a/examples/xmlpatterns/xquery/xquery.pro
+++ b/examples/xmlpatterns/xquery/xquery.pro
@@ -6,3 +6,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/xquery
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xquery.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/xquery
 INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/mkspecs/common/symbian/fixed_stdlib.h b/mkspecs/common/symbian/fixed_stdlib.h
new file mode 100644
index 0000000000..7fd73d649b
--- /dev/null
+++ b/mkspecs/common/symbian/fixed_stdlib.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FIXED_STDLIB_H
+#define FIXED_STDLIB_H
+
+// This hack fixes defect in Symbian stdlib.h. The original file
+// does not work correctly when intermixing C and C++ (STL). Remove the hack
+// when Open C / C++ team has fixed the defect.
+
+// If _WCHAR_T_DECLARED is defined, undef it and store information that we
+// need to revert the _WCHAR_T_DECLARED define after include
+#   ifdef _WCHAR_T_DECLARED
+#       define REVERT_WCHAR_T_DECLARED
+#       undef _WCHAR_T_DECLARED
+#   endif //_WCHAR_T_DECLARED
+
+#include <stdlib.h>
+
+// Revert _WCHAR_T_DECLARED if necessary
+#   ifdef REVERT_WCHAR_T_DECLARED
+#       define _WCHAR_T_DECLARED
+#       undef REVERT_WCHAR_T_DECLARED
+#   endif //REVERT_WCHAR_T_DECLARED
+
+#endif
\ No newline at end of file
diff --git a/mkspecs/common/symbian/qplatformdefs.h b/mkspecs/common/symbian/qplatformdefs.h
new file mode 100644
index 0000000000..ebcd295740
--- /dev/null
+++ b/mkspecs/common/symbian/qplatformdefs.h
@@ -0,0 +1,166 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+//#include <features.h>
+#include <pthread.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+//#include <signal.h>
+#include <dlfcn.h>
+#include <sys/select.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
+#include <arpa/inet.h>
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_STATBUF              struct stat64
+#define QT_STATBUF4TSTAT        struct stat64
+#define QT_STAT                 ::stat64
+#define QT_FSTAT                ::fstat64
+#define QT_LSTAT                ::lstat64
+#define QT_OPEN                 ::open64
+#define QT_TRUNCATE             ::truncate64
+#define QT_FTRUNCATE            ::ftruncate64
+#define QT_LSEEK                ::lseek64
+#else
+#define QT_STATBUF              struct stat
+#define QT_STATBUF4TSTAT        struct stat
+#define QT_STAT                 ::stat
+#define QT_FSTAT                ::fstat
+#define QT_LSTAT                ::lstat
+#define QT_OPEN                 ::open
+#define QT_TRUNCATE             ::truncate
+#define QT_FTRUNCATE            ::ftruncate
+#define QT_LSEEK                ::lseek
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_FOPEN                ::fopen64
+#define QT_FSEEK                ::fseeko64
+#define QT_FTELL                ::ftello64
+#define QT_FGETPOS              ::fgetpos64
+#define QT_FSETPOS              ::fsetpos64
+#define QT_FPOS_T               fpos64_t
+#define QT_OFF_T                off64_t
+#else
+#define QT_FOPEN                ::fopen
+#define QT_FSEEK                ::fseek
+#define QT_FTELL                ::ftell
+#define QT_FGETPOS              ::fgetpos
+#define QT_FSETPOS              ::fsetpos
+#define QT_FPOS_T               fpos_t
+#define QT_OFF_T                long
+#endif
+
+#define QT_STAT_REG		S_IFREG
+#define QT_STAT_DIR		S_IFDIR
+#define QT_STAT_MASK		S_IFMT
+#define QT_STAT_LNK		S_IFLNK
+#define QT_SOCKET_CONNECT	::connect
+#define QT_SOCKET_BIND		::bind
+#define QT_FILENO		fileno
+#define QT_CLOSE		::close
+#define QT_READ			::read
+#define QT_WRITE		::write
+#define QT_ACCESS		::access
+#define QT_GETCWD		::getcwd
+#define QT_CHDIR		::chdir
+#define QT_MKDIR		::mkdir
+#define QT_RMDIR		::rmdir
+#define QT_OPEN_RDONLY		O_RDONLY
+#define QT_OPEN_WRONLY		O_WRONLY
+#define QT_OPEN_RDWR		O_RDWR
+#define QT_OPEN_CREAT		O_CREAT
+#define QT_OPEN_TRUNC		O_TRUNC
+#define QT_OPEN_APPEND		O_APPEND
+
+#define QT_SIGNAL_RETTYPE	void
+#define QT_SIGNAL_ARGS		int
+#define QT_SIGNAL_IGNORE	SIG_IGN
+
+#if (defined(__GLIBC__) && (__GLIBC__ >= 2)) || defined(Q_OS_SYMBIAN)
+#define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
+
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#define QT_SNPRINTF		::snprintf
+#define QT_VSNPRINTF		::vsnprintf
+#endif
+
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/common/symbian/stl-off/new b/mkspecs/common/symbian/stl-off/new
new file mode 100644
index 0000000000..3939e1116f
--- /dev/null
+++ b/mkspecs/common/symbian/stl-off/new
@@ -0,0 +1,5 @@
+// new implemented in symbian libs, do nothing here, just keep Qt happpy
+#ifndef __NEW_SYMB_ADDON
+#define __NEW_SYMB_ADDON
+#include <e32base.h>
+#endif //__NEW_SYMB_ADDON 
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
new file mode 100644
index 0000000000..4f3e1d267a
--- /dev/null
+++ b/mkspecs/common/symbian/symbian.conf
@@ -0,0 +1,138 @@
+#
+# qmake configuration for symbian-*
+#
+
+TEMPLATE		= app
+CONFIG			+= qt warn_on release incremental
+QT			+= core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+DEFINES			+= UNICODE QT_KEYPAD_NAVIGATION
+QMAKE_COMPILER_DEFINES  += SYMBIAN
+
+QMAKE_EXT_OBJ           = .o
+QMAKE_EXT_RES           = _res.o
+
+QMAKE_CC		= gcc
+QMAKE_LEX		= flex
+QMAKE_LEXFLAGS		=
+QMAKE_YACC		= byacc
+QMAKE_YACCFLAGS		= -d
+QMAKE_CFLAGS		=
+QMAKE_CFLAGS_DEPS	=
+QMAKE_CFLAGS_WARN_ON	=
+QMAKE_CFLAGS_WARN_OFF	=
+QMAKE_CFLAGS_RELEASE	=
+QMAKE_CFLAGS_DEBUG	=
+QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+
+QMAKE_CXX		= g++
+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS.CW	= 
+QMAKE_CXXFLAGS.ARMCC	= --no_hide_all
+QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+QMAKE_CXXFLAGS_RTTI_ON	=
+QMAKE_CXXFLAGS_RTTI_OFF	=
+QMAKE_CXXFLAGS_EXCEPTIONS_ON =
+QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
+
+QMAKE_INCDIR		=
+QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+
+QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
+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_LINK		= g++
+QMAKE_LFLAGS		= -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
+QMAKE_LFLAGS_EXCEPTIONS_OFF =
+QMAKE_LFLAGS_RELEASE	= -Wl,-s
+QMAKE_LFLAGS_DEBUG	=
+QMAKE_LFLAGS_CONSOLE	= -Wl,-subsystem,console
+QMAKE_LFLAGS_WINDOWS	= -Wl,-subsystem,windows
+QMAKE_LFLAGS_DLL        = -shared
+QMAKE_LINK_OBJECT_MAX	= 10
+QMAKE_LINK_OBJECT_SCRIPT= object_script
+
+QMAKE_LIBS		= -llibc -llibm -leuser -llibdl
+QMAKE_LIBS_CORE         = $$QMAKE_LIBS -llibpthread -lefsrv
+QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio
+QMAKE_LIBS_NETWORK      = 
+QMAKE_LIBS_EGL          = -llibEGL
+QMAKE_LIBS_OPENGL       = 
+QMAKE_LIBS_OPENVG       = -llibOpenVG
+QMAKE_LIBS_COMPAT       = 
+QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
+QMAKE_LIBS_S60          = -lavkon -leikcoctl
+
+!isEmpty(QMAKE_SH) {
+    QMAKE_COPY           = cp
+    QMAKE_COPY_DIR       = cp -r
+    QMAKE_MOVE           = mv
+    QMAKE_DEL_FILE       = rm
+    QMAKE_MKDIR          = mkdir
+    QMAKE_DEL_DIR        = rmdir
+    QMAKE_CHK_DIR_EXISTS = test -d
+} else {
+    QMAKE_COPY           = copy /y
+    QMAKE_COPY_DIR       = xcopy /s /q /y /i
+    QMAKE_MOVE           = move
+    QMAKE_DEL_FILE       = del
+    QMAKE_MKDIR          = mkdir
+    QMAKE_DEL_DIR        = rmdir
+    QMAKE_CHK_DIR_EXISTS = if not exist
+}
+
+QMAKE_MOC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
+QMAKE_UIC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
+QMAKE_IDC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
+
+QMAKE_IDL		= midl
+QMAKE_LIB		= ar -ru
+QMAKE_RC		= windres
+QMAKE_ZIP		= zip -r -9
+
+QMAKE_STRIP		= strip
+QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+
+load(qt_config)
+load(platform_paths)
+
+MMP_RULES += EXPORTUNFROZEN PAGED
+SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6
+
+# Legacy support requires some hardcoded stdapis paths. 
+INCLUDEPATH = \
+    $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off \
+    $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian \
+    $${EPOCROOT}epoc32/include \
+    $$OS_LAYER_LIBC_SYSTEMINCLUDE \
+    $$INCLUDEPATH
+    
+# Supports S60 3.0, 3.1, 3.2 and 5.0 by default
+default_deployment.depends = \
+    "[0x101F7961],0,0,0,{\"S60ProductID\"}" \
+    "[0x102032BE],0,0,0,{\"S60ProductID\"}" \
+    "[0x102752AE],0,0,0,{\"S60ProductID\"}" \
+    "[0x1028315F],0,0,0,{\"S60ProductID\"}"
+
+DEPLOYMENT += default_deployment
+
+exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v5.0.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v5.0.sis) {
+    S60_VERSION = 5.0
+} else {
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v3.2.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v3.2.sis) {
+        S60_VERSION = 3.2
+    } else {
+        S60_VERSION = 3.1
+        MMP_RULES -= PAGED
+    }
+}
diff --git a/mkspecs/features/debug_and_release.prf b/mkspecs/features/debug_and_release.prf
index 8b8932184f..19031ef952 100644
--- a/mkspecs/features/debug_and_release.prf
+++ b/mkspecs/features/debug_and_release.prf
@@ -1 +1 @@
-!macx-xcode:addExclusiveBuilds(debug, Debug, release, Release)
+!macx-xcode:!symbian-abld:addExclusiveBuilds(debug, Debug, release, Release)
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index c5af2982a7..42ce1bc173 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -1,7 +1,7 @@
 
 #global defaults
 isEmpty(QMAKE_MOC) {
-    win32:QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe
+    contains(QMAKE_HOST.os,Windows):QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe
     else:QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
 }
 isEmpty(MOC_DIR):MOC_DIR = .
@@ -85,7 +85,7 @@ INCREDIBUILD_XGE += moc_source
 
 #make sure we can include these files
 moc_dir_short = $$MOC_DIR
-win32:moc_dir_short ~= s,^.:,/,
+contains(QMAKE_HOST.os,Windows):moc_dir_short ~= s,^.:,/,
 contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR
 else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR
 
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 1bac953fa9..f5b38c5b03 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -118,6 +118,14 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
 
             DEPLOYMENT *= qt_additional_plugin_$${QTPLUG}
         }
+        isEqual(QT_CURRENT_VERIFY, DEPLOYMENT_PLUGIN):shared:symbian: {
+            QT_ITEM = $${QTPLUG}.dll
+
+            eval(qt_additional_plugin_$${QTPLUG}.sources = $${QT_ITEM})
+            eval(qt_additional_plugin_$${QTPLUG}.path = $${QT_PLUGINPATH})
+
+            DEPLOYMENT *= qt_additional_plugin_$${QTPLUG}
+        }
     }
 }
 #specific module settings
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
index e9d79b024d..ae58c5d637 100644
--- a/mkspecs/features/qttest_p4.prf
+++ b/mkspecs/features/qttest_p4.prf
@@ -3,6 +3,14 @@ CONFIG += qt warn_on console depend_includepath
 
 qtAddLibrary(QtTest)
 
+symbian:{
+# qt.prf sets TARGET.EPOCSTACKSIZE and TARGET.EPOCHEAPSIZE
+#    DEFINES += QTEST_NO_SPECIALIZATIONS
+    TARGET.UID3 = $$generate_test_uid($$TARGET)
+    TARGET.CAPABILITY="ALL -TCB"
+    RSS_RULES ="group_name=\"QtTests\";" 
+}
+
 # prefix test binary with tst_
 !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
 
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
new file mode 100644
index 0000000000..df4bb1cca1
--- /dev/null
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -0,0 +1,39 @@
+load(data_caging_paths)
+
+# If no_icon keyword exist, the S60 UI app is just made hidden. This because S60 app FW
+# requires the registration resource file to exist always
+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
+    !isEmpty(ICON) {
+        
+        !count(ICON, $$size(TRANSLATIONS)):!count(ICON, 1) {
+            message("ICON keyword must have one or the same amout of items as in TRANSLATIONS keyword")
+        }
+
+        # MIF files will have UID in their names, if TARGET.UID3 is not set we need to generate it
+        isEmpty(TARGET.UID3):TARGET.UID3 = $$generate_test_uid($$TARGET)
+
+        # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
+        symbian-abld {        
+            #Makefile: requires paths with backslash    
+            ICON = $$replace( ICON, /, \\)
+
+            # Extra compiler rules for mifconv
+            mifconv.output = ${ZDIR}$$APP_RESOURCE_DIR/$${TARGET.UID3}.mif
+            # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library
+            # svg-t icons should always use /c32 depth
+            mifconv.commands = mifconv ${QMAKE_FILE_OUT} $$join(ICON, " /c32 ", "/c32 ",) 
+            mifconv.input = ICON
+            mifconv.CONFIG = no_link combine
+            # target_predeps together with combine seems not to work correctly, lets define it by ourselves
+            PRE_TARGETDEPS += $$mifconv.output
+            QMAKE_EXTRA_COMPILERS += mifconv
+        } 
+        # Rules to use generated MIF file from symbian resources
+        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/armcc_warnings.prf b/mkspecs/features/symbian/armcc_warnings.prf
new file mode 100644
index 0000000000..95b3bc0869
--- /dev/null
+++ b/mkspecs/features/symbian/armcc_warnings.prf
@@ -0,0 +1,10 @@
+# 111:  Statement is unreachable
+# 185:  Dynamic initialization in unreachable code
+# 191:  Type qualifier is meaningless on cast type
+# 368:  class "<class>" defines no constructor to initialize the following: <member>
+#       (Disabled because there are other ways of assigning besides constructors)
+# 1293: Assignment in condition
+# 1294: pre-ANSI C style functions declarations (used a lot in 3rd party code)
+# 2874: <variable> may be used before being set (this one sounds useful, but
+#       it's output also for class instances, making it useless in practice)
+QMAKE_CFLAGS.ARMCC += --diag_suppress 111,185,191,368,1293,1294,2874
diff --git a/mkspecs/features/symbian/data_caging_paths.prf b/mkspecs/features/symbian/data_caging_paths.prf
new file mode 100644
index 0000000000..3ed566134f
--- /dev/null
+++ b/mkspecs/features/symbian/data_caging_paths.prf
@@ -0,0 +1,80 @@
+#
+# ==============================================================================
+#  Name        : data_caging_paths.prf
+#  Part of     : 
+#  Interface   : Data Caging Path Definitions API for Qt/S60
+#  Description : Predefined include paths to be used in the pro-files for the 
+#                paths related to data caging.
+#
+# Usage examples:
+#
+#     # Load these definitions on pro-file if needed:
+#     load(data_caging_paths)
+#    
+#     # These variables are mostly useful when specifying deployment
+#
+#     myLib.sources = myLib.dll
+#     myLib.path = $$SHARED_LIB_DIR
+#     DEPLOYMENT += myLib
+#
+#     # Note: Do not use $$PLUGINS_DIR or $$PLUGINS_1_DIR to deploy Qt plugins.
+#     # $$QT_PUBLIC_PLUGINS_BASE specifies the public base directory for Qt
+#     # plugin stubs:
+#
+#     myPublicImageFormatPlugin.sources = myImageFormat.dll
+#     myPublicImageFormatPlugin.path = $$QT_PLUGINS_BASE_DIR/imageformats
+#     DEPLOYMENT += myPublicImageFormatPlugin
+#
+# ==============================================================================
+
+exists($${EPOCROOT}epoc32/include/data_caging_paths.prf) {
+    
+    # Load platform specific paths
+    load($${EPOCROOT}epoc32/include/data_caging_paths.prf)
+
+} else {                      
+    # No platform specific paths provided, use default paths
+
+    APPARC_RECOGNISER_RESOURCES_DIR  = /resource/apps/registrationresourcefiles
+    APP_BITMAP_DIR                   = /resource/apps
+    APP_RESOURCE_DIR                 = /resource/apps
+    BITMAP_DIR                       = /resource/apps
+    BIOFILE_DIR                      = /resource/messaging/bif
+    CHARCONV_PLUGIN_DIR              = /resource/charconv
+    CONTACTS_RESOURCE_DIR            = /resource/cntmodel
+    CTRL_PANEL_RESOURCE_DIR          = /resource/controls
+    CONVERTER_PLUGIN_RESOURCE_DIR    = /resource/convert
+    ECOM_RESOURCE_DIR                = /resource/plugins
+    ERROR_RESOURCE_DIR               = /resource/errors
+    PROGRAMS_DIR                     = /sys/bin
+    FEP_RESOURCES_DIR                = /resource/fep
+    HELP_FILE_DIR                    = /resource/help
+    LOG_ENGINE_RESOURCE_DIR          = /resource/logengine
+    MTM_RESOURCE_DIR                 = /resource/messaging
+    MTM_INFO_FILE_DIR                = /resource/messaging/mtm
+    PRINTER_DRIVER_DIR               = /resource/printers
+    SHARED_LIB_DIR                   = /sys/bin
+    UIKLAF_RESOURCE_DIR              = /resource/uiklaf
+    WAPPUSH_PLUGIN_RESOURCE_DIR      = /resource/messaging/wappush
+    WATCHER_PLUGIN_RESOURCE_DIR      = /resource/messaging/watchers
+    RECOGNISERS_DIR                  = /sys/bin
+    PARSERS_DIR                      = /sys/bin
+    NOTIFIERS_DIR                    = /sys/bin
+    PLUGINS_DIR                      = /sys/bin
+    PLUGINS_1_DIR                    = /sys/bin
+    RESOURCE_FILES_DIR               = /resource
+
+    CA_CERTIFICATES_DIR     = /private/101f72a6
+    COMMDB_DIR              = /private/100012a5
+    SS_CONFIG_FILE_DIR      = /private/101f7989/esock
+    TRUSTED_FONTS_DIR       = /private/10003a16/fonts
+    UNTRUSTED_FONT_DIR      = /private/10003a16/import/fonts
+    WINDOW_SERVER_INI_DIR   = /private/10003b20
+    SKINS_DIR               = /private/10207114
+    BOOTDATA_DIR            = /resource/bootdata
+}
+
+isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt/plugins
+isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z
+isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps
+isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps
\ No newline at end of file
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
new file mode 100644
index 0000000000..3c2944cadb
--- /dev/null
+++ b/mkspecs/features/symbian/default_post.prf
@@ -0,0 +1,31 @@
+load(default_post)
+
+contains(TEMPLATE, ".*app") {
+    contains(CONFIG, stdbinary) {
+        QMAKE_LIBS +=
+    } else:contains(QT, gui):contains(CONFIG,qt) {
+        S60MAIN_LIBS = -leuser -lavkon -leikcore -leiksrv -lws32 -lapparc -lcone -leikcoctl -lbafl -lefsrv
+        QMAKE_LIBS += -lqtmain.lib $$S60MAIN_LIBS
+    } else {
+        QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
+    }
+}
+contains(TEMPLATE, lib): {
+    contains(CONFIG, staticlib)|contains(CONFIG, static): {
+        # Static libs should not have LIBRARY statements in S60
+        QMAKE_LIBS =
+        # Static libs do not need def files
+        MMP_RULES -= EXPORTUNFROZEN
+    }
+    contains(CONFIG, plugin):!contains(CONFIG, stdbinary): {
+        # Plugins based on normal libraries have predefined def file
+        MMP_RULES -= EXPORTUNFROZEN
+    }
+} else {
+    # Applications don't need this
+    MMP_RULES -= EXPORTUNFROZEN
+}
+
+contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG,qt) {
+    load(application_icon.prf)
+}
\ No newline at end of file
diff --git a/mkspecs/features/symbian/default_pre.prf b/mkspecs/features/symbian/default_pre.prf
new file mode 100644
index 0000000000..ddb23b3157
--- /dev/null
+++ b/mkspecs/features/symbian/default_pre.prf
@@ -0,0 +1,2 @@
+CONFIG = stl_off $$CONFIG
+load(default_pre)
diff --git a/mkspecs/features/symbian/epocallowdlldata.prf b/mkspecs/features/symbian/epocallowdlldata.prf
new file mode 100644
index 0000000000..b336f488fd
--- /dev/null
+++ b/mkspecs/features/symbian/epocallowdlldata.prf
@@ -0,0 +1 @@
+TARGET.EPOCALLOWDLLDATA=1
diff --git a/mkspecs/features/symbian/moc.prf b/mkspecs/features/symbian/moc.prf
new file mode 100644
index 0000000000..089dddce31
--- /dev/null
+++ b/mkspecs/features/symbian/moc.prf
@@ -0,0 +1,16 @@
+load(moc)
+
+RET = $$find(MOC_DIR, "\.[a-z]")
+!isEmpty(RET):{
+    error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile.")
+}
+
+RET = $$find(RCC_DIR, "\.[a-z]")
+!isEmpty(RET):{
+    error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile.")
+}
+
+RET = $$find(OBJECTS_DIR, "\.[a-z]")
+!isEmpty(RET):{
+    error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile.")
+}
diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf
new file mode 100644
index 0000000000..bec9811c4c
--- /dev/null
+++ b/mkspecs/features/symbian/platform_paths.prf
@@ -0,0 +1,480 @@
+#
+# ==============================================================================
+#  Name        : platform_paths.prf
+#  Part of     : 
+#  Interface   : Platform Path Definitions API for Qt/S60
+#  Description : Predefined include paths to be used in the pro-files for the 
+#                components in the layered model. There is one definition for
+#                each layer. The pro-file should use the statement that is 
+#                intended for the same layer as where the pro-file resides.
+#
+# Usage examples:
+#
+#     Note: this file gets automatically added to all Qt/S60 projects
+#    
+#     Variable usages to add the system include paths
+#       
+#       The include paths has to be related to the layer in which your SW 
+#       resides. Thus as an example: a component residing in middleware
+#       layer should use the MW specific macro.
+#
+#         INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+#         INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+#         INCLUDEPATH += $$OS_LAYER_SYSTEMINCLUDE
+#
+#       If there is a need to include public headers of some S60 component,
+#       various *_EXPORT_PATH macros can be utilized:
+#
+#         INCLUDEPATH += $$OS_LAYER_PUBLIC_EXPORT_PATH(somecomponent)
+#
+#     Variables related to using various parts of stdapis:
+#
+#       To use STLLIB you need to have this in your pro-file:
+#
+#         QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
+#         DEFINES *= $$STLLIB_USAGE_DEFINES
+#
+#       Depending on what module you are using from stdapis you need to have
+#       one or more of the following variables in your pro-file.
+#
+#         INCLUDEPATH += $$OS_LAYER_LIBC_SYSTEMINCLUDE
+#         INCLUDEPATH += $$OS_LAYER_GLIB_SYSTEMINCLUDE
+#         INCLUDEPATH += $$OS_LAYER_SSL_SYSTEMINCLUDE
+#         INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE
+#         INCLUDEPATH += $$OS_LAYER_BOOST_SYSTEMINCLUDE
+#         INCLUDEPATH += $$OS_LAYER_DBUS_SYSTEMINCLUDE
+#         INCLUDEPATH += $$OS_LAYER_LIBUTILITY_SYSTEMINCLUDE
+#
+#
+#       
+#
+# ==============================================================================
+
+exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
+    
+    # Load platform specific paths
+    load($${EPOCROOT}epoc32/include/platform_paths.prf)
+
+} else {  
+
+    # No platform specific paths provided, use default paths
+
+    exists($${EPOCROOT}epoc32/include/platform) { # New SF structure
+    
+        # ---------------------------------------
+        # Location, where the applications layer specific public headers are exported
+        # ---------------------------------------
+
+        defineReplace(APP_LAYER_SDK_EXPORT_PATH) {
+             return (/epoc32/include/app/$$1)
+        }
+        defineReplace(APP_LAYER_PUBLIC_EXPORT_PATH) {
+             return (/epoc32/include/app/$$1)
+        }
+
+        # ---------------------------------------
+        # Location, where the applications layer specific platform headers are exported
+        # ---------------------------------------
+
+        defineReplace(APP_LAYER_DOMAIN_EXPORT_PATH) {
+             return (/epoc32/include/platform/app/$$1)
+        }
+        defineReplace(APP_LAYER_PLATFORM_EXPORT_PATH) {
+             return (/epoc32/include/platform/app/$$1)
+        }
+
+        # ---------------------------------------
+        # Location, where the middleware layer specific public headers are exported
+        # ---------------------------------------
+
+        defineReplace(MW_LAYER_SDK_EXPORT_PATH) {
+             return (/epoc32/include/mw/$$1)
+        }
+        defineReplace(MW_LAYER_PUBLIC_EXPORT_PATH) {
+             return (/epoc32/include/mw/$$1)
+        }
+
+        # ---------------------------------------
+        # Location, where the middleware layer specific platform headers are exported
+        # ---------------------------------------
+
+        defineReplace(MW_LAYER_DOMAIN_EXPORT_PATH) {
+             return (/epoc32/include/platform/mw/$$1)
+        }
+        defineReplace(MW_LAYER_PLATFORM_EXPORT_PATH) {
+             return (/epoc32/include/platform/mw/$$1)
+        }
+
+        # ---------------------------------------
+        # Location, where the os layer specific public headers are exported
+        # ---------------------------------------
+
+        defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) {
+             return (/epoc32/include/$$1)
+        }
+        # WARNING: If the following path changes see the exists() function around line 219
+        defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) {
+             return (/epoc32/include/$$1)
+        }
+
+        # ---------------------------------------
+        # Location, where the os specific platform headers are exported
+        # ---------------------------------------
+
+        defineReplace(OSEXT_LAYER_DOMAIN_EXPORT_PATH) {
+             return (/epoc32/include/platform/$$1)
+        }
+        defineReplace(OS_LAYER_PLATFORM_EXPORT_PATH) {
+             return (/epoc32/include/platform/$$1)
+        }
+
+        # ---------------------------------------
+        #  General comments about the 3 define statements related to include paths:
+        #  1) the /epoc32/include/oem is now defined there for backward compability.
+        #     Once the directory is empty, the directory will be removed. However this 
+        #     enables us to ensure that if you use these define statements => you do 
+        #     not have to remove the statements later on, when the directory no longer 
+        #     exists.
+        #  2) These statements should be enough in normal cases. For certain specific 
+        #     cases you might need to add some specific directory from /epoc32/include
+        #     (for instance /epoc32/include/ecom).
+        #     In normal cases the include staments in code should be relative to one of 
+        #     the system include paths, but in certain cases, the included files requires
+        #     that the subdirectory is also part of the system include paths.
+        # ---------------------------------------
+
+        # This variable defines the include paths, which are intended to be 
+        # used in the pro-files that are part of the applications-layer. It includes all 
+        # the needed directories from the /epoc32/include, that are valid ones for the 
+        # application-layer components. 
+        #
+        # Applications layer is the last one in the list, since most likely the most of 
+        # the headers come from middleware or os-layer  => thus they are first.
+
+        APP_LAYER_SYSTEMINCLUDE = \
+         /epoc32/include \
+         /epoc32/include/mw \
+         /epoc32/include/platform/mw \
+         /epoc32/include/platform \
+         /epoc32/include/app \
+         /epoc32/include/platform/app \
+         /epoc32/include/platform/loc \
+         /epoc32/include/platform/mw/loc \
+         /epoc32/include/platform/app/loc \
+         /epoc32/include/platform/loc/sc \
+         /epoc32/include/platform/mw/loc/sc \
+         /epoc32/include/platform/app/loc/sc
+
+        # This define statements defines the include paths, which are intended to be
+        # used in the pro-files that are part of the middleware-layer. It includes all 
+        # the needed directories from the /epoc32/include, that are valid ones for the 
+        # middleware-layer components. 
+
+        MW_LAYER_SYSTEMINCLUDE = \
+         /epoc32/include \
+         /epoc32/include/mw \
+         /epoc32/include/platform/mw \
+         /epoc32/include/platform \
+         /epoc32/include/platform/loc \
+         /epoc32/include/platform/mw/loc \
+         /epoc32/include/platform/loc/sc \
+         /epoc32/include/platform/mw/loc/sc
+
+        # This define statements defines the include paths, which are intended to be
+        # used in the pro-files that are part of the  osextensions-layer. It includes all
+        # the needed directories from the /epoc32/include, that are valid ones for the
+        # os-layer components. 
+
+        OS_LAYER_SYSTEMINCLUDE = \
+         /epoc32/include \
+         /epoc32/include/platform \
+         /epoc32/include/platform/loc \
+         /epoc32/include/platform/loc/sc
+
+        # This define statements defines the include paths, which are intended to be
+        # used in the pro-files that are part of the os-layer. This is intended 
+        # to be only used by those components which need to use in their mmp-file either
+        # kern_ext.mmh or nkern_ext.mmh. Reason is that those
+        # 2 files already contain the /epoc32/include  as system include path.
+
+        OS_LAYER_KERNEL_SYSTEMINCLUDE = \
+         /epoc32/include/platform
+
+
+        # ---------------------------------------
+        # Definitions that also define the systeminclude paths for various
+        # part of stdapis. Append to INCLUDEPATH in pro-file.
+        # ---------------------------------------
+
+        OS_LAYER_LIBC_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis) \
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/sys)
+
+        OS_LAYER_GLIB_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0) \
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/glib) \
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/gObject)
+
+        OS_LAYER_SSL_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/openssl)
+
+        # stlportv5 is preferred over stlport as it has the throwing version of operator new
+        exists($${EPOCROOT}epoc32/include/stdapis/stlportv5) {
+            OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5)
+        } else {
+            OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlport)
+        }
+        
+        OS_LAYER_BOOST_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/boost)
+
+        OS_LAYER_DBUS_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0) \
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0/dbus)
+
+        OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility)
+
+        # ---------------------------------------
+        # Definitions to export IBY files to different folders where they will be taken 
+        # to ROM image
+        # ---------------------------------------
+              
+        defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/app/$$1)
+        }
+        defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/mw/$$1)
+        }
+        defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/os/$$1)
+        }
+        defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/os/$$1)
+        }
+        defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/$$1)
+        }
+        
+        # You need to define the following in pro-file, if you are using the stllib:
+        # QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
+        # DEFINES *= $$STLLIB_USAGE_DEFINES
+        STLLIB_USAGE_CW_FLAGS = "-wchar_t on"
+        STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED
+
+    } else { # Old pre-SF structure
+
+        # ---------------------------------------
+        # Location, where the applications layer specific public headers are exported
+        # ---------------------------------------
+
+        defineReplace(APP_LAYER_SDK_EXPORT_PATH) {
+             return (/epoc32/include/applications/$$1)
+        }
+        defineReplace(APP_LAYER_PUBLIC_EXPORT_PATH) {
+             return (/epoc32/include/applications/$$1)
+        }
+
+        # ---------------------------------------
+        # Location, where the applications layer specific platform headers are exported
+        # ---------------------------------------
+
+        defineReplace(APP_LAYER_DOMAIN_EXPORT_PATH) {
+             return (/epoc32/include/domain/applications/$$1)
+        }
+        defineReplace(APP_LAYER_PLATFORM_EXPORT_PATH) {
+             return (/epoc32/include/domain/applications/$$1)
+        }
+
+        # ---------------------------------------
+        # Location, where the middleware layer specific public headers are exported
+        # ---------------------------------------
+
+        defineReplace(MW_LAYER_SDK_EXPORT_PATH) {
+             return (/epoc32/include/middleware/$$1)
+        }
+        defineReplace(MW_LAYER_PUBLIC_EXPORT_PATH) {
+             return (/epoc32/include/middleware/$$1)
+        }
+
+        # ---------------------------------------
+        # Location, where the middleware layer specific platform headers are exported
+        # ---------------------------------------
+
+        defineReplace(MW_LAYER_DOMAIN_EXPORT_PATH) {
+             return (/epoc32/include/domain/middleware/$$1)
+        }
+        defineReplace(MW_LAYER_PLATFORM_EXPORT_PATH) {
+             return (/epoc32/include/domain/middleware/$$1)
+        }
+
+        # ---------------------------------------
+        # Location, where the os layer specific public headers are exported
+        # ---------------------------------------
+
+        defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) {
+             return (/epoc32/include/osextensions/$$1)
+        }
+        # WARNING: If the following path changes see the exists() function around line 430
+        defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) {
+             return (/epoc32/include/osextensions/$$1)
+        }
+
+        # ---------------------------------------
+        # Location, where the os specific platform headers are exported
+        # ---------------------------------------
+
+        defineReplace(OSEXT_LAYER_DOMAIN_EXPORT_PATH) {
+             return (/epoc32/include/domain/osextensions/$$1)
+        }
+        defineReplace(OS_LAYER_PLATFORM_EXPORT_PATH) {
+             return (/epoc32/include/domain/osextensions/$$1)
+        }
+
+        # ---------------------------------------
+        #  General comments about the 3 define statements related to include paths:
+        #  1) the /epoc32/include/oem is now defined there for backward compability.
+        #     Once the directory is empty, the directory will be removed. However this 
+        #     enables us to ensure that if you use these define statements => you do 
+        #     not have to remove the statements later on, when the directory no longer 
+        #     exists.
+        #  2) These statements should be enough in normal cases. For certain specific 
+        #     cases you might need to add some specific directory from /epoc32/include
+        #     (for instance /epoc32/include/ecom).
+        #     In normal cases the include staments in code should be relative to one of 
+        #     the system include paths, but in certain cases, the included files requires
+        #     that the subdirectory is also part of the system include paths.
+        # ---------------------------------------
+
+        # This variable defines the include paths, which are intended to be 
+        # used in the pro-files that are part of the applications-layer. It includes all 
+        # the needed directories from the /epoc32/include, that are valid ones for the 
+        # application-layer components. 
+        #
+        # Applications layer is the last one in the list, since most likely the most of 
+        # the headers come from middleware or os-layer  => thus they are first.
+
+        APP_LAYER_SYSTEMINCLUDE = \
+         /epoc32/include \
+         /epoc32/include/oem \
+         /epoc32/include/middleware \
+         /epoc32/include/domain/middleware \
+         /epoc32/include/osextensions \
+         /epoc32/include/domain/osextensions \
+         /epoc32/include/applications \
+         /epoc32/include/domain/applications \
+         /epoc32/include/domain/osextensions/loc \
+         /epoc32/include/domain/middleware/loc \
+         /epoc32/include/domain/applications/loc \
+         /epoc32/include/domain/osextensions/loc/sc \
+         /epoc32/include/domain/middleware/loc/sc \
+         /epoc32/include/domain/applications/loc/sc
+
+        # This define statements defines the include paths, which are intended to be
+        # used in the pro-files that are part of the middleware-layer. It includes all 
+        # the needed directories from the /epoc32/include, that are valid ones for the 
+        # middleware-layer components. 
+
+        MW_LAYER_SYSTEMINCLUDE = \
+         /epoc32/include \
+         /epoc32/include/oem \
+         /epoc32/include/middleware \
+         /epoc32/include/domain/middleware \
+         /epoc32/include/osextensions \
+         /epoc32/include/domain/osextensions \
+         /epoc32/include/domain/osextensions/loc \
+         /epoc32/include/domain/middleware/loc \
+         /epoc32/include/domain/osextensions/loc/sc \
+         /epoc32/include/domain/middleware/loc/sc
+
+        # This define statements defines the include paths, which are intended to be
+        # used in the pro-files that are part of the  osextensions-layer. It includes all
+        # the needed directories from the /epoc32/include, that are valid ones for the
+        # os-layer components. 
+
+        OS_LAYER_SYSTEMINCLUDE = \
+         /epoc32/include \
+         /epoc32/include/oem \
+         /epoc32/include/osextensions \
+         /epoc32/include/domain/osextensions \
+         /epoc32/include/domain/osextensions/loc \
+         /epoc32/include/domain/osextensions/loc/sc
+
+        # This define statements defines the include paths, which are intended to be
+        # used in the pro-files that are part of the os-layer. This is intended 
+        # to be only used by those components which need to use in their mmp-file either
+        # kern_ext.mmh or nkern_ext.mmh. Reason is that those
+        # 2 files already contain the /epoc32/include  as system include path.
+
+        OS_LAYER_KERNEL_SYSTEMINCLUDE = \
+         /epoc32/include/oem \
+         /epoc32/include/osextensions \
+         /epoc32/include/domain/osextensions
+
+
+        # ---------------------------------------
+        # Definitions that also define the systeminclude paths for various
+        # part of stdapis. Append to INCLUDEPATH in pro-file.
+        # ---------------------------------------
+
+        OS_LAYER_LIBC_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis) \
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/sys) \
+                                      /epoc32/include/stdapis \
+                                      /epoc32/include/stdapis/sys
+
+        OS_LAYER_GLIB_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0) \
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/glib) \
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/gObject) \
+                                      /epoc32/include/stdapis/glib-2.0 \
+                                      /epoc32/include/stdapis/glib-2.0/glib \
+                                      /epoc32/include/stdapis/glib-2.0/gObject
+
+        OS_LAYER_SSL_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/openssl) \
+                                     /epoc32/include/stdapis/openssl
+
+        # stlportv5 is preferred over stlport as it has the throwing version of operator new
+        exists($${EPOCROOT}epoc32/include/osextensions/stdapis/stlportv5)|exists($${EPOCROOT}epoc32/include/stdapis/stlportv5) {
+            OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5) \
+                                            /epoc32/include/stdapis/stlportv5
+        } else {
+            OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlport) \
+                                            /epoc32/include/stdapis/stlport
+        }
+        
+        OS_LAYER_BOOST_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/boost) \
+                                       /epoc32/include/stdapis/boost
+
+        OS_LAYER_DBUS_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0) \
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0/dbus) \
+                                      /epoc32/include/stdapis/dbus-1.0 \
+                                      /epoc32/include/stdapis/dbus-1.0/dbus
+
+        OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility) \
+                                            /epoc32/include/stdapis/utility
+
+        # ---------------------------------------
+        # Definitions to export IBY files to different folders where they will be taken 
+        # to ROM image
+        # ---------------------------------------
+              
+        defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/app/$$1)
+        }
+        defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/mw/$$1)
+        }
+        defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/osext/$$1)
+        }
+        defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/osext/$$1)
+        }
+        defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/$$1)
+        }
+        
+        # You need to define the following in pro-file, if you are using the stllib:
+        # QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
+        # DEFINES *= $$STLLIB_USAGE_DEFINES
+        STLLIB_USAGE_CW_FLAGS = "-wchar_t on"
+        STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED
+    
+    } 
+}
+
+
+    
diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf
new file mode 100644
index 0000000000..29b39a58d5
--- /dev/null
+++ b/mkspecs/features/symbian/qt.prf
@@ -0,0 +1,15 @@
+contains(DEFINES, QT_MAKEDLL)|contains(DEFINES, QT_DLL) {
+    CONFIG *= epocallowdlldata
+}
+
+CONFIG += qtmain
+
+load(qt)
+
+contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) {
+    default_deployment.depends += \
+        "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtLibs pre-release\"}"
+}
+
+isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000
+isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x020000 0x800000
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf
new file mode 100644
index 0000000000..9eb6b867c5
--- /dev/null
+++ b/mkspecs/features/symbian/stl.prf
@@ -0,0 +1,37 @@
+CONFIG -= stl_off
+
+# STL usage in S60 requires the following mmp variables to be uses
+# OPTION CW -wchar_t on
+# MACRO  _WCHAR_T_DECLARED
+
+QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS 
+DEFINES *= $$STLLIB_USAGE_DEFINES
+
+# Legacy support requires some hardcoded stdapis paths.
+# Note: Also the new header is used from STL when it is enabled
+INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE 
+
+# Remove mkspecs/common/symbian/stl-off from beginning of includepath 
+# in order to use new and delete operators from STL
+INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off
+
+# libstdcppv5 is preferred over libstdcpp as it has/uses the throwing version of operator new
+exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll ) {
+    LIBS *= -llibstdcppv5.dll
+
+    # STDCPP turns on standard C++ new behaviour in SBSv2
+    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
+}
diff --git a/mkspecs/features/symbian/stl_off.prf b/mkspecs/features/symbian/stl_off.prf
new file mode 100644
index 0000000000..d5d1c7c30f
--- /dev/null
+++ b/mkspecs/features/symbian/stl_off.prf
@@ -0,0 +1,2 @@
+CONFIG -= stl
+
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf
index e768d0f0ac..eaf373a520 100644
--- a/mkspecs/features/uic.prf
+++ b/mkspecs/features/uic.prf
@@ -1,11 +1,11 @@
 
 isEmpty(QMAKE_UIC3) {
-    win32:QMAKE_UIC3 = $$[QT_INSTALL_BINS]\uic3.exe
+    contains(QMAKE_HOST.os,Windows):QMAKE_UIC3 = $$[QT_INSTALL_BINS]\uic3.exe
     else:QMAKE_UIC3 = $$[QT_INSTALL_BINS]/uic3
 }
 
 isEmpty(QMAKE_UIC) {
-   win32:QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe
+   contains(QMAKE_HOST.os,Windows):QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe
    else:QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
 }
 
@@ -36,7 +36,7 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_
 
 !isEmpty(FORMS)|!isEmpty(FORMS3) {
     ui_dir_short = $$UI_HEADERS_DIR
-    win32:ui_dir_short ~= s,^.:,/,
+    contains(QMAKE_HOST.os,Windows):ui_dir_short ~= s,^.:,/,
     contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_HEADERS_DIR
     else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR
 }
diff --git a/mkspecs/symbian-abld/qmake.conf b/mkspecs/symbian-abld/qmake.conf
new file mode 100644
index 0000000000..499bf63cd3
--- /dev/null
+++ b/mkspecs/symbian-abld/qmake.conf
@@ -0,0 +1,9 @@
+#
+# qmake configuration for symbian-abld
+#
+# Written for SYMBIAN_ABLD
+#
+
+MAKEFILE_GENERATOR	= SYMBIAN_ABLD
+
+include(../common/symbian/symbian.conf)
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
new file mode 100644
index 0000000000..354ce26051
--- /dev/null
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
@@ -0,0 +1,39 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# ** Contact: Qt Software Information (qt-info@nokia.com)
+# **
+# ** This file is part of symbian-sbsv2 mkspec.
+# **
+# ****************************************************************************/
+
+include $(FLMHOME)/metaflm.mk
+
+SINGLETON:=$(call sanitise,TARGET_$(DEPLOY_TARGET))
+CLEAN_TARGET:=
+
+define qmake_emulator_deployment
+$(ALLTARGET):: $(1)
+FINAL::$(1)
+
+# Prevent duplicate targets from being created
+$(SINGLETON):=1
+
+CLEAN_TARGET:=$(1)
+
+$(1): $(2)
+	$(call startrule,qmake_emulator_deployment) \
+	$(GNUCP) --no-preserve=mode $(2) "$$@" && \
+	$(GNUCHMOD) a+rw "$$@" \
+	$(call endrule,qmake_emulator_deployment) 	
+endef
+
+ifeq ($($(SINGLETON)),)
+$(eval $(call qmake_emulator_deployment, $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_TARGET)), $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_SOURCE))))
+$(call makepath,$(dir $(DEPLOY_TARGET)))
+$(eval $(call GenerateStandardCleanTarget,$(CLEAN_TARGET),''))
+endif	
+
+
+
+
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
new file mode 100644
index 0000000000..9dc529f830
--- /dev/null
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
@@ -0,0 +1,35 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# ** Contact: Qt Software Information (qt-info@nokia.com)
+# **
+# ** This file is part of symbian-sbsv2 mkspec.
+# **
+# ****************************************************************************/
+
+include $(FLMHOME)/metaflm.mk
+
+SINGLETON:=$(call sanitise,TARGET_$(PREDEP_TARGET))
+
+define qmake_extra_pre_targetdep
+$(ALLTARGET):: $(PREDEP_TARGET)
+EXPORT:: $(PREDEP_TARGET)
+LIBRARY:: $(PREDEP_TARGET)
+TARGET:: $(PREDEP_TARGET)
+
+# Prevent duplicate targets from being created
+$(SINGLETON):=1
+
+$(PREDEP_TARGET): $(DEPS) 
+	$(call startrule,qmake_extra_pre_targetdep) \
+	$(COMMAND) \
+	$(call endrule,qmake_extra_pre_targetdep)
+endef
+
+ifeq ($($(SINGLETON)),)
+$(eval $(qmake_extra_pre_targetdep))
+$(eval $(call GenerateStandardCleanTarget,$(PREDEP_TARGET),''))
+endif	
+
+
+
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm
new file mode 100644
index 0000000000..97fc6b3b82
--- /dev/null
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm
@@ -0,0 +1,22 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# ** Contact: Qt Software Information (qt-info@nokia.com)
+# **
+# ** This file is part of symbian-sbsv2 mkspec.
+# **
+# ****************************************************************************/
+
+include $(FLMHOME)/metaflm.mk
+
+SINGLETON:=$(call sanitise,TEMP_DIRS_$(EXTENSION_ROOT))
+
+ifeq ($($(SINGLETON)),)
+$(SINGLETON):=1
+$(call makepath,$(DIRS))
+$(eval $(call GenerateStandardCleanTarget,'',$(DIRS)))
+endif	
+
+
+
+
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
new file mode 100644
index 0000000000..8cbd0a8dbe
--- /dev/null
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
@@ -0,0 +1,34 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# ** Contact: Qt Software Information (qt-info@nokia.com)
+# **
+# ** This file is part of symbian-sbsv2 mkspec.
+# **
+# ****************************************************************************/
+
+include $(FLMHOME)/metaflm.mk
+
+POST_LINK_TARGET:=POST_LINK_$(PLATFORM_PATH)_$(CFG_PATH)_$(call sanitise,$(LINK_TARGET))
+POST_LINK_DEP:=$(EPOCROOT)/epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/$(LINK_TARGET)
+
+# Passing $(PLATFORM_PATH) etc. variables in FLM options makes sbsv2 toolchain to double the dollar signs, 
+# requiring evaluating them twice in order to get desired values, 
+# so do an extra evaluation before using the command.
+define command_fixer
+	THE_COMMAND:=$(POST_LINK_CMD)
+endef
+
+define qmake_post_link
+$(ALLTARGET):: $(POST_LINK_TARGET)
+FINAL:: $(POST_LINK_TARGET)
+
+$(POST_LINK_TARGET): $(POST_LINK_DEP)
+	$(call startrule,qmake_post_link) \
+	$(THE_COMMAND) \
+	$(call endrule,qmake_post_link)
+endef
+
+$(eval $(command_fixer))
+$(eval $(qmake_post_link))
+
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
new file mode 100644
index 0000000000..ff12761c99
--- /dev/null
+++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+# /****************************************************************************
+# **
+# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# ** Contact: Qt Software Information (qt-info@nokia.com)
+# **
+# ** This file is part of symbian-sbsv2 mkspec.
+# **
+# ****************************************************************************/
+-->
+
+<build xmlns="http://symbian.com/xml/build"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://symbian.com/xml/build http://symbian.com/xml/build/1_0.xsd">
+
+	<!-- Extension interfaces : replacements for Template Extension Makefiles -->
+    
+    <interface name="qt.qmake_extra_pre_targetdep" extends="Symbian.UserFLM"
+                flm="qmake_extra_pre_targetdep.flm">
+        <param name='PREDEP_TARGET' />
+        <param name='DEPS' default = '' />
+        <param name='COMMAND' default = '' />
+	</interface>
+    
+    <interface name="qt.qmake_emulator_deployment" extends="Symbian.UserFLM"
+                flm="qmake_emulator_deployment.flm">
+        <param name='DEPLOY_SOURCE' />
+        <param name='DEPLOY_TARGET' />
+    </interface>
+
+    <interface name="qt.qmake_post_link" extends="Symbian.UserFLM"
+                flm="qmake_post_link.flm">
+        <param name='POST_LINK_CMD' />
+        <param name='LINK_TARGET' />
+    </interface>
+
+    <interface name="qt.qmake_generate_temp_dirs" extends="Symbian.UserFLM"
+                flm="qmake_generate_temp_dirs.flm">
+        <param name='DIRS' />
+    </interface>
+</build>
diff --git a/mkspecs/symbian-sbsv2/qmake.conf b/mkspecs/symbian-sbsv2/qmake.conf
new file mode 100644
index 0000000000..0a5e8782bf
--- /dev/null
+++ b/mkspecs/symbian-sbsv2/qmake.conf
@@ -0,0 +1,9 @@
+#
+# qmake configuration for symbian-sbsv2
+#
+# Written for SYMBIAN_SBSV2
+#
+
+MAKEFILE_GENERATOR  = SYMBIAN_SBSV2
+
+include(../common/symbian/symbian.conf)
diff --git a/mkspecs/win32-mwc/qmake.conf b/mkspecs/win32-mwc/qmake.conf
new file mode 100644
index 0000000000..8ebe4ffc8d
--- /dev/null
+++ b/mkspecs/win32-mwc/qmake.conf
@@ -0,0 +1,110 @@
+#
+# qmake configuration for win32-mwc
+#
+# Written for mwc
+#
+
+MAKEFILE_GENERATOR	= MINGW
+TEMPLATE		= app
+CONFIG			+= qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target
+QT			+= core gui
+DEFINES			+= UNICODE QT_NO_PROCESS QT_NO_SHAREDMEMORY QT_NO_CONCURRENT QT_NO_SYSTEMSEMAPHORE
+QMAKE_COMPILER_DEFINES  += __GNUC__ WIN32
+
+QMAKE_EXT_OBJ           = .o
+QMAKE_EXT_RES           = _res.o
+
+QMAKE_CC		= mwccsym2
+QMAKE_LEX		= flex
+QMAKE_LEXFLAGS		=
+QMAKE_YACC		= byacc
+QMAKE_YACCFLAGS		= -d
+QMAKE_CFLAGS		= -gccinc -stackcommit 1024000 -stackreserve 1024000
+QMAKE_CFLAGS_DEPS	= -M
+QMAKE_CFLAGS_WARN_ON	= -w on -w nonotused -w nonotinlined -w noimplicit -w nopadding -w noemptydecl -w nounusedexpr -w nopossible
+QMAKE_CFLAGS_WARN_OFF	= -w off
+QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_DEBUG	= -g -O1
+QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+
+QMAKE_CXX		= mwccsym2
+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+QMAKE_CXXFLAGS_RTTI_ON	= -RTTI on
+QMAKE_CXXFLAGS_RTTI_OFF	= -RTTI off
+QMAKE_CXXFLAGS_EXCEPTIONS_ON = "-Cpp_exceptions on"
+QMAKE_CXXFLAGS_EXCEPTIONS_OFF = "-Cpp_exceptions off"
+
+QMAKE_INCDIR		=
+QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+
+QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
+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_LINK		= mwldsym2
+#QMAKE_LFLAGS		= -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
+QMAKE_LFLAGS		= 
+QMAKE_LFLAGS_EXCEPTIONS_ON = 
+QMAKE_LFLAGS_EXCEPTIONS_OFF = 
+#QMAKE_LFLAGS_RELEASE	= -Wl,-s
+QMAKE_LFLAGS_RELEASE	= 
+QMAKE_LFLAGS_DEBUG	=
+#QMAKE_LFLAGS_CONSOLE	= -Wl,-subsystem,console
+#QMAKE_LFLAGS_WINDOWS	= -Wl,-subsystem,windows
+QMAKE_LFLAGS_CONSOLE	= 
+QMAKE_LFLAGS_WINDOWS	= 
+QMAKE_LFLAGS_DLL        = -runtime dm
+QMAKE_LINK_OBJECT_MAX	= 99999999
+QMAKE_LINK_OBJECT_SCRIPT= object_script
+
+
+QMAKE_LIBS		=
+QMAKE_LIBS_CORE         = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32
+QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
+QMAKE_LIBS_NETWORK      = -lws2_32
+QMAKE_LIBS_OPENGL       = -lopengl32 -lglu32 -lgdi32 -luser32
+QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
+#QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY     = -lqtmain
+
+!isEmpty(QMAKE_SH) {
+    MINGW_IN_SHELL      = 1
+	QMAKE_DIR_SEP		= /
+	QMAKE_COPY		= cp
+	QMAKE_COPY_DIR		= xcopy /s /q /y /i
+	QMAKE_MOVE		= mv
+	QMAKE_DEL_FILE		= rm
+	QMAKE_MKDIR		= mkdir
+	QMAKE_DEL_DIR		= rmdir
+    QMAKE_CHK_DIR_EXISTS = test -d
+} else {
+	QMAKE_COPY		= copy /y
+	QMAKE_COPY_DIR		= xcopy /s /q /y /i
+	QMAKE_MOVE		= move
+	QMAKE_DEL_FILE		= del
+	QMAKE_MKDIR		= mkdir
+	QMAKE_DEL_DIR		= rmdir
+    QMAKE_CHK_DIR_EXISTS	= if not exist
+}
+
+QMAKE_MOC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
+QMAKE_UIC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
+QMAKE_IDC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
+
+QMAKE_IDL		= midl
+QMAKE_LIB		= $$QMAKE_LINK -library -o
+QMAKE_RC		= windres
+QMAKE_ZIP		= zip -r -9
+
+QMAKE_STRIP		= strip
+QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+load(qt_config)
diff --git a/mkspecs/win32-mwc/qplatformdefs.h b/mkspecs/win32-mwc/qplatformdefs.h
new file mode 100644
index 0000000000..0ce3ac634a
--- /dev/null
+++ b/mkspecs/win32-mwc/qplatformdefs.h
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+#ifdef UNICODE
+#ifndef _UNICODE
+#define _UNICODE
+#endif
+#endif
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+#include <tchar.h>
+#include <io.h>
+#include <direct.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <windows.h>
+#include <limits.h>
+
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)
+typedef enum {
+    NameUnknown		  = 0, 
+    NameFullyQualifiedDN  = 1, 
+    NameSamCompatible	  = 2, 
+    NameDisplay		  = 3, 
+    NameUniqueId	  = 6, 
+    NameCanonical	  = 7, 
+    NameUserPrincipal	  = 8, 
+    NameCanonicalEx	  = 9, 
+    NameServicePrincipal  = 10, 
+    NameDnsDomain	  = 12
+} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;
+#endif
+
+#define Q_FS_FAT
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_STATBUF		struct _stati64		// non-ANSI defs
+#define QT_STATBUF4TSTAT	struct _stati64		// non-ANSI defs
+#define QT_STAT			_stati64
+#define QT_FSTAT		_fstati64
+#else
+#define QT_STATBUF		struct _stat		// non-ANSI defs
+#define QT_STATBUF4TSTAT	struct _stat		// non-ANSI defs
+#define QT_STAT			_stat
+#define QT_FSTAT		_fstat
+#endif
+#define QT_STAT_REG		_S_IFREG
+#define QT_STAT_DIR		_S_IFDIR
+#define QT_STAT_MASK		_S_IFMT
+#if defined(_S_IFLNK)
+#  define QT_STAT_LNK		_S_IFLNK
+#endif
+#define QT_FILENO		_fileno
+#define QT_OPEN			_open
+#define QT_CLOSE		_close
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_LSEEK		_lseeki64
+#ifndef UNICODE
+#define QT_TSTAT		_stati64
+#else
+#define QT_TSTAT		_wstati64
+#endif
+#else
+#define QT_LSEEK		_lseek
+#ifndef UNICODE
+#define QT_TSTAT		_stat
+#else
+#define QT_TSTAT		_wstat
+#endif
+#endif
+#define QT_READ			_read
+#define QT_WRITE		_write
+#define QT_ACCESS		_access
+#define QT_GETCWD		_getcwd
+#define QT_CHDIR		_chdir
+#define QT_MKDIR		_mkdir
+#define QT_RMDIR		_rmdir
+#define QT_OPEN_LARGEFILE       0
+#define QT_OPEN_RDONLY		_O_RDONLY
+#define QT_OPEN_WRONLY		_O_WRONLY
+#define QT_OPEN_RDWR		_O_RDWR
+#define QT_OPEN_CREAT		_O_CREAT
+#define QT_OPEN_TRUNC		_O_TRUNC
+#define QT_OPEN_APPEND		_O_APPEND
+#if defined(O_TEXT)
+# define QT_OPEN_TEXT		_O_TEXT
+# define QT_OPEN_BINARY		_O_BINARY
+#endif
+
+#define QT_FOPEN                fopen
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_FSEEK                fseeko64
+#define QT_FTELL                ftello64
+#else
+#define QT_FSEEK                fseek
+#define QT_FTELL                ftell
+#endif
+#define QT_FGETPOS              fgetpos
+#define QT_FSETPOS              fsetpos
+#define QT_FPOS_T               fpos_t
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_OFF_T                off64_t
+#else
+#define QT_OFF_T                long
+#endif
+
+#define QT_SIGNAL_ARGS		int
+
+#define QT_VSNPRINTF		_vsnprintf
+#define QT_SNPRINTF		_snprintf
+
+# define F_OK	0
+# define X_OK	1
+# define W_OK	2
+# define R_OK	4
+
+#define PATH_MAX 1024
+#endif // QPLATFORMDEFS_H
diff --git a/projects.pro b/projects.pro
index 953eae829c..389ec71ea2 100644
--- a/projects.pro
+++ b/projects.pro
@@ -28,6 +28,10 @@ isEmpty(QT_BUILD_PARTS) { #defaults
    }
 }
 
+symbian {
+   QT_BUILD_PARTS = libs examples demos
+}
+
 #process the projects
 for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
     isEqual(PROJECT, tools) {
@@ -49,9 +53,9 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
     }
 }
 
-confclean.depends += clean
+!symbian: confclean.depends += clean
 confclean.commands =
-unix {
+unix:!symbian {
   confclean.commands += (cd config.tests/unix/stl && $(MAKE) distclean); \
 			(cd config.tests/unix/endian && $(MAKE) distclean); \
 			(cd config.tests/unix/ipv6 && $(MAKE) distclean); \
@@ -101,6 +105,19 @@ win32 {
 			-$(DEL_FILE) .qmake.cache $$escape_expand(\n\t) \
 			(cd qmake && $(MAKE) distclean)
 }
+symbian {
+  confclean.depends += distclean
+  confclean.commands += \
+            (cd src\tools\moc && $(MAKE) distclean) $$escape_expand(\n\t) \
+            (cd src\tools\rcc && $(MAKE) distclean) $$escape_expand(\n\t) \
+            (cd src\tools\uic && $(MAKE) distclean) $$escape_expand(\n\t) \
+            -$(DEL_FILE) src\corelib\global\qconfig.h $$escape_expand(\n\t) \
+            -$(DEL_FILE) src\corelib\global\qconfig.cpp $$escape_expand(\n\t) \
+            -$(DEL_FILE) mkspecs\qconfig.pri $$escape_expand(\n\t) \
+            -$(DEL_FILE) .qmake.cache $$escape_expand(\n\t) \
+            (cd qmake && $(MAKE) distclean)
+            
+}
 QMAKE_EXTRA_TARGETS += confclean
 qmakeclean.commands += (cd qmake && $(MAKE) clean)
 QMAKE_EXTRA_TARGETS += qmakeclean
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index dcdc80537f..6ba5b6b134 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -9,7 +9,8 @@ LFLAGS = @QMAKE_LFLAGS@
 OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o  \
      mingw_make.o option.o winmakefile.o projectgenerator.o \
      meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
-     borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o
+     borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o \
+     symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o
 
 #qt code
 QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \
@@ -30,7 +31,7 @@ QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qgl
       qscriptgrammar.o qscriptlexer.o qscriptclassdata.o \
       qscriptparser.o qscriptprettypretty.o qscriptsyntaxchecker.o \
       qscriptvalue.o qscriptvalueimpl.o qscriptvalueiterator.o \
-      qscriptvalueiteratorimpl.o \
+      qscriptvalueiteratorimpl.o qxmlstream.o qxmlutils.o \
       qscriptclass.o qscriptclasspropertyiterator.o \
       qscriptengineagent.o qscriptcontextinfo.o qscriptstring.o \
       $(QTOBJS)
@@ -44,6 +45,8 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
 	   generators/mac/pbuilder_pbx.cpp generators/mac/xmloutput.cpp generators/metamakefile.cpp \
 	   generators/makefiledeps.cpp option.cpp generators/win32/mingw_make.cpp generators/makefile.cpp \
 	   generators/win32/msvc_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
+	   generators/symbian/symmake.cpp generators/symbian/initprojectdeploy_symbian.cpp \
+	   generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \
 	   $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \
 	   $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
@@ -84,16 +87,18 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
 	   $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp \
 	   $(SOURCE_PATH)/src/script/qscriptvalue.cpp $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp \
 	   $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp \
+	   $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp \
+	   $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \
 	   $(SOURCE_PATH)/src/script/qscriptclass.cpp $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp \
 	   $(SOURCE_PATH)/src/script/qscriptengineagent.cpp $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp \
 	   $(SOURCE_PATH)/src/script/qscriptstring.cpp \
 	   $(QTSRCS)
 
-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
+CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \
 	   -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
 	   -I$(BUILD_PATH)/src/corelib/global \
-	   -I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \
-	   -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
+	   -I$(SOURCE_PATH)/src/script -I$(BUILD_PATH)/src/corelib/xml \
+	   -DQT_NO_PCRE -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
 	   -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
 	   -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
            -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
@@ -299,6 +304,18 @@ pbuilder_pbx.o: generators/mac/pbuilder_pbx.cpp
 msvc_dsp.o: generators/win32/msvc_dsp.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_dsp.cpp
 
+symmake.o: generators/symbian/symmake.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake.cpp
+
+symmake_abld.o: generators/symbian/symmake_abld.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake_abld.cpp
+
+symmake_sbsv2.o: generators/symbian/symmake_sbsv2.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
+
+initprojectdeploy_symbian.o: generators/symbian/initprojectdeploy_symbian.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
+
 projectgenerator.o: generators/projectgenerator.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) generators/projectgenerator.cpp
 
@@ -401,6 +418,12 @@ qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
 qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
 
+qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
+
+qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
+
 qscriptclass.o: $(SOURCE_PATH)/src/script/qscriptclass.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclass.cpp
 
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 6340814389..40b08ebfbb 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -28,11 +28,12 @@ CFLAGS      = /Zc:wchar_t-
 
 CFLAGS	     = -c -Fo$@ \
               -W3 -nologo -O2 \
-              -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac \
+              -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \
               -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
               -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
               -I$(BUILD_PATH)\src\corelib\global \
               -I$(BUILD_PATH)\include\QtScript \
+              -I$(BUILD_PATH)\src\corelib\xml \
               -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC)  \
               -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \
               -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \
@@ -54,7 +55,7 @@ BCB = $(MAKEDIR)\..
 CXX	    = bcc32
 CFLAGS	    = -c -o$@ \
 	-tWR -w -w-hid -w-use -O1 \
-	-I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac \
+	-I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \
 	-I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
 	-I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
 	-I$(BUILD_PATH)\src\corelib\global \
@@ -74,7 +75,8 @@ OBJS        = project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw
               option.obj winmakefile.obj projectgenerator.obj property.obj meta.obj \
               makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \
               borland_bmake.obj msvc_nmake.obj msvc_dsp.obj msvc_vcproj.obj \
-              msvc_objectmodel.obj
+              msvc_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \
+              symmake_abld.obj symmake_sbsv2.obj
 
 !IFDEF QMAKE_OPENSOURCE_EDITION
 CFLAGS      = $(CFLAGS) -DQMAKE_OPENSOURCE_EDITION
@@ -160,7 +162,9 @@ QTOBJS= \
 	qscriptvalue.obj \
 	qscriptvalueimpl.obj \
 	qscriptvalueiterator.obj \
-	qscriptvalueiteratorimpl.obj
+	qscriptvalueiteratorimpl.obj \
+	qxmlstream.obj \
+	qxmlutils.obj
 
 
 first all: qmake.exe
@@ -229,6 +233,10 @@ clean::
 	-del msvc_dsp.obj
 	-del msvc_vcproj.obj
 	-del msvc_objectmodel.obj
+	-del symmake.obj
+	-del symmake_abld.obj
+	-del symmake_sbsv2.obj
+	-del initprojectdeploy_symbian.obj
 	-del pbuilder_pbx.obj
 	-del qnumeric.obj \
 	-del qscriptasm.obj \
@@ -269,6 +277,8 @@ clean::
 	-del qscriptvalueimpl.obj \
 	-del qscriptvalueiterator.obj \
 	-del qscriptvalueiteratorimpl.obj
+	-del qxmlstream.obj
+	-del qxmlutils.obj
 	-del vc60.pdb
 	-del vc70.pdb
 	-del qmake.pdb
@@ -451,8 +461,21 @@ msvc_vcproj.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp
 msvc_objectmodel.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_objectmodel.cpp
 	$(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
 
+symmake.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp
+
+symmake_abld.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake_abld.cpp
+
+symmake_sbsv2.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
+
+initprojectdeploy_symbian.obj: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+        $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
+
 md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
+
 project.obj: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
 	$(CXX) $(CXXFLAGS) project.cpp
 
@@ -596,3 +619,9 @@ qscriptvalueiterator.obj: $(SOURCE_PATH)\src\script\qscriptvalueiterator.cpp
 
 qscriptvalueiteratorimpl.obj: $(SOURCE_PATH)\src\script\qscriptvalueiteratorimpl.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptvalueiteratorimpl.cpp
+
+qxmlstream.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp
+
+qxmlutils.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlutils.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlutils.cpp
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 9439f409ab..a3ddf11d80 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -15,14 +15,17 @@ CXX	    =	g++
 CFLAGS	    =	-c -o$@ -O \
 		-I. -Igenerators -Igenerators/unix \
 		-Igenerators/win32 -Igenerators/mac \
+		-Igenerators/symbian \
 		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
 		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
 		-I$(BUILD_PATH)/src/corelib/global \
 	        -I$(BUILD_PATH)/include/QtScript \
+		-I$(BUILD_PATH)/src/corelib/xml \
 		-I$(SOURCE_PATH)/mkspecs/win32-g++  \
 		-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
 	       	-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
-	       	-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM
+	       	-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
+	       	-DQT_BOOTSTRAPPED
 CXXFLAGS    =   $(CFLAGS)
 LFLAGS	    =
 LIBS	    = -lole32 -luuid
@@ -35,7 +38,8 @@ OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
               option.o winmakefile.o projectgenerator.o property.o meta.o \
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
               borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
-              msvc_objectmodel.o
+              msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
+              symmake_abld.o symmake_sbsv2.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
 CFLAGS      += -DQMAKE_OPENSOURCE_EDITION
@@ -121,7 +125,9 @@ QTOBJS= \
 	qscriptvalue.o \
 	qscriptvalueimpl.o \
 	qscriptvalueiterator.o \
-	qscriptvalueiteratorimpl.o
+	qscriptvalueiteratorimpl.o \
+	qxmlstream.o \
+	qxmlutils.o
 
 
 qmake.exe: $(OBJS) $(QTOBJS)
@@ -299,6 +305,18 @@ msvc_vcproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp
 msvc_objectmodel.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_objectmodel.cpp
 	$(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
 
+symmake.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp
+
+symmake_abld.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake_abld.cpp
+
+symmake_sbsv2.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
+
+initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
+
 project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
 	$(CXX) $(CXXFLAGS) project.cpp
 
@@ -442,3 +460,9 @@ qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
 
 qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
+
+qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
+
+qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
index a0e981e87b..85a7e45b29 100644
--- a/qmake/Makefile.win32-g++-sh
+++ b/qmake/Makefile.win32-g++-sh
@@ -15,14 +15,17 @@ CXX	    =	g++
 CFLAGS	    =	-c -o$@ -O \
 		-I. -Igenerators -Igenerators/unix \
 		-Igenerators/win32 -Igenerators/mac \
+		-Igenerators/symbian \
 		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
 		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
 		-I$(BUILD_PATH)/src/corelib/global \
 	        -I$(BUILD_PATH)/include/QtScript \
+		-I$(BUILD_PATH)/src/corelib/xml \
 		-I$(SOURCE_PATH)/mkspecs/win32-g++  \
 		-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
 	       	-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
-	       	-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM
+	       	-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
+	       	-DQT_BOOTSTRAPPED
 CXXFLAGS    =   $(CFLAGS)
 LFLAGS	    =
 LIBS	    = -lole32 -luuid
@@ -35,7 +38,8 @@ OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
               option.o winmakefile.o projectgenerator.o property.o meta.o \
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
               borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
-              msvc_objectmodel.o
+              msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
+              symmake_abld.o symmake_sbsv2.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
 CFLAGS      += -DQMAKE_OPENSOURCE_EDITION
@@ -121,7 +125,9 @@ QTOBJS= \
 	qscriptvalue.o \
 	qscriptvalueimpl.o \
 	qscriptvalueiterator.o \
-	qscriptvalueiteratorimpl.o
+	qscriptvalueiteratorimpl.o \
+	qxmlstream.o \
+	qxmlutils.o
 
 qmake.exe: $(OBJS) $(QTOBJS)
 	$(LINKQMAKE)
@@ -298,6 +304,18 @@ msvc_vcproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp
 msvc_objectmodel.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_objectmodel.cpp
 	$(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
 
+symmake.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp
+
+symmake_abld.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake_abld.cpp
+
+symmake_sbsv2.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
+
+initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
+
 project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
 	$(CXX) $(CXXFLAGS) project.cpp
 
@@ -441,3 +459,9 @@ qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
 
 qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
+
+qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
+
+qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
diff --git a/qmake/Makefile.win32-mwc b/qmake/Makefile.win32-mwc
new file mode 100644
index 0000000000..08b6c49917
--- /dev/null
+++ b/qmake/Makefile.win32-mwc
@@ -0,0 +1,469 @@
+ifeq "$(SOURCE_PATH)" ""
+SOURCE_PATH = ..
+endif
+
+# cmd version
+
+ifeq "$(BUILD_PATH)" ""
+BUILD_PATH = ..
+endif
+
+
+# specific stuff for Metroworks compiler
+
+CXX	    =	mwccsym2
+CFLAGS	    =	-gccinc \
+		-w on -w nonotused -w nonotinlined -w noimplicit -w nopadding -w noemptydecl \
+                -w nounusedexpr -w nopossible -c -o $@ -O \
+		-I. -Igenerators -Igenerators\unix \
+		-Igenerators\win32 -Igenerators\mac \
+		-Igenerators\symbian \
+		-I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
+		-I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
+		-I$(BUILD_PATH)\src\corelib\global \
+		-I$(SOURCE_PATH)\mkspecs\win32-mwc  \
+		-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
+	       	-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DHAVE_QCONFIG_CPP \
+	       	-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
+		-DQT_NO_LIBRARY -I$(BUILD_PATH)\include\QtScript \
+		-I$(SOURCE_PATH)\corelib\xml -DQT_BOOTSTRAPPED
+
+CXXFLAGS    =   $(CFLAGS)
+LFLAGS      = -heapcommit 1024 -heapreserve 102400
+LIBS	    = -ladvapi32.lib
+LINKQMAKE   =	mwccsym2 $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
+ADDCLEAN    =
+
+
+# qmake code
+OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
+              option.o winmakefile.o projectgenerator.o property.o meta.o \
+              makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
+              borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
+              msvc_objectmodel.o initprojectdeploy_symbian.o qpopen.o \
+              symmake.o symmake_abld.o symmake_sbsv2.o
+
+ifdef QMAKE_OPENSOURCE_EDITION
+CFLAGS      += -DQMAKE_OPENSOURCE_EDITION
+endif
+
+# qt code
+QTOBJS= \
+	qbitarray.o \
+	qbuffer.o \
+	qbytearray.o \
+        qcryptographichash.o \
+	qvsnprintf.o \
+	qbytearraymatcher.o \
+	qconfig.o \
+	qdatetime.o \
+	qdir.o \
+	qdiriterator.o \
+	qfile.o \
+	qtemporaryfile.o \
+	qfileinfo.o \
+	qabstractfileengine.o \
+	qfsfileengine.o \
+	qfsfileengine_iterator.o \
+	qfsfileengine_win.o \
+	qfsfileengine_iterator_win.o \
+	qglobal.o \
+	qhash.o \
+	qiodevice.o \
+	qlibraryinfo.o \
+	qlistdata.o \
+	qlinkedlist.o \
+	qlocale.o \
+	qmalloc.o \
+	qmap.o \
+	qregexp.o \
+	qstring.o \
+	qstringlist.o \
+	qtextstream.o \
+	quuid.o \
+	qvector.o \
+	qurl.o \
+	qsettings.o \
+	qsettings_win.o \
+	qvariant.o \
+	qmetatype.o \
+	qnumeric.o \
+	qscriptasm.o \
+	qscriptast.o \
+	qscriptastvisitor.o \
+	qscriptcompiler.o \
+	qscriptecmaarray.o \
+	qscriptecmaboolean.o \
+	qscriptecmacore.o \
+	qscriptecmadate.o \
+	qscriptecmafunction.o \
+	qscriptecmaglobal.o \
+	qscriptecmamath.o \
+	qscriptecmanumber.o \
+	qscriptecmaobject.o \
+	qscriptecmaregexp.o \
+	qscriptecmastring.o \
+	qscriptecmaerror.o \
+	qscriptcontext_p.o \
+	qscriptengine.o \
+	qscriptengine_p.o \
+	qscriptengineagent.o \
+	qscriptextenumeration.o \
+	qscriptextvariant.o \
+	qscriptcontext.o \
+	qscriptcontextinfo.o \
+	qscriptfunction.o \
+	qscriptgrammar.o \
+	qscriptlexer.o \
+	qscriptclassdata.o \
+	qscriptparser.o \
+	qscriptprettypretty.o \
+	qscriptsyntaxchecker.o \
+	qscriptclass.o \
+	qscriptclasspropertyiterator.o \
+	qscriptstring.o \
+	qscriptvalue.o \
+	qscriptvalueimpl.o \
+	qscriptvalueiterator.o \
+	qscriptvalueiteratorimpl.o \
+	qxmlstream.o \
+	qxmlutils.o
+
+
+qmake.exe: $(OBJS) $(QTOBJS)
+	$(LINKQMAKE)
+	-copy qmake.exe $(BUILD_PATH)\bin\qmake.exe
+
+Makefile: Makefile.win32-mwc
+	@echo "Out of date, please rerun configure"
+
+clean::
+	-del $(OBJS) $(QTOBJS) $(ADDCLEAN)
+
+distclean:: clean
+	-del qmake.exe
+	-del $(BUILD_PATH)\bin\qmake.exe
+
+.c.o:
+	$(CXX) $(CFLAGS) $<
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $<
+
+qconfig.o: $(BUILD_PATH)/src/corelib/global/qconfig.cpp
+	$(CXX) $(CXXFLAGS) $(BUILD_PATH)/src/corelib/global/qconfig.cpp
+
+qsettings_win.o: $(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp
+
+qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings.cpp
+
+qvariant.o: $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp
+
+qurl.o: $(SOURCE_PATH)/src/corelib/io/qurl.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qurl.cpp
+
+qtextstream.o: $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp
+
+qdatastream.o: $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp
+
+qiodevice.o: $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp
+
+qlibraryinfo.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp
+
+qnumeric.o: $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp
+
+qmalloc.o: $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp
+
+qglobal.o: $(SOURCE_PATH)/src/corelib/global/qglobal.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qglobal.cpp
+
+qhash.o: $(SOURCE_PATH)/src/corelib/tools/qhash.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qhash.cpp
+
+qbytearray.o: $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp
+
+qcryptographichash.o: $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
+
+qvsnprintf.o: $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp
+
+qbytearraymatcher.o: $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp
+
+qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring.cpp
+
+qlocale.o: $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp
+
+quuid.o: $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp
+
+qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
+
+qlistdata.o: $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
+
+qlinkedlist.o: $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp
+
+qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfile.cpp
+
+qtemporaryfile.o: $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp
+
+qabstractfileengine.o: $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp
+
+qfsfileengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp
+
+qfsfileengine_iterator_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_win.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_win.cpp
+
+qfsfileengine.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp
+
+qfsfileengine_iterator.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp
+
+qtextcodec.o: $(SOURCE_PATH)/src/codecs/qtextcodec.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/codecs/qtextcodec.cpp
+
+qregexp.o: $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp
+
+qvector.o: $(SOURCE_PATH)/src/corelib/tools/qvector.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qvector.cpp
+
+qbitarray.o: $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp
+
+qdir.o: $(SOURCE_PATH)/src/corelib/io/qdir.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qdir.cpp
+
+qdiriterator.o: $(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp
+
+qmetatype.o: $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp
+
+qfileinfo.o: $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp
+
+qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp
+
+qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp
+
+qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qmap.cpp
+
+makefile.o: $(SOURCE_PATH)/qmake/generators/makefile.cpp
+	$(CXX) $(CXXFLAGS) generators/makefile.cpp
+
+unixmake.o: $(SOURCE_PATH)/qmake/generators/unix/unixmake.cpp
+	$(CXX) $(CXXFLAGS) generators/unix/unixmake.cpp
+
+unixmake2.o: $(SOURCE_PATH)/qmake/generators/unix/unixmake2.cpp
+	$(CXX) $(CXXFLAGS) generators/unix/unixmake2.cpp
+
+winmakefile.o: $(SOURCE_PATH)/qmake/generators/win32/winmakefile.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/winmakefile.cpp
+
+borland_bmake.o: $(SOURCE_PATH)/qmake/generators/win32/borland_bmake.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/borland_bmake.cpp
+
+mingw_make.o: $(SOURCE_PATH)/qmake/generators/win32/mingw_make.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/mingw_make.cpp
+
+msvc_nmake.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_nmake.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/msvc_nmake.cpp
+
+msvc_dsp.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_dsp.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/msvc_dsp.cpp
+
+msvc_vcproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/msvc_vcproj.cpp
+
+msvc_objectmodel.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_objectmodel.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
+
+symmake.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp
+
+symmake_abld.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake_abld.cpp
+
+symmake_sbsv2.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
+
+initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
+
+qpopen.o: $(SOURCE_PATH)/qmake/qpopen.cpp $(SOURCE_PATH)/qmake/qpopen.h
+	$(CXX) $(CXXFLAGS) qpopen.cpp
+
+project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
+	$(CXX) $(CXXFLAGS) project.cpp
+
+meta.o: $(SOURCE_PATH)/qmake/meta.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
+	$(CXX) $(CXXFLAGS) meta.cpp
+
+main.o: $(SOURCE_PATH)/qmake/main.cpp $(SOURCE_PATH)/qmake/project.h
+	$(CXX) $(CXXFLAGS) main.cpp
+
+option.o: $(SOURCE_PATH)/qmake/option.cpp $(SOURCE_PATH)/qmake/option.h
+	$(CXX) $(CXXFLAGS) option.cpp
+
+property.o: $(SOURCE_PATH)/qmake/property.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
+	$(CXX) $(CXXFLAGS) property.cpp
+
+projectgenerator.o: $(SOURCE_PATH)/qmake/generators/projectgenerator.cpp
+	$(CXX) $(CXXFLAGS) generators/projectgenerator.cpp
+
+pbuilder_pbx.o: $(SOURCE_PATH)/qmake/generators/mac/pbuilder_pbx.cpp
+	$(CXX) $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp
+
+makefiledeps.o: $(SOURCE_PATH)/qmake/generators/makefiledeps.cpp
+	$(CXX) $(CXXFLAGS) generators/makefiledeps.cpp
+
+metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
+	$(CXX) $(CXXFLAGS) generators/metamakefile.cpp
+
+xmloutput.o: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp
+	$(CXX) $(CXXFLAGS) generators/xmloutput.cpp
+
+qscriptasm.o: $(SOURCE_PATH)\src\script\qscriptasm.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptasm.cpp
+
+qscriptast.o: $(SOURCE_PATH)\src\script\qscriptast.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptast.cpp
+
+qscriptastvisitor.o: $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
+
+qscriptcompiler.o: $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
+
+qscriptecmaarray.o: $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
+
+qscriptecmaboolean.o: $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
+
+qscriptecmacore.o: $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
+
+qscriptecmadate.o: $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
+
+qscriptecmafunction.o: $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
+
+qscriptecmaglobal.o: $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
+
+qscriptecmamath.o: $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
+
+qscriptecmanumber.o: $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
+
+qscriptecmaobject.o: $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
+
+qscriptecmaregexp.o: $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
+
+qscriptecmastring.o: $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
+
+qscriptecmaerror.o: $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
+
+qscriptcontext_p.o: $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
+
+qscriptengine.o: $(SOURCE_PATH)/src/script/qscriptengine.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine.cpp
+
+qscriptengine_p.o: $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
+
+qscriptengineagent.o: $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
+
+qscriptextenumeration.o: $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
+
+qscriptextvariant.o: $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
+
+qscriptcontext.o: $(SOURCE_PATH)/src/script/qscriptcontext.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext.cpp
+
+qscriptcontextinfo.o: $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
+
+qscriptfunction.o: $(SOURCE_PATH)/src/script/qscriptfunction.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptfunction.cpp
+
+qscriptgrammar.o: $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
+
+qscriptlexer.o: $(SOURCE_PATH)/src/script/qscriptlexer.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptlexer.cpp
+
+qscriptclassdata.o: $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
+
+qscriptparser.o: $(SOURCE_PATH)/src/script/qscriptparser.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptparser.cpp
+
+qscriptprettypretty.o: $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
+
+qscriptsyntaxchecker.o: $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
+
+qscriptclass.o: $(SOURCE_PATH)/src/script/qscriptclass.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclass.cpp
+
+qscriptclasspropertyiterator.o: $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
+
+qscriptstring.o: $(SOURCE_PATH)/src/script/qscriptstring.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptstring.cpp
+
+qscriptvalue.o: $(SOURCE_PATH)/src/script/qscriptvalue.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalue.cpp
+
+qscriptvalueimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
+
+qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
+
+qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
+
+qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
+
+qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 36b6c004cb..c1d4601592 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -275,10 +275,12 @@ MakefileGenerator::initOutPaths()
                 int slash = path.lastIndexOf(Option::dir_sep);
                 if(slash != -1) {
                     path = path.left(slash);
-                    if(path != "." &&
-                       !mkdir(fileFixify(path, qmake_getpwd(), Option::output_dir)))
-                        warn_msg(WarnLogic, "%s: Cannot access directory '%s'",
-                                 (*it).toLatin1().constData(), path.toLatin1().constData());
+                    // Make out path only if it does not contains makefile variables
+                    if(!path.contains("${"))
+                        if(path != "." &&
+                           !mkdir(fileFixify(path, qmake_getpwd(), Option::output_dir)))
+                            warn_msg(WarnLogic, "%s: Cannot access directory '%s'",
+                                     (*it).toLatin1().constData(), path.toLatin1().constData());
                 }
             }
         }
@@ -1579,8 +1581,11 @@ MakefileGenerator::verifyExtraCompiler(const QString &comp, const QString &file_
     if(project->values(comp + ".CONFIG").indexOf("moc_verify") != -1) {
         if(!file.isNull()) {
             QMakeSourceFileInfo::addSourceFile(file, QMakeSourceFileInfo::SEEK_MOCS);
-            if(!mocable(file))
+            if(!mocable(file)) {
                 return false;
+            } else {
+                project->values("MOCABLES").append(file);
+            }
         }
     } else if(project->values(comp + ".CONFIG").indexOf("function_verify") != -1) {
         QString tmp_out = project->values(comp + ".output").first();
@@ -1697,6 +1702,10 @@ MakefileGenerator::writeExtraTargets(QTextStream &t)
         if(!cmd.isEmpty())
             t << "\n\t" << cmd;
         t << endl << endl;
+
+		project->values(QLatin1String("QMAKE_ET_PARSED_TARGETS.") + (*it)) << escapeDependencyPath(targ);
+		project->values(QLatin1String("QMAKE_ET_PARSED_DEPS.") + (*it) + escapeDependencyPath(targ)) << deps.split(" ", QString::SkipEmptyParts);
+		project->values(QLatin1String("QMAKE_ET_PARSED_CMD.") + (*it) + escapeDependencyPath(targ)) << cmd;
     }
 }
 
@@ -1784,6 +1793,8 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                 tmp_clean = tmp_out;
             if(tmp_clean.indexOf("${QMAKE_") == -1) {
                 t << "\n\t" << "-$(DEL_FILE) " << tmp_clean;
+                if (isForSymbian())
+                    t << " 2> NUL"; // Eliminate unnecessary warnings
                 wrote_clean = true;
             }
             if(!wrote_clean_cmds || !wrote_clean) {
@@ -1812,7 +1823,10 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                     }
                 }
                 if(!cleans.isEmpty())
-                    t << valGlue(cleans, "\n\t" + del_statement, "\n\t" + del_statement, "");
+                    if (isForSymbian())
+                        t << valGlue(cleans, "\n\t" + del_statement, " 2> NUL\n\t" + del_statement, " 2> NUL");
+                    else
+                        t << valGlue(cleans, "\n\t" + del_statement, "\n\t" + del_statement, "");
                 if(!wrote_clean_cmds) {
                     for(QStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
                         t << "\n\t" << replaceExtraCompilerVariables(tmp_clean_cmds, (*input),
@@ -1839,6 +1853,17 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                     QString dep_cmd = replaceExtraCompilerVariables(tmp_dep_cmd, (*input),
                                                                     tmp_out);
                     dep_cmd = fixEnvVariables(dep_cmd);
+#if defined(Q_CC_MWERKS) && defined(Q_OS_WIN32)
+                    QPopen procPipe;
+                    if (procPipe.init(dep_cmd.toLatin1().constData(), "r")) {
+                        QString indeps;
+                        while(true) {
+                            int read_in = procPipe.fread(buff, 255);
+                            if(!read_in)
+                                break;
+                            indeps += QByteArray(buff, read_in);
+                        }
+#else
                     if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) {
                         QString indeps;
                         while(!feof(proc)) {
@@ -1848,6 +1873,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                             indeps += QByteArray(buff, read_in);
                         }
                         QT_PCLOSE(proc);
+#endif
                         if(!indeps.isEmpty()) {
                             QStringList dep_cmd_deps = indeps.replace('\n', ' ').simplified().split(' ');
                             for(int i = 0; i < dep_cmd_deps.count(); ++i) {
@@ -1887,15 +1913,28 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
             if (inputs.isEmpty())
                 continue;
 
-            QString cmd = replaceExtraCompilerVariables(tmp_cmd, escapeFilePaths(inputs), QStringList(tmp_out));
+            QString cmd;
+            if (isForSymbianSbsv2()) {
+                // In sbsv2 the command inputs and outputs need to use absolute paths
+                cmd = replaceExtraCompilerVariables(tmp_cmd,
+                    fileFixify(escapeFilePaths(inputs), FileFixifyAbsolute),
+                    fileFixify(QStringList(tmp_out), FileFixifyAbsolute));
+            } else {
+                cmd = replaceExtraCompilerVariables(tmp_cmd, escapeFilePaths(inputs), QStringList(tmp_out));
+            }
+
             t << escapeDependencyPath(tmp_out) << ":";
+            project->values(QLatin1String("QMAKE_ET_PARSED_TARGETS.") + (*it)) << escapeDependencyPath(tmp_out);
             // compiler.CONFIG+=explicit_dependencies means that ONLY compiler.depends gets to cause Makefile dependencies
             if(project->values((*it) + ".CONFIG").indexOf("explicit_dependencies") != -1) {
                 t << " " << valList(escapeDependencyPaths(fileFixify(tmp_dep, Option::output_dir, Option::output_dir)));
+                project->values(QLatin1String("QMAKE_ET_PARSED_DEPS.") + (*it) + escapeDependencyPath(tmp_out)) << tmp_dep;
             } else {
                 t << " " << valList(escapeDependencyPaths(inputs)) << " " << valList(escapeDependencyPaths(deps));
+                project->values(QLatin1String("QMAKE_ET_PARSED_DEPS.") + (*it) + escapeDependencyPath(tmp_out)) << inputs << deps;
             }
             t << "\n\t" << cmd << endl << endl;
+            project->values(QLatin1String("QMAKE_ET_PARSED_CMD.") + (*it) + escapeDependencyPath(tmp_out)) << cmd;
             continue;
         }
         for(QStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
@@ -1910,12 +1949,31 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
             }
             QString cmd = replaceExtraCompilerVariables(tmp_cmd, (*input), out);
             // NOTE: The var -> QMAKE_COMP_var replace feature is unsupported, do not use!
+            if (isForSymbianSbsv2()) {
+                // In sbsv2 the command inputs and outputs need to use absolute paths
+                cmd = replaceExtraCompilerVariables(tmp_cmd,
+                    fileFixify((*input), FileFixifyAbsolute),
+                    fileFixify(out, FileFixifyAbsolute));
+            } else {
+                cmd = replaceExtraCompilerVariables(tmp_cmd, (*input), out);
+            }
             for(QStringList::ConstIterator it3 = vars.constBegin(); it3 != vars.constEnd(); ++it3)
                 cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
             if(!tmp_dep_cmd.isEmpty() && doDepends()) {
                 char buff[256];
                 QString dep_cmd = replaceExtraCompilerVariables(tmp_dep_cmd, (*input), out);
                 dep_cmd = fixEnvVariables(dep_cmd);
+#if defined(Q_CC_MWERKS) && defined(Q_OS_WIN32)
+                QPopen procPipe;
+                if (procPipe.init(dep_cmd.toLatin1().constData(), "r")) {
+                    QString indeps;
+                    while(true) {
+                        int read_in = procPipe.fread(buff, 255);
+                        if(!read_in)
+                            break;
+                        indeps += QByteArray(buff, read_in);
+                    }
+#else
                 if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) {
                     QString indeps;
                     while(!feof(proc)) {
@@ -1925,6 +1983,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                         indeps += QByteArray(buff, read_in);
                     }
                     QT_PCLOSE(proc);
+#endif
                     if(!indeps.isEmpty()) {
                         QStringList dep_cmd_deps = indeps.replace('\n', ' ').simplified().split(' ');
                         for(int i = 0; i < dep_cmd_deps.count(); ++i) {
@@ -1999,6 +2058,9 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
             }
             t << escapeDependencyPath(out) << ": " << valList(escapeDependencyPaths(deps)) << "\n\t"
               << cmd << endl << endl;
+            project->values(QLatin1String("QMAKE_ET_PARSED_TARGETS.") + (*it)) << escapeDependencyPath(out);
+            project->values(QLatin1String("QMAKE_ET_PARSED_DEPS.") + (*it) + escapeDependencyPath(out)) << deps;
+            project->values(QLatin1String("QMAKE_ET_PARSED_CMD.") + (*it) + escapeDependencyPath(out)) << cmd;
         }
     }
     t << "compiler_clean: " << clean_targets << endl << endl;
@@ -2170,8 +2232,8 @@ MakefileGenerator::writeHeader(QTextStream &t)
     t << endl;
 }
 
-void
-MakefileGenerator::writeSubDirs(QTextStream &t)
+QList<MakefileGenerator::SubTarget*>
+MakefileGenerator::findSubDirsSubTargets() const
 {
     QList<SubTarget*> targets;
     {
@@ -2268,6 +2330,13 @@ MakefileGenerator::writeSubDirs(QTextStream &t)
             }
         }
     }
+    return targets;
+}
+
+void
+MakefileGenerator::writeSubDirs(QTextStream &t)
+{
+    QList<SubTarget*> targets = findSubDirsSubTargets();
     t << "first: make_default" << endl;
     int flags = SubTargetInstalls;
     if(project->isActiveConfig("ordered"))
@@ -2284,39 +2353,43 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
     for(QStringList::Iterator qeui_it = qeui.begin(); qeui_it != qeui.end(); ++qeui_it)
         t << "include " << (*qeui_it) << endl;
 
-    QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
-    if(ofile.lastIndexOf(Option::dir_sep) != -1)
-        ofile.remove(0, ofile.lastIndexOf(Option::dir_sep) +1);
-    t << "MAKEFILE      = " << ofile << endl;
-    /* Calling Option::fixPathToTargetOS() is necessary for MinGW/MSYS, which requires
-     * back-slashes to be turned into slashes. */
-    t << "QMAKE         = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
-    t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << endl;
-    t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
-    t << "MKDIR         = " << var("QMAKE_MKDIR") << endl;
-    t << "COPY          = " << var("QMAKE_COPY") << endl;
-    t << "COPY_FILE     = " << var("QMAKE_COPY_FILE") << endl;
-    t << "COPY_DIR      = " << var("QMAKE_COPY_DIR") << endl;
-    t << "INSTALL_FILE  = " << var("QMAKE_INSTALL_FILE") << endl;
-    t << "INSTALL_PROGRAM = " << var("QMAKE_INSTALL_PROGRAM") << endl;
-    t << "INSTALL_DIR   = " << var("QMAKE_INSTALL_DIR") << endl;
-    t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << endl;
-    t << "SYMLINK       = " << var("QMAKE_SYMBOLIC_LINK") << endl;
-    t << "DEL_DIR       = " << var("QMAKE_DEL_DIR") << endl;
-    t << "MOVE          = " << var("QMAKE_MOVE") << endl;
-    t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
-    t << "MKDIR         = " << var("QMAKE_MKDIR") << endl;
+    if (!(flags & SubTargetSkipDefaultVariables)) {
+        QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
+        if(ofile.lastIndexOf(Option::dir_sep) != -1)
+            ofile.remove(0, ofile.lastIndexOf(Option::dir_sep) +1);
+        t << "MAKEFILE      = " << ofile << endl;
+        /* Calling Option::fixPathToTargetOS() is necessary for MinGW/MSYS, which requires
+         * back-slashes to be turned into slashes. */
+        t << "QMAKE         = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
+        t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << endl;
+        t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
+        t << "MKDIR         = " << var("QMAKE_MKDIR") << endl;
+        t << "COPY          = " << var("QMAKE_COPY") << endl;
+        t << "COPY_FILE     = " << var("QMAKE_COPY_FILE") << endl;
+        t << "COPY_DIR      = " << var("QMAKE_COPY_DIR") << endl;
+        t << "INSTALL_FILE  = " << var("QMAKE_INSTALL_FILE") << endl;
+        t << "INSTALL_PROGRAM = " << var("QMAKE_INSTALL_PROGRAM") << endl;
+        t << "INSTALL_DIR   = " << var("QMAKE_INSTALL_DIR") << endl;
+        t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << endl;
+        t << "SYMLINK       = " << var("QMAKE_SYMBOLIC_LINK") << endl;
+        t << "DEL_DIR       = " << var("QMAKE_DEL_DIR") << endl;
+        t << "MOVE          = " << var("QMAKE_MOVE") << endl;
+        t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
+        t << "MKDIR         = " << var("QMAKE_MKDIR") << endl;
+        t << "SUBTARGETS    = ";     // subtargets are sub-directory
+        for(int target = 0; target < targets.size(); ++target)
+            t << " \\\n\t\t" << targets.at(target)->target;
+        t << endl << endl;
+    }
     writeExtraVariables(t);
-    t << "SUBTARGETS    = ";     // subtargets are sub-directory
-    for(int target = 0; target < targets.size(); ++target)
-        t << " \\\n\t\t" << targets.at(target)->target;
-    t << endl << endl;
 
     QStringList targetSuffixes;
     const QString abs_source_path = project->first("QMAKE_ABSOLUTE_SOURCE_PATH");
-    targetSuffixes << "make_default" << "make_first" << "all" << "clean" << "distclean"
-                   << QString((flags & SubTargetInstalls) ? "install_subtargets" : "install")
-                   << QString((flags & SubTargetInstalls) ? "uninstall_subtargets" : "uninstall");
+    if (!(flags & SubTargetSkipDefaultTargets)) {
+        targetSuffixes << "make_default" << "make_first" << "all" << "clean" << "distclean"
+                       << QString((flags & SubTargetInstalls) ? "install_subtargets" : "install")
+                       << QString((flags & SubTargetInstalls) ? "uninstall_subtargets" : "uninstall");
+    }
 
     // generate target rules
     for(int target = 0; target < targets.size(); ++target) {
@@ -2436,23 +2509,25 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
     }
     t << endl;
 
-    if(project->values("QMAKE_INTERNAL_QMAKE_DEPS").indexOf("qmake_all") == -1)
-        project->values("QMAKE_INTERNAL_QMAKE_DEPS").append("qmake_all");
+    if (!(flags & SubTargetSkipDefaultTargets)) {
+        if(project->values("QMAKE_INTERNAL_QMAKE_DEPS").indexOf("qmake_all") == -1)
+            project->values("QMAKE_INTERNAL_QMAKE_DEPS").append("qmake_all");
 
-    writeMakeQmake(t);
+        writeMakeQmake(t);
 
-    t << "qmake_all:";
-    if(!targets.isEmpty()) {
-        for(QList<SubTarget*>::Iterator it = targets.begin(); it != targets.end(); ++it) {
-            if(!(*it)->profile.isEmpty())
-                t << " " << (*it)->target << "-" << "qmake_all";
+        t << "qmake_all:";
+        if(!targets.isEmpty()) {
+            for(QList<SubTarget*>::Iterator it = targets.begin(); it != targets.end(); ++it) {
+                if(!(*it)->profile.isEmpty())
+                    t << " " << (*it)->target << "-" << "qmake_all";
+            }
         }
+        if(project->isEmpty("QMAKE_NOFORCE"))
+            t <<  " FORCE";
+        if(project->isActiveConfig("no_empty_targets"))
+            t << "\n\t" << "@cd .";
+        t << endl << endl;
     }
-    if(project->isEmpty("QMAKE_NOFORCE"))
-        t <<  " FORCE";
-    if(project->isActiveConfig("no_empty_targets"))
-        t << "\n\t" << "@cd .";
-    t << endl << endl;
 
     for(int s = 0; s < targetSuffixes.size(); ++s) {
         QString suffix = targetSuffixes.at(s);
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 79a70312b8..6c212d7e5e 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -53,8 +53,12 @@
 QT_BEGIN_NAMESPACE
 
 #ifdef Q_OS_WIN32
+#if defined(Q_CC_MWERKS)
+#include "qpopen.h"
+#else
 #define QT_POPEN _popen
 #define QT_PCLOSE _pclose
+#endif
 #else
 #define QT_POPEN popen
 #define QT_PCLOSE pclose
@@ -84,6 +88,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo
     QString build_args(const QString &outdir=QString());
     void checkMultipleDefinition(const QString &, const QString &);
 
+protected:
     //internal caches
     mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache;
     mutable QHash<QString, QStringList> dependsCache;
@@ -116,9 +121,12 @@ protected:
     enum SubTargetFlags {
         SubTargetInstalls=0x01,
         SubTargetOrdered=0x02,
+        SubTargetSkipDefaultVariables=0x04,
+        SubTargetSkipDefaultTargets=0x08,
 
         SubTargetsNoFlags=0x00
     };
+    QList<MakefileGenerator::SubTarget*> findSubDirsSubTargets() const;
     void writeSubTargets(QTextStream &t, QList<SubTarget*> subtargets, int flags);
 
     //extra compiler interface
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 34d3698456..d36be3ccaa 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -263,8 +263,9 @@ MakefileGenerator
 
 class SubdirsMetaMakefileGenerator : public MetaMakefileGenerator
 {
+protected:
+
     bool init_flag;
-private:
     struct Subdir {
         Subdir() : makefile(0), indent(0) { }
         ~Subdir() { delete makefile; }
@@ -375,6 +376,7 @@ SubdirsMetaMakefileGenerator::init()
     self->makefile = new BuildsMetaMakefileGenerator(project, name, false);
     self->makefile->init();
     subs.append(self);
+
     return true;
 }
 
@@ -418,6 +420,306 @@ SubdirsMetaMakefileGenerator::~SubdirsMetaMakefileGenerator()
     subs.clear();
 }
 
+class SymbianSubdirsMetaMakefileGenerator : public SubdirsMetaMakefileGenerator {
+
+public:
+    SymbianSubdirsMetaMakefileGenerator(QMakeProject *p, const QString &n, bool op) : SubdirsMetaMakefileGenerator(p, n, op) { }
+    virtual ~SymbianSubdirsMetaMakefileGenerator();
+
+    virtual bool init();
+    virtual bool write(const QString &);
+
+protected:
+
+    static QMap<QString, QString> mmpPaths;
+
+    static QMultiMap<QString, QString> mmpDependency;
+
+    static QStringList getDependencyList(QString mmpFilename, int recursionDepth);
+
+    static QStringList calculateRelativePaths(QString mmpParent, QStringList mmpChildren);
+
+private:
+    QString cleanFromSpecialCharacters(QString& str);
+
+};
+
+QMap<QString, QString> SymbianSubdirsMetaMakefileGenerator::mmpPaths;
+
+QMultiMap<QString, QString> SymbianSubdirsMetaMakefileGenerator::mmpDependency;
+
+QStringList SymbianSubdirsMetaMakefileGenerator::getDependencyList(QString mmpFilename, int recursionDepth) {
+
+    QStringList list;
+
+    // printf("Entering recursion mmpFilename = %s and depth = %d \n", qPrintable(mmpFilename), recursionDepth);
+
+    QList<QString> values = mmpDependency.values(mmpFilename);
+    if(recursionDepth < 0) {
+        // special case
+        // just first dependency level
+        list = values;
+        return list;
+
+    }
+    if(values.size() == 0) {
+
+        //reached recursion END condition
+        if(recursionDepth == 0) {
+            --recursionDepth;
+            return list; // empty list // no dependencies / return
+        }
+        else {
+            list.append(mmpFilename);
+            recursionDepth--;
+            return list; // leaf // return
+        }
+    } else {
+        recursionDepth++;
+        for (int i = 0; i < values.size(); ++i) {
+               QString current = values.at(i);
+               QStringList tailList = getDependencyList(current, recursionDepth);
+               for(int j = 0; j < tailList.size(); ++j) {
+                   //QString path = mmpFilename + tailList.at(j);
+                   QString path = tailList.at(j);
+                   list.append(path);
+                   //printf("MMPDEPENDENCY:  %s\n", path.toAscii().data());
+               }// for(int j = 0; j < values.size(); ++j)
+               //list.append(current);
+        } // for (int i = 0; i < values.size(); ++i)
+
+        if(recursionDepth > 0) {
+            //for mmp somewhere in middle
+            list.append(mmpFilename);
+        }
+        recursionDepth--;
+        return list;
+    }
+
+}
+SymbianSubdirsMetaMakefileGenerator::~SymbianSubdirsMetaMakefileGenerator() { }
+
+bool SymbianSubdirsMetaMakefileGenerator::write(const QString &oldpwd) {
+    return SubdirsMetaMakefileGenerator::write(oldpwd);
+}
+
+QString SymbianSubdirsMetaMakefileGenerator::cleanFromSpecialCharacters(QString& str) {
+    QString tmp = str;
+
+    tmp.replace(QString("/"), QString("_"));
+    tmp.replace(QString("\\"), QString("_"));
+    tmp.replace(QString("-"), QString("_"));
+    tmp.replace(QString(":"), QString("_"));
+    tmp.replace(QString("."), QString("_"));
+
+    return tmp;
+}
+
+bool SymbianSubdirsMetaMakefileGenerator::init() {
+
+    if(init_flag)
+        return false;
+
+    init_flag = true;
+
+    /*
+        Not neccessary as it was
+        causing second pass through
+        subdir elements
+
+        SubdirsMetaMakefileGenerator::init();
+    */
+
+    /*
+        if we are here then we have template = subdirs
+
+        so...   go for it ...
+    */
+
+    Option::recursive = true;
+
+    if(Option::recursive) {
+        QString old_output_dir = QDir::cleanPath(Option::output_dir);
+        if(!old_output_dir.endsWith('/'))
+           old_output_dir += '/';
+	QString old_output = Option::output.fileName();
+        QString oldpwd = QDir::cleanPath(qmake_getpwd());
+
+        if(!oldpwd.endsWith('/'))
+           oldpwd += '/';
+
+        // find the parent mmp filename
+        int end = oldpwd.size() - 1;
+        int start = oldpwd.lastIndexOf("/", end - 2);
+        QString parentMmpFilename = oldpwd.mid(start + 1, end - start - 1);
+        parentMmpFilename.prepend(oldpwd);
+        parentMmpFilename = parentMmpFilename.append(".mmp");
+
+
+        const QStringList &subdirs = project->values("SUBDIRS");
+        static int recurseDepth = -1;
+        ++recurseDepth;
+        for(int i = 0; i < subdirs.size(); ++i) {
+            Subdir *sub = new Subdir;
+            sub->indent = recurseDepth;
+
+            QFileInfo subdir(subdirs.at(i));
+            // childMmpFielname should be derived from subdirName
+            QString subdirName = subdirs.at(i);
+            if(!project->isEmpty(subdirs.at(i) + ".file"))
+                subdir = project->first(subdirs.at(i) + ".file");
+            else if(!project->isEmpty(subdirs.at(i) + ".subdir"))
+                subdir = project->first(subdirs.at(i) + ".subdir");
+            QString sub_name;
+
+            QString childMmpFilename;
+
+            if(subdir.isDir()) {
+                subdir = QFileInfo(subdir.filePath() + "/" + subdir.fileName() + Option::pro_ext);
+                childMmpFilename = subdir.fileName();
+                // TODO: create Option::mmp_ext
+                childMmpFilename = subdir.absoluteFilePath();
+                childMmpFilename.replace(Option::pro_ext, QString(""));
+                childMmpFilename.append(".mmp");
+            }
+            else {
+                childMmpFilename = subdir.absoluteFilePath();
+                childMmpFilename.replace(QString(".pro"), QString(".mmp"));
+                sub_name = childMmpFilename;
+                sub_name.replace(QString(".mmp"), QString(""));
+                sub_name.replace(0, sub_name.lastIndexOf("/") + 1, QString(""));
+                project->values("SHADOW_BLD_INFS").append(QString("bld.inf.") + sub_name);
+            }
+
+            //handle sub project
+            QMakeProject *sub_proj = new QMakeProject(project->properties());
+            for (int ind = 0; ind < sub->indent; ++ind)
+                printf(" ");
+            sub->input_dir = subdir.absolutePath();
+            if(subdir.isRelative() && old_output_dir != oldpwd) {
+                sub->output_dir = old_output_dir + "/" + subdir.path();
+                printf("Reading %s [%s]\n", subdir.absoluteFilePath().toLatin1().constData(), sub->output_dir.toLatin1().constData());
+            } else { //what about shadow builds?
+                sub->output_dir = sub->input_dir;
+                printf("Reading %s\n", subdir.absoluteFilePath().toLatin1().constData());
+            }
+
+            // find the child mmp filename
+            qmake_setpwd(sub->input_dir);
+
+            QString newpwd = qmake_getpwd();
+
+            Option::output_dir = sub->output_dir;
+            if(Option::output_dir.at(Option::output_dir.length()-1) != QLatin1Char('/'))
+                Option::output_dir += QLatin1Char('/');
+            sub_proj->read(subdir.fileName());
+            if(!sub_proj->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
+                fprintf(stderr, "Project file(%s) not recursed because all requirements not met:\n\t%s\n",
+                        subdir.fileName().toLatin1().constData(),
+                        sub_proj->values("QMAKE_FAILED_REQUIREMENTS").join(" ").toLatin1().constData());
+                delete sub;
+                delete sub_proj;
+                //continue;
+            } else {
+                // map mmpfile to its absolut filepath
+                mmpPaths.insert(childMmpFilename, newpwd);
+
+                // update mmp files dependency map
+                mmpDependency.insert(parentMmpFilename, childMmpFilename);
+
+                sub->makefile = MetaMakefileGenerator::createMetaGenerator(sub_proj, sub_name);
+                if(0 && sub->makefile->type() == SUBDIRSMETATYPE) {
+                    subs.append(sub);
+                } else {
+                    const QString output_name = Option::output.fileName();
+                    Option::output.setFileName(sub->output_file);
+                    sub->makefile->write(sub->output_dir);
+                    delete sub;
+                    qmakeClearCaches();
+                    sub = 0;
+                    Option::output.setFileName(output_name);
+                }
+            }
+
+            Option::output_dir = old_output_dir;
+            qmake_setpwd(oldpwd);
+
+        }
+        --recurseDepth;
+	Option::output.setFileName(old_output);
+        Option::output_dir = old_output_dir;
+        qmake_setpwd(oldpwd);
+    }
+
+    Subdir *self = new Subdir;
+    self->input_dir = qmake_getpwd();
+
+    // to fully expand find all dependencies
+    // do as recursion, then
+    // insert result
+    // as subdirs data in project
+    QString newpwd = qmake_getpwd();
+    if(!newpwd.endsWith('/'))
+        newpwd += '/';
+    int end = newpwd.size() - 1;
+    int start = newpwd.lastIndexOf("/", end - 2);
+    QString mmpFilename = newpwd.mid(start + 1, end - start - 1);
+    mmpFilename.prepend(newpwd);
+    mmpFilename = mmpFilename.append(".mmp");
+
+    // map mmpfile to its absolut filepath
+    mmpPaths.insert(mmpFilename, newpwd);
+
+    QStringList directDependencyList = getDependencyList(mmpFilename, -1);
+    for(int i = 0; i < directDependencyList.size(); ++i) {
+        project->values("MMPFILES_DIRECT_DEPENDS").append(directDependencyList.at(i));
+    }
+
+    QStringList dependencyList = getDependencyList(mmpFilename, 0);
+/*
+    printf("\n \n PRINTING DEPENDENCY FOR: %s \n", mmpFilename.toAscii().data());
+    // print it for debug
+    for(int i = 0; i < dependencyList.size(); ++i) {
+        printf("FINAL MMP DEPENDENCIES: %s\n", dependencyList.at(i).toAscii().data());
+    }
+    printf("\n \n");
+
+    printf("\n \n PRINTING DIRECT DEPENDENCY FOR: %s \n", mmpFilename.toAscii().data());
+    // print it for debug
+    for(int i = 0; i < directDependencyList.size(); ++i) {
+        printf("DIRECT MMP DEPENDENCIES: %s\n", directDependencyList.at(i).toAscii().data());
+    }
+    printf("\n \n");
+*/
+    self->output_dir = Option::output_dir;
+    if(!Option::recursive || (!Option::output.fileName().endsWith(Option::dir_sep) && !QFileInfo(Option::output).isDir()))
+	self->output_file = Option::output.fileName();
+    self->makefile = new BuildsMetaMakefileGenerator(project, name, false);
+    self->makefile->init();
+    subs.append(self);
+    return true;
+}
+
+QStringList SymbianSubdirsMetaMakefileGenerator::calculateRelativePaths(QString mmpParent, QStringList mmpChildren) {
+    QStringList mmpRelativePaths;
+    QString parentDir = mmpPaths.value(mmpParent);
+    QDir directory(parentDir);
+    for(int i = 0; i < mmpChildren.size(); ++i) {
+        QString childDir = mmpPaths.value(mmpChildren.at(i));
+        if(mmpChildren.at(i) == mmpParent)
+            mmpRelativePaths.append(mmpChildren.at(i));
+        else {
+            QString relativePath = directory.relativeFilePath(childDir);
+            if(relativePath.startsWith(".."))
+                mmpRelativePaths.append(childDir);
+            else
+                directory.relativeFilePath(relativePath);
+            //mmpRelativePaths.append(directory.relativeFilePath(childDir) + "/" + mmpChildren.at(i));
+        }
+    }
+    return mmpRelativePaths;
+}
+
 //Factory things
 QT_BEGIN_INCLUDE_NAMESPACE
 #include "unixmake.h"
@@ -428,6 +730,8 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #include "borland_bmake.h"
 #include "msvc_dsp.h"
 #include "msvc_vcproj.h"
+#include "symmake_abld.h"
+#include "symmake_sbsv2.h"
 QT_END_INCLUDE_NAMESPACE
 
 MakefileGenerator *
@@ -464,6 +768,10 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO)
             mkfile = new NmakeMakefileGenerator;
     } else if(gen == "BMAKE") {
         mkfile = new BorlandMakefileGenerator;
+    } else if(gen == "SYMBIAN_ABLD") {
+        mkfile = new SymbianAbldMakefileGenerator;
+    } else if(gen == "SYMBIAN_SBSV2") {
+        mkfile = new SymbianSbsv2MakefileGenerator;
     } else {
         fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());
     }
@@ -480,7 +788,10 @@ MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &na
     MetaMakefileGenerator *ret = 0;
     if((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
         Option::qmake_mode == Option::QMAKE_GENERATE_PRL)) {
-        if(proj->first("TEMPLATE").endsWith("subdirs"))
+        if(proj->first("MAKEFILE_GENERATOR").startsWith("SYMBIAN") && proj->values("TEMPLATE").contains("subdirs")) {
+            // new metamakefilegenerator type to support subdirs for symbian related projects
+            ret = new SymbianSubdirsMetaMakefileGenerator(proj, name, op);
+        } else if (proj->first("TEMPLATE").endsWith("subdirs"))
             ret = new SubdirsMetaMakefileGenerator(proj, name, op);
     }
     if(!ret)
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
new file mode 100644
index 0000000000..22e4aadd0f
--- /dev/null
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -0,0 +1,244 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "initprojectdeploy_symbian.h"
+#include <QDirIterator>
+#include <project.h>
+#include <qdebug.h>
+
+#define PLUGIN_STUB_DIR "qmakepluginstubs"
+
+static bool isPlugin(const QFileInfo& info, const QString& devicePath)
+{
+    // Libraries are plugins if deployment path is something else than
+    // \\sys\\bin or x:\\sys\\bin
+    if (0 == info.suffix().compare(QLatin1String("dll")) &&
+        (devicePath.size() < 8 ||
+         (0 != devicePath.compare(QLatin1String("\\sys\\bin")) &&
+          0 != devicePath.mid(1).compare(QLatin1String(":\\sys\\bin"))))) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool isBinary(const QFileInfo& info)
+{
+    if (0 == info.suffix().compare(QLatin1String("dll")) ||
+        0 == info.suffix().compare(QLatin1String("exe"))) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static void createPluginStub(const QFileInfo& info,
+                             const QString& devicePath,
+                             DeploymentList &deploymentList,
+                             QStringList& generatedDirs,
+                             QStringList& generatedFiles) {
+    QDir().mkpath(QLatin1String(PLUGIN_STUB_DIR "\\"));
+    if (!generatedDirs.contains(PLUGIN_STUB_DIR))
+        generatedDirs << PLUGIN_STUB_DIR;
+    // Plugin stubs must have different name from the actual plugins, because
+    // the toolchain for creating ROM images cannot handle non-binary .dll files properly.
+    QFile stubFile(QLatin1String(PLUGIN_STUB_DIR "\\") + info.completeBaseName() + ".qtplugin");
+    if(stubFile.open(QIODevice::WriteOnly)) {
+        if (!generatedFiles.contains(stubFile.fileName()))
+            generatedFiles << stubFile.fileName();
+        QTextStream t(&stubFile);
+        // Add note to stub so that people will not wonder what it is.
+        // Creation date is added to make new stub to deploy always to
+        // force plugin cache miss when loading plugins.
+        t << "This file is a Qt plugin stub file. The real Qt plugin is located in \\sys\\bin. Created:" << QDateTime::currentDateTime().toString(Qt::ISODate) << "\n";
+    } else {
+        fprintf(stderr, "cannot deploy \"%s\" because of plugin stub file creation failed\n", info.fileName().toLatin1().constData());
+    }
+    QFileInfo stubInfo(stubFile);
+    deploymentList.append(CopyItem(Option::fixPathToLocalOS(stubInfo.absoluteFilePath()),
+        Option::fixPathToLocalOS(devicePath + "\\" + stubInfo.fileName())));
+}
+
+void initProjectDeploySymbian(QMakeProject* project,
+                              DeploymentList &deploymentList,
+                              const QString &testPath,
+                              bool deployBinaries,
+                              const QString &platform,
+                              const QString &build,
+                              QStringList& generatedDirs,
+                              QStringList& generatedFiles)
+{
+    QString targetPath = project->values("deploy.path").join(" ");
+    if (targetPath.isEmpty())
+        targetPath = testPath;
+    if (targetPath.endsWith("/") || targetPath.endsWith("\\"))
+        targetPath = targetPath.mid(0,targetPath.size()-1);
+
+    bool targetPathHasDriveLetter = false;
+    if (targetPath.size() > 1) {
+        targetPathHasDriveLetter = targetPath.at(1) == QLatin1Char(':');
+    }
+    QString deploymentDrive = targetPathHasDriveLetter ? targetPath.left(2) : QLatin1String("c:");
+
+    // foreach item in DEPLOYMENT
+    foreach(QString item, project->values("DEPLOYMENT")) {
+        // get item.path
+        QString devicePath = project->first(item + ".path");
+        if (!deployBinaries
+            && !devicePath.isEmpty()
+            && (0 == devicePath.compare(project->values("APP_RESOURCE_DIR").join(""))
+              || 0 == devicePath.compare(project->values("REG_RESOURCE_IMPORT_DIR").join("")))) {
+            // Do not deploy resources in emulator builds, as that seems to cause conflicts
+            // If there is ever a real need to deploy pre-built resources for emulator,
+            // BLD_INF_RULES.prj_exports can be used as a workaround.
+            continue;
+        }
+
+        bool devicePathHasDriveLetter = false;
+        if (devicePath.size() > 1) {
+            devicePathHasDriveLetter = devicePath.at(1) == QLatin1Char(':');
+        }
+
+        if (devicePath.isEmpty() || devicePath == QLatin1String(".")) {
+            devicePath = targetPath;
+        }
+        // check if item.path is relative (! either / or \)
+        else if (!(devicePath.at(0) == QLatin1Char('/')
+            || devicePath.at(0) == QLatin1Char('\\')
+            || devicePathHasDriveLetter)) {
+            // create output path
+            devicePath = Option::fixPathToLocalOS(QDir::cleanPath(targetPath + QLatin1Char('\\') + devicePath));
+        } else {
+            if (0 == platform.compare(QLatin1String("winscw"))) {
+                if (devicePathHasDriveLetter) {
+                    devicePath = epocRoot() + "epoc32\\winscw\\" + devicePath.remove(1,1);
+                } else {
+                    devicePath = epocRoot() + "epoc32\\winscw\\c" + devicePath;
+                }
+            } else {
+                // Drive letter needed if targetpath contains one and it is not already in
+                if (targetPathHasDriveLetter && !devicePathHasDriveLetter) {
+                    devicePath = deploymentDrive + devicePath;
+                }
+            }
+        }
+
+        devicePath.replace(QLatin1String("/"), QLatin1String("\\"));
+
+        if (!deployBinaries &&
+            0 == devicePath.right(8).compare(QLatin1String("\\sys\\bin"))) {
+                // Skip deploying to \\sys\\bin for anything but binary deployments
+                // Note: Deploying pre-built binaries also follow this rule, so emulator builds
+                // will not get those deployed. Since there is no way to differentiate currently
+                // between pre-built binaries for emulator and HW anyway, this is not a major issue.
+                continue;
+            }
+
+        // foreach d in item.sources
+        foreach(QString source, project->values(item + ".sources")) {
+            source = Option::fixPathToLocalOS(source);
+            QString nameFilter;
+            QFileInfo info(source);
+            QString searchPath;
+            bool dirSearch = false;
+
+            if (info.isDir()) {
+                nameFilter = QLatin1String("*");
+                searchPath = info.absoluteFilePath();
+                dirSearch = true;
+            } else {
+                if (info.exists() || source.indexOf('*') != -1) {
+                    nameFilter = source.split('\\').last();
+                    searchPath = info.absolutePath();
+                } else {
+                    // Entry was not found. That is ok if it is a binary, since those do not necessarily yet exist.
+                    // Dlls need to be processed even when not deploying binaries for the stubs
+                    if (isBinary(info)) {
+                        if (deployBinaries) {
+                            // Executables and libraries are deployed to \sys\bin
+                            QFileInfo releasePath(epocRoot() + "epoc32\\release\\" + platform + "\\" + build + "\\");
+                            deploymentList.append(CopyItem(Option::fixPathToLocalOS(releasePath.absolutePath() + "\\" + info.fileName()),
+                                Option::fixPathToLocalOS(deploymentDrive + QLatin1String("\\sys\\bin\\") + info.fileName())));
+                        }
+                        if (isPlugin(info, devicePath)) {
+                            createPluginStub(info, devicePath, deploymentList, generatedDirs, generatedFiles);
+                            continue;
+                        }
+                    } else {
+                        // Generate deployment even if file doesn't exist, as this may be the case
+                        // when generating .pkg files.
+                        deploymentList.append(CopyItem(Option::fixPathToLocalOS(info.absoluteFilePath()),
+                            Option::fixPathToLocalOS(devicePath + "\\" + info.fileName())));
+                        continue;
+                    }
+                }
+            }
+
+            int pathSize = info.absolutePath().size();
+            QDirIterator iterator(searchPath, QStringList() << nameFilter
+                                  , QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks
+                                  , dirSearch ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags );
+            // foreach dirIterator-entry in d
+            while(iterator.hasNext()) {
+                iterator.next();
+                QFileInfo iteratorInfo(iterator.filePath());
+                QString absoluteItemPath = Option::fixPathToLocalOS(iteratorInfo.absolutePath());
+                int diffSize = absoluteItemPath.size() - pathSize;
+
+                if (!iteratorInfo.isDir()) {
+                    if (isPlugin(iterator.fileInfo(), devicePath)) {
+                        // This deploys pre-built plugins. Other pre-built binaries will deploy normally,
+                        // as they have \sys\bin target path.
+                        if (deployBinaries) {
+                            deploymentList.append(CopyItem(Option::fixPathToLocalOS(absoluteItemPath + "\\" + iterator.fileName()),
+                                Option::fixPathToLocalOS(deploymentDrive + QLatin1String("\\sys\\bin\\") + iterator.fileName())));
+                        }
+                        createPluginStub(info, devicePath + "\\" + absoluteItemPath.right(diffSize), deploymentList, generatedDirs, generatedFiles);
+                        continue;
+                    } else {
+                        deploymentList.append(CopyItem(Option::fixPathToLocalOS(absoluteItemPath + "\\" + iterator.fileName()),
+                            Option::fixPathToLocalOS(devicePath + "\\" + absoluteItemPath.right(diffSize) + "\\" + iterator.fileName())));
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.h b/qmake/generators/symbian/initprojectdeploy_symbian.h
new file mode 100644
index 0000000000..0aad431f40
--- /dev/null
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef INITPROJECTDEPLOYSYMBIAN_H
+#define INITPROJECTDEPLOYSYMBIAN_H
+
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qdatetime.h>
+#include <option.h>
+#include <qdir.h>
+#include <qfile.h>
+#include <stdlib.h>
+
+struct CopyItem
+{
+    CopyItem(const QString& f, const QString& t) : from(f) , to(t) { }
+    QString from;
+    QString to;
+};
+typedef QList<CopyItem> DeploymentList;
+
+extern void initProjectDeploySymbian(QMakeProject* project,
+                              DeploymentList &deploymentList,
+                              const QString &testPath,
+                              bool deployBinaries,
+                              const QString &platform,
+                              const QString &build,
+                              QStringList& generatedDirs,
+                              QStringList& generatedFiles);
+#endif // INITPROJECTDEPLOYSYMBIAN_H
\ No newline at end of file
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
new file mode 100644
index 0000000000..374d058a09
--- /dev/null
+++ b/qmake/generators/symbian/symmake.cpp
@@ -0,0 +1,1712 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "symmake.h"
+#include "initprojectdeploy_symbian.h"
+
+#include <qstring.h>
+#include <qhash.h>
+#include <qstringlist.h>
+#include <qdir.h>
+#include <qdatetime.h>
+#include <stdlib.h>
+#include <qdebug.h>
+
+#define RESOURCE_DIRECTORY_MMP "/resource/apps"
+#define RESOURCE_DIRECTORY_RESOURCE "\\\\resource\\\\apps\\\\"
+#define REGISTRATION_RESOURCE_DIRECTORY_HW "/private/10003a3f/import/apps"
+#define PLUGIN_COMMON_DEF_FILE_FOR_MMP "./plugin_common.def"
+#define PLUGIN_COMMON_DEF_FILE_ACTUAL "plugin_commonU.def"
+#define BLD_INF_FILENAME_LEN (sizeof(BLD_INF_FILENAME) - 1)
+
+#define BLD_INF_RULES_BASE "BLD_INF_RULES."
+#define BLD_INF_TAG_PLATFORMS "prj_platforms"
+#define BLD_INF_TAG_MMPFILES "prj_mmpfiles"
+#define BLD_INF_TAG_TESTMMPFILES "prj_testmmpfiles"
+#define BLD_INF_TAG_EXTENSIONS "prj_extensions"
+#define RSS_RULES "RSS_RULES"
+#define RSS_RULES_BASE "RSS_RULES."
+#define RSS_TAG_NBROFICONS "number_of_icons"
+#define RSS_TAG_ICONFILE "icon_file"
+
+#define DUMP_VAR(v) \
+{ \
+    QString s(v); \
+    QStringList list = project->values(s); \
+    printf("----------------------------------\n", qPrintable(s)); \
+    printf("Dumping %s (%d items) from %s, %d\n", \
+            qPrintable(s), \
+            list.count(), \
+            __FILE__, \
+            __LINE__); \
+    foreach(QString l, list) \
+        printf("\t%s\n", qPrintable(l)); \
+}
+
+QString SymbianMakefileGenerator::fixPathForMmp(const QString& origPath, const QDir& parentDir)
+{
+    static QString epocRootStr;
+    if (epocRootStr.isEmpty()) {
+        QFileInfo efi(epocRoot());
+        epocRootStr = efi.canonicalFilePath();
+        if (epocRootStr.isEmpty()) {
+            fprintf(stderr, "Unable to resolve epocRoot '%s' to real dir on current drive, defaulting to '/' for mmp paths\n", qPrintable(epocRoot()));
+            epocRootStr = "/";
+        }
+        if (!epocRootStr.endsWith("/"))
+            epocRootStr += "/";
+
+        epocRootStr += "epoc32/";
+    }
+
+    QString resultPath = origPath;
+
+    // Make it relative, unless it starts with "%epocroot%/epoc32/"
+    if (resultPath.startsWith(epocRootStr, Qt::CaseInsensitive)) {
+        resultPath.replace(epocRootStr, "/epoc32/", Qt::CaseInsensitive);
+    } else {
+        resultPath = parentDir.relativeFilePath(resultPath);
+    }
+    resultPath = QDir::cleanPath(resultPath);
+
+    if (resultPath.isEmpty())
+        resultPath = ".";
+
+    return resultPath;
+}
+
+QString SymbianMakefileGenerator::canonizePath(const QString& origPath)
+{
+    // Since current path gets appended almost always anyway, use it as default
+    // for nonexisting paths.
+    static QString defaultPath;
+    if (defaultPath.isEmpty()) {
+        QFileInfo fi(".");
+        defaultPath = fi.canonicalFilePath();
+    }
+
+    // Prepend epocroot to any paths beginning with "/epoc32/"
+    QString resultPath = QDir::fromNativeSeparators(origPath);
+    if (resultPath.startsWith("/epoc32/", Qt::CaseInsensitive))
+        resultPath = QDir::fromNativeSeparators(epocRoot()) + resultPath.mid(1);
+
+    QFileInfo fi(fileInfo(resultPath));
+    if(fi.isDir()) {
+        resultPath = fi.canonicalFilePath();
+    } else {
+        resultPath = fi.canonicalPath();
+    }
+
+    resultPath = QDir::cleanPath(resultPath);
+
+    if (resultPath.isEmpty())
+        resultPath = defaultPath;
+
+    return resultPath;
+}
+
+SymbianMakefileGenerator::SymbianMakefileGenerator() : MakefileGenerator() { }
+SymbianMakefileGenerator::~SymbianMakefileGenerator() { }
+
+void SymbianMakefileGenerator::writeHeader(QTextStream &t) {
+    t << "// ============================================================================" << endl;
+    t << "// * Makefile for building: " << escapeFilePath(var("TARGET")) << endl;
+    t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
+    t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
+    t << "// * This file is generated by qmake and should not be modified by the" << endl;
+    t << "// * user." << endl;
+    t << "// * Project:  " << fileFixify(project->projectFile()) << endl;
+    t << "// * Template: " << var("TEMPLATE") << endl;
+    //if(!project->isActiveConfig("build_pass"))
+    //    t << "// = Command: " << build_args().replace("$(QMAKE)",
+    //                  (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE"))) << endl;
+    t << "// ============================================================================" << endl;
+    t << endl;
+
+    // defining define for bld.inf
+
+    QString shortProFilename = project->projectFile();
+    shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
+    shortProFilename.replace(QString(".pro"), QString(""));
+
+    QString bldinfDefine = shortProFilename;
+    bldinfDefine.append("_");
+    bldinfDefine.append(generate_uid(project->projectFile()));
+
+    bldinfDefine.prepend("BLD_INF_");
+    removeSpecialCharacters(bldinfDefine);
+
+    t << "#define " << bldinfDefine.toUpper() << endl << endl;
+}
+
+bool SymbianMakefileGenerator::writeMakefile(QTextStream &t) {
+    writeHeader(t);
+
+    QString numberOfIcons;
+    QString iconFile;
+    QStringList userRssRules;
+    readRssRules(numberOfIcons, iconFile, userRssRules);
+
+    // Get the application translations and convert to symbian OS lang code, i.e. decical number
+    QStringList symbianLangCodes = symbianLangCodesFromTsFiles();
+
+    // Generate pkg files if there are any actual files to deploy
+    bool generatePkg = false;
+    if (getTargetExtension() == "exe") {
+        generatePkg = true;
+    } else {
+        foreach(QString item, project->values("DEPLOYMENT")) {
+            if (!project->values(item + ".sources").isEmpty()) {
+                generatePkg = true;
+                break;
+            }
+        }
+    }
+
+    if (generatePkg) {
+        QStringList platformList = project->values("SYMBIAN_PLATFORMS");
+        foreach(QString platform, platformList) {
+            if(platform.compare("WINSCW", Qt::CaseInsensitive)) {
+                generatePkgFile(platform.toLower(), "udeb", iconFile);
+                generatePkgFile(platform.toLower(), "urel", iconFile);
+            }
+        }
+    }
+
+    writeBldInfContent(t, generatePkg);
+
+    // Generate empty wrapper makefile here, because wrapper makefile must exist before writeMkFile,
+    // but all required data is not yet available.
+    bool isPrimaryMakefile = true;
+    QString wrapperFileName("Makefile");
+    QString outputFileName = fileInfo(Option::output.fileName()).fileName();
+    if (outputFileName != BLD_INF_FILENAME) {
+        wrapperFileName.append(".").append((outputFileName.size() > BLD_INF_FILENAME_LEN && outputFileName.left(BLD_INF_FILENAME_LEN) == BLD_INF_FILENAME) ? outputFileName.mid(8) : outputFileName);
+        isPrimaryMakefile = false;
+    }
+
+    QFile wrapperMakefile(wrapperFileName);
+    if(wrapperMakefile.open(QIODevice::WriteOnly)) {
+        generatedFiles << wrapperFileName;
+    } else {
+        fprintf(stderr, "Error: Could not open wrapper makefile '%s'\n", qPrintable(wrapperFileName));
+        return false;
+    }
+
+    if (getTargetExtension() == "subdirs") {
+            // If we have something to deploy, generate extension makefile for just that, since
+            // normal extension makefile is not getting generated and we need emulator deployment to be done.
+            if (generatePkg)
+                writeMkFile(wrapperFileName, true);
+            writeWrapperMakefile(wrapperMakefile, isPrimaryMakefile);
+            return true;
+        }
+
+    writeMkFile(wrapperFileName, false);
+
+    QString shortProFilename = project->projectFile();
+    shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
+    shortProFilename.replace(QString(".pro"), QString(""));
+
+    QString mmpFilename = shortProFilename;
+    mmpFilename.append("_");
+    mmpFilename.append(uid3);
+    mmpFilename.append(".mmp");
+    writeMmpFile(mmpFilename, symbianLangCodes);
+
+    if (getTargetExtension() == "exe") {
+        if (!project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
+            QString appname = escapeFilePath(fileFixify(project->first("TARGET")));
+            appname = removePathSeparators(appname);
+            writeRegRssFile(appname, userRssRules);
+            writeRssFile(appname, numberOfIcons, iconFile);
+            writeLocFile(appname, symbianLangCodes);
+        }
+    }
+
+    writeCustomDefFile();
+    writeWrapperMakefile(wrapperMakefile, isPrimaryMakefile);
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QString &config, const QString &iconFile) {
+    QString pkgFilename = QString("%1_%2_%3.%4")
+                          .arg(fileInfo(project->projectFile()).completeBaseName())
+                          .arg(compiler)
+                          .arg(config)
+                          .arg("pkg");
+    QFile pkgFile(pkgFilename);
+    if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text))
+        return false;
+
+    generatedFiles << pkgFile.fileName();
+
+    //   header info
+    QTextStream t(&pkgFile);
+    t << QString("; %1 generated by qmake at %2").arg(pkgFilename).arg(QDateTime::currentDateTime().toString(Qt::ISODate))  << endl;
+    t << "; This file is generated by qmake and should not be modified by the user" << endl;
+    t << ";" << endl << endl;
+
+    // language, (*** hardcoded to english atm)
+    t << "; Language" << endl;
+    t << "&EN" << endl << endl;
+
+    // name of application, UID and version
+    QString applicationName = project->first("TARGET");
+    int last = applicationName.lastIndexOf(QLatin1Char('/'));
+    applicationName = applicationName.mid( last == -1 ? 0 : last+1 );
+
+    QString applicationVersion = project->first("VERSION").isEmpty() ? "1,0,0" : project->first("VERSION").replace('.', ',');
+
+    t << "; SIS header: name, uid, version" << endl;
+    t << QString("#{\"%1\"},(%2),%3").arg(applicationName).arg(uid3).arg(applicationVersion) << endl << endl;
+
+    // vendor names (*** hardcoded for now)
+    t << "; Localised Vendor name" << endl;
+    t << "%{\"Nokia, Qt Software\"}" << endl << endl;
+    t << "; Unique Vendor name" << endl;
+    t << ":\"Nokia, Qt Software\"" << endl << endl;
+
+    // Dependencies
+    t << "; Dependencies" << endl;
+    foreach(QString item, project->values("DEPLOYMENT")) {
+        QStringList dependencies = project->values(item + ".depends");
+        foreach(QString dependency, dependencies) {
+            t << dependency << endl;
+        }
+    }
+    t << endl;
+
+    // install paths on the phone *** should be dynamic at some point
+    QString installPathBin = "!:\\sys\\bin";
+    QString installPathResource = "!:\\resource\\apps";
+    QString installPathRegResource = "!:\\private\\10003a3f\\import\\apps";
+
+    // find location of builds
+    QString epocReleasePath = QString("%1epoc32/release/%2/%3")
+                              .arg(epocRoot())
+                              .arg(compiler)
+                              .arg(config);
+
+
+    if (getTargetExtension() == "exe") {
+        // deploy .exe file
+        t << "; Executable and default resource files" << endl;
+        QString exeFile = applicationName + ".exe";
+        t << QString("\"%1/%2\"    - \"%3\\%4\"")
+             .arg(epocReleasePath)
+             .arg(exeFile)
+             .arg(installPathBin)
+             .arg(exeFile) << endl;
+
+        // deploy rsc & reg_rsc file
+        if (!project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
+            t << QString("\"%1epoc32/data/z/resource/apps/%2\"    - \"%3\\%4\"")
+                 .arg(epocRoot())
+                 .arg(applicationName + ".rsc")
+                 .arg(installPathResource)
+                 .arg(applicationName + ".rsc") << endl;
+
+            t << QString("\"%1epoc32/data/z/private/10003a3f/import/apps/%2\"    - \"%3\\%4\"")
+                 .arg(epocRoot())
+                 .arg(applicationName + "_reg.rsc")
+                 .arg(installPathRegResource)
+                 .arg(applicationName + "_reg.rsc") << endl;
+
+            QString myIconFile = iconFile;
+            myIconFile = myIconFile.replace("\\\\", "\\");
+
+            if (!iconFile.isEmpty())  {
+                t << QString("\"%1epoc32/data/z%2\"    - \"!:%3\"")
+                         .arg(epocRoot())
+                         .arg(QString(myIconFile).replace('\\','/'))
+                         .arg(myIconFile) << endl << endl;
+            }
+        }
+    }
+
+    // deploy any additional DEPLOYMENT  files
+    DeploymentList depList;
+    QString remoteTestPath;
+    remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid);
+
+    initProjectDeploySymbian( project, depList, remoteTestPath, true, compiler, config, generatedDirs, generatedFiles );
+    if (depList.size())
+        t << "; DEPLOYMENT" << endl;
+    for (int i=0; i<depList.size(); ++i)  {
+        t << QString("\"%1\"    - \"%2\"")
+             .arg(QString(depList.at(i).from).replace('\\','/'))
+             .arg(depList.at(i).to) << endl;
+    }
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeCustomDefFile() {
+    if(targetType.compare("plugin", Qt::CaseInsensitive) == 0 && !project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
+        // Create custom def file for plugin
+        QFile ft(QLatin1String(PLUGIN_COMMON_DEF_FILE_ACTUAL));
+
+        if(ft.open(QIODevice::WriteOnly)) {
+            generatedFiles << ft.fileName();
+            QTextStream t(&ft);
+
+            t << "; ==============================================================================" << endl;
+            t << "; Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
+            t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
+            t << "; This file is generated by qmake and should not be modified by the" << endl;
+            t << "; user." << endl;
+            t << ";  Name        : " PLUGIN_COMMON_DEF_FILE_ACTUAL << endl;
+            t << ";  Part of     : " << project->values("TARGET").join(" ") << endl;
+            t << ";  Description : Fixes common plugin symbols to known ordinals" << endl;
+            t << ";  Version     : " << endl;
+            t << ";" << endl;
+            t << "; ==============================================================================" << "\n" << endl;
+
+            t << endl;
+
+            t << "EXPORTS" << endl;
+            t << "\tqt_plugin_query_verification_data @ 1 NONAME" << endl;
+            t << "\tqt_plugin_instance @ 2 NONAME" << endl;
+            t << endl;
+        } else {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void SymbianMakefileGenerator::init()
+{
+    MakefileGenerator::init();
+/*
+    DUMP_VAR("GENERATED_SOURCES");
+*/
+    // fixing again !!!
+    if(0 != project->values("QMAKE_PLATFORM").size())
+        platform = varGlue("QMAKE_PLATFORM", "", " ", "");
+
+    if(0 == project->values("QMAKESPEC").size())
+        project->values("QMAKESPEC").append(qgetenv("QMAKESPEC"));
+
+    if(!isConfigSetToSymbian())
+        project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
+
+
+    // bld.inf
+    project->values("MAKEFILE") += BLD_INF_FILENAME;
+
+    // .mmp
+    initMmpVariables();
+
+    // UID1
+    uid1 = generateUID1();
+
+    // check TARGET.UID2 and TARGET.UID3 presence
+    if(0 != project->values("TARGET.UID3").size()) {
+        uid3 = project->first("TARGET.UID3");
+    } else {
+        uid3 = generateUID3();
+    }
+
+    // some fix
+    if((project->values("TEMPLATE")).contains("app"))
+        targetType = "exe";
+    else if((project->values("TEMPLATE")).contains("lib")) {
+        // check CONFIG to see if we are to build staticlib or dll
+        if(project->values("CONFIG").contains("staticlib") || project->values("CONFIG").contains("static"))
+            targetType = "staticlib";
+        else if (project->values("CONFIG").contains("plugin"))
+            targetType = "plugin";
+        else // for now it will be default
+            targetType = "dll";
+    }
+    else // fix
+        targetType = "subdirs";
+
+    if(0 != project->values("TARGET.UID2").size()) {
+        uid2 = project->first("TARGET.UID2");
+    } else if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
+        uid2 = "0x20004C45";
+    } else {
+        if(getTargetExtension() == "exe") {
+            if(project->values("QT").contains("gui", Qt::CaseInsensitive)) {
+                // exe and also gui
+                uid2 = "0x100039CE";
+            } else {
+                // exe but not gui.. uid2 is ignored anyway
+                // set it to 0
+                uid2 = "0";
+            }
+        } else if(getTargetExtension() == "dll" || getTargetExtension() == "lib") {
+            uid2 = "0x1000008d";
+        }
+    }
+
+    uid2 = uid2.trimmed();
+    uid3 = uid3.trimmed();
+
+    // UID is valid as either hex or decimal, so just convert it to number and back to hex
+    // to get proper string for private dir
+    bool conversionOk = false;
+    uint uidNum = uid3.toUInt(&conversionOk, 0);
+
+    if (!conversionOk) {
+        fprintf(stderr, "Error: Invalid UID \"%s\".", uid3.toUtf8().constData());
+    } else {
+        privateDirUid.setNum(uidNum, 16);
+        while (privateDirUid.length() < 8)
+            privateDirUid.insert(0,QLatin1Char('0'));
+    }
+}
+
+QString SymbianMakefileGenerator::getTargetExtension() {
+    QString ret;
+    if(targetType.compare("exe", Qt::CaseInsensitive) == 0 || targetType.compare("app", Qt::CaseInsensitive) == 0) {
+        ret.append("exe");
+    } else if (targetType.compare("staticlib",Qt::CaseInsensitive) == 0) {
+        ret.append("lib");
+    } else if (targetType.compare("dll", Qt::CaseInsensitive) == 0 || targetType.compare("plugin", Qt::CaseInsensitive) == 0) {
+        ret.append("dll");
+    } else if (targetType.compare("subdirs", Qt::CaseInsensitive) == 0) {
+        // just fix
+        ret.append("subdirs");
+    } else {
+        // if nothing said then assume "exe"
+        ret.append("exe");
+    }
+
+    return ret;
+}
+
+bool SymbianMakefileGenerator::isConfigSetToSymbian() {
+    return project->values("CONFIG").contains("symbian", Qt::CaseInsensitive);
+}
+
+QString SymbianMakefileGenerator::generateUID1() {
+    // just for now
+    return QString("");
+}
+
+QString SymbianMakefileGenerator::generateUID2() {
+    // standard stuff; picked form symbian
+    // later meybe read from somewhere
+    return QString("");
+}
+
+QString SymbianMakefileGenerator::generateUID3() {
+
+    QString target = project->first("TARGET");
+    QString currPath = qmake_getpwd();
+    target.prepend("/").prepend(currPath);
+    return generate_test_uid(target);
+
+}
+
+bool SymbianMakefileGenerator::initMmpVariables() {
+    QStringList sysincspaths;
+    QStringList srcincpaths;
+    QStringList srcpaths;
+
+    srcpaths << project->values("SOURCES") << project->values("GENERATED_SOURCES");
+    srcpaths << project->values("UNUSED_SOURCES") << project->values("UI_SOURCES_DIR");
+    srcpaths << project->values("UI_DIR");
+
+    QDir current = QDir::current();
+    QString canonizedCurrent = canonizePath(".");
+
+    for(int j = 0; j < srcpaths.size(); ++j) {
+        QFileInfo fi(fileInfo(srcpaths.at(j)));
+        // Sometimes sources have other than *.c* files (e.g. *.moc); prune them.
+        if (fi.suffix().startsWith("c")) {
+            if(fi.filePath().length() > fi.fileName().length() ) {
+                appendIfnotExist(srcincpaths, fi.path() );
+                sources[canonizePath(fi.path())] += fi.fileName();
+            } else {
+                sources[canonizedCurrent] += fi.fileName();
+                appendIfnotExist(srcincpaths, canonizedCurrent);
+            }
+        }
+    }
+
+    QStringList incpaths;
+    incpaths << project->values("INCLUDEPATH");
+    incpaths << QLibraryInfo::location(QLibraryInfo::HeadersPath);
+    incpaths << project->values("HEADERS");
+    incpaths << srcincpaths;
+    incpaths << project->values("UI_HEADERS_DIR");
+    incpaths << project->values("UI_DIR");
+
+    QString epocPath("epoc32");
+    for(int j = 0; j < incpaths.size(); ++j) {
+        QString includepath = canonizePath(incpaths.at(j));
+        appendIfnotExist(sysincspaths, includepath);
+        // As a workaround for Symbian toolchain insistence to treat include
+        // statements as relative to source file rather than the file they appear in,
+        // we generate extra temporary include directories to make
+        // relative include paths used in various headers to work properly.
+        // Note that this is not a fix-all solution; it's just a stop-gap measure
+        // to make Qt itself build until toolchain can support relative includes in
+        // a way that Qt expects.
+        if (!includepath.contains(epocPath)) // No temp dirs for epoc includes
+            appendIfnotExist(sysincspaths, includepath + QString("/" QT_EXTRA_INCLUDE_DIR));
+    }
+
+    // remove duplicate include path entries
+    // convert to native directory separators
+    // to check if includepaths are same
+    QStringList temporary;
+    for(int i = 0; i < sysincspaths.size(); ++i) {
+        QString origPath = sysincspaths.at(i);
+        QFileInfo origPathInfo(fileInfo(origPath));
+        bool bFound = false;
+
+        for(int j = 0; j < temporary.size(); ++j) {
+            QString tmpPath = temporary.at(j);
+            QFileInfo tmpPathInfo(fileInfo(tmpPath));
+
+            if(origPathInfo.absoluteFilePath() == tmpPathInfo.absoluteFilePath()) {
+                bFound = true;
+                if(!tmpPathInfo.isRelative() && origPathInfo.isRelative()) {
+                    // we keep the relative notation
+                    temporary.removeOne(tmpPath);
+                    temporary << origPath;
+                }
+            }
+        }
+
+        if(!bFound)
+            temporary << origPath;
+
+    }
+
+    sysincspaths.clear();
+    sysincspaths << temporary;
+
+    systeminclude.insert("SYSTEMINCLUDE", sysincspaths);
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::removeDuplicatedStrings(QStringList& stringList) {
+
+    QStringList tmpStringList;
+
+    for(int i = 0; i < stringList.size(); ++i) {
+        QString string = stringList.at(i);
+        if(tmpStringList.contains(string))
+            continue;
+        else
+            tmpStringList.append(string);
+    }
+
+    stringList.clear();
+    stringList = tmpStringList;
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeMmpFileHeader(QTextStream &t){
+    t << "// ==============================================================================" << endl;
+    t << "// Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
+    t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
+    t << "// This file is generated by qmake and should not be modified by the" << endl;
+    t << "// user." << endl;
+    t << "//  Name        : " << escapeFilePath(fileFixify(project->projectFile().remove(project->projectFile().length()-4,4))) << ".mmp" << endl;
+    t << "// ==============================================================================" << endl << endl;
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeMmpFile(QString &filename, QStringList &symbianLangCodes)
+{
+    QFile ft(filename);
+    if(ft.open(QIODevice::WriteOnly)) {
+        generatedFiles << ft.fileName();
+
+        //printf("WRITING: %s \n", qPrintable(filename));
+
+        QTextStream t(&ft);
+
+        writeMmpFileHeader(t);
+
+        writeMmpFileTargetPart(t);
+
+        writeMmpFileResourcePart(t, symbianLangCodes);
+
+        writeMmpFileMacrosPart(t);
+
+        writeMmpFileIncludePart(t);
+
+        QDir current = QDir::current();
+
+        for(QMap<QString, QStringList>::iterator it = sources.begin(); it != sources.end(); ++it) {
+            QStringList values = it.value();
+            QString currentSourcePath = it.key();
+
+            if (values.size())
+                t << "SOURCEPATH \t" <<  fixPathForMmp(currentSourcePath, current) << endl;
+
+            for (int i = 0; i < values.size(); ++i) {
+                QString sourceFileName = values.at(i);
+                t << "SOURCE\t\t" << sourceFileName << endl;
+            }
+            t << endl;
+        }
+        t << endl;
+
+        if (!project->values("CONFIG").contains("static") && !project->values("CONFIG").contains("staticlib")) {
+            writeMmpFileLibraryPart(t);
+        }
+
+        writeMmpFileCapabilityPart(t);
+
+        writeMmpFileCompilerOptionPart(t);
+
+        writeMmpFileBinaryVersionPart(t);
+
+        writeMmpFileRulesPart(t);
+    } else {
+        return false;
+    }
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeMmpFileMacrosPart(QTextStream& t) {
+
+    t << endl;
+
+    if(isConfigSetToSymbian())
+        return true;
+
+    QStringList &defines = project->values("DEFINES");
+    if (defines.size())
+        t << "// Qt Macros" << endl;
+    for(int i = 0; i < defines.size(); ++i) {
+        QString def = defines.at(i);
+        addMacro(t, def);
+    }
+
+    // These are required in order that all methods will be correctly exported e.g from qtestlib
+    QStringList &exp_defines = project->values("PRL_EXPORT_DEFINES");
+    if (exp_defines.size())
+        t << endl << "// Qt Export Defines" << endl;
+    for(int i = 0; i < exp_defines.size(); ++i) {
+        QString def = exp_defines.at(i);
+        addMacro(t, def);
+    }
+
+    t << endl;
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::addMacro(QTextStream& t, const QString& value) {
+     t << "MACRO" << "\t\t" <<  value << endl;
+     return true;
+}
+
+
+bool SymbianMakefileGenerator::writeMmpFileTargetPart(QTextStream& t) {
+    if(getTargetExtension() == "exe") {
+        t << "TARGET" << "\t\t" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".exe")) << "\n";
+        if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
+            t << "TARGETTYPE" << "\t\t" << "STDEXE" << endl;
+        else
+            t << "TARGETTYPE" << "\t\t" << "EXE" << endl;
+    }  else if (getTargetExtension() == "dll"){
+        t << "TARGET" << "\t\t" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".dll")) << "\n";
+        if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
+            t << "TARGETTYPE" << "\t\t" << "STDDLL" << endl;
+        else
+            t << "TARGETTYPE" << "\t\t" << "DLL" << endl;
+    }   else if (getTargetExtension() == "lib"){
+        t << "TARGET" << "\t\t" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".lib")) << "\n";
+        if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
+            t << "TARGETTYPE" << "\t\t" << "STDLIB" << endl;
+        else
+            t << "TARGETTYPE" << "\t\t" << "LIB" << endl;
+    }   else {
+        printf("unexpected target and targettype %s\n", getTargetExtension().toAscii().data());
+    }
+
+    t << endl;
+
+    t << "UID" << "\t\t" << uid2 << " " << uid3 << endl;
+
+    if(0 != project->values("TARGET.SID").size()) {
+        t << "SECUREID" << "\t\t" << project->values("TARGET.SID").join(" ") << endl;
+    } else {
+        if(0 == uid3.size())
+            t << "SECUREID" << "\t\t" << "0" << endl;
+        else
+            t << "SECUREID" << "\t\t" << uid3 << endl;
+    }
+
+    // default value used from mkspecs..qconfig.h is 0
+    if(0 != project->values("TARGET.VID").size()) {
+        t << "VENDORID" << "\t\t" << project->values("TARGET.VID").join(" ") << endl;
+    }
+
+    t << endl;
+
+    if(0 != project->first("TARGET.EPOCSTACKSIZE").size())
+        t << "EPOCSTACKSIZE" << "\t\t" << project->first("TARGET.EPOCSTACKSIZE") << endl;
+    if(0 != project->values("TARGET.EPOCHEAPSIZE").size())
+        t << "EPOCHEAPSIZE" << "\t\t" << project->values("TARGET.EPOCHEAPSIZE").join(" ") << endl;
+    if(0 != project->values("TARGET.EPOCALLOWDLLDATA").size())
+        t << "EPOCALLOWDLLDATA" << endl;
+
+    if(targetType.compare("plugin", Qt::CaseInsensitive) == 0 && !project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
+        // use custom def file for Qt plugins
+        t << "DEFFILE " PLUGIN_COMMON_DEF_FILE_FOR_MMP << endl;
+    }
+
+    t << endl;
+
+    return true;
+}
+
+
+/*
+    Application registration resource files
+    should be installed to the
+
+    \private\10003a3f\import\apps directory.
+*/
+bool SymbianMakefileGenerator::writeMmpFileResourcePart(QTextStream& t, QStringList &symbianLangCodes) {
+    if((getTargetExtension() == "exe") &&
+        !project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
+        QString target = escapeFilePath(fileFixify(project->first("TARGET")));
+        target = removePathSeparators(target);
+
+        QString locTarget = target;
+        locTarget.append(".rss");
+
+        t << "SOURCEPATH\t\t\t. " << endl;
+        t << "LANG SC ";    // no endl
+        foreach(QString lang, symbianLangCodes) {
+            t << lang << " "; // no endl
+        }
+        t << endl;
+        t << "START RESOURCE\t\t" << locTarget << endl;
+        t << "HEADER" << endl;
+        t << "TARGETPATH\t\t\t" RESOURCE_DIRECTORY_MMP<< endl;
+        t << "END" << endl << endl;
+
+        // now append extension
+        QString regTarget = target;
+        regTarget.append("_reg.rss");
+        // must state SOURCEPATH for resources
+        // relative placement (relative to dir where .mmp located)
+        // absolute placement (!RELATIVE! to EPOCROOT dir)
+
+
+        t << "SOURCEPATH\t\t\t. " << endl;
+        t << "START RESOURCE\t\t" << regTarget << endl;
+        if (isForSymbianSbsv2())
+            t << "DEPENDS " << target << ".rsg" << endl;
+        t << "TARGETPATH\t\t" REGISTRATION_RESOURCE_DIRECTORY_HW << endl;
+        t << "END" << endl << endl;
+     }
+     return true;
+}
+
+bool SymbianMakefileGenerator::writeMmpFileSystemIncludePart(QTextStream& t) {
+
+    QDir current = QDir::current();
+
+    for(QMap<QString, QStringList>::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) {
+        QStringList values = it.value();
+        for (int i = 0; i < values.size(); ++i) {
+            QString handledPath = values.at(i);
+            t << "SYSTEMINCLUDE" << "\t\t" << fixPathForMmp(handledPath, current) << endl;
+        }
+    }
+
+    t << endl;
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeMmpFileIncludePart(QTextStream& t) {
+
+    writeMmpFileSystemIncludePart(t);
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream& t) {
+    QStringList &libs = project->values("LIBS");
+    libs << project->values("QMAKE_LIBS");
+
+    removeDuplicatedStrings(libs);
+
+    for(int i = 0; i < libs.size(); ++i) {
+        QString lib = libs.at(i);
+        // The -L flag is uninteresting, since all symbian libraries exist in the
+        // same directory.
+        if(lib.startsWith("-l")) {
+            lib.remove(0,2);
+            QString mmpStatement;
+            if (lib.endsWith(".dll")) {
+                lib.chop(4);
+                mmpStatement = "LIBRARY\t\t";
+            } else if (lib.endsWith(".lib")) {
+                lib.chop(4);
+                mmpStatement = "STATICLIBRARY\t";
+            } else {
+                // Hacky way to find out what kind of library it is. Check the
+                // ARMV5 build directory for library type. We default to shared
+                // library, since that is probably more common.
+                QString udebStaticLibLocation(epocRoot());
+                QString urelStaticLibLocation(udebStaticLibLocation);
+                udebStaticLibLocation += QString("epoc32/release/armv5/udeb/%1.lib").arg(lib);
+                urelStaticLibLocation += QString("epoc32/release/armv5/urel/%1.lib").arg(lib);
+                if (QFile::exists(udebStaticLibLocation) || QFile::exists(urelStaticLibLocation)) {
+                    mmpStatement = "STATICLIBRARY\t";
+                } else {
+                    mmpStatement = "LIBRARY\t\t";
+                }
+            }
+            t << mmpStatement <<  lib << ".lib" << endl;
+        }
+    }
+
+    t << endl;
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeMmpFileCapabilityPart(QTextStream& t) {
+    if(0 != project->first("TARGET.CAPABILITY").size()) {
+        QStringList &capabilities = project->values("TARGET.CAPABILITY");
+        t << "CAPABILITY" << "\t\t";
+
+        for(int i = 0; i < capabilities.size(); ++i) {
+            QString cap = capabilities.at(i);
+            t << cap << " ";
+        }
+    }
+    else {
+        t << "CAPABILITY" << "\t\t" << "None";
+    }
+    t << endl << endl;
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t) {
+    QString cw, armcc;
+
+    if(0 != project->values("QMAKE_CXXFLAGS.CW").size()) {
+        cw.append(project->values("QMAKE_CXXFLAGS.CW").join(" "));
+        cw.append(" ");
+    }
+
+    if(0 != project->values("QMAKE_CXXFLAGS.ARMCC").size()) {
+        armcc.append(project->values("QMAKE_CXXFLAGS.ARMCC").join(" "));
+        armcc.append(" ");
+    }
+
+    if(0 != project->values("QMAKE_CFLAGS.CW").size()) {
+        cw.append(project->values("QMAKE_CFLAGS.CW").join(" "));
+        cw.append(" ");
+    }
+
+    if(0 != project->values("QMAKE_CFLAGS.ARMCC").size()) {
+        armcc.append(project->values("QMAKE_CFLAGS.ARMCC").join(" "));
+        armcc.append(" ");
+    }
+
+    if(0 != project->values("QMAKE_CXXFLAGS").size()) {
+        cw.append(project->values("QMAKE_CXXFLAGS").join(" "));
+        cw.append(" ");
+        armcc.append(project->values("QMAKE_CXXFLAGS").join(" "));
+        armcc.append(" ");
+    }
+
+    if(0 != project->values("QMAKE_CFLAGS").size()) {
+        cw.append(project->values("QMAKE_CFLAGS").join(" "));
+        cw.append(" ");
+        armcc.append(project->values("QMAKE_CFLAGS").join(" "));
+        armcc.append(" ");
+    }
+
+    if (!cw.isEmpty() && cw[cw.size()-1] == ' ')
+        cw.chop(1);
+    if (!armcc.isEmpty() && armcc[armcc.size()-1] == ' ')
+        armcc.chop(1);
+
+    if (!cw.isEmpty())
+        t << "OPTION" << '\t' << " CW " << cw <<  endl;
+    if (!armcc.isEmpty())
+        t << "OPTION" << '\t' << " ARMCC "<< armcc <<  endl;
+    // others to come
+
+    t <<  endl;
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeMmpFileBinaryVersionPart(QTextStream& t) {
+    QString applicationVersion = project->first("VERSION");
+    QStringList verNumList = applicationVersion.split('.');
+    uint major = 0;
+    uint minor = 0;
+    uint patch = 0;
+    bool success = false;
+
+    if (verNumList.size() > 0) {
+        major = verNumList[0].toUInt(&success);
+        if (success && verNumList.size() > 1) {
+            minor = verNumList[1].toUInt(&success);
+            if (success && verNumList.size() > 2) {
+                patch = verNumList[2].toUInt(&success);
+            }
+        }
+    }
+
+    QString mmpVersion;
+    if (success && major <= 0xFFFF && minor <= 0xFF && patch <= 0xFF) {
+        // Symbian binary version only has major and minor components, so compress
+        // Qt's minor and patch values into the minor component. Since Symbian's minor
+        // component is a 16 bit value, only allow 8 bits for each to avoid overflow.
+        mmpVersion.append(QString::number(major))
+            .append('.')
+            .append(QString::number((minor << 8) + patch));
+    } else {
+        if (!applicationVersion.isEmpty())
+            fprintf(stderr, "Invalid VERSION string: %s\n", qPrintable(applicationVersion));
+        mmpVersion = "10.0"; // Default binary version for symbian is 10.0
+    }
+
+    t << "VERSION " << mmpVersion  << endl;
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeMmpFileRulesPart(QTextStream& t) {
+    foreach(QString item, project->values("MMP_RULES")) {
+        t << endl;
+        // If there is no stringlist defined for a rule, use rule name directly
+        // This is convenience for defining single line mmp statements
+        if (project->values(item).isEmpty()) {
+            t << item << endl;
+        } else {
+            foreach(QString itemRow, project->values(item)) {
+                t << itemRow << endl;
+            }
+        }
+    }
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension) {
+    // Read user defined bld inf rules
+    QMap<QString, QStringList> userBldInfRules;
+    for(QMap<QString, QStringList>::iterator it = project->variables().begin(); it != project->variables().end(); ++it) {
+        if (it.key().startsWith(BLD_INF_RULES_BASE)) {
+            QString newKey = it.key().mid(sizeof(BLD_INF_RULES_BASE)-1);
+            if (newKey.isEmpty()) {
+                fprintf(stderr, "Warning: Empty BLD_INF_RULES key encountered\n");
+                continue;
+            }
+            QStringList newValues;
+            QStringList values = it.value();
+            foreach(QString item, values) {
+                // If there is no stringlist defined for a rule, use rule name directly
+                // This is convenience for defining single line statements
+                if (project->values(item).isEmpty()) {
+                    newValues << item;
+                } else {
+                    foreach(QString itemRow, project->values(item)) {
+                        newValues << itemRow;
+                    }
+                }
+            }
+            userBldInfRules.insert(newKey, newValues);
+        }
+    }
+
+    // Add includes of subdirs bld.inf files
+
+    QString mmpfilename = escapeFilePath(fileFixify(project->projectFile()));
+    mmpfilename = mmpfilename.replace(mmpfilename.lastIndexOf(".")+1, 3, "mmp");
+    QString currentPath = qmake_getpwd();
+
+    if(!currentPath.endsWith(QString("/")))
+        currentPath.append("/");
+
+    QStringList mmpProjects = project->values("MMPFILES_DIRECT_DEPENDS");
+    QStringList shadowProjects = project->values("SHADOW_BLD_INFS");
+
+    removeDuplicatedStrings(mmpProjects);
+    removeDuplicatedStrings(shadowProjects);
+
+    // go in reverse order ... as that is the way how I build the list
+    QListIterator<QString> iT(mmpProjects);
+    iT.toBack();
+    while(iT.hasPrevious()) {
+        QString fullMmpName = iT.previous();
+        QString relativePath;
+        QString bldinfFilename;
+
+        QString fullProFilename = fullMmpName;
+        fullProFilename.replace(QString(".mmp"), QString(".pro"));
+        QString uid = generate_uid(fullProFilename);
+
+        QString cleanMmpName = fullProFilename;
+        cleanMmpName.replace(QString(".pro"), QString(""));
+        cleanMmpName.replace(0, cleanMmpName.lastIndexOf("/") + 1, QString(""));
+
+        if(shadowProjects.contains(BLD_INF_FILENAME "." + cleanMmpName)) { // shadow project
+            QDir directory(currentPath);
+            relativePath = directory.relativeFilePath(fullProFilename);
+            bldinfFilename = BLD_INF_FILENAME "." + cleanMmpName;
+            if(relativePath.contains("/")) {
+                // shadow .pro not in same
+                // directory as parent .pro
+                if(relativePath.startsWith("..")) {
+                    // shadow .pro out of parent .pro
+                    relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
+                    bldinfFilename.prepend("/").prepend(relativePath);
+                } else {
+                    relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
+                    bldinfFilename.prepend("/").prepend(relativePath);
+                }
+            } else {
+                // shadow .pro and parent .pro in same directory
+                bldinfFilename.prepend("./");
+            }
+        } else { // regular project
+            // calc relative path
+            QDir directory(currentPath);
+            relativePath = directory.relativeFilePath(fullProFilename);
+            relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
+            bldinfFilename = relativePath.append("/").append(BLD_INF_FILENAME);
+        }
+
+        QString bldinfDefine = QString("BLD_INF_") + cleanMmpName + QString("_") + uid;
+        bldinfDefine = bldinfDefine.toUpper();
+        removeSpecialCharacters(bldinfDefine);
+
+        t << "#ifndef " << bldinfDefine << endl;
+        t << "\t#include \"" << QDir::toNativeSeparators(bldinfFilename) << "\"" << endl;
+        t << "#endif // " << bldinfDefine << endl;
+    }
+
+    // Add supported project platforms
+
+    t << endl << BLD_INF_TAG_PLATFORMS << endl << endl;
+    if(0 != project->values("SYMBIAN_PLATFORMS").size())
+        t << project->values("SYMBIAN_PLATFORMS").join(" ") << endl;
+
+    QStringList userItems = userBldInfRules.value(BLD_INF_TAG_PLATFORMS);
+    foreach(QString item, userItems)
+        t << item << endl;
+    userBldInfRules.remove(BLD_INF_TAG_PLATFORMS);
+    t << endl;
+
+    // Add project mmps and old style extension makefiles
+    QString mmpTag;
+    if (project->values("CONFIG").contains("symbian_test", Qt::CaseInsensitive))
+        mmpTag = QLatin1String(BLD_INF_TAG_TESTMMPFILES);
+    else
+        mmpTag = QLatin1String(BLD_INF_TAG_MMPFILES);
+
+    t << endl << mmpTag << endl << endl;
+
+    writeBldInfMkFilePart(t, addDeploymentExtension);
+    if (getTargetExtension() == "subdirs") {
+        mmpProjects.removeOne(mmpfilename);
+    }
+
+    if(getTargetExtension() != "subdirs") {
+        QString shortProFilename = project->projectFile();
+        shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
+        shortProFilename.replace(QString(".pro"), QString(""));
+
+        QString mmpFilename = shortProFilename + QString("_") + uid3 + QString(".mmp");
+
+        t << mmpFilename << endl;
+    }
+
+    userItems = userBldInfRules.value(mmpTag);
+    foreach(QString item, userItems)
+        t << item << endl;
+    userBldInfRules.remove(mmpTag);
+
+    t << endl << BLD_INF_TAG_EXTENSIONS << endl << endl;
+
+    // Generate extension rules
+    writeBldInfExtensionRulesPart(t);
+
+    userItems = userBldInfRules.value(BLD_INF_TAG_EXTENSIONS);
+    foreach(QString item, userItems)
+        t << item << endl;
+    userBldInfRules.remove(BLD_INF_TAG_EXTENSIONS);
+
+    // Add rest of the user defined content
+
+    for(QMap<QString, QStringList>::iterator it = userBldInfRules.begin(); it != userBldInfRules.end(); ++it) {
+        t << endl << endl << it.key() << endl << endl;
+        userItems = it.value();
+        foreach(QString item, userItems)
+            t << item << endl;
+    }
+
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &userItems) {
+    QString filename(appName);
+    filename.append("_reg.rss");
+    QFile ft(filename);
+    if(ft.open(QIODevice::WriteOnly)) {
+        generatedFiles << ft.fileName();
+		QTextStream t(&ft);
+        t << "// ============================================================================" << endl;
+        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
+        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
+        t << "// * This file is generated by qmake and should not be modified by the" << endl;
+        t << "// * user." << endl;
+        t << "// ============================================================================" << endl;
+        t << endl;
+		t << "#include <" << appName << ".rsg>" << endl;
+		t << "#include <appinfo.rh>" << endl;
+        t << endl;
+		//t << "#include <data_caging_paths.hrh>" << "\n" << endl;
+		t << "UID2 " << "KUidAppRegistrationResourceFile" << endl;
+		t << "UID3 " << uid3 << endl << endl;
+		t << "RESOURCE APP_REGISTRATION_INFO" << endl;
+		t << "\t{" << endl;
+		t << "\tapp_file=\"" << appName << "\";" << endl;
+		t << "\tlocalisable_resource_file=\"" RESOURCE_DIRECTORY_RESOURCE << appName << "\";" << endl;
+		t << endl;
+
+        foreach(QString item, userItems)
+            t << "\t" << item << endl;
+		t << "\t}" << endl;
+    } else {
+        return false;
+    }
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeRssFile(QString &appName, QString &numberOfIcons, QString &iconFile) {
+    QString filename(appName);
+    filename.append(".rss");
+    QFile ft(filename);
+    if(ft.open(QIODevice::WriteOnly)) {
+        generatedFiles << ft.fileName();
+		QTextStream t(&ft);
+        t << "// ============================================================================" << endl;
+        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
+        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
+        t << "// * This file is generated by qmake and should not be modified by the" << endl;
+        t << "// * user." << endl;
+        t << "// ============================================================================" << endl;
+        t << endl;
+        t << "#include <appinfo.rh>" << endl;
+        t << "#include \"" << appName << ".loc\"" << endl;
+        t << endl;
+        t << "RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info" << endl;
+		t << "\t{" << endl;
+        t << "\tshort_caption = STRING_r_short_caption;" << endl;
+        t << "\tcaption_and_icon =" << endl;
+        t << "\tCAPTION_AND_ICON_INFO" << endl;
+		t << "\t\t{" << endl;
+        t << "\t\tcaption = STRING_r_caption;" << endl;
+
+        if(numberOfIcons.isEmpty() || iconFile.isEmpty() ) {
+            // There can be maximum one item in this tag, validated when parsed
+            t << "\t\tnumber_of_icons = 0;" << endl;
+            t << "\t\ticon_file = \"\";" << endl;
+        }
+        else {
+            // There can be maximum one item in this tag, validated when parsed
+            t << "\t\tnumber_of_icons = " << numberOfIcons << ";" << endl;
+            t << "\t\ticon_file = \"" << iconFile << "\";" << endl;
+        }
+		t << "\t\t};" << endl;
+		t << "\t}" << endl;
+		t << endl;
+	} else {
+        return false;
+    }
+    return true;
+}
+
+bool SymbianMakefileGenerator::writeLocFile(QString &appName, QStringList &symbianLangCodes) {
+    QString filename(appName);
+    filename.append(".loc");
+    QFile ft(filename);
+    if(ft.open(QIODevice::WriteOnly)) {
+        generatedFiles << ft.fileName();
+		QTextStream t(&ft);
+        t << "// ============================================================================" << endl;
+        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
+        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
+        t << "// * This file is generated by qmake and should not be modified by the" << endl;
+        t << "// * user." << endl;
+        t << "// ============================================================================" << endl;
+        t << endl;
+        t << "#ifdef LANGUAGE_SC" << endl;
+        //t << "#include \"" << appName << ".l01\"" << endl;
+        t << "#define STRING_r_short_caption \"" << appName  << "\"" << endl;
+        t << "#define STRING_r_caption \"" << appName  << "\"" << endl;
+        foreach(QString lang, symbianLangCodes) {
+            t << "#elif defined LANGUAGE_" << lang << endl;
+            //t << "#include \"" << appName << ".l" << lang << "\"" << endl;
+            t << "#define STRING_r_short_caption \"" << appName  << "\"" << endl;
+            t << "#define STRING_r_caption \"" << appName  << "\"" << endl;
+        }
+        t << "#else" << endl;
+        t << "#define STRING_r_short_caption \"" << appName  << "\"" << endl;
+        t << "#define STRING_r_caption \"" << appName  << "\"" << endl;
+        t << "#endif" << endl;
+    } else {
+        return false;
+    }
+    return true;
+}
+
+void SymbianMakefileGenerator::readRssRules(QString &numberOfIcons, QString &iconFile, QStringList &userRssRules) {
+    for(QMap<QString, QStringList>::iterator it = project->variables().begin(); it != project->variables().end(); ++it) {
+        if (it.key().startsWith(RSS_RULES_BASE)) {
+            QString newKey = it.key().mid(sizeof(RSS_RULES_BASE)-1);
+            if (newKey.isEmpty()) {
+                fprintf(stderr, "Warning: Empty RSS_RULES_BASE key encountered\n");
+                continue;
+            }
+            QStringList newValues;
+            QStringList values = it.value();
+            foreach(QString item, values) {
+                // If there is no stringlist defined for a rule, use rule name directly
+                // This is convenience for defining single line statements
+                if (project->values(item).isEmpty()) {
+                    newValues << item;
+                } else {
+                    foreach(QString itemRow, project->values(item)) {
+                        newValues << itemRow;
+                    }
+                }
+            }
+            // Verify thet there is exactly one value in RSS_TAG_NBROFICONS
+            if (newKey == RSS_TAG_NBROFICONS) {
+                if (newValues.count() == 1) {
+                    numberOfIcons = newValues[0];
+                } else {
+                    fprintf(stderr, "Warning: There must be exactly one value in '%s%s'\n",
+                        RSS_RULES_BASE, RSS_TAG_NBROFICONS);
+                    continue;
+                }
+            // Verify thet there is exactly one value in RSS_TAG_ICONFILE
+            } else if (newKey == RSS_TAG_ICONFILE) {
+                if (newValues.count() == 1) {
+                    iconFile = newValues[0];
+                } else {
+                    fprintf(stderr, "Warning: There must be exactly one value in '%s%s'\n",
+                        RSS_RULES_BASE, RSS_TAG_ICONFILE);
+                    continue;
+                }
+            } else {
+                fprintf(stderr, "Warning: Unsupported key:'%s%s'\n",
+                    RSS_RULES_BASE, newKey.toLatin1().constData());
+                continue;
+            }
+        }
+    }
+
+    foreach(QString item, project->values(RSS_RULES)) {
+        // If there is no stringlist defined for a rule, use rule name directly
+        // This is convenience for defining single line mmp statements
+        if (project->values(item).isEmpty()) {
+            userRssRules << item;
+        } else {
+            userRssRules << project->values(item);
+        }
+    }
+
+    // Validate that either both RSS_TAG_NBROFICONS and RSS_TAG_ICONFILE keys exist
+    // or neither of them exist
+    if ( !((numberOfIcons.isEmpty() && iconFile.isEmpty()) ||
+        (!numberOfIcons.isEmpty() && !iconFile.isEmpty())) ) {
+        numberOfIcons.clear();
+        iconFile.clear();
+        fprintf(stderr, "Warning: Both or neither of '%s%s' and '%s%s' keys must exist.\n",
+            RSS_RULES_BASE, RSS_TAG_NBROFICONS, RSS_RULES_BASE, RSS_TAG_ICONFILE );
+    }
+
+    // Validate that RSS_TAG_NBROFICONS contains only numbers
+    if( !numberOfIcons.isEmpty() ) {
+        bool ok;
+        numberOfIcons = numberOfIcons.simplified();
+        int tmp = numberOfIcons.toInt(&ok);
+        if (!ok) {
+            numberOfIcons.clear();
+            iconFile.clear();
+            fprintf(stderr, "Warning: '%s%s' must be integer in decimal format.\n",
+                RSS_RULES_BASE, RSS_TAG_NBROFICONS );
+        }
+    }
+}
+
+QStringList SymbianMakefileGenerator::symbianLangCodesFromTsFiles() {
+    QStringList tsfiles;
+    QStringList symbianLangCodes;
+    tsfiles << project->values("TRANSLATIONS");
+
+    fillQt2S60LangMapTable();
+
+    foreach(QString file, tsfiles) {
+        int extIndex = file.lastIndexOf(".");
+        int langIndex = file.lastIndexOf("_", (extIndex - file.length()));
+        langIndex += 1;
+        QString qtlang = file.mid(langIndex, extIndex - langIndex );
+        QString s60lang = qt2S60LangMapTable.value(qtlang, QString("SC"));
+
+        if( !symbianLangCodes.contains(s60lang) && s60lang != "SC" )
+            symbianLangCodes += s60lang;
+    }
+
+    return symbianLangCodes;
+}
+
+void SymbianMakefileGenerator::fillQt2S60LangMapTable() {
+    qt2S60LangMapTable.reserve(170); // 165 items at time of writing.
+    qt2S60LangMapTable.insert("ab", "SC");            //Abkhazian                     //
+    qt2S60LangMapTable.insert("om", "SC");            //Afan                          //
+    qt2S60LangMapTable.insert("aa", "SC");            //Afar	                         //
+    qt2S60LangMapTable.insert("af", "34");            //Afrikaans	                 //Afrikaans
+    qt2S60LangMapTable.insert("sq", "35");            //Albanian                      //Albanian
+    qt2S60LangMapTable.insert("am", "36");            //Amharic                       //Amharic
+    qt2S60LangMapTable.insert("ar", "37");            //Arabic                        //Arabic
+    qt2S60LangMapTable.insert("hy", "38");            //Armenian                      //Armenian
+    qt2S60LangMapTable.insert("as", "SC");            //Assamese                      //
+    qt2S60LangMapTable.insert("ay", "SC");            //Aymara                        //
+    qt2S60LangMapTable.insert("az", "SC");            //Azerbaijani                   //
+    qt2S60LangMapTable.insert("ba", "SC");            //Bashkir                       //
+    qt2S60LangMapTable.insert("eu", "SC");            //Basque                        //
+    qt2S60LangMapTable.insert("bn", "41");            //Bengali                       //Bengali
+    qt2S60LangMapTable.insert("dz", "SC");            //Bhutani                       //
+    qt2S60LangMapTable.insert("bh", "SC");            //Bihari                        //
+    qt2S60LangMapTable.insert("bi", "SC");            //Bislama                       //
+    qt2S60LangMapTable.insert("br", "SC");            //Breton                        //
+    qt2S60LangMapTable.insert("bg", "42");            //Bulgarian                     //Bulgarian
+    qt2S60LangMapTable.insert("my", "43");            //Burmese                       //Burmese
+    qt2S60LangMapTable.insert("be", "40");            //Byelorussian                  //Belarussian
+    qt2S60LangMapTable.insert("km", "SC");            //Cambodian                     //
+    qt2S60LangMapTable.insert("ca", "44");            //Catalan                       //Catalan
+    qt2S60LangMapTable.insert("zh", "SC");            //Chinese                       //
+    qt2S60LangMapTable.insert("co", "SC");            //Corsican                      //
+    qt2S60LangMapTable.insert("hr", "45");            //Croatian                      //Croatian
+    qt2S60LangMapTable.insert("cs", "25");            //Czech                         //Czech
+    qt2S60LangMapTable.insert("da", "07");            //Danish                        //Danish
+    qt2S60LangMapTable.insert("nl", "18");            //Dutch                         //Dutch
+    qt2S60LangMapTable.insert("en", "01");            //English                       //English(UK)
+    qt2S60LangMapTable.insert("eo", "SC");            //Esperanto                     //
+    qt2S60LangMapTable.insert("et", "49");            //Estonian                      //Estonian
+    qt2S60LangMapTable.insert("fo", "SC");            //Faroese                       //
+    qt2S60LangMapTable.insert("fj", "SC");            //Fiji                          //
+    qt2S60LangMapTable.insert("fi", "09");            //Finnish                       //Finnish
+    qt2S60LangMapTable.insert("fr", "02");            //French                        //French
+    qt2S60LangMapTable.insert("fy", "SC");            //Frisian                       //
+    qt2S60LangMapTable.insert("gd", "52");            //Gaelic                        //Gaelic
+    qt2S60LangMapTable.insert("gl", "SC");            //Galician                      //
+    qt2S60LangMapTable.insert("ka", "53");            //Georgian                      //Georgian
+    qt2S60LangMapTable.insert("de", "03");            //German                        //German
+    qt2S60LangMapTable.insert("el", "54");            //Greek                         //Greek
+    qt2S60LangMapTable.insert("kl", "SC");            //Greenlandic                   //
+    qt2S60LangMapTable.insert("gn", "SC");            //Guarani                       //
+    qt2S60LangMapTable.insert("gu", "56");            //Gujarati                      //Gujarati
+    qt2S60LangMapTable.insert("ha", "SC");            //Hausa                         //
+    qt2S60LangMapTable.insert("he", "57");            //Hebrew                        //Hebrew
+    qt2S60LangMapTable.insert("hi", "58");            //Hindi                         //Hindi
+    qt2S60LangMapTable.insert("hu", "17");            //Hungarian                     //Hungarian
+    qt2S60LangMapTable.insert("is", "15");            //Icelandic                     //Icelandic
+    qt2S60LangMapTable.insert("id", "59");            //Indonesian                    //Indonesian
+    qt2S60LangMapTable.insert("ia", "SC");            //Interlingua                   //
+    qt2S60LangMapTable.insert("ie", "SC");            //Interlingue                   //
+    qt2S60LangMapTable.insert("iu", "SC");            //Inuktitut                     //
+    qt2S60LangMapTable.insert("ik", "SC");            //Inupiak                       //
+    qt2S60LangMapTable.insert("ga", "60");            //Irish                         //Irish
+    qt2S60LangMapTable.insert("it", "05");            //Italian                       //Italian
+    qt2S60LangMapTable.insert("ja", "32");            //Japanese                      //Japanese
+    qt2S60LangMapTable.insert("jv", "SC");            //Javanese                      //
+    qt2S60LangMapTable.insert("kn", "62");            //Kannada                       //Kannada
+    qt2S60LangMapTable.insert("ks", "SC");            //Kashmiri                      //
+    qt2S60LangMapTable.insert("kk", "63");            //Kazakh                        //Kazakh
+    qt2S60LangMapTable.insert("rw", "SC");            //Kinyarwanda                   //
+    qt2S60LangMapTable.insert("ky", "SC");            //Kirghiz                       //
+    qt2S60LangMapTable.insert("ko", "65");            //Korean                        //Korean
+    qt2S60LangMapTable.insert("ku", "SC");            //Kurdish                       //
+    qt2S60LangMapTable.insert("rn", "SC");            //Kurundi                       //
+    qt2S60LangMapTable.insert("lo", "66");            //Laothian                      //Laothian
+    qt2S60LangMapTable.insert("la", "SC");            //Latin                         //
+    qt2S60LangMapTable.insert("lv", "67");            //Latvian                       //Latvian
+    qt2S60LangMapTable.insert("ln", "SC");            //Lingala                       //
+    qt2S60LangMapTable.insert("lt", "68");            //Lithuanian                    //Lithuanian
+    qt2S60LangMapTable.insert("mk", "69");            //Macedonian                    //Macedonian
+    qt2S60LangMapTable.insert("mg", "SC");            //Malagasy                      //
+    qt2S60LangMapTable.insert("ms", "70");            //Malay                         //Malay
+    qt2S60LangMapTable.insert("ml", "71");            //Malayalam                     //Malayalam
+    qt2S60LangMapTable.insert("mt", "SC");            //Maltese                       //
+    qt2S60LangMapTable.insert("mi", "SC");            //Maori                         //
+    qt2S60LangMapTable.insert("mr", "72");            //Marathi                       //Marathi
+    qt2S60LangMapTable.insert("mo", "73");            //Moldavian                     //Moldovian
+    qt2S60LangMapTable.insert("mn", "74");            //Mongolian                     //Mongolian
+    qt2S60LangMapTable.insert("na", "SC");            //Nauru                         //
+    qt2S60LangMapTable.insert("ne", "SC");            //Nepali                        //
+    qt2S60LangMapTable.insert("nb", "08");            //Norwegian                     //Norwegian
+    qt2S60LangMapTable.insert("oc", "SC");            //Occitan                       //
+    qt2S60LangMapTable.insert("or", "SC");            //Oriya                         //
+    qt2S60LangMapTable.insert("ps", "SC");            //Pashto                        //
+    qt2S60LangMapTable.insert("fa", "SC");            //Persian                       //
+    qt2S60LangMapTable.insert("pl", "27");            //Polish                        //Polish
+    qt2S60LangMapTable.insert("pt", "13");            //Portuguese                    //Portuguese
+    qt2S60LangMapTable.insert("pa", "77");            //Punjabi                       //Punjabi
+    qt2S60LangMapTable.insert("qu", "SC");            //Quechua                       //
+    qt2S60LangMapTable.insert("rm", "SC");            //RhaetoRomance                 //
+    qt2S60LangMapTable.insert("ro", "78");            //Romanian                      //Romanian
+    qt2S60LangMapTable.insert("ru", "16");            //Russian                       //Russian
+    qt2S60LangMapTable.insert("sm", "SC");            //Samoan                        //
+    qt2S60LangMapTable.insert("sg", "SC");            //Sangho                        //
+    qt2S60LangMapTable.insert("sa", "SC");            //Sanskrit                      //
+    qt2S60LangMapTable.insert("sr", "79");            //Serbian                       //Serbian
+    qt2S60LangMapTable.insert("sh", "SC");            //SerboCroatian                 //
+    qt2S60LangMapTable.insert("st", "SC");            //Sesotho                       //
+    qt2S60LangMapTable.insert("tn", "SC");            //Setswana                      //
+    qt2S60LangMapTable.insert("sn", "SC");            //Shona                         //
+    qt2S60LangMapTable.insert("sd", "SC");            //Sindhi                        //
+    qt2S60LangMapTable.insert("si", "80");            //Singhalese                    //Sinhalese
+    qt2S60LangMapTable.insert("ss", "SC");            //Siswati                       //
+    qt2S60LangMapTable.insert("sk", "26");            //Slovak                        //Slovak
+    qt2S60LangMapTable.insert("sl", "28");            //Slovenian                     //Slovenian
+    qt2S60LangMapTable.insert("so", "81");            //Somali                        //Somali
+    qt2S60LangMapTable.insert("es", "04");            //Spanish                       //Spanish
+    qt2S60LangMapTable.insert("su", "SC");            //Sundanese                     //
+    qt2S60LangMapTable.insert("sw", "84");            //Swahili                       //Swahili
+    qt2S60LangMapTable.insert("sv", "06");            //Swedish                       //Swedish
+    qt2S60LangMapTable.insert("tl", "39");            //Tagalog                       //Tagalog
+    qt2S60LangMapTable.insert("tg", "SC");            //Tajik                         //
+    qt2S60LangMapTable.insert("ta", "87");            //Tamil                         //Tamil
+    qt2S60LangMapTable.insert("tt", "SC");            //Tatar                         //
+    qt2S60LangMapTable.insert("te", "88");            //Telugu                        //Telugu
+    qt2S60LangMapTable.insert("th", "33");            //Thai                          //Thai
+    qt2S60LangMapTable.insert("bo", "89");            //Tibetan                       //Tibetan
+    qt2S60LangMapTable.insert("ti", "90");            //Tigrinya                      //Tigrinya
+    qt2S60LangMapTable.insert("to", "SC");            //Tonga                         //
+    qt2S60LangMapTable.insert("ts", "SC");            //Tsonga                        //
+    qt2S60LangMapTable.insert("tr", "14");            //Turkish                       //Turkish
+    qt2S60LangMapTable.insert("tk", "92");            //Turkmen                       //Turkmen
+    qt2S60LangMapTable.insert("tw", "SC");            //Twi                           //
+    qt2S60LangMapTable.insert("ug", "SC");            //Uigur                         //
+    qt2S60LangMapTable.insert("uk", "93");            //Ukrainian                     //Ukrainian
+    qt2S60LangMapTable.insert("ur", "94");            //Urdu                          //Urdu
+    qt2S60LangMapTable.insert("uz", "SC");            //Uzbek                         //
+    qt2S60LangMapTable.insert("vi", "96");            //Vietnamese                    //Vietnamese
+    qt2S60LangMapTable.insert("vo", "SC");            //Volapuk                       //
+    qt2S60LangMapTable.insert("cy", "97");            //Welsh                         //Welsh
+    qt2S60LangMapTable.insert("wo", "SC");            //Wolof                         //
+    qt2S60LangMapTable.insert("xh", "SC");            //Xhosa                         //
+    qt2S60LangMapTable.insert("yi", "SC");            //Yiddish                       //
+    qt2S60LangMapTable.insert("yo", "SC");            //Yoruba                        //
+    qt2S60LangMapTable.insert("za", "SC");            //Zhuang                        //
+    qt2S60LangMapTable.insert("zu", "98");            //Zulu                          //Zulu
+    qt2S60LangMapTable.insert("nn", "75");            //Nynorsk                       //NorwegianNynorsk
+    qt2S60LangMapTable.insert("bs", "SC");            //Bosnian                       //
+    qt2S60LangMapTable.insert("dv", "SC");            //Divehi                        //
+    qt2S60LangMapTable.insert("gv", "SC");            //Manx                          //
+    qt2S60LangMapTable.insert("kw", "SC");            //Cornish                       //
+    qt2S60LangMapTable.insert("ak", "SC");            //Akan                          //
+    qt2S60LangMapTable.insert("kok", "SC");           //Konkani                       //
+    qt2S60LangMapTable.insert("gaa", "SC");           //Ga                            //
+    qt2S60LangMapTable.insert("ig", "SC");            //Igbo                          //
+    qt2S60LangMapTable.insert("kam", "SC");           //Kamba                         //
+    qt2S60LangMapTable.insert("syr", "SC");           //Syriac                        //
+    qt2S60LangMapTable.insert("byn", "SC");           //Blin                          //
+    qt2S60LangMapTable.insert("gez", "SC");           //Geez                          //
+    qt2S60LangMapTable.insert("kfo", "SC");           //Koro                          //
+    qt2S60LangMapTable.insert("sid", "SC");           //Sidamo                        //
+    qt2S60LangMapTable.insert("cch", "SC");           //Atsam                         //
+    qt2S60LangMapTable.insert("tig", "SC");           //Tigre                         //
+    qt2S60LangMapTable.insert("kaj", "SC");           //Jju                           //
+    qt2S60LangMapTable.insert("fur", "SC");           //Friulian	                     //
+    qt2S60LangMapTable.insert("ve", "SC");            //Venda	                     //
+    qt2S60LangMapTable.insert("ee", "SC");            //Ewe	                         //
+    qt2S60LangMapTable.insert("wa", "SC");            //Walamo	                     //
+    qt2S60LangMapTable.insert("haw", "SC");           //Hawaiian	                     //
+    qt2S60LangMapTable.insert("kcg", "SC");           //Tyap	                         //
+    qt2S60LangMapTable.insert("ny", "SC");            //Chewa	                     //
+}
+
+void SymbianMakefileGenerator::appendIfnotExist(QStringList &list, QString value)
+{
+    if(!list.contains(value))
+        list += value;
+}
+
+void SymbianMakefileGenerator::appendIfnotExist(QStringList &list, QStringList values)
+{
+    foreach(QString item, values)
+        appendIfnotExist(list, item);
+}
+
+QString SymbianMakefileGenerator::removePathSeparators(QString &file)
+{
+    QString ret = file;
+    while(ret.indexOf(QDir::separator()) > 0) {
+        ret.remove(0, ret.indexOf(QDir::separator())+1);
+    }
+
+    return ret;
+}
+
+
+QString SymbianMakefileGenerator::removeTrailingPathSeparators(QString &file)
+{
+    QString ret = file;
+    if(ret.endsWith(QDir::separator())) {
+        ret.remove(ret.length()-1,1);
+    }
+
+    return ret;
+}
+
+void SymbianMakefileGenerator::generateCleanCommands(QTextStream& t,
+                                                     const QStringList& toClean,
+                                                     const QString& cmd,
+                                                     const QString& cmdOptions,
+                                                     const QString& itemPrefix,
+                                                     const QString& itemSuffix)
+{
+    for (int i = 0; i < toClean.size(); ++i) {
+        QString item = toClean.at(i);
+        item.prepend(itemPrefix).append(itemSuffix);
+#if defined(Q_OS_WIN)
+        t << "\t-@ if EXIST \"" << QDir::toNativeSeparators(item) << "\" ";
+        t << cmd << " " << cmdOptions << " \"" << QDir::toNativeSeparators(item) << "\"" << endl;
+#else
+        t << "\t-if test -f " << QDir::toNativeSeparators(item) << "; then ";
+        t << cmd << " " << cmdOptions << " " << QDir::toNativeSeparators(item) << "; fi" << endl;
+#endif
+    }
+}
+
+QString SymbianMakefileGenerator::getWithoutSpecialCharacters(QString& str)
+{
+    QString tmp = str;
+
+    tmp.replace(QString("/"), QString("_"));
+    tmp.replace(QString("\\"), QString("_"));
+    tmp.replace(QString("-"), QString("_"));
+    tmp.replace(QString(":"), QString("_"));
+    tmp.replace(QString("."), QString("_"));
+
+    return tmp;
+}
+
+void SymbianMakefileGenerator::removeSpecialCharacters(QString& str)
+{
+    str.replace(QString("/"), QString("_"));
+    str.replace(QString("\\"), QString("_"));
+    str.replace(QString("-"), QString("_"));
+    str.replace(QString(":"), QString("_"));
+    str.replace(QString("."), QString("_"));
+    str.replace(QString(" "), QString("_"));
+}
+
+void SymbianMakefileGenerator::generateDistcleanTargets(QTextStream& t)
+{
+    t << "dodistclean:" << endl;
+    foreach(QString item, project->values("SUBDIRS")) {
+        bool fromFile = false;
+        QString fixedItem;
+        if(!project->isEmpty(item + ".file")) {
+            fixedItem = project->first(item + ".file");
+            fromFile = true;
+        } else if(!project->isEmpty(item + ".subdir")) {
+            fixedItem = project->first(item + ".subdir");
+            fromFile = false;
+        } else {
+            fromFile = item.endsWith(Option::pro_ext);
+            fixedItem = item;
+        }
+        QFileInfo fi(fileInfo(fixedItem));
+        if (!fromFile) {
+            t << "\t-$(MAKE) -f \"" << Option::fixPathToTargetOS(fi.absoluteFilePath() + "/Makefile") << "\" dodistclean" << endl;
+        } else {
+            QString itemName = fi.fileName();
+            int extIndex = itemName.lastIndexOf(Option::pro_ext);
+            if (extIndex)
+                fixedItem = fi.absolutePath() + "/" + QString("Makefile.") + itemName.mid(0,extIndex);
+            t << "\t-$(MAKE) -f \"" << Option::fixPathToTargetOS(fixedItem) << "\" dodistclean" << endl;
+        }
+
+    }
+
+    generatedFiles << Option::fixPathToTargetOS(fileInfo(Option::output.fileName()).absoluteFilePath()); // bld.inf
+    generatedFiles << project->values("QMAKE_INTERNAL_PRL_FILE"); // Add generated prl files for cleanup
+    generatedFiles << project->values("QMAKE_DISTCLEAN"); // Add any additional files marked for distclean
+    QStringList fixedFiles;
+    QStringList fixedDirs;
+    foreach(QString item, generatedFiles) {
+        QString fixedItem = Option::fixPathToTargetOS(fileInfo(item).absoluteFilePath());
+        if (!fixedFiles.contains(fixedItem)) {
+            fixedFiles << fixedItem;
+        }
+    }
+    foreach(QString item, generatedDirs) {
+        QString fixedItem = Option::fixPathToTargetOS(fileInfo(item).absoluteFilePath());
+        if (!fixedDirs.contains(fixedItem)) {
+            fixedDirs << fixedItem;
+        }
+    }
+    generateCleanCommands(t, fixedFiles, "$(DEL_FILE)", "", "", "");
+    generateCleanCommands(t, fixedDirs, "$(DEL_DIR)", "", "", "");
+    t << endl;
+
+    t << "distclean: clean dodistclean" << endl;
+    t << endl;
+}
\ No newline at end of file
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
new file mode 100644
index 0000000000..52c3c4d462
--- /dev/null
+++ b/qmake/generators/symbian/symmake.h
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SYMMAKEFILE_H
+#define SYMMAKEFILE_H
+
+#include <makefile.h>
+
+QT_BEGIN_NAMESPACE
+
+// In the Qt evaluation and educational version, we have a postfix in the
+// library name (e.g. qtmteval301.dll). QTDLL_POSTFIX is used for this.
+// A script modifies these lines when building eval/edu version, so be careful
+// when changing them.
+#ifndef QTDLL_POSTFIX
+#define QTDLL_POSTFIX ""
+#endif
+
+#define BLD_INF_FILENAME "bld.inf"
+#define MAKEFILE_DEPENDENCY_SEPARATOR " \\\n\t"
+
+#define QT_EXTRA_INCLUDE_DIR "tmp"
+
+class SymbianMakefileGenerator : public MakefileGenerator {
+
+protected:
+
+    QString platform;
+    QString uid1;
+    QString uid2;
+    QString uid3;
+    QString privateDirUid;
+    QString targetType;
+    QMap<QString, QStringList> sources;
+    QMap<QString, QStringList> systeminclude;
+    QMap<QString, QStringList> library;
+    // (output file) (source , command)
+    QMap<QString, QStringList> makmakeCommands;
+
+    QStringList generatedFiles;
+    QStringList generatedDirs;
+    QHash<QString, QString> qt2S60LangMapTable;
+
+    void removeSpecialCharacters(QString& str);
+    QString getWithoutSpecialCharacters(QString& str);
+    QString fixPathForMmp(const QString& origPath, const QDir& parentDir);
+    QString canonizePath(const QString& origPath);
+
+    virtual bool writeMakefile(QTextStream &t);
+    bool generatePkgFile(const QString &compiler, const QString &config, const QString &iconFile);
+
+    virtual void init();
+
+    QString getTargetExtension();
+    bool isConfigSetToSymbian();
+
+    QString generateUID1();
+    QString generateUID2();
+    QString generateUID3();
+
+    bool initMmpVariables();
+
+    void writeHeader(QTextStream &t);
+    bool writeBldInfContent(QTextStream& t, bool addDeploymentExtension);
+
+    static bool removeDuplicatedStrings(QStringList& stringList);
+
+    bool writeMmpFileHeader(QTextStream &t);
+    bool writeMmpFile(QString &filename, QStringList &symbianLangCodes);
+    bool writeMmpFileMacrosPart(QTextStream& t);
+    bool addMacro(QTextStream& t, const QString& value);
+    bool writeMmpFileTargetPart(QTextStream& t);
+    bool writeMmpFileResourcePart(QTextStream& t, QStringList &symbianLangCodes);
+    bool writeMmpFileSystemIncludePart(QTextStream& t);
+    bool writeMmpFileIncludePart(QTextStream& t);
+    bool writeMmpFileLibraryPart(QTextStream& t);
+    bool writeMmpFileCapabilityPart(QTextStream& t);
+    bool writeMmpFileCompilerOptionPart(QTextStream& t);
+    bool writeMmpFileBinaryVersionPart(QTextStream& t);
+    bool writeMmpFileRulesPart(QTextStream& t);
+
+    bool writeRegRssFile(QString &appname, QStringList &useritems);
+    bool writeRssFile(QString &appName, QString &numberOfIcons, QString &iconfile);
+    bool writeLocFile(QString &appName, QStringList &symbianLangCodes);
+    void readRssRules(QString &numberOfIcons, QString &iconFile, QStringList &userRssRules);
+    QStringList symbianLangCodesFromTsFiles();
+    void fillQt2S60LangMapTable();
+
+    void appendIfnotExist(QStringList &list, QString value);
+    void appendIfnotExist(QStringList &list, QStringList values);
+
+    QString removePathSeparators(QString &file);
+    QString removeTrailingPathSeparators(QString &file);
+    void generateCleanCommands(QTextStream& t,
+                               const QStringList& toClean,
+                               const QString& cmd,
+                               const QString& cmdOptions,
+                               const QString& itemPrefix,
+                               const QString& itemSuffix);
+
+    void generateDistcleanTargets(QTextStream& t);
+
+    bool writeCustomDefFile();
+
+    // Subclass implements
+    virtual bool writeBldInfExtensionRulesPart(QTextStream& t) = 0;
+    virtual void writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension) = 0;
+    virtual bool writeMkFile(const QString& wrapperFileName, bool deploymentOnly) = 0;
+    virtual void writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile) = 0;
+
+public:
+
+    SymbianMakefileGenerator();
+    ~SymbianMakefileGenerator();
+
+};
+
+#endif // SYMMAKEFILE_H
+
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
new file mode 100644
index 0000000000..ccda9f2dc5
--- /dev/null
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -0,0 +1,428 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "symmake_abld.h"
+#include "initprojectdeploy_symbian.h"
+
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qdir.h>
+#include <qdatetime.h>
+#include <qdebug.h>
+
+#define DO_NOTHING_TARGET "do_nothing"
+#define CREATE_TEMPS_TARGET "create_temps"
+#define EXTENSION_CLEAN "extension_clean"
+#define PRE_TARGETDEPS_TARGET "pre_targetdeps"
+#define COMPILER_CLEAN_TARGET "compiler_clean"
+#define FINALIZE_TARGET "finalize"
+#define GENERATED_SOURCES_TARGET "generated_sources"
+#define ALL_SOURCE_DEPS_TARGET "all_source_deps"
+#define WINSCW_DEPLOYMENT_TARGET "winscw_deployment"
+#define WINSCW_DEPLOYMENT_CLEAN_TARGET "winscw_deployment_clean"
+
+SymbianAbldMakefileGenerator::SymbianAbldMakefileGenerator() : SymbianMakefileGenerator() { }
+SymbianAbldMakefileGenerator::~SymbianAbldMakefileGenerator() { }
+
+bool SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly)
+{
+
+    QString gnuMakefileName = QLatin1String("Makefile_") + uid3;
+    removeSpecialCharacters(gnuMakefileName);
+    gnuMakefileName.append(".mk");
+
+    QFile ft(gnuMakefileName);
+    if(ft.open(QIODevice::WriteOnly)) {
+        generatedFiles << ft.fileName();
+        QTextStream t(&ft);
+
+        t << "# ==============================================================================" << endl;
+        t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
+        t << QDateTime::currentDateTime().toString() << endl;
+        t << "# This file is generated by qmake and should not be modified by the" << endl;
+        t << "# user." << endl;
+        t << "#  Name        : " << gnuMakefileName << endl;
+        t << "#  Part of     : " << project->values("TARGET").join(" ") << endl;
+        t << "#  Description : This file is used to call necessary targets on wrapper makefile" << endl;
+        t << "#                during normal Symbian build process." << endl;
+        t << "#  Version     : " << endl;
+        t << "#" << endl;
+        t << "# ==============================================================================" << "\n" << endl;
+
+        t << endl << endl;
+
+        t << "MAKE = make" << endl;
+        t << endl;
+
+        t << DO_NOTHING_TARGET " :" << endl;
+        t << "\t" << "@rem " DO_NOTHING_TARGET << endl << endl;
+
+        QString buildDeps;
+        QString cleanDeps;
+        QString finalDeps;
+        QString cleanDepsWinscw;
+        QString finalDepsWinscw;
+        QStringList wrapperTargets;
+        if (deploymentOnly) {
+            buildDeps.append(DO_NOTHING_TARGET);
+            cleanDeps.append(DO_NOTHING_TARGET);
+            cleanDepsWinscw.append( WINSCW_DEPLOYMENT_CLEAN_TARGET);
+            finalDeps.append(DO_NOTHING_TARGET);
+            finalDepsWinscw.append(WINSCW_DEPLOYMENT_TARGET);
+            wrapperTargets << WINSCW_DEPLOYMENT_TARGET << WINSCW_DEPLOYMENT_CLEAN_TARGET;
+        } else {
+            buildDeps.append(CREATE_TEMPS_TARGET " " PRE_TARGETDEPS_TARGET);
+            cleanDeps.append(EXTENSION_CLEAN);
+            cleanDepsWinscw.append(EXTENSION_CLEAN " " WINSCW_DEPLOYMENT_CLEAN_TARGET);
+            finalDeps.append(FINALIZE_TARGET);
+            finalDepsWinscw.append(FINALIZE_TARGET " " WINSCW_DEPLOYMENT_TARGET);
+            wrapperTargets << PRE_TARGETDEPS_TARGET
+                << CREATE_TEMPS_TARGET
+                << EXTENSION_CLEAN
+                << FINALIZE_TARGET
+                << WINSCW_DEPLOYMENT_CLEAN_TARGET
+                << WINSCW_DEPLOYMENT_TARGET;
+        }
+
+        t << "MAKMAKE: " << buildDeps << endl << endl;
+        t << "LIB: " << buildDeps << endl << endl;
+        t << "BLD: " << buildDeps << endl << endl;
+        t << "ifeq \"$(PLATFORM)\" \"WINSCW\"" << endl;
+        t << "CLEAN: " << cleanDepsWinscw << endl;
+        t << "else" << endl;
+        t << "CLEAN: " << cleanDeps << endl;
+        t << "endif" << endl << endl;
+        t << "CLEANLIB: " DO_NOTHING_TARGET << endl << endl;
+        t << "RESOURCE: " DO_NOTHING_TARGET << endl << endl;
+        t << "FREEZE: " DO_NOTHING_TARGET << endl << endl;
+        t << "SAVESPACE: " DO_NOTHING_TARGET << endl << endl;
+        t << "RELEASABLES: " DO_NOTHING_TARGET << endl << endl;
+        t << "ifeq \"$(PLATFORM)\" \"WINSCW\"" << endl;
+        t << "FINAL: " << finalDepsWinscw << endl;
+        t << "else" << endl;
+        t << "FINAL: " << finalDeps << endl;
+        t << "endif" << endl << endl;
+
+        QString makefile(Option::fixPathToTargetOS(fileInfo(wrapperFileName).canonicalFilePath()));
+        foreach(QString target, wrapperTargets) {
+            t << target << " : " << makefile << endl;
+            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << endl << endl;
+        }
+
+        t << endl;
+    } // if(ft.open(QIODevice::WriteOnly))
+
+    return true;
+}
+
+void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile)
+{
+    QStringList allPlatforms;
+    foreach(QString platform, project->values("SYMBIAN_PLATFORMS")) {
+        allPlatforms << platform.toLower();
+    }
+
+    QStringList debugPlatforms = allPlatforms;
+    QStringList releasePlatforms = allPlatforms;
+    releasePlatforms.removeAll("winscw"); // No release for emulator
+
+    bool isSubdirs = getTargetExtension() == "subdirs";
+
+    QString testClause;
+    if (project->values("CONFIG").contains("symbian_test", Qt::CaseInsensitive))
+        testClause = QLatin1String(" test");
+    else
+        testClause = QLatin1String("");
+
+    QTextStream t(&wrapperFile);
+
+    t << "# ==============================================================================" << endl;
+    t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
+    t << QDateTime::currentDateTime().toString() << endl;
+    t << "# This file is generated by qmake and should not be modified by the" << endl;
+    t << "# user." << endl;
+    t << "#  Name        : " << wrapperFile.fileName() << endl;
+    t << "#  Description : Wrapper Makefile for calling Symbian build tools" << endl;
+    t << "#" << endl;
+    t << "# ==============================================================================" << "\n" << endl;
+    t << endl;
+    QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
+    if(ofile.lastIndexOf(Option::dir_sep) != -1)
+        ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) -1);
+    t << "MAKEFILE          = " << ofile << endl;
+    t << "QMAKE             = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
+    t << "DEL_FILE          = " << var("QMAKE_DEL_FILE") << endl;
+    t << "DEL_DIR           = " << var("QMAKE_DEL_DIR") << endl;
+    t << "XCOPY             = xcopy /d /f /h /r /y /i" << endl;
+    t << "ABLD              = ABLD.BAT" << endl;
+    t << "DEBUG_PLATFORMS   = " << debugPlatforms.join(" ") << endl;
+    t << "RELEASE_PLATFORMS = " << releasePlatforms.join(" ") << endl;
+    t << "MAKE              = make" << endl;
+    t << endl;
+    t << "ifeq (WINS,$(findstring WINS, $(PLATFORM)))" << endl;
+    t << "ZDIR=$(EPOCROOT)epoc32\\release\\$(PLATFORM)\\$(CFG)\\Z" << endl;
+    t << "else" << endl;
+    t << "ZDIR=$(EPOCROOT)epoc32\\data\\z" << endl;
+    t << "endif" << endl;
+    t << endl;
+    t << "DEFINES" << '\t' << " = "
+        << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
+        << varGlue("QMAKE_COMPILER_DEFINES", "-D", "-D", " ")
+        << varGlue("DEFINES","-D"," -D","") << endl;
+
+    t << "INCPATH" << '\t' << " = ";
+
+    for(QMap<QString, QStringList>::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) {
+        QStringList values = it.value();
+        for (int i = 0; i < values.size(); ++i) {
+            t << " -I\"" << values.at(i) << "\"";
+        }
+    }
+    t << endl;
+    t << "first: default" << endl;
+    if (debugPlatforms.contains("winscw"))
+        t << "default: debug-winscw";
+    else if (debugPlatforms.contains("armv5"))
+        t << "default: debug-armv5";
+    else if (debugPlatforms.size())
+        t << "default: debug-" << debugPlatforms.first();
+    else
+        t << "default: all";
+
+    t << endl;
+    if (!isPrimaryMakefile) {
+        t << "all:" << endl;
+    } else {
+        t << "all: debug release" << endl;
+        t << endl;
+        t << "qmake:" << endl;
+        t << "\t$(QMAKE) -spec symbian-abld -o \"" << fileInfo(Option::output.fileName()).fileName()
+          << "\" \"" << project->projectFile() << "\"" << endl;
+        t << endl;
+        t << BLD_INF_FILENAME ":" << endl;
+        t << "\t$(QMAKE)" << endl;
+        t << endl;
+        t << "$(ABLD): " BLD_INF_FILENAME << endl;
+        t << "\tbldmake bldfiles" << endl;
+        t << endl;
+
+        t << "debug: $(ABLD)" << endl;
+        foreach(QString item, debugPlatforms) {
+            t << "\t$(ABLD)" << testClause << " build " << item << " udeb" << endl;
+        }
+        t << endl;
+        t << "release: $(ABLD)" << endl;
+        foreach(QString item, releasePlatforms) {
+            t << "\t$(ABLD)" << testClause << " build " << item << " urel" << endl;
+        }
+        t << endl;
+
+        // For more specific builds, targets are in this form: build-platform, e.g. release-armv5
+        foreach(QString item, debugPlatforms) {
+            t << "debug-" << item << ": $(ABLD)" << endl;
+            t << "\t$(ABLD)" << testClause << " build " << item << " udeb" << endl;
+        }
+
+        foreach(QString item, releasePlatforms) {
+            t << "release-" << item << ": $(ABLD)" << endl;
+            t << "\t$(ABLD)" << testClause << " build " << item << " urel" << endl;
+        }
+
+        t << endl;
+        t << "export: $(ABLD)" << endl;
+        t << "\t$(ABLD)" << testClause << " export" << endl;
+        t << endl;
+
+        t << "cleanexport: $(ABLD)" << endl;
+        t << "\t$(ABLD)" << testClause << " cleanexport" << endl;
+        t << endl;
+
+    }
+
+    // pre_targetdeps target depends on:
+    //  - all targets specified in PRE_TARGETDEPS
+    //  - the GENERATED_SOURCES sources (so that they get generated)
+    //  - all dependencies of sources targeted for compilation
+    //    (mainly to ensure that any included UNUSED_SOURCES that need to be generated get generated)
+    //
+    // Unfortunately, Symbian build chain doesn't support linking generated objects to target,
+    // so supporting generating sources is the best we can do. This is enough for mocs.
+
+    if (!isSubdirs) {
+        writeExtraTargets(t);
+        writeExtraCompilerTargets(t);
+
+        t << CREATE_TEMPS_TARGET ":" << endl;
+        // generate command lines like this ...
+        // -@ if NOT EXIST  ".\somedir"         mkdir ".\somedir"
+        QStringList dirsToClean;
+        for(QMap<QString, QStringList>::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) {
+            QStringList values = it.value();
+            for (int i = 0; i < values.size(); ++i) {
+                if (values.at(i).endsWith("/" QT_EXTRA_INCLUDE_DIR)) {
+                    QString fixedValue(QDir::toNativeSeparators(values.at(i)));
+                    dirsToClean << fixedValue;
+                    t << "\t-@ if NOT EXIST \""  << fixedValue << "\" mkdir \""
+                      << fixedValue << "\"" << endl;
+                }
+            }
+        }
+        t << endl;
+
+        // Note: EXTENSION_CLEAN will get called many times when doing reallyclean
+        //       This is why the "2> NUL" gets appended to generated clean targets in makefile.cpp.
+        t << EXTENSION_CLEAN ": " COMPILER_CLEAN_TARGET << endl;
+        generateCleanCommands(t, dirsToClean, var("QMAKE_DEL_DIR"), " /S /Q ", "", "");
+        t << endl;
+
+        t << PRE_TARGETDEPS_TARGET ":"
+          << MAKEFILE_DEPENDENCY_SEPARATOR GENERATED_SOURCES_TARGET
+          << MAKEFILE_DEPENDENCY_SEPARATOR ALL_SOURCE_DEPS_TARGET;
+        if (project->values("PRE_TARGETDEPS").size())
+            t << MAKEFILE_DEPENDENCY_SEPARATOR << project->values("PRE_TARGETDEPS").join(MAKEFILE_DEPENDENCY_SEPARATOR);
+        t << endl << endl;
+        t << GENERATED_SOURCES_TARGET ":";
+        if (project->values("GENERATED_SOURCES").size())
+            t << MAKEFILE_DEPENDENCY_SEPARATOR << project->values("GENERATED_SOURCES").join(MAKEFILE_DEPENDENCY_SEPARATOR);
+        t << endl << endl;
+        t << ALL_SOURCE_DEPS_TARGET ":";
+
+        QStringList allDeps;
+        for(QMap<QString, QStringList>::iterator it = sources.begin(); it != sources.end(); ++it) {
+            QString currentSourcePath = it.key();
+            QStringList values = it.value();
+            for (int i = 0; i < values.size(); ++i) {
+                // we need additional check
+                QString sourceFile = currentSourcePath + "/" + values.at(i);
+                QStringList deps = findDependencies(QDir::toNativeSeparators(sourceFile));
+                appendIfnotExist(allDeps, deps);
+            }
+        }
+
+        foreach(QString item, allDeps) {
+            t << MAKEFILE_DEPENDENCY_SEPARATOR << item;
+        }
+        t << endl << endl;
+
+        // Post link operations
+        t << FINALIZE_TARGET ":" << endl;
+        if(!project->isEmpty("QMAKE_POST_LINK")) {
+            t << '\t' << var("QMAKE_POST_LINK");
+            t << endl;
+        }
+        t << endl;
+    }
+    else {
+        QList<MakefileGenerator::SubTarget*> subtargets = findSubDirsSubTargets();
+        writeSubTargets(t, subtargets, SubTargetSkipDefaultVariables|SubTargetSkipDefaultTargets);
+        qDeleteAll(subtargets);
+    }
+
+    writeDeploymentTargets(t);
+
+    generateDistcleanTargets(t);
+
+    t << "clean: $(ABLD)" << endl;
+    t << "\t-$(ABLD)" << testClause << " reallyclean" << endl;
+    t << "\t-bldmake clean" << endl;
+    t << endl;
+
+    // create execution target
+    if (debugPlatforms.contains("winscw") && getTargetExtension() == "exe") {
+        t << "run:" << endl;
+        t << "\t-call " << epocRoot() << "epoc32\\release\\winscw\\udeb\\" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".exe")) << endl << endl;
+    }
+}
+
+bool SymbianAbldMakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t)
+{
+    // We don't use extensions for anything in abld
+    Q_UNUSED(t);
+    return true;
+}
+
+bool SymbianAbldMakefileGenerator::writeDeploymentTargets(QTextStream &t)
+{
+    t << WINSCW_DEPLOYMENT_TARGET ":" << endl;
+
+    QString remoteTestPath = epocRoot() + QLatin1String("epoc32\\winscw\\c\\private\\") + privateDirUid;   // default 4 OpenC; 4 all Symbian too
+    DeploymentList depList;
+    initProjectDeploySymbian( project, depList, remoteTestPath, false, QLatin1String("winscw"), QLatin1String("udeb"), generatedDirs, generatedFiles );
+
+    if (depList.size())
+        t << "\t-echo Deploying changed files..." << endl;
+
+    for (int i=0; i<depList.size(); ++i) {
+        // xcopy prompts for selecting file or directory if target doesn't exist,
+        // and doesn't provide switch to force file selection. It does provide dir forcing, though,
+        // so strip the last part of the destination.
+        t << "\t-$(XCOPY) \"" << depList.at(i).from << "\" \"" << depList.at(i).to.left(depList.at(i).to.lastIndexOf("\\")+1) << "\"" << endl;
+    }
+
+    t << endl;
+
+    t << WINSCW_DEPLOYMENT_CLEAN_TARGET ":" << endl;
+    QStringList cleanList;
+    for (int i=0; i<depList.size(); ++i) {
+        cleanList.append(depList.at(i).to);
+    }
+    generateCleanCommands(t, cleanList, "$(DEL_FILE)", "", "", "");
+
+    // Note: If deployment creates any directories, they will not get deleted after cleanup.
+    // To do this in robust fashion could be quite complex.
+
+    t << endl;
+
+    return true;
+}
+
+void SymbianAbldMakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension)
+{
+    // Normally emulator deployment gets done via regular makefile, but since subdirs
+    // do not get that, special deployment only makefile is generated for them if needed.
+    if(getTargetExtension() != "subdirs" || addDeploymentExtension) {
+        QString gnuMakefileName = QLatin1String("Makefile_") + uid3;
+        removeSpecialCharacters(gnuMakefileName);
+        gnuMakefileName.append(".mk");
+        t << "gnumakefile " << gnuMakefileName << endl;
+    }
+}
+
diff --git a/qmake/generators/symbian/symmake_abld.h b/qmake/generators/symbian/symmake_abld.h
new file mode 100644
index 0000000000..d32381377f
--- /dev/null
+++ b/qmake/generators/symbian/symmake_abld.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SYMMAKE_ABLD_H
+#define SYMMAKE_ABLD_H
+
+#include <symmake.h>
+
+QT_BEGIN_NAMESPACE
+
+class SymbianAbldMakefileGenerator : public SymbianMakefileGenerator {
+
+protected:
+
+    // Inherited from parent
+    virtual bool writeBldInfExtensionRulesPart(QTextStream& t);
+    virtual void writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension);
+    virtual bool writeMkFile(const QString& wrapperFileName, bool deploymentOnly);
+    virtual void writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile);
+
+    bool writeDeploymentTargets(QTextStream &t);
+
+public:
+
+    SymbianAbldMakefileGenerator();
+    ~SymbianAbldMakefileGenerator();
+
+};
+
+#endif // SYMMAKE_ABLD_H
+
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
new file mode 100644
index 0000000000..0266bac579
--- /dev/null
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -0,0 +1,421 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "symmake_sbsv2.h"
+#include "initprojectdeploy_symbian.h"
+
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qdir.h>
+#include <qdatetime.h>
+#include <qdebug.h>
+
+SymbianSbsv2MakefileGenerator::SymbianSbsv2MakefileGenerator() : SymbianMakefileGenerator() { }
+SymbianSbsv2MakefileGenerator::~SymbianSbsv2MakefileGenerator() { }
+
+#define FLM_DEST_DIR "epoc32/tools/makefile_templates/qt"
+#define FLM_SOURCE_DIR "/mkspecs/symbian-sbsv2/flm/qt"
+
+// Copies Qt FLMs to correct location under epocroot.
+// This is not done by configure as it is possible to change epocroot after configure.
+void SymbianSbsv2MakefileGenerator::exportFlm()
+{
+    static bool flmExportDone = false;
+
+    if (!flmExportDone) {
+        QDir sourceDir = QDir(QLibraryInfo::location(QLibraryInfo::PrefixPath) + FLM_SOURCE_DIR);
+        QFileInfoList sourceInfos = sourceDir.entryInfoList(QDir::Files);
+
+        QDir destDir(epocRoot() + FLM_DEST_DIR);
+        if (!destDir.exists()) {
+            if (destDir.mkpath(destDir.absolutePath()))
+                generatedDirs << destDir.absolutePath();
+        }
+
+        foreach(QFileInfo item, sourceInfos) {
+            QFileInfo destInfo = QFileInfo(destDir.absolutePath() + "/" + item.fileName());
+            if (!destInfo.exists() || destInfo.lastModified() < item.lastModified()) {
+                if (destInfo.exists())
+                    QFile::remove(destInfo.absoluteFilePath());
+                if (QFile::copy(item.absoluteFilePath(), destInfo.absoluteFilePath()))
+                    generatedFiles << destInfo.absoluteFilePath();
+                else
+                    fprintf(stderr, "Error: Could not copy '%s' -> '%s'\n", qPrintable(item.absoluteFilePath()), qPrintable(destInfo.absoluteFilePath()));
+            }
+        }
+        flmExportDone = true;
+    }
+}
+
+bool SymbianSbsv2MakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly)
+{
+    // Can't use extension makefile with sbsv2
+    Q_UNUSED(wrapperFileName);
+    Q_UNUSED(deploymentOnly);
+    return true;
+}
+
+void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile)
+{
+    QStringList allPlatforms;
+    foreach(QString platform, project->values("SYMBIAN_PLATFORMS")) {
+        allPlatforms << platform.toLower();
+    }
+
+    QStringList debugPlatforms = allPlatforms;
+    QStringList releasePlatforms = allPlatforms;
+    releasePlatforms.removeAll("winscw"); // No release for emulator
+
+    bool isSubdirs = getTargetExtension() == "subdirs";
+
+    QString testClause;
+    if (project->values("CONFIG").contains("symbian_test", Qt::CaseInsensitive))
+        testClause = QLatin1String(".test");
+    else
+        testClause = QLatin1String("");
+
+    QTextStream t(&wrapperFile);
+
+    t << "# ==============================================================================" << endl;
+    t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
+    t << QDateTime::currentDateTime().toString() << endl;
+    t << "# This file is generated by qmake and should not be modified by the" << endl;
+    t << "# user." << endl;
+    t << "#  Name        : " << wrapperFile.fileName() << endl;
+    t << "#  Description : Wrapper Makefile for calling Symbian build tools" << endl;
+    t << "#" << endl;
+    t << "# ==============================================================================" << "\n" << endl;
+    t << endl;
+    QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
+    if(ofile.lastIndexOf(Option::dir_sep) != -1)
+        ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) -1);
+    t << "MAKEFILE          = " << ofile << endl;
+    t << "QMAKE             = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
+    t << "DEL_FILE          = " << var("QMAKE_DEL_FILE") << endl;
+    t << "DEL_DIR           = " << var("QMAKE_DEL_DIR") << endl;
+    t << "DEBUG_PLATFORMS   = " << debugPlatforms.join(" ") << endl;
+    t << "RELEASE_PLATFORMS = " << releasePlatforms.join(" ") << endl;
+    t << "MAKE              = make" << endl;
+    t << "SBS               = sbs" << endl;
+    t << endl;
+    t << "DEFINES" << '\t' << " = "
+        << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
+        << varGlue("QMAKE_COMPILER_DEFINES", "-D", "-D", " ")
+        << varGlue("DEFINES","-D"," -D","") << endl;
+
+    t << "INCPATH" << '\t' << " = ";
+
+    for(QMap<QString, QStringList>::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) {
+        QStringList values = it.value();
+        for (int i = 0; i < values.size(); ++i) {
+            t << " -I\"" << values.at(i) << "\" ";
+        }
+    }
+    t << endl;
+    t << "first: default" << endl;
+    if (debugPlatforms.contains("winscw"))
+        t << "default: debug-winscw";
+    else if (debugPlatforms.contains("armv5"))
+        t << "default: debug-armv5";
+    else if (debugPlatforms.size())
+        t << "default: debug-" << debugPlatforms.first();
+    else
+        t << "default: all";
+
+    t << endl;
+    if (!isPrimaryMakefile) {
+        t << "all:" << endl;
+    } else {
+        t << "all: debug release" << endl;
+        t << endl;
+        t << "qmake:" << endl;
+        t << "\t$(QMAKE) -spec symbian-sbsv2 -o \"" << fileInfo(Option::output.fileName()).fileName()
+          << "\" \"" << project->projectFile() << "\"" << endl;
+        t << endl;
+        t << BLD_INF_FILENAME ":" << endl;
+        t << "\t$(QMAKE)" << endl;
+        t << endl;
+
+        t << "debug: " << BLD_INF_FILENAME << endl;
+        foreach(QString item, debugPlatforms) {
+            t << "\t$(SBS) -c " << item << "_udeb" << testClause << endl;
+        }
+        t << endl;
+        t << "release: " << BLD_INF_FILENAME << endl;
+        foreach(QString item, releasePlatforms) {
+            t << "\t$(SBS) -c " << item << "_urel" << testClause << endl;
+        }
+        t << endl;
+
+        // For more specific builds, targets are in this form: build-platform, e.g. release-armv5
+        foreach(QString item, debugPlatforms) {
+            t << "debug-" << item << ": " << BLD_INF_FILENAME << endl;
+            t << "\t$(SBS) -c " << item << "_udeb" << testClause << endl;
+        }
+
+        foreach(QString item, releasePlatforms) {
+            t << "release-" << item << ": " << BLD_INF_FILENAME << endl;
+            t << "\t$(SBS) -c " << item << "_urel" << testClause << endl;
+        }
+
+        t << endl;
+        t << "export: " << BLD_INF_FILENAME << endl;
+        t << "\t$(SBS) export" << endl;
+        t << endl;
+
+        t << "cleanexport: " << BLD_INF_FILENAME << endl;
+        t << "\t$(SBS) cleanexport" << endl;
+        t << endl;
+
+    }
+
+    // Add all extra targets including extra compiler targest also to wrapper makefile,
+    // even though many of them may have already been added to bld.inf as FLMs.
+    // This is to enable use of targets like 'mocables', which call targets generated by extra compilers.
+    if (!isSubdirs) {
+        t << extraTargetsCache;
+        t << extraCompilersCache;
+    }
+    else {
+        QList<MakefileGenerator::SubTarget*> subtargets = findSubDirsSubTargets();
+        writeSubTargets(t, subtargets, SubTargetSkipDefaultVariables|SubTargetSkipDefaultTargets);
+        qDeleteAll(subtargets);
+    }
+
+    generateDistcleanTargets(t);
+
+    t << "clean: " << BLD_INF_FILENAME << endl;
+    t << "\t-$(SBS) reallyclean" << endl;
+    t << endl;
+
+    // create execution target
+    if (debugPlatforms.contains("winscw") && getTargetExtension() == "exe") {
+        t << "run:" << endl;
+        t << "\t-call " << epocRoot() << "epoc32/release/winscw/udeb/" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".exe")) << endl << endl;
+    }
+}
+
+bool SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t)
+{
+    // Makes sure we have needed FLMs in place.
+    exportFlm();
+
+    // Parse extra compilers data
+    QStringList defines;
+    QStringList incPath;
+
+    defines << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
+            << varGlue("QMAKE_COMPILER_DEFINES", "-D", "-D", " ")
+            << varGlue("DEFINES","-D"," -D","");
+    for(QMap<QString, QStringList>::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) {
+        QStringList values = it.value();
+        for (int i = 0; i < values.size(); ++i) {
+            incPath << QLatin1String(" -I\"") + values.at(i) + "\"";
+        }
+    }
+
+    // Write extra compilers and targets to initialize QMAKE_ET_* variables
+    // Cache results to avoid duplicate calls when creating wrapper makefile
+    QTextStream extraCompilerStream(&extraCompilersCache);
+    QTextStream extraTargetStream(&extraTargetsCache);
+    writeExtraCompilerTargets(extraCompilerStream);
+    writeExtraTargets(extraTargetStream);
+
+    // Figure out everything the target depends on as we don't want to run extra targets that
+    // are not necessary.
+    QStringList allPreDeps;
+    foreach(QString item, project->values("PRE_TARGETDEPS")) {
+        // Predeps get mangled in windows, so fix them to more sbsv2 friendly format
+#if defined(Q_OS_WIN)
+        if (item.mid(1,1) == ":")
+            item = item.mid(0,1).toUpper().append(item.mid(1)); // Fix drive to uppercase
+#endif
+        item.replace("\\", "/");
+        allPreDeps << escapeDependencyPath(item);
+    }
+
+    foreach (QString item, project->values("GENERATED_SOURCES")) {
+        allPreDeps.append(fileInfo(item).absoluteFilePath());
+    }
+
+    for(QMap<QString, QStringList>::iterator it = sources.begin(); it != sources.end(); ++it) {
+        QString currentSourcePath = it.key();
+        QStringList values = it.value();
+        for (int i = 0; i < values.size(); ++i) {
+            QString sourceFile = currentSourcePath + "/" + values.at(i);
+            QStringList deps = findDependencies(QDir::toNativeSeparators(sourceFile));
+            foreach(QString depItem, deps) {
+                appendIfnotExist(allPreDeps, fileInfo(depItem).absoluteFilePath());
+            }
+        }
+    }
+
+    // Write FLM rules for all extra targets and compilers that we depend on to build the target.
+    QStringList extraTargets;
+    extraTargets << project->values("QMAKE_EXTRA_TARGETS") <<  project->values("QMAKE_EXTRA_COMPILERS");
+    foreach(QString item, extraTargets) {
+        foreach(QString targetItem, project->values(QLatin1String("QMAKE_ET_PARSED_TARGETS.") + item)) {
+            // Make sure targetpath is absolute
+            QString absoluteTarget = fileInfo(targetItem).absoluteFilePath();
+            if (allPreDeps.contains(absoluteTarget)) {
+                QStringList deps = project->values(QLatin1String("QMAKE_ET_PARSED_DEPS.") + item + targetItem);
+                //QString depsItem = project->values(QLatin1String("QMAKE_ET_PARSED_DEPS.") + item + targetItem).join(" ");
+                QString commandItem =  project->values(QLatin1String("QMAKE_ET_PARSED_CMD.") + item + targetItem).join(" ");
+
+
+                // Make sure all deps paths are absolute
+                QString absoluteDeps;
+                foreach (QString depItem, deps) {
+                    if (!depItem.isEmpty()) {
+                        absoluteDeps.append(fileInfo(depItem).absoluteFilePath());
+                        absoluteDeps.append(" ");
+                    }
+                }
+
+                t << "START EXTENSION qt/qmake_extra_pre_targetdep" << endl;
+                t << "OPTION PREDEP_TARGET " << absoluteTarget << endl;
+                t << "OPTION DEPS " << absoluteDeps << endl;
+                //t << "OPTION DEPS " << depsItem << endl;
+
+                if (commandItem.indexOf("$(INCPATH)") != -1)
+                    commandItem.replace("$(INCPATH)", incPath.join(" "));
+                if (commandItem.indexOf("$(DEFINES)") != -1)
+                    commandItem.replace("$(DEFINES)", defines.join(" "));
+
+                // Sbsv2 strips all backslashes (even doubles ones) from option parameters, so just replace them with slashes
+                // Problem: If some command actually needs backslashes for something else than dir separator, we are out of luck...
+                commandItem.replace("\\", "/");
+                t << "OPTION COMMAND " << commandItem << endl;
+                t << "END" << endl;
+            }
+        }
+    }
+
+    t << endl;
+
+    // Write winscw deployment rules
+    QString remoteTestPath = epocRoot() + QLatin1String("epoc32/winscw/c/private/") + privateDirUid;
+    DeploymentList depList;
+    initProjectDeploySymbian( project, depList, remoteTestPath, false, QLatin1String("winscw"), QLatin1String("udeb"), generatedDirs, generatedFiles );
+
+    t << "#if defined(WINSCW)" << endl;
+    for (int i=0; i<depList.size(); ++i) {
+        t << "START EXTENSION qt/qmake_emulator_deployment" << endl;
+        QString fromItem = depList.at(i).from;
+        QString toItem = depList.at(i).to;
+        fromItem.replace("\\", "/");
+        toItem.replace("\\", "/");
+#if defined(Q_OS_WIN)
+        toItem.prepend(QDir::current().absolutePath().left(2)); // add drive
+#endif
+        t << "OPTION DEPLOY_SOURCE " << fromItem << endl;
+        t << "OPTION DEPLOY_TARGET " << toItem << endl;
+        t << "END" << endl;
+    }
+    t << "#endif" << endl;
+
+    t << endl;
+
+    // ### TODO: Linux emulator (platsim?) deployment
+
+    // Write post link rules
+    if(!project->isEmpty("QMAKE_POST_LINK")) {
+        t << "START EXTENSION qt/qmake_post_link" << endl;
+        t << "OPTION POST_LINK_CMD " << var("QMAKE_POST_LINK") << endl;
+        t << "OPTION LINK_TARGET " << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".").append(getTargetExtension())) << endl;
+        t << "END" << endl;
+        t << endl;
+    }
+
+    // Application icon generation
+    QStringList icons = project->values("ICON");
+    if (icons.size()) {
+        QString icon = icons.first();
+        if (icons.size() > 1)
+            fprintf(stderr, "Warning: Only first icon specified in ICON variable is used: '%s'.", icon);
+
+        t << "START EXTENSION s60/mifconv" << endl;
+
+        QFileInfo iconInfo = fileInfo(icon);
+        QString iconPath = iconInfo.path();
+        QString iconFile = iconInfo.baseName();
+
+        t << "OPTION SOURCES -c32 " << iconFile << endl;
+        t << "OPTION SOURCEDIR " << iconPath << endl;
+        t << "OPTION TARGETFILE " << uid3 << ".mif" << endl;
+        t << "OPTION SVGENCODINGVERSION 3" << endl; // Compatibility with S60 3.1 devices and up
+        t << "END" << endl;
+    }
+
+    // Generate temp dirs
+    QString tempDirs;
+    for(QMap<QString, QStringList>::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) {
+        QStringList values = it.value();
+        for (int i = 0; i < values.size(); ++i) {
+            QString value = values.at(i);
+            if (value.endsWith("/" QT_EXTRA_INCLUDE_DIR)) {
+                value = fileInfo(value).absoluteFilePath();
+                tempDirs.append(value);
+                tempDirs.append(" ");
+            }
+        }
+    }
+
+    if (tempDirs.size())
+        tempDirs.chop(1); // Remove final space
+
+    t << "START EXTENSION qt/qmake_generate_temp_dirs" << endl;
+    t << "OPTION DIRS " << tempDirs << endl;
+    t << "END" << endl;
+    t << endl;
+
+    t << endl;
+
+    return true;
+}
+
+void SymbianSbsv2MakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension)
+{
+    // We don't generate extension makefile in sbsb2
+    Q_UNUSED(t);
+    Q_UNUSED(addDeploymentExtension);
+}
+
diff --git a/qmake/generators/symbian/symmake_sbsv2.h b/qmake/generators/symbian/symmake_sbsv2.h
new file mode 100644
index 0000000000..e55d177183
--- /dev/null
+++ b/qmake/generators/symbian/symmake_sbsv2.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SYMMAKE_SBSV2_H
+#define SYMMAKE_SBSV2_H
+
+#include <symmake.h>
+
+QT_BEGIN_NAMESPACE
+
+class SymbianSbsv2MakefileGenerator : public SymbianMakefileGenerator {
+
+protected:
+
+    // Inherited from parent
+    virtual bool writeBldInfExtensionRulesPart(QTextStream& t);
+    virtual void writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension);
+    virtual bool writeMkFile(const QString& wrapperFileName, bool deploymentOnly);
+    virtual void writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile);
+
+public:
+
+    SymbianSbsv2MakefileGenerator();
+    ~SymbianSbsv2MakefileGenerator();
+
+private:
+    void exportFlm();
+
+    QString extraTargetsCache;
+    QString extraCompilersCache;
+};
+
+#endif // SYMMAKE_SBSV2_H
+
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 44905edf50..44caa68fb8 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -1123,6 +1123,20 @@ QString DspMakefileGenerator::writeBuildstepForFileForConfig(const QString &file
                     fileOut);
                 dep_cmd = Option::fixPathToLocalOS(dep_cmd, true, false);
                 if(config->canExecute(dep_cmd)) {
+#if defined(Q_CC_MWERKS) && defined(Q_OS_WIN32)
+                    QPopen procPipe;
+                    if( procPipe.init(dep_cmd.toLatin1().constData(), "r") ) {
+                        QString indeps;
+                        while(true) {
+                            int read_in = procPipe.fread(buff, 255);
+                            if ( !read_in )
+                                break;
+                            indeps += QByteArray(buff, read_in);
+                        }
+                        if(!indeps.isEmpty())
+                            step.deps += config->fileFixify(indeps.replace('\n', ' ').simplified().split(' '));
+                    }
+#else
                     if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) {
                         QString indeps;
                         while(!feof(proc)) {
@@ -1135,6 +1149,7 @@ QString DspMakefileGenerator::writeBuildstepForFileForConfig(const QString &file
                         if(!indeps.isEmpty())
                             step.deps += config->fileFixify(indeps.replace('\n', ' ').simplified().split(' '));
                     }
+#endif
                 }
             }
 
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 68d9d8840c..372d902820 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -2215,6 +2215,26 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
 							             Option::fixPathToLocalOS(inFile, true, false),
                                                                      out);
             if(Project->canExecute(dep_cmd)) {
+#if defined(Q_CC_MWERKS) && defined(Q_OS_WIN32)
+                QPopen procPipe;
+                if( procPipe.init(dep_cmd.toLatin1().constData(), "r") ) {
+                    QString indeps;
+                    while(true) {
+                        int read_in = procPipe.fread(buff, 255);
+                        if ( !read_in )
+                            break;
+                        indeps += QByteArray(buff, read_in);
+                    }
+                    if(!indeps.isEmpty()) {
+                        QStringList extradeps = indeps.split(QLatin1Char('\n'));
+                        for (int i = 0; i < extradeps.count(); ++i) {
+                            QString dd = extradeps.at(i).simplified();
+                            if (!dd.isEmpty())
+                                deps += Project->fileFixify(dd);
+                        }
+                    }
+                }
+#else
                 if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) {
                     QString indeps;
                     while(!feof(proc)) {
@@ -2233,6 +2253,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
                         }
                     }
                 }
+#endif
             }
         }
         for (int i = 0; i < deps.count(); ++i)
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 5f250bf347..78a552bd24 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1418,6 +1418,20 @@ void VcprojGenerator::initResourceFiles()
 
                 dep_cmd = Option::fixPathToLocalOS(dep_cmd, true, false);
                 if(canExecute(dep_cmd)) {
+#if defined(Q_CC_MWERKS) && defined(Q_OS_WIN32)
+                    QPopen procPipe;
+                    if( procPipe.init(dep_cmd.toLatin1().constData(), "r") ) {
+                        QString indeps;
+                        while(true) {
+                            int read_in = procPipe.fread(buff, 255);
+                            if ( !read_in )
+                                break;
+                            indeps += QByteArray(buff, read_in);
+                        }
+                        if(!indeps.isEmpty())
+                            deps += fileFixify(indeps.replace('\n', ' ').simplified().split(' '));
+                    }
+#else
                     if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) {
                         QString indeps;
                         while(!feof(proc)) {
@@ -1430,6 +1444,7 @@ void VcprojGenerator::initResourceFiles()
                         if(!indeps.isEmpty())
                             deps += fileFixify(indeps.replace('\n', ' ').simplified().split(' '));
                     }
+#endif
                 }
             }
             vcProject.ResourceFiles.addFiles(deps);
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 4fefbabc71..2da2e3b97e 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -52,6 +52,8 @@
 #include <qtextstream.h>
 #include <qstack.h>
 #include <qhash.h>
+#include <qxmlstream.h>
+#include <qsettings.h>
 #include <qdebug.h>
 #ifdef Q_OS_UNIX
 #include <unistd.h>
@@ -63,8 +65,12 @@
 #include <stdlib.h>
 
 #ifdef Q_OS_WIN32
+#if defined(Q_CC_MWERKS)
+#include "qpopen.h"
+#else
 #define QT_POPEN _popen
 #define QT_PCLOSE _pclose
+#endif
 #else
 #define QT_POPEN popen
 #define QT_PCLOSE pclose
@@ -76,7 +82,8 @@ QT_BEGIN_NAMESPACE
 enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST,
                   E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION,
                   E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND,
-                  E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE };
+                  E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE,
+                  E_GENERATE_TEST_UID, E_SIZE };
 QMap<QString, ExpandFunc> qmake_expandFunctions()
 {
     static QMap<QString, ExpandFunc> *qmake_expand_functions = 0;
@@ -107,6 +114,8 @@ QMap<QString, ExpandFunc> qmake_expandFunctions()
         qmake_expand_functions->insert("files", E_FILES);
         qmake_expand_functions->insert("prompt", E_PROMPT);
         qmake_expand_functions->insert("replace", E_REPLACE);
+        qmake_expand_functions->insert("generate_test_uid", E_GENERATE_TEST_UID);
+        qmake_expand_functions->insert("size", E_SIZE);
     }
     return *qmake_expand_functions;
 }
@@ -588,6 +597,69 @@ static void qmake_error_msg(const QString &msg)
             msg.toLatin1().constData());
 }
 
+enum isForSymbian_enum
+{
+    isForSymbian_NOT_SET = -1,
+    isForSymbian_FALSE = 0,
+    isForSymbian_ABLD = 1,
+    isForSymbian_SBSV2 = 2,
+};
+
+static isForSymbian_enum isForSymbian_value = isForSymbian_NOT_SET;
+
+// Checking for symbian build is primarily determined from the qmake spec,
+// but if that is not specified, detect if symbian is the default spec
+// by checking the MAKEFILE_GENERATOR variable value.
+static void init_isForSymbian(const QMap<QString, QStringList>& vars)
+{
+    if (isForSymbian_value != isForSymbian_NOT_SET)
+        return;
+
+    QString spec = QFileInfo(Option::mkfile::qmakespec).fileName();
+    if (spec.startsWith("symbian-abld", Qt::CaseInsensitive)) {
+        isForSymbian_value = isForSymbian_ABLD;
+        return;
+    }
+    if (spec.startsWith("symbian-sbsv2", Qt::CaseInsensitive)) {
+        isForSymbian_value = isForSymbian_SBSV2;
+        return;
+    }
+
+    QStringList generatorList = vars["MAKEFILE_GENERATOR"];
+
+    if (!generatorList.isEmpty()) {
+        QString generator = generatorList.first();
+        if (generator.startsWith("SYMBIAN_ABLD"))
+            isForSymbian_value = isForSymbian_ABLD;
+        else if (generator.startsWith("SYMBIAN_SBSV2"))
+            isForSymbian_value = isForSymbian_SBSV2;
+        else
+            isForSymbian_value = isForSymbian_FALSE;
+    } else {
+        isForSymbian_value = isForSymbian_FALSE;
+    }
+}
+
+bool isForSymbian()
+{
+    // If isForSymbian_value has not been initialized explicitly yet,
+    // call initializer with dummy map to check qmake spec.
+    if (isForSymbian_value == isForSymbian_NOT_SET)
+        init_isForSymbian(QMap<QString, QStringList>());
+
+    return (isForSymbian_value == isForSymbian_ABLD || isForSymbian_value == isForSymbian_SBSV2);
+}
+
+bool isForSymbianSbsv2()
+{
+    // If isForSymbian_value has not been initialized explicitly yet,
+    // call initializer with dummy map to check qmake spec.
+    if (isForSymbian_value == isForSymbian_NOT_SET)
+        init_isForSymbian(QMap<QString, QStringList>());
+
+    return (isForSymbian_value == isForSymbian_SBSV2);
+}
+
 /*
    1) environment variable QMAKEFEATURES (as separated by colons)
    2) property variable QMAKEFEATURES (as separated by colons)
@@ -614,11 +686,21 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0)
             concat << base_concat + QDir::separator() + "unix";
             break;
         case Option::TARG_UNIX_MODE:
-            concat << base_concat + QDir::separator() + "unix";
-            break;
+            {
+                if (isForSymbian())
+                    concat << base_concat + QDir::separator() + "symbian";
+                else
+                    concat << base_concat + QDir::separator() + "unix";
+                break;
+            }
         case Option::TARG_WIN_MODE:
-            concat << base_concat + QDir::separator() + "win32";
-            break;
+            {
+                if (isForSymbian())
+                    concat << base_concat + QDir::separator() + "symbian";
+                else
+                    concat << base_concat + QDir::separator() + "win32";
+                break;
+            }
         case Option::TARG_MAC9_MODE:
             concat << base_concat + QDir::separator() + "mac";
             concat << base_concat + QDir::separator() + "mac9";
@@ -1471,6 +1553,9 @@ QMakeProject::read(uchar cmd)
                 fprintf(stderr, "Failure to read QMAKESPEC conf file %s.\n", spec.toLatin1().constData());
                 return false;
             }
+
+            init_isForSymbian(base_vars);
+
             if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty()) {
                 debug_msg(1, "QMAKECACHE file: reading %s", Option::mkfile::cachefile.toLatin1().constData());
                 read(Option::mkfile::cachefile, base_vars);
@@ -1605,23 +1690,32 @@ QMakeProject::isActiveConfig(const QString &x, bool regex, QMap<QString, QString
     else if(x == "false")
         return false;
 
+    static QString spec;
+    if(spec.isEmpty())
+        spec = QFileInfo(Option::mkfile::qmakespec).fileName();
+
+    // Symbian is an exception to how scopes are resolved. Since we do not
+    // have a separate target mode for Symbian, but we expect the scope to resolve
+    // on other platforms we base it entirely on the mkspec. This means that
+    // using a mkspec starting with 'symbian*' will resolve both the 'symbian'
+    // and the 'unix' (because of Open C) scopes to true.
+    if(isForSymbian() && (x == "symbian" || x == "unix"))
+        return true;
+
     //mkspecs
     if((Option::target_mode == Option::TARG_MACX_MODE ||
         Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")
-        return true;
+        return !isForSymbian();
     else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx")
-        return true;
+        return !isForSymbian();
     else if(Option::target_mode == Option::TARG_MAC9_MODE && x == "mac9")
-        return true;
+        return !isForSymbian();
     else if((Option::target_mode == Option::TARG_MAC9_MODE || Option::target_mode == Option::TARG_MACX_MODE) &&
             x == "mac")
-        return true;
+        return !isForSymbian();
     else if(Option::target_mode == Option::TARG_WIN_MODE && x == "win32")
-        return true;
+        return !isForSymbian();
     QRegExp re(x, Qt::CaseSensitive, QRegExp::Wildcard);
-    static QString spec;
-    if(spec.isEmpty())
-        spec = QFileInfo(Option::mkfile::qmakespec).fileName();
     if((regex && re.exactMatch(spec)) || (!regex && spec == x))
         return true;
 #ifdef Q_OS_UNIX
@@ -1712,6 +1806,7 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QMap<QString, QStringL
         if(file.indexOf(Option::dir_sep) == -1 || !QFile::exists(file)) {
             static QStringList *feature_roots = 0;
             if(!feature_roots) {
+                init_isForSymbian(base_vars);
                 feature_roots = new QStringList(qmake_feature_paths(prop));
                 qmakeAddCacheClear(qmakeDeleteCacheClear_QStringList, (void**)&feature_roots);
             }
@@ -2152,11 +2247,33 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
         } else {
             QMakeProjectEnv env(place);
             char buff[256];
-            FILE *proc = QT_POPEN(args[0].toLatin1(), "r");
             bool singleLine = true;
             if(args.count() > 1)
                 singleLine = (args[1].toLower() == "true");
             QString output;
+#if defined(Q_CC_MWERKS) && defined(Q_OS_WIN32)
+            QPopen procPipe;
+            if( !procPipe.init(args[0].toLatin1(), "r") ) {
+                fprintf(stderr, "%s:%d system(%s) failed.\n",
+                        parser.file.toLatin1().constData(),
+                        parser.line_no,
+                        qPrintable(args[0]));
+            }
+
+            while(true) {
+                int read_in = procPipe.fread(buff, 255);
+                if ( !read_in )
+                    break;
+                for(int i = 0; i < read_in; ++i) {
+                    if((singleLine && buff[i] == '\n') || buff[i] == '\t')
+                        buff[i] = ' ';
+                }
+                buff[read_in] = '\0';
+                output += buff;
+            }
+            ret += split_value_list(output);
+#else
+            FILE *proc = QT_POPEN(args[0].toLatin1(), "r");
             while(proc && !feof(proc)) {
                 int read_in = int(fread(buff, 1, 255, proc));
                 if(!read_in)
@@ -2171,6 +2288,7 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
             ret += split_value_list(output);
             if(proc)
                 QT_PCLOSE(proc);
+#endif
         }
         break; }
     case E_UNIQUE: {
@@ -2305,6 +2423,32 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
                 ret += it->replace(before, after);
         }
         break; }
+    case E_GENERATE_TEST_UID: {
+        if(args.count() != 1) {
+            fprintf(stderr, "%s:%d: generate_test_uid(targetname) requires one argument.\n",
+                    parser.file.toLatin1().constData(), parser.line_no);
+        } else {
+            QString target = args[0];
+
+            QString currPath = qmake_getpwd();
+            target.prepend("/").prepend(currPath);
+
+
+            QString tmp = generate_test_uid(target);
+
+            ret += tmp;
+        }
+        break; }
+    case E_SIZE: {
+        if(args.count() != 1) {
+            fprintf(stderr, "%s:%d: size(var) requires one argument.\n",
+                    parser.file.toLatin1().constData(), parser.line_no);
+        } else {
+            //QString target = args[0];
+            int size = values(args[0]).size();
+            ret += QString::number(size);
+        }
+        break; }
     default: {
 #ifdef QTSCRIPT_SUPPORT
         {
@@ -3179,9 +3323,161 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList
     } else if (var == QLatin1String("QMAKE_DIR_SEP")) {
         if (place[var].isEmpty())
             return values("DIR_SEPARATOR", place);
+    } else if (var == QLatin1String("EPOCROOT")) {
+        if (place[var].isEmpty())
+            place[var] = QStringList(epocRoot());
     }
     //qDebug("REPLACE [%s]->[%s]", qPrintable(var), qPrintable(place[var].join("::")));
     return place[var];
 }
 
+
+// UIDs starting with 0xE are test UIDs in symbian
+QString generate_test_uid(const QString& target) {
+    QString tmp = generate_uid(target);
+    tmp.replace(0,1,"E");
+    tmp.prepend("0x");
+
+    // printf("generate_test_uid for %s is %s \n", qPrintable(target), qPrintable(tmp));
+
+    return tmp;
+}
+
+
+// UIDs starting with 0xE are test UIDs in symbian
+QString generate_uid(const QString& target) {
+
+    static QMap<QString, QString> targetToUid;
+
+    QString tmp = targetToUid[target];
+
+    if(!tmp.isEmpty()) {
+        // printf("generate_uid for %s is %s \n", qPrintable(target), qPrintable(tmp));
+        return tmp;
+    }
+
+    unsigned long hash = 5381;
+    int c;
+
+    for(int i = 0; i < target.size(); ++i) {
+        c = target.at(i).toAscii();
+        hash ^= c + ((c-i) << i%20) + ((c+i) << (i+5)%20) + ((c-2*i) << (i+10)%20) + ((c+2*i) << (i+15)%20);
+    }
+
+    tmp.setNum(hash, 16);
+    for(int i = tmp.size(); i < 8; ++i)
+        tmp.prepend("0");
+
+#if 0
+    static QMap<QString, QString> uidConflictCheckList;
+    QString testStr = tmp;
+    testStr.replace(0,1,"E"); // Simulate actual UID generation
+    if (uidConflictCheckList.contains(testStr)) {
+        printf("\n\n!!!! generated duplicate uid for %s is %s <-> %s !!!!\n\n\n",
+            qPrintable(target),
+            qPrintable(testStr),
+            qPrintable(uidConflictCheckList.value(testStr)));
+        }
+    uidConflictCheckList.insert(testStr, target);
+    printf("generate_uid for %s is %s \n", qPrintable(target), qPrintable(tmp));
+#endif
+
+    targetToUid[target] = tmp;
+
+    return tmp;
+}
+
+static void fixEpocRootStr(QString& path)
+{
+    path.replace("\\","/");
+
+    if (path.size() > 1 && path[1] == QChar(':')) {
+        path = path.mid(2);
+    }
+
+    if (!path.size() || path[path.size()-1] != QChar('/')) {
+        path += QChar('/');
+    }
+}
+
+#define SYMBIAN_SDKS_KEY "HKEY_LOCAL_MACHINE\\Software\\Symbian\\EPOC SDKs"
+
+static QString epocRootStr;
+
+QString epocRoot()
+{
+    if (!epocRootStr.isEmpty())
+    {
+        return epocRootStr;
+    }
+
+    // First, check the env variable
+    epocRootStr = qgetenv("EPOCROOT");
+
+    if (epocRootStr.isEmpty()) {
+        // No EPOCROOT set, check the default device
+        // First check EPOCDEVICE env variable
+        QString defaultDevice = qgetenv("EPOCDEVICE");
+
+        // Check the windows registry via QSettings for devices.xml path
+        QSettings settings(SYMBIAN_SDKS_KEY, QSettings::NativeFormat);
+        QString devicesXmlPath = settings.value("CommonPath").toString();
+
+        if (!devicesXmlPath.isEmpty()) {
+            // Parse xml for correct device
+            devicesXmlPath += "/devices.xml";
+            QFile devicesFile(devicesXmlPath);
+            if (devicesFile.open(QIODevice::ReadOnly)) {
+                QXmlStreamReader xml(&devicesFile);
+                while (!xml.atEnd()) {
+                    xml.readNext();
+                    if (xml.isStartElement() && xml.name() == "devices") {
+                        if (xml.attributes().value("version") == "1.0") {
+                            // Look for correct device
+                            while (!(xml.isEndElement() && xml.name() == "devices") && !xml.atEnd()) {
+                                xml.readNext();
+                                if (xml.isStartElement() && xml.name() == "device") {
+                                    if ((defaultDevice.isEmpty() && xml.attributes().value("default") == "yes") ||
+                                        (!defaultDevice.isEmpty() && (xml.attributes().value("id").toString() + QString(":") + xml.attributes().value("name").toString()) == defaultDevice)) {
+                                        // Found the correct device
+                                        while (!(xml.isEndElement() && xml.name() == "device") && !xml.atEnd()) {
+                                            xml.readNext();
+                                            if (xml.isStartElement() && xml.name() == "epocroot") {
+                                                epocRootStr = xml.readElementText();
+                                                fixEpocRootStr(epocRootStr);
+                                                return epocRootStr;
+                                            }
+                                        }
+                                        xml.raiseError("No epocroot element found");
+                                    }
+                                }
+                            }
+                        } else {
+                            xml.raiseError("Invalid 'devices' element version");
+                        }
+                    }
+                }
+                if (xml.hasError()) {
+                    fprintf(stderr, "ERROR: \"%s\" when parsing devices.xml\n", qPrintable(xml.errorString()));
+                }
+            } else {
+                fprintf(stderr, "Could not open devices.xml (%s)\n", qPrintable(devicesXmlPath));
+            }
+        } else {
+            fprintf(stderr, "Could not retrieve " SYMBIAN_SDKS_KEY " setting\n");
+        }
+
+        fprintf(stderr, "Failed to determine epoc root.\n");
+        if (!defaultDevice.isEmpty())
+            fprintf(stderr, "The device indicated by EPOCDEVICE environment variable (%s) could not be found.\n", qPrintable(defaultDevice));
+        fprintf(stderr, "Either set EPOCROOT or EPOCDEVICE environment variable to a valid value, or provide a default Symbian device.\n");
+
+        // No valid device found; set epocroot to "/"
+        epocRootStr = QLatin1String("/");
+    }
+
+    fixEpocRootStr(epocRootStr);
+    return epocRootStr;
+}
+
 QT_END_NAMESPACE
diff --git a/qmake/project.h b/qmake/project.h
index edc9ecfa32..a079e42b54 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -203,6 +203,13 @@ inline QString QMakeProject::first(const QString &v)
 inline QMap<QString, QStringList> &QMakeProject::variables()
 { return vars; }
 
+// Helper functions needed for Symbian .mmp files and deployment
+QString generate_test_uid(const QString& target);
+QString generate_uid(const QString& target);
+QString epocRoot();
+bool isForSymbian();
+bool isForSymbianSbsv2();
+
 QT_END_NAMESPACE
 
 #endif // PROJECT_H
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 9ba8506db4..6808f68eba 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -13,14 +13,29 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
            generators/xmloutput.cpp generators/win32/borland_bmake.cpp \
            generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \
            generators/win32/msvc_dsp.cpp generators/win32/msvc_vcproj.cpp \
-           generators/win32/msvc_objectmodel.cpp
+           generators/win32/msvc_objectmodel.cpp \
+           generators/symbian/symmake.cpp \
+           generators/symbian/symmake_abld.cpp \
+           generators/symbian/symmake_sbsv2.cpp \
+           generators/symbian/initprojectdeploy_symbian.cpp 
+
+# MWC does not provide an implementation of popen() so fake it.
+win32-mwc {
+    SOURCES += qpopen.cpp \
+}
+
+           
 HEADERS += project.h property.h generators/makefile.h \
            generators/unix/unixmake.h meta.h option.h cachekeys.h \
            generators/win32/winmakefile.h generators/projectgenerator.h \
            generators/makefiledeps.h generators/metamakefile.h generators/mac/pbuilder_pbx.h \
            generators/xmloutput.h generators/win32/borland_bmake.h generators/win32/msvc_nmake.h \
            generators/win32/msvc_dsp.h generators/win32/msvc_vcproj.h \
-           generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h
+           generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \
+           generators/symbian/symmake.h \
+           generators/symbian/symmake_abld.h \
+           generators/symbian/symmake_sbsv2.h \
+           generators/symbian/initprojectdeploy_symbian.h
 
 contains(QT_EDITION, OpenSource) {
    DEFINES += QMAKE_OPENSOURCE_EDITION
@@ -65,7 +80,9 @@ bootstrap { #Qt code
         qlibraryinfo.cpp \
         qvariant.cpp \
         qvector.cpp \
-        qvsnprintf.cpp
+        qvsnprintf.cpp \
+        qxmlstream.cpp \
+        qxmlutils.cpp
 
    HEADERS+= \
         qbitarray.h \
@@ -101,7 +118,9 @@ bootstrap { #Qt code
         qtextstream.h \
         qurl.h \
         quuid.h \
-        qvector.h
+        qvector.h \
+        qxmlstream.h \
+        qxmlutils.h
 
     unix {
         SOURCES += qfsfileengine_unix.cpp qfsfileengine_iterator_unix.cpp
@@ -113,6 +132,7 @@ bootstrap { #Qt code
     } else:win32 {
 	SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp
         win32-msvc*:LIBS += ole32.lib advapi32.lib
+        win32-mwc:LIBS += -lole32.lib -ladvapi32.lib
     }
 
     qnx {
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index 5740061853..acf77181a5 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -18,8 +18,9 @@ VPATH += $$QT_SOURCE_TREE/src/corelib/global \
          $$QT_SOURCE_TREE/src/corelib/codecs \
          $$QT_SOURCE_TREE/src/corelib/plugin \
 	 $$QT_SOURCE_TREE/src/corelib/io \
+	 $$QT_SOURCE_TREE/src/corelib/xml \
 	 $$QT_SOURCE_TREE/src/script
-INCPATH += generators generators/unix generators/win32 generators/mac \
+INCPATH += generators generators/unix generators/win32 generators/mac generators/symbian \
            $$QT_SOURCE_TREE/include $$QT_SOURCE_TREE/include/QtCore \
            $$QT_SOURCE_TREE/qmake $$QT_SOURCE_TREE/include/QtScript
 include(qmake.pri)
diff --git a/qmake/qpopen.cpp b/qmake/qpopen.cpp
new file mode 100644
index 0000000000..ebde03517f
--- /dev/null
+++ b/qmake/qpopen.cpp
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qpopen.h"
+
+
+QPopen::QPopen()
+{
+}
+
+bool QPopen::init(const char *command, const char* /* mode */)
+{
+    SECURITY_ATTRIBUTES attributes;
+
+    attributes.nLength = sizeof(SECURITY_ATTRIBUTES);
+    attributes.bInheritHandle = TRUE;
+    attributes.lpSecurityDescriptor = NULL;
+
+    if (! CreatePipe(&childStdOutR, &childStdOutW, &attributes, 0)) {
+        return false;
+    }
+
+    // Ensure that the read handle to the child process's pipe for STDOUT is not inherited.
+    SetHandleInformation( childStdOutR, HANDLE_FLAG_INHERIT, 0);
+
+    // Create a pipe for the child process's STDIN.
+    if (! CreatePipe(&childStdInR, &childStdInW, &attributes, 0)) {
+        return false;
+    }
+
+    // Ensure that the write handle to the child process's pipe for STDIN is not inherited.
+    SetHandleInformation( childStdInW, HANDLE_FLAG_INHERIT, 0);
+
+    //TCHAR szCmdline[strlen(command)]=TEXT(command);
+    TCHAR *szCmdLine = new TCHAR[strlen(command)+1];
+    strcpy(szCmdLine, command);
+
+    // Set up members of the PROCESS_INFORMATION structure.
+
+    ZeroMemory( &processInfo, sizeof(PROCESS_INFORMATION) );
+
+    // Set up members of the STARTUPINFO structure.
+
+    ZeroMemory( &siStartInfo, sizeof(STARTUPINFO) );
+    siStartInfo.cb = sizeof(STARTUPINFO);
+    siStartInfo.hStdError = childStdOutW;
+    siStartInfo.hStdOutput = childStdOutW;
+    siStartInfo.hStdInput = childStdInR;
+    siStartInfo.dwFlags |= STARTF_USESTDHANDLES;
+
+    // Create the child process.
+
+    bool success = CreateProcess(NULL,
+            szCmdLine,     // command line
+            NULL,          // process security attributes
+            NULL,          // primary thread security attributes
+            TRUE,          // handles are inherited
+            0,             // creation flags
+            NULL,          // use parent's environment
+            NULL,          // use parent's current directory
+            &siStartInfo,  // STARTUPINFO pointer
+            &processInfo);  // receives PROCESS_INFORMATION
+
+    delete szCmdLine;
+
+    return success;
+}
+
+QPopen::~QPopen()
+{
+    CloseHandle(processInfo.hProcess);
+    CloseHandle(processInfo.hThread);
+    CloseHandle(childStdInR);
+    CloseHandle(childStdInW);
+    CloseHandle(childStdOutR);
+    CloseHandle(childStdOutW);
+}
+
+int QPopen::fwrite(char* buffer, int maxBytes)
+{
+    DWORD bytesWritten;
+
+    bool success = WriteFile(childStdInW, buffer, maxBytes, &bytesWritten, NULL);
+    if(success) {
+        return bytesWritten;
+    }
+
+    return 0;
+}
+
+
+int QPopen::fread(char* buffer, int maxBytes)
+{
+    DWORD bytesRead;
+
+    if( !CloseHandle(childStdOutW) )
+        return 0;
+
+    bool success = ReadFile(childStdOutR, buffer, maxBytes, &bytesRead, NULL);
+    if(success)
+        return bytesRead;
+
+    return 0;
+}
+
diff --git a/qmake/qpopen.h b/qmake/qpopen.h
new file mode 100644
index 0000000000..e15830d57b
--- /dev/null
+++ b/qmake/qpopen.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPOPEN_H
+#define QPOPEN_H
+
+#include <windows.h>
+#include <tchar.h>
+#include <stdio.h>
+#include <string.h>
+
+class QPopen
+{
+public:
+    QPopen();
+    ~QPopen();
+    int fread(char* buffer, int maxBytes);
+    int fwrite(char* buffer, int maxBytes);
+    bool init(const char* command, const char* mode);
+
+private:
+    // This pair of handles represent the "Write" pipe
+    // ie: Parent -> Child
+    HANDLE childStdInR;
+    HANDLE childStdInW;
+
+    // This pair of handles represent the "Read" pipe
+    // ie: Child -> Parent
+    HANDLE childStdOutR;
+    HANDLE childStdOutW;
+    PROCESS_INFORMATION processInfo;
+    STARTUPINFO siStartInfo;
+};
+
+#endif
diff --git a/selfsigned.cer b/selfsigned.cer
new file mode 100644
index 0000000000..af7244934d
--- /dev/null
+++ b/selfsigned.cer
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDFTCCAtOgAwIBAgIBADALBgcqhkjOOAQDBQAwcDELMAkGA1UEBhMCTk8xDjAM
+BgNVBAoTBU5va2lhMRQwEgYDVQQLEwtRdCBTb2Z0d2FyZTEOMAwGA1UEAxMFVHJv
+bGwxKzApBgkqhkiG9w0BCQEWHHF0czYwLWZlZWRiYWNrQHRyb2xsdGVjaC5jb20w
+HhcNMDgxMDAzMTMwNDM1WhcNMDkxMDAzMTMwNDM1WjBwMQswCQYDVQQGEwJOTzEO
+MAwGA1UEChMFTm9raWExFDASBgNVBAsTC1F0IFNvZnR3YXJlMQ4wDAYDVQQDEwVU
+cm9sbDErMCkGCSqGSIb3DQEJARYccXRzNjAtZmVlZGJhY2tAdHJvbGx0ZWNoLmNv
+bTCCAbYwggErBgcqhkjOOAQBMIIBHgKBgQC7OyI3lyV06OqahpbeEa5p9ucmoBxV
+n6YKvBjliPNMhQe7Di1Igv63rllQPqABv1Qu1YJc5CPiF4dSSQ/R7XjKEQqPZY4A
+PZooTKWVCs+e3Yo2HWaZYRks/euvcqvEOqmkZ2RUccaTb1T+b2et0vphFmlVYXPx
+BrIlbKtgJg+6QwIVAJnqTjBmWtEYQ6kFWfLE3yFIKx0BAoGAais4n6lD7yFJHB2F
+mb4W09EPx+LZTFSHgj9uzLiWWDEVl+j9jA4eYZBMb2yRBZ9zVXqjDSrFLWMuoNrV
+taqAVb9V2DrDHx3s0gSQmS5BNK2KThZCNOgj3YT4GRIZR4L6gqDBS5dkWLrwFUfC
+l6Hw9tizQR4EO4HgjEnMSxzXDzsDgYQAAoGAJH/tVAEb1boQKTt5eHRI/zCtw4ab
+Vtw7jHMzqQ+m921izJyzz5AJCVjtu6a1bLnW09i9oFIZ7bYs+Cd+qRgac2cVkX4x
+xmMXuAgw03VMf3vEbK2M2+BkjpUGrfoST5XG/eJbno6Tp1BGvYd88ZLt3gXBPnqi
+2QpMaOGqMED4mWkwCwYHKoZIzjgEAwUAAy8AMCwCFGCSlB1FYaBiIAuirrAACZzi
+p2jnAhQ/hlJjpxOgF7Z5RZCNAhz6HNhZ3g==
+-----END CERTIFICATE-----
diff --git a/selfsigned.key b/selfsigned.key
new file mode 100644
index 0000000000..47c51a0a56
--- /dev/null
+++ b/selfsigned.key
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBugIBAAKBgQC7OyI3lyV06OqahpbeEa5p9ucmoBxVn6YKvBjliPNMhQe7Di1I
+gv63rllQPqABv1Qu1YJc5CPiF4dSSQ/R7XjKEQqPZY4APZooTKWVCs+e3Yo2HWaZ
+YRks/euvcqvEOqmkZ2RUccaTb1T+b2et0vphFmlVYXPxBrIlbKtgJg+6QwIVAJnq
+TjBmWtEYQ6kFWfLE3yFIKx0BAoGAais4n6lD7yFJHB2Fmb4W09EPx+LZTFSHgj9u
+zLiWWDEVl+j9jA4eYZBMb2yRBZ9zVXqjDSrFLWMuoNrVtaqAVb9V2DrDHx3s0gSQ
+mS5BNK2KThZCNOgj3YT4GRIZR4L6gqDBS5dkWLrwFUfCl6Hw9tizQR4EO4HgjEnM
+SxzXDzsCgYAkf+1UARvVuhApO3l4dEj/MK3DhptW3DuMczOpD6b3bWLMnLPPkAkJ
+WO27prVsudbT2L2gUhnttiz4J36pGBpzZxWRfjHGYxe4CDDTdUx/e8RsrYzb4GSO
+lQat+hJPlcb94luejpOnUEa9h3zxku3eBcE+eqLZCkxo4aowQPiZaQIUV0KZx9KH
+Qp9/xwskqgJvmWgR8KQ=
+-----END DSA PRIVATE KEY-----
diff --git a/src/3rdparty/freetype/src/gzip/zconf.h b/src/3rdparty/freetype/src/gzip/zconf.h
index 3ccc3a66ab..2030a7e8d4 100644
--- a/src/3rdparty/freetype/src/gzip/zconf.h
+++ b/src/3rdparty/freetype/src/gzip/zconf.h
@@ -5,6 +5,11 @@
 
 /* @(#) $Id: zconf.h,v 1.4 2007/06/01 06:56:17 wl Exp $ */
 
+#if defined(__ARMCC__) || defined(__CC_ARM)
+/* Ultra ugly hack that convinces RVCT to use the systems zlib */
+#include <stdapis/zconf.h>
+#else /* defined(__ARMCC__) || defined(__CC_ARM) */
+
 #ifndef _ZCONF_H
 #define _ZCONF_H
 
@@ -276,3 +281,5 @@ typedef uLong FAR uLongf;
 #endif
 
 #endif /* _ZCONF_H */
+
+#endif /* defined(__ARMCC__) || defined(__CC_ARM) */
diff --git a/src/3rdparty/freetype/src/gzip/zlib.h b/src/3rdparty/freetype/src/gzip/zlib.h
index 50d0d3f146..0f98fdcbd3 100644
--- a/src/3rdparty/freetype/src/gzip/zlib.h
+++ b/src/3rdparty/freetype/src/gzip/zlib.h
@@ -28,6 +28,11 @@
   (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
 */
 
+#if defined(__ARMCC__) || defined(__CC_ARM)
+/* Ultra ugly hack that convinces RVCT to use the systems zlib */
+#include <stdapis/zlib.h>
+#else /* defined(__ARMCC__) || defined(__CC_ARM) */
+
 #ifndef _ZLIB_H
 #define _ZLIB_H
 
@@ -828,3 +833,5 @@ ZEXTERN(int)  inflateInit2_ OF((z_streamp strm, int  windowBits,
 #endif
 
 #endif /* _ZLIB_H */
+
+#endif /* defined(__ARMCC__) || defined(__CC_ARM) */
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-global.h b/src/3rdparty/harfbuzz/src/harfbuzz-global.h
index d4e6b466b6..393cc7bdb7 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-global.h
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-global.h
@@ -28,7 +28,13 @@
 #ifndef HARFBUZZ_GLOBAL_H
 #define HARFBUZZ_GLOBAL_H
 
+// Bug in stdlib.h, see more information from fixed_stdlib.h
+#if (defined __SYMBIAN32__ && !defined __cplusplus)
+#include <fixed_stdlib.h>
+#else
 #include <stdlib.h>
+#endif  // defined __SYMBIAN32__ && !defined __cplusplus
+
 #include <string.h>
 
 #ifdef __cplusplus
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-impl.c b/src/3rdparty/harfbuzz/src/harfbuzz-impl.c
index 9056a558bf..ddbf36be0e 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-impl.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-impl.c
@@ -33,7 +33,7 @@ HB_INTERNAL HB_Pointer
 _hb_alloc(size_t     size,
 	  HB_Error  *perror )
 {
-  HB_Error    error = 0;
+  HB_Error    error = (HB_Error)0;
   HB_Pointer  block = NULL;
 
   if ( size > 0 )
@@ -54,7 +54,7 @@ _hb_realloc(HB_Pointer  block,
 	    HB_Error   *perror )
 {
     HB_Pointer  block2 = NULL;
-    HB_Error    error  = 0;
+    HB_Error    error  = (HB_Error)0;
 
     block2 = realloc( block, new_size );
     if ( block2 == NULL && new_size != 0 )
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
index 36b92822e9..2e3ef3806f 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
@@ -935,7 +935,13 @@ static HB_Stream getTableStream(void *font, HB_GetFontTableFunc tableFunc, HB_Ta
     if (error)
         return 0;
     stream = (HB_Stream)malloc(sizeof(HB_StreamRec));
+    if (!stream)
+        return 0;
     stream->base = (HB_Byte*)malloc(length);
+    if (!stream->base) {
+        free(stream);
+        return 0;
+    }
     error = tableFunc(font, tag, stream->base, &length);
     if (error) {
         _hb_close_stream(stream);
@@ -950,6 +956,8 @@ static HB_Stream getTableStream(void *font, HB_GetFontTableFunc tableFunc, HB_Ta
 HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
 {
     HB_Face face = (HB_Face )malloc(sizeof(HB_FaceRec));
+    if (!face)
+        return 0;
 
     face->isSymbolFont = false;
     face->gdef = 0;
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-stream.c b/src/3rdparty/harfbuzz/src/harfbuzz-stream.c
index 3dcee8291b..2d9638f6b6 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-stream.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-stream.c
@@ -70,7 +70,7 @@ HB_INTERNAL HB_Error
 _hb_stream_seek( HB_Stream stream,
 		 HB_UInt pos )
 {
-  HB_Error  error = 0;
+  HB_Error  error = (HB_Error)0;
 
   stream->pos = pos;
   if (pos > stream->size)
diff --git a/src/3rdparty/libjpeg/jinclude.h b/src/3rdparty/libjpeg/jinclude.h
index 0a4f15146a..725bd518db 100644
--- a/src/3rdparty/libjpeg/jinclude.h
+++ b/src/3rdparty/libjpeg/jinclude.h
@@ -36,7 +36,12 @@
 #endif
 
 #ifdef HAVE_STDLIB_H
+// Bug in stdlib.h, see more information from fixed_stdlib.h
+#if (defined __SYMBIAN32__ && !defined __cplusplus)
+#include <fixed_stdlib.h>
+#else
 #include <stdlib.h>
+#endif  // defined __SYMBIAN32__ && !defined __cplusplus
 #endif
 
 #ifdef NEED_SYS_TYPES_H
diff --git a/src/3rdparty/libmng/libmng_types.h b/src/3rdparty/libmng/libmng_types.h
index 81fb29f528..45be543295 100644
--- a/src/3rdparty/libmng/libmng_types.h
+++ b/src/3rdparty/libmng/libmng_types.h
@@ -198,7 +198,12 @@
 #endif /* MNG_INCLUDE_IJG6B */
 
 #if defined(MNG_INTERNAL_MEMMNGMT) || defined(MNG_INCLUDE_FILTERS)
-#include <stdlib.h>                    /* "calloc" & "free" & "abs" */
+// Bug in stdlib.h, see more information from fixed_stdlib.h
+#if (defined __SYMBIAN32__ && !defined __cplusplus)
+#include <fixed_stdlib.h>
+#else
+#include <stdlib.h>
+#endif  // defined __SYMBIAN32__ && !defined __cplusplus
 #endif
 
 #include <limits.h>                    /* get proper integer widths */
diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h
index 8eb7d351b5..e680a05533 100644
--- a/src/3rdparty/libpng/pngconf.h
+++ b/src/3rdparty/libpng/pngconf.h
@@ -353,7 +353,12 @@
 /* Other defines for things like memory and the like can go here.  */
 #ifdef PNG_INTERNAL
 
+// Bug in stdlib.h, see more information from fixed_stdlib.h
+#if (defined __SYMBIAN32__ && !defined __cplusplus)
+#include <fixed_stdlib.h>
+#else
 #include <stdlib.h>
+#endif  // defined __SYMBIAN32__ && !defined __cplusplus
 
 /* The functions exported by PNG_EXTERN are PNG_INTERNAL functions, which
  * aren't usually used outside the library (as far as I know), so it is
@@ -1333,7 +1338,9 @@ typedef z_stream FAR *  png_zstreamp;
        defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ))
 
 #  ifndef PNGAPI
-#     if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
+#     if (defined(__GNUC__) && defined(__arm__)) || defined (__ARMCC__)
+#        define PNGAPI
+#     elif defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))  || defined(__WINSCW__)
 #        define PNGAPI __cdecl
 #     else
 #        define PNGAPI _cdecl
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h
index 689421c2b3..9dbc469811 100644
--- a/src/3rdparty/libtiff/libtiff/tif_config.h
+++ b/src/3rdparty/libtiff/libtiff/tif_config.h
@@ -104,7 +104,7 @@
 /* #undef HAVE_PTHREAD */
 
 /* Define to 1 if you have the <search.h> header file. */
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_VXWORKS)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS)
 #define HAVE_SEARCH_H 1
 #endif
 
diff --git a/src/3rdparty/libtiff/libtiff/tif_unix.c b/src/3rdparty/libtiff/libtiff/tif_unix.c
index 28de5c9fe5..b60a0e13f7 100644
--- a/src/3rdparty/libtiff/libtiff/tif_unix.c
+++ b/src/3rdparty/libtiff/libtiff/tif_unix.c
@@ -35,7 +35,12 @@
 #endif
 
 #include <stdarg.h>
+// Bug in stdlib.h, see more information from fixed_stdlib.h
+#if (defined __SYMBIAN32__ && !defined __cplusplus)
+#include <fixed_stdlib.h>
+#else
 #include <stdlib.h>
+#endif  // defined __SYMBIAN32__ && !defined __cplusplus
 #include <sys/stat.h>
 
 #ifdef HAVE_UNISTD_H
@@ -181,7 +186,7 @@ TIFFOpen(const char* name, const char* mode)
 	return tif;
 }
 
-#ifdef __WIN32__
+#if defined (__WIN32__) && !defined(__SYMBIAN32__)
 #include <windows.h>
 /*
  * Open a TIFF file with a Unicode filename, for read/writing.
diff --git a/src/3rdparty/libtiff/libtiff/tiffio.h b/src/3rdparty/libtiff/libtiff/tiffio.h
index 7aaf561386..96223d7ae5 100644
--- a/src/3rdparty/libtiff/libtiff/tiffio.h
+++ b/src/3rdparty/libtiff/libtiff/tiffio.h
@@ -71,6 +71,11 @@ typedef	uint32 toff_t;		/* file offset */
 #define __WIN32__
 #endif
 
+// Bug in stdlib.h, see more information from fixed_stdlib.h
+#if (defined __SYMBIAN32__ && !defined __cplusplus)
+#include <fixed_stdlib.h>
+#endif  // defined __SYMBIAN32__ && !defined __cplusplus
+
 /*
  * On windows you should define USE_WIN32_FILEIO if you are using tif_win32.c
  * or AVOID_WIN32_FILEIO if you are using something else (like tif_unix.c).
diff --git a/src/3rdparty/phonon/phonon/abstractmediastream.cpp b/src/3rdparty/phonon/phonon/abstractmediastream.cpp
index a661702186..5b860f3fed 100644
--- a/src/3rdparty/phonon/phonon/abstractmediastream.cpp
+++ b/src/3rdparty/phonon/phonon/abstractmediastream.cpp
@@ -49,7 +49,6 @@ AbstractMediaStream::AbstractMediaStream(AbstractMediaStreamPrivate &dd, QObject
 
 AbstractMediaStream::~AbstractMediaStream()
 {
-    delete d_ptr;
 }
 
 qint64 AbstractMediaStream::streamSize() const
diff --git a/src/3rdparty/phonon/phonon/abstractmediastream.h b/src/3rdparty/phonon/phonon/abstractmediastream.h
index 0daa92ab53..c4cde85fb9 100644
--- a/src/3rdparty/phonon/phonon/abstractmediastream.h
+++ b/src/3rdparty/phonon/phonon/abstractmediastream.h
@@ -214,7 +214,7 @@ class PHONON_EXPORT AbstractMediaStream : public QObject
         virtual void seekStream(qint64 offset);
 
         AbstractMediaStream(AbstractMediaStreamPrivate &dd, QObject *parent);
-        AbstractMediaStreamPrivate *d_ptr;
+        QScopedPointer<AbstractMediaStreamPrivate> d_ptr;
 };
 
 } // namespace Phonon
diff --git a/src/3rdparty/phonon/phonon/abstractmediastream_p.h b/src/3rdparty/phonon/phonon/abstractmediastream_p.h
index a9d64894fb..0e87c4d2c4 100644
--- a/src/3rdparty/phonon/phonon/abstractmediastream_p.h
+++ b/src/3rdparty/phonon/phonon/abstractmediastream_p.h
@@ -45,6 +45,7 @@ class PHONON_EXPORT AbstractMediaStreamPrivate : private MediaNodeDestructionHan
     public:
         void setStreamInterface(StreamInterface *);
         void setMediaObjectPrivate(MediaObjectPrivate *);
+        ~AbstractMediaStreamPrivate();
 
     protected:
         AbstractMediaStreamPrivate()
@@ -56,7 +57,6 @@ class PHONON_EXPORT AbstractMediaStreamPrivate : private MediaNodeDestructionHan
             errorType(NoError)
         {
         }
-        ~AbstractMediaStreamPrivate();
 
         virtual void setStreamSize(qint64 newSize);
         virtual void setStreamSeekable(bool s);
diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h
index b7d5eff81b..3ecb1bbb1d 100644
--- a/src/3rdparty/zlib/zutil.h
+++ b/src/3rdparty/zlib/zutil.h
@@ -21,7 +21,12 @@
 #    include <stddef.h>
 #  endif
 #  include <string.h>
-#  include <stdlib.h>
+// Bug in stdlib.h, see more information from fixed_stdlib.h
+#if (defined __SYMBIAN32__ && !defined __cplusplus)
+#include <fixed_stdlib.h>
+#else
+#include <stdlib.h>
+#endif // defined __SYMBIAN32__ && !defined __cplusplus
 #endif
 #ifdef NO_ERRNO_H
 #   ifdef _WIN32_WCE
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri
index dd3141a3cc..9f0e28937c 100644
--- a/src/corelib/arch/arch.pri
+++ b/src/corelib/arch/arch.pri
@@ -4,9 +4,12 @@ win32:HEADERS += arch/qatomic_windows.h \
 mac:HEADERS += arch/qatomic_macosx.h \
                arch/qatomic_generic.h
 
+symbian:HEADERS +=  arch/qatomic_symbian.h \
+                    arch/qatomic_generic.h
+
 vxworks:HEADERS += arch/qatomic_vxworks.h
 
-!wince*:!win32:!mac:HEADERS += arch/qatomic_alpha.h \
+!wince*:!win32:!mac:!symbian:HEADERS += arch/qatomic_alpha.h \
                        arch/qatomic_avr32.h \
                        arch/qatomic_ia64.h \
                        arch/qatomic_parisc.h \
diff --git a/src/corelib/arch/generic/qatomic_generic_unix.cpp b/src/corelib/arch/generic/qatomic_generic_unix.cpp
index ffb82c5f74..1c00d4bbb6 100644
--- a/src/corelib/arch/generic/qatomic_generic_unix.cpp
+++ b/src/corelib/arch/generic/qatomic_generic_unix.cpp
@@ -39,10 +39,13 @@
 **
 ****************************************************************************/
 
+#if !defined(Q_OS_SYMBIAN) || (defined(Q_OS_SYMBIAN) && !defined(Q_CC_RVCT))
+
 #include "qplatformdefs.h"
 
 #include <QtCore/qatomic.h>
 
+QT_BEGIN_NAMESPACE
 static pthread_mutex_t qAtomicMutex = PTHREAD_MUTEX_INITIALIZER;
 
 Q_CORE_EXPORT
@@ -116,3 +119,5 @@ void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *_q_value, qptrdiff
     pthread_mutex_unlock(&qAtomicMutex);
     return returnValue;
 }
+QT_END_NAMESPACE
+#endif //!defined(Q_OS_SYMBIAN) && !defined(Q_CC_RVCT)
diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h
index 17e4630aea..17bced684f 100644
--- a/src/corelib/arch/qatomic_arch.h
+++ b/src/corelib/arch/qatomic_arch.h
@@ -82,6 +82,8 @@ QT_BEGIN_HEADER
 #  include "QtCore/qatomic_windowsce.h"
 #elif defined(QT_ARCH_X86_64)
 #  include "QtCore/qatomic_x86_64.h"
+#elif defined(QT_ARCH_SYMBIAN)
+#  include "QtCore/qatomic_symbian.h"
 #elif defined(QT_ARCH_SH)
 #  include "QtCore/qatomic_sh.h"
 #elif defined(QT_ARCH_SH4A)
diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h
index 56f0025ed8..66c3a3a239 100644
--- a/src/corelib/arch/qatomic_arm.h
+++ b/src/corelib/arch/qatomic_arm.h
@@ -116,6 +116,12 @@ extern "C" typedef int (qt_atomic_eabi_cmpxchg_ptr_t)(void *oldval, void *newval
 extern Q_CORE_EXPORT char q_atomic_lock;
 Q_CORE_EXPORT void qt_atomic_yield(int *);
 
+#ifdef Q_CC_RVCT
+
+Q_CORE_EXPORT __asm char q_atomic_swp(volatile char *ptr, char newval);
+
+#else
+
 inline char q_atomic_swp(volatile char *ptr, char newval)
 {
     register char ret;
@@ -126,7 +132,9 @@ inline char q_atomic_swp(volatile char *ptr, char newval)
     return ret;
 }
 
-#endif
+#endif // Q_CC_RVCT
+
+#endif // QT_NO_ARM_EABI
 
 // Reference counting
 
@@ -213,6 +221,8 @@ inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
 
 // Fetch and store for integers
 
+#ifndef Q_CC_RVCT
+
 inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
 {
     int originalValue;
@@ -223,6 +233,8 @@ inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
     return originalValue;
 }
 
+#endif
+
 inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
 {
     return fetchAndStoreOrdered(newValue);
@@ -323,6 +335,22 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValu
 
 // Fetch and store for pointers
 
+#ifdef Q_CC_RVCT
+
+template <typename T>
+__asm T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
+{
+    add r2, pc, #0
+    bx r2
+    arm
+    swp r2,r1,[r0]
+    mov r0, r2
+    bx lr
+    thumb
+}
+
+#else
+
 template <typename T>
 Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
 {
@@ -334,6 +362,8 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
     return originalValue;
 }
 
+#endif // Q_CC_RVCT
+
 template <typename T>
 Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
 {
diff --git a/src/corelib/arch/qatomic_symbian.h b/src/corelib/arch/qatomic_symbian.h
new file mode 100644
index 0000000000..9b8b341b56
--- /dev/null
+++ b/src/corelib/arch/qatomic_symbian.h
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QATOMIC_SYMBIAN_H
+#define QATOMIC_SYMBIAN_H
+
+QT_BEGIN_HEADER
+
+#if defined(Q_CC_RVCT)
+#  define QT_NO_ARM_EABI
+#  include <QtCore/qatomic_arm.h>
+#elif defined(Q_CC_NOKIAX86) || defined(Q_CC_GCCE)
+#  include <QtCore/qatomic_generic.h>
+#endif
+
+QT_END_HEADER
+
+#endif // QATOMIC_SYMBIAN_H
diff --git a/src/corelib/arch/qatomic_windows.h b/src/corelib/arch/qatomic_windows.h
index 8f127ec7b1..14c927d0e9 100644
--- a/src/corelib/arch/qatomic_windows.h
+++ b/src/corelib/arch/qatomic_windows.h
@@ -107,7 +107,7 @@ template <typename T>
 Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
 { return true; }
 
-#if defined(Q_CC_MSVC)
+#if defined(Q_CC_MSVC) || defined(Q_CC_MWERKS)
 
 // MSVC++ 6.0 doesn't generate correct code when optimizations are turned on!
 #if _MSC_VER < 1300 && defined (_M_IX86)
@@ -218,7 +218,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo
 
 #else
 
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_CC_MWERKS)
 // use compiler intrinsics for all atomic functions
 //those functions need to be define in the global namespace
 QT_END_NAMESPACE
@@ -319,7 +319,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo
 
 #else // Q_OS_WINCE
 
-#if _WIN32_WCE < 0x600 && defined(_X86_)
+#if (_WIN32_WCE < 0x600 && defined(_X86_)) || defined(Q_CC_MWERKS)
 // For X86 Windows CE build we need to include winbase.h to be able
 // to catch the inline functions which overwrite the regular 
 // definitions inside of coredll.dll. Though one could use the 
@@ -327,8 +327,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo
 // exported at all.
 #include <winbase.h>
 #else
-
-#if _WIN32_WCE >= 0x600
+#if _WIN32_WCE >= 0x600 || defined(Q_CC_MWERKS)
 #define Q_ARGUMENT_TYPE volatile
 #  if defined(_X86_)
 #    define InterlockedIncrement _InterlockedIncrement
diff --git a/src/corelib/arch/symbian/arch.pri b/src/corelib/arch/symbian/arch.pri
new file mode 100644
index 0000000000..deb94b15e7
--- /dev/null
+++ b/src/corelib/arch/symbian/arch.pri
@@ -0,0 +1,5 @@
+#
+# Symbian architecture
+#
+SOURCES +=  $$QT_ARCH_CPP/qatomic_symbian.cpp \
+            $$QT_ARCH_CPP/../generic/qatomic_generic_unix.cpp
diff --git a/src/corelib/arch/symbian/qatomic_symbian.cpp b/src/corelib/arch/symbian/qatomic_symbian.cpp
new file mode 100644
index 0000000000..170b737dd2
--- /dev/null
+++ b/src/corelib/arch/symbian/qatomic_symbian.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qatomic.h>
+
+#if defined(Q_CC_RVCT)
+
+#include "../arm/qatomic_arm.cpp"
+
+QT_BEGIN_NAMESPACE
+
+// This declspec needs to be explicit. RVCT has a bug which prevents embedded
+// assembler functions from being exported (normally all functions are
+// exported, and Q_CORE_EXPORT resolves to nothing).
+__declspec(dllexport) __asm char q_atomic_swp(volatile char *ptr, char newval)
+{
+    add r2, pc, #0
+    bx r2
+    arm
+    swpb r2,r1,[r0]
+    mov r0, r2
+    bx lr
+    thumb
+}
+
+__declspec(dllexport) __asm int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
+{
+    add r2, pc, #0
+    bx r2
+    arm
+    swp r2,r1,[r0]
+    mov r0, r2
+    bx lr
+    thumb
+}
+
+QT_END_NAMESPACE
+
+#endif // Q_CC_RVCT
+
diff --git a/src/corelib/codecs/qisciicodec.cpp b/src/corelib/codecs/qisciicodec.cpp
index c05431318e..ad40aff06e 100644
--- a/src/corelib/codecs/qisciicodec.cpp
+++ b/src/corelib/codecs/qisciicodec.cpp
@@ -38,7 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #include "qisciicodec_p.h"
 #include "qlist.h"
 
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 4b774d7474..9e3fdf2408 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -92,6 +92,11 @@
 #  define QT_NO_SETLOCALE
 #endif
 
+#if 0 // ### TODO - remove me!
+// enabling this is not exception safe!
+#define Q_DEBUG_TEXTCODEC
+#endif
+
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_TEXTCODECPLUGIN
@@ -169,7 +174,9 @@ static QTextCodec *createForMib(int mib)
 }
 
 static QList<QTextCodec*> *all = 0;
+#ifdef Q_DEBUG_TEXTCODEC
 static bool destroying_is_ok = false;
+#endif
 
 static QTextCodec *localeMapper = 0;
 QTextCodec *QTextCodec::cftr = 0;
@@ -191,15 +198,21 @@ QTextCodecCleanup::~QTextCodecCleanup()
     if (!all)
         return;
 
+#ifdef Q_DEBUG_TEXTCODEC
     destroying_is_ok = true;
+#endif
 
-    while (all->size())
-        delete all->takeFirst();
+    for (QList<QTextCodec *>::const_iterator it = all->constBegin()
+            ; it != all->constEnd(); ++it) {
+        delete *it;
+    }
     delete all;
     all = 0;
     localeMapper = 0;
 
+#ifdef Q_DEBUG_TEXTCODEC
     destroying_is_ok = false;
+#endif
 }
 
 Q_GLOBAL_STATIC(QTextCodecCleanup, createQTextCodecCleanup)
@@ -658,8 +671,10 @@ static void setup()
     if (all)
         return;
 
+#ifdef Q_DEBUG_TEXTCODEC
     if (destroying_is_ok)
         qWarning("QTextCodec: Creating new codec during codec cleanup");
+#endif
     all = new QList<QTextCodec*>;
     // create the cleanup object to cleanup all codecs on exit
     (void) createQTextCodecCleanup();
@@ -914,8 +929,10 @@ QTextCodec::QTextCodec()
 */
 QTextCodec::~QTextCodec()
 {
+#ifdef Q_DEBUG_TEXTCODEC
     if (!destroying_is_ok)
         qWarning("QTextCodec::~QTextCodec: Called by application");
+#endif
     if (all)
         all->removeAll(this);
 }
diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
index d0a37de967..8b042d96e5 100644
--- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
+++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
@@ -104,11 +104,17 @@ static qint64 getticks()
         return 0;
     return (ts.tv_sec * 1000000000) + ts.tv_nsec;
 #else
+
+#ifdef Q_OS_SYMBIAN
+    return clock();
+#else
     // no clock_gettime(), fall back to wall time
     struct timeval tv;
     gettimeofday(&tv, 0);
     return (tv.tv_sec * 1000000) + tv.tv_usec;
 #endif
+
+#endif
 }
 
 #elif defined(Q_OS_WIN)
diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.h b/src/corelib/concurrent/qtconcurrentiteratekernel.h
index 1629e8fcb9..b62b7cf771 100644
--- a/src/corelib/concurrent/qtconcurrentiteratekernel.h
+++ b/src/corelib/concurrent/qtconcurrentiteratekernel.h
@@ -49,8 +49,10 @@
 #include <QtCore/qatomic.h>
 #include <QtCore/qtconcurrentmedian.h>
 #include <QtCore/qtconcurrentthreadengine.h>
-#include <iterator>
 
+#ifndef QT_NO_STL
+#  include <iterator>
+#endif
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
@@ -148,6 +150,7 @@ public:
     inline void * getPointer() { return 0; }
 };
 
+#ifndef QT_NO_STL
 inline bool selectIteration(std::bidirectional_iterator_tag)
 {
     return false; // while
@@ -162,6 +165,14 @@ inline bool selectIteration(std::random_access_iterator_tag)
 {
     return true; // for
 }
+#else
+// no stl support, always use while iteration
+template <typename T>
+inline bool selectIteration(T)
+{
+    return false; // while
+}
+#endif
 
 template <typename Iterator, typename T>
 class IterateKernel : public ThreadEngine<T>
@@ -170,7 +181,10 @@ public:
     typedef T ResultType;
 
     IterateKernel(Iterator _begin, Iterator _end)
-#ifndef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION
+#if defined (QT_NO_STL)
+        : begin(_begin), end(_end), current(_begin), currentIndex(0),
+           forIteration(false), progressReportingEnabled(true)
+#elif !defined(QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION)
         : begin(_begin), end(_end), current(_begin), currentIndex(0),
            forIteration(selectIteration(typename std::iterator_traits<Iterator>::iterator_category())), progressReportingEnabled(true)
 #else
@@ -178,7 +192,12 @@ public:
           forIteration(selectIteration(std::iterator_category(_begin))), progressReportingEnabled(true)
 #endif
     {
+#if defined (QT_NO_STL)
+       iterationCount = 0;
+#else
         iterationCount =  forIteration ? std::distance(_begin, _end) : 0;
+
+#endif
     }
 
     virtual ~IterateKernel() { }
diff --git a/src/corelib/concurrent/qthreadpool.cpp b/src/corelib/concurrent/qthreadpool.cpp
index 9c53b7ea40..eea6331017 100644
--- a/src/corelib/concurrent/qthreadpool.cpp
+++ b/src/corelib/concurrent/qthreadpool.cpp
@@ -248,14 +248,14 @@ bool QThreadPoolPrivate::tooManyThreadsActive() const
 */
 void QThreadPoolPrivate::startThread(QRunnable *runnable)
 {
-    QThreadPoolThread *thread = new QThreadPoolThread(this);
-    allThreads.insert(thread);
+    QScopedPointer <QThreadPoolThread> thread(new QThreadPoolThread(this));
+    allThreads.insert(thread.data());
     ++activeThreads;
 
     if (runnable->autoDelete())
         ++runnable->ref;
     thread->runnable = runnable;
-    thread->start();
+    thread.take()->start();
 }
 
 /*! \internal
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index db51d438eb..96e2b5cf3c 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -28,3 +28,11 @@ QMAKE_LIBS += $$QMAKE_LIBS_CORE
 QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtCore.dynlist
 
 contains(DEFINES,QT_EVAL):include(eval.pri)
+
+symbian: {
+    TARGET.UID3=0x2001B2DC
+
+    # Workaroud for problems with paging this dll
+    MMP_RULES -= PAGED
+    MMP_RULES *= UNPAGED
+}
\ No newline at end of file
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 63941ef9b3..375f4aa826 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -44,6 +44,8 @@
 #include "qvector.h"
 #include "qlist.h"
 #include "qthreadstorage.h"
+#include "qdir.h"
+#include "qstringlist.h"
 
 #ifndef QT_NO_QOBJECT
 #include <private/qthread_p.h>
@@ -66,10 +68,15 @@
 #  include <envLib.h>
 #endif
 
-#ifdef Q_CC_MWERKS
+#if defined(Q_CC_MWERKS) && defined(Q_OS_MACX)
 #include <CoreServices/CoreServices.h>
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+#include <e32def.h>
+#include <e32debug.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 
@@ -1053,6 +1060,20 @@ bool qSharedBuild()
 */
 
 /*!
+    \fn QSysInfo::SymVersion QSysInfo::symbianVersion()
+
+    Returns the version of the Symbian operating system on which the
+    application is run (Symbian only).
+*/
+
+/*!
+    \fn QSysInfo::S60Version QSysInfo::s60Version()
+
+    Returns the version of the S60 SDK system on which the
+    application is run (S60 only).
+*/
+
+/*!
     \enum QSysInfo::Endian
 
     \value BigEndian  Big-endian byte order (also called Network byte order)
@@ -1108,7 +1129,7 @@ bool qSharedBuild()
     \value WV_NT_based  NT-based version of Windows
     \value WV_CE_based  CE-based version of Windows
 
-    \sa MacVersion
+    \sa MacVersion, SymVersion
 */
 
 /*!
@@ -1137,7 +1158,39 @@ bool qSharedBuild()
     \value MV_LEOPARD  Apple codename for MV_10_5
     \value MV_SNOWLEOPARD  Apple codename for MV_10_6
 
-    \sa WinVersion
+    \sa WinVersion, SymVersion
+*/
+
+/*!
+    \enum QSysInfo::SymVersion
+
+    This enum provides symbolic names for the various versions of the
+    Symbian operating system. On Symbian, the
+    QSysInfo::symbianVersion() function gives the version of the
+    system on which the application is run.
+
+    \value SV_9_2 Symbian OS 9.2
+    \value SV_9_3 Symbian OS 9.3
+    \value SV_9_4 Symbian OS 9.4
+    \value SV_Unknown An unknown and currently unsupported platform
+
+    \sa S60Version, WinVersion, MacVersion
+*/
+
+/*!
+    \enum QSysInfo::S60Version
+
+    This enum provides symbolic names for the various versions of the
+    S60 SDK. On S60, the
+    QSysInfo::s60Version() function gives the version of the
+    SDK on which the application is run.
+
+    \value SV_S60_3_1 S60 3rd Edition Feature Pack 1
+    \value SV_S60_3_2 S60 3rd Edition Feature Pack 2
+    \value SV_S60_5_0 S60 5th Edition
+    \value SV_S60_Unknown An unknown and currently unsupported platform
+
+    \sa SymVersion, WinVersion, MacVersion
 */
 
 /*!
@@ -1704,6 +1757,87 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion()
 
 #endif
 
+#ifdef Q_OS_SYMBIAN
+# ifdef Q_WS_S60
+static QSysInfo::S60Version cachedS60Version = QSysInfo::S60Version(-1);
+
+QSysInfo::S60Version QSysInfo::s60Version()
+{
+#  ifdef Q_CC_NOKIAX86
+    // For emulator builds. Emulators don't support the trick we use to figure
+    // out which SDK we are running under, so simply hardcode it there.
+#   if defined(__SERIES60_31__)
+    return SV_S60_3_1;
+
+#   elif defined(__S60_32__)
+    return SV_S60_3_2;
+
+#   elif defined(__S60_50__)
+    return SV_S60_5_0;
+
+#   else
+    return SV_S60_Unknown;
+
+#   endif
+
+#  else
+    // For hardware builds.
+    if (cachedS60Version != -1)
+        return cachedS60Version;
+
+    QDir dir(QLatin1String("z:\\system\\install"));
+    QStringList filters;
+    filters << QLatin1String("Series60v?.*.sis");
+    dir.setNameFilters(filters);
+
+    QStringList names = dir.entryList(QDir::NoFilter, QDir::Name | QDir::Reversed | QDir::IgnoreCase);
+    if (names.size() == 0)
+        return cachedS60Version = SV_S60_Unknown;
+
+    int major, minor;
+    major = names[0][9].toAscii() - '0';
+    minor = names[0][11].toAscii() - '0';
+    if (major == 3) {
+        if (minor == 1) {
+            return cachedS60Version = SV_S60_3_1;
+        } else if (minor == 2) {
+            return cachedS60Version = SV_S60_3_2;
+        }
+    } else if (major == 5) {
+        if (minor == 0) {
+            return cachedS60Version = SV_S60_5_0;
+        }
+    }
+
+    return cachedS60Version = SV_S60_Unknown;
+#  endif
+}
+QSysInfo::SymVersion QSysInfo::symbianVersion()
+{
+    switch (s60Version()) {
+    case SV_S60_3_1:
+        return SV_9_2;
+    case SV_S60_3_2:
+        return SV_9_3;
+    case SV_S60_5_0:
+        return SV_9_4;
+    default:
+        return SV_Unknown;
+    }
+}
+#else
+QSysInfo::S60Version QSysInfo::s60Version()
+{
+    return SV_S60_None;
+}
+
+QSysInfo::SymVersion QSysInfo::symbianVersion()
+{
+    return SV_Unknown;
+}
+# endif // ifdef Q_WS_S60
+#endif // ifdef Q_OS_SYMBIAN
+
 /*!
     \macro void Q_ASSERT(bool test)
     \relates <QtGlobal>
@@ -1796,6 +1930,17 @@ void qt_check_pointer(const char *n, int l)
     qWarning("In file %s, line %d: Out of memory", n, l);
 }
 
+#ifndef QT_NO_EXCEPTIONS
+/* \internal
+   Allows you to throw an exception without including <new>
+   Called internally from Q_CHECK_PTR on certain OS combinations
+*/
+void qBadAlloc()
+{
+    QT_THROW(std::bad_alloc());
+}
+#endif
+
 /*
   The Q_ASSERT macro calls this function when the test fails.
 */
@@ -1853,7 +1998,7 @@ void *qMemSet(void *dest, int c, size_t n) { return memset(dest, c, n); }
 
 static QtMsgHandler handler = 0;                // pointer to debug handler
 
-#ifdef Q_CC_MWERKS
+#if defined(Q_CC_MWERKS) && defined(Q_OS_MACX)
 extern bool qt_is_gui_used;
 static void mac_default_handler(const char *msg)
 {
@@ -1865,7 +2010,7 @@ static void mac_default_handler(const char *msg)
         fprintf(stderr, msg);
     }
 }
-#endif // Q_CC_MWERKS
+#endif // Q_CC_MWERKS && Q_OS_MACX
 
 
 
@@ -1986,12 +2131,23 @@ void qt_message_output(QtMsgType msgType, const char *buf)
     if (handler) {
         (*handler)(msgType, buf);
     } else {
-#if defined(Q_CC_MWERKS)
+#if defined(Q_CC_MWERKS) && defined(Q_OS_MACX)
         mac_default_handler(buf);
 #elif defined(Q_OS_WINCE)
         QString fstr = QString::fromLatin1(buf);
         fstr += QLatin1Char('\n');
         OutputDebugString(reinterpret_cast<const wchar_t *> (fstr.utf16()));
+#elif defined(Q_OS_SYMBIAN)
+        // RDebug::Print has a cap of 256 characters so break it up
+        _LIT(format, "[Qt Message] %S");
+        const int maxBlockSize = 256 - ((const TDesC &)format).Length();
+        const TPtrC8 ptr(reinterpret_cast<const TUint8*>(buf));
+        HBufC* hbuffer = HBufC::NewL(qMin(maxBlockSize, ptr.Length()));
+        for (int i = 0; i < ptr.Length(); i += hbuffer->Length()) {
+            hbuffer->Des().Copy(ptr.Mid(i, qMin(maxBlockSize, ptr.Length()-i)));
+            RDebug::Print(format, hbuffer);
+        }
+        delete hbuffer;
 #else
         fprintf(stderr, "%s\n", buf);
         fflush(stderr);
@@ -2018,7 +2174,14 @@ void qt_message_output(QtMsgType msgType, const char *buf)
             _CrtDbgBreak();
 #endif
 
-#if (defined(Q_OS_UNIX) || defined(Q_CC_MINGW))
+#if defined(Q_OS_SYMBIAN)
+        __DEBUGGER(); // on the emulator, get the debugger to kick in if there's one around
+        TBuf<256> tmp;
+        TPtrC8 ptr(reinterpret_cast<const TUint8*>(buf));
+        TInt len = Min(tmp.MaxLength(), ptr.Length());
+        tmp.Copy(ptr.Left(len));
+        User::Panic(tmp, 0); // Panic the current thread
+#elif (defined(Q_OS_UNIX) || defined(Q_CC_MINGW))
         abort(); // trap; generates core dump
 #else
         exit(1); // goodbye cruel world
@@ -2026,6 +2189,48 @@ void qt_message_output(QtMsgType msgType, const char *buf)
     }
 }
 
+#if !defined(QT_NO_EXCEPTIONS)
+/*!
+    \internal
+    Uses a local buffer to output the message. Not locale safe + cuts off
+    everything after character 1023, but will work in out of memory situations.
+*/
+static void qEmergencyOut(QtMsgType msgType, const char *msg, va_list ap)
+{
+    char emergency_buf[256] = { '\0' };
+    emergency_buf[255] = '\0';
+    if (msg)
+        qvsnprintf(emergency_buf, 255, msg, ap);
+    qt_message_output(msgType, emergency_buf);
+}
+#endif
+
+/*!
+    \internal
+*/
+static void qt_message(QtMsgType msgType, const char *msg, va_list ap)
+{
+#if !defined(QT_NO_EXCEPTIONS)
+    if (std::uncaught_exception()) {
+        qEmergencyOut(msgType, msg, ap);
+        return;
+    }
+#endif
+    QByteArray buf;
+    if (msg) {
+        QT_TRY {
+            buf = QString().vsprintf(msg, ap).toLocal8Bit();
+        } QT_CATCH(const std::bad_alloc &) {
+#if !defined(QT_NO_EXCEPTIONS)
+            qEmergencyOut(msgType, msg, ap);
+            // don't rethrow - we use qWarning and friends in destructors.
+            return;
+#endif
+        }
+    }
+    qt_message_output(msgType, buf.constData());
+}
+
 #undef qDebug
 /*!
     \relates <QtGlobal>
@@ -2063,14 +2268,10 @@ void qt_message_output(QtMsgType msgType, const char *buf)
 */
 void qDebug(const char *msg, ...)
 {
-    QString buf;
     va_list ap;
-    va_start(ap, msg);                        // use variable arg list
-    if (msg)
-        buf.vsprintf(msg, ap);
+    va_start(ap, msg); // use variable arg list
+    qt_message(QtDebugMsg, msg, ap);
     va_end(ap);
-
-    qt_message_output(QtDebugMsg, buf.toLocal8Bit().constData());
 }
 
 #undef qWarning
@@ -2107,14 +2308,10 @@ void qDebug(const char *msg, ...)
 */
 void qWarning(const char *msg, ...)
 {
-    QString buf;
     va_list ap;
     va_start(ap, msg); // use variable arg list
-    if (msg)
-        buf.vsprintf(msg, ap);
+    qt_message(QtWarningMsg, msg, ap);
     va_end(ap);
-
-    qt_message_output(QtWarningMsg, buf.toLocal8Bit().constData());
 }
 
 /*!
@@ -2147,15 +2344,12 @@ void qWarning(const char *msg, ...)
 */
 void qCritical(const char *msg, ...)
 {
-    QString buf;
     va_list ap;
     va_start(ap, msg); // use variable arg list
-    if (msg)
-        buf.vsprintf(msg, ap);
+    qt_message(QtCriticalMsg, msg, ap);
     va_end(ap);
-
-    qt_message_output(QtCriticalMsg, buf.toLocal8Bit().constData());
 }
+
 #ifdef QT3_SUPPORT
 void qSystemWarning(const char *msg, int code)
    { qCritical("%s (%s)", msg, qt_error_string(code).toLocal8Bit().constData()); }
@@ -2163,6 +2357,8 @@ void qSystemWarning(const char *msg, int code)
 
 void qErrnoWarning(const char *msg, ...)
 {
+    // qt_error_string() will allocate anyway, so we don't have
+    // to be careful here (like we do in plain qWarning())
     QString buf;
     va_list ap;
     va_start(ap, msg);
@@ -2175,6 +2371,8 @@ void qErrnoWarning(const char *msg, ...)
 
 void qErrnoWarning(int code, const char *msg, ...)
 {
+    // qt_error_string() will allocate anyway, so we don't have
+    // to be careful here (like we do in plain qWarning())
     QString buf;
     va_list ap;
     va_start(ap, msg);
@@ -2211,14 +2409,10 @@ void qErrnoWarning(int code, const char *msg, ...)
 */
 void qFatal(const char *msg, ...)
 {
-    QString buf;
     va_list ap;
     va_start(ap, msg); // use variable arg list
-    if (msg)
-        buf.vsprintf(msg, ap);
+    qt_message(QtFatalMsg, msg, ap);
     va_end(ap);
-
-    qt_message_output(QtFatalMsg, buf.toLocal8Bit().constData());
 }
 
 // getenv is declared as deprecated in VS2005. This function
@@ -2264,7 +2458,9 @@ typedef uint SeedStorageType;
 #  endif
 
 typedef QThreadStorage<SeedStorageType *> SeedStorage;
+#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)
 Q_GLOBAL_STATIC(SeedStorage, randTLS)  // Thread Local Storage for seed value
+#endif
 
 #endif
 
@@ -2287,7 +2483,7 @@ Q_GLOBAL_STATIC(SeedStorage, randTLS)  // Thread Local Storage for seed value
 */
 void qsrand(uint seed)
 {
-#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD)
+#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)	
     SeedStorageType *pseed = randTLS()->localData();
     if (!pseed)
         randTLS()->setLocalData(pseed = new SeedStorageType);
@@ -2316,7 +2512,7 @@ void qsrand(uint seed)
 */
 int qrand()
 {
-#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD)
+#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)
     SeedStorageType *pseed = randTLS()->localData();
     if (!pseed) {
         randTLS()->setLocalData(pseed = new SeedStorageType);
@@ -3067,4 +3263,176 @@ bool QInternal::callFunction(InternalFunction func, void **args)
     \sa Q_DECL_EXPORT
 */
 
+#if defined(Q_OS_SYMBIAN)
+
+#include <typeinfo>
+
+/*! \macro QT_TRANSLATE_SYMBIAN_LEAVE_TO_EXCEPTION(function)
+    \relates <QtGlobal>
+    \ingroup qts60
+
+    TRAP leaves from Symbian \a function and throws an appropriate
+    standard C++ exception instead.
+    This must be used when calling Symbian OS leaving functions
+    from inside Qt or standard C++ code, so that the code can respond
+    correctly to the exception.
+
+    \warning This macro is only available on Symbian.
+
+    Example:
+
+    \code
+    // A Symbian leaving function is being called within a Qt function.
+    // Any leave must be converted to an exception
+    CAknTitlePane* titlePane = S60->titlePane();
+    if (titlePane) {
+        TPtrC captionPtr(qt_QString2TPtrC(caption));
+        QT_TRANSLATE_SYMBIAN_LEAVE_TO_EXCEPTION(titlePane->SetTextL(captionPtr));
+    }
+    \endcode
+
+    \sa QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_ERROR(), QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE()
+*/
+
+/*! \macro QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_ERROR(error, function)
+    \relates <QtGlobal>
+    \ingroup qts60
+
+    Catch standard C++ exceptions from a \a function and convert them to a Symbian OS
+    \a error code, or \c KErrNone if there is no exception.
+    This must be used inside Qt or standard C++ code when using exception throwing
+    code (practically anything) and returning an error code to Symbian OS.
+
+    \warning This macro is only available on Symbian.
+
+    Example:
+
+    \code
+    // An exception might be thrown in this Symbian TInt error returning function.
+    // It is caught and translated to an error code
+    TInt QServerApp::Connect(const QString &serverName)
+    {
+        TPtrC name;
+        TInt err;
+        QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_ERROR(err, name.Set(qt_QString2TPtrC(serverName)));
+        if (err != KErrNone)
+            return err;
+        return iServer.Connect(name);
+    }
+    \endcode
+}
+
+    \sa QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(), QT_TRANSLATE_SYMBIAN_LEAVE_TO_EXCEPTION()
+*/
+
+/*! \macro QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(function)
+    \relates <QtGlobal>
+    \ingroup qts60
+
+    Catch standard C++ exceptions from \a function and convert them to Symbian OS
+    leaves. This must be used inside Qt or standard C++ code when using exception
+    throwing code (practically anything) and returning to Symbian OS from a leaving function.
+    For example inside a Symbian active object's \c RunL function implemented with Qt code.
+
+    \warning This macro is only available on Symbian.
+
+    Example:
+
+    \code
+    // This active object signals Qt code
+    // Exceptions from the Qt code must be converted to Symbian OS leaves for the active scheduler
+    void QWakeUpActiveObject::RunL()
+    {
+        iStatus = KRequestPending;
+        SetActive();
+        QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(m_dispatcher->wakeUpWasCalled());
+    }
+    \endcode
+
+    \sa QT_TRANSLATE_SYMBIAN_LEAVE_TO_EXCEPTION(), QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_ERROR()
+*/
+
+#include <stdexcept>
+
+class QSymbianLeaveException : public std::exception
+{
+public:
+    inline QSymbianLeaveException(int err) : error(err) {}
+    inline const char* what() const throw() { return "Symbian leave exception"; }
+
+public:
+    int error;
+};
+
+/*! \relates <QtGlobal>
+    \ingroup qts60
+
+    Throws an exception if the \a error parameter is a symbian error code.
+    This is the exception throwing equivalent of Symbian's User::LeaveIfError.
+
+    \warning This function is only available on Symbian.
+
+    \sa qt_translateExceptionToSymbianErrorL(), qt_translateExceptionToSymbianError()
+*/
+void qt_translateSymbianErrorToException(int error)
+{
+    if (error >= KErrNone)
+        return;  // do nothing - not an exception
+    switch (error) {
+    case KErrNoMemory:
+        throw std::bad_alloc();
+    default:
+        throw QSymbianLeaveException(error);
+    }
+}
+
+/*! \relates <QtGlobal>
+    \ingroup qts60
+
+    Convert a caught standard C++ exception \a aThrow to a Symbian leave
+
+    \warning This function is only available on Symbian.
+
+    \sa qt_translateSymbianErrorToException(), qt_translateExceptionToSymbianError()
+*/
+void qt_translateExceptionToSymbianErrorL(const std::exception& aThrow)
+{
+    User::Leave(qt_translateExceptionToSymbianError(aThrow));
+}
+
+/*! \relates <QtGlobal>
+    \ingroup qts60
+
+    Convert a caught standard C++ exception \a aThrow to a Symbian error code
+
+    \warning This function is only available on Symbian.
+
+    \sa qt_translateSymbianErrorToException(), qt_translateExceptionToSymbianErrorL()
+*/
+int qt_translateExceptionToSymbianError(const std::exception& aThrow)
+{
+    const std::type_info& atype = typeid(aThrow);
+    int err = KErrGeneral;
+
+    if(atype == typeid (std::bad_alloc))
+        err = KErrNoMemory;
+    else if(atype == typeid(QSymbianLeaveException))
+        err = static_cast<const QSymbianLeaveException&>(aThrow).error;
+    else if(atype == typeid(std::invalid_argument))
+        err =  KErrArgument;
+    else if(atype == typeid(std::out_of_range))
+        // std::out_of_range is of type logic_error which by definition means that it is
+        // "presumably detectable before the program executes".
+        // std::out_of_range is used to report an argument is not within the expected range.
+        // The description of KErrArgument says an argument is out of range. Hence the mapping.
+        err =  KErrArgument;
+    else if(atype == typeid(std::overflow_error))
+        err =  KErrOverflow;
+    else if(atype == typeid(std::underflow_error))
+        err =  KErrUnderflow;
+
+    return err;
+}
+#endif
+
 QT_END_NAMESPACE
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 8263bae81c..9013416b51 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -110,7 +110,7 @@ namespace QT_NAMESPACE {}
     This expands to a "using QT_NAMESPACE" also in _header files_.
     It is the only way the feature can be used without too much
     pain, but if people _really_ do not want it they can add
-    DEFINES += QT_NO_USING_NAMESPACE to theur .pro files.
+    DEFINES += QT_NO_USING_NAMESPACE to their .pro files.
     */
    QT_USE_NAMESPACE
 # endif
@@ -144,6 +144,7 @@ namespace QT_NAMESPACE {}
    The operating system, must be one of: (Q_OS_x)
 
      DARWIN   - Darwin OS (synonym for Q_OS_MAC)
+     SYMBIAN  - Symbian
      MSDOS    - MS-DOS and Windows
      OS2      - OS/2
      OS2EMX   - XFree86 on OS/2 (not PM)
@@ -182,6 +183,11 @@ namespace QT_NAMESPACE {}
 #  else
 #    define Q_OS_DARWIN32
 #  endif
+#elif defined(__SYMBIAN32__) || defined(SYMBIAN)
+#  define Q_OS_SYMBIAN
+#  define Q_NO_POSIX_SIGNALS
+// TODO: should this be in qconfig.h
+#  define QT_NO_GETIFADDRS
 #elif defined(__CYGWIN__)
 #  define Q_OS_CYGWIN
 #elif defined(MSDOS) || defined(_MSDOS)
@@ -351,7 +357,9 @@ namespace QT_NAMESPACE {}
      HIGHC    - MetaWare High C/C++
      PGI      - Portland Group C++
      GHS      - Green Hills Optimizing C++ Compilers
+     GCCE     - GCCE (Symbian GCCE builds)
      RVCT     - ARM Realview Compiler Suite
+     NOKIAX86 - Nokia x86 (Symbian WINSCW builds)
 
 
    Should be sorted most to least authoritative.
@@ -372,6 +380,9 @@ namespace QT_NAMESPACE {}
 
 #elif defined(__MWERKS__)
 #  define Q_CC_MWERKS
+#  if defined(__EMU_SYMBIAN_OS__)
+#    define Q_CC_NOKIAX86
+#  endif
 /* "explicit" recognized since 4.0d1 */
 
 #elif defined(_MSC_VER)
@@ -426,7 +437,15 @@ namespace QT_NAMESPACE {}
 #elif defined(__WATCOMC__)
 #  define Q_CC_WAT
 
-#elif defined(__CC_ARM)
+/* Symbian GCCE */
+#elif defined(__GCCE__)
+#  define Q_CC_GCCE
+#  define QT_VISIBILITY_AVAILABLE
+
+/* ARM Realview Compiler Suite
+   RVCT compiler also defines __EDG__ and __GNUC__ (if --gnu flag is given),
+   so check for it before that */
+#elif defined(__ARMCC__) || defined(__CC_ARM)
 #  define Q_CC_RVCT
 
 #elif defined(__GNUC__)
@@ -708,6 +727,11 @@ namespace QT_NAMESPACE {}
 #  endif
 #  define Q_NO_USING_KEYWORD /* ### check "using" status */
 
+#elif defined(__WINSCW__) && !defined(Q_CC_NOKIAX86)
+#  define Q_CC_NOKIAX86
+// #  define Q_CC_MWERKS // May be required
+
+
 #else
 #  error "Qt has not been tested with this compiler - talk to qt-bugs@trolltech.com"
 #endif
@@ -755,6 +779,7 @@ namespace QT_NAMESPACE {}
      QWS      - Qt for Embedded Linux
      WIN32    - Windows
      X11      - X Window System
+     S60      - Symbian S60
      PM       - unsupported
      WIN16    - unsupported
 */
@@ -787,6 +812,10 @@ namespace QT_NAMESPACE {}
 #    elif defined(Q_OS_MAC32)
 #      define Q_WS_MAC32
 #    endif
+#  elif defined(Q_OS_SYMBIAN)
+#    if (defined(__SERIES60_31__) || defined(__S60_32__) || defined(__S60_50__)) && !defined(QT_NO_S60)
+#      define Q_WS_S60
+#    endif
 #  elif !defined(Q_WS_QWS)
 #    define Q_WS_X11
 #  endif
@@ -812,7 +841,7 @@ typedef short qint16;              /* 16 bit signed */
 typedef unsigned short quint16;    /* 16 bit unsigned */
 typedef int qint32;                /* 32 bit signed */
 typedef unsigned int quint32;      /* 32 bit unsigned */
-#if defined(Q_OS_WIN) && !defined(Q_CC_GNU)
+#if defined(Q_OS_WIN) && !defined(Q_CC_GNU) && !defined(Q_CC_MWERKS)
 #  define Q_INT64_C(c) c ## i64    /* signed 64 bit constant */
 #  define Q_UINT64_C(c) c ## ui64   /* unsigned 64 bit constant */
 typedef __int64 qint64;            /* 64 bit signed */
@@ -830,7 +859,7 @@ typedef quint64 qulonglong;
 #ifndef QT_POINTER_SIZE
 #  if defined(Q_OS_WIN64)
 #   define QT_POINTER_SIZE 8
-#  elif defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+#  elif defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
 #   define QT_POINTER_SIZE 4
 #  endif
 #endif
@@ -877,6 +906,12 @@ QT_END_INCLUDE_NAMESPACE
 */
 
 #ifndef QT_LINUXBASE /* the LSB defines TRUE and FALSE for us */
+/* Symbian OS defines TRUE = 1 and FALSE = 0, 
+redefine to built-in booleans to make autotests work properly */
+#ifdef Q_OS_SYMBIAN  
+    #undef TRUE
+    #undef FALSE
+#endif
 #  ifndef TRUE
 #   define TRUE true
 #   define FALSE false
@@ -1031,7 +1066,7 @@ typedef int QNoImplicitBoolCast;
 // This logic must match the one in qmetatype.h
 #if defined(QT_COORD_TYPE)
 typedef QT_COORD_TYPE qreal;
-#elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE)
+#elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE) || defined(QT_ARCH_SYMBIAN)
 typedef float qreal;
 #else
 typedef double qreal;
@@ -1047,8 +1082,13 @@ inline T qAbs(const T &t) { return t >= 0 ? t : -t; }
 inline int qRound(qreal d)
 { return d >= 0.0 ? int(d + 0.5) : int(d - int(d-1) + 0.5) + int(d-1); }
 
+#if defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE) || defined(QT_ARCH_SYMBIAN)
+inline qint64 qRound64(double d)
+{ return d >= 0.0 ? qint64(d + 0.5) : qint64(d - qint64(d-1) + 0.5) + qint64(d-1); }
+#else
 inline qint64 qRound64(qreal d)
 { return d >= 0.0 ? qint64(d + 0.5) : qint64(d - qint64(d-1) + 0.5) + qint64(d-1); }
+#endif
 
 template <typename T>
 inline const T &qMin(const T &a, const T &b) { if (a < b) return a; return b; }
@@ -1119,6 +1159,8 @@ class QDataStream;
 #ifndef Q_DECL_EXPORT
 #  ifdef Q_OS_WIN
 #    define Q_DECL_EXPORT __declspec(dllexport)
+#  elif  defined(Q_CC_NOKIAX86)
+#    define Q_DECL_EXPORT __declspec(dllexport)
 #  elif defined(QT_VISIBILITY_AVAILABLE)
 #    define Q_DECL_EXPORT __attribute__((visibility("default")))
 #  endif
@@ -1129,6 +1171,8 @@ class QDataStream;
 #ifndef Q_DECL_IMPORT
 #  if defined(Q_OS_WIN)
 #    define Q_DECL_IMPORT __declspec(dllimport)
+#  elif defined(Q_CC_NOKIAX86)
+#    define Q_DECL_IMPORT __declspec(dllimport)
 #  else
 #    define Q_DECL_IMPORT
 #  endif
@@ -1138,7 +1182,7 @@ class QDataStream;
    Create Qt DLL if QT_DLL is defined (Windows only)
 */
 
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
 #  if defined(QT_NODLL)
 #    undef QT_MAKEDLL
 #    undef QT_DLL
@@ -1290,16 +1334,42 @@ class QDataStream;
    for Trolltech's internal unit tests. If you want slower loading times and more
    symbols that can vanish from version to version, feel free to define QT_BUILD_INTERNAL.
 */
-#if defined(QT_BUILD_INTERNAL) && defined(Q_OS_WIN) && defined(QT_MAKEDLL)
+#if defined(QT_BUILD_INTERNAL) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_MAKEDLL)
 #    define Q_AUTOTEST_EXPORT Q_DECL_EXPORT
-#elif defined(QT_BUILD_INTERNAL) && defined(Q_OS_WIN) && defined(QT_DLL)
+#elif defined(QT_BUILD_INTERNAL) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_DLL)
 #    define Q_AUTOTEST_EXPORT Q_DECL_IMPORT
-#elif defined(QT_BUILD_INTERNAL) && !defined(Q_OS_WIN) && defined(QT_SHARED)
+#elif defined(QT_BUILD_INTERNAL) && !(defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_SHARED)
 #    define Q_AUTOTEST_EXPORT Q_DECL_EXPORT
 #else
 #    define Q_AUTOTEST_EXPORT
 #endif
 
+inline void qt_noop() {}
+
+/* These wrap try/catch so we can switch off exceptions later.
+
+   Beware - do not use more than one QT_CATCH per QT_TRY, and do not use
+   the exception instance in the catch block.
+   If you can't live with those constraints, don't use these macros.
+   Use the QT_NO_EXCEPTIONS macro to protect your code instead.
+*/
+
+#ifdef QT_BOOTSTRAPPED
+#  define QT_NO_EXCEPTIONS
+#endif
+
+#ifdef QT_NO_EXCEPTIONS
+#  define QT_TRY if (true)
+#  define QT_CATCH(A) else
+#  define QT_THROW(A) qt_noop()
+#  define QT_RETHROW qt_noop()
+#else
+#  define QT_TRY try
+#  define QT_CATCH(A) catch (A)
+#  define QT_THROW(A) throw A
+#  define QT_RETHROW throw
+#endif
+
 /*
    System information
 */
@@ -1396,6 +1466,23 @@ public:
     };
     static const MacVersion MacintoshVersion;
 #endif
+#ifdef Q_OS_SYMBIAN
+    enum SymVersion {
+        SV_Unknown = 0x0000,
+        SV_9_2 = 0x0001,
+        SV_9_3 = 0x0002,
+        SV_9_4 = 0x0004
+    };
+    static SymVersion symbianVersion();
+    enum S60Version {
+        SV_S60_None = 0x0000,
+        SV_S60_Unknown = 0x0001,
+        SV_S60_3_1 = 0x0002,
+        SV_S60_3_2 = 0x0004,
+        SV_S60_5_0 = 0x0008
+    };
+    static S60Version s60Version();
+#endif
 };
 
 Q_CORE_EXPORT const char *qVersion();
@@ -1440,7 +1527,7 @@ inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; }
    Avoid "unused parameter" warnings
 */
 
-#if defined(Q_CC_INTEL) && !defined(Q_OS_WIN)
+#if defined(Q_CC_INTEL) && !defined(Q_OS_WIN) || defined(Q_CC_RVCT)
 template <typename T>
 inline void qUnused(T &x) { (void)x; }
 #  define Q_UNUSED(x) qUnused(x);
@@ -1452,6 +1539,10 @@ inline void qUnused(T &x) { (void)x; }
    Debugging and error handling
 */
 
+#if defined(Q_OS_SYMBIAN) && defined(NDEBUG) && !defined(QT_NO_DEBUG)
+#  define QT_NO_DEBUG
+#endif
+
 #if !defined(QT_NO_DEBUG) && !defined(QT_DEBUG)
 #  define QT_DEBUG
 #endif
@@ -1520,8 +1611,6 @@ inline QNoDebug qDebug();
 #endif
 
 
-inline void qt_noop() {}
-
 Q_CORE_EXPORT void qt_assert(const char *assertion, const char *file, int line);
 
 #if !defined(Q_ASSERT)
@@ -1548,10 +1637,18 @@ Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char *
 
 Q_CORE_EXPORT void qt_check_pointer(const char *, int);
 
-#ifndef QT_NO_DEBUG
-#  define Q_CHECK_PTR(p) do {if(!(p))qt_check_pointer(__FILE__,__LINE__);} while (0)
+#ifndef QT_NO_EXCEPTIONS
+Q_CORE_EXPORT void qBadAlloc();
+#endif
+
+#ifdef QT_NO_EXCEPTIONS
+#  if defined(QT_NO_DEBUG)
+#    define Q_CHECK_PTR(p) qt_noop();
+#  else
+#    define Q_CHECK_PTR(p) do {if(!(p))qt_check_pointer(__FILE__,__LINE__);} while (0)
+#  endif
 #else
-#  define Q_CHECK_PTR(p)
+#  define Q_CHECK_PTR(p) do { if (!(p)) qBadAlloc(); } while (0)
 #endif
 
 #if (defined(Q_CC_GNU) && !defined(Q_OS_SOLARIS)) || defined(Q_CC_HPACC) || defined(Q_CC_DIAB)
@@ -1564,7 +1661,7 @@ Q_CORE_EXPORT void qt_check_pointer(const char *, int);
 #      define Q_FUNC_INFO __FUNCSIG__
 #  endif
 #else
-#   if defined(Q_OS_SOLARIS) || defined(Q_CC_XLC)
+#   if defined(Q_OS_SOLARIS) || defined(Q_CC_XLC) || defined(Q_OS_SYMBIAN)
 #      define Q_FUNC_INFO __FILE__ "(line number unavailable)"
 #   else
         /* These two macros makes it possible to turn the builtin line expander into a
@@ -1573,9 +1670,9 @@ Q_CORE_EXPORT void qt_check_pointer(const char *, int);
 #       define QT_STRINGIFY(x) QT_STRINGIFY2(x)
 #       define Q_FUNC_INFO __FILE__ ":" QT_STRINGIFY(__LINE__)
 #   endif
-    /* The MIPSpro compiler postpones macro expansion, and therefore macros must be in scope
-     * when being used. */
-#   if !defined(Q_CC_MIPS)
+    /* The MIPSpro and RVCT compilers postpones macro expansion,
+       and therefore macros must be in scope when being used. */
+#   if !defined(Q_CC_MIPS) && !defined(Q_CC_RVCT) && !defined(Q_CC_NOKIAX86)
 #       undef QT_STRINGIFY2
 #       undef QT_STRINGIFY
 #   endif
@@ -1700,12 +1797,12 @@ public:
     static TYPE *NAME()                                                 \
     {                                                                   \
         if (!this_##NAME.pointer && !this_##NAME.destroyed) {           \
-            TYPE *x = new TYPE;                                         \
+            QScopedPointer<TYPE > x(new TYPE);                          \
             INITIALIZER;                                                \
-            if (!this_##NAME.pointer.testAndSetOrdered(0, x))           \
-                delete x;                                               \
-            else                                                        \
+            if (this_##NAME.pointer.testAndSetOrdered(0, x.data())) {   \
                 static QGlobalStaticDeleter<TYPE > cleanup(this_##NAME); \
+                x.take();                                               \
+            }                                                           \
         }                                                               \
         return this_##NAME.pointer;                                     \
     }
@@ -1908,7 +2005,7 @@ public: \
    types must declare a 'bool isDetached(void) const;' member for this
    to work.
 */
-#if defined Q_CC_MSVC && _MSC_VER < 1300
+#if (defined Q_CC_MSVC && _MSC_VER < 1300) || defined(Q_CC_MWERKS)
 template <typename T>
 inline void qSwap_helper(T &value1, T &value2, T*)
 {
@@ -2091,7 +2188,7 @@ typedef uint Flags;
 
 #endif /* Q_NO_TYPESAFE_FLAGS */
 
-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL)
+#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT)
 /* make use of typeof-extension */
 template <typename T>
 class QForeachContainer {
@@ -2186,8 +2283,8 @@ inline const QForeachContainer<T> *qForeachContainer(const QForeachContainerBase
 #endif
 
 #define Q_DECLARE_PRIVATE(Class) \
-    inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(d_ptr); } \
-    inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr); } \
+    inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \
+    inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr.data()); } \
     friend class Class##Private;
 
 #define Q_DECLARE_PRIVATE_D(Dptr, Class) \
@@ -2247,7 +2344,9 @@ Q_CORE_EXPORT QString qtTrId(const char *id, int n = -1);
      Class(const Class &); \
      Class &operator=(const Class &);
 #else
-# define Q_DISABLE_COPY(Class)
+# define Q_DISABLE_COPY(Class) \
+     Class(const Class &); \
+     Class &operator=(const Class &);
 #endif
 
 class QByteArray;
@@ -2284,6 +2383,44 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathTranslations();
 QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+QT_END_NAMESPACE
+// forward declare std::exception
+#ifdef __cplusplus
+namespace std { class exception; }
+#endif
+QT_BEGIN_NAMESPACE
+Q_CORE_EXPORT void qt_translateSymbianErrorToException(int error);
+Q_CORE_EXPORT void qt_translateExceptionToSymbianErrorL(const std::exception& ex);
+Q_CORE_EXPORT int qt_translateExceptionToSymbianError(const std::exception& ex);
+
+#define QT_TRANSLATE_SYMBIAN_LEAVE_TO_EXCEPTION(f)  \
+    {                                               \
+        TInt error;                                 \
+        TRAP(error, f);                             \
+        if (error)                                    \
+            qt_translateSymbianErrorToException(error); \
+     }
+
+#define QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_ERROR(err, f)     \
+    {                                                       \
+        err = KErrNone;                                     \
+        try {                                               \
+            f;                                              \
+        } catch (const std::exception &ex) {                \
+            err = qt_translateExceptionToSymbianError(ex);  \
+        }                                                   \
+    }
+
+#define QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(f)      \
+    {                                                   \
+    TInt err;                                           \
+    QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_ERROR(err, f)     \
+    User::LeaveIfError(err);                            \
+    }
+#endif
+
+
 /*
    This gives us the possibility to check which modules the user can
    use. These are purely compile time checks and will generate no code.
@@ -2359,6 +2496,9 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
 #define QT_LICENSED_MODULE(x) \
     enum QtValidLicenseFor##x##Module { Licensed##x = true };
 
+/* qdoc is really unhappy with the following block of preprocessor checks,
+   making it difficult to document classes properly after this point. */
+
 #if (QT_EDITION & QT_MODULE_CORE)
 QT_LICENSED_MODULE(Core)
 #endif
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 2ce9229c6d..112903d015 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include "qdir.h"
-#include "qfile.h"    
+#include "qfile.h"
 #include "qconfig.h"
 #include "qsettings.h"
 #include "qlibraryinfo.h"
-#include "qpointer.h"
+#include "qscopedpointer.h"
 
 #ifdef QT_BUILD_QMAKE
 QT_BEGIN_NAMESPACE
@@ -67,8 +67,7 @@ QT_BEGIN_NAMESPACE
 struct QLibrarySettings
 {
     QLibrarySettings();
-    ~QLibrarySettings() { delete static_cast<QSettings *>(settings); }
-    QSettings *settings;
+    QScopedPointer<QSettings> settings;
 };
 Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings)
 
@@ -79,32 +78,19 @@ public:
     static void cleanup()
     {
         QLibrarySettings *ls = qt_library_settings();
-        if (ls) {
-            delete static_cast<QSettings *>(ls->settings);
-            ls->settings = 0;
-        }
+        if (ls)
+            ls->settings.reset(0);
     }
     static QSettings *configuration()
     {
-#ifdef QT_NO_THREAD
-        // This recursion guard should be a temporary solution; the recursive
-        // dependency should be found and removed.
-        static bool initializing = false;
-        if (initializing)
-            return 0;
-        initializing = true;
-#endif
         QLibrarySettings *ls = qt_library_settings();
-#ifdef QT_NO_THREAD
-        initializing = false;
-#endif
-        return ls ? static_cast<QSettings *>(qt_library_settings()->settings) : (QSettings*)0;
+        return ls ? ls->settings.data() : 0;
     }
 };
 
 QLibrarySettings::QLibrarySettings()
+    : settings(QLibraryInfoPrivate::findConfiguration())
 {
-    settings = QLibraryInfoPrivate::findConfiguration();
 #ifndef QT_BUILD_QMAKE
     qAddPostRoutine(QLibraryInfoPrivate::cleanup);
 #endif
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 7770fd6a18..ceec078ec5 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -44,6 +44,10 @@
 
 #include <QtCore/qglobal.h>
 
+#ifdef Q_OS_SYMBIAN
+# include <e32def.h>
+#endif
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -1403,8 +1407,29 @@ public:
         ImFont,
         ImCursorPosition,
         ImSurroundingText,
-        ImCurrentSelection
+        ImCurrentSelection,
+        ImMaximumTextLength,
+        ImAnchorPosition
+    };
+
+    enum InputMethodHint {
+        ImhNone = 0x0,
+        ImhHiddenText = 0x1,
+        ImhNoAutoUppercase = 0x2,
+        ImhPreferNumbers = 0x4,
+        ImhPreferUppercase = 0x8,
+        ImhPreferLowercase = 0x10,
+        ImhNoPredictiveText = 0x20,
+
+        ImhDigitsOnly = 0x10000,
+        ImhFormattedNumbersOnly = 0x20000,
+        ImhUppercaseOnly = 0x40000,
+        ImhLowercaseOnly = 0x80000,
+        ImhDialableCharactersOnly = 0x100000,
+
+        ImhExclusiveInputMask = 0xffff0000
     };
+    Q_DECLARE_FLAGS(InputMethodHints, InputMethodHint)
 
     enum ToolButtonStyle {
         ToolButtonIconOnly,
@@ -1499,6 +1524,8 @@ public:
     typedef unsigned long HANDLE;
 #elif defined(Q_WS_QWS)
     typedef void * HANDLE;
+#elif defined(Q_OS_SYMBIAN)
+    typedef unsigned long int HANDLE; // equivalent to TUint32
 #endif
     typedef WindowFlags WFlags;
 
@@ -1590,6 +1617,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::DropActions)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::ItemFlags)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::MatchFlags)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::TextInteractionFlags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::InputMethodHints)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::TouchPointStates)
 
 typedef bool (*qInternalCallback)(void **);
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index bd41f5e4e8..b49554e775 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -64,7 +64,8 @@ win32 {
 } else:unix {
         SOURCES += io/qfsfileengine_unix.cpp
         SOURCES += io/qfsfileengine_iterator_unix.cpp
-        SOURCES += io/qprocess_unix.cpp
+        symbian:SOURCES += io/qprocess_symbian.cpp
+        else:SOURCES += io/qprocess_unix.cpp
         macx-*: {
             HEADERS += io/qfilesystemwatcher_fsevents_p.h
             SOURCES += io/qsettings_mac.cpp io/qfilesystemwatcher_fsevents.cpp
@@ -84,4 +85,9 @@ win32 {
             SOURCES += io/qfilesystemwatcher_kqueue.cpp
             HEADERS += io/qfilesystemwatcher_kqueue_p.h
         }
+
+        symbian {
+            SOURCES += io/qfilesystemwatcher_symbian.cpp
+            HEADERS += io/qfilesystemwatcher_symbian_p.h
+        }
 }
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp
index 9eb3305d76..fbd838a8f6 100644
--- a/src/corelib/io/qabstractfileengine.cpp
+++ b/src/corelib/io/qabstractfileengine.cpp
@@ -356,8 +356,6 @@ QAbstractFileEngine::QAbstractFileEngine(QAbstractFileEnginePrivate &dd) : d_ptr
  */
 QAbstractFileEngine::~QAbstractFileEngine()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
@@ -885,7 +883,6 @@ QAbstractFileEngineIterator::QAbstractFileEngineIterator(QDir::Filters filters,
 */
 QAbstractFileEngineIterator::~QAbstractFileEngineIterator()
 {
-    delete d;
 }
 
 /*!
diff --git a/src/corelib/io/qabstractfileengine.h b/src/corelib/io/qabstractfileengine.h
index 60ba20aa3f..54eb6de22b 100644
--- a/src/corelib/io/qabstractfileengine.h
+++ b/src/corelib/io/qabstractfileengine.h
@@ -194,7 +194,7 @@ protected:
     QAbstractFileEngine();
     QAbstractFileEngine(QAbstractFileEnginePrivate &);
 
-    QAbstractFileEnginePrivate *d_ptr;
+    QScopedPointer<QAbstractFileEnginePrivate> d_ptr;
 private:
     Q_DECLARE_PRIVATE(QAbstractFileEngine)
     Q_DISABLE_COPY(QAbstractFileEngine)
@@ -238,7 +238,7 @@ private:
     friend class QDirIterator;
     friend class QDirIteratorPrivate;
     void setPath(const QString &path);
-    QAbstractFileEngineIteratorPrivate *d;
+    QScopedPointer<QAbstractFileEngineIteratorPrivate> d;
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index 7766ed3a71..2c672f8f33 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -80,8 +80,11 @@ public:
     inline QDebug &operator=(const QDebug &other);
     inline ~QDebug() {
         if (!--stream->ref) {
-            if(stream->message_output)
-                qt_message_output(stream->type, stream->buffer.toLocal8Bit().data());
+            if(stream->message_output) {
+                QT_TRY {
+                    qt_message_output(stream->type, stream->buffer.toLocal8Bit().data());
+                } QT_CATCH(std::bad_alloc) { /* We're out of memory - give up. */ }
+            }
             delete stream;
         }
     }
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 072eb27367..edbe5f0864 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 
 static QString driveSpec(const QString &path)
 {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     if (path.size() < 2)
         return QString();
     char c = path.at(0).toAscii();
@@ -86,6 +86,7 @@ class QDirPrivate
     QDir *q_ptr;
     Q_DECLARE_PUBLIC(QDir)
 
+    friend class QScopedPointer<QDirPrivate>;
 protected:
     QDirPrivate(QDir*, const QDir *copy=0);
     ~QDirPrivate();
@@ -150,7 +151,7 @@ private:
         QString path = p;
         if ((path.endsWith(QLatin1Char('/')) || path.endsWith(QLatin1Char('\\')))
                 && path.length() > 1) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
             if (!(path.length() == 3 && path.at(1) == QLatin1Char(':')))
 #endif
                 path.truncate(path.length() - 1);
@@ -588,8 +589,6 @@ QDir::QDir(const QDir &dir)  : d_ptr(new QDirPrivate(this, &dir))
 
 QDir::~QDir()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
@@ -787,6 +786,8 @@ QString QDir::relativeFilePath(const QString &fileName) const
     if (fileDrive.toLower() != dirDrive.toLower()
         || (file.startsWith(QLatin1String("//"))
         && !dir.startsWith(QLatin1String("//"))))
+#elif defined(Q_OS_SYMBIAN)
+    if (fileDrive.toLower() != dirDrive.toLower())
 #else
     if (fileDrive != dirDrive)
 #endif
@@ -802,7 +803,7 @@ QString QDir::relativeFilePath(const QString &fileName) const
 
     int i = 0;
     while (i < dirElts.size() && i < fileElts.size() &&
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
            dirElts.at(i).toLower() == fileElts.at(i).toLower())
 #else
            dirElts.at(i) == fileElts.at(i))
@@ -849,7 +850,7 @@ QString QDir::convertSeparators(const QString &pathName)
 QString QDir::toNativeSeparators(const QString &pathName)
 {
     QString n(pathName);
-#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX)
+#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) || defined(Q_OS_SYMBIAN)
     for (int i=0; i<(int)n.length(); i++) {
         if (n[i] == QLatin1Char('/'))
             n[i] = QLatin1Char('\\');
@@ -873,7 +874,7 @@ QString QDir::toNativeSeparators(const QString &pathName)
 QString QDir::fromNativeSeparators(const QString &pathName)
 {
     QString n(pathName);
-#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX)
+#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) || defined(Q_OS_SYMBIAN)
     for (int i=0; i<(int)n.length(); i++) {
         if (n[i] == QLatin1Char('\\'))
             n[i] = QLatin1Char('/');
@@ -1821,10 +1822,10 @@ QFileInfoList QDir::drives()
 
 QChar QDir::separator()
 {
-#if defined(Q_OS_UNIX)
-    return QLatin1Char('/');
-#elif defined (Q_FS_FAT) || defined(Q_WS_WIN)
+#if defined (Q_FS_FAT) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
     return QLatin1Char('\\');
+#elif defined(Q_OS_UNIX) 
+    return QLatin1Char('/');
 #elif defined (Q_OS_MAC)
     return QLatin1Char(':');
 #else
@@ -1924,7 +1925,8 @@ QString QDir::currentPath()
 
     Under non-Windows operating systems the \c HOME environment
     variable is used if it exists, otherwise the path returned by the
-    rootPath() function is used.
+    rootPath() function is used, except in Symbian, where c:\\data is
+    returned.
 
     \sa home(), currentPath(), rootPath(), tempPath()
 */
@@ -2146,7 +2148,7 @@ QString QDir::cleanPath(const QString &path)
                     levels++;
                 }
             } else if(last != -1 && iwrite - last == 1) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
                 eaten = (iwrite > 2);
 #else
                 eaten = true;
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index bad43c8fd0..f54fbdc232 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -45,6 +45,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qstringlist.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -57,7 +58,7 @@ class QDirPrivate;
 class Q_CORE_EXPORT QDir
 {
 protected:
-    QDirPrivate *d_ptr;
+    QScopedPointer<QDirPrivate> d_ptr;
 private:
     Q_DECLARE_PRIVATE(QDir)
 public:
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index c81078b9c6..24d4ff3dcb 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -109,6 +109,7 @@ QFilePrivate::openExternalFile(int flags, int fd)
     return false;
 #else
     delete fileEngine;
+    fileEngine = 0;
     QFSFileEngine *fe = new QFSFileEngine;
     fe->setFileName(fileName);
     fileEngine = fe;
@@ -125,6 +126,7 @@ QFilePrivate::openExternalFile(int flags, FILE *fh)
     return false;
 #else
     delete fileEngine;
+    fileEngine = 0;
     QFSFileEngine *fe = new QFSFileEngine;
     fe->setFileName(fileName);
     fileEngine = fe;
@@ -408,9 +410,6 @@ QFile::QFile(QFilePrivate &dd, QObject *parent)
 QFile::~QFile()
 {
     close();
-#ifdef QT_NO_QOBJECT
-    delete d_ptr;
-#endif
 }
 
 /*!
@@ -745,9 +744,10 @@ QFile::rename(const QString &newName)
                         error = true;
                     }
                 }
-                if (error)
+                if (error) {
                     out.remove();
-                else {
+                } else {
+					fileEngine()->setFileName(newName);
                     setPermissions(permissions());
                     unsetError();
                     setFileName(newName);
@@ -793,6 +793,9 @@ QFile::rename(const QString &oldName, const QString &newName)
 
     \note To create a valid link on Windows, \a linkName must have a \c{.lnk} file extension.
 
+    \note On Symbian, no link is created and false is returned if fileName()
+    currently specifies a directory.
+
     \sa setFileName()
 */
 
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index c50bb51b44..c568369c47 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -371,8 +371,6 @@ QFileInfo::QFileInfo(const QFileInfo &fileinfo) : d_ptr(new QFileInfoPrivate(&fi
 
 QFileInfo::~QFileInfo()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index c2fde58da5..5295b16b7f 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -44,6 +44,7 @@
 
 #include <QtCore/qfile.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -165,7 +166,7 @@ public:
 #endif
 
 protected:
-    QFileInfoPrivate *d_ptr;
+    QScopedPointer<QFileInfoPrivate> d_ptr;
 private:
     Q_DECLARE_PRIVATE(QFileInfo)
 };
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp
index 27fe1c2cfe..883a77a689 100644
--- a/src/corelib/io/qfilesystemwatcher.cpp
+++ b/src/corelib/io/qfilesystemwatcher.cpp
@@ -62,6 +62,8 @@
 #  include "qfilesystemwatcher_fsevents_p.h"
 #  endif //MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 #  include "qfilesystemwatcher_kqueue_p.h"
+#elif defined(Q_OS_SYMBIAN)
+#  include "qfilesystemwatcher_symbian_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -252,6 +254,8 @@ QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine()
     else
 #  endif
         return QKqueueFileSystemWatcherEngine::create();
+#elif defined(Q_OS_SYMBIAN)
+    return new QSymbianFileSystemWatcherEngine;
 #else
     return 0;
 #endif
diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp
new file mode 100644
index 0000000000..aeb19db3d0
--- /dev/null
+++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp
@@ -0,0 +1,282 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qfilesystemwatcher.h"
+#include "qfilesystemwatcher_symbian_p.h"
+#include "qfileinfo.h"
+#include "qdebug.h"
+#include "private/qcore_symbian_p.h"
+#include <QDir>
+
+#ifndef QT_NO_FILESYSTEMWATCHER
+
+
+QT_BEGIN_NAMESPACE
+
+CNotifyChangeEvent* CNotifyChangeEvent::New(RFs &fs, const TDesC& file,
+        QSymbianFileSystemWatcherEngine* e)
+{
+    CNotifyChangeEvent* self = new CNotifyChangeEvent(fs, file, e);
+    return self;
+}
+
+CNotifyChangeEvent::CNotifyChangeEvent(RFs &fs, const TDesC& file,
+    QSymbianFileSystemWatcherEngine* e, TInt aPriority) :
+        CActive(aPriority),
+        fsSession(fs),
+        watchedPath(file),
+        engine(e)
+{
+    fsSession.NotifyChange(ENotifyAll, iStatus, file);
+    CActiveScheduler::Add(this);
+    SetActive();
+}
+
+CNotifyChangeEvent::~CNotifyChangeEvent()
+{
+    Cancel();
+}
+
+void CNotifyChangeEvent::RunL()
+{
+    if (iStatus.Int() == KErrNone){
+        fsSession.NotifyChange(ENotifyAll, iStatus, watchedPath);
+        SetActive();
+        QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(engine->emitPathChanged(this));
+    } else {
+        qWarning("CNotifyChangeEvent::RunL() - Failed to order change notifications: %d", iStatus.Int());
+    }
+}
+
+void CNotifyChangeEvent::DoCancel()
+{
+    fsSession.NotifyChangeCancel();
+}
+
+QSymbianFileSystemWatcherEngine::QSymbianFileSystemWatcherEngine() :
+    watcherStarted(false)
+{
+    moveToThread(this);
+}
+
+QSymbianFileSystemWatcherEngine::~QSymbianFileSystemWatcherEngine()
+{
+    stop();
+}
+
+QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths,
+        QStringList *files, QStringList *directories)
+{
+    QMutexLocker locker(&mutex);
+    QStringList p = paths;
+
+    if (!startWatcher()) {
+        qWarning("Could not start QSymbianFileSystemWatcherEngine thread");
+
+        return p;
+    }
+
+    QMutableListIterator<QString> it(p);
+    while (it.hasNext()) {
+        QString path = it.next();
+        QFileInfo fi(path);
+        if (!fi.exists())
+            continue;
+
+        bool isDir = fi.isDir();
+        if (isDir) {
+            if (directories->contains(path))
+                continue;
+        } else {
+            if (files->contains(path))
+                continue;
+        }
+
+        // Use absolute filepath as relative paths seem to have some issues.
+        QString filePath = fi.absoluteFilePath();
+        if(isDir && filePath.at(filePath.size()-1) != QChar('/')) {
+            filePath += QChar('/');
+        }
+
+        currentEvent = NULL;
+        QMetaObject::invokeMethod(this,
+                "addNativeListener",
+                Qt::QueuedConnection,
+                Q_ARG(QString, filePath));
+
+        syncCondition.wait(&mutex);
+
+        if (currentEvent) {
+            currentEvent->isDir = isDir;
+
+            activeObjectToPath.insert(currentEvent, path);
+            it.remove();
+
+            if (isDir)
+                 directories->append(path);
+             else
+                 files->append(path);
+        }
+    }
+
+    return p;
+}
+
+QStringList QSymbianFileSystemWatcherEngine::removePaths(const QStringList &paths,
+        QStringList *files, QStringList *directories)
+{
+    QMutexLocker locker(&mutex);
+
+    QStringList p = paths;
+    QMutableListIterator<QString> it(p);
+    while (it.hasNext()) {
+        QString path = it.next();
+
+        currentEvent = activeObjectToPath.key(path);
+        if (!currentEvent)
+            continue;
+        activeObjectToPath.remove(currentEvent);
+
+        QMetaObject::invokeMethod(this,
+                "removeNativeListener",
+                Qt::QueuedConnection);
+
+        syncCondition.wait(&mutex);
+
+        it.remove();
+
+        files->removeAll(path);
+        directories->removeAll(path);
+    }
+
+    if (activeObjectToPath.size() == 0)
+        stop();
+
+    return p;
+}
+
+void QSymbianFileSystemWatcherEngine::emitPathChanged(CNotifyChangeEvent *e)
+{
+    QMutexLocker locker(&mutex);
+
+    QString path = activeObjectToPath.value(e);
+    QFileInfo fi(path);
+
+    if (e->isDir) {
+        emit directoryChanged(path, !fi.exists());
+    } else {
+        emit fileChanged(path, !fi.exists());
+    }
+}
+
+void QSymbianFileSystemWatcherEngine::stop()
+{
+    QMetaObject::invokeMethod(this, "quit");
+    wait();
+}
+
+// This method must be called inside mutex
+bool QSymbianFileSystemWatcherEngine::startWatcher()
+{
+    bool retval = true;
+
+    if (!watcherStarted) {
+#if defined(Q_OS_SYMBIAN)
+        setStackSize(0x5000);
+#endif
+        start();
+        syncCondition.wait(&mutex);
+
+        if (errorCode != KErrNone) {
+            retval = false;
+        } else {
+            watcherStarted = true;
+        }
+    }
+    return retval;
+}
+
+
+void QSymbianFileSystemWatcherEngine::run()
+{
+    // Initialize file session
+
+    errorCode = fsSession.Connect();
+
+    mutex.lock();
+    syncCondition.wakeOne();
+    mutex.unlock();
+
+    if (errorCode == KErrNone) {
+        exec();
+
+        foreach(CNotifyChangeEvent* e, activeObjectToPath.keys()) {
+            e->Cancel();
+            delete e;
+        }
+
+        activeObjectToPath.clear();
+        fsSession.Close();
+        watcherStarted = false;
+    }
+}
+
+void QSymbianFileSystemWatcherEngine::addNativeListener(const QString &directoryPath)
+{
+    QMutexLocker locker(&mutex);
+    QString nativeDir(QDir::toNativeSeparators(directoryPath));
+    TPtrC ptr(qt_QString2TPtrC(nativeDir));
+    currentEvent = CNotifyChangeEvent::New(fsSession, ptr, this);
+    syncCondition.wakeOne();
+}
+
+void QSymbianFileSystemWatcherEngine::removeNativeListener()
+{
+    QMutexLocker locker(&mutex);
+    currentEvent->Cancel();
+    delete currentEvent;
+    currentEvent = NULL;
+    syncCondition.wakeOne();
+}
+
+
+QT_END_NAMESPACE
+#endif // QT_NO_FILESYSTEMWATCHER
diff --git a/src/corelib/io/qfilesystemwatcher_symbian_p.h b/src/corelib/io/qfilesystemwatcher_symbian_p.h
new file mode 100644
index 0000000000..9919114ea0
--- /dev/null
+++ b/src/corelib/io/qfilesystemwatcher_symbian_p.h
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QFILESYSTEMWATCHER_SYMBIAN_P_H
+#define QFILESYSTEMWATCHER_SYMBIAN_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qfilesystemwatcher_p.h"
+#include "qhash.h"
+#include "qmutex.h"
+#include "qwaitcondition.h"
+
+#ifndef QT_NO_FILESYSTEMWATCHER
+
+#include <e32base.h>
+#include <f32file.h>
+
+QT_BEGIN_NAMESPACE
+
+class QSymbianFileSystemWatcherEngine;
+
+class CNotifyChangeEvent : public CActive
+{
+public:
+    CNotifyChangeEvent(RFs &fsSession, const TDesC& file, QSymbianFileSystemWatcherEngine* engine,
+            TInt aPriority = EPriorityStandard);
+    ~CNotifyChangeEvent();
+    static CNotifyChangeEvent* New(RFs &fsSession, const TDesC& file,
+            QSymbianFileSystemWatcherEngine* engine);
+
+    bool isDir;
+
+private:
+    void RunL();
+    void DoCancel();
+
+    RFs &fsSession;
+    TPath watchedPath;
+    QSymbianFileSystemWatcherEngine *engine;
+};
+
+class QSymbianFileSystemWatcherEngine : public QFileSystemWatcherEngine
+{
+    Q_OBJECT
+
+public:
+    QSymbianFileSystemWatcherEngine();
+    ~QSymbianFileSystemWatcherEngine();
+
+    QStringList addPaths(const QStringList &paths, QStringList *files,
+            QStringList *directories);
+    QStringList removePaths(const QStringList &paths, QStringList *files,
+            QStringList *directories);
+
+    void stop();
+
+protected:
+    void run();
+
+public Q_SLOTS:
+    void addNativeListener(const QString &directoryPath);
+    void removeNativeListener();
+
+private:
+    friend class CNotifyChangeEvent;
+    void emitPathChanged(CNotifyChangeEvent *e);
+
+    bool startWatcher();
+
+    RFs fsSession;
+    QHash<CNotifyChangeEvent*, QString> activeObjectToPath;
+    QMutex mutex;
+    QWaitCondition syncCondition;
+    int errorCode;
+    bool watcherStarted;
+    CNotifyChangeEvent *currentEvent;
+};
+
+#endif // QT_NO_FILESYSTEMWATCHER
+
+QT_END_NAMESPACE
+
+#endif // QFILESYSTEMWATCHER_WIN_P_H
diff --git a/src/corelib/io/qfsfileengine.h b/src/corelib/io/qfsfileengine.h
index 62ed1c2bd2..feca09b850 100644
--- a/src/corelib/io/qfsfileengine.h
+++ b/src/corelib/io/qfsfileengine.h
@@ -83,6 +83,9 @@ public:
     FileFlags fileFlags(FileFlags type) const;
     bool setPermissions(uint perms);
     QString fileName(FileName file) const;
+#ifdef Q_OS_SYMBIAN
+    QString fileNameSymbian(FileName file) const;
+#endif
     uint ownerId(FileOwner) const;
     QString owner(FileOwner) const;
     QDateTime fileTime(FileTime time) const;
diff --git a/src/corelib/io/qfsfileengine_iterator_unix.cpp b/src/corelib/io/qfsfileengine_iterator_unix.cpp
index a6c965cc36..5b382eb65d 100644
--- a/src/corelib/io/qfsfileengine_iterator_unix.cpp
+++ b/src/corelib/io/qfsfileengine_iterator_unix.cpp
@@ -53,7 +53,7 @@ class QFSFileEngineIteratorPlatformSpecificData
 public:
     inline QFSFileEngineIteratorPlatformSpecificData()
         : dir(0), dirEntry(0), done(false)
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
           , mt_file(0)
 #endif
     { }
@@ -62,7 +62,7 @@ public:
     dirent *dirEntry;
     bool done;
 
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
     // for readdir_r
     dirent *mt_file;
 #endif
@@ -75,7 +75,7 @@ void QFSFileEngineIterator::advance()
     if (!platform->dir)
         return;
 
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
     if (::readdir_r(platform->dir, platform->mt_file, &platform->dirEntry) != 0)
         platform->done = true;
 #else
@@ -86,7 +86,7 @@ void QFSFileEngineIterator::advance()
         ::closedir(platform->dir);
         platform->dir = 0;
         platform->done = true;
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
         delete [] platform->mt_file;
         platform->mt_file = 0;
 #endif
@@ -102,7 +102,7 @@ void QFSFileEngineIterator::deletePlatformSpecifics()
 {
     if (platform->dir) {
         ::closedir(platform->dir);
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
         delete [] platform->mt_file;
         platform->mt_file = 0;
 #endif
@@ -123,7 +123,7 @@ bool QFSFileEngineIterator::hasNext() const
             if ((int) maxPathName == -1)
                 maxPathName = FILENAME_MAX;
             maxPathName += sizeof(dirent) + 1;
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
             if (that->platform->mt_file)
                 delete [] that->platform->mt_file;
             that->platform->mt_file = (dirent *)new char[maxPathName];
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index c0b682067a..6c5db5fb89 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -52,12 +52,16 @@
 #include "qfile.h"
 #include "qdir.h"
 #include "qdatetime.h"
-#include "qdebug.h"
 #include "qvarlengtharray.h"
 
 #include <sys/mman.h>
 #include <stdlib.h>
 #include <limits.h>
+#if defined(Q_OS_SYMBIAN)
+# include <syslimits.h>
+# include <f32file.h>
+# include "private/qcore_symbian_p.h"
+#endif
 #include <errno.h>
 #if !defined(QWS) && defined(Q_OS_MAC)
 # include <private/qcore_mac_p.h>
@@ -65,6 +69,22 @@
 
 QT_BEGIN_NAMESPACE
 
+
+#ifdef Q_OS_SYMBIAN
+/*!
+    \internal
+
+    Returns true if supplied path is a relative path
+*/
+static bool isRelativePathSymbian(const QString& fileName)
+{
+    return !(fileName.startsWith(QLatin1Char('/'))
+        || (fileName.length() >= 2
+        && ((fileName.at(0).isLetter() && fileName.at(1) == QLatin1Char(':'))
+        || (fileName.at(0) == QLatin1Char('/') && fileName.at(1) == QLatin1Char('/')))));
+}
+#endif
+
 /*!
     \internal
 
@@ -372,10 +392,37 @@ bool QFSFileEngine::remove()
     return unlink(d->nativeFilePath.constData()) == 0;
 }
 
-bool QFSFileEngine::copy(const QString &)
+bool QFSFileEngine::copy(const QString &newName)
 {
+#if defined(Q_OS_SYMBIAN)
+    Q_D(QFSFileEngine);
+    RFs rfs;
+    TInt err = rfs.Connect();
+    if (err == KErrNone) {
+        CFileMan* fm = NULL;
+        QString oldNative(QDir::toNativeSeparators(d->filePath));
+        TPtrC oldPtr(qt_QString2TPtrC(oldNative));
+        QFileInfo fi(newName);
+        QString absoluteNewName = fi.absolutePath() + QDir::separator() + fi.fileName();
+        QString newNative(QDir::toNativeSeparators(absoluteNewName));
+        TPtrC newPtr(qt_QString2TPtrC(newNative));
+        TRAP (err,
+            fm = CFileMan::NewL(rfs);
+            RFile rfile;
+            err = rfile.Open(rfs, oldPtr, EFileShareReadersOrWriters);
+            if (err == KErrNone) {
+                err = fm->Copy(rfile, newPtr);
+                rfile.Close();
+            }
+        ) // End TRAP
+        delete fm;
+        rfs.Close();
+    }
+    return (err == KErrNone);
+#else
     // ### Add copy code for Unix here
     return false;
+#endif
 }
 
 bool QFSFileEngine::rename(const QString &newName)
@@ -399,7 +446,11 @@ bool QFSFileEngine::mkdir(const QString &name, bool createParentDirectories) con
 {
     QString dirName = name;
     if (createParentDirectories) {
+#if defined(Q_OS_SYMBIAN)
+        dirName = QDir::toNativeSeparators(QDir::cleanPath(dirName));
+#else
         dirName = QDir::cleanPath(dirName);
+#endif
         for(int oldslash = -1, slash=0; slash != -1; oldslash = slash) {
             slash = dirName.indexOf(QDir::separator(), oldslash+1);
             if (slash == -1) {
@@ -431,7 +482,11 @@ bool QFSFileEngine::rmdir(const QString &name, bool recurseParentDirectories) co
 {
     QString dirName = name;
     if (recurseParentDirectories) {
+#if defined(Q_OS_SYMBIAN)
+        dirName = QDir::toNativeSeparators(QDir::cleanPath(dirName));
+#else
         dirName = QDir::cleanPath(dirName);
+#endif
         for(int oldslash = 0, slash=dirName.length(); slash > 0; oldslash = slash) {
             QByteArray chunk = QFile::encodeName(dirName.left(slash));
             QT_STATBUF st;
@@ -452,7 +507,11 @@ bool QFSFileEngine::rmdir(const QString &name, bool recurseParentDirectories) co
 
 bool QFSFileEngine::caseSensitive() const
 {
+#if defined(Q_OS_SYMBIAN)
+    return false;
+#else
     return true;
+#endif
 }
 
 bool QFSFileEngine::setCurrentPath(const QString &path)
@@ -466,6 +525,16 @@ QString QFSFileEngine::currentPath(const QString &)
 {
     QString result;
     QT_STATBUF st;
+#if defined(Q_OS_SYMBIAN)
+    char currentName[PATH_MAX+1];
+    if (::getcwd(currentName, PATH_MAX))
+        result = QDir::fromNativeSeparators(QFile::decodeName(QByteArray(currentName)));
+    if (result.isEmpty()) {
+# if defined(QT_DEBUG)
+        qWarning("QDir::currentPath: getcwd() failed");
+# endif
+    } else
+#endif
     if (QT_STAT(".", &st) == 0) {
 #if defined(__GLIBC__) && !defined(PATH_MAX)
         char *currentName = ::get_current_dir_name();
@@ -473,18 +542,26 @@ QString QFSFileEngine::currentPath(const QString &)
             result = QFile::decodeName(QByteArray(currentName));
             ::free(currentName);
         }
-#else
+#elif !defined(Q_OS_SYMBIAN)
         char currentName[PATH_MAX+1];
         if (::getcwd(currentName, PATH_MAX))
             result = QFile::decodeName(QByteArray(currentName));
-#endif
-#if defined(QT_DEBUG)
+# if defined(QT_DEBUG)
         if (result.isNull())
             qWarning("QDir::currentPath: getcwd() failed");
+# endif
 #endif
     } else {
-#if defined(QT_DEBUG)
+#if defined(Q_OS_SYMBIAN)
+        // If current dir returned by Open C doesn't exist,
+        // try to create it (can happen with application private dirs)
+        // Ignore mkdir failures; we want to be consistent with Open C
+        // current path regardless.
+        ::mkdir(QFile::encodeName(currentName), 0777);
+#else
+# if defined(QT_DEBUG)
         qWarning("QDir::currentPath: stat(\".\") failed");
+# endif
 #endif
     }
     return result;
@@ -493,28 +570,61 @@ QString QFSFileEngine::currentPath(const QString &)
 QString QFSFileEngine::homePath()
 {
     QString home = QFile::decodeName(qgetenv("HOME"));
+#if defined(Q_OS_SYMBIAN)
+    if (home.isEmpty())
+        home = QLatin1String("C:/Data");
+#else
     if (home.isNull())
         home = rootPath();
+#endif
     return home;
 }
 
 QString QFSFileEngine::rootPath()
 {
+#if defined(Q_OS_SYMBIAN)
+    return QString::fromLatin1("C:/");
+#else
     return QString::fromLatin1("/");
+#endif
 }
 
 QString QFSFileEngine::tempPath()
 {
-    QString temp = QFile::decodeName(qgetenv("TMPDIR"));
-    if (temp.isEmpty())
-        temp = QString::fromLatin1("/tmp/");
+#ifdef Q_OS_SYMBIAN
+        QString temp = QDir::currentPath().left(2);
+        temp += QString::fromLatin1( "/system/temp/");
+#else
+        QString temp = QFile::decodeName(qgetenv("TMPDIR"));
+        if (temp.isEmpty())
+            temp = QString::fromLatin1("/tmp/");
+#endif
     return temp;
 }
 
 QFileInfoList QFSFileEngine::drives()
 {
     QFileInfoList ret;
+#if defined(Q_OS_SYMBIAN)
+    TDriveList driveList;
+    RFs rfs;
+    TInt err = rfs.Connect();
+    if (err == KErrNone) {
+        err = rfs.DriveList(driveList);
+        if (err == KErrNone) {
+            for(char i=0; i < KMaxDrives; i++) {
+                if (driveList[i]) {
+                    ret.append(QString("%1:/").arg(QChar('A'+i)));
+                }
+            }
+        } else {
+            qWarning("QDir::drives: Getting drives failed");
+        }
+        rfs.Close();
+    }
+#else
     ret.append(rootPath());
+#endif
     return ret;
 }
 
@@ -547,6 +657,32 @@ bool QFSFileEnginePrivate::isSymlink() const
     return is_link;
 }
 
+#if defined(Q_OS_SYMBIAN)
+static bool _q_isSymbianHidden(const QString &path, bool isDir)
+{
+    bool retval = false;
+    RFs rfs;
+    TInt err = rfs.Connect();
+    if (err == KErrNone) {
+        QFileInfo fi(path);
+        QString absPath = fi.absoluteFilePath();
+        if (isDir && absPath.at(absPath.size()-1) != QChar('/')) {
+            absPath += QChar('/');
+        }
+        QString native(QDir::toNativeSeparators(absPath));
+        TPtrC ptr(qt_QString2TPtrC(native));
+        TUint attributes;
+        err = rfs.Att(ptr, attributes);
+        rfs.Close();
+        if (err == KErrNone && (attributes & KEntryAttHidden)) {
+            retval = true;
+        }
+    }
+
+    return retval;
+}
+#endif
+
 #if !defined(QWS) && defined(Q_OS_MAC)
 static bool _q_isMacHidden(const QString &path)
 {
@@ -651,20 +787,147 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const
         ret |= LocalDiskFlag;
         if (exists)
             ret |= ExistsFlag;
+#if defined(Q_OS_SYMBIAN)
+    if (d->filePath == QLatin1String("/") || (d->filePath.at(0).isLetter() && d->filePath.mid(1,d->filePath.length()) == QLatin1String(":/")))
+        ret |= RootFlag;
+
+    // In Symbian, all symlinks have hidden attribute for some reason;
+    // lets make them visible for better compatibility with other platforms.
+    // If somebody actually wants a hidden link, then they are out of luck.
+    if (!(ret & RootFlag) && !d->isSymlink())
+        if(_q_isSymbianHidden(d->filePath, ret & DirectoryType)
+#else
         if (fileName(BaseName)[0] == QLatin1Char('.')
-#if !defined(QWS) && defined(Q_OS_MAC)
+# if !defined(QWS) && defined(Q_OS_MAC)
             || _q_isMacHidden(d->filePath)
+# endif
 #endif
         )
             ret |= HiddenFlag;
+#if !defined(Q_OS_SYMBIAN)
         if (d->filePath == QLatin1String("/"))
             ret |= RootFlag;
+#endif
     }
     return ret;
 }
 
+#ifdef Q_OS_SYMBIAN
+QString QFSFileEngine::fileNameSymbian(FileName file) const
+{
+    Q_D(const QFSFileEngine);
+    if(file == BaseName) {
+        int slash = d->filePath.lastIndexOf(QLatin1Char('/'));
+        if(slash == -1) {
+            int colon = d->filePath.lastIndexOf(QLatin1Char(':'));
+            if(colon != -1)
+                return d->filePath.mid(colon + 1);
+            return d->filePath;
+        }
+        return d->filePath.mid(slash + 1);
+    } else if(file == PathName) {
+        if(!d->filePath.size())
+            return d->filePath;
+
+        int slash = d->filePath.lastIndexOf(QLatin1Char('/'));
+        if(slash == -1) {
+            if(d->filePath.length() >= 2 && d->filePath.at(1) == QLatin1Char(':'))
+                return d->filePath.left(2);
+            return QString::fromLatin1(".");
+        } else {
+            if(!slash)
+                return QString::fromLatin1("/");
+            if(slash == 2 && d->filePath.length() >= 2 && d->filePath.at(1) == QLatin1Char(':'))
+                slash++;
+            return d->filePath.left(slash);
+        }
+    } else if(file == AbsoluteName || file == AbsolutePathName) {
+        QString ret;
+        if (!isRelativePath()) {
+            if (d->filePath.size() > 2 && d->filePath.at(1) == QLatin1Char(':')
+                && d->filePath.at(2) != QLatin1Char('/') || // It's a drive-relative path, so Z:a.txt -> Z:\currentpath\a.txt
+                d->filePath.startsWith(QLatin1Char('/'))    // It's a absolute path to the current drive, so \a.txt -> Z:\a.txt
+                ) {
+                ret = QString(QDir::currentPath().left(2) + QDir::fromNativeSeparators(d->filePath));
+            } else {
+                ret = d->filePath;
+            }
+        } else {
+            ret = QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + d->filePath);
+        }
+
+        // The path should be absolute at this point.
+        // From the docs :
+        // Absolute paths begin with the directory separator "/"
+        // (optionally preceded by a drive specification under Windows).
+        if (ret.at(0) != QLatin1Char('/')) {
+            Q_ASSERT(ret.length() >= 2);
+            Q_ASSERT(ret.at(0).isLetter());
+            Q_ASSERT(ret.at(1) == QLatin1Char(':'));
+
+            // Force uppercase drive letters.
+            ret[0] = ret.at(0).toUpper();
+        }
+
+        if (file == AbsolutePathName) {
+            int slash = ret.lastIndexOf(QLatin1Char('/'));
+            if (slash < 0)
+                return ret;
+            else if (ret.at(0) != QLatin1Char('/') && slash == 2)
+                return ret.left(3);      // include the slash
+            else
+                return ret.left(slash > 0 ? slash : 1);
+        }
+        return ret;
+    } else if(file == CanonicalName || file == CanonicalPathName) {
+        if (!(fileFlags(ExistsFlag) & ExistsFlag))
+            return QString();
+
+        QString ret = QFSFileEnginePrivate::canonicalized(fileName(AbsoluteName));
+        if (!ret.isEmpty() && file == CanonicalPathName) {
+            int slash = ret.lastIndexOf(QLatin1Char('/'));
+            if (slash == -1)
+                ret = QDir::fromNativeSeparators(QDir::currentPath());
+            else if (slash == 0)
+                ret = QLatin1String("/");
+            ret = ret.left(slash);
+        }
+        return ret;
+    } else if(file == LinkName) {
+        if (d->isSymlink()) {
+            char s[PATH_MAX+1];
+            int len = readlink(d->nativeFilePath.constData(), s, PATH_MAX);
+            if (len > 0) {
+                s[len] = '\0';
+                QString ret = QFile::decodeName(QByteArray(s));
+
+                if (isRelativePathSymbian(ret)) {
+                    if (!isRelativePathSymbian(d->filePath)) {
+                        ret.prepend(d->filePath.left(d->filePath.lastIndexOf(QLatin1Char('/')))
+                                    + QLatin1Char('/'));
+                    } else {
+                        ret.prepend(QDir::currentPath() + QLatin1Char('/'));
+                    }
+                }
+                ret = QDir::cleanPath(ret);
+                if (ret.size() > 1 && ret.endsWith(QLatin1Char('/')))
+                    ret.chop(1);
+                return ret;
+            }
+        }
+        return QString();
+    } else if(file == BundleName) {
+        return QString();
+    }
+    return d->filePath;
+}
+#endif
+
 QString QFSFileEngine::fileName(FileName file) const
 {
+#ifdef Q_OS_SYMBIAN
+    return fileNameSymbian(file);
+#endif
     Q_D(const QFSFileEngine);
     if (file == BundleName) {
 #if !defined(QWS) && defined(Q_OS_MAC)
@@ -808,10 +1071,14 @@ QString QFSFileEngine::fileName(FileName file) const
 bool QFSFileEngine::isRelativePath() const
 {
     Q_D(const QFSFileEngine);
+#ifdef Q_OS_SYMBIAN
+    return isRelativePathSymbian(d->filePath);
+#else
     int len = d->filePath.length();
     if (len == 0)
         return true;
     return d->filePath[0] != QLatin1Char('/');
+#endif
 }
 
 uint QFSFileEngine::ownerId(FileOwner own) const
@@ -847,6 +1114,9 @@ QString QFSFileEngine::owner(FileOwner own) const
         if (pw)
             return QFile::decodeName(QByteArray(pw->pw_name));
     } else if (own == OwnerGroup) {
+#ifdef Q_OS_SYMBIAN
+        return QString();
+#endif
         struct group *gr = 0;
 #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
         size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index 819034a2d3..68eef5f4f1 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -1267,7 +1267,7 @@ bool QFSFileEnginePrivate::doStat() const
 static QString readLink(const QString &link)
 {
 #if !defined(Q_OS_WINCE)
-#if !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_LIBRARY) && !defined(Q_CC_MWERKS)
     QString ret;
 
     bool neededCoInit = false;
@@ -1332,7 +1332,7 @@ QString QFSFileEnginePrivate::getLink() const
 bool QFSFileEngine::link(const QString &newName)
 {
 #if !defined(Q_OS_WINCE)
-#if !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_LIBRARY) && !defined(Q_CC_MWERKS)
     bool ret = false;
 
     QString linkName = newName;
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 2977c7f6a2..d9bb4fd664 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -1036,6 +1036,15 @@ qint64 QIODevice::readLine(char *data, qint64 maxSize)
         if (readSoFar)
             debugBinaryString(data, int(readSoFar));
 #endif
+#if defined(Q_OS_SYMBIAN)
+        // Open C fgets strips '\r' but readSoFar gets returned as if it was still there
+        if ((d->openMode & Text) &&
+            readSoFar > 1 &&
+            data[readSoFar - 1] == '\0' &&
+            data[readSoFar - 2] == '\n') {
+            --readSoFar;
+        }
+#endif
         if (readSoFar && data[readSoFar - 1] == '\n') {
             if (d->openMode & Text) {
                 // QRingBuffer::readLine() isn't Text aware.
@@ -1074,6 +1083,12 @@ qint64 QIODevice::readLine(char *data, qint64 maxSize)
     data[readSoFar] = '\0';
 
     if (d->openMode & Text) {
+#if defined(Q_OS_SYMBIAN)
+        // Open C fgets strips '\r' but readSoFar gets returned as if it was still there
+        if (readSoFar > 1 && data[readSoFar - 1] == '\0' && data[readSoFar - 2] == '\n') {
+            --readSoFar;
+        }
+#endif
         if (readSoFar > 1 && data[readSoFar - 1] == '\n' && data[readSoFar - 2] == '\r') {
             data[readSoFar - 2] = '\n';
             data[readSoFar - 1] = '\0';
diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h
index 58c743523e..866fa72249 100644
--- a/src/corelib/io/qiodevice.h
+++ b/src/corelib/io/qiodevice.h
@@ -46,6 +46,7 @@
 #include <QtCore/qobject.h>
 #else
 #include <QtCore/qobjectdefs.h>
+#include <QtCore/qscopedpointer.h>
 #endif
 #include <QtCore/qstring.h>
 
@@ -160,7 +161,7 @@ protected:
     void setErrorString(const QString &errorString);
 
 #ifdef QT_NO_QOBJECT
-    QIODevicePrivate *d_ptr;
+    QScopedPointer<QIODevicePrivate> d_ptr;
 #endif
 
 private:
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index e75c31465c..871ea636b1 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -176,7 +176,8 @@ void QProcessPrivate::Channel::clear()
     used as an input source for QXmlReader, or for generating data to
     be uploaded using QFtp.
 
-    \note On Windows CE, reading and writing to a process is not supported.
+    \note On Windows CE and Symbian, reading and writing to a process
+    is not supported.
 
     When the process exits, QProcess reenters the \l NotRunning state
     (the initial state), and emits finished().
@@ -226,6 +227,10 @@ void QProcessPrivate::Channel::clear()
     setWorkingDirectory(). By default, processes are run in the
     current working directory of the calling process.
 
+    \note On Symbian, setting environment or working directory
+    is not supported. The working directory will always be the private
+    directory of the running process.
+
     \section1 Synchronous Process API
 
     QProcess provides a set of functions which allow it to be used
@@ -460,6 +465,10 @@ QProcessPrivate::QProcessPrivate()
 #ifdef Q_OS_UNIX
     serial = 0;
 #endif
+#ifdef Q_OS_SYMBIAN
+    symbianProcess = NULL;
+    processLaunched = false;
+#endif
 }
 
 /*! \internal
@@ -533,6 +542,13 @@ void QProcessPrivate::cleanup()
 #ifdef Q_OS_UNIX
     serial = 0;
 #endif
+#ifdef Q_OS_SYMBIAN
+    if (symbianProcess) {
+        symbianProcess->Close();
+        delete symbianProcess;
+        symbianProcess = NULL;
+    }
+#endif
 }
 
 /*! \internal
@@ -790,7 +806,7 @@ void QProcessPrivate::closeWriteChannel()
         if (stdinChannel.notifier) {
             qDeleteInEventHandler(stdinChannel.notifier);
             stdinChannel.notifier = 0;
-        } 
+        }
     }
 #ifdef Q_OS_WIN
     // ### Find a better fix, feeding the process little by little
@@ -1089,6 +1105,10 @@ QString QProcess::workingDirectory() const
     process in this directory. The default behavior is to start the
     process in the working directory of the calling process.
 
+    \note The working directory setting is ignored on Symbian;
+    the private directory of the process is considered its working
+    directory.
+
     \sa workingDirectory(), start()
 */
 void QProcess::setWorkingDirectory(const QString &dir)
@@ -1229,7 +1249,7 @@ void QProcess::setEnvironment(const QStringList &environment)
     using setEnvironment() or setEnvironmentHash(). If no environment
     has been set, the environment of the calling process will be used.
 
-    \note The environment settings are ignored on Windows CE,
+    \note The environment settings are ignored on Windows CE and Symbian,
     as there is no concept of an environment.
 
     \sa environmentHash(), setEnvironment(), systemEnvironment()
@@ -1715,6 +1735,9 @@ void QProcess::start(const QString &program, OpenMode mode)
     event loop does not handle the WM_CLOSE message, can only be terminated by
     calling kill().
 
+    \note Terminating running processes from other processes will typically
+    cause a panic in Symbian due to platform security.
+
     \sa kill()
 */
 void QProcess::terminate()
@@ -1729,6 +1752,9 @@ void QProcess::terminate()
     On Windows, kill() uses TerminateProcess, and on Unix and Mac OS X, the
     SIGKILL signal is sent to the process.
 
+    \note Killing running processes from other processes will typically
+    cause a panic in Symbian due to platform security.
+
     \sa terminate()
 */
 void QProcess::kill()
@@ -1875,9 +1901,9 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #ifdef Q_OS_MAC
 # include <crt_externs.h>
 # define environ (*_NSGetEnviron())
-#elif defined(Q_OS_WINCE)
-  static char *qt_wince_environ[] = { 0 };
-#define environ qt_wince_environ
+#elif defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+  static char *qt_empty_environ[] = { 0 };
+#define environ qt_empty_environ
 #elif !defined(Q_OS_WIN)
   extern char **environ;
 #endif
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index 970fc606cb..bff5f7e5c9 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -55,8 +55,13 @@ QT_MODULE(Core)
 
 template <class Key, class T> class QHash;
 
-#if (!defined(Q_OS_WIN32) && !defined(Q_OS_WINCE)) || defined(qdoc)
+#if (!defined(Q_OS_WIN32) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)) || defined(qdoc)
 typedef qint64 Q_PID;
+#elif defined(Q_OS_SYMBIAN)
+QT_END_NAMESPACE
+#  include <e32std.h>
+QT_BEGIN_NAMESPACE
+typedef TProcessId Q_PID;
 #else
 QT_END_NAMESPACE
 typedef struct _PROCESS_INFORMATION *Q_PID;
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
index e2a11aa304..767511aac4 100644
--- a/src/corelib/io/qprocess_p.h
+++ b/src/corelib/io/qprocess_p.h
@@ -180,7 +180,7 @@ public:
     QWinEventNotifier *processFinishedNotifier;
 
     void startProcess();
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     void execChild(const char *workingDirectory, char **path, char **argv, char **envp);
 #endif
     bool processStarted();
@@ -221,6 +221,11 @@ public:
 #ifdef Q_OS_UNIX
     static void initializeProcessManager();
 #endif
+
+#ifdef Q_OS_SYMBIAN
+    bool processLaunched;
+    RProcess* symbianProcess;
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp
new file mode 100644
index 0000000000..7da6a1dbdd
--- /dev/null
+++ b/src/corelib/io/qprocess_symbian.cpp
@@ -0,0 +1,1035 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//#define QPROCESS_DEBUG
+
+#ifdef QPROCESS_DEBUG
+#include "qdebug.h"
+#define QPROCESS_DEBUG_PRINT(args...) qDebug(args);
+#else
+#define QPROCESS_DEBUG_PRINT(args...)
+#endif
+
+#ifndef QT_NO_PROCESS
+
+#define QPROCESS_ASSERT(check, panicReason, args...) \
+    if (!(check)) { \
+        qWarning(args); \
+        User::Panic(KQProcessPanic, panicReason); \
+    }
+
+#include <exception>
+#include <e32base.h>
+#include <e32std.h>
+#include <stdio.h>
+#include "qplatformdefs.h"
+
+#include "qstring.h"
+#include "qprocess.h"
+#include "qprocess_p.h"
+#include "qeventdispatcher_symbian_p.h"
+
+#include <private/qthread_p.h>
+#include <qmutex.h>
+#include <qmap.h>
+#include <qsocketnotifier.h>
+
+#include <errno.h>
+
+
+QT_BEGIN_NAMESPACE
+
+_LIT(KQProcessManagerThreadName, "QProcManThread");
+_LIT(KQProcessPanic, "QPROCESS");
+enum TQProcessPanic {
+    EProcessManagerMediatorRunError         = 1,
+    EProcessManagerMediatorInactive         = 2,
+    EProcessManagerMediatorNotPending       = 3,
+    EProcessManagerMediatorInvalidCmd       = 4,
+    EProcessManagerMediatorCreationFailed   = 5,
+    EProcessManagerMediatorThreadOpenFailed = 6,
+    EProcessManagerMediatorNullObserver     = 7,
+    EProcessActiveRunError                  = 10,
+    EProcessActiveNullParameter             = 11,
+    EProcessManagerMutexCreationFail        = 20,
+    EProcessManagerThreadCreationFail       = 21,
+    EProcessManagerSchedulerCreationFail    = 22,
+    EProcessManagerNullParam                = 23
+};
+
+// Forward declarations
+class QProcessManager;
+
+
+// Active object to listen for child process death
+class CProcessActive : public CActive
+{
+public:
+    static CProcessActive* construct(QProcess* process,
+                               RProcess** proc,
+                               int serial,
+                               int deathPipe);
+
+    virtual ~CProcessActive();
+
+    void start();
+    void stop();
+
+    bool error();
+
+protected:
+
+    // From CActive
+    void RunL();
+    TInt RunError(TInt aError);
+    void DoCancel();
+
+    CProcessActive();
+
+private:
+
+    QProcess* process;
+    RProcess** pproc;
+    int serial;
+    int deathPipe;
+    bool errorValue;
+};
+
+// Active object to communicate synchronously with process manager thread
+class CProcessManagerMediator : public CActive
+{
+public:
+    static CProcessManagerMediator* construct();
+
+    virtual ~CProcessManagerMediator();
+
+    bool add(CProcessActive* processObserver);
+    void remove(CProcessActive* processObserver);
+    void terminate();
+
+protected:
+
+    enum Commands {
+        ENoCommand,
+        EAdd,
+        ERemove,
+        ETerminate
+    };
+
+    // From CActive
+    void RunL();
+    TInt RunError(TInt aError);
+    void DoCancel();
+
+    CProcessManagerMediator();
+
+    bool notify(CProcessActive* processObserver, Commands command);
+
+private:
+    CProcessActive* currentObserver;
+    Commands currentCommand;
+
+    RThread processManagerThread;
+};
+
+// Process manager manages child process death listeners
+class QProcessManager
+{
+public:
+    QProcessManager();
+    ~QProcessManager();
+
+    void startThread();
+
+    TInt run(void* param);
+    bool add(QProcess *process);
+    void remove(QProcess *process);
+
+    inline void setMediator(CProcessManagerMediator* newMediator) {mediator = newMediator;};
+
+private:
+    inline void lock() {managerMutex.Wait();};
+    inline void unlock() {managerMutex.Signal();};
+
+    QMap<int, CProcessActive *> children;
+    CProcessManagerMediator* mediator;
+    RMutex managerMutex;
+    bool threadStarted;
+    RThread managerThread;
+};
+
+static bool qt_rprocess_running(RProcess* proc)
+{
+    if(proc && proc->Handle()) {
+        TExitType et = proc->ExitType();
+        if (et == EExitPending) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+static void qt_create_symbian_commandline(const QStringList &arguments, QString& commandLine)
+{
+    for (int i=0; i<arguments.size(); ++i) {
+        QString tmp = arguments.at(i);
+        // in the case of \" already being in the string the \ must also be escaped
+        tmp.replace( QLatin1String("\\\""), QLatin1String("\\\\\"") );
+        // escape a single " because the arguments will be parsed
+        tmp.replace( QLatin1String("\""), QLatin1String("\\\"") );
+        if (tmp.isEmpty() || tmp.contains(QLatin1Char(' ')) || tmp.contains(QLatin1Char('\t'))) {
+            // The argument must not end with a \ since this would be interpreted
+            // as escaping the quote -- rather put the \ behind the quote: e.g.
+            // rather use "foo"\ than "foo\"
+            QString endQuote(QLatin1String("\""));
+            int i = tmp.length();
+            while (i>0 && tmp.at(i-1) == QLatin1Char('\\')) {
+                --i;
+                endQuote += QLatin1String("\\");
+            }
+            commandLine += QLatin1String(" \"") + tmp.left(i) + endQuote;
+        } else {
+            commandLine += QLatin1Char(' ') + tmp;
+        }
+    }
+}
+
+static TInt qt_create_symbian_process(RProcess **proc, const QString &programName, const QStringList &arguments)
+{
+    RProcess* newProc = NULL;
+    newProc = new RProcess();
+
+    if (!newProc) {
+        return KErrNoMemory;
+    }
+
+    QString commandLine;
+    qt_create_symbian_commandline(arguments, commandLine);
+
+    TPtrC program_ptr(reinterpret_cast<const TText*>(programName.constData()));
+    TPtrC cmdline_ptr(reinterpret_cast<const TText*>(commandLine.constData()));
+
+    TInt err = newProc->Create(program_ptr, cmdline_ptr);
+
+    if (err == KErrNotFound){
+        // Strip path from program name and try again (i.e. try from default location "\sys\bin")
+        int index = programName.lastIndexOf(QChar('\\'));
+        int index2 = programName.lastIndexOf(QChar('/'));
+        index = qMax(index, index2);
+
+        if(index != -1 && programName.length() >= index){
+            QString strippedName;
+            strippedName = programName.mid(index+1);
+            QPROCESS_DEBUG_PRINT("qt_create_symbian_process() Process '%s' not found, try stripped version '%s'", qPrintable(programName), qPrintable(strippedName));
+
+            TPtrC stripped_ptr(reinterpret_cast<const TText*>(strippedName.constData()));
+            err = newProc->Create(stripped_ptr, cmdline_ptr);
+
+            if (err != KErrNone) {
+                QPROCESS_DEBUG_PRINT("qt_create_symbian_process() Unable to create process '%s': %d", qPrintable(strippedName), err);
+            }
+        }
+    }
+
+    if (err == KErrNone) {
+        *proc = newProc;
+    } else {
+        delete newProc;
+    }
+
+    return err;
+}
+
+static qint64 qt_native_read(int fd, char *data, qint64 maxlen)
+{
+    qint64 ret = 0;
+    do {
+        ret = ::read(fd, data, maxlen);
+    } while (ret == -1 && errno == EINTR);
+
+    QPROCESS_DEBUG_PRINT("qt_native_read(): fd: %d, result: %d, errno = %d", fd, (int)ret, errno);
+
+    return ret;
+}
+
+static qint64 qt_native_write(int fd, const char *data, qint64 len)
+{
+    qint64 ret = 0;
+    do {
+        ret = ::write(fd, data, len);
+    } while (ret == -1 && errno == EINTR);
+
+    QPROCESS_DEBUG_PRINT("qt_native_write(): fd: %d, result: %d, errno = %d", fd, (int)ret, errno);
+
+    return ret;
+}
+
+static void qt_native_close(int fd)
+{
+    int ret;
+    do {
+        ret = ::close(fd);
+    } while (ret == -1 && errno == EINTR);
+}
+
+static void qt_create_pipe(int *pipe)
+{
+    if (pipe[0] != -1)
+        qt_native_close(pipe[0]);
+    if (pipe[1] != -1)
+        qt_native_close(pipe[1]);
+    if (::pipe(pipe) != 0) {
+        qWarning("QProcessPrivate::createPipe: Cannot create pipe %p: %s",
+                 pipe, qPrintable(qt_error_string(errno)));
+    } else {
+        QPROCESS_DEBUG_PRINT("qt_create_pipe(): Created pipe %d - %d", pipe[0], pipe[1]);
+    }
+}
+
+// Called from ProcessManagerThread
+CProcessActive* CProcessActive::construct(QProcess* process,
+                                          RProcess** proc,
+                                          int serial,
+                                          int deathPipe)
+{
+    QPROCESS_ASSERT((process || proc || *proc),
+        EProcessActiveNullParameter,
+        "CProcessActive::construct(): process (0x%x), proc (0x%x) or *proc == NULL, not creating an instance", process, proc)
+
+    CProcessActive*  newInstance = new CProcessActive();
+
+    if (!newInstance) {
+        QPROCESS_DEBUG_PRINT("CProcessActive::construct(): Failed to create new instance");
+    } else {
+        newInstance->process = process;
+        newInstance->pproc = proc;
+        newInstance->serial = serial;
+        newInstance->deathPipe = deathPipe;
+        newInstance->errorValue = false;
+    }
+
+    return newInstance;
+}
+
+// Called from ProcessManagerThread
+CProcessActive::CProcessActive()
+    : CActive(CActive::EPriorityStandard)
+{
+    // Nothing to do
+}
+
+// Called from ProcessManagerThread
+CProcessActive::~CProcessActive()
+{
+    process = NULL;
+    pproc = NULL;
+}
+
+// Called from ProcessManagerThread
+void CProcessActive::start()
+{
+    if (qt_rprocess_running(*pproc)) {
+        CActiveScheduler::Add(this);
+        (*pproc)->Logon(iStatus);
+        SetActive();
+        QPROCESS_DEBUG_PRINT("CProcessActive::start(): Started monitoring for process exit.");
+    } else {
+        QPROCESS_DEBUG_PRINT("CProcessActive::start(): Process doesn't exist or is already dead");
+        // Assume process has already died
+        qt_native_write(deathPipe, "", 1);
+        errorValue = true;
+    }
+}
+
+// Called from ProcessManagerThread
+void CProcessActive::stop()
+{
+    QPROCESS_DEBUG_PRINT("CProcessActive::stop()");
+
+    // Remove this from scheduler (also cancels the request)
+    Deque();
+}
+
+bool CProcessActive::error()
+{
+    return errorValue;
+}
+
+// Called from ProcessManagerThread
+void CProcessActive::RunL()
+{
+    // If this method gets executed, the monitored process has died
+
+    // Notify main thread
+    qt_native_write(deathPipe, "", 1);
+    QPROCESS_DEBUG_PRINT("CProcessActive::RunL() sending death notice to %d", deathPipe);
+}
+
+// Called from ProcessManagerThread
+TInt CProcessActive::RunError(TInt aError)
+{
+    Q_UNUSED(aError);
+    // Handle RunL leave (should never happen)
+    QPROCESS_ASSERT(0, EProcessActiveRunError, "CProcessActive::RunError(): Should never get here!")
+    return 0;
+}
+
+// Called from ProcessManagerThread
+void CProcessActive::DoCancel()
+{
+    QPROCESS_DEBUG_PRINT("CProcessActive::DoCancel()");
+
+    if (qt_rprocess_running(*pproc)) {
+        (*pproc)->LogonCancel(iStatus);
+        QPROCESS_DEBUG_PRINT("CProcessActive::DoCancel(): Stopped monitoring for process exit.");
+    } else {
+        QPROCESS_DEBUG_PRINT("CProcessActive::DoCancel(): Process doesn't exist");
+    }
+}
+
+
+// Called from ProcessManagerThread
+CProcessManagerMediator* CProcessManagerMediator::construct()
+{
+    CProcessManagerMediator*  newInstance = new CProcessManagerMediator;
+    TInt err(KErrNone);
+
+    newInstance->currentCommand = ENoCommand;
+    newInstance->currentObserver = NULL;
+
+    if (newInstance) {
+        err = newInstance->processManagerThread.Open(newInstance->processManagerThread.Id());
+        QPROCESS_ASSERT((err == KErrNone),
+            EProcessManagerMediatorThreadOpenFailed,
+            "CProcessManagerMediator::construct(): Failed to open processManagerThread (err:%d)", err)
+    } else {
+        QPROCESS_ASSERT(0,
+            EProcessManagerMediatorCreationFailed,
+            "CProcessManagerMediator::construct(): Failed to open construct mediator")
+    }
+
+    // Activate mediator
+    CActiveScheduler::Add(newInstance);
+    newInstance->iStatus = KRequestPending;
+    newInstance->SetActive();
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::construct(): new instance successfully created and activated");
+
+    return newInstance;
+}
+
+// Called from ProcessManagerThread
+CProcessManagerMediator::CProcessManagerMediator()
+    : CActive(CActive::EPriorityStandard)
+{
+    // Nothing to do
+}
+
+// Called from ProcessManagerThread
+CProcessManagerMediator::~CProcessManagerMediator()
+{
+    processManagerThread.Close();
+	currentCommand = ENoCommand;
+    currentObserver = NULL;
+}
+
+// Called from main thread
+bool CProcessManagerMediator::add(CProcessActive* processObserver)
+{
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::add()");
+    return notify(processObserver, EAdd);
+}
+
+// Called from main thread
+void CProcessManagerMediator::remove(CProcessActive* processObserver)
+{
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::remove()");
+    notify(processObserver, ERemove);
+}
+
+// Called from main thread
+void CProcessManagerMediator::terminate()
+{
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::terminate()");
+    notify(NULL, ETerminate);
+}
+
+// Called from main thread
+bool CProcessManagerMediator::notify(CProcessActive* processObserver, Commands command)
+{
+    bool success(true);
+
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::Notify(): Command: %d, processObserver: 0x%x", command, processObserver);
+
+    QPROCESS_ASSERT((command == ETerminate || processObserver),
+        EProcessManagerMediatorNullObserver,
+        "CProcessManagerMediator::Notify(): NULL processObserver not allowed for command: %d", command)
+
+    QPROCESS_ASSERT(IsActive(),
+        EProcessManagerMediatorInactive,
+        "CProcessManagerMediator::Notify(): Mediator is not active!")
+
+    QPROCESS_ASSERT(iStatus==KRequestPending,
+        EProcessManagerMediatorNotPending,
+        "CProcessManagerMediator::Notify(): Mediator request not pending!")
+
+    currentObserver = processObserver;
+    currentCommand = command;
+
+    // Sync with process manager thread
+    TRequestStatus pmStatus;
+    processManagerThread.Rendezvous(pmStatus);
+
+    // Complete request -> RunL will run in the process manager thread
+    TRequestStatus* status = &iStatus;
+    processManagerThread.RequestComplete(status, command);
+
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::Notify(): Waiting process manager to complete...");
+    User::WaitForRequest(pmStatus);
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::Notify(): Wait over");
+
+    if (currentObserver) {
+        success = !(currentObserver->error());
+        QPROCESS_DEBUG_PRINT("CProcessManagerMediator::Notify(): success = %d", success);
+    }
+
+    currentObserver = NULL;
+    currentCommand = ENoCommand;
+
+    return success;
+}
+
+// Called from ProcessManagerThread
+void CProcessManagerMediator::RunL()
+{
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::RunL(): currentCommand: %d, iStatus: %d", currentCommand, iStatus.Int());
+    switch (currentCommand) {
+        case EAdd:
+            currentObserver->start();
+            break;
+        case ERemove:
+            currentObserver->stop();
+            break;
+        case ETerminate:
+            Deque();
+            CActiveScheduler::Stop();
+            return;
+        default:
+            QPROCESS_ASSERT(0,
+                EProcessManagerMediatorInvalidCmd,
+                "CProcessManagerMediator::RunL(): Invalid command!")
+            break;
+    }
+
+    iStatus = KRequestPending;
+    SetActive();
+
+    // Notify main thread that we are done
+    RThread::Rendezvous(KErrNone);
+}
+
+// Called from ProcessManagerThread
+TInt CProcessManagerMediator::RunError(TInt aError)
+{
+    Q_UNUSED(aError);
+    // Handle RunL leave (should never happen)
+    QPROCESS_ASSERT(0,
+        EProcessManagerMediatorRunError,
+        "CProcessManagerMediator::RunError(): Should never get here!")
+    return 0;
+}
+
+// Called from ProcessManagerThread
+void CProcessManagerMediator::DoCancel()
+{
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::DoCancel()");
+    TRequestStatus* status = &iStatus;
+    processManagerThread.RequestComplete(status, KErrCancel);
+}
+
+Q_GLOBAL_STATIC(QProcessManager, processManager)
+
+TInt processManagerThreadFunction(TAny* param)
+{
+    QPROCESS_ASSERT(param,
+        EProcessManagerNullParam,
+        "processManagerThreadFunction(): NULL param")
+
+    QProcessManager* manager = reinterpret_cast<QProcessManager*>(param);
+
+    CActiveScheduler* scheduler = new CQtActiveScheduler();
+
+    QPROCESS_ASSERT(scheduler,
+        EProcessManagerSchedulerCreationFail,
+        "processManagerThreadFunction(): Scheduler creation failed")
+
+    CActiveScheduler::Install(scheduler);
+
+    //Creating mediator also adds it to scheduler and activates it. Failure will panic.
+    manager->setMediator(CProcessManagerMediator::construct());
+    RThread::Rendezvous(KErrNone);
+
+    CActiveScheduler::Start();
+
+    CActiveScheduler::Install(NULL);
+    delete scheduler;
+
+    return KErrNone;
+}
+
+QProcessManager::QProcessManager()
+    : mediator(NULL), threadStarted(false)
+{
+    TInt err = managerMutex.CreateLocal();
+
+    QPROCESS_ASSERT(err == KErrNone,
+        EProcessManagerMutexCreationFail,
+        "QProcessManager::QProcessManager(): Failed to create new managerMutex (err: %d)", err)
+}
+
+QProcessManager::~QProcessManager()
+{
+    QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager()");
+    // Cancel death listening for all child processes
+    if (mediator) {
+        QMap<int, CProcessActive *>::Iterator it = children.begin();
+        while (it != children.end()) {
+            // Remove all monitors
+            CProcessActive *active = it.value();
+            mediator->remove(active);
+
+            QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager() removed listening for a process");
+            ++it;
+        }
+
+        // Terminate process manager thread.
+        mediator->terminate();
+        delete mediator;
+    }
+
+    qDeleteAll(children.values());
+    children.clear();
+	managerThread.Close();
+    managerMutex.Close();
+}
+
+void QProcessManager::startThread()
+{
+    lock();
+
+    if (!threadStarted) {
+        TInt err = managerThread.Create(KQProcessManagerThreadName,
+                                        processManagerThreadFunction,
+                                        0x5000,
+                                        (RAllocator*)NULL,
+                                        (TAny*)this,
+                                        EOwnerProcess);
+
+        QPROCESS_ASSERT(err == KErrNone,
+            EProcessManagerThreadCreationFail,
+            "QProcessManager::startThread(): Failed to create new managerThread (err:%d)", err)
+
+        threadStarted = true;
+
+        // Manager thread must start running before we continue, so sync with rendezvous
+        TRequestStatus status;
+        managerThread.Rendezvous(status);
+        managerThread.Resume();
+        User::WaitForRequest(status);
+    }
+
+    unlock();
+}
+
+static QBasicAtomicInt idCounter = Q_BASIC_ATOMIC_INITIALIZER(1);
+
+bool QProcessManager::add(QProcess *process)
+{
+    QPROCESS_ASSERT(process,
+        EProcessManagerNullParam,
+        "QProcessManager::add(): Failed to add CProcessActive to ProcessManager - NULL process")
+
+    lock();
+
+    int serial = idCounter.fetchAndAddRelaxed(1);
+    process->d_func()->serial = serial;
+
+    QPROCESS_DEBUG_PRINT("QProcessManager::add(): serial: %d, deathPipe: %d - %d, symbianProcess: 0x%x", serial, process->d_func()->deathPipe[0], process->d_func()->deathPipe[1], process->d_func()->symbianProcess);
+
+    CProcessActive* newActive =
+        CProcessActive::construct(process,
+                                  &(process->d_func()->symbianProcess),
+                                  serial,
+                                  process->d_func()->deathPipe[1]);
+
+    if (newActive){
+        if (mediator->add(newActive)) {
+            children.insert(serial, newActive);
+            unlock();
+            return true;
+        } else {
+            QPROCESS_DEBUG_PRINT("QProcessManager::add(): Failed to add CProcessActive to ProcessManager");
+            delete newActive;
+        }
+    }
+
+    unlock();
+
+    return false;
+}
+
+void QProcessManager::remove(QProcess *process)
+{
+    QPROCESS_ASSERT(process,
+        EProcessManagerNullParam,
+        "QProcessManager::remove(): Failed to remove CProcessActive from ProcessManager - NULL process")
+
+    lock();
+
+    int serial = process->d_func()->serial;
+    CProcessActive *active = children.value(serial);
+    if (!active) {
+        unlock();
+        return;
+    }
+
+    mediator->remove(active);
+
+    children.remove(serial);
+    delete active;
+
+    unlock();
+}
+
+void QProcessPrivate::destroyPipe(int *pipe)
+{
+    if (pipe[1] != -1) {
+        qt_native_close(pipe[1]);
+        pipe[1] = -1;
+    }
+    if (pipe[0] != -1) {
+        qt_native_close(pipe[0]);
+        pipe[0] = -1;
+    }
+}
+
+bool QProcessPrivate::createChannel(Channel &channel)
+{
+    Q_UNUSED(channel);
+    // No channels used
+    return false;
+}
+
+void QProcessPrivate::startProcess()
+{
+    Q_Q(QProcess);
+
+    QPROCESS_DEBUG_PRINT("QProcessPrivate::startProcess()");
+
+    // Start the process (platform dependent)
+    q->setProcessState(QProcess::Starting);
+
+    processManager()->startThread();
+
+    qt_create_pipe(deathPipe);
+    if (threadData->eventDispatcher) {
+        deathNotifier = new QSocketNotifier(deathPipe[0],
+                                            QSocketNotifier::Read, q);
+        QObject::connect(deathNotifier, SIGNAL(activated(int)),
+                         q, SLOT(_q_processDied()));
+    }
+
+    TInt err = qt_create_symbian_process(&symbianProcess, program, arguments);
+
+    if (err == KErrNone) {
+        pid = symbianProcess->Id();
+
+        ::fcntl(deathPipe[0], F_SETFL, ::fcntl(deathPipe[0], F_GETFL) | O_NONBLOCK);
+
+        if (!processManager()->add(q)) {
+            qWarning("QProcessPrivate::startProcess(): Failed to start monitoring for process death.");
+            err = KErrNoMemory;
+        }
+    }
+
+    if (err != KErrNone) {
+        // Cleanup, report error and return
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::startProcess() Process open failed, err: %d, '%s'", err, qPrintable(program));
+        q->setProcessState(QProcess::NotRunning);
+        processError = QProcess::FailedToStart;
+        q->setErrorString(QLatin1String(QT_TRANSLATE_NOOP(QProcess, "Resource error (qt_create_symbian_process failure)")));
+        emit q->error(processError);
+        cleanup();
+        return;
+    }
+
+    processLaunched = true;
+
+    symbianProcess->Resume();
+
+    QPROCESS_DEBUG_PRINT("QProcessPrivate::startProcess(): this: 0x%x, pid: %d", this, (TUint)pid);
+
+    // Notify child start
+    _q_startupNotification();
+
+}
+
+bool QProcessPrivate::processStarted()
+{
+    QPROCESS_DEBUG_PRINT("QProcessPrivate::processStarted() == %s", processLaunched ? "true" : "false");
+
+    // Since we cannot get information whether process has actually been launched
+    // or not in Symbian, we need to fake it. Assume process is started if launch was
+    // successful.
+
+    return processLaunched;
+}
+
+qint64 QProcessPrivate::bytesAvailableFromStdout() const
+{
+    // In Symbian, zero bytes are always available
+    return 0;
+}
+
+qint64 QProcessPrivate::bytesAvailableFromStderr() const
+{
+    // In Symbian, zero bytes are always available
+    return 0;
+}
+
+qint64 QProcessPrivate::readFromStdout(char *data, qint64 maxlen)
+{
+    Q_UNUSED(data);
+    Q_UNUSED(maxlen);
+    // In Symbian, zero bytes are always read
+    return 0;
+}
+
+qint64 QProcessPrivate::readFromStderr(char *data, qint64 maxlen)
+{
+    Q_UNUSED(data);
+    Q_UNUSED(maxlen);
+    // In Symbian, zero bytes are always read
+    return 0;
+}
+
+qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen)
+{
+    Q_UNUSED(data);
+    Q_UNUSED(maxlen);
+    // In Symbian, zero bytes are always written
+    return 0;
+}
+
+void QProcessPrivate::terminateProcess()
+{
+    // Not allowed by platform security - will panic kern-exec 46 if process has been started.
+    // Works if process is not yet started.
+    if (qt_rprocess_running(symbianProcess)) {
+        symbianProcess->Terminate(0);
+    } else {
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::terminateProcess(), Process not running");
+    }
+}
+
+void QProcessPrivate::killProcess()
+{
+    // Not allowed by platform security - will panic kern-exec 46 if process has been started.
+    // Works if process is not yet started.
+    if (qt_rprocess_running(symbianProcess)) {
+        symbianProcess->Kill(0);
+    } else {
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::killProcess(), Process not running");
+    }
+}
+
+bool QProcessPrivate::waitForStarted(int msecs)
+{
+    Q_UNUSED(msecs);
+    // Since we can get no actual feedback from process beyond its death,
+    // assume that started has already been emitted if process has been launched
+    return processLaunched;
+}
+
+bool QProcessPrivate::waitForReadyRead(int msecs)
+{
+    // Functionality not supported in Symbian
+    Q_UNUSED(msecs);
+    return false;
+}
+
+bool QProcessPrivate::waitForBytesWritten(int msecs)
+{
+    // Functionality not supported in Symbian
+    Q_UNUSED(msecs);
+    return false;
+}
+
+bool QProcessPrivate::waitForFinished(int msecs)
+{
+    Q_Q(QProcess);
+    QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished(%d)", msecs);
+
+    TRequestStatus timerStatus = 0;
+    TRequestStatus logonStatus = 0;
+    bool timeoutOccurred = false;
+
+    // Logon to process to observe its death
+    if (qt_rprocess_running(symbianProcess)) {
+        symbianProcess->Logon(logonStatus);
+
+        // Create timer
+        RTimer timer;
+        timer.CreateLocal();
+        TTimeIntervalMicroSeconds32 interval(msecs*1000);
+        timer.After(timerStatus, interval);
+
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished() - Waiting...");
+        User::WaitForRequest(logonStatus, timerStatus);
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished() - Wait completed");
+
+        if (timerStatus == KErrNone) {
+            timeoutOccurred = true;
+        }
+
+        timer.Cancel();
+        timer.Close();
+
+        symbianProcess->LogonCancel(logonStatus);
+
+        // Eat cancel request completion so that it won't mess up main thread scheduling later
+        User::WaitForRequest(logonStatus, timerStatus);
+    } else {
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished(), qt_rprocess_running returned false");
+    }
+
+	if (timeoutOccurred) {
+	    processError = QProcess::Timedout;
+	    q->setErrorString(QLatin1String(QT_TRANSLATE_NOOP(QProcess, "Process operation timed out")));
+	    return false;
+	}
+
+    _q_processDied();
+
+    return true;
+}
+
+bool QProcessPrivate::waitForWrite(int msecs)
+{
+    // Functionality not supported in Symbian
+    Q_UNUSED(msecs);
+    return false;
+}
+
+// Deceptively named function. Exit code is actually got in waitForDeadChild().
+void QProcessPrivate::findExitCode()
+{
+    Q_Q(QProcess);
+    processManager()->remove(q);
+}
+
+bool QProcessPrivate::waitForDeadChild()
+{
+    Q_Q(QProcess);
+
+    // read a byte from the death pipe
+    char c;
+    qt_native_read(deathPipe[0], &c, 1);
+
+    if (symbianProcess && symbianProcess->Handle()) {
+        TExitType et = symbianProcess->ExitType();
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForDeadChild() symbianProcess->ExitType: %d", et);
+        if (et != EExitPending) {
+            processManager()->remove(q);
+            exitCode = symbianProcess->ExitReason();
+            crashed = (et == EExitPanic);
+#if defined QPROCESS_DEBUG
+            TExitCategoryName catName = symbianProcess->ExitCategory();
+            qDebug() << "QProcessPrivate::waitForDeadChild() dead with exitCode"
+                     << exitCode << ", crashed:" << crashed
+                     << ", category:" << QString::fromUtf16(catName.Ptr());
+#endif
+        } else {
+            QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForDeadChild() not dead!");
+        }
+    }
+
+    return true;
+}
+
+void QProcessPrivate::_q_notified()
+{
+    // Nothing to do in Symbian
+}
+
+/*! \internal
+ */
+bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory, qint64 *pid)
+{
+    QPROCESS_DEBUG_PRINT("QProcessPrivate::startDetached()");
+    Q_UNUSED(workingDirectory);
+
+    RProcess* newProc = NULL;
+
+    TInt err = qt_create_symbian_process(&newProc, program, arguments);
+
+    if (err == KErrNone) {
+        if (pid) {
+            *pid = (qint64)newProc->Id();
+        }
+
+        newProc->Resume();
+        newProc->Close();
+        return true;
+    }
+
+    return false;
+}
+
+
+void QProcessPrivate::initializeProcessManager()
+{
+    (void) processManager();
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_PROCESS
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 42c57a4ddb..e15fcf2360 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -318,9 +318,8 @@ QResourcePrivate::ensureInitialized() const
     if(path.startsWith(QLatin1Char(':')))
         path = path.mid(1);
 
-    bool found = false;
     if(path.startsWith(QLatin1Char('/'))) {
-        found = that->load(path);
+        that->load(path);
     } else {
         QMutexLocker lock(resourceMutex());
         QStringList searchPaths = *resourceSearchPaths();
@@ -328,7 +327,6 @@ QResourcePrivate::ensureInitialized() const
         for(int i = 0; i < searchPaths.size(); ++i) {
             const QString searchPath(searchPaths.at(i) + QLatin1Char('/') + path);
             if(that->load(searchPath)) {
-                found = true;
                 that->absoluteFilePath = QLatin1Char(':') + searchPath;
                 break;
             }
@@ -390,7 +388,6 @@ QResource::QResource(const QString &file, const QLocale &locale) : d_ptr(new QRe
 */
 QResource::~QResource()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h
index 3c382041c9..0bf9660f8a 100644
--- a/src/corelib/io/qresource.h
+++ b/src/corelib/io/qresource.h
@@ -91,7 +91,7 @@ protected:
     QStringList children() const;
 
 protected:
-    QResourcePrivate *d_ptr;
+    QScopedPointer<QResourcePrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QResource)
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 2a483bc46f..20cd8a71d2 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -1093,10 +1093,10 @@ static QString getPath(QSettings::Format format, QSettings::Scope scope)
     QString homePath = QDir::homePath();
     QString systemPath;
 
-    globalMutex()->lock();
+    QMutexLocker locker(globalMutex());
     PathHash *pathHash = pathHashFunc();
     bool loadSystemPath = pathHash->isEmpty();
-    globalMutex()->unlock();
+    locker.unlock();
 
     if (loadSystemPath) {
         /*
@@ -1108,7 +1108,7 @@ static QString getPath(QSettings::Format format, QSettings::Scope scope)
         systemPath += QLatin1Char('/');
     }
 
-    QMutexLocker locker(globalMutex());
+    locker.relock();
     if (pathHash->isEmpty()) {
         /*
            Lazy initialization of pathHash. We initialize the
@@ -1168,9 +1168,6 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
     int i;
     initFormat();
 
-    for (i = 0; i < NumConfFiles; ++i)
-        confFiles[i] = 0;
-
     QString org = organization;
     if (org.isEmpty()) {
         setStatus(QSettings::AccessError);
@@ -1183,14 +1180,14 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
     if (scope == QSettings::UserScope) {
         QString userPath = getPath(format, QSettings::UserScope);
         if (!application.isEmpty())
-            confFiles[F_User | F_Application] = QConfFile::fromName(userPath + appFile, true);
-        confFiles[F_User | F_Organization] = QConfFile::fromName(userPath + orgFile, true);
+            confFiles[F_User | F_Application].reset(QConfFile::fromName(userPath + appFile, true));
+        confFiles[F_User | F_Organization].reset(QConfFile::fromName(userPath + orgFile, true));
     }
 
     QString systemPath = getPath(format, QSettings::SystemScope);
     if (!application.isEmpty())
-        confFiles[F_System | F_Application] = QConfFile::fromName(systemPath + appFile, false);
-    confFiles[F_System | F_Organization] = QConfFile::fromName(systemPath + orgFile, false);
+        confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
+    confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
 
     for (i = 0; i < NumConfFiles; ++i) {
         if (confFiles[i]) {
@@ -1209,9 +1206,7 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(const QString &fileName,
 {
     initFormat();
 
-    confFiles[0] = QConfFile::fromName(fileName, true);
-    for (int i = 1; i < NumConfFiles; ++i)
-        confFiles[i] = 0;
+    confFiles[0].reset(QConfFile::fromName(fileName, true));
 
     initAccess();
 }
@@ -1228,19 +1223,27 @@ QConfFileSettingsPrivate::~QConfFileSettingsPrivate()
                 usedHash->remove(confFiles[i]->name);
 
             if (confFiles[i]->size == 0) {
-                delete confFiles[i];
+                delete confFiles[i].take();
             } else if (unusedCache) {
-                // compute a better size?
-                unusedCache->insert(confFiles[i]->name, confFiles[i],
+                QT_TRY {
+                    // compute a better size?
+                    unusedCache->insert(confFiles[i]->name, confFiles[i].data(),
                                     10 + (confFiles[i]->originalKeys.size() / 4));
+                    confFiles[i].take();
+                } QT_CATCH(...) {
+                    // out of memory. Do not cache the file.
+                    delete confFiles[i].take();
+                }
             }
         }
+        // prevent the ScopedPointer to deref it again.
+        confFiles[i].take();
     }
 }
 
 void QConfFileSettingsPrivate::remove(const QString &key)
 {
-    QConfFile *confFile = confFiles[spec];
+    QConfFile *confFile = confFiles[spec].data();
     if (!confFile)
         return;
 
@@ -1267,7 +1270,7 @@ void QConfFileSettingsPrivate::remove(const QString &key)
 
 void QConfFileSettingsPrivate::set(const QString &key, const QVariant &value)
 {
-    QConfFile *confFile = confFiles[spec];
+    QConfFile *confFile = confFiles[spec].data();
     if (!confFile)
         return;
 
@@ -1284,7 +1287,7 @@ bool QConfFileSettingsPrivate::get(const QString &key, QVariant *value) const
     bool found = false;
 
     for (int i = 0; i < NumConfFiles; ++i) {
-        if (QConfFile *confFile = confFiles[i]) {
+        if (QConfFile *confFile = confFiles[i].data()) {
             QMutexLocker locker(&confFile->mutex);
 
             if (!confFile->addedKeys.isEmpty()) {
@@ -1319,7 +1322,7 @@ QStringList QConfFileSettingsPrivate::children(const QString &prefix, ChildSpec
     int startPos = prefix.size();
 
     for (int i = 0; i < NumConfFiles; ++i) {
-        if (QConfFile *confFile = confFiles[i]) {
+        if (QConfFile *confFile = confFiles[i].data()) {
             QMutexLocker locker(&confFile->mutex);
 
             if (thePrefix.isEmpty()) {
@@ -1352,7 +1355,7 @@ QStringList QConfFileSettingsPrivate::children(const QString &prefix, ChildSpec
 
 void QConfFileSettingsPrivate::clear()
 {
-    QConfFile *confFile = confFiles[spec];
+    QConfFile *confFile = confFiles[spec].data();
     if (!confFile)
         return;
 
@@ -1368,7 +1371,7 @@ void QConfFileSettingsPrivate::sync()
     // error we just try to go on and make the best of it
 
     for (int i = 0; i < NumConfFiles; ++i) {
-        QConfFile *confFile = confFiles[i];
+        QConfFile *confFile = confFiles[i].data();
         if (confFile) {
             QMutexLocker locker(&confFile->mutex);
             syncConfFile(i);
@@ -1383,7 +1386,7 @@ void QConfFileSettingsPrivate::flush()
 
 QString QConfFileSettingsPrivate::fileName() const
 {
-    QConfFile *confFile = confFiles[spec];
+    QConfFile *confFile = confFiles[spec].data();
     if (!confFile)
         return QString();
     return confFile->name;
@@ -1394,7 +1397,7 @@ bool QConfFileSettingsPrivate::isWritable() const
     if (format > QSettings::IniFormat && !writeFunc)
         return false;
 
-    QConfFile *confFile = confFiles[spec];
+    QConfFile *confFile = confFiles[spec].data();
     if (!confFile)
         return false;
 
@@ -1403,7 +1406,7 @@ bool QConfFileSettingsPrivate::isWritable() const
 
 void QConfFileSettingsPrivate::syncConfFile(int confFileNo)
 {
-    QConfFile *confFile = confFiles[confFileNo];
+    QConfFile *confFile = confFiles[confFileNo].data();
     bool readOnly = confFile->addedKeys.isEmpty() && confFile->removedKeys.isEmpty();
     bool ok;
 
@@ -2738,11 +2741,13 @@ QSettings::QSettings(const QString &fileName, Format format)
 QSettings::~QSettings()
 {
     Q_D(QSettings);
-    if (d->pendingChanges)
-        d->flush();
-#ifdef QT_NO_QOBJECT
-    delete d;
-#endif
+    if (d->pendingChanges) {
+        QT_TRY {
+            d->flush();
+        } QT_CATCH(...) {
+            ; // ok. then don't flush but at least don't throw in the destructor
+        }
+    }
 }
 
 /*!
@@ -3545,8 +3550,7 @@ void QSettings::setPath_helper(Scope scope, const QString &organization, const Q
     QSettingsPrivate *oldPriv = d;
     QSettingsPrivate *newPriv = QSettingsPrivate::create(oldPriv->format, scope, organization, application);
     static_cast<QObjectPrivate &>(*newPriv) = static_cast<QObjectPrivate &>(*oldPriv);  // copy the QObject stuff over (hack)
-    delete oldPriv;
-    d_ptr = newPriv;
+    d_ptr.reset(newPriv);
 }
 
 /*! \fn bool QSettings::writeEntry(const QString &key, bool value)
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h
index cd171beddc..0d382b6671 100644
--- a/src/corelib/io/qsettings.h
+++ b/src/corelib/io/qsettings.h
@@ -78,7 +78,7 @@ class Q_CORE_EXPORT QSettings
 #ifndef QT_NO_QOBJECT
     Q_OBJECT
 #else
-    QSettingsPrivate *d_ptr;
+    QScopedPointer<QSettingsPrivate> d_ptr;
 #endif
     Q_DECLARE_PRIVATE(QSettings)
 
diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h
index 6ca010e51e..a49a063bd9 100644
--- a/src/corelib/io/qsettings_p.h
+++ b/src/corelib/io/qsettings_p.h
@@ -300,7 +300,7 @@ private:
     void ensureAllSectionsParsed(QConfFile *confFile) const;
     void ensureSectionParsed(QConfFile *confFile, const QSettingsKey &key) const;
 
-    QConfFile *confFiles[NumConfFiles];
+    QScopedSharedPointer<QConfFile> confFiles[NumConfFiles];
     QSettings::ReadFunc readFunc;
     QSettings::WriteFunc writeFunc;
     QString extension;
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index e92e729d2e..5dc30c5af1 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -514,6 +514,10 @@ QTemporaryFile::QTemporaryFile()
 {
     Q_D(QTemporaryFile);
     d->templateName = QDir::tempPath() + QLatin1String("/qt_temp.XXXXXX");
+#ifdef Q_OS_SYMBIAN
+    //Just for verify that folder really exist on hardware
+    fileEngine()->mkdir( QDir::tempPath(), true  );
+#endif    
 }
 
 /*!
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index 2acb5109a4..d9f19df1f9 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -1114,9 +1114,6 @@ QTextStream::~QTextStream()
 #endif
     if (!d->writeBuffer.isEmpty())
         d->flushWriteBuffer();
-
-    delete d;
-    d_ptr = 0;
 }
 
 /*!
diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h
index 6d39f7f459..fc4794e14a 100644
--- a/src/corelib/io/qtextstream.h
+++ b/src/corelib/io/qtextstream.h
@@ -46,6 +46,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qchar.h>
 #include <QtCore/qlocale.h>
+#include <QtCore/qscopedpointer.h>
 
 #ifndef QT_NO_TEXTCODEC
 #  ifdef QT3_SUPPORT
@@ -256,7 +257,7 @@ private:
 
     Q_DISABLE_COPY(QTextStream)
 
-    QTextStreamPrivate *d_ptr;
+    QScopedPointer<QTextStreamPrivate> d_ptr;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTextStream::NumberFlags)
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index 3493784666..124b2b386c 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -87,7 +87,7 @@ mac {
 		kernel/qcore_mac.cpp
 }
 
-unix {
+unix:!symbian {
 	SOURCES += \
                 kernel/qcore_unix.cpp \
                 kernel/qcrashhandler.cpp \
@@ -113,6 +113,22 @@ unix {
    contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
 }
 
+symbian {
+	SOURCES += \
+                kernel/qcore_unix.cpp \
+                kernel/qcrashhandler.cpp \
+                kernel/qeventdispatcher_symbian.cpp \
+                kernel/qcore_symbian_p.cpp \
+                kernel/qsharedmemory_symbian.cpp \
+                kernel/qsystemsemaphore_symbian.cpp
+
+	HEADERS += \
+                kernel/qcore_unix_p.h \
+                kernel/qcrashhandler_p.h \
+                kernel/qeventdispatcher_symbian_p.h \
+                kernel/qcore_symbian_p.h
+}
+
 vxworks {
 	SOURCES += \
 		kernel/qfunctions_vxworks.cpp
diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp
new file mode 100644
index 0000000000..a3a85b0787
--- /dev/null
+++ b/src/corelib/kernel/qcore_symbian_p.cpp
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <exception>
+#include <e32base.h>
+#include <e32uid.h>
+#include "qcore_symbian_p.h"
+#include <string>
+
+QT_BEGIN_NAMESPACE
+
+/*
+    Helper function for calling into Symbian classes that expect a TDes&.
+    This function converts a QString to a TDes by allocating memory that
+    must be deleted by the caller.
+*/
+
+Q_CORE_EXPORT HBufC* qt_QString2HBufC(const QString& aString)
+{
+    HBufC *buffer;
+#ifdef QT_NO_UNICODE
+    TPtrC8 ptr(reinterpret_cast<const TUint8*>(aString.toLocal8Bit().constData()));
+#else
+    TPtrC16 ptr(qt_QString2TPtrC(aString));
+#endif
+    buffer = HBufC::New(ptr.Length());
+    Q_CHECK_PTR(buffer);
+    buffer->Des().Copy(ptr);
+    return buffer;
+}
+
+Q_CORE_EXPORT QString qt_TDesC2QStringL(const TDesC& aDescriptor)
+{
+#ifdef QT_NO_UNICODE
+    return QString::fromLocal8Bit(aDescriptor.Ptr(), aDescriptor.Length());
+#else
+    return QString::fromUtf16(aDescriptor.Ptr(), aDescriptor.Length());
+#endif
+}
+
+QHBufC::QHBufC()
+    : m_hBufC(0)
+{
+}
+
+QHBufC::QHBufC(const QHBufC &src)
+{
+    m_hBufC = src.m_hBufC->Alloc();
+    Q_CHECK_PTR(m_hBufC);
+}
+
+/*!
+  \internal
+  Constructs a QHBufC from an HBufC. Note that the QHBufC instance takes
+  ownership of the HBufC.
+*/
+QHBufC::QHBufC(HBufC *src)
+    : m_hBufC(src)
+{
+}
+
+QHBufC::QHBufC(const QString &src)
+{
+    m_hBufC = qt_QString2HBufC(src);
+}
+
+QHBufC::~QHBufC()
+{
+    if (m_hBufC)
+        delete m_hBufC;
+}
+
+class QS60PluginResolver
+{
+public:
+    QS60PluginResolver()
+        : initTried(false) {}
+
+    ~QS60PluginResolver() {
+        lib.Close();
+    }
+
+    TLibraryFunction resolve(int ordinal) {
+        if (!initTried) {
+            init();
+            initTried = true;
+        }
+
+        if (lib.Handle())
+            return lib.Lookup(ordinal);
+        else
+            return reinterpret_cast<TLibraryFunction>(NULL);
+    }
+
+private:
+    void init()
+    {
+#ifdef Q_WS_S60
+        _LIT(KLibName_3_1, "qts60plugin_3_1.dll");
+        _LIT(KLibName_3_2, "qts60plugin_3_2.dll");
+        _LIT(KLibName_5_0, "qts60plugin_5_0.dll");
+        TPtrC libName;
+        TInt uidValue;
+        switch (QSysInfo::s60Version()) {
+        case QSysInfo::SV_S60_3_1:
+            libName.Set(KLibName_3_1);
+            uidValue = 0x2001E620;
+            break;
+        case QSysInfo::SV_S60_3_2:
+            libName.Set(KLibName_3_2);
+            uidValue = 0x2001E621;
+            break;
+        case QSysInfo::SV_S60_5_0: // Fall through to default
+        default:
+            // Default to 5.0 version, as any unknown platform is likely to be newer than that
+            libName.Set(KLibName_5_0);
+            uidValue = 0x2001E622;
+            break;
+        }
+
+        TUidType libUid(KDynamicLibraryUid, KSharedLibraryUid, TUid::Uid(uidValue));
+        lib.Load(libName, libUid);
+#endif
+    }
+
+    RLibrary lib;
+    bool initTried;
+};
+
+Q_GLOBAL_STATIC(QS60PluginResolver, qt_s60_plugin_resolver);
+
+/*!
+  \internal
+  Resolves a platform version specific function from S60 plugin.
+  If plugin is missing or resolving fails for another reason, NULL is returned.
+*/
+Q_CORE_EXPORT TLibraryFunction qt_resolveS60PluginFunc(int ordinal)
+{
+    return qt_s60_plugin_resolver()->resolve(ordinal);
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qcore_symbian_p.h b/src/corelib/kernel/qcore_symbian_p.h
new file mode 100644
index 0000000000..bd8f304040
--- /dev/null
+++ b/src/corelib/kernel/qcore_symbian_p.h
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCORE_SYMBIAN_P_H
+#define QCORE_SYMBIAN_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <e32std.h>
+#include <QtCore/qglobal.h>
+#include <qstring.h>
+#include <qrect.h>
+#include <qhash.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+Q_CORE_EXPORT HBufC* qt_QString2HBufC(const QString& aString);
+
+Q_CORE_EXPORT QString qt_TDesC2QStringL(const TDesC& aDescriptor);
+inline QString qt_TDes2QStringL(const TDes& aDescriptor) { return qt_TDesC2QStringL(aDescriptor); }
+
+static inline QSize qt_TSize2QSize(const TSize& ts)
+{
+    return QSize(ts.iWidth, ts.iHeight);
+}
+
+static inline TSize qt_QSize2TSize(const QSize& qs)
+{
+    return TSize(qs.width(), qs.height());
+}
+
+static inline QRect qt_TRect2QRect(const TRect& tr)
+{
+    return QRect(tr.iTl.iX, tr.iTl.iY, tr.Width(), tr.Height());
+}
+
+static inline TRect qt_QRect2TRect(const QRect& qr)
+{
+    return TRect(TPoint(qr.left(), qr.top()), TSize(qr.width(), qr.height()));
+}
+
+// Returned TPtrC is valid as long as the given parameter is valid and unmodified
+static inline TPtrC qt_QString2TPtrC( const QString& string )
+{
+    return TPtrC16(static_cast<const TUint16*>(string.utf16()), string.length());
+}
+
+class Q_CORE_EXPORT QHBufC
+{
+public:
+    QHBufC();
+    QHBufC(const QHBufC &src);
+    QHBufC(HBufC *src);
+    QHBufC(const QString &src);
+    ~QHBufC();
+
+    inline operator HBufC *() { return m_hBufC; }
+    inline operator const HBufC *() const { return m_hBufC; }
+    inline HBufC *data() { return m_hBufC; }
+    inline const HBufC *data() const { return m_hBufC; }
+    inline HBufC & operator*() { return *m_hBufC; }
+    inline const HBufC & operator*() const { return *m_hBufC; }
+    inline HBufC * operator->() { return m_hBufC; }
+    inline const HBufC * operator->() const { return m_hBufC; }
+
+    inline bool operator==(const QHBufC &param) const { return data() == param.data(); }
+    inline bool operator!=(const QHBufC &param) const { return data() != param.data(); }
+
+private:
+    HBufC *m_hBufC;
+};
+
+inline uint qHash(TUid uid)
+{
+    return qHash(uid.iUid);
+}
+
+// S60 version specific function ordinals that can be resolved
+enum S60PluginFuncOrdinals
+{
+    S60Plugin_TimeFormatL            = 1,
+    S60Plugin_GetTimeFormatSpec      = 2,
+    S60Plugin_GetLongDateFormatSpec  = 3,
+    S60Plugin_GetShortDateFormatSpec = 4,
+    S60Plugin_LocalizedDirectoryName = 5
+};
+
+Q_CORE_EXPORT TLibraryFunction qt_resolveS60PluginFunc(int ordinal);
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif //QCORE_SYMBIAN_P_H
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index 69ebb050fb..e301c924e5 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -290,8 +290,8 @@ static inline int qt_safe_close(int fd)
 #undef QT_CLOSE
 #define QT_CLOSE qt_safe_close
 
-#ifndef Q_OS_VXWORKS // no processes in VxWorks
-
+// Open C does not (yet?) implement these on Symbian OS and VxWorks doesn't have processes
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS)
 static inline int qt_safe_execve(const char *filename, char *const argv[],
                                  char *const envp[])
 {
@@ -313,7 +313,9 @@ static inline int qt_safe_execvp(const char *file, char *const argv[])
     EINTR_LOOP(ret, ::execvp(file, argv));
     return ret;
 }
+#endif
 
+#ifndef Q_OS_VXWORKS // no processes on VxWorks
 static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options)
 {
     register int ret;
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index d0a4943d7e..b84ad5334e 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -63,7 +63,12 @@
 #include <private/qfactoryloader_p.h>
 #include <private/qfunctions_p.h>
 
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_SYMBIAN
+#  include <exception>
+#  include <f32file.h>
+#  include "qeventdispatcher_symbian_p.h"
+#  include "private/qcore_symbian_p.h"
+#elif defined(Q_OS_UNIX)
 #  if !defined(QT_NO_GLIB)
 #    include "qeventdispatcher_glib_p.h"
 #  endif
@@ -90,6 +95,21 @@
 
 QT_BEGIN_NAMESPACE
 
+class QLockedMutexUnlocker
+{
+public:
+    inline explicit QLockedMutexUnlocker(QMutex *m)
+        : mtx(m)
+    { }
+    inline ~QLockedMutexUnlocker() { unlock(); }
+    inline void unlock() { if (mtx) mtx->unlock(); mtx = 0; }
+
+private:
+    Q_DISABLE_COPY(QLockedMutexUnlocker)
+
+    QMutex *mtx;
+};
+
 #if defined(Q_WS_WIN) || defined(Q_WS_MAC)
 extern QString qAppFileName();
 #endif
@@ -161,7 +181,14 @@ void qRemovePostRoutine(QtCleanUpFunction p)
 
 void Q_CORE_EXPORT qt_call_post_routines()
 {
-    QVFuncList *list = postRList();
+    QVFuncList *list = 0;
+    QT_TRY {
+        list = postRList();
+    } QT_CATCH(const std::bad_alloc &) {
+        // ignore - if we can't allocate a post routine list,
+        // there's a high probability that there's no post
+        // routine to be executed :)
+    }
     if (!list)
         return;
     while (!list->isEmpty())
@@ -250,30 +277,34 @@ QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv)
 
 QCoreApplicationPrivate::~QCoreApplicationPrivate()
 {
+    if (threadData) {
 #ifndef QT_NO_THREAD
-    void *data = &threadData->tls;
-    QThreadStorageData::finish((void **)data);
+        void *data = &threadData->tls;
+        QThreadStorageData::finish((void **)data);
 #endif
 
-    // need to clear the state of the mainData, just in case a new QCoreApplication comes along.
-    QMutexLocker locker(&threadData->postEventList.mutex);
-    for (int i = 0; i < threadData->postEventList.size(); ++i) {
-        const QPostEvent &pe = threadData->postEventList.at(i);
-        if (pe.event) {
-            --pe.receiver->d_func()->postedEvents;
-            pe.event->posted = false;
-            delete pe.event;
+        // need to clear the state of the mainData, just in case a new QCoreApplication comes along.
+        QMutexLocker locker(&threadData->postEventList.mutex);
+        for (int i = 0; i < threadData->postEventList.size(); ++i) {
+            const QPostEvent &pe = threadData->postEventList.at(i);
+            if (pe.event) {
+                --pe.receiver->d_func()->postedEvents;
+                pe.event->posted = false;
+                delete pe.event;
+            }
         }
+        threadData->postEventList.clear();
+        threadData->postEventList.recursion = 0;
+        threadData->quitNow = false;
     }
-    threadData->postEventList.clear();
-    threadData->postEventList.recursion = 0;
-    threadData->quitNow = false;
 }
 
 void QCoreApplicationPrivate::createEventDispatcher()
 {
     Q_Q(QCoreApplication);
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_SYMBIAN)
+    eventDispatcher = new QEventDispatcherSymbian(q);
+#elif defined(Q_OS_UNIX)
 #  if !defined(QT_NO_GLIB)
     if (qgetenv("QT_NO_GLIB").isEmpty() && QEventDispatcherGlib::versionSupported())
         eventDispatcher = new QEventDispatcherGlib(q);
@@ -311,6 +342,11 @@ void QCoreApplicationPrivate::checkReceiverThread(QObject *receiver)
     Q_UNUSED(currentThread);
     Q_UNUSED(thr);
 }
+#elif defined(Q_OS_SYMBIAN) && defined (QT_NO_DEBUG)
+// no implementation in release builds, but keep the symbol present
+void QCoreApplicationPrivate::checkReceiverThread(QObject *receiver)
+{
+}
 #endif
 
 void QCoreApplicationPrivate::appendApplicationPathToLibraryPaths()
@@ -318,10 +354,17 @@ void QCoreApplicationPrivate::appendApplicationPathToLibraryPaths()
 #if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     QStringList *app_libpaths = coreappdata()->app_libpaths;
     Q_ASSERT(app_libpaths);
+# if defined(Q_OS_SYMBIAN)
+    QString app_location( QCoreApplication::applicationDirPath() );
+    // File existence check for application's private dir requires additional '\' or
+    // platform security will not allow it.
+    if (app_location !=  QLibraryInfo::location(QLibraryInfo::PluginsPath) && QFile::exists(app_location + QLatin1Char('\\')) && !app_libpaths->contains(app_location))
+# else
     QString app_location( QCoreApplication::applicationFilePath() );
     app_location.truncate(app_location.lastIndexOf(QLatin1Char('/')));
     app_location = QDir(app_location).canonicalPath();
     if (app_location !=  QLibraryInfo::location(QLibraryInfo::PluginsPath) && QFile::exists(app_location) && !app_libpaths->contains(app_location))
+# endif
         app_libpaths->append(app_location);
 #endif
 }
@@ -449,6 +492,13 @@ QCoreApplication::QCoreApplication(int &argc, char **argv)
 {
     init();
     QCoreApplicationPrivate::eventDispatcher->startingUp();
+#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) && defined(Q_OS_SYMBIAN)
+    // Refresh factoryloader, as text codecs are requested during lib path
+    // resolving process and won't be therefore properly loaded.
+    // Unknown if this is symbian specific issue.
+    QFactoryLoader::refreshAll();
+#endif
+
 }
 
 extern void set_winapp_name();
@@ -525,7 +575,14 @@ QCoreApplication::~QCoreApplication()
 #if !defined(QT_NO_THREAD)
 #if !defined(QT_NO_CONCURRENT)
     // Synchronize and stop the global thread pool threads.
-    QThreadPool::globalInstance()->waitForDone();
+    QThreadPool *globalThreadPool = 0;
+    QT_TRY {
+        globalThreadPool = QThreadPool::globalInstance();
+    } QT_CATCH (...) {
+        // swallow the exception, since destructors shouldn't throw
+    }
+    if (globalThreadPool)
+        globalThreadPool->waitForDone();
 #endif
     QThread::cleanup();
 #endif
@@ -621,17 +678,13 @@ bool QCoreApplication::notifyInternal(QObject *receiver, QEvent *event)
     d->inEventHandler = true;
 #endif
 
-#if defined(QT_NO_EXCEPTIONS)
-    bool returnValue = notify(receiver, event);
-#else
     bool returnValue;
-    try {
+    QT_TRY {
         returnValue = notify(receiver, event);
-    } catch(...) {
+    } QT_CATCH (...) {
         --threadData->loopLevel;
-        throw;
+        QT_RETHROW;
     }
-#endif
 
 #ifdef QT_JAMBI_BUILD
     // Restore the previous state if the object was not deleted..
@@ -960,7 +1013,7 @@ void QCoreApplication::exit(int returnCode)
     The event is \e not deleted when the event has been sent. The normal
     approach is to create the event on the stack, for example:
 
-    \snippet doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp 0
+    \snippet doc/src/snippets/code/src.corelib.kernel.qcoreapplication.cpp 0
 
     \sa postEvent(), notify()
 */
@@ -1052,15 +1105,14 @@ void QCoreApplication::postEvent(QObject *receiver, QEvent *event, int priority)
         data->postEventList.mutex.lock();
     }
 
+    QLockedMutexUnlocker locker(&data->postEventList.mutex);
+
     // if this is one of the compressible events, do compression
     if (receiver->d_func()->postedEvents
         && self && self->compressEvent(event, receiver, &data->postEventList)) {
-        data->postEventList.mutex.unlock();
         return;
     }
 
-    event->posted = true;
-    ++receiver->d_func()->postedEvents;
     if (event->type() == QEvent::DeferredDelete && data == QThreadData::current()) {
         // remember the current running eventloop for DeferredDelete
         // events posted in the receiver's thread
@@ -1081,8 +1133,10 @@ void QCoreApplication::postEvent(QObject *receiver, QEvent *event, int priority)
         QPostEventList::iterator at = qUpperBound(begin, end, priority);
         data->postEventList.insert(at, QPostEvent(receiver, event, priority));
     }
+    event->posted = true;
+    ++receiver->d_func()->postedEvents;
     data->canWait = false;
-    data->postEventList.mutex.unlock();
+    locker.unlock();
 
     if (data->eventDispatcher)
         data->eventDispatcher->wakeUp();
@@ -1477,7 +1531,7 @@ bool QCoreApplication::event(QEvent *e)
 
     Example:
 
-    \snippet doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp 1
+    \snippet doc/src/snippets/code/src.corelib.kernel.qcoreapplication.cpp 1
 
     \sa exit(), aboutToQuit(), QApplication::lastWindowClosed()
 */
@@ -1711,6 +1765,10 @@ bool QCoreApplicationPrivate::isTranslatorInstalled(QTranslator *translator)
     function also assumes that the current directory has not been
     changed by the application.
 
+    In Symbian this function will return the application private directory
+    in C-drive, not the path to executable itself, as those are always in
+    /sys/bin.
+
     \sa applicationFilePath()
 */
 QString QCoreApplication::applicationDirPath()
@@ -1722,7 +1780,32 @@ QString QCoreApplication::applicationDirPath()
 
     QCoreApplicationPrivate *d = self->d_func();
     if (d->cachedApplicationDirPath.isNull())
+#if defined(Q_OS_SYMBIAN)
+    {
+        QString appPath;
+        RProcess proc;
+        TInt err = proc.Open(proc.Id());
+        if (err == KErrNone) {
+#if defined(Q_CC_NOKIAX86)
+            // In emulator, always resolve the private dir on C-drive
+            appPath.append(QChar('C'));
+#else
+            appPath.append(QChar((proc.FileName())[0]));
+#endif
+            appPath.append(QLatin1String(":\\private\\"));
+            QString sid;
+            sid.setNum(proc.SecureId().iId, 16);
+            appPath.append(sid);
+            appPath.append(QLatin1Char('\\'));
+            proc.Close();
+        }
+
+        QFileInfo fi(appPath);
+        d->cachedApplicationDirPath = fi.exists() ? fi.canonicalFilePath() : QString();
+    }
+#else
         d->cachedApplicationDirPath = QFileInfo(applicationFilePath()).path();
+#endif
     return d->cachedApplicationDirPath;
 }
 
@@ -1763,7 +1846,20 @@ QString QCoreApplication::applicationFilePath()
         return d->cachedApplicationFilePath;
     }
 #endif
-#if defined( Q_OS_UNIX )
+#if defined(Q_OS_SYMBIAN)
+    QString appPath;
+    RProcess proc;
+    TInt err = proc.Open(proc.Id());
+    if (err == KErrNone) {
+        TFileName procName = proc.FileName();
+        appPath.append(QString(reinterpret_cast<const QChar*>(procName.Ptr()), procName.Length()));
+        proc.Close();
+    }
+
+    d->cachedApplicationFilePath = appPath;
+    return d->cachedApplicationFilePath;
+
+#elif defined( Q_OS_UNIX )
 #  ifdef Q_OS_LINUX
     // Try looking for a /proc/<pid>/exe symlink first which points to
     // the absolute path of the executable
@@ -2055,7 +2151,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMutex, libraryPathMutex, (QMutex::Recursive))
     If you want to iterate over the list, you can use the \l foreach
     pseudo-keyword:
 
-    \snippet doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp 2
+    \snippet doc/src/snippets/code/src.corelib.kernel.qcoreapplication.cpp 2
 
     \sa setLibraryPaths(), addLibraryPath(), removeLibraryPath(), QLibrary,
         {How to Create Qt Plugins}
@@ -2066,12 +2162,37 @@ QStringList QCoreApplication::libraryPaths()
     if (!coreappdata()->app_libpaths) {
         QStringList *app_libpaths = coreappdata()->app_libpaths = new QStringList;
         QString installPathPlugins =  QLibraryInfo::location(QLibraryInfo::PluginsPath);
+#if defined(Q_OS_SYMBIAN)
+        // Add existing path on all drives for relative PluginsPath in Symbian
+        if (installPathPlugins.at(1) != QChar(':')) {
+            QString tempPath = installPathPlugins;
+            if (tempPath.at(tempPath.length()-1) != QChar('\\')) {
+                tempPath += QChar('\\');
+            }
+            RFs fs;
+            TInt err = fs.Connect();
+            if (err == KErrNone) {
+                TPtrC tempPathPtr(reinterpret_cast<const TText*>(tempPath.constData()));
+                TFindFile finder(fs);
+                err = finder.FindByDir(tempPathPtr, tempPathPtr);
+                while (err == KErrNone) {
+                    QString foundDir = QString::fromUtf16(finder.File().Ptr(), finder.File().Length());
+                    foundDir = QDir(foundDir).canonicalPath();
+                    if (!app_libpaths->contains(foundDir))
+                        app_libpaths->append(foundDir);
+                    err = finder.Find();
+                }
+                fs.Close();
+            }
+        }
+#else
         if (QFile::exists(installPathPlugins)) {
             // Make sure we convert from backslashes to slashes.
             installPathPlugins = QDir(installPathPlugins).canonicalPath();
             if (!app_libpaths->contains(installPathPlugins))
                 app_libpaths->append(installPathPlugins);
         }
+#endif
 
         // If QCoreApplication is not yet instantiated,
         // make sure we add the application path when we construct the QCoreApplication
@@ -2079,7 +2200,7 @@ QStringList QCoreApplication::libraryPaths()
 
         const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
         if (!libPathEnv.isEmpty()) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
             QLatin1Char pathSep(';');
 #else
             QLatin1Char pathSep(':');
@@ -2181,7 +2302,7 @@ void QCoreApplication::removeLibraryPath(const QString &path)
     A function with the following signature that can be used as an
     event filter:
 
-    \snippet doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp 3
+    \snippet doc/src/snippets/code/src.corelib.kernel.qcoreapplication.cpp 3
 
     \sa setEventFilter()
 */
@@ -2394,7 +2515,7 @@ int QCoreApplication::loopLevel()
     The function specified by \a ptr should take no arguments and should
     return nothing. For example:
 
-    \snippet doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp 4
+    \snippet doc/src/snippets/code/src.corelib.kernel.qcoreapplication.cpp 4
 
     Note that for an application- or module-wide cleanup,
     qAddPostRoutine() is often not suitable. For example, if the
@@ -2408,7 +2529,7 @@ int QCoreApplication::loopLevel()
     parent-child mechanism to call a cleanup function at the right
     time:
 
-    \snippet doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp 5
+    \snippet doc/src/snippets/code/src.corelib.kernel.qcoreapplication.cpp 5
 
     By selecting the right parent object, this can often be made to
     clean up the module's data at the right moment.
@@ -2422,7 +2543,7 @@ int QCoreApplication::loopLevel()
     translation functions, \c tr() and \c trUtf8(), with these
     signatures:
 
-    \snippet doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp 6
+    \snippet doc/src/snippets/code/src.corelib.kernel.qcoreapplication.cpp 6
 
     This macro is useful if you want to use QObject::tr() or
     QObject::trUtf8() in classes that don't inherit from QObject.
@@ -2431,7 +2552,7 @@ int QCoreApplication::loopLevel()
     class definition (before the first \c{public:} or \c{protected:}).
     For example:
 
-    \snippet doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp 7
+    \snippet doc/src/snippets/code/src.corelib.kernel.qcoreapplication.cpp 7
 
     The \a context parameter is normally the class name, but it can
     be any string.
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 4b8e556947..48e65a733a 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -165,7 +165,7 @@ public:
     virtual bool winEventFilter(MSG *message, long *result);
 #endif
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     static void watchUnixSignal(int signal, bool watch);
 #endif
 
@@ -195,6 +195,8 @@ private:
     void init();
 
     static QCoreApplication *self;
+    
+    Q_DISABLE_COPY(QCoreApplication)
 
     friend class QEventDispatcherUNIXPrivate;
     friend class QApplication;
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index 5dba7c1d70..5765417d56 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -92,7 +92,7 @@ public:
     static void sendPostedEvents(QObject *receiver, int event_type, QThreadData *data);
     static void removePostedEvents_unlocked(QObject *receiver, int type, QThreadData *data);
 
-#if !defined (QT_NO_DEBUG) || defined (QT_MAC_FRAMEWORK_BUILD)
+#if !defined (QT_NO_DEBUG) || defined (QT_MAC_FRAMEWORK_BUILD) || defined (Q_OS_SYMBIAN)
     void checkReceiverThread(QObject *receiver);
 #endif
     int &argc;
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index a682fad977..3cb8fe61b1 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -108,6 +108,7 @@ QT_BEGIN_NAMESPACE
     \value ApplicationLayoutDirectionChange The default application layout direction has changed.
     \value ApplicationPaletteChange         The default application palette has changed.
     \value ApplicationWindowIconChange      The application's icon has changed.
+    \value CloseSoftwareInputPanel          A widget wants to close the software input panel (SIP).
     \value ChildAdded                       An object gets a child (QChildEvent).
     \value ChildInserted                    An object gets a child (QChildEvent). Qt3Support only, use ChildAdded instead.
     \value ChildPolished                    A widget child gets polished (QChildEvent).
@@ -186,6 +187,7 @@ QT_BEGIN_NAMESPACE
     \value Polish                           The widget is polished.
     \value PolishRequest                    The widget should be polished.
     \value QueryWhatsThis                   The widget should accept the event if it has "What's This?" help.
+    \value RequestSoftwareInputPanel        A widget wants to open a software input panel (SIP).
     \value Resize                           Widget's size changed (QResizeEvent).
     \value Shortcut                         Key press in child for shortcut key handling (QShortcutEvent).
     \value ShortcutOverride                 Key press in child, for overriding shortcut key handling (QKeyEvent).
@@ -269,6 +271,7 @@ QT_BEGIN_NAMESPACE
     \omitvalue FutureCallOut
     \omitvalue CocoaRequestModal
     \omitvalue Signal
+    \omitvalue SymbianDeferredFocusChanged
     \omitvalue WinGesture
 */
 
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index 1d86f47315..c361fd5d10 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -278,6 +278,11 @@ public:
 
         WinGesture = 197,
 
+        RequestSoftwareInputPanel = 199,
+        CloseSoftwareInputPanel = 200,
+
+        SymbianDeferredFocusChanged = 201,       // Internal for generating asynchronous focus events on Symbian
+
         // 512 reserved for Qt Jambi's MetaCall event
         // 513 reserved for Qt Jambi's DeleteOnMainThread event
 
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
new file mode 100644
index 0000000000..34a20daf8e
--- /dev/null
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -0,0 +1,996 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qeventdispatcher_symbian_p.h"
+#include <private/qthread_p.h>
+#include <qcoreapplication.h>
+#include <private/qcoreapplication_p.h>
+#include <qdatetime.h>
+
+#include <unistd.h>
+#include <errno.h>
+
+QT_BEGIN_NAMESPACE
+
+#define WAKE_UP_PRIORITY CActive::EPriorityStandard
+#define TIMER_PRIORITY CActive::EPriorityHigh
+#define NULLTIMER_PRIORITY CActive::EPriorityLow
+#define COMPLETE_DEFERRED_ACTIVE_OBJECTS_PRIORITY CActive::EPriorityIdle
+
+static inline int qt_pipe_write(int socket, const char *data, qint64 len)
+{
+	return ::write(socket, data, len);
+}
+#if defined(write)
+# undef write
+#endif
+
+static inline int qt_pipe_close(int socket)
+{
+	return ::close(socket);
+}
+#if defined(close)
+# undef close
+#endif
+
+static inline int qt_pipe_fcntl(int socket, int command)
+{
+	return ::fcntl(socket, command);
+}
+static inline int qt_pipe2_fcntl(int socket, int command, int option)
+{
+	return ::fcntl(socket, command, option);
+}
+#if defined(fcntl)
+# undef fcntl
+#endif
+
+static inline int qt_socket_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout)
+{
+	return ::select(nfds, readfds, writefds, exceptfds, timeout);
+}
+
+// This simply interrupts the select and locks the mutex until destroyed.
+class QSelectMutexGrabber
+{
+public:
+    QSelectMutexGrabber(int fd, QMutex *mutex)
+        : m_mutex(mutex)
+    {
+        if (m_mutex->tryLock())
+            return;
+
+        char dummy = 0;
+        qt_pipe_write(fd, &dummy, 1);
+
+        m_mutex->lock();
+    }
+
+    ~QSelectMutexGrabber()
+    {
+        m_mutex->unlock();
+    }
+
+private:
+    QMutex *m_mutex;
+};
+
+/*
+ * This class is designed to aid in implementing event handling in a more round robin fashion. We
+ * cannot change active objects that we do not own, but the active objects that Qt owns will use
+ * this as a base class with convenience functions.
+ *
+ * Here is how it works: On every RunL, the deriving class should call okToRun(). This will allow
+ * exactly one run of the active object, and mark it as such. If it is called again, it will return
+ * false, and add the object to a queue so it can be run later.
+ *
+ * The QCompleteDeferredAOs class is a special object that runs after all others, which will
+ * reactivate the objects that were previously not run.
+ */
+inline QActiveObject::QActiveObject(TInt priority, QEventDispatcherSymbian *dispatcher)
+    : CActive(priority),
+      m_dispatcher(dispatcher),
+      m_hasAlreadyRun(false),
+      m_hasRunAgain(false),
+      m_iterationCount(1)
+{
+}
+
+QActiveObject::~QActiveObject()
+{
+    if (m_hasRunAgain)
+        m_dispatcher->removeDeferredActiveObject(this);
+}
+
+bool QActiveObject::okToRun()
+{
+    Q_ASSERT(!m_hasRunAgain);
+
+    if (!m_hasAlreadyRun || m_dispatcher->iterationCount() != m_iterationCount) {
+        // First occurrence of this event in this iteration.
+        m_hasAlreadyRun = true;
+        m_iterationCount = m_dispatcher->iterationCount();
+        return true;
+    } else {
+        // The event has already occurred.
+        m_dispatcher->addDeferredActiveObject(this);
+        m_hasRunAgain = true;
+        return false;
+    }
+}
+
+void QActiveObject::reactivateAndComplete()
+{
+    iStatus = KRequestPending;
+    SetActive();
+    TRequestStatus *status = &iStatus;
+    QEventDispatcherSymbian::RequestComplete(status, KErrNone);
+
+    m_hasRunAgain = false;
+    m_hasAlreadyRun = false;
+}
+
+QWakeUpActiveObject::QWakeUpActiveObject(QEventDispatcherSymbian *dispatcher)
+    : CActive(WAKE_UP_PRIORITY),
+      m_dispatcher(dispatcher)
+{
+    CActiveScheduler::Add(this);
+    iStatus = KRequestPending;
+    SetActive();
+}
+
+QWakeUpActiveObject::~QWakeUpActiveObject()
+{
+    Cancel();
+}
+
+void QWakeUpActiveObject::DoCancel()
+{
+    if (iStatus.Int() & KRequestPending) {
+        TRequestStatus *status = &iStatus;
+        QEventDispatcherSymbian::RequestComplete(status, KErrNone);
+    }
+}
+
+void QWakeUpActiveObject::RunL()
+{
+    iStatus = KRequestPending;
+    SetActive();
+    QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(m_dispatcher->wakeUpWasCalled());
+}
+
+QTimerActiveObject::QTimerActiveObject(QEventDispatcherSymbian *dispatcher, SymbianTimerInfo *timerInfo)
+    : QActiveObject((timerInfo->interval) ? TIMER_PRIORITY : NULLTIMER_PRIORITY , dispatcher),
+      m_timerInfo(timerInfo)
+{
+}
+
+QTimerActiveObject::~QTimerActiveObject()
+{
+    Cancel();
+}
+
+void QTimerActiveObject::DoCancel()
+{
+    if (m_timerInfo->interval > 0) {
+        m_rTimer.Cancel();
+        m_rTimer.Close();
+    } else {
+        if (iStatus.Int() & KRequestPending) {
+            TRequestStatus *status = &iStatus;
+            QEventDispatcherSymbian::RequestComplete(status, KErrNone);
+        }
+    }
+}
+
+void QTimerActiveObject::RunL()
+{
+    int error;
+    QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_ERROR(error, Run());
+    if (error < 0) {
+        CActiveScheduler::Current()->Error(error);  // stop and report here, as this timer will be deleted on scope exit
+    }
+}
+
+void QTimerActiveObject::Run()
+{
+    if (!okToRun())
+        return;
+
+    if (m_timerInfo->interval > 0) {
+        // Start a new timer immediately so that we don't lose time.
+        iStatus = KRequestPending;
+        SetActive();
+        m_rTimer.After(iStatus, m_timerInfo->interval*1000);
+
+        m_timerInfo->dispatcher->timerFired(m_timerInfo->timerId);
+    } else {
+        // However, we only complete zero timers after the event has finished,
+        // in order to prevent busy looping when doing nested loops.
+
+        // Keep the refpointer around in order to avoid deletion until the end of this function.
+        SymbianTimerInfoPtr timerInfoPtr(m_timerInfo);
+
+        m_timerInfo->dispatcher->timerFired(m_timerInfo->timerId);
+
+        iStatus = KRequestPending;
+        SetActive();
+        TRequestStatus *status = &iStatus;
+        QEventDispatcherSymbian::RequestComplete(status, KErrNone);
+    }
+}
+
+void QTimerActiveObject::Start()
+{
+    CActiveScheduler::Add(this);
+    if (m_timerInfo->interval > 0) {
+        m_rTimer.CreateLocal();
+        iStatus = KRequestPending;
+        SetActive();
+        m_rTimer.After(iStatus, m_timerInfo->interval*1000);
+    } else {
+        iStatus = KRequestPending;
+        SetActive();
+        TRequestStatus *status = &iStatus;
+        QEventDispatcherSymbian::RequestComplete(status, KErrNone);
+    }
+}
+
+SymbianTimerInfo::~SymbianTimerInfo()
+{
+    delete timerAO;
+}
+
+QCompleteDeferredAOs::QCompleteDeferredAOs(QEventDispatcherSymbian *dispatcher)
+    : CActive(COMPLETE_DEFERRED_ACTIVE_OBJECTS_PRIORITY),
+      m_dispatcher(dispatcher)
+{
+    CActiveScheduler::Add(this);
+    iStatus = KRequestPending;
+    SetActive();
+}
+
+QCompleteDeferredAOs::~QCompleteDeferredAOs()
+{
+    Cancel();
+}
+
+void QCompleteDeferredAOs::complete()
+{
+    if (iStatus.Int() & KRequestPending) {
+        TRequestStatus *status = &iStatus;
+        QEventDispatcherSymbian::RequestComplete(status, KErrNone);
+    }
+}
+
+void QCompleteDeferredAOs::DoCancel()
+{
+    if (iStatus.Int() & KRequestPending) {
+        TRequestStatus *status = &iStatus;
+        QEventDispatcherSymbian::RequestComplete(status, KErrNone);
+    }
+}
+
+void QCompleteDeferredAOs::RunL()
+{
+    iStatus = KRequestPending;
+    SetActive();
+
+    QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(m_dispatcher->reactivateDeferredActiveObjects());
+}
+
+QSelectThread::QSelectThread()
+    : m_quit(false)
+{
+    if (::pipe(m_pipeEnds) != 0) {
+        qWarning("Select thread was unable to open a pipe, errno: %i", errno);
+    } else {
+        int flags0 = qt_pipe_fcntl(m_pipeEnds[0], F_GETFL);
+        int flags1 = qt_pipe_fcntl(m_pipeEnds[1], F_GETFL);
+        // We should check the error code here, but Open C has a bug that returns
+        // failure even though the operation was successful.
+        qt_pipe2_fcntl(m_pipeEnds[0], F_SETFL, flags0 | O_NONBLOCK);
+        qt_pipe2_fcntl(m_pipeEnds[1], F_SETFL, flags1 | O_NONBLOCK);
+    }
+}
+
+QSelectThread::~QSelectThread()
+{
+    qt_pipe_close(m_pipeEnds[1]);
+    qt_pipe_close(m_pipeEnds[0]);
+}
+
+void QSelectThread::run()
+{
+    Q_D(QThread);
+
+    m_mutex.lock();
+
+    while (!m_quit) {
+        fd_set readfds;
+        fd_set writefds;
+        fd_set exceptionfds;
+
+        FD_ZERO(&readfds);
+        FD_ZERO(&writefds);
+        FD_ZERO(&exceptionfds);
+
+        int maxfd = 0;
+        maxfd = qMax(maxfd, updateSocketSet(QSocketNotifier::Read, &readfds));
+        maxfd = qMax(maxfd, updateSocketSet(QSocketNotifier::Write, &writefds));
+        maxfd = qMax(maxfd, updateSocketSet(QSocketNotifier::Exception, &exceptionfds));
+        maxfd = qMax(maxfd, m_pipeEnds[0]);
+        maxfd++;
+
+        FD_SET(m_pipeEnds[0], &readfds);
+
+        int ret;
+        int savedSelectErrno;
+        //do {
+            ret = qt_socket_select(maxfd, &readfds, &writefds, &exceptionfds, 0);
+            savedSelectErrno = errno;
+        //} while (ret == 0);
+
+        char buffer;
+
+        while (::read(m_pipeEnds[0], &buffer, 1) > 0) {}
+
+        if(ret == 0) {
+         // do nothing
+        } else if (ret < 0) {
+            switch (savedSelectErrno) {
+            case EBADF:
+            case EINVAL:
+            case ENOMEM:
+            case EFAULT:
+                qWarning("::select() returned an error: %i", savedSelectErrno);
+                break;
+            case ECONNREFUSED:
+            case EPIPE:
+                qWarning("::select() returned an error: %i (go through sockets)", savedSelectErrno);
+                // prepare to go through all sockets
+                // mark in fd sets both:
+                //     good ones
+                //     ones that return -1 in select
+                // after loop update notifiers for all of them
+
+                // as we dont have "exception" notifier type
+                // we should force monitoring fd_set of this
+                // type as well
+
+                // clean @ start
+                FD_ZERO(&readfds);
+                FD_ZERO(&writefds);
+                FD_ZERO(&exceptionfds);
+                {
+                for (QHash<QSocketNotifier *, TRequestStatus *>::const_iterator i = m_AOStatuses.begin();
+                        i != m_AOStatuses.end(); ++i) {
+
+                    fd_set onefds;
+                    FD_ZERO(&onefds);
+                    FD_SET(i.key()->socket(), &onefds);
+
+                    fd_set excfds;
+                    FD_ZERO(&excfds);
+                    FD_SET(i.key()->socket(), &excfds);
+
+                    maxfd = i.key()->socket() + 1;
+
+                    struct timeval timeout;
+                    timeout.tv_sec = 0;
+                    timeout.tv_usec = 0;
+
+                    ret = 0;
+
+                    if(i.key()->type() == QSocketNotifier::Read) {
+                        ret = ::select(maxfd, &onefds, 0, &excfds, &timeout);
+                        if(ret != 0) FD_SET(i.key()->socket(), &readfds);
+                    } else if(i.key()->type() == QSocketNotifier::Write) {
+                        ret = ::select(maxfd, 0, &onefds, &excfds, &timeout);
+                        if(ret != 0) FD_SET(i.key()->socket(), &writefds);
+                    }
+
+                } // end for
+                }
+
+                // traversed all, so update
+                updateActivatedNotifiers(QSocketNotifier::Read, &readfds);
+                updateActivatedNotifiers(QSocketNotifier::Write, &writefds);
+                updateActivatedNotifiers(QSocketNotifier::Exception, &exceptionfds);
+
+                break;
+            case EINTR: // Should never occur on Symbian, but this is future proof!
+            default:
+                qWarning("::select() returned an unknown error: %i", savedSelectErrno);
+
+                break;
+            }
+        } else {
+            updateActivatedNotifiers(QSocketNotifier::Read, &readfds);
+            updateActivatedNotifiers(QSocketNotifier::Write, &writefds);
+            updateActivatedNotifiers(QSocketNotifier::Exception, &exceptionfds);
+        }
+
+        m_waitCond.wait(&m_mutex);
+    }
+
+    m_mutex.unlock();
+}
+
+void QSelectThread::requestSocketEvents ( QSocketNotifier *notifier, TRequestStatus *status )
+{
+    Q_D(QThread);
+
+    if (!isRunning()) {
+        start();
+    }
+
+    QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex);
+
+    Q_ASSERT(!m_AOStatuses.contains(notifier));
+
+    m_AOStatuses.insert(notifier, status);
+
+    m_waitCond.wakeAll();
+}
+
+void QSelectThread::cancelSocketEvents ( QSocketNotifier *notifier )
+{
+    QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex);
+
+    m_AOStatuses.remove(notifier);
+
+    m_waitCond.wakeAll();
+}
+
+void QSelectThread::restart()
+{
+    QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex);
+
+    m_waitCond.wakeAll();
+}
+
+int QSelectThread::updateSocketSet(QSocketNotifier::Type type, fd_set *fds)
+{
+    int maxfd = 0;
+    if(m_AOStatuses.isEmpty()) {
+        /*
+         * Wonder if should return -1
+         * to signal that no descriptors
+         * added to fds
+        */
+        return maxfd;
+    }
+    for ( QHash<QSocketNotifier *, TRequestStatus *>::const_iterator i = m_AOStatuses.begin();
+            i != m_AOStatuses.end(); ++i) {
+        if (i.key()->type() == type) {
+            FD_SET(i.key()->socket(), fds);
+            maxfd = qMax(maxfd, i.key()->socket());
+        } else if(type == QSocketNotifier::Exception) {
+            /*
+             * We are registering existing sockets
+             * always to exception set
+             *
+             * Doing double FD_SET shouldn't
+             * matter
+             */
+            FD_SET(i.key()->socket(), fds);
+            maxfd = qMax(maxfd, i.key()->socket());
+        }
+    }
+
+    return maxfd;
+}
+
+void QSelectThread::updateActivatedNotifiers(QSocketNotifier::Type type, fd_set *fds)
+{
+    Q_D(QThread);
+    if(m_AOStatuses.isEmpty()) {
+        return;
+    }
+    QList<QSocketNotifier *> toRemove;
+    for (QHash<QSocketNotifier *, TRequestStatus *>::const_iterator i = m_AOStatuses.begin();
+            i != m_AOStatuses.end(); ++i) {
+        if (i.key()->type() == type && FD_ISSET(i.key()->socket(), fds)) {
+            toRemove.append(i.key());
+            TRequestStatus *status = i.value();
+            // Thread data is still owned by the main thread.
+            QEventDispatcherSymbian::RequestComplete(d->threadData->symbian_thread_handle, status, KErrNone);
+        } else if(type == QSocketNotifier::Exception && FD_ISSET(i.key()->socket(), fds)) {
+            /*
+             * check if socket is in exception set
+             * then signal RequestComplete for it
+             */
+            qWarning("exception on %d", i.key()->socket());
+            toRemove.append(i.key());
+            TRequestStatus *status = i.value();
+            QEventDispatcherSymbian::RequestComplete(d->threadData->symbian_thread_handle, status, KErrNone);
+        }
+    }
+
+    for (int c = 0; c < toRemove.size(); ++c) {
+        m_AOStatuses.remove(toRemove[c]);
+    }
+}
+
+void QSelectThread::stop()
+{
+    m_quit = true;
+    restart();
+    wait();
+}
+
+QSocketActiveObject::QSocketActiveObject(QEventDispatcherSymbian *dispatcher, QSocketNotifier *notifier)
+    : QActiveObject(CActive::EPriorityStandard, dispatcher),
+      m_notifier(notifier),
+      m_inSocketEvent(false),
+      m_deleteLater(false)
+{
+    CActiveScheduler::Add(this);
+    iStatus = KRequestPending;
+    SetActive();
+}
+
+QSocketActiveObject::~QSocketActiveObject()
+{
+    Cancel();
+}
+
+void QSocketActiveObject::DoCancel()
+{
+    if (iStatus.Int() & KRequestPending) {
+        TRequestStatus *status = &iStatus;
+        QEventDispatcherSymbian::RequestComplete(status, KErrNone);
+    }
+}
+
+void QSocketActiveObject::RunL()
+{
+    if (!okToRun())
+        return;
+
+    QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(m_dispatcher->socketFired(this));
+}
+
+void QSocketActiveObject::deleteLater()
+{
+    if (m_inSocketEvent) {
+        m_deleteLater = true;
+    } else {
+        delete this;
+    }
+}
+
+QEventDispatcherSymbian::QEventDispatcherSymbian(QObject *parent)
+    : QAbstractEventDispatcher(parent),
+      m_activeScheduler(0),
+      m_wakeUpAO(0),
+      m_completeDeferredAOs(0),
+      m_interrupt(false),
+      m_wakeUpDone(0),
+      m_iterationCount(0),
+      m_noSocketEvents(false)
+{
+}
+
+QEventDispatcherSymbian::~QEventDispatcherSymbian()
+{
+    m_processHandle.Close();
+}
+
+void QEventDispatcherSymbian::startingUp()
+{
+    if( !CActiveScheduler::Current() ) {
+        m_activeScheduler = new(ELeave)CQtActiveScheduler();
+        CActiveScheduler::Install(m_activeScheduler);
+    }
+    m_wakeUpAO = new(ELeave) QWakeUpActiveObject(this);
+    m_completeDeferredAOs = new(ELeave) QCompleteDeferredAOs(this);
+    // We already might have posted events, wakeup once to process them
+    wakeUp();
+}
+
+void QEventDispatcherSymbian::closingDown()
+{
+    if (m_selectThread.isRunning()) {
+        m_selectThread.stop();
+    }
+
+    delete m_completeDeferredAOs;
+    delete m_wakeUpAO;
+    if (m_activeScheduler) {
+        delete m_activeScheduler;
+    }
+}
+
+bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags flags )
+{
+    bool handledAnyEvent = false;
+
+    QT_TRY {
+        Q_D(QAbstractEventDispatcher);
+    
+        // It is safe if this counter overflows. The main importance is that each
+        // iteration count is different from the last.
+        m_iterationCount++;
+
+        RThread &thread = d->threadData->symbian_thread_handle;
+
+        bool block;
+        if (flags & QEventLoop::WaitForMoreEvents) {
+            block = true;
+            emit aboutToBlock();
+        } else {
+            block = false;
+        }
+
+        bool oldNoSocketEventsValue = m_noSocketEvents;
+        if (flags & QEventLoop::ExcludeSocketNotifiers) {
+            m_noSocketEvents = true;
+        } else {
+            m_noSocketEvents = false;
+            handledAnyEvent = sendDeferredSocketEvents();
+        }
+
+        bool handledSymbianEvent = false;
+        m_interrupt = false;
+
+        /*
+         * This QTime variable is used to measure the time it takes to finish
+         * the event loop. If we take too long in the loop, other processes
+         * may be starved and killed. After the first event has completed, we
+         * take the current time, and if the remaining events take longer than
+         * a preset time, we temporarily lower the priority to force a context
+         * switch. For applications that do not take unecessarily long in the
+         * event loop, the priority will not be altered.
+         */
+        QTime time;
+        enum {
+            FirstRun,
+            SubsequentRun,
+            TimeStarted
+        } timeState = FirstRun;
+
+        TProcessPriority priority;
+
+        while (1) {
+            if (block) {
+                // This is where Qt will spend most of its time.
+                CActiveScheduler::Current()->WaitForAnyRequest();
+            } else {
+                if (thread.RequestCount() == 0) {
+                    break;
+                }
+                // This one should return without delay.
+                CActiveScheduler::Current()->WaitForAnyRequest();
+            }
+
+            if (timeState == SubsequentRun) {
+                time.start();
+                timeState = TimeStarted;
+            }
+
+            TInt error;
+            handledSymbianEvent = CActiveScheduler::RunIfReady(error, CActive::EPriorityIdle);
+            if (error) {
+                qWarning("CActiveScheduler::RunIfReady() returned error: %i\n", error);
+                CActiveScheduler::Current()->Error(error);
+            }
+
+            if (!handledSymbianEvent) {
+                qFatal("QEventDispatcherSymbian::processEvents(): Caught Symbian stray signal");
+            }
+            handledAnyEvent = true;
+            if (m_interrupt) {
+                break;
+            }
+            block = false;
+            if (timeState == TimeStarted && time.elapsed() > 100) {
+                priority = m_processHandle.Priority();
+                m_processHandle.SetPriority(EPriorityLow);
+                time.start();
+                // Slight chance of race condition in the next lines, but nothing fatal
+                // will happen, just wrong priority.
+                if (m_processHandle.Priority() == EPriorityLow) {
+                    m_processHandle.SetPriority(priority);
+                }
+            }
+            if (timeState == FirstRun)
+                timeState = SubsequentRun;
+        };
+
+        emit awake();
+
+        m_noSocketEvents = oldNoSocketEventsValue;
+    } QT_CATCH (const std::exception& ex) {
+#ifndef QT_NO_EXCEPTIONS
+        CActiveScheduler::Current()->Error(qt_translateExceptionToSymbianError(ex));
+#endif
+    }
+
+    return handledAnyEvent;
+}
+
+void QEventDispatcherSymbian::timerFired(int timerId)
+{
+    QHash<int, SymbianTimerInfoPtr>::iterator i = m_timerList.find(timerId);
+    if (i == m_timerList.end()) {
+        // The timer has been deleted. Ignore this event.
+        return;
+    }
+
+    SymbianTimerInfoPtr timerInfo = *i;
+
+    // Prevent infinite timer recursion.
+    if (timerInfo->inTimerEvent) {
+        return;
+    }
+
+    timerInfo->inTimerEvent = true;
+
+    QTimerEvent event(timerInfo->timerId);
+    QCoreApplication::sendEvent(timerInfo->receiver, &event);
+
+    timerInfo->inTimerEvent = false;
+
+    return;
+}
+
+void QEventDispatcherSymbian::socketFired(QSocketActiveObject *socketAO)
+{
+    if (m_noSocketEvents) {
+        m_deferredSocketEvents.append(socketAO);
+        return;
+    }
+
+    QEvent e(QEvent::SockAct);
+    socketAO->m_inSocketEvent = true;
+    QCoreApplication::sendEvent(socketAO->m_notifier, &e);
+    socketAO->m_inSocketEvent = false;
+
+    if (socketAO->m_deleteLater) {
+        delete socketAO;
+    } else {
+        socketAO->iStatus = KRequestPending;
+        socketAO->SetActive();
+        reactivateSocketNotifier(socketAO->m_notifier);
+    }
+}
+
+void QEventDispatcherSymbian::wakeUpWasCalled()
+{
+    // The reactivation should happen in RunL, right before the call to this function.
+    // This is because m_wakeUpDone is the "signal" that the object can be completed
+    // once more.
+    // Also, by dispatching the posted events after resetting m_wakeUpDone, we guarantee
+    // that no posted event notification will be lost. If we did it the other way
+    // around, it would be possible for another thread to post an event right after
+    // the sendPostedEvents was done, but before the object was ready to be completed
+    // again. This could deadlock the application if there are no other posted events.
+    m_wakeUpDone.fetchAndStoreOrdered(0);
+    sendPostedEvents();
+}
+
+void QEventDispatcherSymbian::interrupt()
+{
+    m_interrupt = true;
+    wakeUp();
+}
+
+void QEventDispatcherSymbian::wakeUp()
+{
+    Q_D(QAbstractEventDispatcher);
+
+    if (m_wakeUpAO && m_wakeUpDone.testAndSetAcquire(0, 1)) {
+        TRequestStatus *status = &m_wakeUpAO->iStatus;
+        QEventDispatcherSymbian::RequestComplete(d->threadData->symbian_thread_handle, status, KErrNone);
+    }
+}
+
+bool QEventDispatcherSymbian::sendPostedEvents()
+{
+    Q_D(QAbstractEventDispatcher);
+
+    // moveToThread calls this and canWait == true -> Events will never get processed
+    // if we check for d->threadData->canWait
+    //
+    // QCoreApplication::postEvent sets canWait = false, but after the object and events
+    // are moved to a new thread, the canWait in new thread is true i.e. not changed to reflect
+    // the flag on old thread. That's why events in a new thread will not get processed.
+    // This migth be actually bug in moveToThread functionality, but because other platforms
+    // do not check canWait in wakeUp (where we essentially are now) - decided to remove it from
+    // here as well.
+
+    //if (!d->threadData->canWait) {
+        QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
+        return true;
+    //}
+    //return false;
+}
+
+inline void QEventDispatcherSymbian::addDeferredActiveObject(QActiveObject *object)
+{
+    if (m_deferredActiveObjects.isEmpty()) {
+        m_completeDeferredAOs->complete();
+    }
+    m_deferredActiveObjects.append(object);
+}
+
+inline void QEventDispatcherSymbian::removeDeferredActiveObject(QActiveObject *object)
+{
+    m_deferredActiveObjects.removeAll(object);
+}
+
+void QEventDispatcherSymbian::reactivateDeferredActiveObjects()
+{
+    while (!m_deferredActiveObjects.isEmpty()) {
+        QActiveObject *object = m_deferredActiveObjects.takeFirst();
+        object->reactivateAndComplete();
+    }
+
+    // We do this because we want to return from processEvents. This is because
+    // each invocation of processEvents should only run each active object once.
+    // The active scheduler should run them continously, however.
+    m_interrupt = true;
+}
+
+bool QEventDispatcherSymbian::sendDeferredSocketEvents()
+{
+    bool sentAnyEvents = false;
+    while (!m_deferredSocketEvents.isEmpty()) {
+        sentAnyEvents = true;
+        socketFired(m_deferredSocketEvents.takeFirst());
+    }
+
+    return sentAnyEvents;
+}
+
+void QEventDispatcherSymbian::flush()
+{
+}
+
+bool QEventDispatcherSymbian::hasPendingEvents()
+{
+    Q_D(QAbstractEventDispatcher);
+    return (d->threadData->symbian_thread_handle.RequestCount() != 0
+            || !d->threadData->canWait || !m_deferredSocketEvents.isEmpty());
+}
+
+void QEventDispatcherSymbian::registerSocketNotifier ( QSocketNotifier * notifier )
+{
+    QSocketActiveObject *socketAO = new (ELeave) QSocketActiveObject(this, notifier);
+    m_notifiers.insert(notifier, socketAO);
+    m_selectThread.requestSocketEvents(notifier, &socketAO->iStatus);
+}
+
+void QEventDispatcherSymbian::unregisterSocketNotifier ( QSocketNotifier * notifier )
+{
+    m_selectThread.cancelSocketEvents(notifier);
+    if (m_notifiers.contains(notifier)) {
+        QSocketActiveObject *sockObj = *m_notifiers.find(notifier);
+        m_deferredSocketEvents.removeAll(sockObj);
+        sockObj->deleteLater();
+        m_notifiers.remove(notifier);
+    }
+}
+
+void QEventDispatcherSymbian::reactivateSocketNotifier(QSocketNotifier *notifier)
+{
+    m_selectThread.requestSocketEvents(notifier, &m_notifiers[notifier]->iStatus);
+}
+
+void QEventDispatcherSymbian::registerTimer ( int timerId, int interval, QObject * object )
+{
+    if (interval < 0) {
+        qWarning("Timer interval < 0");
+        interval = 0;
+    }
+
+    SymbianTimerInfoPtr timer(new SymbianTimerInfo);
+    timer->timerId      = timerId;
+    timer->interval     = interval;
+    timer->inTimerEvent = false;
+    timer->receiver     = object;
+    timer->dispatcher   = this;
+    timer->timerAO      = new(ELeave) QTimerActiveObject(this, timer.data());
+    m_timerList.insert(timerId, timer);
+
+    timer->timerAO->Start();
+}
+
+bool QEventDispatcherSymbian::unregisterTimer ( int timerId )
+{
+    if (!m_timerList.contains(timerId)) {
+        return false;
+    }
+
+    SymbianTimerInfoPtr timerInfo = m_timerList.take(timerId);
+
+    if (!QObjectPrivate::get(timerInfo->receiver)->inThreadChangeEvent)
+        QAbstractEventDispatcherPrivate::releaseTimerId(timerId);
+
+    return true;
+}
+
+bool QEventDispatcherSymbian::unregisterTimers ( QObject * object )
+{
+    QList<TimerInfo> idsToRemove = registeredTimers(object);
+
+    if (idsToRemove.isEmpty())
+        return false;
+
+    for (int c = 0; c < idsToRemove.size(); ++c) {
+        unregisterTimer(idsToRemove[c].first);
+    }
+
+    return true;
+}
+
+QList<QEventDispatcherSymbian::TimerInfo> QEventDispatcherSymbian::registeredTimers ( QObject * object ) const
+{
+    QList<TimerInfo> list;
+    for (QHash<int, SymbianTimerInfoPtr>::const_iterator i = m_timerList.begin(); i != m_timerList.end(); ++i) {
+        if ((*i)->receiver == object) {
+            list.push_back(TimerInfo((*i)->timerId, (*i)->interval));
+        }
+    }
+
+    return list;
+}
+
+/*
+ * This active scheduler class implements a simple report and continue policy, for Symbian OS leaves
+ * or exceptions from Qt that fall back to the scheduler.
+ * It will be used in cases where there is no existing active scheduler installed.
+ * Apps which link to qts60main.lib will have the UI active scheduler installed in the main thread
+ * instead of this one. But this would be used in other threads in the UI.
+ * An app could replace this behaviour by installing an alternative active scheduler.
+ */
+void CQtActiveScheduler::Error(TInt aError) const
+{
+    QT_TRY {
+        qWarning("Error from active scheduler %d", aError);
+    }
+    QT_CATCH (const std::bad_alloc&) {}    // ignore alloc fails, nothing more can be done
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h
new file mode 100644
index 0000000000..b39d6df224
--- /dev/null
+++ b/src/corelib/kernel/qeventdispatcher_symbian_p.h
@@ -0,0 +1,311 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QEVENTDISPATCHER_SYMBIAN_P_H
+#define QEVENTDISPATCHER_SYMBIAN_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qhash.h>
+#include <qset.h>
+#include <qshareddata.h>
+#include <qabstracteventdispatcher.h>
+#include <private/qabstracteventdispatcher_p.h>
+#include <qthread.h>
+#include <qmutex.h>
+#include <qwaitcondition.h>
+#include <qsocketnotifier.h>
+
+#include <e32base.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+
+QT_BEGIN_NAMESPACE
+
+
+class QEventDispatcherSymbian;
+class QTimerActiveObject;
+
+class QActiveObject : public CActive
+{
+public:
+    QActiveObject(TInt priority, QEventDispatcherSymbian *dispatcher);
+    ~QActiveObject();
+
+    bool okToRun();
+
+    void reactivateAndComplete();
+
+protected:
+    QEventDispatcherSymbian *m_dispatcher;
+
+private:
+    bool m_hasAlreadyRun : 1;
+    bool m_hasRunAgain : 1;
+    int m_iterationCount;
+};
+
+class QWakeUpActiveObject : public CActive
+{
+public:
+    QWakeUpActiveObject(QEventDispatcherSymbian *dispatcher);
+    ~QWakeUpActiveObject();
+
+    void Complete();
+
+protected:
+    void DoCancel();
+    void RunL();
+
+private:
+    QEventDispatcherSymbian *m_dispatcher;
+};
+
+struct SymbianTimerInfo : public QSharedData
+{
+    ~SymbianTimerInfo();
+
+    int timerId;
+    int interval;
+    bool inTimerEvent;
+    QObject *receiver;
+    QTimerActiveObject *timerAO;
+    QEventDispatcherSymbian *dispatcher;
+};
+
+typedef QExplicitlySharedDataPointer<SymbianTimerInfo> SymbianTimerInfoPtr;
+
+// This is a bit of a proxy class. See comments in SetActive and Start for details.
+class QTimerActiveObject : public QActiveObject
+{
+public:
+    QTimerActiveObject(QEventDispatcherSymbian *dispatcher, SymbianTimerInfo *timerInfo);
+    ~QTimerActiveObject();
+
+    void Start();
+
+protected:
+    void DoCancel();
+    void RunL();
+
+private:
+    void Run();
+
+private:
+    SymbianTimerInfo *m_timerInfo;
+    RTimer m_rTimer;
+};
+
+class QCompleteDeferredAOs : public CActive
+{
+public:
+    QCompleteDeferredAOs(QEventDispatcherSymbian *dispatcher);
+    ~QCompleteDeferredAOs();
+
+    void complete();
+
+protected:
+    void DoCancel();
+    void RunL();
+
+private:
+    QEventDispatcherSymbian *m_dispatcher;
+};
+
+class QSocketActiveObject : public QActiveObject
+{
+public:
+    QSocketActiveObject(QEventDispatcherSymbian *dispatcher, QSocketNotifier *notifier);
+    ~QSocketActiveObject();
+
+    void deleteLater();
+
+protected:
+    void DoCancel();
+    void RunL();
+
+private:
+    QSocketNotifier *m_notifier;
+    bool m_inSocketEvent;
+    bool m_deleteLater;
+
+    friend class QEventDispatcherSymbian;
+};
+
+class QSelectThread : public QThread
+{
+    Q_DECLARE_PRIVATE(QThread)
+
+public:
+    QSelectThread();
+    ~QSelectThread();
+
+    void requestSocketEvents ( QSocketNotifier *notifier, TRequestStatus *status );
+    void cancelSocketEvents ( QSocketNotifier *notifier );
+    void restart();
+    void stop();
+
+protected:
+    void run();
+
+private:
+    int updateSocketSet(QSocketNotifier::Type type, fd_set *fds);
+    void updateActivatedNotifiers(QSocketNotifier::Type type, fd_set *fds);
+
+private:
+    int m_pipeEnds[2];
+    QHash<QSocketNotifier *, TRequestStatus *> m_AOStatuses;
+    QMutex m_mutex;
+    QWaitCondition m_waitCond;
+    bool m_quit;
+};
+
+class Q_CORE_EXPORT CQtActiveScheduler : public CActiveScheduler
+{
+public: // from CActiveScheduler
+    virtual void Error(TInt aError) const;
+};
+
+class Q_CORE_EXPORT QEventDispatcherSymbian : public QAbstractEventDispatcher
+{
+    Q_DECLARE_PRIVATE(QAbstractEventDispatcher)
+
+public:
+    QEventDispatcherSymbian(QObject *parent = 0);
+    ~QEventDispatcherSymbian();
+
+    void flush();
+    bool hasPendingEvents();
+    void interrupt();
+    bool processEvents ( QEventLoop::ProcessEventsFlags flags );
+    void registerSocketNotifier ( QSocketNotifier * notifier );
+    void registerTimer ( int timerId, int interval, QObject * object );
+    QList<TimerInfo> registeredTimers ( QObject * object ) const;
+    void unregisterSocketNotifier ( QSocketNotifier * notifier );
+    bool unregisterTimer ( int timerId );
+    bool unregisterTimers ( QObject * object );
+    void wakeUp();
+
+    void startingUp();
+    void closingDown();
+
+    void timerFired(int timerId);
+    void socketFired(QSocketActiveObject *socketAO);
+    void wakeUpWasCalled();
+    void reactivateSocketNotifier(QSocketNotifier *notifier);
+
+    void addDeferredActiveObject(QActiveObject *object);
+    void removeDeferredActiveObject(QActiveObject *object);
+    void reactivateDeferredActiveObjects();
+
+    inline int iterationCount() const { return m_iterationCount; }
+
+    static void RequestComplete(TRequestStatus *&status, TInt reason);
+    static void RequestComplete(RThread &threadHandle, TRequestStatus *&status, TInt reason);
+
+private:
+    bool sendPostedEvents();
+    bool sendDeferredSocketEvents();
+
+private:
+    QSelectThread m_selectThread;
+
+    CQtActiveScheduler *m_activeScheduler;
+
+    QHash<int, SymbianTimerInfoPtr> m_timerList;
+    QHash<QSocketNotifier *, QSocketActiveObject *> m_notifiers;
+
+    QWakeUpActiveObject *m_wakeUpAO;
+    QCompleteDeferredAOs *m_completeDeferredAOs;
+
+    volatile bool m_interrupt;
+    QAtomicInt m_wakeUpDone;
+
+    unsigned char m_iterationCount;
+    bool m_noSocketEvents;
+    QList<QSocketActiveObject *> m_deferredSocketEvents;
+
+    QList<QActiveObject *> m_deferredActiveObjects;
+
+    RProcess m_processHandle;
+};
+
+#ifdef QT_DEBUG
+// EActive is defined to 1 and ERequestPending to 2, but they are both private.
+// A little dangerous to rely on, but it is only for debugging.
+# define REQUEST_STATUS_ACTIVE_AND_PENDING 3
+# define VERIFY_PENDING_REQUEST_STATUS \
+    Q_ASSERT(status->Int() & REQUEST_STATUS_ACTIVE_AND_PENDING == REQUEST_STATUS_ACTIVE_AND_PENDING);
+#else
+# define REQUEST_STATUS_ACTIVE_AND_PENDING
+# define VERIFY_PENDING_REQUEST_STATUS
+#endif
+
+// Convenience functions for doing some sanity checking on our own complete code.
+// Unless QT_DEBUG is defined, it is exactly equivalent to the Symbian version.
+inline void QEventDispatcherSymbian::RequestComplete(TRequestStatus *&status, TInt reason)
+{
+    VERIFY_PENDING_REQUEST_STATUS
+    User::RequestComplete(status, reason);
+}
+inline void QEventDispatcherSymbian::RequestComplete(RThread &threadHandle, TRequestStatus *&status, TInt reason)
+{
+    VERIFY_PENDING_REQUEST_STATUS
+    threadHandle.RequestComplete(status, reason);
+}
+
+#undef REQUEST_STATUS_ACTIVE_AND_PENDING
+#undef VERIFY_PENDING_REQUEST_STATUS
+
+QT_END_NAMESPACE
+
+#endif // QEVENTDISPATCHER_SYMBIAN_P_H
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 7982d4cb7a..78a2b0be51 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -232,7 +232,7 @@ int QEventDispatcherUNIXPrivate::doSelect(QEventLoop::ProcessEventsFlags flags,
                     continue;
 
                 for (int i = 0; i < list.size(); ++i) {
-                    QSockNot *sn = list.at(i);
+                    QSockNot *sn = list[i];
 
                     FD_ZERO(&fdset);
                     FD_SET(sn->fd, &fdset);
@@ -295,7 +295,7 @@ int QEventDispatcherUNIXPrivate::doSelect(QEventLoop::ProcessEventsFlags flags,
         for (int i=0; i<3; i++) {
             QSockNotType::List &list = sn_vec[i].list;
             for (int j = 0; j < list.size(); ++j) {
-                QSockNot *sn = list.at(j);
+                QSockNot *sn = list[j];
                 if (FD_ISSET(sn->fd, &sn_vec[i].select_fds))
                     q->setSocketNotifierPending(sn->obj);
             }
@@ -622,7 +622,10 @@ QEventDispatcherUNIX::QEventDispatcherUNIX(QEventDispatcherUNIXPrivate &dd, QObj
 { }
 
 QEventDispatcherUNIX::~QEventDispatcherUNIX()
-{ }
+{
+    Q_D(QEventDispatcherUNIX);
+    d->threadData->eventDispatcher = 0;
+}
 
 int QEventDispatcherUNIX::select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
                                  timeval *timeout)
@@ -711,8 +714,8 @@ QSockNotType::QSockNotType()
 
 QSockNotType::~QSockNotType()
 {
-    while (!list.isEmpty())
-        delete list.takeFirst();
+    for (int i = 0; i < list.size(); ++i)
+        delete list[i];
 }
 
 /*****************************************************************************
@@ -748,7 +751,7 @@ void QEventDispatcherUNIX::registerSocketNotifier(QSocketNotifier *notifier)
 
     int i;
     for (i = 0; i < list.size(); ++i) {
-        QSockNot *p = list.at(i);
+        QSockNot *p = list[i];
         if (p->fd < sockfd)
             break;
         if (p->fd == sockfd) {
@@ -786,7 +789,7 @@ void QEventDispatcherUNIX::unregisterSocketNotifier(QSocketNotifier *notifier)
     QSockNot *sn = 0;
     int i;
     for (i = 0; i < list.size(); ++i) {
-        sn = list.at(i);
+        sn = list[i];
         if(sn->obj == notifier && sn->fd == sockfd)
             break;
     }
@@ -804,7 +807,7 @@ void QEventDispatcherUNIX::unregisterSocketNotifier(QSocketNotifier *notifier)
         for (int i=0; i<3; i++) {
             if (!d->sn_vec[i].list.isEmpty())
                 d->sn_highest = qMax(d->sn_highest,  // list is fd-sorted
-                                     d->sn_vec[i].list.first()->fd);
+                                     d->sn_vec[i].list[0]->fd);
         }
     }
 }
@@ -828,7 +831,7 @@ void QEventDispatcherUNIX::setSocketNotifierPending(QSocketNotifier *notifier)
     QSockNot *sn = 0;
     int i;
     for (i = 0; i < list.size(); ++i) {
-        sn = list.at(i);
+        sn = list[i];
         if(sn->obj == notifier && sn->fd == sockfd)
             break;
     }
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h
index 5e016d3767..a52af009da 100644
--- a/src/corelib/kernel/qeventdispatcher_unix_p.h
+++ b/src/corelib/kernel/qeventdispatcher_unix_p.h
@@ -58,6 +58,7 @@
 #include "private/qabstracteventdispatcher_p.h"
 #include "private/qcore_unix_p.h"
 #include "private/qpodlist_p.h"
+#include "QtCore/qvarlengtharray.h"
 
 #if defined(Q_OS_VXWORKS)
 #  include <sys/times.h>
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 7bf209a3b0..e8492276b5 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -375,7 +375,9 @@ void QMetaObject::removeGuard(QObject **ptr)
     if (!*ptr)
         return;
     GuardHash *hash = guardHash();
-    if (!hash)
+    /* check that the hash is empty - otherwise we might detach
+       the shared_null hash, which will alloc, which is not nice */
+    if (!hash || hash->isEmpty())
         return;
     QMutexLocker locker(guardHashLock());
     GuardHash::iterator it = hash->find(*ptr);
@@ -446,9 +448,20 @@ void QObjectPrivate::clearGuards(QObject *object)
 
     if (!priv->hasGuards)
         return;
-    GuardHash *hash = guardHash();
-    if (hash) {
-        QMutexLocker locker(guardHashLock());
+
+    GuardHash *hash = 0;
+    QMutex *mutex = 0;
+    QT_TRY {
+        hash = guardHash();
+        mutex = guardHashLock();
+    } QT_CATCH(const std::bad_alloc &) {
+        // do nothing in case of OOM - code below is safe
+    }
+
+    /* check that the hash is empty - otherwise we might detach
+       the shared_null hash, which will alloc, which is not nice */
+    if (hash && !hash->isEmpty()) {
+        QMutexLocker locker(mutex);
         GuardHash::iterator it = hash->find(object);
         const GuardHash::iterator end = hash->end();
         while (it.key() == object && it != end) {
@@ -766,7 +779,14 @@ QObject::~QObject()
         QObjectPrivate::clearGuards(this);
     }
 
-    emit destroyed(this);
+    QT_TRY {
+        emit destroyed(this);
+    } QT_CATCH(...) {
+        // all the signal/slots connections are still in place - if we don't
+        // quit now, we will crash pretty soon.
+        qWarning("Detected an unexpected exception in ~QObject while emitting destroyed().");
+        QT_RETHROW;
+    }
 
     {
         QMutexLocker locker(signalSlotLock(this));
@@ -873,9 +893,6 @@ QObject::~QObject()
                  objectName().isNull() ? "unnamed" : qPrintable(objectName()));
     }
 #endif
-
-    delete d;
-    d_ptr = 0;
 }
 
 QObjectPrivate::Connection::~Connection()
@@ -1124,11 +1141,11 @@ bool QObject::event(QEvent *e)
 #if defined(QT_NO_EXCEPTIONS)
             mce->placeMetaCall(this);
 #else
-            try {
+            QT_TRY {
                 mce->placeMetaCall(this);
-            } catch (...) {
+            } QT_CATCH(...) {
                 QObjectPrivate::resetCurrentSender(this, &currentSender, previousSender);
-                throw;
+                QT_RETHROW;
             }
 #endif
             QObjectPrivate::resetCurrentSender(this, &currentSender, previousSender);
@@ -1421,8 +1438,10 @@ void QObjectPrivate::setThreadData_helper(QThreadData *currentData, QThreadData
             ++eventsMoved;
         }
     }
-    if (eventsMoved > 0 && targetData->eventDispatcher)
+    if (eventsMoved > 0 && targetData->eventDispatcher) {
+        targetData->canWait = false;
         targetData->eventDispatcher->wakeUp();
+    }
 
     // the current emitting thread shouldn't restore currentSender after calling moveToThread()
     if (currentSender)
@@ -3170,9 +3189,9 @@ void QMetaObject::activate(QObject *sender, int from_signal_index, int to_signal
 #if defined(QT_NO_EXCEPTIONS)
             metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv ? argv : empty_argv);
 #else
-            try {
+            QT_TRY {
                 metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv ? argv : empty_argv);
-            } catch (...) {
+            } QT_CATCH(...) {
                 locker.relock();
 
                 QObjectPrivate::resetCurrentSender(receiver, &currentSender, previousSender);
@@ -3181,7 +3200,7 @@ void QMetaObject::activate(QObject *sender, int from_signal_index, int to_signal
                 Q_ASSERT(connectionLists->inUse >= 0);
                 if (connectionLists->orphaned && !connectionLists->inUse)
                     delete connectionLists;
-                throw;
+                QT_RETHROW;
             }
 #endif
 
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index 9169a90c6f..a9f005b5e2 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -51,6 +51,7 @@
 #ifdef QT_INCLUDE_COMPAT
 #include <QtCore/qcoreevent.h>
 #endif
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -288,7 +289,7 @@ protected:
     QObject(QObjectPrivate &dd, QObject *parent = 0);
 
 protected:
-    QObjectData *d_ptr;
+    QScopedPointer<QObjectData> d_ptr;
 
     static const QMetaObject staticQtMetaObject;
 
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp
index 9f4bbea766..eab8b2033f 100644
--- a/src/corelib/kernel/qsharedmemory.cpp
+++ b/src/corelib/kernel/qsharedmemory.cpp
@@ -44,7 +44,9 @@
 #include "qsystemsemaphore.h"
 #include <qdir.h>
 #include <qcryptographichash.h>
-
+#ifdef Q_OS_SYMBIAN
+#include <e32const.h>
+#endif
 #include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
@@ -57,6 +59,7 @@ QT_BEGIN_NAMESPACE
     the subset that the win/unix kernel allows.
 
     On Unix this will be a file name
+    On Symbian key will be truncated to 80 characters
   */
 QString
 QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
@@ -70,10 +73,12 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
     QString part1 = key;
     part1.replace(QRegExp(QLatin1String("[^A-Za-z]")), QString());
     result.append(part1);
+#ifdef Q_OS_SYMBIAN
+    return result.left(KMaxKernelName);
+#endif
 
     QByteArray hex = QCryptographicHash::hash(key.toUtf8(), QCryptographicHash::Sha1).toHex();
     result.append(QLatin1String(hex));
-
 #ifdef Q_OS_WIN
     return result;
 #else
@@ -118,6 +123,14 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
   process. This means that QSharedMemory should not be used across
   multiple threads in the same process in HP-UX.
 
+  \o Symbian: QSharedMemory does not "own" the shared memory segment.
+  When all threads or processes that have an instance of QSharedMemory
+  attached to a particular shared memory segment have either destroyed
+  their instance of QSharedMemory or exited, the Symbian kernel
+  releases the shared memory segment automatically.
+  Also, access to a shared memory segment cannot be limited to read-only
+  in Symbian.
+
   \endlist
 
   Remember to lock the shared memory with lock() before reading from
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
index 4266e54dd0..01beffff23 100644
--- a/src/corelib/kernel/qsharedmemory_p.h
+++ b/src/corelib/kernel/qsharedmemory_p.h
@@ -71,6 +71,9 @@ namespace QSharedMemoryPrivate
 
 #ifdef Q_OS_WIN
 #include <qt_windows.h>
+#elif defined(Q_OS_SYMBIAN)
+#include <e32std.h>
+#include <sys/types.h>
 #else
 #include <sys/sem.h>
 #endif
@@ -140,7 +143,11 @@ public:
     bool attach(QSharedMemory::AccessMode mode);
     bool detach();
 
+#ifdef Q_OS_SYMBIAN
+    void setErrorString(const QString &function, TInt errorCode);
+#else
     void setErrorString(const QString &function);
+#endif
 
 #ifndef QT_NO_SYSTEMSEMAPHORE
     bool tryLocker(QSharedMemoryLocker *locker, const QString function) {
@@ -156,6 +163,8 @@ public:
 private:
 #ifdef Q_OS_WIN
     HANDLE hand;
+#elif defined(Q_OS_SYMBIAN)
+    RChunk chunk;
 #else
     key_t unix_key;
 #endif
diff --git a/src/corelib/kernel/qsharedmemory_symbian.cpp b/src/corelib/kernel/qsharedmemory_symbian.cpp
new file mode 100644
index 0000000000..ffa363f113
--- /dev/null
+++ b/src/corelib/kernel/qsharedmemory_symbian.cpp
@@ -0,0 +1,176 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qsharedmemory.h"
+#include "qsharedmemory_p.h"
+#include "qsystemsemaphore.h"
+#include "qcore_symbian_p.h"
+#include <qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_SHAREDMEMORY
+
+#define QSHAREDMEMORY_DEBUG
+
+QSharedMemoryPrivate::QSharedMemoryPrivate() : QObjectPrivate(),
+        memory(0), size(0), error(QSharedMemory::NoError),
+           systemSemaphore(QString()), lockedByMe(false)
+{
+}
+
+void QSharedMemoryPrivate::setErrorString(const QString &function, TInt errorCode)
+{
+    if (errorCode == KErrNone)
+        return;
+    switch (errorCode) {
+    case KErrAlreadyExists:
+        error = QSharedMemory::AlreadyExists;
+        errorString = QSharedMemory::tr("%1: already exists").arg(function);
+    break;
+    case KErrNotFound:
+        error = QSharedMemory::NotFound;
+        errorString = QSharedMemory::tr("%1: doesn't exists").arg(function);
+        break;
+    case KErrArgument:
+        error = QSharedMemory::InvalidSize;
+        errorString = QSharedMemory::tr("%1: invalid size").arg(function);
+        break;
+    case KErrNoMemory:
+        error = QSharedMemory::OutOfResources;
+        errorString = QSharedMemory::tr("%1: out of resources").arg(function);
+        break;
+    case KErrPermissionDenied:
+        error = QSharedMemory::PermissionDenied;
+        errorString = QSharedMemory::tr("%1: permission denied").arg(function);
+        break;
+    default:
+        errorString = QSharedMemory::tr("%1: unknown error %2").arg(function).arg(errorCode);
+        error = QSharedMemory::UnknownError;
+#if defined QSHAREDMEMORY_DEBUG
+        qDebug() << errorString << "key" << key;
+#endif
+    }
+}
+
+key_t QSharedMemoryPrivate::handle()
+{
+    // Not really cost effective to check here if shared memory is attachable, as it requires
+    // exactly the same call as attaching, so always assume handle is valid and return failure
+    // from attach.
+    return 1;
+}
+
+bool QSharedMemoryPrivate::cleanHandle()
+{
+    chunk.Close();
+    return true;
+}
+
+bool QSharedMemoryPrivate::create(int size)
+{
+    // Get a windows acceptable key
+    QString safeKey = makePlatformSafeKey(key);
+    QString function = QLatin1String("QSharedMemory::create");
+    if (safeKey.isEmpty()) {
+        error = QSharedMemory::KeyError;
+        errorString = QSharedMemory::tr("%1: key error").arg(function);
+        return false;
+    }
+
+    TPtrC ptr(qt_QString2TPtrC(safeKey));
+
+    TInt err = chunk.CreateGlobal(ptr, size, size);
+
+    setErrorString(function, err);
+
+    if (err != KErrNone)
+        return false;
+
+    // Zero out the created chunk
+    Mem::FillZ(chunk.Base(), chunk.Size());
+
+    return true;
+}
+
+bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode /* mode */)
+{
+    // Grab a pointer to the memory block
+    if (!chunk.Handle()) {
+        QString function = QLatin1String("QSharedMemory::handle");
+        QString safeKey = makePlatformSafeKey(key);
+        if (safeKey.isEmpty()) {
+            error = QSharedMemory::KeyError;
+            errorString = QSharedMemory::tr("%1: unable to make key").arg(function);
+            return false;
+        }
+
+        TPtrC ptr(qt_QString2TPtrC(safeKey));
+
+        TInt err = KErrNoMemory;
+
+        err = chunk.OpenGlobal(ptr, false);
+
+        if (err != KErrNone) {
+            setErrorString(function, err);
+            return false;
+        }
+    }
+
+    size = chunk.Size();
+    memory = chunk.Base();
+
+    return true;
+}
+
+bool QSharedMemoryPrivate::detach()
+{
+    chunk.Close();
+
+    memory = 0;
+    size = 0;
+
+    return true;
+}
+
+#endif //QT_NO_SHAREDMEMORY
+
+QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index 05369c404d..61f77276e2 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -48,9 +48,6 @@
 #include <qdebug.h>
 
 #include <errno.h>
-
-#ifndef QT_NO_SHAREDMEMORY
-
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
diff --git a/src/corelib/kernel/qsystemsemaphore.cpp b/src/corelib/kernel/qsystemsemaphore.cpp
index da08c89a1c..fa3c3ea1ee 100644
--- a/src/corelib/kernel/qsystemsemaphore.cpp
+++ b/src/corelib/kernel/qsystemsemaphore.cpp
@@ -123,6 +123,11 @@ QT_BEGIN_NAMESPACE
   operations that were not released. Thus if the process acquires a
   resource and then exits without releasing it, Unix will release that
   resource.
+
+  \o Symbian: QSystemSemaphore behaves the same as Windows semaphores.
+  In other words, the operating system owns the semaphore and ignores
+  QSystemSemaphore::AccessMode.
+
   \endlist
 
   \sa QSharedMemory, QSemaphore
@@ -147,7 +152,7 @@ QT_BEGIN_NAMESPACE
   creates a new semaphore for that key and sets its resource count to
   \a initialValue.
 
-  In Windows, \a mode is ignored, and the system always tries to
+  In Windows and in Symbian, \a mode is ignored, and the system always tries to
   create a semaphore for the specified \a key. If the system does not
   already have a semaphore identified as \a key, it creates the
   semaphore and sets its resource count to \a initialValue. But if the
@@ -165,8 +170,8 @@ QT_BEGIN_NAMESPACE
   \sa acquire(), key()
  */
 QSystemSemaphore::QSystemSemaphore(const QString &key, int initialValue, AccessMode mode)
+    : d(new QSystemSemaphorePrivate)
 {
-    d = new QSystemSemaphorePrivate;
     setKey(key, initialValue, mode);
 }
 
@@ -188,7 +193,6 @@ QSystemSemaphore::QSystemSemaphore(const QString &key, int initialValue, AccessM
 QSystemSemaphore::~QSystemSemaphore()
 {
     d->cleanHandle();
-    delete d;
 }
 
 /*!
@@ -198,7 +202,7 @@ QSystemSemaphore::~QSystemSemaphore()
   enable handling the problem in Unix implementations of semaphores
   that survive a crash. In Unix, when a semaphore survives a crash, we
   need a way to force it to reset its resource count, when the system
-  reuses the semaphore. In Windows, where semaphores can't survive a
+  reuses the semaphore. In Windows and in Symbian, where semaphores can't survive a
   crash, this enum has no effect.
 
   \value Open If the semaphore already exists, its initial resource
@@ -211,7 +215,7 @@ QSystemSemaphore::~QSystemSemaphore()
   This value should be passed to the constructor, when the first
   semaphore for a particular key is constructed and you know that if
   the semaphore already exists it could only be because of a crash. In
-  Windows, where a semaphore can't survive a crash, Create and Open
+  Windows and in Symbian, where a semaphore can't survive a crash, Create and Open
   have the same behavior.
 */
 
@@ -231,7 +235,7 @@ void QSystemSemaphore::setKey(const QString &key, int initialValue, AccessMode m
         return;
     d->error = NoError;
     d->errorString = QString();
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN)
     // optimization to not destroy/create the file & semaphore
     if (key == d->key && mode == Create && d->createdSemaphore && d->createdFile) {
         d->initialValue = initialValue;
diff --git a/src/corelib/kernel/qsystemsemaphore.h b/src/corelib/kernel/qsystemsemaphore.h
index dfe03dbe35..5710aed0ed 100644
--- a/src/corelib/kernel/qsystemsemaphore.h
+++ b/src/corelib/kernel/qsystemsemaphore.h
@@ -43,6 +43,7 @@
 #define QSYSTEMSEMAPHORE_H
 
 #include <QtCore/qstring.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -89,7 +90,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QSystemSemaphore)
-    QSystemSemaphorePrivate *d;
+    QScopedPointer<QSystemSemaphorePrivate> d;
 };
 
 #endif // QT_NO_SYSTEMSEMAPHORE
diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/kernel/qsystemsemaphore_p.h
index 35624d2e9c..d6ce61d58e 100644
--- a/src/corelib/kernel/qsystemsemaphore_p.h
+++ b/src/corelib/kernel/qsystemsemaphore_p.h
@@ -62,6 +62,10 @@
 #   include <sys/types.h>
 #endif
 
+#ifdef Q_OS_SYMBIAN
+class RSemaphore;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QSystemSemaphorePrivate
@@ -77,10 +81,14 @@ public:
 
 #ifdef Q_OS_WIN
     HANDLE handle(QSystemSemaphore::AccessMode mode = QSystemSemaphore::Open);
+    void setErrorString(const QString &function);
+#elif defined(Q_OS_SYMBIAN)
+    int handle(QSystemSemaphore::AccessMode mode = QSystemSemaphore::Open);
+    void setErrorString(const QString &function,int err = 0);
 #else
     key_t handle(QSystemSemaphore::AccessMode mode = QSystemSemaphore::Open);
-#endif
     void setErrorString(const QString &function);
+#endif
     void cleanHandle();
     bool modifySemaphore(int count);
 
@@ -90,13 +98,14 @@ public:
 #ifdef Q_OS_WIN
     HANDLE semaphore;
     HANDLE semaphoreLock;
+#elif defined(Q_OS_SYMBIAN)
+    RSemaphore semaphore;
 #else
     int semaphore;
     bool createdFile;
     bool createdSemaphore;
     key_t unix_key;
 #endif
-
     QString errorString;
     QSystemSemaphore::SystemSemaphoreError error;
 };
diff --git a/src/corelib/kernel/qsystemsemaphore_symbian.cpp b/src/corelib/kernel/qsystemsemaphore_symbian.cpp
new file mode 100644
index 0000000000..817904667d
--- /dev/null
+++ b/src/corelib/kernel/qsystemsemaphore_symbian.cpp
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qsystemsemaphore.h"
+#include "qsystemsemaphore_p.h"
+#include "qcoreapplication.h"
+#include <qdebug.h>
+
+#include <qcore_symbian_p.h>
+#include <e32cmn.h>
+QT_BEGIN_NAMESPACE
+        
+#ifndef QT_NO_SYSTEMSEMAPHORE
+
+QSystemSemaphorePrivate::QSystemSemaphorePrivate() :
+        error(QSystemSemaphore::NoError)
+{
+}
+
+void QSystemSemaphorePrivate::setErrorString(const QString &function, int err)
+{
+    if (err == KErrNone){
+        return;
+    }
+    switch(err){
+    case KErrAlreadyExists:
+        errorString = QCoreApplication::tr("%1: already exists", "QSystemSemaphore").arg(function);
+        error = QSystemSemaphore::AlreadyExists;
+    break;
+    case KErrNotFound:    
+        errorString = QCoreApplication::tr("%1: doesn't exists", "QSystemSemaphore").arg(function);
+        error = QSystemSemaphore::NotFound;
+    break;
+    case KErrNoMemory:
+    case KErrInUse:
+        errorString = QCoreApplication::tr("%1: out of resources", "QSystemSemaphore").arg(function);
+        error = QSystemSemaphore::OutOfResources;
+    break;
+default:
+    errorString = QCoreApplication::tr("%1: unknown error %2", "QSystemSemaphore").arg(function).arg(err);
+    error = QSystemSemaphore::UnknownError;
+    }
+
+#if defined QSYSTEMSEMAPHORE_DEBUG
+        qDebug() << errorString << "key" << key;
+#endif
+}
+
+int QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode)
+{
+    // don't allow making handles on empty keys
+    if (key.isEmpty())
+        return 0;
+    QString safeName = makeKeyFileName();
+    TPtrC name(qt_QString2TPtrC(safeName));
+    int err;
+    err = semaphore.OpenGlobal(name,EOwnerProcess);
+    if (err == KErrNotFound){
+        err = semaphore.CreateGlobal(name,initialValue, EOwnerProcess);
+    }
+    if (err){
+        setErrorString(QLatin1String("QSystemSemaphore::handle"),err);
+        return 0;
+    }
+    return semaphore.Handle();
+}
+
+void QSystemSemaphorePrivate::cleanHandle()
+{
+    semaphore.Close();
+}
+
+bool QSystemSemaphorePrivate::modifySemaphore(int count)
+{
+    if (0 == handle())
+        return false;
+
+    if (count > 0) {
+        semaphore.Signal(count);
+    } else {
+        semaphore.Wait();
+        }
+    return true;
+}
+
+#endif //QT_NO_SYSTEMSEMAPHORE
+
+QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 2b5ea0ae5d..b487615bac 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -156,16 +156,43 @@ static void construct(QVariant::Private *x, const void *copy)
         x->data.b = copy ? *static_cast<const bool *>(copy) : false;
         break;
     case QVariant::Double:
+#if defined(Q_CC_RVCT) 
+        // Using trinary operator with 64bit constants crashes when ran on Symbian device
+        if (copy){
+            x->data.d = *static_cast<const double*>(copy);
+        } else {
+            x->data.d = 0.0;
+        }
+#else
         x->data.d = copy ? *static_cast<const double*>(copy) : 0.0;
+#endif        
         break;
     case QMetaType::Float:
         x->data.f = copy ? *static_cast<const float*>(copy) : 0.0f;
         break;
     case QVariant::LongLong:
+#if defined(Q_CC_RVCT) 
+        // Using trinary operator with 64bit constants crashes when ran on Symbian device
+        if (copy){
+            x->data.ll = *static_cast<const qlonglong *>(copy);
+        } else {
+            x->data.ll = Q_INT64_C(0);
+        }
+#else
         x->data.ll = copy ? *static_cast<const qlonglong *>(copy) : Q_INT64_C(0);
+#endif        
         break;
     case QVariant::ULongLong:
+#if defined(Q_CC_RVCT) 
+        // Using trinary operator with 64bit constants crashes when ran on Symbian device
+        if (copy){
+            x->data.ull = *static_cast<const qulonglong *>(copy);
+        } else {
+            x->data.ull = Q_UINT64_C(0);
+        }
+#else
         x->data.ull = copy ? *static_cast<const qulonglong *>(copy) : Q_UINT64_C(0);
+#endif        
         break;
     case QVariant::Invalid:
     case QVariant::UserType:
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index 309bfb8854..265a5a2d77 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -98,10 +98,10 @@ Q_GLOBAL_STATIC(QMutex, qt_library_mutex)
     Unix), unless the file name has an absolute path. If the file
     cannot be found, QLibrary tries the name with different
     platform-specific file suffixes, like ".so" on Unix, ".dylib" on
-    the Mac, or ".dll" on Windows. This makes it possible to specify
-    shared libraries that are only identified by their basename (i.e.
-    without their suffix), so the same code will work on different
-    operating systems.
+    the Mac, or ".dll" on Windows and Symbian. This makes it possible
+    to specify shared libraries that are only identified by their
+    basename (i.e. without their suffix), so the same code will work
+    on different operating systems.
 
     The most important functions are load() to dynamically load the
     library file, isLoaded() to check whether loading was successful,
@@ -120,6 +120,11 @@ Q_GLOBAL_STATIC(QMutex, qt_library_mutex)
     linking", which is done by the link step in the build process when
     linking an executable against a library.
 
+    Note: In Symbian resolving symbols using their names is supported
+    only if the library is built as STDDLL. Otherwise ordinals must
+    be used. Also, in Symbian the path of the library is ignored and
+    system default library location is always used.
+
     The following code snippet loads a library, resolves the symbol
     "mysymbol", and calls the function if everything succeeded. If
     something goes wrong, e.g. the library file does not exist or the
@@ -288,7 +293,7 @@ static bool qt_parse_pattern(const char *s, uint *version, bool *debug, QByteArr
 }
 #endif // QT_NO_PLUGIN_CHECK
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(QT_NO_PLUGIN_CHECK)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN) && !defined(QT_NO_PLUGIN_CHECK)
 
 #if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
 #  define USE_MMAP
@@ -361,7 +366,7 @@ static bool qt_unix_query(const QString &library, uint *version, bool *debug, QB
     char *filedata = 0;
     ulong fdlen = 0;
 
-#ifdef USE_MMAP
+# ifdef USE_MMAP
     char *mapaddr = 0;
     size_t maplen = file.size();
     mapaddr = (char *) mmap(mapaddr, maplen, PROT_READ, MAP_PRIVATE, file.handle(), 0);
@@ -378,14 +383,14 @@ static bool qt_unix_query(const QString &library, uint *version, bool *debug, QB
             lib->errorString = QLibrary::tr("Could not mmap '%1': %2")
                 .arg(library)
                 .arg(qt_error_string());
-#endif // USE_MMAP
+# endif // USE_MMAP
         // try reading the data into memory instead
         data = file.readAll();
         filedata = data.data();
         fdlen = data.size();
-#ifdef USE_MMAP
+# ifdef USE_MMAP
     }
-#endif // USE_MMAP
+# endif // USE_MMAP
 
     // verify that the pattern is present in the plugin
     const char pattern[] = "pattern=QT_PLUGIN_VERIFICATION_DATA";
@@ -398,7 +403,7 @@ static bool qt_unix_query(const QString &library, uint *version, bool *debug, QB
 
     if (!ret && lib)
         lib->errorString = QLibrary::tr("Plugin verification data mismatch in '%1'").arg(library);
-#ifdef USE_MMAP
+# ifdef USE_MMAP
     if (mapaddr != MAP_FAILED && munmap(mapaddr, maplen) != 0) {
         if (qt_debug_component())
             qWarning("munmap: %s", qPrintable(qt_error_string(errno)));
@@ -407,13 +412,13 @@ static bool qt_unix_query(const QString &library, uint *version, bool *debug, QB
                 .arg(library)
                 .arg( qt_error_string() );
     }
-#endif // USE_MMAP
+# endif // USE_MMAP
 
     file.close();
     return ret;
 }
 
-#endif // Q_OS_UNIX && !Q_OS_MAC && !defined(QT_NO_PLUGIN_CHECK)
+#endif // Q_OS_UNIX && !Q_OS_MAC && !defined(Q_OS_SYMBIAN) && !defined(QT_NO_PLUGIN_CHECK)
 
 typedef QMap<QString, QLibraryPrivate*> LibraryMap;
 Q_GLOBAL_STATIC(LibraryMap, libraryMap)
@@ -493,6 +498,11 @@ bool QLibraryPrivate::loadPlugin()
     }
     if (load()) {
         instance = (QtPluginInstanceFunction)resolve("qt_plugin_instance");
+#if defined(Q_OS_SYMBIAN)
+        // If resolving with function name failed (i.e. not STDDLL), try resolving using known ordinal
+        if (!instance)
+            instance = (QtPluginInstanceFunction)resolve("2");
+#endif
         return instance;
     }
     return false;
@@ -517,6 +527,10 @@ bool QLibrary::isLibrary(const QString &fileName)
 {
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
     return fileName.endsWith(QLatin1String(".dll"));
+#elif defined(Q_OS_SYMBIAN)
+    // Plugin stubs are also considered libraries in Symbian.
+    return (fileName.endsWith(QLatin1String(".dll")) ||
+            fileName.endsWith(QLatin1String(".qtplugin")));
 #else
     QString completeSuffix = QFileInfo(fileName).completeSuffix();
     if (completeSuffix.isEmpty())
@@ -597,10 +611,10 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)
                      .arg(fileName);
     QStringList reg;
 #ifndef QT_NO_SETTINGS
-    bool madeSettings = false;
+    QScopedPointer<QSettings> madeSettings;
     if (!settings) {
         settings = new QSettings(QSettings::UserScope, QLatin1String("Trolltech"));
-        madeSettings = true;
+        madeSettings.reset(settings);
     }
     reg = settings->value(regkey).toStringList();
 #endif
@@ -610,7 +624,7 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)
         key = reg.at(2).toLatin1();
         success = qt_version != 0;
     } else {
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN)
         if (!pHnd) {
             // use unix shortcut to avoid loading the library
             success = qt_unix_query(fileName, &qt_version, &debug, &key, this);
@@ -625,6 +639,10 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)
 #ifdef Q_OS_WIN
                 hTempModule = ::LoadLibraryEx((wchar_t*)QDir::toNativeSeparators(fileName).utf16(), 0, DONT_RESOLVE_DLL_REFERENCES);
 #else
+#  if defined(Q_OS_SYMBIAN)
+                //Guard against accidentally trying to load non-plugin libraries by making sure the stub exists
+                if (fileinfo.exists())
+#  endif
                 temporary_load =  load_sys();
 #endif
             }
@@ -643,8 +661,17 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)
 #endif
                 : (QtPluginQueryVerificationDataFunction) resolve("qt_plugin_query_verification_data");
 #else
-            QtPluginQueryVerificationDataFunction qtPluginQueryVerificationDataFunction =
-                (QtPluginQueryVerificationDataFunction) resolve("qt_plugin_query_verification_data");
+            QtPluginQueryVerificationDataFunction qtPluginQueryVerificationDataFunction = NULL;
+#  if defined(Q_OS_SYMBIAN)
+            if (temporary_load) {
+                qtPluginQueryVerificationDataFunction = (QtPluginQueryVerificationDataFunction) resolve("qt_plugin_query_verification_data");
+                // If resolving with function name failed (i.e. not STDDLL), try resolving using known ordinal
+                if (!qtPluginQueryVerificationDataFunction)
+                    qtPluginQueryVerificationDataFunction = (QtPluginQueryVerificationDataFunction) resolve("1");
+            }
+#  else
+            qtPluginQueryVerificationDataFunction = (QtPluginQueryVerificationDataFunction) resolve("qt_plugin_query_verification_data");
+#  endif
 #endif
 
             if (!qtPluginQueryVerificationDataFunction
@@ -680,8 +707,7 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)
 #endif
     }
 #ifndef QT_NO_SETTINGS
-    if (madeSettings)
-        delete settings;
+    madeSettings.reset();
 #endif
 
     if (!success) {
@@ -818,6 +844,8 @@ QLibrary::QLibrary(QObject *parent)
     QLibrary will automatically look for the file with the appropriate
     suffix in accordance with the platform, e.g. ".so" on Unix,
     ".dylib" on Mac OS X, and ".dll" on Windows. (See \l{fileName}.)
+
+    Note: In Symbian the path portion of the \a fileName is ignored.
  */
 QLibrary::QLibrary(const QString& fileName, QObject *parent)
     :QObject(parent), d(0), did_load(false)
@@ -829,13 +857,15 @@ QLibrary::QLibrary(const QString& fileName, QObject *parent)
 /*!
     Constructs a library object with the given \a parent that will
     load the library specified by \a fileName and major version number \a verNum.
-    Currently, the version number is ignored on Windows.
+    Currently, the version number is ignored on Windows and Symbian.
 
     We recommend omitting the file's suffix in \a fileName, since
     QLibrary will automatically look for the file with the appropriate
     suffix in accordance with the platform, e.g. ".so" on Unix,
     ".dylib" on Mac OS X, and ".dll" on Windows. (See \l{fileName}.)
- */
+
+    Note: In Symbian the path portion of the \a fileName is ignored.
+*/
 QLibrary::QLibrary(const QString& fileName, int verNum, QObject *parent)
     :QObject(parent), d(0), did_load(false)
 {
@@ -845,12 +875,14 @@ QLibrary::QLibrary(const QString& fileName, int verNum, QObject *parent)
 /*!
     Constructs a library object with the given \a parent that will
     load the library specified by \a fileName and full version number \a version.
-    Currently, the version number is ignored on Windows.
+    Currently, the version number is ignored on Windows and Symbian.
 
     We recommend omitting the file's suffix in \a fileName, since
     QLibrary will automatically look for the file with the appropriate
     suffix in accordance with the platform, e.g. ".so" on Unix,
     ".dylib" on Mac OS X, and ".dll" on Windows. (See \l{fileName}.)
+
+    Note: In Symbian the path portion of the \a fileName is ignored.
  */
 QLibrary::QLibrary(const QString& fileName, const QString &version, QObject *parent)
     :QObject(parent), d(0), did_load(false)
@@ -892,6 +924,8 @@ QLibrary::~QLibrary()
     platforms, fileName() will return "libGL.so". If the file name was
     originally passed as "/usr/lib/libGL", fileName() will return
     "/usr/lib/libGL.so".
+
+    Note: In Symbian the path portion of the \a fileName is ignored.
 */
 
 void QLibrary::setFileName(const QString &fileName)
@@ -919,7 +953,10 @@ QString QLibrary::fileName() const
 
     Sets the fileName property and major version number to \a fileName
     and \a versionNumber respectively.
-    The \a versionNumber is ignored on Windows.
+    The \a versionNumber is ignored on Windows and Symbian.
+
+    Note: In Symbian the path portion of the \a fileName is ignored.
+
     \sa setFileName()
 */
 void QLibrary::setFileNameAndVersion(const QString &fileName, int verNum)
@@ -940,7 +977,10 @@ void QLibrary::setFileNameAndVersion(const QString &fileName, int verNum)
 
     Sets the fileName property and full version number to \a fileName
     and \a version respectively.
-    The \a version parameter is ignored on Windows.
+    The \a version parameter is ignored on Windows and Symbian.
+
+    Note: In Symbian the path portion of the \a fileName is ignored.
+
     \sa setFileName()
 */
 void QLibrary::setFileNameAndVersion(const QString &fileName, const QString &version)
@@ -976,6 +1016,8 @@ void QLibrary::setFileNameAndVersion(const QString &fileName, const QString &ver
 
     \snippet doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp 4
 
+    Note: In Symbian resolving with symbol names works only if the loaded
+    library was built as STDDLL. Otherwise, the ordinals must be used.
 */
 void *QLibrary::resolve(const char *symbol)
 {
@@ -995,6 +1037,9 @@ void *QLibrary::resolve(const char *symbol)
     The function returns 0 if the symbol could not be resolved or if
     the library could not be loaded.
 
+    Note: In Symbian resolving with symbol names works only if the loaded
+    library was built as STDDLL. Otherwise, the ordinals must be used.
+
     \sa resolve()
 */
 void *QLibrary::resolve(const QString &fileName, const char *symbol)
@@ -1015,6 +1060,9 @@ void *QLibrary::resolve(const QString &fileName, const char *symbol)
     The function returns 0 if the symbol could not be resolved or if
     the library could not be loaded.
 
+    Note: In Symbian resolving with symbol names works only if the loaded
+    library was built as STDDLL. Otherwise, the ordinals must be used.
+
     \sa resolve()
 */
 void *QLibrary::resolve(const QString &fileName, int verNum, const char *symbol)
@@ -1036,6 +1084,9 @@ void *QLibrary::resolve(const QString &fileName, int verNum, const char *symbol)
     The function returns 0 if the symbol could not be resolved or if
     the library could not be loaded.
 
+    Note: In Symbian resolving with symbol names works only if the loaded
+    library was built as STDDLL. Otherwise, the ordinals must be used.
+
     \sa resolve()
 */
 void *QLibrary::resolve(const QString &fileName, const QString &version, const char *symbol)
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
index cc70589f8a..462cfbffa0 100644
--- a/src/corelib/plugin/qlibrary_unix.cpp
+++ b/src/corelib/plugin/qlibrary_unix.cpp
@@ -81,18 +81,31 @@ bool QLibraryPrivate::load_sys()
     QString attempt;
 #if !defined(Q_OS_VXWORKS)
     QFileInfo fi(fileName);
+
+#if defined(Q_OS_SYMBIAN)
+    QString path; // In Symbian, always resolve with just the filename
+    QString name;
+
+    // Replace possible ".qtplugin" suffix with ".dll"
+    if (fi.suffix() == QLatin1String("qtplugin"))
+        name = fi.completeBaseName() + QLatin1String(".dll");
+    else
+        name = fi.fileName();
+#else
     QString path = fi.path();
     QString name = fi.fileName();
     if (path == QLatin1String(".") && !fileName.startsWith(path))
         path.clear();
     else
         path += QLatin1Char('/');
-
+#endif
     // The first filename we want to attempt to load is the filename as the callee specified.
     // Thus, the first attempt we do must be with an empty prefix and empty suffix.
     QStringList suffixes(QLatin1String("")), prefixes(QLatin1String(""));
     if (pluginState != IsAPlugin) {
+#if !defined(Q_OS_SYMBIAN)
         prefixes << QLatin1String("lib");
+#endif
 #if defined(Q_OS_HPUX)
         // according to
         // http://docs.hp.com/en/B2355-90968/linkerdifferencesiapa.htm
@@ -120,6 +133,9 @@ bool QLibraryPrivate::load_sys()
         }
 #elif defined(Q_OS_AIX)
         suffixes << ".a";
+
+#elif defined(Q_OS_SYMBIAN)
+        suffixes << QLatin1String(".dll");
 #else
         if (!fullVersion.isEmpty()) {
             suffixes << QString::fromLatin1(".so.%1").arg(fullVersion);
@@ -157,7 +173,7 @@ bool QLibraryPrivate::load_sys()
     else {
 #if defined(Q_OS_MAC)
         if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_4)
-#endif        
+#endif
         dlFlags |= RTLD_LOCAL;
     }
 #endif
@@ -188,6 +204,12 @@ bool QLibraryPrivate::load_sys()
 #else
             pHnd = dlopen(QFile::encodeName(attempt), dlFlags);
 #endif
+
+#if defined(Q_OS_SYMBIAN)
+            // Never try again in symbian, dlopen already handles the library search logic,
+            // and there is only one possible suffix.
+            retry = false;
+#else
             if (!pHnd && fileName.startsWith(QLatin1Char('/')) && QFile::exists(attempt)) {
                 // We only want to continue if dlopen failed due to that the shared library did not exist.
                 // However, we are only able to apply this check for absolute filenames (since they are
@@ -195,6 +217,7 @@ bool QLibraryPrivate::load_sys()
                 // This is all because dlerror is flawed and cannot tell us the reason why it failed.
                 retry = false;
             }
+#endif
         }
     }
 
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index 2a0ec99850..53641907de 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -46,6 +46,7 @@
 #include <qfileinfo.h>
 #include "qlibrary_p.h"
 #include "qdebug.h"
+#include "qdir.h"
 
 #ifndef QT_NO_LIBRARY
 
@@ -116,6 +117,16 @@ QT_BEGIN_NAMESPACE
     link to plugins statically. You can use QLibrary if you need to
     load dynamic libraries in a statically linked application.
 
+    \note In Symbian the plugin stub files must be used whenever a
+    path to plugin is needed. For the purposes of loading plugins,
+    the stubs can be considered to have the same name as the actual
+    plugin binary. In practice they have ".qtplugin" extension
+    instead of ".dll", but this difference is handled transparently
+    by QPluginLoader and QLibrary to avoid need for Symbian specific
+    plugin handling in most Qt applications. Plugin stubs are needed
+    because Symbian Platform Security denies all access to the directory
+    where the actual plugin binaries are located.
+
     \sa QLibrary, {Plug & Paint Example}
 */
 
@@ -136,6 +147,8 @@ QPluginLoader::QPluginLoader(QObject *parent)
     Unix, - \c .dylib on Mac OS X, and \c .dll on Windows. The suffix
     can be verified with QLibrary::isLibrary().
 
+    Note: In Symbian the \a fileName must point to plugin stub file.
+
     \sa setFileName()
 */
 QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent)
@@ -170,7 +183,7 @@ QPluginLoader::~QPluginLoader()
     The root component, returned by this function, is not deleted when
     the QPluginLoader is destroyed. If you want to ensure that the root
     component is deleted, you should call unload() as soon you don't
-    need to access the core component anymore.  When the library is 
+    need to access the core component anymore.  When the library is
     finally unloaded, the root component will automatically be deleted.
 
     The component object is a QObject. Use qobject_cast() to access
@@ -221,9 +234,9 @@ bool QPluginLoader::load()
     call will fail, and unloading will only happen when every instance
     has called unload().
 
-    Don't try to delete the root component. Instead rely on 
+    Don't try to delete the root component. Instead rely on
     that unload() will automatically delete it when needed.
-    
+
     \sa instance(), load()
 */
 bool QPluginLoader::unload()
@@ -261,6 +274,8 @@ bool QPluginLoader::isLoaded() const
 
     By default, this property contains an empty string.
 
+    Note: In Symbian the \a fileName must point to plugin stub file.
+
     \sa load()
 */
 void QPluginLoader::setFileName(const QString &fileName)
@@ -273,7 +288,42 @@ void QPluginLoader::setFileName(const QString &fileName)
         d = 0;
         did_load = false;
     }
+
+#if defined(Q_OS_SYMBIAN)
+    // In Symbian we actually look for plugin stub, so modify the filename
+    // to make canonicalFilePath find the file, if .dll is specified.
+    QFileInfo fi(fileName);
+
+    if (fi.suffix() == QLatin1String("dll")) {
+        QString stubName = fileName;
+        stubName.chop(3);
+        stubName += QLatin1String("qtplugin");
+        fi = QFileInfo(stubName);
+    }
+
+    QString fn = fi.canonicalFilePath();
+    // If not found directly, check also all the available drives
+    if (!fn.length()) {
+        QString stubPath(fi.fileName().length() ? fi.absoluteFilePath() : QString());
+        if (stubPath.length() > 1) {
+            if (stubPath.at(1).toAscii() == ':')
+                stubPath.remove(0,2);
+            QFileInfoList driveList(QDir::drives());
+            foreach(const QFileInfo& drive, driveList) {
+                QString testFilePath(drive.absolutePath() + stubPath);
+                testFilePath = QDir::cleanPath(testFilePath);            
+                if (QFile::exists(testFilePath)) {
+                    fn = testFilePath;
+                    break;
+                }
+            }
+        }
+    }
+    
+#else
     QString fn = QFileInfo(fileName).canonicalFilePath();
+#endif
+
     d = QLibraryPrivate::findOrCreate(fn);
     d->loadHints = lh;
     if (fn.isEmpty())
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index 73daee6f4a..a8741cf75e 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -558,7 +558,7 @@ bool QUuid::operator>(const QUuid &other) const
 
     \sa variant(), version()
 */
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) && ! defined(Q_CC_MWERKS)
 
 QT_BEGIN_INCLUDE_NAMESPACE
 #include <objbase.h> // For CoCreateGuid
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 9cb1d4dbaa..932a239338 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -2064,7 +2064,7 @@ int QSignalEventGenerator::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
         switch (_id) {
         case 0: {
 // ### in Qt 4.6 we can use QObject::senderSignalIndex()
-            QObjectPrivate *d = static_cast<QObjectPrivate *>(d_ptr);
+            QObjectPrivate *d = static_cast<QObjectPrivate *>(d_ptr.data());
             int signalIndex = -1;
             QObject *sender = this->sender();
             if (sender && d->currentSender)
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 2e31c6df3b..1cf4bc9d5a 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -129,35 +129,6 @@ void QThreadData::deref()
 #endif
 }
 
-
-#ifndef QT_NO_THREAD
-/*
-  QThreadPrivate
-*/
-
-QThreadPrivate::QThreadPrivate(QThreadData *d)
-    : QObjectPrivate(), running(false), finished(false), terminated(false),
-      stackSize(0), priority(QThread::InheritPriority), data(d)
-{
-#if defined (Q_OS_UNIX)
-    thread_id = 0;
-#elif defined (Q_WS_WIN)
-    handle = 0;
-    id = 0;
-    waiters = 0;
-    terminationEnabled = true;
-    terminatePending = false;
-#endif
-
-    if (!data)
-        data = new QThreadData;
-}
-
-QThreadPrivate::~QThreadPrivate()
-{
-    data->deref();
-}
-
 /*
   QAdoptedThread
 */
@@ -167,25 +138,28 @@ QAdoptedThread::QAdoptedThread(QThreadData *data)
 {
     // thread should be running and not finished for the lifetime
     // of the application (even if QCoreApplication goes away)
+#ifndef QT_NO_THREAD
     d_func()->running = true;
     d_func()->finished = false;
     init();
+#endif
 
     // fprintf(stderr, "new QAdoptedThread = %p\n", this);
 }
 
 QAdoptedThread::~QAdoptedThread()
 {
+#ifndef QT_NO_THREAD
     QThreadPrivate::finish(this);
-
+#endif
     // fprintf(stderr, "~QAdoptedThread = %p\n", this);
 }
 
 QThread *QAdoptedThread::createThreadForAdoption()
 {
-    QThread *t = new QAdoptedThread(0);
-    t->moveToThread(t);
-    return t;
+    QScopedPointer<QThread> t(new QAdoptedThread(0));
+    t->moveToThread(t.data());
+    return t.take();
 }
 
 void QAdoptedThread::run()
@@ -193,6 +167,35 @@ void QAdoptedThread::run()
     // this function should never be called
     qFatal("QAdoptedThread::run(): Internal error, this implementation should never be called.");
 }
+#ifndef QT_NO_THREAD
+/*
+  QThreadPrivate
+*/
+
+QThreadPrivate::QThreadPrivate(QThreadData *d)
+    : QObjectPrivate(), running(false), finished(false), terminated(false),
+      stackSize(0), priority(QThread::InheritPriority), data(d)
+{
+#if defined (Q_OS_UNIX)
+    thread_id = 0;
+#elif defined (Q_WS_WIN)
+    handle = 0;
+    id = 0;
+    waiters = 0;
+#endif
+#if defined (Q_WS_WIN) || defined (Q_OS_SYMBIAN)  
+    terminationEnabled = true;
+    terminatePending = false;
+#endif
+
+    if (!data)
+        data = new QThreadData;
+}
+
+QThreadPrivate::~QThreadPrivate()
+{
+    data->deref();
+}
 
 /*!
     \class QThread
@@ -479,10 +482,10 @@ uint QThread::stackSize() const
 int QThread::exec()
 {
     Q_D(QThread);
-    d->mutex.lock();
+    QMutexLocker locker(&d->mutex);
     d->data->quitNow = false;
     QEventLoop eventLoop;
-    d->mutex.unlock();
+    locker.unlock();
     int returnCode = eventLoop.exec();
     return returnCode;
 }
@@ -715,25 +718,37 @@ QThread::Priority QThread::priority() const
 
 #else // QT_NO_THREAD
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <private/qcoreapplication_p.h>
-QT_END_INCLUDE_NAMESPACE
-
-Q_GLOBAL_STATIC_WITH_ARGS(QThreadData, staticThreadData, (0));
-QThread* QThread::instance = 0;
-
-QThread::QThread() : QObject(*new QThreadPrivate, (QObject*)0)
-{
+QThread::QThread(QObject *parent)
+    : QObject(*(new QThreadPrivate), (QObject*)0){
     Q_D(QThread);
     d->data->thread = this;
-    QCoreApplicationPrivate::theMainThread = this;
+}
+
+QThread *QThread::currentThread()
+{
+    return QThreadData::current()->thread;
 }
 
 QThreadData* QThreadData::current()
 {
-    if (QThread::instance)
-        return QThread::instance->d_func()->data;
-    return staticThreadData();
+    static QThreadData *data = 0; // reinterpret_cast<QThreadData *>(pthread_getspecific(current_thread_data_key));
+    if (!data) {
+        QScopedPointer<QThreadData> newdata(new QThreadData);
+        newdata->thread = new QAdoptedThread(newdata.data());
+        data = newdata.take();
+        data->deref();
+    }
+    return data;
+}
+
+/*! \internal
+ */
+QThread::QThread(QThreadPrivate &dd, QObject *parent)
+    : QObject(dd, parent)
+{
+    Q_D(QThread);
+    // fprintf(stderr, "QThreadData %p taken from private data for thread %p\n", d->data, this);
+    d->data->thread = this;
 }
 
 #endif // QT_NO_THREAD
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index 02134275ae..c784352d06 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -142,15 +142,18 @@ class Q_CORE_EXPORT QThread : public QObject
 {
 public:
     static Qt::HANDLE currentThreadId() { return Qt::HANDLE(currentThread()); }
-    static QThread* currentThread()
-    { if (!instance) instance = new QThread(); return instance; }
+    static QThread* currentThread();
+    
+protected:
+    QThread(QThreadPrivate &dd, QObject *parent = 0);
 
 private:
-    QThread();
+    explicit QThread(QObject *parent = 0);
     static QThread *instance;
 
     friend class QCoreApplication;
     friend class QThreadData;
+    friend class QAdoptedThread;
     Q_DECLARE_PRIVATE(QThread)
 };
 
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index d798a76023..31b5090386 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -62,6 +62,10 @@
 #include "QtCore/qmap.h"
 #include "private/qobject_p.h"
 
+#ifdef Q_OS_SYMBIAN
+#include <e32base.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QAbstractEventDispatcher;
@@ -132,46 +136,37 @@ public:
     QWaitCondition thread_done;
 
     static void *start(void *arg);
-    static void finish(void *arg);
+#if defined(Q_OS_SYMBIAN)
+    static void finish(void *arg, bool lockAnyway=true, bool closeNativeHandle=true);
+#else
+    static void finish(void *);
 #endif
+#endif // Q_OS_UNIX
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
     HANDLE handle;
     unsigned int id;
     int waiters;
-    bool terminationEnabled, terminatePending;
 
     static unsigned int __stdcall start(void *);
     static void finish(void *, bool lockAnyway=true);
 #endif // Q_OS_WIN32
 
+#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN)  
+    bool terminationEnabled, terminatePending;
+# endif
     QThreadData *data;
 
     static void createEventDispatcher(QThreadData *data);
 };
 
-// thread wrapper for the main() thread
-class QAdoptedThread : public QThread
-{
-    Q_DECLARE_PRIVATE(QThread)
-
-public:
-    QAdoptedThread(QThreadData *data = 0);
-    ~QAdoptedThread();
-    void init();
-
-    static QThread *createThreadForAdoption();
-private:
-    void run();
-};
-
 #else // QT_NO_THREAD
 
 class QThreadPrivate : public QObjectPrivate
 {
 public:
-    QThreadPrivate() : data(QThreadData::current()) {}
-    ~QThreadPrivate() { }
+    QThreadPrivate(QThreadData *d = 0) : data(d ? d : new QThreadData) {}
+    ~QThreadPrivate() { delete data; }
 
     QThreadData *data;
 
@@ -210,6 +205,25 @@ public:
     QMap<int, void *> tls;
 
     QMutex mutex;
+
+# ifdef Q_OS_SYMBIAN
+    RThread symbian_thread_handle;
+# endif
+};
+
+// thread wrapper for the main() thread
+class QAdoptedThread : public QThread
+{
+    Q_DECLARE_PRIVATE(QThread)
+
+public:
+    QAdoptedThread(QThreadData *data = 0);
+    ~QAdoptedThread();
+    void init();
+
+    static QThread *createThreadForAdoption();
+private:
+    void run();
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index efe37ad45b..1be9048699 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -47,7 +47,12 @@
 #if !defined(QT_NO_GLIB)
 #  include "../kernel/qeventdispatcher_glib_p.h"
 #endif
+
+#ifdef Q_OS_SYMBIAN
+#include <private/qeventdispatcher_symbian_p.h>
+#else
 #include <private/qeventdispatcher_unix_p.h>
+#endif
 
 #include "qthreadstorage.h"
 
@@ -138,7 +143,14 @@ QThreadData *QThreadData::current()
         } else {
             data = new QThreadData;
             pthread_setspecific(current_thread_data_key, data);
-            data->thread = new QAdoptedThread(data);
+            QT_TRY {
+                data->thread = new QAdoptedThread(data);
+            } QT_CATCH(...) {
+                pthread_setspecific(current_thread_data_key, 0);
+                data->deref();
+                data = 0;
+                QT_RETHROW;
+            }
             data->deref();
         }
         if (!QCoreApplicationPrivate::theMainThread)
@@ -150,7 +162,13 @@ QThreadData *QThreadData::current()
 
 void QAdoptedThread::init()
 {
-    d_func()->thread_id = pthread_self();
+    Q_D(QThread);
+    d->thread_id = pthread_self();
+#ifdef Q_OS_SYMBIAN
+    d->data->symbian_thread_handle = RThread();
+    TThreadId threadId = d->data->symbian_thread_handle.Id();
+    d->data->symbian_thread_handle.Open(threadId);
+#endif
 }
 
 /*
@@ -178,7 +196,11 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data)
         data->eventDispatcher = new QEventDispatcherGlib;
     else
 #endif
+#ifdef Q_OS_SYMBIAN
+    	data->eventDispatcher = new QEventDispatcherSymbian;
+#else
         data->eventDispatcher = new QEventDispatcherUNIX;
+#endif
     data->eventDispatcher->startingUp();
 }
 
@@ -186,12 +208,24 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data)
 
 void *QThreadPrivate::start(void *arg)
 {
+#ifndef Q_OS_SYMBIAN
     pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
     pthread_cleanup_push(QThreadPrivate::finish, arg);
-
+#endif
+    
     QThread *thr = reinterpret_cast<QThread *>(arg);
     QThreadData *data = QThreadData::get2(thr);
 
+#ifdef Q_OS_SYMBIAN
+    // Because Symbian Open C does not provide a way to convert between
+    // RThread and pthread_t, we must delay initialization of the RThread
+    // handle when creating a thread, until we are running in the new thread.
+    // Here, we pick up the current thread and assign that to the handle.
+    data->symbian_thread_handle = RThread();
+    TThreadId threadId = data->symbian_thread_handle.Id();
+    data->symbian_thread_handle.Open(threadId);
+#endif
+
     pthread_once(&current_thread_data_once, create_current_thread_data_key);
     pthread_setspecific(current_thread_data_key, data);
 
@@ -202,19 +236,33 @@ void *QThreadPrivate::start(void *arg)
     createEventDispatcher(data);
 
     emit thr->started();
+#ifndef Q_OS_SYMBIAN
     pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
     pthread_testcancel();
+#endif
     thr->run();
 
+#ifndef Q_OS_SYMBIAN
     pthread_cleanup_pop(1);
+#else
+    QThreadPrivate::finish(arg);    
+#endif
+
     return 0;
 }
 
+#ifdef Q_OS_SYMBIAN
+void QThreadPrivate::finish(void *arg, bool lockAnyway, bool closeNativeHandle)
+#else
 void QThreadPrivate::finish(void *arg)
+#endif
 {
     QThread *thr = reinterpret_cast<QThread *>(arg);
     QThreadPrivate *d = thr->d_func();
-    QMutexLocker locker(&d->mutex);
+#ifdef Q_OS_SYMBIAN
+    if (lockAnyway)
+#endif
+        d->mutex.lock();
 
     d->priority = QThread::InheritPriority;
     d->running = false;
@@ -235,7 +283,15 @@ void QThreadPrivate::finish(void *arg)
     QThreadStorageData::finish((void **)data);
 
     d->thread_id = 0;
+#ifdef Q_OS_SYMBIAN
+    if (closeNativeHandle)
+    	d->data->symbian_thread_handle.Close();
+#endif
     d->thread_done.wakeAll();
+#ifdef Q_OS_SYMBIAN
+    if (lockAnyway)
+#endif
+        d->mutex.unlock();
 }
 
 
@@ -288,6 +344,9 @@ int QThread::idealThreadCount()
 #elif defined(Q_OS_INTEGRITY)
     // as of aug 2008 Integrity only supports one single core CPU
     cores = 1;
+#elif defined(Q_OS_SYMBIAN)
+	 // ### TODO - Get the number of cores from HAL? when multicore architectures (SMP) are supported
+    cores = 1;
 #elif defined(Q_OS_VXWORKS)
     // VxWorks
 #  if defined(QT_VXWORKS_HAS_CPUSET)
@@ -389,7 +448,8 @@ void QThread::start(Priority priority)
 
     d->priority = priority;
 
-#if defined(Q_OS_DARWIN) || !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)
+#if defined(Q_OS_DARWIN) || !defined(Q_OS_OPENBSD) && !defined(Q_OS_SYMBIAN) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)
+// ### Need to implement thread sheduling and priorities for symbian os. Implementation removed for now
     switch (priority) {
     case InheritPriority:
         {
@@ -447,6 +507,13 @@ void QThread::start(Priority priority)
     }
 #endif // _POSIX_THREAD_PRIORITY_SCHEDULING
 
+#ifdef Q_OS_SYMBIAN
+    if (d->stackSize == 0)
+        // The default stack size on Symbian is very small, making even basic
+        // operations like file I/O fail, so we increase it by default.
+        d->stackSize = 0x14000; // Maximum stack size on Symbian.
+#endif
+
     if (d->stackSize > 0) {
 #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0 > 0)
         int code = pthread_attr_setstacksize(&attr, d->stackSize);
@@ -471,7 +538,9 @@ void QThread::start(Priority priority)
     if (code == EPERM) {
         // caller does not have permission to set the scheduling
         // parameters/policy
+#ifndef Q_OS_SYMBIAN
         pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED);
+#endif
         code =
             pthread_create(&d->thread_id, &attr, QThreadPrivate::start, this);
     }
@@ -484,6 +553,9 @@ void QThread::start(Priority priority)
         d->running = false;
         d->finished = false;
         d->thread_id = 0;
+#ifdef Q_OS_SYMBIAN
+        d->data->symbian_thread_handle.Close();
+#endif
     }
 }
 
@@ -495,6 +567,7 @@ void QThread::terminate()
     if (!d->thread_id)
         return;
 
+#ifndef Q_OS_SYMBIAN
     int code = pthread_cancel(d->thread_id);
     if (code) {
         qWarning("QThread::start: Thread termination error: %s",
@@ -502,6 +575,21 @@ void QThread::terminate()
     } else {
         d->terminated = true;
     }
+#else
+    if (!d->running)
+        return;
+    if (!d->terminationEnabled) {
+        d->terminatePending = true;
+        return;
+    }
+   
+    d->terminated = true;
+    QThreadPrivate::finish(this, false, false);
+    d->data->symbian_thread_handle.Terminate(KErrNone);         
+    d->data->symbian_thread_handle.Close();
+#endif
+
+
 }
 
 bool QThread::wait(unsigned long time)
@@ -526,11 +614,24 @@ bool QThread::wait(unsigned long time)
 
 void QThread::setTerminationEnabled(bool enabled)
 {
-    Q_ASSERT_X(currentThread() != 0, "QThread::setTerminationEnabled()",
+    QThread *thr = currentThread();
+    Q_ASSERT_X(thr != 0, "QThread::setTerminationEnabled()",
                "Current thread was not started with QThread.");
+#ifndef Q_OS_SYMBIAN
     pthread_setcancelstate(enabled ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE, NULL);
     if (enabled)
         pthread_testcancel();
+#else
+    QThreadPrivate *d = thr->d_func();
+    QMutexLocker locker(&d->mutex);
+    d->terminationEnabled = enabled;
+    if (enabled && d->terminatePending) {
+        d->terminated = true;
+        QThreadPrivate::finish(thr, false);
+        locker.unlock(); // don't leave the mutex locked!
+	    pthread_exit(NULL);    
+    }
+#endif
 }
 
 void QThread::setPriority(Priority priority)
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 32b680e5c2..d8a187677a 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -112,7 +112,14 @@ QThreadData *QThreadData::current()
             // This needs to be called prior to new AdoptedThread() to
             // avoid recursion.
             TlsSetValue(qt_current_thread_data_tls_index, threadData);
-            threadData->thread = new QAdoptedThread(threadData);
+            QT_TRY {
+                threadData->thread = new QAdoptedThread(threadData);
+            } QT_CATCH(...) {
+                TlsSetValue(qt_current_thread_data_tls_index, 0);
+                threadData->deref();
+                threadData = 0;
+                QT_RETHROW;
+            }
             threadData->deref();
         }
 
diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp
index 9e20ced064..87503b76ce 100644
--- a/src/corelib/thread/qthreadstorage.cpp
+++ b/src/corelib/thread/qthreadstorage.cpp
@@ -101,12 +101,14 @@ void **QThreadStorageData::get() const
         qWarning("QThreadStorage::get: QThreadStorage can only be used with threads started with QThread");
         return 0;
     }
-    QMap<int, void *>::iterator it = data->tls.find(id);
+    QMap<int, void *>::const_iterator it = data->tls.constFind(id);
     DEBUG_MSG("QThreadStorageData: Returning storage %d, data %p, for thread %p",
           id,
           it != data->tls.end() ? it.value() : 0,
           data->thread);
-    return it != data->tls.end() && it.value() != 0 ? &it.value() : 0;
+    // const_cast below is a bit evil - but we have to make sure not to detach here
+    // otherwise we'll go bonkers in oom situations
+    return it != data->tls.constEnd() && it.value() != 0 ? const_cast<void **>(&it.value()) : 0;
 }
 
 void **QThreadStorageData::set(void *p)
@@ -129,9 +131,9 @@ void **QThreadStorageData::set(void *p)
             void *q = it.value();
             it.value() = 0;
 
-            mutex()->lock();
+            QMutexLocker locker(mutex());
             void (*destructor)(void *) = destructors()->value(id);
-            mutex()->unlock();
+            locker.unlock();
 
             destructor(q);
         }
@@ -167,9 +169,9 @@ void QThreadStorageData::finish(void **p)
             continue;
         }
 
-        mutex()->lock();
+        QMutexLocker locker(mutex());
         void (*destructor)(void *) = destructors()->value(id);
-        mutex()->unlock();
+        locker.unlock();
 
         if (!destructor) {
             if (QThread::currentThread())
diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h
index 84cad2002a..5f433a1c68 100644
--- a/src/corelib/tools/qalgorithms.h
+++ b/src/corelib/tools/qalgorithms.h
@@ -142,7 +142,7 @@ inline void qCount(const Container &container, const T &value, Size &n)
 }
 
 
-#if defined Q_CC_MSVC && _MSC_VER < 1300
+#if (defined Q_CC_MSVC && _MSC_VER < 1300) || defined(Q_CC_MWERKS)
 template <typename T>
 inline void qSwap(T &value1, T &value2)
 {
diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp
index a2d30ba097..641fd4ecf7 100644
--- a/src/corelib/tools/qbitarray.cpp
+++ b/src/corelib/tools/qbitarray.cpp
@@ -209,6 +209,8 @@ void QBitArray::resize(int size)
         uchar* c = reinterpret_cast<uchar*>(d.data());
         if (size > (s << 3))
             memset(c + s, 0, d.size() - s);
+        else if ( size % 8)
+            *(c+1+size/8) &= (1 << (size%8)) - 1;
         *c = d.size()*8 - size;
     }
 }
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index 5d3386e660..22cee0eef9 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -538,9 +538,13 @@ QByteArray qUncompress(const uchar* data, int nbytes)
     QByteArray baunzip;
     int res;
     do {
-        baunzip.resize(len);
-        res = ::uncompress((uchar*)baunzip.data(), &len,
-                            (uchar*)data+4, nbytes-4);
+        QT_TRY {
+            baunzip.resize(len);
+            res = ::uncompress((uchar*)baunzip.data(), &len,
+                                (uchar*)data+4, nbytes-4);
+        } QT_CATCH (const std::bad_alloc &) {
+            res = Z_MEM_ERROR;
+        }
 
         switch (res) {
         case Z_OK:
@@ -1233,14 +1237,11 @@ QByteArray::QByteArray(const char *str)
     } else {
         int len = qstrlen(str);
         d = static_cast<Data *>(qMalloc(sizeof(Data)+len));
-        if (!d) {
-            d = &shared_null;
-        } else {
-            d->ref = 0;;
-            d->alloc = d->size = len;
-            d->data = d->array;
-            memcpy(d->array, str, len+1); // include null terminator
-        }
+        Q_CHECK_PTR(d);
+        d->ref = 0;;
+        d->alloc = d->size = len;
+        d->data = d->array;
+        memcpy(d->array, str, len+1); // include null terminator
     }
     d->ref.ref();
 }
@@ -1264,15 +1265,12 @@ QByteArray::QByteArray(const char *data, int size)
         d = &shared_empty;
     } else {
         d = static_cast<Data *>(qMalloc(sizeof(Data) + size));
-        if (!d) {
-            d = &shared_null;
-        } else {
-            d->ref = 0;
-            d->alloc = d->size = size;
-            d->data = d->array;
-            memcpy(d->array, data, size);
-            d->array[size] = '\0';
-        }
+        Q_CHECK_PTR(d);
+        d->ref = 0;
+        d->alloc = d->size = size;
+        d->data = d->array;
+        memcpy(d->array, data, size);
+        d->array[size] = '\0';
     }
     d->ref.ref();
 }
@@ -1290,15 +1288,12 @@ QByteArray::QByteArray(int size, char ch)
         d = &shared_null;
     } else {
         d = static_cast<Data *>(qMalloc(sizeof(Data)+size));
-        if (!d) {
-            d = &shared_null;
-        } else {
-            d->ref = 0;
-            d->alloc = d->size = size;
-            d->data = d->array;
-            d->array[size] = '\0';
-            memset(d->array, ch, size);
-        }
+        Q_CHECK_PTR(d);
+        d->ref = 0;
+        d->alloc = d->size = size;
+        d->data = d->array;
+        d->array[size] = '\0';
+        memset(d->array, ch, size);
     }
     d->ref.ref();
 }
@@ -1349,8 +1344,7 @@ void QByteArray::resize(int size)
         //    QByteArray a(sz);
         //
         Data *x = static_cast<Data *>(qMalloc(sizeof(Data)+size));
-        if (!x)
-            return;
+        Q_CHECK_PTR(x);
         x->ref = 1;
         x->alloc = x->size = size;
         x->data = x->array;
@@ -1392,8 +1386,7 @@ void QByteArray::realloc(int alloc)
 {
     if (d->ref != 1 || d->data != d->array) {
         Data *x = static_cast<Data *>(qMalloc(sizeof(Data) + alloc));
-        if (!x)
-            return;
+        Q_CHECK_PTR(x);
         x->size = qMin(alloc, d->size);
         ::memcpy(x->array, d->data, x->size);
         x->array[x->size] = '\0';
@@ -1405,8 +1398,7 @@ void QByteArray::realloc(int alloc)
         d = x;
     } else {
         Data *x = static_cast<Data *>(qRealloc(d, sizeof(Data) + alloc));
-        if (!x)
-            return;
+        Q_CHECK_PTR(x);
         x->alloc = alloc;
         x->data = x->array;
         d = x;
@@ -1827,11 +1819,13 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after
     const char *b = before;
     if (after >= d->data && after < d->data + d->size) {
         char *copy = (char *)malloc(asize);
+        Q_CHECK_PTR(copy);
         memcpy(copy, after, asize);
         a = copy;
     }
     if (before >= d->data && before < d->data + d->size) {
         char *copy = (char *)malloc(bsize);
+        Q_CHECK_PTR(copy);
         memcpy(copy, before, bsize);
         b = copy;
     }
@@ -3752,6 +3746,7 @@ QByteArray QByteArray::number(double n, char f, int prec)
 QByteArray QByteArray::fromRawData(const char *data, int size)
 {
     Data *x = static_cast<Data *>(qMalloc(sizeof(Data)));
+    Q_CHECK_PTR(x);
     if (data) {
         x->data = const_cast<char *>(data);
     } else {
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index e494ac13fc..ae4f93b2a8 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -122,6 +122,17 @@ template <typename T> class QList;
 
 class Q_CORE_EXPORT QByteArray
 {
+private:
+    struct Data {
+        QBasicAtomicInt ref;
+        int alloc, size;
+        // ### Qt 5.0: We need to add the missing capacity bit
+        // (like other tool classes have), to maintain the
+        // reserved memory on resize.
+        char *data;
+        char array[1];
+    };
+
 public:
     inline QByteArray();
     QByteArray(const char *);
@@ -348,15 +359,6 @@ public:
 
 private:
     operator QNoImplicitBoolCast() const;
-    struct Data {
-        QBasicAtomicInt ref;
-        int alloc, size;
-	// ### Qt 5.0: We need to add the missing capacity bit
-	// (like other tool classes have), to maintain the
-	// reserved memory on resize.
-        char *data;
-        char array[1];
-    };
     static Data shared_null;
     static Data shared_empty;
     Data *d;
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp
index aebe574cc0..b48ce0598b 100644
--- a/src/corelib/tools/qcryptographichash.cpp
+++ b/src/corelib/tools/qcryptographichash.cpp
@@ -41,6 +41,10 @@
 
 #include <qcryptographichash.h>
 
+#ifdef Q_OS_SYMBIAN
+#define _MD5_H_ // Needed to disable system header
+#endif
+
 #include "../../3rdparty/md5/md5.h"
 #include "../../3rdparty/md5/md5.cpp"
 #include "../../3rdparty/md4/md4.h"
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 2c2418c875..74fbe0aae6 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -2199,8 +2199,8 @@ int QTime::elapsed() const
     \sa isValid()
 */
 QDateTime::QDateTime()
+    : d(new QDateTimePrivate)
 {
-    d = new QDateTimePrivate;
 }
 
 
@@ -2210,8 +2210,8 @@ QDateTime::QDateTime()
 */
 
 QDateTime::QDateTime(const QDate &date)
+    : d(new QDateTimePrivate)
 {
-    d = new QDateTimePrivate;
     d->date = date;
     d->time = QTime(0, 0, 0);
 }
@@ -2224,8 +2224,8 @@ QDateTime::QDateTime(const QDate &date)
 */
 
 QDateTime::QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec)
+    : d(new QDateTimePrivate)
 {
-    d = new QDateTimePrivate;
     d->date = date;
     d->time = date.isValid() && !time.isValid() ? QTime(0, 0, 0) : time;
     d->spec = (spec == Qt::UTC) ? QDateTimePrivate::UTC : QDateTimePrivate::LocalUnknown;
@@ -2236,8 +2236,8 @@ QDateTime::QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec)
 */
 
 QDateTime::QDateTime(const QDateTime &other)
+    : d(other.d.data())
 {
-    d = other.d;
     d->ref.ref();
 }
 
@@ -2246,8 +2246,6 @@ QDateTime::QDateTime(const QDateTime &other)
 */
 QDateTime::~QDateTime()
 {
-    if (!d->ref.deref())
-        delete d;
 }
 
 /*!
@@ -2257,7 +2255,7 @@ QDateTime::~QDateTime()
 
 QDateTime &QDateTime::operator=(const QDateTime &other)
 {
-    qAtomicAssign(d, other.d);
+    d.assign(other.d.data());
     return *this;
 }
 
@@ -3290,7 +3288,7 @@ QDateTime QDateTime::fromString(const QString &string, const QString &format)
  */
 void QDateTime::detach()
 {
-    qAtomicDetach(d);
+    d.detach();
 }
 
 /*****************************************************************************
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h
index 5b94855216..b60c4d5938 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/tools/qdatetime.h
@@ -44,6 +44,7 @@
 
 #include <QtCore/qstring.h>
 #include <QtCore/qnamespace.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -284,7 +285,7 @@ public:
 private:
     friend class QDateTimePrivate;
     void detach();
-    QDateTimePrivate *d;
+    QScopedSharedPointer<QDateTimePrivate> d;
 
 #ifndef QT_NO_DATASTREAM
     friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QDateTime &);
diff --git a/src/corelib/tools/qharfbuzz.cpp b/src/corelib/tools/qharfbuzz.cpp
index cca6181cc0..3adc02277d 100644
--- a/src/corelib/tools/qharfbuzz.cpp
+++ b/src/corelib/tools/qharfbuzz.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qharfbuzz_p.h"
-
 #include "qunicodetables_p.h"
 #include "qlibrary.h"
 #include "qtextcodec.h"
 
+#include "qharfbuzz_p.h"
+
 QT_USE_NAMESPACE
 
 extern "C" {
@@ -126,6 +126,7 @@ char *HB_TextCodec_ConvertFromUnicode(void *codec, const HB_UChar16 *unicode, hb
     QByteArray data = reinterpret_cast<QTextCodec *>(codec)->fromUnicode((const QChar *)unicode, length);
     // ### suboptimal
     char *output = (char *)malloc(data.length() + 1);
+    Q_CHECK_PTR(output);
     memcpy(output, data.constData(), data.length() + 1);
     if (outputLength)
         *outputLength = data.length();
diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/tools/qharfbuzz_p.h
index 3492d2ebd7..4d7277ac05 100644
--- a/src/corelib/tools/qharfbuzz_p.h
+++ b/src/corelib/tools/qharfbuzz_p.h
@@ -53,8 +53,8 @@
 #ifndef QHARFBUZZ_P_H
 #define QHARFBUZZ_P_H
 
-#include <harfbuzz-shaper.h>
 #include <QtCore/qglobal.h>
+#include <harfbuzz-shaper.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index bdc9e1ac52..9507449842 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -171,7 +171,9 @@ QHashData QHashData::shared_null = {
 
 void *QHashData::allocateNode()
 {
-    return qMalloc(nodeSize);
+    void *ptr = qMalloc(nodeSize);
+    Q_CHECK_PTR(ptr);
+    return ptr;
 }
 
 void QHashData::freeNode(void *node)
@@ -181,6 +183,13 @@ void QHashData::freeNode(void *node)
 
 QHashData *QHashData::detach_helper(void (*node_duplicate)(Node *, void *), int nodeSize)
 {
+    return detach_helper( node_duplicate, 0, nodeSize );
+}
+
+QHashData *QHashData::detach_helper(void (*node_duplicate)(Node *, void *),
+        void (*node_delete)(Node *),
+        int nodeSize)
+{
     union {
         QHashData *d;
         Node *e;
@@ -197,18 +206,43 @@ QHashData *QHashData::detach_helper(void (*node_duplicate)(Node *, void *), int
     d->sharable = true;
 
     if (numBuckets) {
-        d->buckets = new Node *[numBuckets];
+        QT_TRY {
+            d->buckets = new Node *[numBuckets];
+        } QT_CATCH(...) {
+            // restore a consistent state for d
+            d->numBuckets = 0;
+            // roll back
+            d->free_helper(node_delete);
+            QT_RETHROW;
+        }
+
         Node *this_e = reinterpret_cast<Node *>(this);
         for (int i = 0; i < numBuckets; ++i) {
             Node **nextNode = &d->buckets[i];
             Node *oldNode = buckets[i];
             while (oldNode != this_e) {
-                Node *dup = static_cast<Node *>(allocateNode());
-                node_duplicate(oldNode, dup);
-                dup->h = oldNode->h;
-                *nextNode = dup;
-                nextNode = &dup->next;
-                oldNode = oldNode->next;
+                QT_TRY {
+                    Node *dup = static_cast<Node *>(allocateNode());
+
+                    QT_TRY {
+                        node_duplicate(oldNode, dup);
+                    } QT_CATCH(...) {
+                        freeNode( dup );
+                        QT_RETHROW;
+                    }
+
+                    dup->h = oldNode->h;
+                    *nextNode = dup;
+                    nextNode = &dup->next;
+                    oldNode = oldNode->next;
+                } QT_CATCH(...) {
+                    // restore a consistent state for d
+                    *nextNode = e;
+                    d->numBuckets = i+1;
+                    // roll back
+                    d->free_helper(node_delete);
+                    QT_RETHROW;
+                }
             }
             *nextNode = e;
         }
@@ -216,6 +250,26 @@ QHashData *QHashData::detach_helper(void (*node_duplicate)(Node *, void *), int
     return d;
 }
 
+void QHashData::free_helper(void (*node_delete)(Node *))
+{
+    if (node_delete) {
+        Node *this_e = reinterpret_cast<Node *>(this);
+        Node **bucket = reinterpret_cast<Node **>(this->buckets);
+
+        int n = numBuckets;
+        while (n--) {
+            Node *cur = *bucket++;
+            while (cur != this_e) {
+                Node *next = cur->next;
+                node_delete(cur);
+                cur = next;
+            }
+        }
+    }
+    delete [] buckets;
+    delete this;
+}
+
 QHashData::Node *QHashData::nextNode(Node *node)
 {
     union {
@@ -298,9 +352,10 @@ void QHashData::rehash(int hint)
         Node **oldBuckets = buckets;
         int oldNumBuckets = numBuckets;
 
+        int nb = primeForNumBits(hint);
+        buckets = new Node *[nb];
         numBits = hint;
-        numBuckets = primeForNumBits(hint);
-        buckets = new Node *[numBuckets];
+        numBuckets = nb;
         for (int i = 0; i < numBuckets; ++i)
             buckets[i] = e;
 
@@ -327,8 +382,7 @@ void QHashData::rehash(int hint)
 
 void QHashData::destroyAndFree()
 {
-    delete [] buckets;
-    delete this;
+    free_helper(0);
 }
 
 #ifdef QT_QHASH_DEBUG
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h
index e6a256bad9..d1a3386897 100644
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -129,12 +129,15 @@ struct Q_CORE_EXPORT QHashData
 
     void *allocateNode();
     void freeNode(void *node);
-    QHashData *detach_helper(void (*node_duplicate)(Node *, void *), int nodeSize);
+    QHashData *detach_helper(void (*node_duplicate)(Node *, void *), int nodeSize); // ### Qt5 remove me
+    QHashData *detach_helper(void (*node_duplicate)(Node *, void *), void (*node_delete)(Node *),
+            int nodeSize);
     void mightGrow();
     bool willGrow();
     void hasShrunk();
     void rehash(int hint);
-    void destroyAndFree();
+    void free_helper(void (*node_delete)(Node *));
+    void destroyAndFree(); // ### Qt5 remove me
     Node *firstNode();
 #ifdef QT_QHASH_DEBUG
     void dump();
@@ -476,21 +479,30 @@ private:
     Node **findNode(const Key &key, uint *hp = 0) const;
     Node *createNode(uint h, const Key &key, const T &value, Node **nextNode);
     void deleteNode(Node *node);
+    static void deleteNode(QHashData::Node *node);
 
     static void duplicateNode(QHashData::Node *originalNode, void *newNode);
 };
 
+
 template <class Key, class T>
 Q_INLINE_TEMPLATE void QHash<Key, T>::deleteNode(Node *node)
 {
+    deleteNode(reinterpret_cast<QHashData::Node*>(node));
+}
+
+
+template <class Key, class T>
+Q_INLINE_TEMPLATE void QHash<Key, T>::deleteNode(QHashData::Node *node)
+{
 #ifdef Q_CC_BOR
-    node->~QHashNode<Key, T>();
+    concrete(node)->~QHashNode<Key, T>();
 #elif defined(QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION)
-    node->~QHashNode();
+    concrete(node)->~QHashNode();
 #else
-    node->~Node();
+    concrete(node)->~Node();
 #endif
-    d->freeNode(node);
+    qFree(node);
 }
 
 template <class Key, class T>
@@ -538,18 +550,7 @@ Q_INLINE_TEMPLATE QHash<Key, T> &QHash<Key, T>::unite(const QHash<Key, T> &other
 template <class Key, class T>
 Q_OUTOFLINE_TEMPLATE void QHash<Key, T>::freeData(QHashData *x)
 {
-    Node *e_for_x = reinterpret_cast<Node *>(x);
-    Node **bucket = reinterpret_cast<Node **>(x->buckets);
-    int n = x->numBuckets;
-    while (n--) {
-        Node *cur = *bucket++;
-        while (cur != e_for_x) {
-            Node *next = cur->next;
-            deleteNode(cur);
-            cur = next;
-        }
-    }
-    x->destroyAndFree();
+    x->free_helper(deleteNode);
 }
 
 template <class Key, class T>
@@ -561,7 +562,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::clear()
 template <class Key, class T>
 Q_OUTOFLINE_TEMPLATE void QHash<Key, T>::detach_helper()
 {
-    QHashData *x = d->detach_helper(duplicateNode,
+    QHashData *x = d->detach_helper(duplicateNode, deleteNode,
         QTypeInfo<T>::isDummy ? sizeof(DummyNode) : sizeof(Node));
     if (!d->ref.deref())
         freeData(d);
@@ -911,7 +912,8 @@ public:
     inline QMultiHash operator+(const QMultiHash &other) const
     { QMultiHash result = *this; result += other; return result; }
 
-#ifndef Q_NO_USING_KEYWORD
+#if !defined(Q_NO_USING_KEYWORD) && !defined(Q_CC_RVCT)
+    // RVCT compiler doesn't handle using-keyword right when used functions are overloaded in child class
     using QHash<Key, T>::contains;
     using QHash<Key, T>::remove;
     using QHash<Key, T>::count;
@@ -981,7 +983,12 @@ Q_INLINE_TEMPLATE int QMultiHash<Key, T>::remove(const Key &key, const T &value)
     typename QHash<Key, T>::iterator end(QHash<Key, T>::end());
     while (i != end && i.key() == key) {
         if (i.value() == value) {
+#if defined(Q_CC_RVCT)  
+            // RVCT has problems with scoping, apparently.      
+            i = QHash<Key, T>::erase(i);
+#else
             i = erase(i);
+#endif            
             ++n;
         } else {
             ++i;
diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h
index 022cb42208..a639f19132 100644
--- a/src/corelib/tools/qlinkedlist.h
+++ b/src/corelib/tools/qlinkedlist.h
@@ -265,15 +265,22 @@ void QLinkedList<T>::detach_helper()
     x.d->ref = 1;
     x.d->size = d->size;
     x.d->sharable = true;
-    Node *i = e->n, *j = x.e;
-    while (i != e) {
-        j->n = new Node(i->t);
-        j->n->p = j;
-        i = i->n;
-        j = j->n;
+    Node *original = e->n;
+    Node *copy = x.e;
+    while (original != e) {
+        QT_TRY {
+            copy->n = new Node(original->t);
+            copy->n->p = copy;
+            original = original->n;
+            copy = copy->n;
+        } QT_CATCH(...) {
+            copy->n = x.e;
+            free(x.d);
+            QT_RETHROW;
+        }
     }
-    j->n = x.e;
-    x.e->p = j;
+    copy->n = x.e;
+    x.e->p = copy;
     if (!d->ref.deref())
         free(d);
     d = x.d;
@@ -474,14 +481,21 @@ QLinkedList<T> &QLinkedList<T>::operator+=(const QLinkedList<T> &l)
     detach();
     int n = l.d->size;
     d->size += n;
-    Node *o = l.e->n;
+    Node *original = l.e->n;
     while (n--) {
-        Node *i = new Node(o->t);
-        o = o->n;
-        i->n = e;
-        i->p = e->p;
-        i->p->n = i;
-        e->p = i;
+        QT_TRY {
+            Node *copy = new Node(original->t);
+            original = original->n;
+            copy->n = e;
+            copy->p = e->p;
+            copy->p->n = copy;
+            e->p = copy;
+        } QT_CATCH(...) {
+            // restore the original list
+            while (n++<d->size)
+                removeLast();
+            QT_RETHROW;
+        }
     }
     return *this;
 }
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index a2c5ed834b..a56518bf12 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -117,6 +117,14 @@ public:
     inline int size() const { return p.size(); }
 
     inline void detach() { if (d->ref != 1) detach_helper(); }
+
+    inline void detachShared()
+    {
+        // The "this->" qualification is needed for GCCE.
+        if (d->ref != 1 && this->d != &QListData::shared_null)
+            detach_helper();
+    }
+
     inline bool isDetached() const { return d->ref == 1; }
     inline void setSharable(bool sharable) { if (!sharable) detach(); d->sharable = sharable; }
 
@@ -352,12 +360,27 @@ Q_INLINE_TEMPLATE void QList<T>::node_destruct(Node *n)
 template <typename T>
 Q_INLINE_TEMPLATE void QList<T>::node_copy(Node *from, Node *to, Node *src)
 {
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic)
-        while(from != to)
-            (from++)->v = new T(*reinterpret_cast<T*>((src++)->v));
-    else if (QTypeInfo<T>::isComplex)
-        while(from != to)
-            new (from++) T(*reinterpret_cast<T*>(src++));
+    Node *current = from;
+    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
+        QT_TRY {
+            while(current != to)
+                (current++)->v = new T(*reinterpret_cast<T*>((src++)->v));
+        } QT_CATCH(...) {
+            while (current != from)
+                delete reinterpret_cast<T*>(current--);
+            QT_RETHROW;
+        }
+    }
+    else if (QTypeInfo<T>::isComplex) {
+        QT_TRY {
+            while(current != to)
+                new (current++) T(*reinterpret_cast<T*>(src++));
+        } QT_CATCH(...) {
+            while (current != from)
+                (reinterpret_cast<T*>(current--))->~T();
+            QT_RETHROW;
+        }
+    }
 }
 
 template <typename T>
@@ -384,8 +407,16 @@ Q_INLINE_TEMPLATE QList<T> &QList<T>::operator=(const QList<T> &l)
 }
 template <typename T>
 inline typename QList<T>::iterator QList<T>::insert(iterator before, const T &t)
-{ Node *n = reinterpret_cast<Node *>(p.insert(before.i-reinterpret_cast<Node *>(p.begin())));
- node_construct(n,t); return n; }
+{
+    Node *n = reinterpret_cast<Node *>(p.insert(before.i - reinterpret_cast<Node *>(p.begin())));
+    QT_TRY {
+        node_construct(n, t);
+    } QT_CATCH(...) {
+        p.remove(before.i - reinterpret_cast<Node *>(p.begin()));
+        QT_RETHROW;
+    }
+    return n;
+}
 template <typename T>
 inline typename QList<T>::iterator QList<T>::erase(iterator it)
 { node_destruct(it.i);
@@ -423,10 +454,22 @@ Q_OUTOFLINE_TEMPLATE void QList<T>::append(const T &t)
 {
     detach();
     if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-        node_construct(reinterpret_cast<Node *>(p.append()), t);
+        Node *n = reinterpret_cast<Node *>(p.append());
+        QT_TRY {
+            node_construct(n, t);
+        } QT_CATCH(...) {
+            --d->end;
+            QT_RETHROW;
+        }
     } else {
         const T cpy(t);
-        node_construct(reinterpret_cast<Node *>(p.append()), cpy);
+        Node *n = reinterpret_cast<Node *>(p.append());
+        QT_TRY {
+            node_construct(n, cpy);
+        } QT_CATCH(...) {
+            --d->end;
+            QT_RETHROW;
+        }
     }
 }
 
@@ -435,10 +478,22 @@ inline void QList<T>::prepend(const T &t)
 {
     detach();
     if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-        node_construct(reinterpret_cast<Node *>(p.prepend()), t);
+        Node *n = reinterpret_cast<Node *>(p.prepend());
+        QT_TRY {
+            node_construct(n, t);
+        } QT_CATCH(...) {
+            ++d->begin;
+            QT_RETHROW;
+        }
     } else {
         const T cpy(t);
-        node_construct(reinterpret_cast<Node *>(p.prepend()), cpy);
+        Node *n = reinterpret_cast<Node *>(p.prepend());
+        QT_TRY {
+            node_construct(n, cpy);
+        } QT_CATCH(...) {
+            ++d->begin;
+            QT_RETHROW;
+        }
     }
 }
 
@@ -447,10 +502,22 @@ inline void QList<T>::insert(int i, const T &t)
 {
     detach();
     if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-        node_construct(reinterpret_cast<Node *>(p.insert(i)), t);
+        Node *n = reinterpret_cast<Node *>(p.insert(i));
+        QT_TRY {
+            node_construct(n, t);
+        } QT_CATCH(...) {
+            p.remove(i);
+            QT_RETHROW;
+        }
     } else {
         const T cpy(t);
-        node_construct(reinterpret_cast<Node *>(p.insert(i)), cpy);
+        Node *n = reinterpret_cast<Node *>(p.insert(i));
+        QT_TRY {
+            node_construct(n, cpy);
+        } QT_CATCH(...) {
+            p.remove(i);
+            QT_RETHROW;
+        }
     }
 }
 
@@ -522,7 +589,14 @@ Q_OUTOFLINE_TEMPLATE void QList<T>::detach_helper()
 {
     Node *n = reinterpret_cast<Node *>(p.begin());
     QListData::Data *x = p.detach2();
-    node_copy(reinterpret_cast<Node *>(p.begin()), reinterpret_cast<Node *>(p.end()), n);
+    QT_TRY {
+        node_copy(reinterpret_cast<Node *>(p.begin()), reinterpret_cast<Node *>(p.end()), n);
+    } QT_CATCH(...) {
+        qFree(d);
+        d = x;
+        QT_RETHROW;
+    }
+
     if (!x->ref.deref())
         free(x);
 }
@@ -572,7 +646,7 @@ Q_OUTOFLINE_TEMPLATE void QList<T>::clear()
 template <typename T>
 Q_OUTOFLINE_TEMPLATE int QList<T>::removeAll(const T &_t)
 {
-    detach();
+    detachShared();
     const T t = _t;
     int removedCount=0, i=0;
     Node *n;
@@ -590,7 +664,7 @@ Q_OUTOFLINE_TEMPLATE int QList<T>::removeAll(const T &_t)
 template <typename T>
 Q_OUTOFLINE_TEMPLATE bool QList<T>::removeOne(const T &_t)
 {
-    detach();
+    detachShared();
     int index = indexOf(_t);
     if (index != -1) {
         removeAt(index);
diff --git a/src/corelib/tools/qlistdata.cpp b/src/corelib/tools/qlistdata.cpp
index 120693740f..3c45bed157 100644
--- a/src/corelib/tools/qlistdata.cpp
+++ b/src/corelib/tools/qlistdata.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include <new>
 #include "qlist.h"
 #include "qtools_p.h"
 #include <string.h>
@@ -71,8 +72,7 @@ static int grow(int size)
 QListData::Data *QListData::detach()
 {
     Data *x = static_cast<Data *>(qMalloc(DataHeaderSize + d->alloc * sizeof(void *)));
-    if (!x)
-        qFatal("QList: Out of memory");
+    Q_CHECK_PTR(x);
 
     ::memcpy(x, d, DataHeaderSize + d->alloc * sizeof(void *));
     x->alloc = d->alloc;
@@ -91,10 +91,10 @@ QListData::Data *QListData::detach()
 QListData::Data *QListData::detach2()
 {
     Data *x = d;
-    d = static_cast<Data *>(qMalloc(DataHeaderSize + x->alloc * sizeof(void *)));
-    if (!d)
-        qFatal("QList: Out of memory");
+    Data* t = static_cast<Data *>(qMalloc(DataHeaderSize + x->alloc * sizeof(void *)));
+    Q_CHECK_PTR(t);
 
+    d = t;
     ::memcpy(d, x, DataHeaderSize + x->alloc * sizeof(void *));
     d->alloc = x->alloc;
     d->ref = 1;
@@ -109,8 +109,7 @@ void QListData::realloc(int alloc)
 {
     Q_ASSERT(d->ref == 1);
     Data *x = static_cast<Data *>(qRealloc(d, DataHeaderSize + alloc * sizeof(void *)));
-    if (!x)
-        qFatal("QList: Out of memory");
+    Q_CHECK_PTR(x);
 
     d = x;
     d->alloc = alloc;
@@ -514,6 +513,15 @@ void **QListData::erase(void **xi)
     \internal
 */
 
+/*! \fn void QList::detachShared()
+
+    \internal
+
+    like detach(), but does nothing if we're shared_null.
+    This prevents needless mallocs, and makes QList more exception safe
+    in case of cleanup work done in destructors on empty lists.
+*/
+
 /*! \fn bool QList::isDetached() const
 
     \internal
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 8608fe4067..e66f533ab8 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -122,6 +122,13 @@ Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
 static qlonglong qstrtoll(const char *nptr, const char **endptr, register int base, bool *ok);
 static qulonglong qstrtoull(const char *nptr, const char **endptr, register int base, bool *ok);
 
+#if defined(Q_CC_MWERKS) && defined(Q_OS_WIN32)
+inline bool isascii(int c)
+{
+	return (c >= 0 && c <=127);
+}
+#endif
+
 /******************************************************************************
 ** Helpers for accessing Qt locale database
 */
@@ -288,7 +295,7 @@ static bool splitLocaleName(const QString &name, QChar *lang_begin, QChar *cntry
     return lang_len == 2 || lang_len == 3;
 }
 
-static void getLangAndCountry(const QString &name, QLocale::Language &lang, QLocale::Country &cntry)
+void getLangAndCountry(const QString &name, QLocale::Language &lang, QLocale::Country &cntry)
 {
     lang = QLocale::C;
     cntry = QLocale::AnyCountry;
@@ -1199,7 +1206,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
     return QVariant();
 }
 
-#elif defined(Q_OS_UNIX)
+#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
 
 static uint unixGetSystemMeasurementSystem()
 {
@@ -1243,7 +1250,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant /* in */) const
     }
 }
 
-#else
+#elif !defined(Q_OS_SYMBIAN)
 
 /*!
     Returns a fallback locale, that will get used for everything that
@@ -5050,6 +5057,7 @@ static Bigint *Balloc(int k)
 
     x = 1 << k;
     rv = static_cast<Bigint *>(MALLOC(sizeof(Bigint) + (x-1)*sizeof(Long)));
+    Q_CHECK_PTR(rv);
     rv->k = k;
     rv->maxwds = x;
     rv->sign = rv->wds = 0;
@@ -6727,6 +6735,7 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt,
             i = 1;
     }
     *resultp = static_cast<char *>(malloc(i + 1));
+    Q_CHECK_PTR(resultp);
     s = s0 = *resultp;
 
     if (ilim >= 0 && ilim <= Quick_max && try_quick) {
@@ -7148,6 +7157,7 @@ Q_CORE_EXPORT char *qdtoa( double d, int mode, int ndigits, int *decpt, int *sig
         n = i + 1;
     }
     *resultp = static_cast<char*>(malloc(n + 1));
+    Q_CHECK_PTR(resultp);
     qstrncpy(*resultp, res, n + 1);
     return *resultp;
 }
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
new file mode 100644
index 0000000000..976227d43b
--- /dev/null
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -0,0 +1,879 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDate>
+#include <QLocale>
+#include <QTime>
+#include <QVariant>
+
+#include <e32std.h>
+#include "private/qcore_symbian_p.h"
+
+
+QT_BEGIN_NAMESPACE
+
+// Located in qlocale.cpp
+extern void getLangAndCountry(const QString &name, QLocale::Language &lang, QLocale::Country &cntry);
+
+static TExtendedLocale _s60Locale;
+
+// Type definitions for runtime resolved function pointers
+typedef void (*FormatFunc)(TTime&, TDes&, const TDesC&, const TLocale&);
+typedef TPtrC (*FormatSpecFunc)(TExtendedLocale&);
+
+// Runtime resolved functions
+static FormatFunc ptrTimeFormatL = NULL;
+static FormatSpecFunc ptrGetTimeFormatSpec = NULL;
+static FormatSpecFunc ptrGetLongDateFormatSpec = NULL;
+static FormatSpecFunc ptrGetShortDateFormatSpec = NULL;
+
+// Default functions if functions cannot be resolved
+static void defaultTimeFormatL(TTime&, TDes& des, const TDesC&, const TLocale&)
+{
+    des.Zero();
+}
+
+static TPtrC defaultFormatSpec(TExtendedLocale&)
+{
+    return TPtrC(KNullDesC);
+}
+
+/*!
+    Definition of struct for mapping Symbian to ISO locale
+*/
+struct symbianToISO {
+    int symbian_language;
+    char iso_name[8];
+};
+
+
+/*!
+    Mapping from Symbian to ISO locale
+*/
+static const symbianToISO symbian_to_iso_list[] = {
+    { ELangEnglish,             "en_GB" },
+    { ELangFrench,              "fr_FR" },
+    { ELangGerman,              "de_DE" },
+    { ELangSpanish,             "es_ES" },
+    { ELangItalian,             "it_IT" },
+    { ELangSwedish,             "sv_SE" },
+    { ELangDanish,              "da_DK" },
+    { ELangNorwegian,           "no_NO" },
+    { ELangFinnish,             "fi_FI" },
+    { ELangAmerican,            "en_US" },
+    { ELangPortuguese,          "pt_PT" },
+    { ELangTurkish,             "tr_TR" },
+    { ELangIcelandic,           "is_IS" },
+    { ELangRussian,             "ru_RU" },
+    { ELangHungarian,           "hu_HU" },
+    { ELangDutch,               "nl_NL" },
+    { ELangBelgianFlemish,      "nl_BE" },
+    { ELangCzech,               "cs_CZ" },
+    { ELangSlovak,              "sk_SK" },
+    { ELangPolish,              "pl_PL" },
+    { ELangSlovenian,           "sl_SI" },
+    { ELangTaiwanChinese,       "zh_TW" },
+    { ELangHongKongChinese,     "zh_HK" },
+    { ELangPrcChinese,          "zh_CN" },
+    { ELangJapanese,            "ja_JP" },
+    { ELangThai,                "th_TH" },
+    { ELangArabic,              "ar_AE" },
+    { ELangTagalog,             "tl_PH" },
+    { ELangBulgarian,           "bg_BG" },
+    { ELangCatalan,             "ca_ES" },
+    { ELangCroatian,            "hr_HR" },
+    { ELangEstonian,            "et_EE" },
+    { ELangFarsi,               "fa_IR" },
+    { ELangCanadianFrench,      "fr_CA" },
+    { ELangGreek,               "el_GR" },
+    { ELangHebrew,              "he_IL" },
+    { ELangHindi,               "hi_IN" },
+    { ELangIndonesian,          "id_ID" },
+    { ELangLatvian,             "lv_LV" },
+    { ELangLithuanian,          "lt_LT" },
+    { ELangMalay,               "ms_MY" },
+    { ELangBrazilianPortuguese, "pt_BR" },
+    { ELangRomanian,            "ro_RO" },
+    { ELangSerbian,             "sr_YU" },
+    { ELangLatinAmericanSpanish, "es" },
+    { ELangUkrainian,           "uk_UA" },
+    { ELangUrdu,                "ur_PK" }, // India/Pakistan
+    { ELangVietnamese,          "vi_VN" },
+#ifdef __E32LANG_H__
+// 5.0
+    { ELangBasque,              "eu_ES" },
+    { ELangGalician,            "gl_ES" },
+#endif
+#if !defined(__SERIES60_31__)
+    { ELangEnglish_Apac,        "en" },
+    { ELangEnglish_Taiwan,      "en_TW" },
+    { ELangEnglish_HongKong,    "en_HK" },
+    { ELangEnglish_Prc,         "en_CN" },
+    { ELangEnglish_Japan,       "en_JP"},
+    { ELangEnglish_Thailand,    "en_TH" },
+    { ELangMalay_Apac,          "ms" }
+#endif
+};
+
+/*!
+    Returns ISO name corresponding to the Symbian locale code \a sys_fmt.
+*/
+static QByteArray symbianLocaleName(int code)
+{
+    //Number of Symbian to ISO locale mappings
+    static const int symbian_to_iso_count
+        = sizeof(symbian_to_iso_list)/sizeof(symbianToISO);
+
+    int cmp = code - symbian_to_iso_list[0].symbian_language;
+    if (cmp < 0)
+        return 0;
+
+    if (cmp == 0)
+        return symbian_to_iso_list[0].iso_name;
+
+    int begin = 0;
+    int end = symbian_to_iso_count;
+
+    while (end - begin > 1) {
+        uint mid = (begin + end)/2;
+
+        const symbianToISO *elt = symbian_to_iso_list + mid;
+        int cmp = code - elt->symbian_language;
+        if (cmp < 0)
+            end = mid;
+        else if (cmp > 0)
+            begin = mid;
+        else
+            return elt->iso_name;
+    }
+
+    return 0;
+}
+
+
+// order is: normal, abbr, nmode, nmode+abbr
+static const char *us_locale_dep[] = {
+    "MM", "dd", "yyyy", "MM", "dd",
+    "M", "d", "yy", "M", "d",
+    "MMMM", "dd", "yyyy", "MMMM", "dd",
+    "MMM", "d", "yy", "MMM", "d" };
+
+static const char *eu_locale_dep[] = {
+    "dd", "MM", "yyyy", "dd", "MM",
+    "d", "M", "yy", "d", "M",
+    "dd", "MMMM", "yyyy", "dd", "MMMM",
+    "d", "MMM", "yy", "d", "MMM" };
+
+static const char *jp_locale_dep[] = {
+    "yyyy", "MM", "dd", "MM", "dd",
+    "yy", "M", "d", "M", "d",
+    "yyyy", "MMMM", "dd", "MMMM", "dd",
+    "yy", "MMM", "d", "MMM", "d" };
+
+/*!
+    Returns a Qt version of the given \a sys_fmt Symbian locale format string.
+*/
+static QString s60ToQtFormat(const QString &sys_fmt)
+{
+    TLocale *locale = _s60Locale.GetLocale();
+
+    QString result;
+    QString other;
+    QString qtformatchars = QString::fromLatin1("adhmsyzAHM");
+
+    QChar c;
+    int i = 0;
+    bool open_escape = false;
+    bool abbrev_next = false;
+    bool locale_indep_ordering = false;
+    bool minus_mode = false;
+    bool plus_mode = false;
+    bool n_mode = false;
+    TTimeFormat tf = locale->TimeFormat();
+
+    while (i < sys_fmt.size()) {
+
+        c = sys_fmt.at(i);
+
+        // let formatting thru
+        if (c.unicode() == '%') {
+            // if we have gathered string, concat it
+            if (!other.isEmpty()) {
+                result += other;
+                other.clear();
+            }
+            // if we have open escape, end it
+            if (open_escape) {
+                result += QLatin1Char('\'');
+                open_escape = false;
+            }
+
+            ++i;
+            if (i >= sys_fmt.size())
+                break;
+
+            c = sys_fmt.at(i);
+
+            // process specials
+            abbrev_next = c.unicode() == '*';
+            plus_mode = c.unicode() == '+';
+            minus_mode = c.unicode() == '-';
+
+            if (abbrev_next || plus_mode || minus_mode) {
+                ++i;
+                if (i >= sys_fmt.size())
+                    break;
+
+                c = sys_fmt.at(i);
+
+                if (plus_mode || minus_mode) {
+                    // break on undefined plus/minus mode
+                    if (c.unicode() != 'A' && c.unicode() != 'B')
+                        break;
+                }
+            }
+
+            switch (c.unicode()) {
+                case 'F':
+                {
+                    // locale indep mode on
+                    locale_indep_ordering = true;
+                    break;
+                }
+
+                case '/':
+                {
+                    // date sep 0-3
+                    ++i;
+                    if (i >= sys_fmt.size())
+                        break;
+
+                    c = sys_fmt.at(i);
+                    if (c.isDigit() && c.digitValue() <= 3) {
+                        TChar s = locale->DateSeparator(c.digitValue());
+                        TUint val = s;
+                        // some indexes return zero for empty
+                        if (val > 0)
+                            result += QChar(val);
+                    }
+                    break;
+                }
+
+                case 'D':
+                {
+                    if (!locale_indep_ordering)
+                        break;
+
+                    if (!abbrev_next)
+                        result += QLatin1String("dd");
+                    else
+                        result += QLatin1Char('d');
+
+                    break;
+                }
+
+                case 'M':
+                {
+                    if (!locale_indep_ordering)
+                        break;
+
+                    if (!n_mode) {
+                        if (!abbrev_next)
+                            result += QLatin1String("MM");
+                        else
+                            result += QLatin1String("M");
+                    } else {
+                        if (!abbrev_next)
+                            result += QLatin1String("MMMM");
+                        else
+                            result += QLatin1String("MMM");
+                    }
+
+                    break;
+                }
+
+                case 'N':
+                {
+                    n_mode = true;
+
+                    if (!locale_indep_ordering)
+                        break;
+
+                    if (!abbrev_next)
+                        result += QLatin1String("MMMM");
+                    else
+                        result += QLatin1String("MMM");
+
+                    break;
+                }
+
+                case 'Y':
+                {
+                    if (!locale_indep_ordering)
+                        break;
+
+                    if (!abbrev_next)
+                        result += QLatin1String("yyyy");
+                    else
+                        result += QLatin1String("yy");
+
+                    break;
+                }
+
+                case 'E':
+                {
+                    if (!abbrev_next)
+                        result += QLatin1String("dddd");
+                    else
+                        result += QLatin1String("ddd");
+
+                    break;
+                }
+
+                case ':':
+                {
+                    // timesep 0-3
+                    ++i;
+                    if (i >= sys_fmt.size())
+                        break;
+
+                    c = sys_fmt.at(i);
+                    if (c.isDigit() && c.digitValue() <= 3) {
+                        TChar s = locale->TimeSeparator(c.digitValue());
+                        TUint val = s;
+                        // some indexes return zero for empty
+                        if (val > 0)
+                            result += QChar(val);
+                    }
+
+                    break;
+                }
+
+                case 'J':
+                {
+                    if (tf == ETime24 && !abbrev_next)
+                        result += QLatin1String("hh");
+                    else
+                        result += QLatin1Char('h');
+
+                    break;
+                }
+
+                case 'H':
+                {
+                    if (!abbrev_next)
+                        result += QLatin1String("hh");
+                    else
+                        result += QLatin1Char('h');
+
+                    break;
+                }
+
+                case 'I':
+                {
+                    result += QLatin1Char('h');
+                    break;
+                }
+
+                case 'T':
+                {
+                    if (!abbrev_next)
+                        result += QLatin1String("mm");
+                    else
+                        result += QLatin1Char('m');
+
+                    break;
+                }
+
+                case 'S':
+                {
+                    if (!abbrev_next)
+                        result += QLatin1String("ss");
+                    else
+                        result += QLatin1Char('s');
+
+                    break;
+                }
+
+                case 'B':
+                {
+                    // only done for 12h clock
+                    if (tf == ETime24)
+                        break;
+                }
+
+                    // fallthru to A
+                case 'A': {
+                    // quickie to get capitalization, can't use s60 string as is because Qt 'hh' format's am/pm logic
+                    TAmPmName ampm = TAmPmName();
+                    TChar first(ampm[0]);
+                    QString qtampm = QString::fromLatin1(first.IsUpper() ? "AP" : "ap");
+
+                    int pos = locale->AmPmSymbolPosition();
+
+                    if ((minus_mode && pos != ELocaleBefore) ||
+                        (plus_mode && pos != ELocaleAfter))
+                        break;
+
+                    if (!abbrev_next && locale->AmPmSpaceBetween()) {
+                        if (pos == ELocaleBefore)
+                            qtampm.append(QLatin1Char(' '));
+                        else
+                            qtampm.prepend(QLatin1Char(' '));
+                    }
+
+                    result += qtampm;
+                    }
+                    break;
+
+                case '.': {
+                        // decimal sep
+                        TChar s = locale->DecimalSeparator();
+                        TUint val = s;
+                        if (val > 0)
+                            result += QChar(val);
+                    }
+                    break;
+
+                case 'C':
+                {
+                    // six digits in s60, three digits in qt
+                    if (!abbrev_next) {
+                        result += QLatin1String("zzz");
+                    } else {
+                        // next char is number from 0-6, how many digits to display
+                        ++i;
+                        if (i >= sys_fmt.size())
+                            break;
+
+                        c = sys_fmt.at(i);
+
+                        if (c.isDigit()) {
+                            // try to match wanted digits
+                            QChar val(c.digitValue());
+
+                            if (val >= 3) {
+                                result += QLatin1String("zzz");
+                            } else if (val > 0) {
+                                result += QLatin1Char('z');
+                            }
+                        }
+                    }
+                    break;
+                }
+
+                // these cases fallthru
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                {
+
+                    // shouldn't parse these with %F
+                    if (locale_indep_ordering)
+                        break;
+
+                    TDateFormat df = locale->DateFormat();
+
+                    const char **locale_dep;
+                    switch (df) {
+                        default: // fallthru to american
+                        case EDateAmerican:
+                            locale_dep = us_locale_dep;
+                            break;
+                        case EDateEuropean:
+                            locale_dep = eu_locale_dep;
+                            break;
+                        case EDateJapanese:
+                            locale_dep = jp_locale_dep;
+                            break;
+                    }
+                    int offset = 0;
+                    if (abbrev_next)
+                        offset += 5;
+                    if (n_mode)
+                        offset += 10;
+
+                    result += QLatin1String(locale_dep[offset + (c.digitValue()-1)]);
+                    break;
+                }
+
+                case '%': // fallthru percent
+                {
+                // any junk gets copied as is
+                }
+                default:
+                {
+                    result += c;
+                    break;
+                }
+
+                case 'Z': // Qt doesn't support these :(
+                case 'X':
+                case 'W':
+                {
+                    break;
+                }
+            }
+        } else {
+            // double any single quotes, don't begin escape
+            if (c.unicode() == '\'') {
+                // end open escape
+                if (open_escape) {
+                    result += other;
+                    other.clear();
+                    result += QLatin1Char('\'');
+                    open_escape = false;
+                }
+
+                other += c;
+            }
+
+            // gather chars and escape them in one go if any format chars are found
+            if (!open_escape && qtformatchars.indexOf(c) != -1) {
+                result += QLatin1Char('\'');
+                open_escape = true;
+            }
+            other += c;
+        }
+
+        ++i;
+    }
+
+    if (!other.isEmpty())
+        result += other;
+    if (open_escape)
+        result += QLatin1Char('\'');
+
+    return result;
+}
+
+/*!
+    Retrieves Symbian locale decimal separator.
+*/
+static QString symbianDecimalPoint()
+{
+    TLocale *locale = _s60Locale.GetLocale();
+
+    TChar decPoint = locale->DecimalSeparator();
+    int val = decPoint;
+    return QChar(val);
+}
+
+/*!
+    Retrieves Symbian locale group separator.
+*/
+static QString symbianGroupSeparator()
+{
+    TLocale *locale = _s60Locale.GetLocale();
+
+    TChar grpSep = locale->ThousandsSeparator();
+    int val = grpSep;
+    return QChar(val);
+}
+
+/*!
+    Retrieves Symbian locale zero digit.
+*/
+static QString symbianZeroDigit()
+{
+    TLocale *locale = _s60Locale.GetLocale();
+
+    // TDigitType enumeration value returned by TLocale
+    // will always correspond to zero digit unicode value.
+    TDigitType digit = locale->DigitType();
+    return QChar(digit);
+}
+
+/*!
+    Retrieves a day name from Symbian locale. The \a day is an integer
+    from 1 to 7. When \a short_format is true the method returns
+    the day in short format. Otherwise it returns the day in a long format.
+*/
+static QString symbianDayName(int day, bool short_format)
+{
+    day -= 1;
+
+    if (day < 0 || day > 6)
+        return QString();
+
+    if (short_format) {
+        return qt_TDes2QStringL(TDayNameAbb(TDay(day)));
+    } else {
+        return qt_TDes2QStringL(TDayName(TDay(day)));
+    }
+}
+
+/*!
+    Retrieves a month name from Symbian locale. The \a month is an integer
+    from 1 to 12. When \a short_format is true the method returns
+    the month in short format. Otherwise it returns the month in a long format.
+*/
+static QString symbianMonthName(int month, bool short_format)
+{
+    month -= 1;
+    if (month < 0 || month > 11)
+        return QString();
+
+    if (short_format) {
+        return qt_TDes2QStringL(TMonthNameAbb(TMonth(month)));
+    } else {
+        return qt_TDes2QStringL(TMonthName(TMonth(month)));
+    }
+}
+
+/*!
+    Retrieves date format from Symbian locale and
+    transforms it to Qt format.
+
+    When \a short_format is true the method returns
+    short date format. Otherwise it returns the long format.
+*/
+static QString symbianDateFormat(bool short_format)
+{
+    TPtrC dateFormat;
+
+    if (short_format) {
+        dateFormat.Set(ptrGetShortDateFormatSpec(_s60Locale));
+    } else {
+        dateFormat.Set(ptrGetLongDateFormatSpec(_s60Locale));
+    }
+
+    return s60ToQtFormat(qt_TDesC2QStringL(dateFormat));
+}
+
+/*!
+    Retrieves time format from Symbian locale and
+    transforms it to Qt format.
+*/
+static QString symbianTimeFormat()
+{
+    return s60ToQtFormat(qt_TDesC2QStringL(ptrGetTimeFormatSpec(_s60Locale)));
+}
+
+/*!
+    Returns localized string representation of given \a date
+    formatted with Symbian locale date format.
+
+    If \a short_format is true the format will be a short version.
+    Otherwise it uses a longer version.
+*/
+static QString symbianDateToString(const QDate &date, bool short_format)
+{
+    int month = date.month() - 1;
+    int day = date.day() - 1;
+    int year = date.year();
+
+    TDateTime dateTime;
+    dateTime.Set(year, TMonth(month), day, 0, 0, 0, 0);
+
+    TTime timeStr(dateTime);
+    TBuf<KMaxLongDateFormatSpec*2> buffer;
+
+    TPtrC dateFormat;
+    if (short_format) {
+        dateFormat.Set(ptrGetShortDateFormatSpec(_s60Locale));
+    } else {
+        dateFormat.Set(ptrGetLongDateFormatSpec(_s60Locale));
+    }
+
+    TRAPD(err, ptrTimeFormatL(timeStr, buffer, dateFormat, *_s60Locale.GetLocale());)
+
+    if (err == KErrNone)
+        return qt_TDes2QStringL(buffer);
+    else
+        return QString();
+}
+
+/*!
+    Returns localized string representation of given \a time
+    formatted with Symbian locale time format.
+*/
+static QString symbianTimeToString(const QTime &time)
+{
+    int hour = time.hour();
+    int minute = time.minute();
+    int second = time.second();
+    int milliseconds = 0;
+
+    TDateTime dateTime;
+    dateTime.Set(0, TMonth(0), 0, hour, minute, second, milliseconds);
+
+    TTime timeStr(dateTime);
+    TBuf<KMaxTimeFormatSpec*2> buffer;
+
+    TRAPD(err, ptrTimeFormatL(
+        timeStr,
+        buffer,
+        ptrGetTimeFormatSpec(_s60Locale),
+        *_s60Locale.GetLocale());
+    )
+
+    if (err == KErrNone)
+        return qt_TDes2QStringL(buffer);
+    else
+        return QString();
+}
+
+/*!
+    Returns the measurement system stored in Symbian locale
+
+    \sa QLocale::MeasurementSystem
+*/
+static QLocale::MeasurementSystem symbianMeasurementSystem()
+{
+    TLocale *locale = _s60Locale.GetLocale();
+
+    TUnitsFormat unitFormat = locale->UnitsGeneral();
+    if (unitFormat == EUnitsImperial)
+        return QLocale::ImperialSystem;
+    else
+        return QLocale::MetricSystem;
+}
+
+QLocale QSystemLocale::fallbackLocale() const
+{
+    // load system data before query calls
+    static bool initDone = false;
+    if (!initDone) {
+        _s60Locale.LoadSystemSettings();
+
+        // Initialize platform version dependent function pointers
+        ptrTimeFormatL = reinterpret_cast<FormatFunc>
+            (qt_resolveS60PluginFunc(S60Plugin_TimeFormatL));
+        ptrGetTimeFormatSpec = reinterpret_cast<FormatSpecFunc>
+            (qt_resolveS60PluginFunc(S60Plugin_GetTimeFormatSpec));
+        ptrGetLongDateFormatSpec = reinterpret_cast<FormatSpecFunc>
+            (qt_resolveS60PluginFunc(S60Plugin_GetLongDateFormatSpec));
+        ptrGetShortDateFormatSpec = reinterpret_cast<FormatSpecFunc>
+            (qt_resolveS60PluginFunc(S60Plugin_GetShortDateFormatSpec));
+        if (!ptrTimeFormatL)
+            ptrTimeFormatL = &defaultTimeFormatL;
+        if (!ptrGetTimeFormatSpec)
+            ptrGetTimeFormatSpec = &defaultFormatSpec;
+        if (!ptrGetLongDateFormatSpec)
+            ptrGetLongDateFormatSpec = &defaultFormatSpec;
+        if (!ptrGetShortDateFormatSpec)
+            ptrGetShortDateFormatSpec = &defaultFormatSpec;
+    }
+
+    TLanguage lang = User::Language();
+    QString locale = symbianLocaleName(lang);
+    return QLocale(locale);
+}
+
+/*!
+    Generic query method for locale data. Provides indirection.
+    Denotes the \a type of the query
+    with \a in as input data depending on the query.
+
+    \sa QSystemLocale::QueryType
+*/
+QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
+{
+    switch(type) {
+        case DecimalPoint:
+            return symbianDecimalPoint();
+        case GroupSeparator:
+            return symbianGroupSeparator();
+
+        case ZeroDigit:
+             return symbianZeroDigit();
+
+        case DayNameLong:
+        case DayNameShort:
+            return symbianDayName(in.toInt(), (type == DayNameShort) );
+
+        case MonthNameLong:
+        case MonthNameShort:
+            return symbianMonthName(in.toInt(), (type == MonthNameShort) );
+
+        case DateFormatLong:
+        case DateFormatShort:
+            return symbianDateFormat( (type == DateFormatShort) );
+        case TimeFormatLong:
+        case TimeFormatShort:
+            return symbianTimeFormat();
+        case DateTimeFormatLong:
+        case DateTimeFormatShort:
+            return symbianDateFormat( (type == DateTimeFormatShort) ) + QLatin1Char(' ') + symbianTimeFormat();
+        case DateToStringShort:
+        case DateToStringLong:
+             return symbianDateToString(in.toDate(), (type == DateToStringShort) );
+        case TimeToStringShort:
+        case TimeToStringLong:
+             return symbianTimeToString(in.toTime());
+        case DateTimeToStringShort:
+        case DateTimeToStringLong: {
+                const QDateTime dt = in.toDateTime();
+                return symbianDateToString(dt.date(), (type == DateTimeToStringShort) )
+                       + QLatin1Char(' ') + symbianTimeToString(dt.time());
+            }
+        case MeasurementSystem:
+            return static_cast<int>(symbianMeasurementSystem());
+        case LanguageId:
+        case CountryId: {
+                TLanguage language = User::Language();
+                QString locale = symbianLocaleName(language);
+                QLocale::Language lang;
+                QLocale::Country cntry;
+                getLangAndCountry(locale, lang, cntry);
+                if (type == LanguageId)
+                    return lang;
+                // few iso codes have no country and will use this
+                if (cntry == QLocale::AnyCountry)
+                    return fallbackLocale().country();
+
+                return cntry;
+            }
+        case NegativeSign:
+        case PositiveSign:
+        case AMText:
+        case PMText:
+            break;
+        default:
+            break;
+    }
+    return QVariant();
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 1789b47de1..b4282e7fb9 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -59,6 +59,7 @@ QMapData QMapData::shared_null = {
 QMapData *QMapData::createData()
 {
     QMapData *d = new QMapData;
+    Q_CHECK_PTR(d);
     Node *e = reinterpret_cast<Node *>(d);
     e->backward = e;
     e->forward[0] = e;
@@ -84,6 +85,15 @@ void QMapData::continueFreeData(int offset)
     delete this;
 }
 
+/*!
+    Creates a new node inside the data structure.
+
+    \a update is an array with pointers to the node after which the new node
+    should be inserted. Because of the strange skip list data structure there
+    could be several pointers to this node on different levels.
+    \a offset is an amount of bytes that needs to reserved just before the
+    QMapData::Node structure.
+*/
 QMapData::Node *QMapData::node_create(Node *update[], int offset)
 {
     int level = 0;
@@ -94,10 +104,6 @@ QMapData::Node *QMapData::node_create(Node *update[], int offset)
         mask <<= Sparseness;
     }
 
-    ++randomBits;
-    if (level == 3 && !insertInOrder)
-        randomBits = qrand();
-
     if (level > topLevel) {
         Node *e = reinterpret_cast<Node *>(this);
         level = ++topLevel;
@@ -105,7 +111,13 @@ QMapData::Node *QMapData::node_create(Node *update[], int offset)
         update[level] = e;
     }
 
+    ++randomBits;
+    if (level == 3 && !insertInOrder)
+        randomBits = qrand();
+
     void *concreteNode = qMalloc(offset + sizeof(Node) + level * sizeof(Node *));
+    Q_CHECK_PTR(concreteNode);
+
     Node *abstractNode = reinterpret_cast<Node *>(reinterpret_cast<char *>(concreteNode) + offset);
 
     abstractNode->backward = update[0];
@@ -116,6 +128,7 @@ QMapData::Node *QMapData::node_create(Node *update[], int offset)
         update[i]->forward[i] = abstractNode;
         update[i] = abstractNode;
     }
+    // update[level+1]=reinterpret_cast<Node *>(this);
     ++size;
     return abstractNode;
 }
@@ -146,7 +159,7 @@ uint QMapData::adjust_ptr(Node *node)
 
 void QMapData::dump()
 {
-    qDebug("Map data (ref = %d, size = %d, randomBits = %#.8x)", ref.atomic, size, randomBits);
+    qDebug("Map data (ref = %d, size = %d, randomBits = %#.8x)", int(ref), size, randomBits);
 
     QString preOutput;
     QVector<QString> output(topLevel + 1);
@@ -158,12 +171,12 @@ void QMapData::dump()
 
     Node *update[LastLevel + 1];
     for (int i = 0; i <= topLevel; ++i) {
-        str.sprintf("%d: [%.8x] -", i, adjust_ptr(forward[i]));
+        str.sprintf("%d: [%.8x] -", i, adjust_ptr(reinterpret_cast<Node *>(forward[i])));
         output[i] += str;
-        update[i] = forward[i];
+        update[i] = reinterpret_cast<Node *>(forward[i]);
     }
 
-    Node *node = forward[0];
+    Node *node = reinterpret_cast<Node *>(forward[0]);
     while (node != e) {
         int level = 0;
         while (level < topLevel && update[level + 1] == node)
@@ -178,13 +191,13 @@ void QMapData::dump()
             update[i] = node->forward[i];
         }
         for (int j = level + 1; j <= topLevel; ++j)
-            output[j] += "---------------";
+            output[j] += QString("---------------");
         node = node->forward[0];
     }
 
-    qDebug(preOutput.ascii());
+    qDebug("%s", preOutput.ascii());
     for (int i = 0; i <= topLevel; ++i)
-        qDebug(output[i].ascii());
+        qDebug("%s", output[i].ascii());
 }
 #endif
 
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index e31e0978e7..be80e75afe 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -416,9 +416,29 @@ Q_INLINE_TEMPLATE typename QMapData::Node *
 QMap<Key, T>::node_create(QMapData *adt, QMapData::Node *aupdate[], const Key &akey, const T &avalue)
 {
     QMapData::Node *abstractNode = adt->node_create(aupdate, payload());
-    Node *concreteNode = concrete(abstractNode);
-    new (&concreteNode->key) Key(akey);
-    new (&concreteNode->value) T(avalue);
+    QT_TRY {
+        Node *concreteNode = concrete(abstractNode);
+        new (&concreteNode->key) Key(akey);
+        QT_TRY {
+            new (&concreteNode->value) T(avalue);
+        } QT_CATCH(...) {
+            concreteNode->key.~Key();
+            QT_RETHROW;
+        }
+    } QT_CATCH(...) {
+        adt->node_delete(aupdate, payload(), abstractNode);
+        QT_RETHROW;
+    }
+
+    // clean up the update array for further insertions
+    /*
+    for (int i = 0; i <= d->topLevel; ++i) {
+        if ( aupdate[i]==reinterpret_cast<QMapData::Node *>(adt) || aupdate[i]->forward[i] != abstractNode)
+            break;
+        aupdate[i] = abstractNode;
+    }
+*/
+
     return abstractNode;
 }
 
@@ -704,8 +724,13 @@ Q_OUTOFLINE_TEMPLATE void QMap<Key, T>::detach_helper()
         QMapData::Node *cur = e->forward[0];
         update[0] = x.e;
         while (cur != e) {
-            Node *concreteNode = concrete(cur);
-            node_create(x.d, update, concreteNode->key, concreteNode->value);
+            QT_TRY {
+                Node *concreteNode = concrete(cur);
+                node_create(x.d, update, concreteNode->key, concreteNode->value);
+            } QT_CATCH(...) {
+                freeData(x.d);
+                QT_RETHROW;
+            }
             cur = cur->forward[0];
         }
         x.d->insertInOrder = false;
@@ -923,7 +948,8 @@ public:
     inline QMultiMap operator+(const QMultiMap &other) const
     { QMultiMap result = *this; result += other; return result; }
 
-#ifndef Q_NO_USING_KEYWORD
+#if !defined(Q_NO_USING_KEYWORD) && !defined(Q_CC_RVCT)
+    // RVCT compiler doesn't handle using-keyword right when used functions are overloaded in child class
     using QMap<Key, T>::contains;
     using QMap<Key, T>::remove;
     using QMap<Key, T>::count;
@@ -993,7 +1019,12 @@ Q_INLINE_TEMPLATE int QMultiMap<Key, T>::remove(const Key &key, const T &value)
     typename QMap<Key, T>::iterator end(QMap<Key, T>::end());
     while (i != end && !qMapLessThanKey<Key>(key, i.key())) {
         if (i.value() == value) {
+#if defined(Q_CC_RVCT)  
+            // RVCT has problems with scoping, apparently.      
+            i = QMap<Key, T>::erase(i);
+#else
             i = erase(i);
+#endif            
             ++n;
         } else {
             ++i;
diff --git a/src/corelib/tools/qpodlist_p.h b/src/corelib/tools/qpodlist_p.h
index 30405f530e..b365f80217 100644
--- a/src/corelib/tools/qpodlist_p.h
+++ b/src/corelib/tools/qpodlist_p.h
@@ -53,9 +53,7 @@
 // We mean it.
 //
 
-#include <QtCore/qcontainerfwd.h>
-#include <QtCore/qglobal.h>
-#include <new>
+#include <QtCore/qvarlengtharray.h>
 
 QT_BEGIN_HEADER
 
@@ -63,87 +61,29 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Core)
 
-template<class T, int Prealloc>
-class QPodList
+template <typename T, int Prealloc>
+class QPodList : public QVarLengthArray<T, Prealloc>
 {
+    using QVarLengthArray<T, Prealloc>::s;
+    using QVarLengthArray<T, Prealloc>::a;
+    using QVarLengthArray<T, Prealloc>::ptr;
+    using QVarLengthArray<T, Prealloc>::realloc;
 public:
-    inline explicit QPodList(int size = 0);
+    inline explicit QPodList(int size = 0)
+        : QVarLengthArray<T, Prealloc>(size)
+    {}
 
-    inline QPodList(const QPodList<T, Prealloc> &other)
-        : a(Prealloc), s(0), ptr(reinterpret_cast<T *>(array))
+    inline void insert(int idx, const T &t)
     {
-        append(other.constData(), other.size());
-    }
-
-    inline ~QPodList() {
-        if (ptr != reinterpret_cast<T *>(array))
-            qFree(ptr);
-    }
-    inline QPodList<T, Prealloc> &operator=(const QPodList<T, Prealloc> &other)
-    {
-        if (this != &other) {
-            clear();
-            append(other.constData(), other.size());
-        }
-        return *this;
-    }
-
-    inline int size() const { return s; }
-    inline int count() const { return s; }
-    inline bool isEmpty() const { return (s == 0); }
-    inline void resize(int size);
-    inline void clear() { resize(0); }
-
-    inline int capacity() const { return a; }
-    inline void reserve(int size);
-
-    inline T &operator[](int idx) {
-        Q_ASSERT(idx >= 0 && idx < s);
-        return ptr[idx];
-    }
-    inline const T &operator[](int idx) const {
-        Q_ASSERT(idx >= 0 && idx < s);
-        return ptr[idx];
-    }
-
-    inline const T &at(int idx) const {
-        Q_ASSERT(idx >= 0 && idx < s);
-        return ptr[idx];
-    }
-
-    inline const T &first() const {
-        return at(0);
-    }
-
-    inline T& append() {
-        const int idx = s++;
-        if (s == a)
-            realloc(s, s<<1);
-        return ptr[idx];
-    }
-    inline void append(const T &t) {
-        append() = t;
-    }
-
-    inline T& insert(int idx) {
-        Q_ASSERT(idx >= 0 && idx <= s);
         const int sz = s++;
         if (s == a)
-            realloc(s, s<<1);
+            realloc(s, s << 1);
         ::memmove(ptr + idx + 1, ptr + idx, (sz - idx) * sizeof(T));
-        return ptr[idx];
-    }
-    inline void insert(int idx, const T &t) {
-        insert(idx) = t;
+        ptr[idx] = t;
     }
 
-    inline void removeAt(int idx) {
-        Q_ASSERT(idx >= 0 && idx < s);
-        ::memmove(ptr + idx, ptr + idx + 1, (s - idx - 1) * sizeof(T));
-        --s;
-    }
-
-    inline void removeAll(const T &t) {
+    inline void removeAll(const T &t)
+    {
         int i = 0;
         for (int j = 0; j < s; ++j) {
             if (ptr[j] != t)
@@ -152,110 +92,22 @@ public:
         s = i;
     }
 
-    inline int indexOf(const T &t, int from = 0) const {
-        if (from < 0)
-            from = qMax(from + s, 0);
-        if (from < s) {
-            const T *n = ptr + from - 1;
-            const T *e = ptr + s;
-            while (++n != e)
-                if (*n == t)
-                    return n - ptr;
-        }
-        return -1;
-    }
-
-    inline bool contains(const T &t) const {
-        return indexOf(t) >= 0;
+    inline void removeAt(int idx)
+    {
+        Q_ASSERT(idx >= 0 && idx < s);
+        ::memmove(ptr + idx, ptr + idx + 1, (s - idx - 1) * sizeof(T));
+        --s;
     }
 
-    inline T takeFirst() {
+    inline T takeFirst()
+    {
         Q_ASSERT(s > 0);
         T tmp = ptr[0];
         removeAt(0);
         return tmp;
     }
-
-    inline T *data() { return ptr; }
-    inline const T *data() const { return ptr; }
-    inline const T * constData() const { return ptr; }
-
-private:
-    void append(const T *buf, int size);
-    void realloc(int size, int alloc);
-
-    int a;
-    int s;
-    T *ptr;
-    union {
-        // ### Qt 5: Use 'Prealloc * sizeof(T)' as array size
-        char array[sizeof(qint64) * (((Prealloc * sizeof(T)) / sizeof(qint64)) + 1)];
-        qint64 q_for_alignment_1;
-        double q_for_alignment_2;
-    };
 };
 
-template <class T, int Prealloc>
-Q_INLINE_TEMPLATE QPodList<T, Prealloc>::QPodList(int asize)
-    : s(asize) {
-    if (s > Prealloc) {
-        ptr = reinterpret_cast<T *>(qMalloc(s * sizeof(T)));
-        a = s;
-    } else {
-        ptr = reinterpret_cast<T *>(array);
-        a = Prealloc;
-    }
-}
-
-template <class T, int Prealloc>
-Q_INLINE_TEMPLATE void QPodList<T, Prealloc>::resize(int asize)
-{ realloc(asize, qMax(asize, a)); }
-
-template <class T, int Prealloc>
-Q_INLINE_TEMPLATE void QPodList<T, Prealloc>::reserve(int asize)
-{ if (asize > a) realloc(s, asize); }
-
-template <class T, int Prealloc>
-Q_OUTOFLINE_TEMPLATE void QPodList<T, Prealloc>::append(const T *abuf, int asize)
-{
-    Q_ASSERT(abuf);
-    if (asize <= 0)
-        return;
-
-    const int idx = s;
-    const int news = s + asize;
-    if (news >= a)
-        realloc(news, news<<1);
-    else
-        s = news;
-
-    qMemCopy(&ptr[idx], abuf, asize * sizeof(T));
-}
-
-template <class T, int Prealloc>
-Q_OUTOFLINE_TEMPLATE void QPodList<T, Prealloc>::realloc(int asize, int aalloc)
-{
-    Q_ASSERT(aalloc >= asize);
-    T *oldPtr = ptr;
-    int osize = s;
-    s = asize;
-
-    if (aalloc != a) {
-        ptr = reinterpret_cast<T *>(qMalloc(aalloc * sizeof(T)));
-        if (ptr) {
-            a = aalloc;
-            qMemCopy(ptr, oldPtr, osize * sizeof(T));
-        } else {
-            ptr = oldPtr;
-            s = 0;
-            asize = 0;
-        }
-    }
-
-    if (oldPtr != reinterpret_cast<T *>(array) && oldPtr != ptr)
-        qFree(oldPtr);
-}
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index c1d48ec72e..8bda634dde 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -1310,14 +1310,20 @@ void QRegExpMatchState::prepareForMatch(QRegExpEngine *eng)
     int ns = eng->s.size(); // number of states
     int ncap = eng->ncap;
 #ifndef QT_NO_REGEXP_OPTIM
-    slideTabSize = qMax(eng->minl + 1, 16);
+    int newSlideTabSize = qMax(eng->minl + 1, 16);
 #else
-    slideTabSize = 0;
+    int newSlideTabSize = 0;
 #endif
     int numCaptures = eng->numCaptures();
-    capturedSize = 2 + 2 * numCaptures;
-    bigArray = (int *)realloc(bigArray, ((3 + 4 * ncap) * ns + 4 * ncap + slideTabSize + capturedSize)*sizeof(int));
+    int newCapturedSize = 2 + 2 * numCaptures;
+    bigArray = (int *)realloc(bigArray, ((3 + 4 * ncap) * ns + 4 * ncap + newSlideTabSize + newCapturedSize)*sizeof(int));
+    Q_CHECK_PTR(bigArray);
 
+    // set all internal variables only _after_ bigArray is realloc'ed
+    // to prevent a broken regexp in oom case
+
+    slideTabSize = newSlideTabSize;
+    capturedSize = newCapturedSize;
     inNextStack = bigArray;
     memset(inNextStack, -1, ns * sizeof(int));
     curStack = inNextStack + ns;
@@ -3610,10 +3616,15 @@ static void derefEngine(QRegExpEngine *eng, const QRegExpEngineKey &key)
 #if !defined(QT_NO_REGEXP_OPTIM)
         if (globalEngineCache()) {
             QMutexLocker locker(mutex());
-            globalEngineCache()->insert(key, eng, 4 + key.pattern.length() / 4);
-        }
-        else
+            QT_TRY {
+                globalEngineCache()->insert(key, eng, 4 + key.pattern.length() / 4);
+            } QT_CATCH(const std::bad_alloc &) {
+                // in case of an exception (e.g. oom), just delete the engine
+                delete eng;
+            }
+        } else {
             delete eng;
+        }
 #else
         Q_UNUSED(key);
         delete eng;
diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h
index 008c068acd..7cfca0e4d4 100644
--- a/src/corelib/tools/qringbuffer_p.h
+++ b/src/corelib/tools/qringbuffer_p.h
@@ -248,6 +248,9 @@ public:
             QByteArray tmp = buffers[0];
             buffers.clear();
             buffers << tmp;
+			//TODO merge this optimization ?
+			//buffers.erase(buffers.begin() + 1, buffers.end());
+            //>>>>>>> 08ae7ee1fb930e7d4b4039e2294cba69f9380964:src/corelib/tools/qringbuffer_p.h
             if (buffers.at(0).size() != basicBlockSize)
                 buffers[0].resize(basicBlockSize);
         }
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
new file mode 100644
index 0000000000..912edb684e
--- /dev/null
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -0,0 +1,192 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \class QScopedPointer
+    \brief The QScopedPointer class stores a pointer to a dynamically allocated object, and deletes it upon destruction.
+    \since 4.6
+    \reentrant
+    \ingroup misc
+
+    Managing heap allocated objects manually is hard and error prone, with the
+    common result that code leaks memory and is hard to maintain.
+    QScopedPointer is a small utility class that heavily simplifies this by
+    assigning stack-based memory ownership to heap allocations, more generally
+    called resource acquisition is initialization(RAII).
+
+    QScopedPointer guarantees that the object pointed to will get deleted when
+    the current scope dissapears, and it also has no way of releasing
+    ownership, hence clearly communicating the lifetime and ownership of the
+    object. These guarantees are convenient when reading the code.
+
+    Consider this function which does heap allocations, and have various exit points:
+
+    \snippet doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp 0
+
+    It's encumbered by the manual delete calls. With QScopedPointer, the code
+    can be simplified to:
+
+    \snippet doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp 1
+
+    The code the compiler generates for QScopedPointer is the same as when
+    writing it manually. Code that makes use of \a delete are candidates for
+    QScopedPointer usage(and if not, possibly another type of smart pointer
+    such as QSharedPointer). QScopedPointer intentionally has no copy
+    constructor or assignment operator, such that ownership and lifetime is
+    clearly communicated.
+
+    The const qualification on a regular C++ pointer can also be expressed with
+    a QScopedPointer:
+
+    \snippet doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp 2
+
+    \note QScopedPointer does not work with arrays.
+
+    \section1 Forward Declared Pointers
+
+    Classes that are forward declared can be used within QScopedPointer, as
+    long as the destructor of the forward declared class is available whenever
+    a QScopedPointer needs to clean up.
+
+    Concretely, this means that all classes containing a QScopedPointer that
+    points to a forward declared class must have non-inline constructors,
+    destructors and assignment operators:
+
+    \snippet doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp 4
+
+    Otherwise, the compiler output a warning about not being able to destruct
+    \c MyPrivateClass.
+
+    \sa QSharedPointer
+*/
+
+/*!
+    \fn QScopedPointer::QScopedPointer(T *p = 0)
+
+    Constructs this QScopedPointer instance and sets its pointer to \a p.
+*/
+
+/*!
+    \fn QScopedPointer::~QScopedPointer()
+
+    Destroys this QScopedPointer object. Delete the object its pointer points
+    to.
+*/
+
+/*!
+    \fn T *QScopedPointer::data() const
+
+    Returns the value of the pointer referenced by this object. QScopedPointer
+    still owns the object pointed to.
+*/
+
+/*!
+    \fn T &QScopedPointer::operator*() const
+
+    Provides access to the scoped pointer's object.
+
+    If the contained pointer is \c null, behavior is undefined.
+    \sa isNull()
+*/
+
+/*!
+    \fn T *QScopedPointer::operator->() const
+
+    Provides access to the scoped pointer's object.
+
+    If the contained pointer is \c null, behavior is undefined.
+
+    \sa isNull()
+*/
+
+/*!
+    \fn QScopedPointer::operator bool() const
+
+    Returns \c true if this object is not \c null. This function is suitable
+    for use in \tt if-constructs, like:
+
+    \snippet doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp 3
+
+    \sa isNull()
+*/
+
+/*!
+    \fn bool QScopedPointer::operator==(const QScopedPointer<T> &other) const
+
+    Equality operator. Returns true if the scoped pointer \a other
+    is pointing to the same object as this pointer, otherwise returns false.
+*/
+
+
+/*!
+    \fn bool QScopedPointer::operator!=(const QScopedPointer<T> &other) const
+
+    Inequality operator. Returns true if the scoped pointer \a other
+    is not pointing to the same object as this pointer, otherwise returns false.
+*/
+
+/*!
+    \fn bool QScopedPointer::isNull() const
+
+    Returns \c true if this object is holding a pointer that is \c null.
+*/
+
+/*!
+    \fn void QScopedPointer::reset(T *other = 0)
+
+    Deletes the existing object it is pointing to if any, and sets its pointer to
+    \a other. QScopedPointer now owns \a other and will delete it in its
+    destructor.
+
+    If \a other is equal to the value returned by data(), behavior is
+    undefined.
+*/
+
+/*!
+    \fn T *QScopedPointer::take()
+
+    Returns the value of the pointer referenced by this object. The pointer of this
+    QScopedPointer object will be reset to \c null.
+*/
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h
new file mode 100644
index 0000000000..fc8f9e2454
--- /dev/null
+++ b/src/corelib/tools/qscopedpointer.h
@@ -0,0 +1,199 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSCOPEDPOINTER_H
+#define QSCOPEDPOINTER_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+QT_MODULE(Core)
+
+template <typename T>
+class QScopedPointer
+{
+public:
+    explicit inline QScopedPointer(T *p = 0) : d(p)
+    {
+    }
+
+    inline ~QScopedPointer()
+    {
+        delete d;
+    }
+
+    inline T &operator*() const
+    {
+        return *d;
+    }
+
+    inline T *operator->() const
+    {
+        return d;
+    }
+
+    inline bool operator==(const QScopedPointer<T> &other) const
+    {
+        return d == other.d;
+    }
+
+    inline bool operator!=(const QScopedPointer<T> &other) const
+    {
+        return d != other.d;
+    }
+
+    inline operator bool() const
+    {
+        return d;
+    }
+
+    inline T *data() const
+    {
+        return d;
+    }
+
+    inline bool isNull() const
+    {
+        return !d;
+    }
+
+    inline void reset(T *other = 0)
+    {
+        T *oldD = d;
+        d = other;
+        delete oldD;
+    }
+
+    inline T *take()
+    {
+        T *oldD = d;
+        d = 0;
+        return oldD;
+    }
+
+protected:
+    T *d;
+
+private:
+    Q_DISABLE_COPY(QScopedPointer)
+};
+
+/* internal class - allows special handling for resetting and cleaning the pointer */
+template <typename T, typename CustomHandler>
+class QScopedCustomPointer : public QScopedPointer<T>
+{
+public:
+    inline QScopedCustomPointer(T *p = 0)
+        : QScopedPointer<T>(p)
+    {
+    }
+
+    inline ~QScopedCustomPointer()
+    {
+        T *oldD = this->d;
+        this->d = 0;
+        CustomHandler::cleanup(oldD);
+    }
+
+    inline void reset(T *other = 0)
+    {
+        CustomHandler::reset(this->d, other);
+    }
+
+    inline T *&data_ptr()
+    {
+        return this->d;
+    }
+};
+
+/* Internal helper class - a handler for QShared* classes, to be used in QScopedCustomPointer */
+template <typename T>
+class QScopedSharedPointerHandler
+{
+public:
+    static inline void cleanup(T *d)
+    {
+        if (d && !d->ref.deref())
+            delete d;
+    }
+
+    static inline void reset(T *&d, T *other)
+    {
+        T *oldD = d;
+        d = other;
+        cleanup(oldD);
+    }
+};
+
+/* Internal. This should really have been a typedef, but you can't have a templated typedef :)
+   This class is basically a scoped pointer pointing to a ref-counted object
+ */
+template <typename T>
+class QScopedSharedPointer : public QScopedCustomPointer<T, QScopedSharedPointerHandler<T> >
+{
+public:
+    inline QScopedSharedPointer(T *p = 0)
+        : QScopedCustomPointer<T, QScopedSharedPointerHandler<T> >(p)
+    {
+    }
+
+    inline void detach()
+    {
+        qAtomicDetach(this->d);
+    }
+
+    inline void assign(T *other)
+    {
+        if (this->d == other)
+            return;
+        if (other)
+            other->ref.ref();
+        T *oldD = this->d;
+        this->d = other;
+        QScopedSharedPointerHandler<T>::cleanup(oldD);
+    }
+};
+
+QT_END_NAMESPACE
+QT_END_HEADER
+
+#endif // QSCOPEDPOINTER_H
diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp
index 6cd220c22d..d000c3353c 100644
--- a/src/corelib/tools/qshareddata.cpp
+++ b/src/corelib/tools/qshareddata.cpp
@@ -231,7 +231,7 @@ QT_BEGIN_NAMESPACE
   In the member function documentation, \e{d pointer} always refers
   to the internal pointer to the shared data object.
 
-  \sa QSharedData, QExplicitlySharedDataPointer
+  \sa QSharedData, QExplicitlySharedDataPointer, QScopedPointer, QSharedPointer
 */
 
 /*! \fn T& QSharedDataPointer::operator*()
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index 2ca612ed12..8a63d641d5 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -102,13 +102,18 @@
     except that it only detaches if
     QExplicitlySharedDataPointer::detach() is explicitly called.
 
+    QScopedPointer simply holds a pointer to a heap allocated object and
+    deletes it in its destructor. This class is useful when an object needs to
+    be heap allocated and deleted, but no more. QScopedPointer is lightweight,
+    it makes no use of additional structure or reference counting.
+
     Finally, QPointer holds a pointer to a QObject-derived object, but
     it does so weakly. QPointer is similar, in that behaviour, to
     QWeakPointer: it does not allow you to prevent the object from
     being destroyed. All you can do is query whether it has been
     destroyed or not.
 
-    \sa QSharedDataPointer, QWeakPointer
+    \sa QSharedDataPointer, QWeakPointer, QScopedPointer
 */
 
 /*!
@@ -130,7 +135,7 @@
     must first create a QSharedPointer object and verify if the pointer
     is null or not.
 
-    \sa QSharedPointer
+    \sa QSharedPointer, QScopedPointer
 */
 
 /*!
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 9fa8df4c78..9a5532c86f 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -119,13 +119,19 @@ namespace QtSharedPointer {
     template <class T>
     class Basic
     {
+#ifndef Q_CC_NOKIAX86
         typedef T *Basic:: *RestrictedBool;
+#endif
     public:
         typedef T Type;
 
         inline T *data() const { return value; }
         inline bool isNull() const { return !data(); }
+#ifndef Q_CC_NOKIAX86
         inline operator RestrictedBool() const { return isNull() ? 0 : &Basic::value; }
+#else
+        inline operator bool() const { return isNull() ? 0 : &Basic::value; }
+#endif
         inline bool operator !() const { return isNull(); }
         inline T &operator*() const { return *data(); }
         inline T *operator->() const { return data(); }
@@ -365,7 +371,7 @@ namespace QtSharedPointer {
         {
             if (d == o) return;
             if (o) {
-                verifyReconstruction(actual);
+                Basic<T>::verifyReconstruction(actual);
 
                 // increase the strongref, but never up from zero
                 register int tmp = o->strongref;
@@ -403,15 +409,15 @@ public:
     inline QSharedPointer() { }
     // inline ~QSharedPointer() { }
 
-    inline explicit QSharedPointer(T *ptr) { internalConstruct(ptr); }
+    inline explicit QSharedPointer(T *ptr) { BaseClass::internalConstruct(ptr); }
 
     template <typename Deleter>
-    inline QSharedPointer(T *ptr, Deleter d) { internalConstruct(ptr, d); }
+    inline QSharedPointer(T *ptr, Deleter d) { BaseClass::internalConstruct(ptr, d); }
 
     inline QSharedPointer(const QSharedPointer<T> &other) : BaseClass(other) { }
     inline QSharedPointer<T> &operator=(const QSharedPointer<T> &other)
     {
-        internalCopy(other);
+        BaseClass::internalCopy(other);
         return *this;
     }
 
@@ -427,7 +433,7 @@ public:
     inline QSharedPointer<T> &operator=(const QSharedPointer<X> &other)
     {
         QSHAREDPOINTER_VERIFY_AUTO_CAST(T, X); // if you get an error in this line, the cast is invalid
-        internalCopy(other);
+        BaseClass::internalCopy(other);
         return *this;
     }
 
@@ -485,12 +491,18 @@ public:
 template <class T>
 class QWeakPointer
 {
+#ifndef Q_CC_NOKIAX86
     typedef T *QWeakPointer:: *RestrictedBool;
+#endif
     typedef QtSharedPointer::ExternalRefCountData Data;
 
 public:
     inline bool isNull() const { return d == 0 || d->strongref == 0 || value == 0; }
+#ifndef Q_CC_NOKIAX86
     inline operator RestrictedBool() const { return isNull() ? 0 : &QWeakPointer::value; }
+#else
+    inline operator bool() const { return isNull() ? 0 : &QWeakPointer::value; }
+#endif
     inline bool operator !() const { return isNull(); }
 
     inline QWeakPointer() : d(0), value(0) { }
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 99fbaa9dee..f3c773b904 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -978,6 +978,7 @@ QString::QString(const QChar *unicode, int size)
         d->ref.ref();
     } else {
         d = (Data*) qMalloc(sizeof(Data)+size*sizeof(QChar));
+        Q_CHECK_PTR(d);
         d->ref = 1;
         d->alloc = d->size = size;
         d->clean = d->asciiCache = d->simpletext = d->righttoleft = d->capacity = 0;
@@ -1001,6 +1002,7 @@ QString::QString(int size, QChar ch)
         d->ref.ref();
     } else {
         d = (Data*) qMalloc(sizeof(Data)+size*sizeof(QChar));
+        Q_CHECK_PTR(d);
         d->ref = 1;
         d->alloc = d->size = size;
         d->clean = d->asciiCache = d->simpletext = d->righttoleft = d->capacity = 0;
@@ -1042,7 +1044,9 @@ QString::QString(int size, Qt::Initialization)
 */
 QString::QString(QChar ch)
 {
-    d = (Data *)qMalloc(sizeof(Data) + sizeof(QChar));
+    void *buf = qMalloc(sizeof(Data) + sizeof(QChar));
+    Q_CHECK_PTR(buf);
+    d = reinterpret_cast<Data *>(buf);
     d->ref = 1;
     d->alloc = d->size = 1;
     d->clean = d->asciiCache = d->simpletext = d->righttoleft = d->capacity = 0;
@@ -1212,8 +1216,7 @@ void QString::realloc(int alloc)
 {
     if (d->ref != 1 || d->data != d->array) {
         Data *x = static_cast<Data *>(qMalloc(sizeof(Data) + alloc * sizeof(QChar)));
-        if (!x)
-            return;
+        Q_CHECK_PTR(x);
         x->size = qMin(alloc, d->size);
         ::memcpy(x->array, d->data, x->size * sizeof(QChar));
         x->array[x->size] = 0;
@@ -1236,8 +1239,7 @@ void QString::realloc(int alloc)
         }
 #endif
         Data *x = static_cast<Data *>(qRealloc(d, sizeof(Data) + alloc * sizeof(QChar)));
-        if (!x)
-            return;
+        Q_CHECK_PTR(x);
         x->alloc = alloc;
         x->data = x->array;
         d = x;
@@ -1394,6 +1396,7 @@ QString& QString::insert(int i, const QChar *unicode, int size)
     if (s >= d->data && s < d->data + d->alloc) {
         // Part of me - take a copy
         ushort *tmp = static_cast<ushort *>(qMalloc(size * sizeof(QChar)));
+        Q_CHECK_PTR(tmp);
         memcpy(tmp, s, size * sizeof(QChar));
         insert(i, reinterpret_cast<const QChar *>(tmp), size);
         qFree(tmp);
@@ -1748,51 +1751,69 @@ QString &QString::replace(const QString &before, const QString &after, Qt::CaseS
  */
 void QString::replace_helper(uint *indices, int nIndices, int blen, const QChar *after, int alen)
 {
-    if (blen == alen) {
-        detach();
-        for (int i = 0; i < nIndices; ++i)
-            memcpy(d->data + indices[i], after, alen * sizeof(QChar));
-    } else if (alen < blen) {
+    // copy *after in case it lies inside our own d->data area
+    // (which we could possibly invalidate via a realloc or corrupt via memcpy operations.)
+    QChar *afterBuffer = const_cast<QChar *>(after);
+    if (after >= reinterpret_cast<QChar *>(d->data) && after < reinterpret_cast<QChar *>(d->data) + d->size) {
+        afterBuffer = static_cast<QChar *>(qMalloc(alen*sizeof(QChar)));
+        Q_CHECK_PTR(afterBuffer);
+        ::memcpy(afterBuffer, after, alen*sizeof(QChar));
+    }
+
+    QT_TRY {
         detach();
-        uint to = indices[0];
-        if (alen)
-            memcpy(d->data+to, after, alen*sizeof(QChar));
-        to += alen;
-        uint movestart = indices[0] + blen;
-        for (int i = 1; i < nIndices; ++i) {
-            int msize = indices[i] - movestart;
-            if (msize > 0) {
-                memmove(d->data + to, d->data + movestart, msize * sizeof(QChar));
-                to += msize;
+        if (blen == alen) {
+            // replace in place
+            for (int i = 0; i < nIndices; ++i)
+                memcpy(d->data + indices[i], afterBuffer, alen * sizeof(QChar));
+        } else if (alen < blen) {
+            // replace from front
+            uint to = indices[0];
+            if (alen)
+                memcpy(d->data+to, after, alen*sizeof(QChar));
+            to += alen;
+            uint movestart = indices[0] + blen;
+            for (int i = 1; i < nIndices; ++i) {
+                int msize = indices[i] - movestart;
+                if (msize > 0) {
+                    memmove(d->data + to, d->data + movestart, msize * sizeof(QChar));
+                    to += msize;
+                }
+                if (alen) {
+                    memcpy(d->data + to, afterBuffer, alen*sizeof(QChar));
+                    to += alen;
+                }
+                movestart = indices[i] + blen;
             }
-            if (alen) {
-                memcpy(d->data + to, after, alen*sizeof(QChar));
-                to += alen;
+            int msize = d->size - movestart;
+            if (msize > 0)
+                memmove(d->data + to, d->data + movestart, msize * sizeof(QChar));
+            resize(d->size - nIndices*(blen-alen));
+        } else {
+            // replace from back
+            int adjust = nIndices*(alen-blen);
+            int newLen = d->size + adjust;
+            int moveend = d->size;
+            resize(newLen);
+
+            while (nIndices) {
+                --nIndices;
+                int movestart = indices[nIndices] + blen;
+                int insertstart = indices[nIndices] + nIndices*(alen-blen);
+                int moveto = insertstart + alen;
+                memmove(d->data + moveto, d->data + movestart,
+                        (moveend - movestart)*sizeof(QChar));
+                memcpy(d->data + insertstart, afterBuffer, alen*sizeof(QChar));
+                moveend = movestart-blen;
             }
-            movestart = indices[i] + blen;
-        }
-        int msize = d->size - movestart;
-        if (msize > 0)
-            memmove(d->data + to, d->data + movestart, msize * sizeof(QChar));
-        resize(d->size - nIndices*(blen-alen));
-    } else {
-        // we have a table of replacement positions, use them for fast replacing
-        int adjust = nIndices*(alen-blen);
-        int newLen = d->size + adjust;
-        int moveend = d->size;
-        resize(newLen);
-
-        while (nIndices) {
-            --nIndices;
-            int movestart = indices[nIndices] + blen;
-            int insertstart = indices[nIndices] + nIndices*(alen-blen);
-            int moveto = insertstart + alen;
-            memmove(d->data + moveto, d->data + movestart,
-                    (moveend - movestart)*sizeof(QChar));
-            memcpy(d->data + insertstart, after, alen*sizeof(QChar));
-            moveend = movestart-blen;
         }
+    } QT_CATCH(const std::bad_alloc &) {
+        if (afterBuffer != after)
+            qFree(afterBuffer);
+        QT_RETHROW;
     }
+    if (afterBuffer != after)
+        qFree(afterBuffer);
 }
 
 /*!
@@ -1820,21 +1841,7 @@ QString &QString::replace(const QChar *before, int blen,
     if (alen == 0 && blen == 0)
         return *this;
 
-    // protect against before or after being part of this
-    const QChar *a = after;
-    const QChar *b = before;
-    if (after >= (const QChar *)d->data && after < (const QChar *)d->data + d->size) {
-        QChar *copy = (QChar *)malloc(alen*sizeof(QChar));
-        memcpy(copy, after, alen*sizeof(QChar));
-        a = copy;
-    }
-    if (before >= (const QChar *)d->data && before < (const QChar *)d->data + d->size) {
-        QChar *copy = (QChar *)malloc(blen*sizeof(QChar));
-        memcpy(copy, before, blen*sizeof(QChar));
-        b = copy;
-    }
-
-    QStringMatcher matcher(b, blen, cs);
+    QStringMatcher matcher(before, blen, cs);
 
     int index = 0;
     while (1) {
@@ -1853,7 +1860,7 @@ QString &QString::replace(const QChar *before, int blen,
         if (!pos)
             break;
 
-        replace_helper(indices, pos, blen, a, alen);
+        replace_helper(indices, pos, blen, after, alen);
 
         if (index == -1)
             break;
@@ -1861,11 +1868,6 @@ QString &QString::replace(const QChar *before, int blen,
         index += pos*(alen-blen);
     }
 
-    if (a != after)
-        ::free((QChar *)a);
-    if (b != before)
-        ::free((QChar *)b);
-
     return *this;
 }
 
@@ -3600,6 +3602,7 @@ QString::Data *QString::fromLatin1_helper(const char *str, int size)
         if (size < 0)
             size = qstrlen(str);
         d = static_cast<Data *>(qMalloc(sizeof(Data) + size * sizeof(QChar)));
+        Q_CHECK_PTR(d);
         d->ref = 1;
         d->alloc = d->size = size;
         d->clean = d->asciiCache = d->simpletext = d->righttoleft = d->capacity = 0;
@@ -3607,7 +3610,7 @@ QString::Data *QString::fromLatin1_helper(const char *str, int size)
         ushort *i = d->data;
         d->array[size] = '\0';
         while (size--)
-           *i++ = (uchar)*str++;
+            *i++ = (uchar)*str++;
     }
     return d;
 }
@@ -6923,6 +6926,7 @@ void QString::updateProperties() const
 QString QString::fromRawData(const QChar *unicode, int size)
 {
     Data *x = static_cast<Data *>(qMalloc(sizeof(Data)));
+    Q_CHECK_PTR(x);
     if (unicode) {
         x->data = (ushort *)unicode;
     } else {
diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/tools/qtextboundaryfinder.cpp
index 2104a6c640..e200ed22ce 100644
--- a/src/corelib/tools/qtextboundaryfinder.cpp
+++ b/src/corelib/tools/qtextboundaryfinder.cpp
@@ -38,11 +38,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "private/qharfbuzz_p.h"
 #include <QtCore/qtextboundaryfinder.h>
 #include <QtCore/qvarlengtharray.h>
 #include <private/qunicodetables_p.h>
 #include <qdebug.h>
+#include "private/qharfbuzz_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -176,6 +176,7 @@ QTextBoundaryFinder::QTextBoundaryFinder(const QTextBoundaryFinder &other)
     , freePrivate(true)
 {
     d = (QTextBoundaryFinderPrivate *) malloc(length*sizeof(HB_CharAttributes));
+    Q_CHECK_PTR(d);
     memcpy(d, other.d, length*sizeof(HB_CharAttributes));
 }
 
@@ -193,8 +194,11 @@ QTextBoundaryFinder &QTextBoundaryFinder::operator=(const QTextBoundaryFinder &o
     length = other.length;
     pos = other.pos;
     freePrivate = true;
-    
-    d = (QTextBoundaryFinderPrivate *) realloc(d, length*sizeof(HB_CharAttributes));
+
+    QTextBoundaryFinderPrivate *newD = (QTextBoundaryFinderPrivate *)
+        realloc(d, length*sizeof(HB_CharAttributes));
+    Q_CHECK_PTR(newD);
+    d = newD;
     memcpy(d, other.d, length*sizeof(HB_CharAttributes));
 
     return *this;
@@ -221,6 +225,7 @@ QTextBoundaryFinder::QTextBoundaryFinder(BoundaryType type, const QString &strin
     , freePrivate(true)
 {
     d = (QTextBoundaryFinderPrivate *) malloc(length*sizeof(HB_CharAttributes));
+    Q_CHECK_PTR(d);
     init(t, chars, length, d->attributes);
 }
 
@@ -248,6 +253,7 @@ QTextBoundaryFinder::QTextBoundaryFinder(BoundaryType type, const QChar *chars,
         freePrivate = false;
     } else {
         d = (QTextBoundaryFinderPrivate *) malloc(length*sizeof(HB_CharAttributes));
+        Q_CHECK_PTR(d);
         freePrivate = true;
     }
     init(t, chars, length, d->attributes);
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h
index 923efbd6e4..0b9d908fe0 100644
--- a/src/corelib/tools/qvarlengtharray.h
+++ b/src/corelib/tools/qvarlengtharray.h
@@ -52,6 +52,9 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Core)
 
+template<class T, int Prealloc>
+class QPodList;
+
 // Prealloc = 256 by default, specified in qcontainerfwd.h
 template<class T, int Prealloc>
 class QVarLengthArray
@@ -122,6 +125,7 @@ public:
     inline const T * constData() const { return ptr; }
 
 private:
+    friend class QPodList<T, Prealloc>;
     void realloc(int size, int alloc);
 
     int a;
@@ -140,6 +144,7 @@ Q_INLINE_TEMPLATE QVarLengthArray<T, Prealloc>::QVarLengthArray(int asize)
     : s(asize) {
     if (s > Prealloc) {
         ptr = reinterpret_cast<T *>(qMalloc(s * sizeof(T)));
+        Q_CHECK_PTR(ptr);
         a = s;
     } else {
         ptr = reinterpret_cast<T *>(array);
@@ -161,25 +166,24 @@ Q_INLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::reserve(int asize)
 { if (asize > a) realloc(s, asize); }
 
 template <class T, int Prealloc>
-Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::append(const T *abuf, int asize)
+Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::append(const T *abuf, int increment)
 {
     Q_ASSERT(abuf);
-    if (asize <= 0)
+    if (increment <= 0)
         return;
 
-    const int idx = s;
-    const int news = s + asize;
-    if (news >= a)
-        realloc(s, qMax(s<<1, news));
-    s = news;
+    const int asize = s + increment;
+
+    if (asize >= a)
+        realloc(s, qMax(s*2, asize));
 
     if (QTypeInfo<T>::isComplex) {
-        T *i = ptr + idx;
-        T *j = i + asize;
-        while (i < j)
-            new (i++) T(*abuf++);
+        // call constructor for new objects (which can throw)
+        while (s < asize)
+            new (ptr+(s++)) T(*abuf++);
     } else {
-        qMemCopy(&ptr[idx], abuf, asize * sizeof(T));
+        qMemCopy(&ptr[s], abuf, increment * sizeof(T));
+        s = asize;
     }
 }
 
@@ -189,46 +193,58 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::realloc(int asize, int a
     Q_ASSERT(aalloc >= asize);
     T *oldPtr = ptr;
     int osize = s;
-    s = asize;
+    // s = asize;
 
     if (aalloc != a) {
         ptr = reinterpret_cast<T *>(qMalloc(aalloc * sizeof(T)));
+        Q_CHECK_PTR(ptr);
         if (ptr) {
+            s = 0;
             a = aalloc;
 
             if (QTypeInfo<T>::isStatic) {
-                T *i = ptr + osize;
-                T *j = oldPtr + osize;
-                while (i != ptr) {
-                    new (--i) T(*--j);
-                    j->~T();
+                QT_TRY {
+                    while (s < asize) {
+                        new (ptr+s) T(*(oldPtr+s));
+                        (oldPtr+s)->~T();
+                        s++;
+                    }
+                } QT_CATCH(...) {
+                    // clean up all the old objects and then free the old ptr
+                    int sClean = s;
+                    while (sClean < osize)
+                        (oldPtr+(sClean++))->~T();
+                    if (oldPtr != reinterpret_cast<T *>(array) && oldPtr != ptr)
+                        qFree(oldPtr);
+                    QT_RETHROW;
                 }
             } else {
-                qMemCopy(ptr, oldPtr, osize * sizeof(T));
+                qMemCopy(ptr, oldPtr, qMin(asize, osize) * sizeof(T));
+                s = asize;
             }
         } else {
             ptr = oldPtr;
-            s = 0;
-            asize = 0;
+            return;
         }
     }
 
     if (QTypeInfo<T>::isComplex) {
-        if (asize < osize) {
-            T *i = oldPtr + osize;
-            T *j = oldPtr + asize;
-            while (i-- != j)
-                i->~T();
-        } else {
-            T *i = ptr + asize;
-            T *j = ptr + osize;
-            while (i != j)
-                new (--i) T;
-        }
+        while (osize > asize)
+            (oldPtr+(--osize))->~T();
+        if( oldPtr == ptr )
+            s = osize;
     }
 
     if (oldPtr != reinterpret_cast<T *>(array) && oldPtr != ptr)
         qFree(oldPtr);
+
+    if (QTypeInfo<T>::isComplex) {
+        // call default constructor for new objects (which can throw)
+        while (s < asize)
+            new (ptr+(s++)) T;
+    } else {
+        s = asize;
+    }
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp
index 04913232c3..89ba285d30 100644
--- a/src/corelib/tools/qvector.cpp
+++ b/src/corelib/tools/qvector.cpp
@@ -50,6 +50,7 @@ QVectorData QVectorData::shared_null = { Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, tr
 QVectorData *QVectorData::malloc(int sizeofTypedData, int size, int sizeofT, QVectorData *init)
 {
     QVectorData* p = (QVectorData *)qMalloc(sizeofTypedData + (size - 1) * sizeofT);
+    Q_CHECK_PTR(p);
     ::memcpy(p, init, sizeofTypedData + (qMin(size, init->alloc) - 1) * sizeofT);
     return p;
 }
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index dcd87b7ba1..3a7b35ce90 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -77,6 +77,7 @@ struct Q_CORE_EXPORT QVectorData
     static QVectorData shared_null;
     // ### Qt 5: rename to 'allocate()'. The current name causes problems for
     // some debugges when the QVector is member of a class within an unnamed namespace.
+    // ### Qt 5: can be removed completely. (Ralf)
     static QVectorData *malloc(int sizeofTypedData, int size, int sizeofT, QVectorData *init);
     static int grow(int sizeofTypedData, int size, int sizeofT, bool excessive);
 };
@@ -372,7 +373,9 @@ QVector<T> &QVector<T>::operator=(const QVector<T> &v)
 template <typename T>
 inline QVectorData *QVector<T>::malloc(int aalloc)
 {
-    return static_cast<QVectorData *>(qMalloc(sizeOfTypedData() + (aalloc - 1) * sizeof(T)));
+    QVectorData *data = static_cast<QVectorData *>(qMalloc(sizeOfTypedData() + (aalloc - 1) * sizeof(T)));
+    Q_CHECK_PTR(data);
+    return data;
 }
 
 template <typename T>
@@ -423,74 +426,79 @@ void QVector<T>::free(Data *x)
 template <typename T>
 void QVector<T>::realloc(int asize, int aalloc)
 {
-    T *j, *i, *b;
+    T *pOld;
+    T *pNew;
     union { QVectorData *d; Data *p; } x;
     x.d = d;
 
-    if (QTypeInfo<T>::isComplex && aalloc == d->alloc && d->ref == 1) {
-        // pure resize
-        i = p->array + d->size;
-        j = p->array + asize;
-        if (i > j) {
-            while (i-- != j)
-                i->~T();
-        } else {
-            while (j-- != i)
-                new (j) T;
+    if (QTypeInfo<T>::isComplex && asize < d->size && d->ref == 1 ) {
+        // call the destructor on all objects that need to be
+        // destroyed when shrinking
+        pOld = p->array + d->size;
+        pNew = p->array + asize;
+        while (asize < d->size) {
+            (--pOld)->~T();
+            d->size--;
         }
-        d->size = asize;
-        return;
     }
 
     if (aalloc != d->alloc || d->ref != 1) {
         // (re)allocate memory
         if (QTypeInfo<T>::isStatic) {
             x.d = malloc(aalloc);
+            Q_CHECK_PTR(x.p);
+            x.d->size = 0;
         } else if (d->ref != 1) {
-            x.d = QVectorData::malloc(sizeOfTypedData(), aalloc, sizeof(T), d);
-        } else {
+            x.d = malloc(aalloc);
+            Q_CHECK_PTR(x.p);
             if (QTypeInfo<T>::isComplex) {
-                // call the destructor on all objects that need to be
-                // destroyed when shrinking
-                if (asize < d->size) {
-                    j = p->array + asize;
-                    i = p->array + d->size;
-                    while (i-- != j)
-                        i->~T();
-                    i = p->array + asize;
-                }
+                x.d->size = 0;
+            } else {
+                ::memcpy(x.p, p, sizeOfTypedData() + (qMin(aalloc, d->alloc) - 1) * sizeof(T));
+                x.d->size = d->size;
+            }
+        } else {
+            QT_TRY {
+                QVectorData *mem = static_cast<QVectorData *>(qRealloc(p, sizeOfTypedData() + (aalloc - 1) * sizeof(T)));
+                Q_CHECK_PTR(mem);
+                x.d = d = mem;
+                x.d->size = d->size;
+            } QT_CATCH (const std::bad_alloc &) {
+                if (aalloc > d->alloc) // ignore the error in case we are just shrinking.
+                    QT_RETHROW;
             }
-            x.d = d = static_cast<QVectorData *>(qRealloc(d, sizeOfTypedData() + (aalloc - 1) * sizeof(T)));
         }
         x.d->ref = 1;
+        x.d->alloc = aalloc;
         x.d->sharable = true;
         x.d->capacity = d->capacity;
-
     }
+
     if (QTypeInfo<T>::isComplex) {
-        if (asize < d->size) {
-            j = p->array + asize;
-            i = x.p->array + asize;
-        } else {
-            // construct all new objects when growing
-            i = x.p->array + asize;
-            j = x.p->array + d->size;
-            while (i != j)
-                new (--i) T;
-            j = p->array + d->size;
-        }
-        if (i != j) {
+        QT_TRY {
+            pOld = p->array + x.d->size;
+            pNew = x.p->array + x.d->size;
             // copy objects from the old array into the new array
-            b = x.p->array;
-            while (i != b)
-                new (--i) T(*--j);
+            while (x.d->size < qMin(asize, d->size)) {
+                new (pNew++) T(*pOld++);
+                x.d->size++;
+            }
+            // construct all new objects when growing
+            while (x.d->size < asize) {
+                new (pNew++) T;
+                x.d->size++;
+            }
+        } QT_CATCH (...) {
+            free(x.p);
+            QT_RETHROW;
         }
-    } else if (asize > d->size) {
+
+    } else if (asize > x.d->size) {
         // initialize newly allocated memory to 0
-        qMemSet(x.p->array + d->size, 0, (asize - d->size) * sizeof(T));
+        qMemSet(x.p->array + x.d->size, 0, (asize - x.d->size) * sizeof(T));
     }
     x.d->size = asize;
-    x.d->alloc = aalloc;
+
     if (d != x.d) {
         if (!d->ref.deref())
             free(p);
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 44fbb62a9a..e6c6169122 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -42,7 +42,8 @@ HEADERS +=  \
 	tools/qtimeline.h \
 	tools/qunicodetables_p.h \
 	tools/qvarlengtharray.h \
-	tools/qvector.h
+	tools/qvector.h \
+        tools/qscopedpointer.h
 
 
 SOURCES += \
@@ -73,6 +74,7 @@ SOURCES += \
 	tools/qvector.cpp \
         tools/qvsnprintf.cpp
 
+symbian:SOURCES+=tools/qlocale_symbian.cpp
 
 #zlib support
 contains(QT_CONFIG, zlib) {
@@ -109,4 +111,7 @@ SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \
            tools/qharfbuzz.cpp
 HEADERS += tools/qharfbuzz_p.h
 
-!macx-icc:!vxworks:unix:LIBS += -lm
+INCLUDEPATH += ../3rdparty/md5 \
+               ../3rdparty/md4
+
+!macx-icc:unix:!symbian:!vxworks:LIBS += -lm
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index 3e8f73e480..cbf367e086 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -434,7 +434,6 @@ QXmlStreamReader::~QXmlStreamReader()
     Q_D(QXmlStreamReader);
     if (d->deleteDevice)
         delete d->device;
-    delete d;
 }
 
 /*! \fn bool QXmlStreamReader::hasError() const
@@ -823,7 +822,9 @@ inline void QXmlStreamReaderPrivate::reallocateStack()
 {
     stack_size <<= 1;
     sym_stack = reinterpret_cast<Value*> (qRealloc(sym_stack, stack_size * sizeof(Value)));
+    Q_CHECK_PTR(sym_stack);
     state_stack = reinterpret_cast<int*> (qRealloc(state_stack, stack_size * sizeof(int)));
+    Q_CHECK_PTR(sym_stack);
 }
 
 
@@ -3135,8 +3136,6 @@ QXmlStreamWriter::QXmlStreamWriter(QString *string)
 */
 QXmlStreamWriter::~QXmlStreamWriter()
 {
-    Q_D(QXmlStreamWriter);
-    delete d;
 }
 
 
diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h
index dcf010569d..7be71387bf 100644
--- a/src/corelib/xml/qxmlstream.h
+++ b/src/corelib/xml/qxmlstream.h
@@ -48,6 +48,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QVector>
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_HEADER
 
@@ -392,7 +393,7 @@ public:
 private:
     Q_DISABLE_COPY(QXmlStreamReader)
     Q_DECLARE_PRIVATE(QXmlStreamReader)
-    QXmlStreamReaderPrivate *d_ptr;
+    QScopedPointer<QXmlStreamReaderPrivate> d_ptr;
 
 };
 #endif // QT_NO_XMLSTREAMREADER
@@ -465,7 +466,7 @@ public:
 private:
     Q_DISABLE_COPY(QXmlStreamWriter)
     Q_DECLARE_PRIVATE(QXmlStreamWriter)
-    QXmlStreamWriterPrivate *d_ptr;
+    QScopedPointer<QXmlStreamWriterPrivate> d_ptr;
 };
 #endif // QT_NO_XMLSTREAMWRITER
 
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp
index 79c2959fa5..24996ddf1e 100644
--- a/src/dbus/qdbusabstractadaptor.cpp
+++ b/src/dbus/qdbusabstractadaptor.cpp
@@ -264,7 +264,7 @@ void QDBusAdaptorConnector::polish()
 
 void QDBusAdaptorConnector::relaySlot(void **argv)
 {
-    QObjectPrivate *d = static_cast<QObjectPrivate *>(d_ptr);
+    QObjectPrivate *d = static_cast<QObjectPrivate *>(d_ptr.data());
     relay(d->currentSender->sender, d->currentSender->signal, argv);
 }
 
diff --git a/src/dbus/qdbuscontext.h b/src/dbus/qdbuscontext.h
index c679bde2f9..e655a7bdaf 100644
--- a/src/dbus/qdbuscontext.h
+++ b/src/dbus/qdbuscontext.h
@@ -74,7 +74,7 @@ public:
 
 private:
     QDBusContextPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(QDBusContext)
+    friend class QDBusContextPrivate;
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri
index f1ec8588bd..b9fad41d78 100644
--- a/src/gui/dialogs/dialogs.pri
+++ b/src/gui/dialogs/dialogs.pri
@@ -7,6 +7,7 @@ HEADERS += \
 	dialogs/qabstractpagesetupdialog_p.h \
 	dialogs/qcolordialog.h \
 	dialogs/qcolordialog_p.h \
+        dialogs/qfscompleter_p.h \
 	dialogs/qdialog.h \
 	dialogs/qdialog_p.h \
 	dialogs/qerrormessage.h \
@@ -45,7 +46,7 @@ win32 {
     !win32-borland:!wince*: LIBS += -lshell32 	# the filedialog needs this library
 }
 
-!mac:!embedded:unix {
+!mac:!embedded:!symbian:unix {
         HEADERS += dialogs/qpagesetupdialog_unix_p.h
 	SOURCES += dialogs/qprintdialog_unix.cpp \
 		   dialogs/qpagesetupdialog_unix.cpp
@@ -70,7 +71,7 @@ embedded {
         }
 }
 
-wince*: FORMS += dialogs/qfiledialog_wince.ui
+wince*|symbian: FORMS += dialogs/qfiledialog_embedded.ui
 else: FORMS += dialogs/qfiledialog.ui
 
 INCLUDEPATH += $$PWD
@@ -94,4 +95,4 @@ SOURCES += \
 
 FORMS += dialogs/qpagesetupwidget.ui
 RESOURCES += dialogs/qprintdialog.qrc
-RESOURCES += dialogs/qmessagebox.qrc
\ No newline at end of file
+RESOURCES += dialogs/qmessagebox.qrc
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp
index bb6c6d6c1b..3cb35bf0cc 100644
--- a/src/gui/dialogs/qdialog.cpp
+++ b/src/gui/dialogs/qdialog.cpp
@@ -64,8 +64,10 @@ extern bool qt_wince_is_mobile();     //defined in qguifunctions_wce.cpp
 extern bool qt_wince_is_smartphone(); //is defined in qguifunctions_wce.cpp
 #elif defined(Q_WS_X11)
 #  include "../kernel/qt_x11_p.h"
+#elif defined(Q_OS_SYMBIAN)
+#  include "qfiledialog.h"
+#  include "qmenubar.h"
 #endif
-
 #ifndef SPI_GETSNAPTODEFBUTTON
 #  define SPI_GETSNAPTODEFBUTTON  95
 #endif
@@ -292,9 +294,13 @@ QDialog::QDialog(QDialogPrivate &dd, QWidget *parent, Qt::WindowFlags f)
 
 QDialog::~QDialog()
 {
-    // Need to hide() here, as our (to-be) overridden hide()
-    // will not be called in ~QWidget.
-    hide();
+    QT_TRY {
+        // Need to hide() here, as our (to-be) overridden hide()
+        // will not be called in ~QWidget.
+        hide();
+    } QT_CATCH(...) {
+        // we're in the destructor - just swallow the exception
+    }
 }
 
 /*!
@@ -486,7 +492,19 @@ int QDialog::exec()
 #endif //QT_NO_MENUBAR
 #endif //Q_WS_WINCE_WM
 
-    show();
+#ifdef Q_OS_SYMBIAN
+#ifndef QT_NO_MENUBAR
+    QMenuBar *menuBar = 0;
+    if (!findChild<QMenuBar *>())
+        menuBar = new QMenuBar(this);
+#endif
+
+    if (qobject_cast<QFileDialog *>(this))
+        showFullScreen();
+    else
+#endif // Q_OS_SYMBIAN
+
+        show();
 
 #ifdef Q_WS_MAC
     d->mac_nativeDialogModalHelp();
@@ -511,6 +529,13 @@ int QDialog::exec()
         delete menuBar;
 #endif //QT_NO_MENUBAR
 #endif //Q_WS_WINCE_WM
+#ifdef Q_OS_SYMBIAN
+#ifndef QT_NO_MENUBAR
+    else if (menuBar)
+        delete menuBar;
+#endif //QT_NO_MENUBAR
+#endif //Q_OS_SYMBIAN
+
     return res;
 }
 
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 8b4e1b1a8b..6198661b1b 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -58,12 +58,15 @@
 #include <qdebug.h>
 #include <qapplication.h>
 #include <qstylepainter.h>
-#ifndef Q_WS_WINCE
+#if !defined(Q_WS_WINCE) && !defined(Q_OS_SYMBIAN)
 #include "ui_qfiledialog.h"
 #else
-#include "ui_qfiledialog_wince.h"
+#define Q_EMBEDDED_SMALLSCREEN
+#include "ui_qfiledialog_embedded.h"
+#if defined(Q_OS_WINCE)
 extern bool qt_priv_ptr_valid;
 #endif
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -358,7 +361,6 @@ QFileDialog::~QFileDialog()
     settings.beginGroup(QLatin1String("Qt"));
     settings.setValue(QLatin1String("filedialog"), saveState());
 #endif
-    delete d->qFileDialogUi;
     d->deleteNativeDialog_sys();
 }
 
@@ -490,6 +492,38 @@ void QFileDialog::changeEvent(QEvent *e)
     QDialog::changeEvent(e);
 }
 
+QFileDialogPrivate::QFileDialogPrivate()
+    :
+#ifndef QT_NO_PROXYMODEL
+        proxyModel(0),
+#endif
+        model(0),
+        fileMode(QFileDialog::AnyFile),
+        acceptMode(QFileDialog::AcceptOpen),
+        currentHistoryLocation(-1),
+        renameAction(0),
+        deleteAction(0),
+        showHiddenAction(0),
+        useDefaultCaption(true),
+        defaultFileTypes(true),
+        fileNameLabelExplicitlySat(false),
+        nativeDialogInUse(false),
+#ifdef Q_WS_MAC
+        mDelegate(0),
+#ifndef QT_MAC_USE_COCOA
+        mDialog(0),
+        mDialogStarted(false),
+        mDialogClosed(true),
+#endif
+#endif
+        qFileDialogUi(0)
+{
+}
+
+QFileDialogPrivate::~QFileDialogPrivate()
+{
+}
+
 void QFileDialogPrivate::retranslateWindowTitle()
 {
     Q_Q(QFileDialog);
@@ -2068,7 +2102,7 @@ void QFileDialogPrivate::init(const QString &directory, const QString &nameFilte
     q->restoreState(settings.value(QLatin1String("filedialog")).toByteArray());
 #endif
 
-#ifdef Q_WS_WINCE
+#if defined(Q_EMBEDDED_SMALLSCREEN)
     qFileDialogUi->lookInLabel->setVisible(false);
     qFileDialogUi->fileNameLabel->setVisible(false);
     qFileDialogUi->fileTypeLabel->setVisible(false);
@@ -2108,7 +2142,7 @@ void QFileDialogPrivate::createWidgets()
             q, SLOT(_q_rowsInserted(const QModelIndex &)));
     model->setReadOnly(false);
 
-    qFileDialogUi = new Ui_QFileDialog();
+    qFileDialogUi.reset(new Ui_QFileDialog());
     qFileDialogUi->setupUi(q);
 
     QList<QUrl> initialBookmarks;
@@ -2134,7 +2168,7 @@ void QFileDialogPrivate::createWidgets()
     qFileDialogUi->fileNameLabel->setBuddy(qFileDialogUi->fileNameEdit);
 #endif
 #ifndef QT_NO_COMPLETER
-    completer = new QFSCompletor(model, q);
+    completer = new QFSCompleter(model, q);
     qFileDialogUi->fileNameEdit->setCompleter(completer);
     QObject::connect(qFileDialogUi->fileNameEdit, SIGNAL(textChanged(QString)),
             q, SLOT(_q_autoCompleteFileName(QString)));
@@ -2192,9 +2226,9 @@ void QFileDialogPrivate::createWidgets()
         treeHeader->addAction(showHeader);
     }
 
-    QItemSelectionModel *selModel = qFileDialogUi->treeView->selectionModel();
+    QScopedPointer<QItemSelectionModel> selModel(qFileDialogUi->treeView->selectionModel());
     qFileDialogUi->treeView->setSelectionModel(qFileDialogUi->listView->selectionModel());
-    delete selModel;
+
     QObject::connect(qFileDialogUi->treeView, SIGNAL(activated(QModelIndex)),
                      q, SLOT(_q_enterDirectory(QModelIndex)));
     QObject::connect(qFileDialogUi->treeView, SIGNAL(customContextMenuRequested(QPoint)),
@@ -2276,9 +2310,9 @@ void QFileDialog::setProxyModel(QAbstractProxyModel *proxyModel)
         connect(d->model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
             this, SLOT(_q_rowsInserted(const QModelIndex &)));
     }
-    QItemSelectionModel *selModel = d->qFileDialogUi->treeView->selectionModel();
+    QScopedPointer<QItemSelectionModel> selModel(d->qFileDialogUi->treeView->selectionModel());
     d->qFileDialogUi->treeView->setSelectionModel(d->qFileDialogUi->listView->selectionModel());
-    delete selModel;
+
     d->setRootIndex(idx);
 
     // reconnect selection
@@ -3159,7 +3193,7 @@ void QFileDialogLineEdit::keyPressEvent(QKeyEvent *e)
 
 #ifndef QT_NO_COMPLETER
 
-QString QFSCompletor::pathFromIndex(const QModelIndex &index) const
+QString QFSCompleter::pathFromIndex(const QModelIndex &index) const
 {
     const QFileSystemModel *dirModel;
     if (proxyModel)
@@ -3174,14 +3208,17 @@ QString QFSCompletor::pathFromIndex(const QModelIndex &index) const
     return index.data(QFileSystemModel::FilePathRole).toString();
 }
 
-QStringList QFSCompletor::splitPath(const QString &path) const
+QStringList QFSCompleter::splitPath(const QString &path) const
 {
     if (path.isEmpty())
         return QStringList(completionPrefix());
 
     QString pathCopy = QDir::toNativeSeparators(path);
     QString sep = QDir::separator();
-#ifdef Q_OS_WIN
+#if defined(Q_OS_SYMBIAN)
+    if (pathCopy == QLatin1String("\\"))
+        return QStringList(pathCopy);
+#elif defined(Q_OS_WIN)
     if (pathCopy == QLatin1String("\\") || pathCopy == QLatin1String("\\\\"))
         return QStringList(pathCopy);
     QString doubleSlash(QLatin1String("\\\\"));
@@ -3193,7 +3230,11 @@ QStringList QFSCompletor::splitPath(const QString &path) const
 
     QRegExp re(QLatin1Char('[') + QRegExp::escape(sep) + QLatin1Char(']'));
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_SYMBIAN)
+    QStringList parts = pathCopy.split(re, QString::SkipEmptyParts);
+    if (pathCopy.endsWith(sep))
+        parts.append(QString());
+#elif defined(Q_OS_WIN)
     QStringList parts = pathCopy.split(re, QString::SkipEmptyParts);
     if (!doubleSlash.isEmpty() && !parts.isEmpty())
         parts[0].prepend(doubleSlash);
@@ -3205,7 +3246,7 @@ QStringList QFSCompletor::splitPath(const QString &path) const
         parts[0] = sep[0];
 #endif
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     bool startsFromRoot = !parts.isEmpty() && parts[0].endsWith(QLatin1Char(':'));
 #else
     bool startsFromRoot = path[0] == sep[0];
diff --git a/src/gui/dialogs/qfiledialog_wince.ui b/src/gui/dialogs/qfiledialog_embedded.ui
index 3f1545866d..3f1545866d 100644
--- a/src/gui/dialogs/qfiledialog_wince.ui
+++ b/src/gui/dialogs/qfiledialog_embedded.ui
diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/gui/dialogs/qfiledialog_p.h
index 4c599cc039..2da2b92c2a 100644
--- a/src/gui/dialogs/qfiledialog_p.h
+++ b/src/gui/dialogs/qfiledialog_p.h
@@ -75,6 +75,7 @@
 #include <qpointer.h>
 #include <qdebug.h>
 #include "qsidebar_p.h"
+#include "qfscompleter_p.h"
 
 #if defined (Q_OS_UNIX)
 #include <unistd.h>
@@ -90,25 +91,6 @@ class QCompleter;
 class QHBoxLayout;
 class Ui_QFileDialog;
 
-#ifndef QT_NO_COMPLETER
-/*!
-    QCompleter that can deal with QFileSystemModel
-  */
-class QFSCompletor :  public QCompleter {
-public:
-    QFSCompletor(QFileSystemModel *model, QObject *parent = 0) : QCompleter(model, parent), proxyModel(0), sourceModel(model)
-    {
-#ifdef Q_OS_WIN
-        setCaseSensitivity(Qt::CaseInsensitive);
-#endif
-    }
-    QString pathFromIndex(const QModelIndex &index) const;
-    QStringList splitPath(const QString& path) const;
-
-    QAbstractProxyModel *proxyModel;
-    QFileSystemModel *sourceModel;
-};
-#endif // QT_NO_COMPLETER
 
 struct QFileDialogArgs
 {
@@ -130,31 +112,7 @@ class Q_AUTOTEST_EXPORT QFileDialogPrivate : public QDialogPrivate
     Q_DECLARE_PUBLIC(QFileDialog)
 
 public:
-    QFileDialogPrivate() :
-#ifndef QT_NO_PROXYMODEL
-    proxyModel(0),
-#endif
-    model(0),
-    fileMode(QFileDialog::AnyFile),
-    acceptMode(QFileDialog::AcceptOpen),
-    currentHistoryLocation(-1),
-    renameAction(0),
-    deleteAction(0),
-    showHiddenAction(0),
-    useDefaultCaption(true),
-    defaultFileTypes(true),
-    fileNameLabelExplicitlySat(false),
-    nativeDialogInUse(false),
-#ifdef Q_WS_MAC
-    mDelegate(0),
-#ifndef QT_MAC_USE_COCOA
-    mDialog(0),
-    mDialogStarted(false),
-    mDialogClosed(true),
-#endif
-#endif
-    qFileDialogUi(0)
-    {}
+    QFileDialogPrivate();
 
     void createToolButtons();
     void createMenuActions();
@@ -222,7 +180,7 @@ public:
 
     static inline QString toInternal(const QString &path)
     {
-#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX)
+#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) || defined(Q_OS_SYMBIAN)
         QString n(path);
         for (int i = 0; i < (int)n.length(); ++i)
             if (n[i] == QLatin1Char('\\')) n[i] = QLatin1Char('/');
@@ -275,7 +233,7 @@ public:
     QFileSystemModel *model;
 
 #ifndef QT_NO_COMPLETER
-    QFSCompletor *completer;
+    QFSCompleter *completer;
 #endif //QT_NO_COMPLETER
 
     QFileDialog::FileMode fileMode;
@@ -296,7 +254,7 @@ public:
     bool defaultFileTypes;
     bool fileNameLabelExplicitlySat;
     QStringList nameFilters;
-    
+
     // Members for using native dialogs:
     bool nativeDialogInUse;
     // setVisible_sys returns true if it ends up showing a native
@@ -358,7 +316,7 @@ public:
     void mac_nativeDialogModalHelp();
 #endif
 
-    Ui_QFileDialog *qFileDialogUi;
+    QScopedPointer<Ui_QFileDialog> qFileDialogUi;
 
     QString acceptLabel;
 
@@ -367,6 +325,11 @@ public:
     QByteArray signalToDisconnectOnClose;
 
     QFileDialog::Options opts;
+
+    ~QFileDialogPrivate();
+
+private:
+    Q_DISABLE_COPY(QFileDialogPrivate)
 };
 
 class QFileDialogLineEdit : public QLineEdit
diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp
index 467822cbf4..6e1b6afed7 100644
--- a/src/gui/dialogs/qfileinfogatherer.cpp
+++ b/src/gui/dialogs/qfileinfogatherer.cpp
@@ -86,10 +86,10 @@ QFileInfoGatherer::QFileInfoGatherer(QObject *parent)
 */
 QFileInfoGatherer::~QFileInfoGatherer()
 {
-    mutex.lock();
+    QMutexLocker locker(&mutex);
     abort = true;
     condition.wakeOne();
-    mutex.unlock();
+    locker.unlock();
     wait();
 }
 
@@ -97,9 +97,8 @@ void QFileInfoGatherer::setResolveSymlinks(bool enable)
 {
     Q_UNUSED(enable);
 #ifdef Q_OS_WIN
-    mutex.lock();
+    QMutexLocker locker(&mutex);
     m_resolveSymlinks = enable;
-    mutex.unlock();
 #endif
 }
 
@@ -110,9 +109,8 @@ bool QFileInfoGatherer::resolveSymlinks() const
 
 void QFileInfoGatherer::setIconProvider(QFileIconProvider *provider)
 {
-    mutex.lock();
+    QMutexLocker locker(&mutex);
     m_iconProvider = provider;
-    mutex.unlock();
 }
 
 QFileIconProvider *QFileInfoGatherer::iconProvider() const
@@ -127,12 +125,11 @@ QFileIconProvider *QFileInfoGatherer::iconProvider() const
 */
 void QFileInfoGatherer::fetchExtendedInformation(const QString &path, const QStringList &files)
 {
-    mutex.lock();
+    QMutexLocker locker(&mutex);
     // See if we already have this dir/file in our que
     int loc = this->path.lastIndexOf(path);
     while (loc > 0)  {
         if (this->files.at(loc) == files) {
-            mutex.unlock();
             return;
         }
         loc = this->path.lastIndexOf(path, loc - 1);
@@ -140,7 +137,6 @@ void QFileInfoGatherer::fetchExtendedInformation(const QString &path, const QStr
     this->path.push(path);
     this->files.push(files);
     condition.wakeAll();
-    mutex.unlock();
 }
 
 /*!
@@ -163,10 +159,9 @@ void QFileInfoGatherer::updateFile(const QString &filePath)
 void QFileInfoGatherer::clear()
 {
 #ifndef QT_NO_FILESYSTEMWATCHER
-    mutex.lock();
+    QMutexLocker locker(&mutex);
     watcher->removePaths(watcher->files());
     watcher->removePaths(watcher->directories());
-    mutex.unlock();
 #endif
 }
 
@@ -178,9 +173,8 @@ void QFileInfoGatherer::clear()
 void QFileInfoGatherer::removePath(const QString &path)
 {
 #ifndef QT_NO_FILESYSTEMWATCHER
-    mutex.lock();
+    QMutexLocker locker(&mutex);
     watcher->removePath(path);
-    mutex.unlock();
 #endif
 }
 
@@ -201,9 +195,8 @@ void QFileInfoGatherer::run()
 {
     forever {
         bool updateFiles = false;
-        mutex.lock();
+        QMutexLocker locker(&mutex);
         if (abort) {
-            mutex.unlock();
             return;
         }
         if (this->path.isEmpty())
@@ -217,8 +210,9 @@ void QFileInfoGatherer::run()
             this->files.pop_front();
             updateFiles = true;
         }
-        mutex.unlock();
-        if (updateFiles) getFileInfos(path, list);
+        locker.unlock();
+        if (updateFiles)
+            getFileInfos(path, list);
     }
 }
 
@@ -290,6 +284,8 @@ QString QFileInfoGatherer::translateDriveName(const QFileInfo &drive) const
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     if (driveName.startsWith(QLatin1Char('/'))) // UNC host
         return drive.fileName();
+#endif
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     if (driveName.endsWith(QLatin1Char('/')))
         driveName.chop(1);
 #endif
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index b8e12b493c..749203957b 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -347,7 +347,7 @@ QFileSystemModelPrivate::QFileSystemNode *QFileSystemModelPrivate::node(const QS
     // ### TODO can we use bool QAbstractFileEngine::caseSensitive() const?
     QStringList pathElements = absolutePath.split(QLatin1Char('/'), QString::SkipEmptyParts);
     if ((pathElements.isEmpty())
-#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+#if (!defined(Q_OS_WIN) || defined(Q_OS_WINCE)) && !defined(Q_OS_SYMBIAN)
         && QDir::fromNativeSeparators(longPath) != QLatin1String("/")
 #endif
         )
@@ -376,9 +376,21 @@ QFileSystemModelPrivate::QFileSystemNode *QFileSystemModelPrivate::node(const QS
         r = translateVisibleLocation(rootNode, r);
         index = q->index(r, 0, QModelIndex());
         pathElements.pop_front();
-    } else {
+    } else
+#endif
+
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+    {
         if (!pathElements.at(0).contains(QLatin1String(":")))
+#if defined(Q_CC_NOKIAX86)
+        {
+            // Workaround for bizarre compiler crash.
+            QString rootPath = QDir(longPath).rootPath();
+            pathElements.prepend(rootPath);
+        }
+#else
             pathElements.prepend(QDir(longPath).rootPath());
+#endif
         if (pathElements.at(0).endsWith(QLatin1Char('/')))
             pathElements[0].chop(1);
     }
@@ -1589,12 +1601,25 @@ void QFileSystemModelPrivate::_q_directoryChanged(const QString &directory, cons
     if (parentNode->children.count() == 0)
         return;
     QStringList toRemove;
+#if defined(Q_OS_SYMBIAN)
+    // Filename case must be exact in qBinaryFind below, so create a list of all lowercase names.
+    QStringList newFiles;
+    for(int i = 0; i < files.size(); i++) {
+        newFiles << files.at(i).toLower();
+    }
+#else
     QStringList newFiles = files;
+#endif
     qSort(newFiles.begin(), newFiles.end());
     QHash<QString, QFileSystemNode*>::const_iterator i = parentNode->children.constBegin();
     while (i != parentNode->children.constEnd()) {
         QStringList::iterator iterator;
-        iterator = qBinaryFind(newFiles.begin(), newFiles.end(), i.value()->fileName);
+        iterator = qBinaryFind(newFiles.begin(), newFiles.end(),
+#if defined(Q_OS_SYMBIAN)
+                    i.value()->fileName.toLower());
+#else
+                    i.value()->fileName);
+#endif
         if (iterator == newFiles.end()) {
             toRemove.append(i.value()->fileName);
         }
@@ -1917,8 +1942,8 @@ bool QFileSystemModelPrivate::passNameFilters(const QFileSystemNode *node) const
     return true;
 }
 
+QT_END_NAMESPACE
+
 #include "moc_qfilesystemmodel.cpp"
 
 #endif // QT_NO_FILESYSTEMMODEL
-
-QT_END_NAMESPACE
diff --git a/src/gui/dialogs/qfscompleter_p.h b/src/gui/dialogs/qfscompleter_p.h
new file mode 100644
index 0000000000..c65eeea833
--- /dev/null
+++ b/src/gui/dialogs/qfscompleter_p.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOMPLETOR_P_H
+#define QCOMPLETOR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qcompleter.h"
+#include <QtGui/qfilesystemmodel.h>
+QT_BEGIN_NAMESPACE
+#ifndef QT_NO_COMPLETER
+
+/*!
+    QCompleter that can deal with QFileSystemModel
+  */
+class QFSCompleter :  public QCompleter {
+public:
+    QFSCompleter(QFileSystemModel *model, QObject *parent = 0)
+        : QCompleter(model, parent), proxyModel(0), sourceModel(model)
+    {
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+        setCaseSensitivity(Qt::CaseInsensitive);
+#endif
+    }
+    QString pathFromIndex(const QModelIndex &index) const;
+    QStringList splitPath(const QString& path) const;
+
+    QAbstractProxyModel *proxyModel;
+    QFileSystemModel *sourceModel;
+};
+#endif // QT_NO_COMPLETER
+QT_END_NAMESPACE
+#endif // QCOMPLETOR_P_H
+
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp
index 31f73b917a..8a79759b99 100644
--- a/src/gui/dialogs/qmessagebox.cpp
+++ b/src/gui/dialogs/qmessagebox.cpp
@@ -269,7 +269,7 @@ void QMessageBoxPrivate::updateSize()
         return;
 
     QSize screenSize = QApplication::desktop()->availableGeometry(QCursor::pos()).size();
-#if defined(Q_WS_QWS) || defined(Q_WS_WINCE)
+#if defined(Q_WS_QWS) || defined(Q_WS_WINCE) || defined(Q_OS_SYMBIAN)
     // the width of the screen, less the window border.
     int hardLimit = screenSize.width() - (q->frameGeometry().width() - q->geometry().width());
 #else
diff --git a/src/gui/dialogs/qpagesetupdialog_win.cpp b/src/gui/dialogs/qpagesetupdialog_win.cpp
index 3f2fb34594..5f49aee814 100644
--- a/src/gui/dialogs/qpagesetupdialog_win.cpp
+++ b/src/gui/dialogs/qpagesetupdialog_win.cpp
@@ -71,7 +71,7 @@ int QPageSetupDialog::exec()
         return Rejected;
 
     QWin32PrintEngine *engine = static_cast<QWin32PrintEngine*>(d->printer->paintEngine());
-    QWin32PrintEnginePrivate *ep = static_cast<QWin32PrintEnginePrivate *>(engine->d_ptr);
+    QWin32PrintEnginePrivate *ep = static_cast<QWin32PrintEnginePrivate *>(engine->d_ptr.data());
 
     PAGESETUPDLG psd;
     memset(&psd, 0, sizeof(PAGESETUPDLG));
diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp
index 5d64a6726f..3fb132d32c 100644
--- a/src/gui/dialogs/qprintdialog_unix.cpp
+++ b/src/gui/dialogs/qprintdialog_unix.cpp
@@ -44,7 +44,6 @@
 #ifndef QT_NO_PRINTDIALOG
 
 #include "private/qabstractprintdialog_p.h"
-#include "qfiledialog_p.h"
 #include <QtGui/qmessagebox.h>
 #include "qprintdialog.h"
 #include "qfiledialog.h"
@@ -55,6 +54,7 @@
 
 #include <QtGui/qdialogbuttonbox.h>
 
+#include "qfscompleter_p.h"
 #include "ui_qprintpropertieswidget.h"
 #include "ui_qprintsettingsoutput.h"
 #include "ui_qprintwidget.h"
@@ -696,7 +696,7 @@ QUnixPrintWidgetPrivate::QUnixPrintWidgetPrivate(QUnixPrintWidget *p)
     QFileSystemModel *fsm = new QFileSystemModel(widget.filename);
     fsm->setRootPath(QDir::homePath());
 #if !defined(QT_NO_COMPLETER) && !defined(QT_NO_FILEDIALOG)
-    widget.filename->setCompleter(new QFSCompletor(fsm, widget.filename));
+    widget.filename->setCompleter(new QFSCompleter(fsm, widget.filename));
 #endif
 #endif
     _q_printerChanged(currentPrinterIndex);
diff --git a/src/gui/dialogs/qprintpreviewdialog.cpp b/src/gui/dialogs/qprintpreviewdialog.cpp
index eaae2877a5..ef640560db 100644
--- a/src/gui/dialogs/qprintpreviewdialog.cpp
+++ b/src/gui/dialogs/qprintpreviewdialog.cpp
@@ -42,6 +42,7 @@
 #include "qprintpreviewdialog.h"
 #include "qprintpreviewwidget.h"
 #include <private/qprinter_p.h>
+#include "private/qdialog_p.h"
 
 #include <QtGui/qaction.h>
 #include <QtGui/qboxlayout.h>
@@ -138,12 +139,12 @@ private:
 };
 } // anonymous namespace
 
-class QPrintPreviewDialogPrivate
+class QPrintPreviewDialogPrivate : public QDialogPrivate
 {
     Q_DECLARE_PUBLIC(QPrintPreviewDialog)
 public:
-    QPrintPreviewDialogPrivate(QPrintPreviewDialog *q)
-        : q_ptr(q), printDialog(0), ownPrinter(false),
+    QPrintPreviewDialogPrivate()
+        : printDialog(0), ownPrinter(false),
           initialized(false) {}
 
     // private slots
@@ -168,7 +169,6 @@ public:
     void updatePageNumLabel();
     void updateZoomFactor();
 
-    QPrintPreviewDialog *q_ptr;
     QPrintDialog *printDialog;
     QPrintPreviewWidget *preview;
     QPrinter *printer;
@@ -662,7 +662,7 @@ void QPrintPreviewDialogPrivate::_q_zoomFactorChanged()
     \sa QWidget::setWindowFlags()
 */
 QPrintPreviewDialog::QPrintPreviewDialog(QPrinter* printer, QWidget *parent, Qt::WindowFlags flags)
-    : QDialog(parent, flags), d_ptr(new QPrintPreviewDialogPrivate(this))
+    : QDialog(*new QPrintPreviewDialogPrivate, parent, flags)
 {
     Q_D(QPrintPreviewDialog);
     d->init(printer);
@@ -676,7 +676,7 @@ QPrintPreviewDialog::QPrintPreviewDialog(QPrinter* printer, QWidget *parent, Qt:
     system default printer.
 */
 QPrintPreviewDialog::QPrintPreviewDialog(QWidget *parent, Qt::WindowFlags f)
-    : QDialog(parent, f), d_ptr(new QPrintPreviewDialogPrivate(this))
+    : QDialog(*new QPrintPreviewDialogPrivate, parent, f)
 {
     Q_D(QPrintPreviewDialog);
     d->init();
@@ -691,7 +691,6 @@ QPrintPreviewDialog::~QPrintPreviewDialog()
     if (d->ownPrinter)
         delete d->printer;
     delete d->printDialog;
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/gui/dialogs/qprintpreviewdialog.h b/src/gui/dialogs/qprintpreviewdialog.h
index 6c4c188c17..85ed517dc2 100644
--- a/src/gui/dialogs/qprintpreviewdialog.h
+++ b/src/gui/dialogs/qprintpreviewdialog.h
@@ -94,7 +94,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_previewChanged())
     Q_PRIVATE_SLOT(d_func(), void _q_zoomFactorChanged())
 
-    QPrintPreviewDialogPrivate *d_ptr;
+    void *dummy; // ### Qt 5 - remove me
 };
 
 
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp
index a97aedd1d2..345c0f714c 100644
--- a/src/gui/dialogs/qwizard.cpp
+++ b/src/gui/dialogs/qwizard.cpp
@@ -83,7 +83,7 @@ const int ModernHeaderTopMargin = 2;
 const int ClassicHMargin = 4;
 const int MacButtonTopMargin = 13;
 const int MacLayoutLeftMargin = 20;
-const int MacLayoutTopMargin = 14;
+//const int MacLayoutTopMargin = 14; // Unused. Save some space and avoid warning.
 const int MacLayoutRightMargin = 20;
 const int MacLayoutBottomMargin = 17;
 
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h
index 3ae148931d..d2be229a40 100644
--- a/src/gui/egl/qegl_p.h
+++ b/src/gui/egl/qegl_p.h
@@ -56,7 +56,7 @@
 #include <QtCore/qsize.h>
 #include <QtGui/qimage.h>
 
-#include "qeglproperties_p.h"
+#include <private/qeglproperties_p.h>
 
 QT_BEGIN_INCLUDE_NAMESPACE
 
diff --git a/src/gui/embedded/qsoundqss_qws.cpp b/src/gui/embedded/qsoundqss_qws.cpp
index a45d0fecbe..e239e14431 100644
--- a/src/gui/embedded/qsoundqss_qws.cpp
+++ b/src/gui/embedded/qsoundqss_qws.cpp
@@ -1037,24 +1037,28 @@ void QWSSoundServerPrivate::stopFile(int wid, int sid)
 void QWSSoundServerPrivate::stopAll(int wid)
 {
     QWSSoundServerProvider *bucket;
-    QList<QWSSoundServerProvider*>::Iterator it = active.begin();
-    while (it != active.end()) {
-        bucket = *it;
-        if (bucket->groupId() == wid) {
-            it = active.erase(it);
-            delete bucket;
-        } else {
-            ++it;
+    if (!active.isEmpty()) {
+        QList<QWSSoundServerProvider*>::Iterator it = active.begin();
+        while (it != active.end()) {
+            bucket = *it;
+            if (bucket->groupId() == wid) {
+                it = active.erase(it);
+                delete bucket;
+            } else {
+                ++it;
+            }
         }
     }
-    it = inactive.begin();
-    while (it != inactive.end()) {
-        bucket = *it;
-        if (bucket->groupId() == wid) {
-            it = inactive.erase(it);
-            delete bucket;
-        } else {
-            ++it;
+    if (!inactive.isEmpty()) {
+        QList<QWSSoundServerProvider*>::Iterator it = inactive.begin();
+        while (it != inactive.end()) {
+            bucket = *it;
+            if (bucket->groupId() == wid) {
+                it = inactive.erase(it);
+                delete bucket;
+            } else {
+                ++it;
+            }
         }
     }
 }
diff --git a/src/gui/embedded/qwindowsystem_qws.cpp b/src/gui/embedded/qwindowsystem_qws.cpp
index 624ba84dbd..954505176e 100644
--- a/src/gui/embedded/qwindowsystem_qws.cpp
+++ b/src/gui/embedded/qwindowsystem_qws.cpp
@@ -1297,7 +1297,13 @@ QWSServer::QWSServer(int flags, QObject *parent) :
     QObject(*new QWSServerPrivate, parent)
 {
     Q_D(QWSServer);
-    d->initServer(flags);
+    QT_TRY {
+        d->initServer(flags);
+    } QT_CATCH(...) {
+        qwsServer = 0;
+        qwsServerPrivate = 0;
+        QT_RETHROW;
+    }
 }
 
 #ifdef QT3_SUPPORT
@@ -1743,21 +1749,23 @@ void QWSServerPrivate::cleanupFonts(bool force)
 #if defined(QWS_DEBUG_FONTCLEANUP)
     qDebug() << "cleanupFonts()";
 #endif
-    QMap<QByteArray, int>::Iterator it = fontReferenceCount.begin();
-    while (it != fontReferenceCount.end()) {
-        if (it.value() && !force) {
-            ++it;
-            continue;
-        }
+    if (!fontReferenceCount.isEmpty()) {
+        QMap<QByteArray, int>::Iterator it = fontReferenceCount.begin();
+        while (it != fontReferenceCount.end()) {
+            if (it.value() && !force) {
+                ++it;
+                continue;
+            }
 
-        const QByteArray &fontName = it.key();
+            const QByteArray &fontName = it.key();
 #if defined(QWS_DEBUG_FONTCLEANUP)
-        qDebug() << "removing unused font file" << fontName;
+            qDebug() << "removing unused font file" << fontName;
 #endif
-        QFile::remove(QFile::decodeName(fontName));
-        sendFontRemovedEvent(fontName);
+            QFile::remove(QFile::decodeName(fontName));
+            sendFontRemovedEvent(fontName);
 
-        it = fontReferenceCount.erase(it);
+            it = fontReferenceCount.erase(it);
+        }
     }
 
     if (crashedClientIds.isEmpty())
@@ -3959,7 +3967,8 @@ void QWSServerPrivate::openDisplay()
 
 void QWSServerPrivate::closeDisplay()
 {
-    qt_screen->shutdownDevice();
+    if (qt_screen)
+        qt_screen->shutdownDevice();
 }
 
 /*!
@@ -4058,9 +4067,14 @@ void QWSServer::startup(int flags)
 
 void QWSServer::closedown()
 {
-    unlink(qws_qtePipeFilename().toLatin1().constData());
-    delete qwsServer;
+    QScopedPointer<QWSServer> server(qwsServer);
     qwsServer = 0;
+    QT_TRY {
+        unlink(qws_qtePipeFilename().toLatin1().constData());
+    } QT_CATCH(const std::bad_alloc &) {
+        // ### TODO - what to do when we run out of memory
+        // when calling toLatin1?
+    }
 }
 
 void QWSServerPrivate::emergency_cleanup()
diff --git a/src/gui/embedded/qwscursor_qws.cpp b/src/gui/embedded/qwscursor_qws.cpp
index 193094443d..e4474ac2cc 100644
--- a/src/gui/embedded/qwscursor_qws.cpp
+++ b/src/gui/embedded/qwscursor_qws.cpp
@@ -531,7 +531,7 @@ void QWSCursor::set(const uchar *data, const uchar *mask,
 
     cursor = QImage(width,height, QImage::Format_Indexed8);
 
-    if (!width || !height || !data || !mask)
+    if (!width || !height || !data || !mask || cursor.isNull())
         return;
 
     cursor.setNumColors(3);
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index a047e6abc6..7e738631bf 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -577,6 +577,7 @@
 #include <QtGui/qpixmapcache.h>
 #include <QtGui/qstyleoption.h>
 #include <QtGui/qevent.h>
+#include <QInputContext>
 
 #include <private/qgraphicsitem_p.h>
 #include <private/qgraphicswidget_p.h>
@@ -1042,7 +1043,7 @@ void QGraphicsItemPrivate::childrenBoundingRectHelper(QTransform *x, QRectF *rec
 
     for (int i = 0; i < children.size(); ++i) {
         QGraphicsItem *child = children.at(i);
-        QGraphicsItemPrivate *childd = child->d_ptr;
+        QGraphicsItemPrivate *childd = child->d_ptr.data();
         bool hasPos = !childd->pos.isNull();
         if (hasPos || childd->transformData) {
             // COMBINE
@@ -1201,12 +1202,11 @@ QGraphicsItem::~QGraphicsItem()
     if (d_ptr->transformData) {
         for(int i = 0; i < d_ptr->transformData->graphicsTransforms.size(); ++i) {
             QGraphicsTransform *t = d_ptr->transformData->graphicsTransforms.at(i);
-            static_cast<QGraphicsTransformPrivate *>(t->d_ptr)->item = 0;
+            static_cast<QGraphicsTransformPrivate *>(t->d_ptr.data())->item = 0;
             delete t;
         }
     }
     delete d_ptr->transformData;
-    delete d_ptr;
 
     qt_dataStore()->data.remove(this);
 }
@@ -3410,7 +3410,7 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co
     QTransform x;
     const QGraphicsItem *p = child;
     do {
-        p->d_ptr->combineTransformToParent(&x);
+        p->d_ptr.data()->combineTransformToParent(&x);
     } while ((p = p->d_ptr->parent) && p != root);
     if (parentOfOther)
         return x.inverted(ok);
@@ -3793,7 +3793,7 @@ QRectF QGraphicsItem::sceneBoundingRect() const
     const QGraphicsItem *parentItem = this;
     const QGraphicsItemPrivate *itemd;
     do {
-        itemd = parentItem->d_ptr;
+        itemd = parentItem->d_ptr.data();
         if (itemd->transformData)
             break;
         offset += itemd->pos;
@@ -8631,7 +8631,7 @@ class QGraphicsTextItemPrivate
 {
 public:
     QGraphicsTextItemPrivate()
-        : control(0), pageNumber(0), useDefaultImpl(false), tabChangesFocus(false)
+        : control(0), pageNumber(0), useDefaultImpl(false), tabChangesFocus(false), clickCausedFocus(0)
     { }
 
     mutable QTextControl *control;
@@ -8652,6 +8652,8 @@ public:
     bool useDefaultImpl;
     bool tabChangesFocus;
 
+    uint clickCausedFocus : 1;
+
     QGraphicsTextItem *qq;
 };
 
@@ -8981,7 +8983,13 @@ void QGraphicsTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             dd->useDefaultImpl = false;
         return;
     }
+
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8993,7 +9001,13 @@ void QGraphicsTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
         QGraphicsItem::mouseMoveEvent(event);
         return;
     }
+
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -9013,7 +9027,23 @@ void QGraphicsTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         }
         return;
     }
+
+    if (event->button() == Qt::LeftButton && qApp->autoSipEnabled()
+            && (!dd->clickCausedFocus || qApp->autoSipOnMouseFocus())) {
+        QEvent _event(QEvent::RequestSoftwareInputPanel);
+        QApplication::sendEvent(event->widget(), &_event);
+    } else {
+        QGraphicsItem::mouseReleaseEvent(event);
+    }
+    dd->clickCausedFocus = 0;
+
     dd->sendControlEvent(event);
+
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -9032,6 +9062,11 @@ void QGraphicsTextItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
     }
 
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -9040,6 +9075,11 @@ void QGraphicsTextItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 void QGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -9048,6 +9088,18 @@ void QGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 void QGraphicsTextItem::keyPressEvent(QKeyEvent *event)
 {
     dd->sendControlEvent(event);
+    QList<QGraphicsView *> views = scene()->views();
+    for (int i = 0; i < views.size(); ++i) {
+        QGraphicsView *view = views.at(i);
+        Q_ASSERT(view->viewport());
+        if(view->viewport()->hasFocus()) {
+            QInputContext *qic = view->viewport()->inputContext();
+            if(qic){
+               qic->update();
+            }
+            break;
+        }
+    }
 }
 
 /*!
@@ -9056,6 +9108,18 @@ void QGraphicsTextItem::keyPressEvent(QKeyEvent *event)
 void QGraphicsTextItem::keyReleaseEvent(QKeyEvent *event)
 {
     dd->sendControlEvent(event);
+    QList<QGraphicsView *> views = scene()->views();
+    for (int i = 0; i < views.size(); ++i) {
+        QGraphicsView *view = views.at(i);
+        Q_ASSERT(view->viewport());
+        if(view->viewport()->hasFocus()) {
+            QInputContext *qic = view->viewport()->inputContext();
+            if(qic){
+               qic->update();
+            }
+            break;
+        }
+    }
 }
 
 /*!
@@ -9064,7 +9128,22 @@ void QGraphicsTextItem::keyReleaseEvent(QKeyEvent *event)
 void QGraphicsTextItem::focusInEvent(QFocusEvent *event)
 {
     dd->sendControlEvent(event);
+    if (event->reason() == Qt::MouseFocusReason) {
+        dd->clickCausedFocus = 1;
+    }
     update();
+    QList<QGraphicsView *> views = scene()->views();
+    for (int i = 0; i < views.size(); ++i) {
+        QGraphicsView *view = views.at(i);
+        Q_ASSERT(view->viewport());
+        if(view->viewport()->hasFocus()) {
+            QInputContext *qic = view->viewport()->inputContext();
+            if(qic){
+               qic->reset();
+            }
+            break;
+        }
+    }
 }
 
 /*!
@@ -9074,6 +9153,18 @@ void QGraphicsTextItem::focusOutEvent(QFocusEvent *event)
 {
     dd->sendControlEvent(event);
     update();
+    QList<QGraphicsView *> views = scene()->views();
+    for (int i = 0; i < views.size(); ++i) {
+        QGraphicsView *view = views.at(i);
+        Q_ASSERT(view->viewport());
+        if(view->viewport()->hasFocus()) {
+            QInputContext *qic = view->viewport()->inputContext();
+            if(qic){
+               qic->reset();
+            }
+            break;
+        }
+    }
 }
 
 /*!
@@ -9082,6 +9173,11 @@ void QGraphicsTextItem::focusOutEvent(QFocusEvent *event)
 void QGraphicsTextItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -9090,6 +9186,11 @@ void QGraphicsTextItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 void QGraphicsTextItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -9098,6 +9199,11 @@ void QGraphicsTextItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
 void QGraphicsTextItem::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -9106,6 +9212,11 @@ void QGraphicsTextItem::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
 void QGraphicsTextItem::dropEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -9122,6 +9233,11 @@ void QGraphicsTextItem::inputMethodEvent(QInputMethodEvent *event)
 void QGraphicsTextItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -9130,6 +9246,11 @@ void QGraphicsTextItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 void QGraphicsTextItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -9138,6 +9259,11 @@ void QGraphicsTextItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
 void QGraphicsTextItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index b94fb970a5..3e7224d9ed 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -46,6 +46,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qrect.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtGui/qpainterpath.h>
 #include <QtGui/qpixmap.h>
 
@@ -419,7 +420,7 @@ protected:
 protected:
     QGraphicsItem(QGraphicsItemPrivate &dd,
                   QGraphicsItem *parent, QGraphicsScene *scene);
-    QGraphicsItemPrivate *d_ptr;
+    QScopedPointer<QGraphicsItemPrivate> d_ptr;
 
     void addToIndex();
     void removeFromIndex();
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 5c3622be2b..ba01b5254b 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -56,9 +56,9 @@
 #include "qgraphicsitem.h"
 #include "qset.h"
 #include "qpixmapcache.h"
-#include "qgraphicsview_p.h"
+#include <private/qgraphicsview_p.h>
 #include "qgraphicstransform.h"
-#include "qgraphicstransform_p.h"
+#include <private/qgraphicstransform_p.h>
 
 #include <QtCore/qpoint.h>
 
@@ -174,11 +174,11 @@ public:
 
     static const QGraphicsItemPrivate *get(const QGraphicsItem *item)
     {
-        return item->d_ptr;
+        return item->d_ptr.data();
     }
     static QGraphicsItemPrivate *get(QGraphicsItem *item)
     {
-        return item->d_ptr;
+        return item->d_ptr.data();
     }
 
     void updateAncestorFlag(QGraphicsItem::GraphicsItemFlag childFlag,
@@ -513,8 +513,8 @@ struct QGraphicsItemPrivate::TransformData
 inline bool qt_closestLeaf(const QGraphicsItem *item1, const QGraphicsItem *item2)
 {
     // Return true if sibling item1 is on top of item2.
-    const QGraphicsItemPrivate *d1 = item1->d_ptr;
-    const QGraphicsItemPrivate *d2 = item2->d_ptr;
+    const QGraphicsItemPrivate *d1 = item1->d_ptr.data();
+    const QGraphicsItemPrivate *d2 = item2->d_ptr.data();
     bool f1 = d1->flags & QGraphicsItem::ItemStacksBehindParent;
     bool f2 = d2->flags & QGraphicsItem::ItemStacksBehindParent;
     if (f1 != f2)
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp
index e28016246d..acf591ac5e 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp
@@ -369,7 +369,6 @@ QGraphicsLayoutItem::~QGraphicsLayoutItem()
             }
         }
     }
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.h b/src/gui/graphicsview/qgraphicslayoutitem.h
index 85a5f07ed3..60f894f0f3 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.h
+++ b/src/gui/graphicsview/qgraphicslayoutitem.h
@@ -42,6 +42,7 @@
 #ifndef QGRAPHICSLAYOUTITEM_H
 #define QGRAPHICSLAYOUTITEM_H
 
+#include <QtCore/qscopedpointer.h>
 #include <QtGui/qsizepolicy.h>
 #include <QtGui/qevent.h>
 
@@ -112,7 +113,7 @@ protected:
     QGraphicsLayoutItem(QGraphicsLayoutItemPrivate &dd);
 
     virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const = 0;
-    QGraphicsLayoutItemPrivate *d_ptr;
+    QScopedPointer<QGraphicsLayoutItemPrivate> d_ptr;
 
 private:
     QSizeF *effectiveSizeHints(const QSizeF &constraint) const;
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.h b/src/gui/graphicsview/qgraphicsproxywidget.h
index 01b5033d1f..ee314b9904 100644
--- a/src/gui/graphicsview/qgraphicsproxywidget.h
+++ b/src/gui/graphicsview/qgraphicsproxywidget.h
@@ -129,7 +129,7 @@ protected Q_SLOTS:
 
 private:
     Q_DISABLE_COPY(QGraphicsProxyWidget)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QGraphicsProxyWidget)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QGraphicsProxyWidget)
     Q_PRIVATE_SLOT(d_func(), void _q_removeWidgetSlot())
 
     friend class QWidget;
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index da4a347c82..9b9c9c24cf 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -3988,7 +3988,7 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte
                                            const QStyleOptionGraphicsItem *option, QWidget *widget,
                                            bool painterStateProtection)
 {
-    QGraphicsItemPrivate *itemd = item->d_ptr;
+    QGraphicsItemPrivate *itemd = item->d_ptr.data();
     QGraphicsItem::CacheMode cacheMode = QGraphicsItem::CacheMode(itemd->cacheMode);
 
     // Render directly, using no cache.
@@ -4680,7 +4680,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
                 if (dirtyRect.isEmpty())
                     continue; // Discard updates outside the bounding rect.
 
-                if (!updateHelper(viewPrivate, item->d_ptr, dirtyRect, itemIsUntransformable)
+                if (!updateHelper(viewPrivate, item->d_ptr.data(), dirtyRect, itemIsUntransformable)
                     && item->d_ptr->paintedViewBoundingRectsNeedRepaint) {
                     paintedViewBoundingRect = QRect(-1, -1, -1, -1); // Outside viewport.
                 }
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
index 07d23b72eb..e5f03b3e98 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
@@ -413,8 +413,8 @@ QList<QGraphicsItem *> QGraphicsSceneBspTreeIndexPrivate::estimateItems(const QR
 bool QGraphicsSceneBspTreeIndexPrivate::closestItemFirst_withoutCache(const QGraphicsItem *item1, const QGraphicsItem *item2)
 {
     // Siblings? Just check their z-values.
-    const QGraphicsItemPrivate *d1 = item1->d_ptr;
-    const QGraphicsItemPrivate *d2 = item2->d_ptr;
+    const QGraphicsItemPrivate *d1 = item1->d_ptr.data();
+    const QGraphicsItemPrivate *d2 = item2->d_ptr.data();
     if (d1->parent == d2->parent)
         return qt_closestLeaf(item1, item2);
 
diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp
index 92af0ccbb3..73cc787d3f 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.cpp
+++ b/src/gui/graphicsview/qgraphicssceneevent.cpp
@@ -317,7 +317,6 @@ QGraphicsSceneEvent::QGraphicsSceneEvent(QGraphicsSceneEventPrivate &dd, Type ty
 */
 QGraphicsSceneEvent::~QGraphicsSceneEvent()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/gui/graphicsview/qgraphicssceneevent.h
index b38e757e51..ea17f9d992 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.h
+++ b/src/gui/graphicsview/qgraphicssceneevent.h
@@ -44,6 +44,7 @@
 
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qpoint.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtCore/qrect.h>
 #include <QtGui/qpolygon.h>
 #include <QtCore/qset.h>
@@ -74,7 +75,7 @@ public:
 
 protected:
     QGraphicsSceneEvent(QGraphicsSceneEventPrivate &dd, Type type = None);
-    QGraphicsSceneEventPrivate *d_ptr;
+    QScopedPointer<QGraphicsSceneEventPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QGraphicsSceneEvent)
 };
 
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp
index 890aff74a1..69b600225f 100644
--- a/src/gui/graphicsview/qgraphicstransform.cpp
+++ b/src/gui/graphicsview/qgraphicstransform.cpp
@@ -95,7 +95,7 @@ void QGraphicsTransformPrivate::setItem(QGraphicsItem *i)
 
     if (item) {
         Q_Q(QGraphicsTransform);
-        QGraphicsItemPrivate *d_ptr = item->d_ptr;
+        QGraphicsItemPrivate *d_ptr = item->d_ptr.data();
 
         item->prepareGeometryChange();
         Q_ASSERT(d_ptr->transformData);
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index ca55f2e962..e1f9f62d03 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -776,7 +776,7 @@ QRect QGraphicsViewPrivate::mapToViewRect(const QGraphicsItem *item, const QRect
     const QGraphicsItem *parentItem = item;
     const QGraphicsItemPrivate *itemd;
     do {
-        itemd = parentItem->d_ptr;
+        itemd = parentItem->d_ptr.data();
         if (itemd->transformData)
             break;
         offset += itemd->pos;
@@ -1028,6 +1028,11 @@ QGraphicsView::QGraphicsView(QWidget *parent)
     // using a simple reference count. The same goes for acceptDrops and mouse
     // tracking.
     setAttribute(Qt::WA_InputMethodEnabled);
+
+    // viewport part of the graphics view has to be enabled
+    // as well, because when events come this widget is asked
+    // for input context and so on
+    viewport()->setAttribute(Qt::WA_InputMethodEnabled);
 }
 
 /*!
@@ -1042,6 +1047,11 @@ QGraphicsView::QGraphicsView(QGraphicsScene *scene, QWidget *parent)
     setAcceptDrops(true);
     setBackgroundRole(QPalette::Base);
     setAttribute(Qt::WA_InputMethodEnabled);
+
+    // viewport part of the graphics view has to be enabled
+    // as well, because when events come this widget is asked
+    // for input context and so on
+    viewport()->setAttribute(Qt::WA_InputMethodEnabled);
 }
 
 /*!
@@ -1054,6 +1064,11 @@ QGraphicsView::QGraphicsView(QGraphicsViewPrivate &dd, QWidget *parent)
     setAcceptDrops(true);
     setBackgroundRole(QPalette::Base);
     setAttribute(Qt::WA_InputMethodEnabled);
+
+    // viewport part of the graphics view has to be enabled
+    // as well, because when events come this widget is asked
+    // for input context and so on
+    viewport()->setAttribute(Qt::WA_InputMethodEnabled);
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index 3ea80cedb0..bf0acc96a1 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -333,7 +333,7 @@ void QGraphicsWidget::resize(const QSizeF &size)
 void QGraphicsWidget::setGeometry(const QRectF &rect)
 {
     QGraphicsWidgetPrivate *wd = QGraphicsWidget::d_func();
-    QGraphicsLayoutItemPrivate *d = QGraphicsLayoutItem::d_ptr;
+    QGraphicsLayoutItemPrivate *d = QGraphicsLayoutItem::d_ptr.data();
     QRectF newGeom;
     QPointF oldPos = d->geom.topLeft();
     if (!wd->inSetPos) {
diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h
index d03a637b56..cb5490a0cf 100644
--- a/src/gui/graphicsview/qgraphicswidget.h
+++ b/src/gui/graphicsview/qgraphicswidget.h
@@ -220,7 +220,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QGraphicsWidget)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QGraphicsWidget)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QGraphicsWidget)
     friend class QGraphicsScene;
     friend class QGraphicsScenePrivate;
     friend class QGraphicsView;
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index b77bfdc317..fdf4808ccb 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -4,7 +4,7 @@ QT = core
 DEFINES   += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
 
-!win32:!embedded:!mac:CONFIG      += x11
+!win32:!embedded:!mac:!symbian:CONFIG      += x11
 
 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
 
@@ -17,6 +17,7 @@ x11:include(kernel/x11.pri)
 mac:include(kernel/mac.pri)
 win32:include(kernel/win.pri)
 embedded:include(embedded/embedded.pri)
+symbian:include(kernel/symbian.pri)
 
 #modules
 include(animation/animation.pri)
@@ -47,3 +48,7 @@ QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist
 
 DEFINES += Q_INTERNAL_QAPP_SRC
 
+symbian:TARGET.UID3=0x2001B2DD
+
+# ro-section in gui can exceed default allocated space, so more rw-section little further
+symbian-sbsv2: MMP_RULES += "LINKEROPTION  armcc --rw-base 0x800000"
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index b9c36dc018..5e9bf8eff3 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -66,6 +66,9 @@ mac {
     HEADERS += image/qpixmap_mac_p.h
     SOURCES += image/qpixmap_mac.cpp
 }
+symbian {
+    SOURCES += image/qpixmap_s60.cpp
+}
 
 # Built-in image format support
 HEADERS += \
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index bb77fb53f7..476fe52b24 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -178,6 +178,13 @@ static int depthForFormat(QImage::Format format)
     return depth;
 }
 
+/*! \fn QImageData * QImageData::create(const QSize &size, QImage::Format format, int numColors)
+
+    \internal
+
+    Creates a new image data.
+    Returns 0 if invalid parameters are give or anything else failed.
+*/
 QImageData * QImageData::create(const QSize &size, QImage::Format format, int numColors)
 {
     if (!size.isValid() || numColors < 0 || format == QImage::Format_Invalid)
@@ -216,7 +223,7 @@ QImageData * QImageData::create(const QSize &size, QImage::Format format, int nu
         || INT_MAX/sizeof(uchar *) < uint(height))
         return 0;
 
-    QImageData *d = new QImageData;
+    QScopedPointer<QImageData> d(new QImageData);
     d->colortable.resize(numColors);
     if (depth == 1) {
         d->colortable[0] = QColor(Qt::black).rgba();
@@ -239,12 +246,11 @@ QImageData * QImageData::create(const QSize &size, QImage::Format format, int nu
     d->data  = (uchar *)malloc(d->nbytes);
 
     if (!d->data) {
-        delete d;
         return 0;
     }
 
     d->ref.ref();
-    return d;
+    return d.take();
 
 }
 
@@ -1610,6 +1616,7 @@ int QImage::numColors() const
 /*!
     Returns a pointer to the scanline pointer table. This is the
     beginning of the data block for the image.
+    Returns 0 in case of an error.
 
     Use the bits() or scanLine() function instead.
 */
@@ -1625,6 +1632,8 @@ uchar **QImage::jumpTable()
 
     if (!d->jumptable) {
         d->jumptable = (uchar **)malloc(d->height*sizeof(uchar *));
+        if (!d->jumptable)
+            return 0;
         uchar *data = d->data;
         int height = d->height;
         uchar **p = d->jumptable;
@@ -1645,6 +1654,8 @@ const uchar * const *QImage::jumpTable() const
         return 0;
     if (!d->jumptable) {
         d->jumptable = (uchar **)malloc(d->height*sizeof(uchar *));
+        if (!d->jumptable)
+            return 0;
         uchar *data = d->data;
         int height = d->height;
         uchar **p = d->jumptable;
diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp
index c64eef861a..8248e42651 100644
--- a/src/gui/image/qimageiohandler.cpp
+++ b/src/gui/image/qimageiohandler.cpp
@@ -272,7 +272,6 @@ QImageIOHandler::QImageIOHandler(QImageIOHandlerPrivate &dd)
 */
 QImageIOHandler::~QImageIOHandler()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h
index 94751f313d..50508c04ac 100644
--- a/src/gui/image/qimageiohandler.h
+++ b/src/gui/image/qimageiohandler.h
@@ -44,6 +44,7 @@
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -109,7 +110,7 @@ public:
 
 protected:
     QImageIOHandler(QImageIOHandlerPrivate &dd);
-    QImageIOHandlerPrivate *d_ptr;
+    QScopedPointer<QImageIOHandlerPrivate> d_ptr;
 private:
     Q_DISABLE_COPY(QImageIOHandler)
 };
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index ea1392bd1a..ddb51d36f9 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -132,7 +132,6 @@ QPicture::QPicture(int formatVersion)
 {
     Q_D(QPicture);
     d_ptr->q_ptr = this;
-    d->paintEngine = 0;
 
     if (formatVersion == 0)
         qWarning("QPicture: invalid format version 0");
@@ -155,7 +154,7 @@ QPicture::QPicture(int formatVersion)
 */
 
 QPicture::QPicture(const QPicture &pic)
-    : QPaintDevice(), d_ptr(pic.d_ptr)
+    : QPaintDevice(), d_ptr(pic.d_ptr.data())
 {
     d_func()->ref.ref();
 }
@@ -173,10 +172,6 @@ QPicture::QPicture(QPicturePrivate &dptr)
 */
 QPicture::~QPicture()
 {
-    if (!d_func()->ref.deref()) {
-        delete d_func()->paintEngine;
-        delete d_func();
-    }
 }
 
 /*!
@@ -1032,9 +1027,7 @@ void QPicture::detach_helper()
     x->formatMinor = d->formatMinor;
     x->brect = d->brect;
     x->override_rect = d->override_rect;
-    if (!d->ref.deref())
-        delete d;
-    d_ptr = x;
+    d_ptr.reset(x);
 }
 
 /*!
@@ -1043,13 +1036,25 @@ void QPicture::detach_helper()
 */
 QPicture& QPicture::operator=(const QPicture &p)
 {
-    qAtomicAssign<QPicturePrivate>(d_ptr, p.d_ptr);
+    d_ptr.assign(p.d_ptr.data());
     return *this;
 }
 
 /*!
   \internal
 
+  Constructs a QPicturePrivate
+*/
+QPicturePrivate::QPicturePrivate()
+    : in_memory_only(false),
+      q_ptr(0)
+{
+    ref = 1;
+}
+
+/*!
+  \internal
+
   Sets formatOk to false and resets the format version numbers to default
 */
 
@@ -1137,8 +1142,8 @@ bool QPicturePrivate::checkFormat()
 QPaintEngine *QPicture::paintEngine() const
 {
     if (!d_func()->paintEngine)
-        const_cast<QPicture*>(this)->d_func()->paintEngine = new QPicturePaintEngine;
-    return d_func()->paintEngine;
+        const_cast<QPicture*>(this)->d_func()->paintEngine.reset(new QPicturePaintEngine);
+    return d_func()->paintEngine.data();
 }
 
 /*****************************************************************************
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index 67e8db2cb8..c323f0e52d 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -106,7 +106,7 @@ private:
     bool exec(QPainter *p, QDataStream &ds, int i);
     void detach_helper();
 
-    QPicturePrivate *d_ptr;
+    QScopedSharedPointer<QPicturePrivate> d_ptr;
     friend class QPicturePaintEngine;
     friend class Q3Picture;
     friend class QAlphaPaintEngine;
@@ -114,7 +114,7 @@ private:
 
 public:
     typedef QPicturePrivate* DataPtr;
-    inline DataPtr &data_ptr() { return d_ptr; }
+    inline DataPtr &data_ptr() { return d_ptr.data_ptr(); }
 };
 
 Q_DECLARE_SHARED(QPicture)
diff --git a/src/gui/image/qpicture_p.h b/src/gui/image/qpicture_p.h
index 86b636551c..6147019b05 100644
--- a/src/gui/image/qpicture_p.h
+++ b/src/gui/image/qpicture_p.h
@@ -143,7 +143,7 @@ public:
         PdcReservedStop = 199 //   for Qt
     };
 
-    inline QPicturePrivate() : in_memory_only(false), q_ptr(0) { ref = 1; }
+    QPicturePrivate();
     QAtomicInt ref;
 
     bool checkFormat();
@@ -156,7 +156,7 @@ public:
     int formatMinor;
     QRect brect;
     QRect override_rect;
-    QPaintEngine *paintEngine;
+    QScopedPointer<QPaintEngine> paintEngine;
     bool in_memory_only;
     QList<QImage> image_list;
     QList<QPixmap> pixmap_list;
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 82835d5b95..44181d1040 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -77,6 +77,10 @@
 # include <private/qpixmap_x11_p.h>
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+# include <private/qt_s60_p.h>
+#endif
+
 #include "qpixmap_raster_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -1887,7 +1891,10 @@ int QPixmap::defaultDepth()
     return 32; // XXX
 #elif defined(Q_WS_MAC)
     return 32;
+#elif defined(Q_OS_SYMBIAN)
+    return S60->screenDepth;
 #endif
+    
 }
 
 /*!
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index d1e2ecb260..279e1ef16e 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -51,6 +51,10 @@
 
 QT_BEGIN_HEADER
 
+#if defined(Q_OS_SYMBIAN)
+class CFbsBitmap;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
@@ -59,7 +63,6 @@ class QImageWriter;
 class QColor;
 class QVariant;
 class QX11Info;
-
 class QPixmapData;
 
 class Q_GUI_EXPORT QPixmap : public QPaintDevice
@@ -152,6 +155,11 @@ public:
     static QPixmap fromMacCGImageRef(CGImageRef image);
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+    CFbsBitmap *toSymbianCFbsBitmap() const;
+    static QPixmap fromSymbianCFbsBitmap(CFbsBitmap *bitmap);
+#endif
+
     inline QPixmap copy(int x, int y, int width, int height) const;
     QPixmap copy(const QRect &rect = QRect()) const;
 
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
new file mode 100644
index 0000000000..132e26ebd4
--- /dev/null
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -0,0 +1,233 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <exception>
+#include <w32std.h>
+#include <fbs.h>
+
+#include <private/qt_s60_p.h>
+#include "qpixmap.h"
+#include "qpixmap_raster_p.h"
+#include <qwidget.h>
+
+QT_BEGIN_NAMESPACE
+
+QPixmap QPixmap::grabWindow(WId winId, int x, int y, int w, int h )
+{
+    CWsScreenDevice* screenDevice = S60->screenDevice();
+    TSize screenSize = screenDevice->SizeInPixels();
+
+    TSize srcSize;
+    // Find out if this is one of our windows.
+    QSymbianControl *sControl;
+    sControl = winId->MopGetObject(sControl);
+    if (sControl && sControl->widget()->windowType() == Qt::Desktop) {
+        // Grabbing desktop widget
+        srcSize = screenSize;
+    } else {
+        TPoint relativePos = winId->PositionRelativeToScreen();
+        x += relativePos.iX;
+        y += relativePos.iY;
+        srcSize = winId->Size();
+    }
+
+    TRect srcRect(TPoint(x, y), srcSize);
+    // Clip to the screen
+    srcRect.Intersection(TRect(screenSize));
+
+    if (w > 0 && h > 0) {
+        TRect subRect(TPoint(x, y), TSize(w, h));
+        // Clip to the subRect
+        srcRect.Intersection(subRect);
+    }
+
+    if (srcRect.IsEmpty())
+        return QPixmap();
+
+    TDisplayMode displayMode = screenDevice->DisplayMode();
+    CFbsBitmap* temporary = new (ELeave) CFbsBitmap();
+    TInt error = temporary->Create(srcRect.Size(), displayMode);
+    if (error == KErrNone)
+        error = screenDevice->CopyScreenToBitmap(temporary, srcRect);
+
+    if (error != KErrNone) {
+        CBase::Delete(temporary);
+        return QPixmap();
+    }
+
+    QPixmap pixmap = QPixmap::fromSymbianCFbsBitmap(temporary);
+    CBase::Delete(temporary);
+    return pixmap;
+}
+
+/*!
+\since 4.6
+
+Returns a \c CFbsBitmap that is equivalent to the QPixmap by copying the data.
+
+It is the caller's responsibility to delete the \c CFbsBitmap after use.
+
+\warning This function is only available on Symbian OS.
+
+\sa fromSymbianCFbsBitmap()
+*/
+
+CFbsBitmap *QPixmap::toSymbianCFbsBitmap() const
+{
+    if (isNull())
+        return 0;
+
+    TDisplayMode mode;
+    const QImage img = toImage();
+    QImage::Format destFormat = img.format();
+    switch (img.format()) {
+    case QImage::Format_Mono:
+        destFormat = QImage::Format_MonoLSB;
+        // Fall through intended
+    case QImage::Format_MonoLSB:
+        mode = EGray2;
+        break;
+    case QImage::Format_Indexed8:
+        if (img.isGrayscale())
+            mode = EGray256;
+        else
+            mode = EColor256;
+        break;
+    case QImage::Format_RGB32:
+        mode = EColor16MU;
+        break;
+    case QImage::Format_ARGB6666_Premultiplied:
+    case QImage::Format_ARGB8565_Premultiplied:
+    case QImage::Format_ARGB8555_Premultiplied:
+        destFormat = QImage::Format_ARGB32_Premultiplied;
+        // Fall through intended
+    case QImage::Format_ARGB32_Premultiplied:
+#if !defined(__SERIES60_31__) && !defined(__S60_32__)
+        // ### TODO: Add runtime detection as well?
+        mode = EColor16MAP;
+            break;
+#endif
+        destFormat = QImage::Format_ARGB32;
+        // Fall through intended
+    case QImage::Format_ARGB32:
+        mode = EColor16MA;
+        break;
+    case QImage::Format_RGB555:
+        destFormat = QImage::Format_RGB16;
+        // Fall through intended
+    case QImage::Format_RGB16:
+        mode = EColor64K;
+        break;
+    case QImage::Format_RGB666:
+        destFormat = QImage::Format_RGB888;
+        // Fall through intended
+    case QImage::Format_RGB888:
+        mode = EColor16M;
+        break;
+    case QImage::Format_RGB444:
+        mode = EColor4K;
+        break;
+    case QImage::Format_Invalid:
+        return 0;
+    default:
+        qWarning("Image format not supported: %d", img.format());
+        return 0;
+    }
+
+    CFbsBitmap* bitmap = new (ELeave) CFbsBitmap();
+    TSize size(width(), height());
+    if (bitmap->Create(size, mode) != KErrNone) {
+        CBase::Delete(bitmap);
+        return 0;
+    }
+
+    const QImage converted = img.convertToFormat(destFormat);
+
+    bitmap->LockHeap();
+    const uchar *sptr = converted.bits();
+    uchar *dptr = (uchar*)bitmap->DataAddress();
+    Mem::Copy(dptr, sptr, converted.numBytes());
+    bitmap->UnlockHeap();
+    return bitmap;
+}
+
+/*!
+\since 4.6
+
+Returns a QPixmap that is equivalent to the \c CFbsBitmap by copying the data.
+If the CFbsBitmap is not valid or is compressed in memory, this function will
+return a null QPixmap.
+
+\warning This function is only available on Symbian OS.
+
+\sa toSymbianCFbsBitmap(), {QPixmap#Pixmap Conversion}{Pixmap Conversion}
+*/
+
+QPixmap QPixmap::fromSymbianCFbsBitmap(CFbsBitmap *bitmap)
+{
+    int width = bitmap->SizeInPixels().iWidth;
+    int height = bitmap->SizeInPixels().iHeight;
+
+    if (!bitmap || width <= 0 || height <= 0 || bitmap->IsCompressedInRAM())
+        return QPixmap();
+
+    TDisplayMode displayMode = bitmap->DisplayMode();
+    QImage::Format format = qt_TDisplayMode2Format(displayMode);
+    int bytesPerLine = CFbsBitmap::ScanLineLength(width, displayMode);
+    bitmap->LockHeap();
+    QImage image = QImage((const uchar*)bitmap->DataAddress(), width, height, bytesPerLine, format);
+    if (displayMode == EGray2) {
+        image.setNumColors(2);
+        image.setColor(0, QColor(Qt::color0).rgba());
+        image.setColor(1, QColor(Qt::color1).rgba());
+    } else if (displayMode == EGray256) {
+        for (int i=0; i < 256; ++i)
+            image.setColor(i, qRgb(i, i, i));
+    }else if (displayMode == EColor256) {
+        const TColor256Util *palette = TColor256Util::Default();
+        for (int i=0; i < 256; ++i)
+            image.setColor(i, (QRgb)(palette->Color256(i).Value()));
+    }
+    QPixmap pixmap = QPixmap::fromImage(image.copy());
+    bitmap->UnlockHeap();
+    return pixmap;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index ecdcd8ce46..b4a3a49a59 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -86,7 +86,9 @@ QT_BEGIN_NAMESPACE
     \sa QCache, QPixmap
 */
 
-#if defined(Q_WS_QWS) || defined(Q_WS_WINCE)
+#if defined(Q_OS_SYMBIAN)
+static int cache_limit = 1024; // 1048 KB cache limit for symbian
+#elif defined(Q_WS_QWS) || defined(Q_WS_WINCE)
 static int cache_limit = 2048; // 2048 KB cache limit for embedded
 #else
 static int cache_limit = 10240; // 10 MB cache limit for desktop
@@ -608,7 +610,12 @@ void QPixmapCache::remove(const Key &key)
 
 void QPixmapCache::clear()
 {
-    pm_cache()->clear();
+    QT_TRY {
+        pm_cache()->clear();
+    } QT_CATCH(const std::bad_alloc &) {
+        // if we ran out of memory during pm_cache(), it's no leak,
+        // so just ignore it.
+    }
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/image/qpixmapdatafactory.cpp b/src/gui/image/qpixmapdatafactory.cpp
index e5bf414704..852e875d9c 100644
--- a/src/gui/image/qpixmapdatafactory.cpp
+++ b/src/gui/image/qpixmapdatafactory.cpp
@@ -47,7 +47,7 @@
 #ifdef Q_WS_X11
 # include <private/qpixmap_x11_p.h>
 #endif
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
 # include <private/qpixmap_raster_p.h>
 #endif
 #ifdef Q_WS_MAC
@@ -75,7 +75,7 @@ QPixmapData* QSimplePixmapDataFactory::create(QPixmapData::PixelType type)
 
 #if defined(Q_WS_X11)
     return new QX11PixmapData(type);
-#elif defined(Q_WS_WIN)
+#elif defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
     return new QRasterPixmapData(type);
 #elif defined(Q_WS_MAC)
     return new QMacPixmapData(type);
diff --git a/src/gui/inputmethod/inputmethod.pri b/src/gui/inputmethod/inputmethod.pri
index d321cd4e0b..6d9f748256 100644
--- a/src/gui/inputmethod/inputmethod.pri
+++ b/src/gui/inputmethod/inputmethod.pri
@@ -23,4 +23,9 @@ mac:!embedded {
     HEADERS += inputmethod/qmacinputcontext_p.h
     SOURCES += inputmethod/qmacinputcontext_mac.cpp
 }
+symbian:contains(QT_CONFIG, s60) {
+    HEADERS += inputmethod/qcoefepinputcontext_p.h
+    SOURCES += inputmethod/qcoefepinputcontext_s60.cpp
+    LIBS += -lfepbase
+}
 
diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h
new file mode 100644
index 0000000000..d7547636c1
--- /dev/null
+++ b/src/gui/inputmethod/qcoefepinputcontext_p.h
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOEFEPINPUTCONTEXT_P_H
+#define QCOEFEPINPUTCONTEXT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QT_NO_IM
+
+#include "qinputcontext.h"
+#include <qhash.h>
+#include <private/qcore_symbian_p.h>
+#include <private/qt_s60_p.h>
+
+#include <fepbase.h>
+#include <aknedsts.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_GUI_EXPORT QCoeFepInputContext : public QInputContext,
+                                         public MCoeFepAwareTextEditor,
+                                         public MCoeFepAwareTextEditor_Extension1,
+                                         public MObjectProvider
+{
+    Q_OBJECT
+
+public:
+    QCoeFepInputContext(QObject *parent = 0);
+    ~QCoeFepInputContext();
+
+    QString identifierName() { return QLatin1String("coefep"); }
+    QString language();
+
+    void reset();
+    void update();
+
+    bool filterEvent(const QEvent *event);
+    void mouseHandler( int x, QMouseEvent *event);
+    bool isComposing() const { return m_isEditing; }
+
+    void setFocusWidget(QWidget * w);
+    void widgetDestroyed(QWidget *w);
+
+    TCoeInputCapabilities inputCapabilities();
+
+private:
+    void commitCurrentString(bool triggeredBySymbian);
+    void updateHints(bool mustUpdateInputCapabilities);
+    void applyHints(Qt::InputMethodHints hints);
+    void applyFormat(QList<QInputMethodEvent::Attribute> *attributes);
+    void queueInputCapabilitiesChanged();
+
+private Q_SLOTS:
+    void ensureInputCapabilitiesChanged();
+
+    // From MCoeFepAwareTextEditor
+public:
+    void StartFepInlineEditL(const TDesC& aInitialInlineText, TInt aPositionOfInsertionPointInInlineText,
+            TBool aCursorVisibility, const MFormCustomDraw* aCustomDraw,
+            MFepInlineTextFormatRetriever& aInlineTextFormatRetriever,
+            MFepPointerEventHandlerDuringInlineEdit& aPointerEventHandlerDuringInlineEdit);
+    void UpdateFepInlineTextL(const TDesC& aNewInlineText, TInt aPositionOfInsertionPointInInlineText);
+    void SetInlineEditingCursorVisibilityL(TBool aCursorVisibility);
+    void CancelFepInlineEdit();
+    TInt DocumentLengthForFep() const;
+    TInt DocumentMaximumLengthForFep() const;
+    void SetCursorSelectionForFepL(const TCursorSelection& aCursorSelection);
+    void GetCursorSelectionForFep(TCursorSelection& aCursorSelection) const;
+    void GetEditorContentForFep(TDes& aEditorContent, TInt aDocumentPosition, TInt aLengthToRetrieve) const;
+    void GetFormatForFep(TCharFormat& aFormat, TInt aDocumentPosition) const;
+    void GetScreenCoordinatesForFepL(TPoint& aLeftSideOfBaseLine, TInt& aHeight, TInt& aAscent,
+            TInt aDocumentPosition) const;
+private:
+    void DoCommitFepInlineEditL();
+    MCoeFepAwareTextEditor_Extension1* Extension1(TBool& aSetToTrue);
+
+    // From MCoeFepAwareTextEditor_Extension1
+public:
+    void SetStateTransferingOwnershipL(MCoeFepAwareTextEditor_Extension1::CState* aState, TUid aTypeSafetyUid);
+    MCoeFepAwareTextEditor_Extension1::CState* State(TUid aTypeSafetyUid);
+
+    // From MObjectProvider
+public:
+    TTypeUid::Ptr MopSupplyObject(TTypeUid id);
+
+private:
+    QSymbianControl *m_parent;
+    CAknEdwinState *m_fepState;
+    QString m_preeditString;
+    Qt::InputMethodHints m_lastImHints;
+    TUint m_textCapabilities;
+    bool m_isEditing;
+    bool m_inDestruction;
+    bool m_pendingInputCapabilitiesChanged;
+    int m_cursorVisibility;
+    int m_inlinePosition;
+    MFepInlineTextFormatRetriever *m_formatRetriever;
+    MFepPointerEventHandlerDuringInlineEdit *m_pointerHandler;
+};
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_IM
+
+#endif // QCOEFEPINPUTCONTEXT_P_H
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
new file mode 100644
index 0000000000..c03426f787
--- /dev/null
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -0,0 +1,747 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT_NO_IM
+
+#include "qcoefepinputcontext_p.h"
+#include <qapplication.h>
+#include <qtextformat.h>
+
+#include <fepitfr.h>
+
+#include <limits.h>
+// You only find these enumerations on SDK 5 onwards, so we need to provide our own
+// to remain compatible with older releases. They won't be called by pre-5.0 SDKs.
+
+// MAknEdStateObserver::EAknCursorPositionChanged
+#define QT_EAknCursorPositionChanged MAknEdStateObserver::EAknEdwinStateEvent(6)
+// MAknEdStateObserver::EAknActivatePenInputRequest
+#define QT_EAknActivatePenInputRequest MAknEdStateObserver::EAknEdwinStateEvent(7)
+
+QT_BEGIN_NAMESPACE
+
+QCoeFepInputContext::QCoeFepInputContext(QObject *parent)
+    : QInputContext(parent),
+      m_fepState(new (ELeave) CAknEdwinState),
+      m_lastImHints(Qt::ImhNone),
+      m_textCapabilities(TCoeInputCapabilities::EAllText),
+      m_isEditing(false),
+      m_inDestruction(false),
+      m_pendingInputCapabilitiesChanged(false),
+      m_cursorVisibility(1),
+      m_inlinePosition(0),
+      m_formatRetriever(0),
+      m_pointerHandler(0)
+{
+    m_fepState->SetObjectProvider(this);
+    m_fepState->SetFlags(EAknEditorFlagDefault);
+    m_fepState->SetDefaultInputMode( EAknEditorTextInputMode );
+    m_fepState->SetPermittedInputModes( EAknEditorAllInputModes );
+    m_fepState->SetDefaultCase( EAknEditorLowerCase );
+    m_fepState->SetPermittedCases( EAknEditorLowerCase|EAknEditorUpperCase );
+    m_fepState->SetSpecialCharacterTableResourceId( 0 );
+    m_fepState->SetNumericKeymap( EAknEditorStandardNumberModeKeymap );
+}
+
+QCoeFepInputContext::~QCoeFepInputContext()
+{
+    m_inDestruction = true;
+
+    // This is to make sure that the FEP manager "forgets" about us,
+    // otherwise we may get callbacks even after we're destroyed.
+    // The call below is essentially equivalent to InputCapabilitiesChanged(),
+    // but is synchronous, rather than asynchronous.
+    CCoeEnv::Static()->SyncNotifyFocusObserversOfChangeInFocus();
+
+    if (m_fepState)
+        delete m_fepState;
+}
+
+void QCoeFepInputContext::reset()
+{
+    CCoeEnv::Static()->Fep()->CancelTransaction();
+}
+
+void QCoeFepInputContext::update()
+{
+    updateHints(false);
+
+    // For pre-5.0 SDKs, we don't do text updates on S60 side.
+    if (QSysInfo::s60Version() != QSysInfo::SV_S60_5_0) {
+        return;
+    }
+
+    // Don't be fooled (as I was) by the name of this enumeration.
+    // What it really does is tell the virtual keyboard UI that the text has been
+    // updated and it should be reflected in the internal display of the VK.
+    m_fepState->ReportAknEdStateEventL(QT_EAknCursorPositionChanged);
+}
+
+void QCoeFepInputContext::setFocusWidget(QWidget *w)
+{
+    commitCurrentString(false);
+
+    QInputContext::setFocusWidget(w);
+
+    updateHints(true);
+}
+
+void QCoeFepInputContext::widgetDestroyed(QWidget *w)
+{
+    // Make sure that the input capabilities of whatever new widget got focused are queried.
+    CCoeControl *ctrl = w->effectiveWinId();
+    if (ctrl->IsFocused()) {
+        ctrl->SetFocus(false);
+        ctrl->SetFocus(true);
+    }
+}
+
+/*!
+    Definition of struct for mapping Symbian to ISO locale
+    ### REMOVE
+    See below.
+*/
+struct symbianToISO {
+    int symbian_language;
+    char iso_name[8];
+};
+
+/*!
+    Mapping from Symbian to ISO locale
+    ### REMOVE
+    This was taken from the preliminary QLocale port to S60, and should be
+    removed once that is finished.
+*/
+static const symbianToISO symbian_to_iso_list[] = {
+    { ELangEnglish,             "en_GB" },
+    { ELangFrench,              "fr_FR" },
+    { ELangGerman,              "de_DE" },
+    { ELangSpanish,             "es_ES" },
+    { ELangItalian,             "it_IT" },
+    { ELangSwedish,             "sv_SE" },
+    { ELangDanish,              "da_DK" },
+    { ELangNorwegian,           "no_NO" },
+    { ELangFinnish,             "fi_FI" },
+    { ELangAmerican,            "en_US" },
+    { ELangPortuguese,          "pt_PT" },
+    { ELangTurkish,             "tr_TR" },
+    { ELangIcelandic,           "is_IS" },
+    { ELangRussian,             "ru_RU" },
+    { ELangHungarian,           "hu_HU" },
+    { ELangDutch,               "nl_NL" },
+    { ELangBelgianFlemish,      "nl_BE" },
+    { ELangCzech,               "cs_CZ" },
+    { ELangSlovak,              "sk_SK" },
+    { ELangPolish,              "pl_PL" },
+    { ELangSlovenian,           "sl_SI" },
+    { ELangTaiwanChinese,       "zh_TW" },
+    { ELangHongKongChinese,     "zh_HK" },
+    { ELangPrcChinese,          "zh_CN" },
+    { ELangJapanese,            "ja_JP" },
+    { ELangThai,                "th_TH" },
+    { ELangArabic,              "ar_AE" },
+    { ELangTagalog,             "tl_PH" },
+    { ELangBulgarian,           "bg_BG" },
+    { ELangCatalan,             "ca_ES" },
+    { ELangCroatian,            "hr_HR" },
+    { ELangEstonian,            "et_EE" },
+    { ELangFarsi,               "fa_IR" },
+    { ELangCanadianFrench,      "fr_CA" },
+    { ELangGreek,               "el_GR" },
+    { ELangHebrew,              "he_IL" },
+    { ELangHindi,               "hi_IN" },
+    { ELangIndonesian,          "id_ID" },
+    { ELangLatvian,             "lv_LV" },
+    { ELangLithuanian,          "lt_LT" },
+    { ELangMalay,               "ms_MY" },
+    { ELangBrazilianPortuguese, "pt_BR" },
+    { ELangRomanian,            "ro_RO" },
+    { ELangSerbian,             "sr_YU" },
+    { ELangLatinAmericanSpanish, "es" },
+    { ELangUkrainian,           "uk_UA" },
+    { ELangUrdu,                "ur_PK" }, // India/Pakistan
+    { ELangVietnamese,          "vi_VN" },
+#ifdef __E32LANG_H__
+// 5.0
+    { ELangBasque,              "eu_ES" },
+    { ELangGalician,            "gl_ES" },
+#endif
+    //{ ELangEnglish_Apac,        "en" },
+    //{ ELangEnglish_Taiwan,      "en_TW" },
+    //{ ELangEnglish_HongKong,    "en_HK" },
+    //{ ELangEnglish_Prc,         "en_CN" },
+    //{ ELangEnglish_Japan,       "en_JP"},
+    //{ ELangEnglish_Thailand,    "en_TH" },
+    //{ ELangMalay_Apac,          "ms" }
+};
+
+/*!
+    Number of Symbian to ISO locale mappings
+    ### Remove.
+    See comment for array above.
+*/
+static const int symbian_to_iso_count
+    = sizeof(symbian_to_iso_list)/sizeof(symbianToISO);
+
+QString QCoeFepInputContext::language()
+{
+    TLanguage lang = m_fepState->LocalLanguage();
+    if (lang < symbian_to_iso_count) {
+        return QLatin1String(symbian_to_iso_list[lang].iso_name);
+    } else {
+        return QLatin1String("C");
+    }
+}
+
+bool QCoeFepInputContext::filterEvent(const QEvent *event)
+{
+    // The CloseSoftwareInputPanel event is not handled here, because the VK will automatically
+    // close when it discovers that the underlying widget does not have input capabilities.
+
+    if (!focusWidget())
+        return false;
+
+    if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
+        const QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event);
+        Q_ASSERT(m_lastImHints == focusWidget()->inputMethodHints());
+        if (keyEvent->key() == Qt::Key_F20 && m_lastImHints & Qt::ImhHiddenText) {
+            // Special case in Symbian. On editors with secret text, F20 is for some reason
+            // considered to be a backspace.
+            QKeyEvent modifiedEvent(keyEvent->type(), Qt::Key_Backspace, keyEvent->modifiers(),
+                    keyEvent->text(), keyEvent->isAutoRepeat(), keyEvent->count());
+            QApplication::sendEvent(focusWidget(), &modifiedEvent);
+            return true;
+        }
+    }
+
+    // For pre-5.0 SDKs, we don't launch the keyboard.
+    if (QSysInfo::s60Version() != QSysInfo::SV_S60_5_0) {
+        return false;
+    }
+
+    if (event->type() == QEvent::RequestSoftwareInputPanel) {
+        // Notify S60 that we want the virtual keyboard to show up.
+        QSymbianControl *sControl;
+        sControl = focusWidget()->effectiveWinId()->MopGetObject(sControl);
+        Q_ASSERT(sControl);
+
+        // The FEP UI temporarily steals focus when it shows up the first time, causing
+        // all sorts of weird effects on the focused widgets. Since it will immediately give
+        // back focus to us, we temporarily disable focus handling until the job's done.
+        if (sControl) {
+            sControl->setIgnoreFocusChanged(true);
+        }
+
+        ensureInputCapabilitiesChanged();
+        m_fepState->ReportAknEdStateEventL(MAknEdStateObserver::QT_EAknActivatePenInputRequest);
+
+        if (sControl) {
+            sControl->setIgnoreFocusChanged(false);
+        }
+        return true;
+    }
+
+    return false;
+}
+
+void QCoeFepInputContext::mouseHandler( int x, QMouseEvent *event)
+{
+    Q_ASSERT(m_isEditing);
+    Q_ASSERT(focusWidget());
+
+    if (event->type() == QEvent::MouseButtonPress && event->button() == Qt::LeftButton) {
+        commitCurrentString(false);
+        int pos = focusWidget()->inputMethodQuery(Qt::ImCursorPosition).toInt();
+
+        QList<QInputMethodEvent::Attribute> attributes;
+        attributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, pos + x, 0, QVariant());
+        QInputMethodEvent event("", attributes);
+        sendEvent(event);
+    }
+}
+
+TCoeInputCapabilities QCoeFepInputContext::inputCapabilities()
+{
+    if (m_inDestruction) {
+        return TCoeInputCapabilities(TCoeInputCapabilities::ENone, 0, 0);
+    }
+
+    return TCoeInputCapabilities(m_textCapabilities, this, 0);
+}
+
+static QTextCharFormat qt_TCharFormat2QTextCharFormat(const TCharFormat &cFormat)
+{
+    QTextCharFormat qFormat;
+
+    QBrush foreground(QColor(cFormat.iFontPresentation.iTextColor.Internal()));
+    qFormat.setForeground(foreground);
+
+    qFormat.setFontStrikeOut(cFormat.iFontPresentation.iStrikethrough == EStrikethroughOn);
+    qFormat.setFontUnderline(cFormat.iFontPresentation.iUnderline == EUnderlineOn);
+
+    return qFormat;
+}
+
+void QCoeFepInputContext::updateHints(bool mustUpdateInputCapabilities)
+{
+    QWidget *w = focusWidget();
+    if (w) {
+        Qt::InputMethodHints hints = w->inputMethodHints();
+        if (hints != m_lastImHints) {
+            m_lastImHints = hints;
+            applyHints(hints);
+        } else if (!mustUpdateInputCapabilities) {
+            // Optimization. Return immediately if there was no change.
+            return;
+        }
+    }
+    queueInputCapabilitiesChanged();
+}
+
+void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints)
+{
+    using namespace Qt;
+
+    bool numbersOnly = hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly
+            || hints & ImhDialableCharactersOnly;
+    bool noOnlys = !(numbersOnly || hints & ImhUppercaseOnly
+            || hints & ImhLowercaseOnly);
+    TInt flags;
+    Qt::InputMethodHints oldHints = hints;
+
+    // Some sanity checking. Make sure that only one preference is set.
+    InputMethodHints prefs = ImhPreferNumbers | ImhPreferUppercase | ImhPreferLowercase;
+    prefs &= hints;
+    if (prefs != ImhPreferNumbers && prefs != ImhPreferUppercase && prefs != ImhPreferLowercase) {
+        hints &= ~prefs;
+    }
+    if (!noOnlys) {
+        // Make sure that the preference is within the permitted set.
+        if (hints & ImhPreferNumbers && !(hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly
+                || hints & ImhDialableCharactersOnly)) {
+            hints &= ~ImhPreferNumbers;
+        } else if (hints & ImhPreferUppercase && !(hints & ImhUppercaseOnly)) {
+            hints &= ~ImhPreferUppercase;
+        } else if (hints & ImhPreferLowercase && !(hints & ImhLowercaseOnly)) {
+            hints &= ~ImhPreferLowercase;
+        }
+        // If there is no preference, set it to something within the permitted set.
+        if (!(hints & ImhPreferNumbers || hints & ImhPreferUppercase || hints & ImhPreferLowercase)) {
+            if (hints & ImhLowercaseOnly) {
+                hints |= ImhPreferLowercase;
+            } else if (hints & ImhUppercaseOnly) {
+                hints |= ImhPreferUppercase;
+            } else if (hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly
+                    || hints & ImhDialableCharactersOnly) {
+                hints |= ImhPreferNumbers;
+            }
+        }
+    }
+
+    if (hints & ImhPreferNumbers) {
+        m_fepState->SetDefaultInputMode(EAknEditorNumericInputMode);
+        m_fepState->SetCurrentInputMode(EAknEditorNumericInputMode);
+    } else {
+        m_fepState->SetDefaultInputMode(EAknEditorTextInputMode);
+        m_fepState->SetCurrentInputMode(EAknEditorTextInputMode);
+    }
+    flags = 0;
+    if (numbersOnly) {
+        flags |= EAknEditorNumericInputMode;
+    }
+    if (hints & ImhUppercaseOnly || hints & ImhLowercaseOnly) {
+        flags |= EAknEditorTextInputMode;
+    }
+    if (flags == 0) {
+        flags = EAknEditorAllInputModes;
+    }
+    m_fepState->SetPermittedInputModes(flags);
+    m_fepState->ReportAknEdStateEventL(MAknEdStateObserver::EAknEdwinStateInputModeUpdate);
+
+    if (hints & ImhPreferLowercase) {
+        m_fepState->SetDefaultCase(EAknEditorLowerCase);
+        m_fepState->SetCurrentCase(EAknEditorLowerCase);
+    } else if (hints & ImhPreferUppercase) {
+        m_fepState->SetDefaultCase(EAknEditorUpperCase);
+        m_fepState->SetCurrentCase(EAknEditorUpperCase);
+    } else if (hints & ImhNoAutoUppercase) {
+        m_fepState->SetDefaultCase(EAknEditorLowerCase);
+        m_fepState->SetCurrentCase(EAknEditorLowerCase);
+    } else {
+        m_fepState->SetDefaultCase(EAknEditorTextCase);
+        m_fepState->SetCurrentCase(EAknEditorTextCase);
+    }
+    flags = 0;
+    if (hints & ImhUppercaseOnly) {
+        flags |= EAknEditorUpperCase;
+    }
+    if (hints & ImhLowercaseOnly) {
+        flags |= EAknEditorLowerCase;
+    }
+    if (flags == 0) {
+        flags = EAknEditorAllCaseModes;
+        if (hints & ImhNoAutoUppercase) {
+            flags &= ~EAknEditorTextCase;
+        }
+    }
+    m_fepState->SetPermittedCases(flags);
+    m_fepState->ReportAknEdStateEventL(MAknEdStateObserver::EAknEdwinStateCaseModeUpdate);
+
+    flags = 0;
+    if (hints & ImhUppercaseOnly && !(hints & ImhLowercaseOnly)
+            || hints & ImhLowercaseOnly && !(hints & ImhUppercaseOnly)) {
+        flags |= EAknEditorFlagFixedCase;
+    }
+    // Using T9 and hidden text together may actually crash the FEP, so check for hidden text too.
+    if (hints & ImhNoPredictiveText || hints & ImhHiddenText) {
+        flags |= EAknEditorFlagNoT9;
+    }
+    m_fepState->SetFlags(flags);
+    m_fepState->ReportAknEdStateEventL(MAknEdStateObserver::EAknEdwinStateFlagsUpdate);
+
+    if (hints & ImhFormattedNumbersOnly) {
+        flags = EAknEditorCalculatorNumberModeKeymap;
+    } else if (hints & ImhDigitsOnly) {
+        flags = EAknEditorPlainNumberModeKeymap;
+    } else {
+        // ImhDialableCharactersOnly is the fallback as well, so we don't need to check for
+        // that flag.
+        flags = EAknEditorStandardNumberModeKeymap;
+    }
+    m_fepState->SetNumericKeymap(static_cast<TAknEditorNumericKeymap>(flags));
+
+    if (hints & ImhHiddenText) {
+        m_textCapabilities = TCoeInputCapabilities::EAllText | TCoeInputCapabilities::ESecretText;
+    } else {
+        m_textCapabilities = TCoeInputCapabilities::EAllText;
+    }
+}
+
+void QCoeFepInputContext::applyFormat(QList<QInputMethodEvent::Attribute> *attributes)
+{
+    TCharFormat cFormat;
+    TInt numChars = 0;
+    TInt charPos = 0;
+    int oldSize = attributes->size();
+    while (m_formatRetriever) {
+        m_formatRetriever->GetFormatOfFepInlineText(cFormat, numChars, charPos);
+        if (numChars <= 0) {
+            // This shouldn't happen according to S60 docs, but apparently does sometimes.
+            break;
+        }
+        attributes->append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat,
+                                                        charPos,
+                                                        numChars,
+                                                        QVariant(qt_TCharFormat2QTextCharFormat(cFormat))));
+        charPos += numChars;
+        if (charPos >= m_preeditString.size()) {
+            break;
+        }
+    }
+
+    if (attributes->size() == oldSize) {
+        // S60 didn't provide any format, so let's give our own instead.
+        attributes->append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat,
+                                                        0,
+                                                        m_preeditString.size(),
+                                                        standardFormat(PreeditFormat)));
+    }
+}
+
+void QCoeFepInputContext::queueInputCapabilitiesChanged()
+{
+    if (m_pendingInputCapabilitiesChanged)
+        return;
+
+    // Call ensureInputCapabilitiesChanged asynchronously. This is done to improve performance
+    // by not updating input capabilities too often. The reason we don't call the Symbian
+    // asynchronous version of InputCapabilitiesChanged is because we need to ensure that it
+    // is synchronous in some specific cases. Those will call ensureInputCapabilitesChanged.
+    QMetaObject::invokeMethod(this, "ensureInputCapabilitiesChanged", Qt::QueuedConnection);
+    m_pendingInputCapabilitiesChanged = true;
+}
+
+void QCoeFepInputContext::ensureInputCapabilitiesChanged()
+{
+    if (!m_pendingInputCapabilitiesChanged)
+        return;
+
+    // The call below is essentially equivalent to InputCapabilitiesChanged(),
+    // but is synchronous, rather than asynchronous.
+    CCoeEnv::Static()->SyncNotifyFocusObserversOfChangeInFocus();
+    m_pendingInputCapabilitiesChanged = false;
+}
+
+void QCoeFepInputContext::StartFepInlineEditL(const TDesC& aInitialInlineText,
+        TInt aPositionOfInsertionPointInInlineText, TBool aCursorVisibility, const MFormCustomDraw* /*aCustomDraw*/,
+        MFepInlineTextFormatRetriever& aInlineTextFormatRetriever,
+        MFepPointerEventHandlerDuringInlineEdit& aPointerEventHandlerDuringInlineEdit)
+{
+    QWidget *w = focusWidget();
+    if (!w)
+        return;
+
+    m_isEditing = true;
+
+    QList<QInputMethodEvent::Attribute> attributes;
+
+    m_cursorVisibility = aCursorVisibility ? 1 : 0;
+    m_inlinePosition = aPositionOfInsertionPointInInlineText;
+    m_preeditString = qt_TDesC2QStringL(aInitialInlineText);
+
+    m_formatRetriever = &aInlineTextFormatRetriever;
+    m_pointerHandler = &aPointerEventHandlerDuringInlineEdit;
+
+    applyFormat(&attributes);
+
+    attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor,
+                                                   m_inlinePosition,
+                                                   m_cursorVisibility,
+                                                   QVariant()));
+    QInputMethodEvent event(m_preeditString, attributes);
+    sendEvent(event);
+}
+
+void QCoeFepInputContext::UpdateFepInlineTextL(const TDesC& aNewInlineText,
+        TInt aPositionOfInsertionPointInInlineText)
+{
+    QWidget *w = focusWidget();
+    if (!w)
+        return;
+
+    m_inlinePosition = aPositionOfInsertionPointInInlineText;
+
+    QList<QInputMethodEvent::Attribute> attributes;
+    applyFormat(&attributes);
+    attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor,
+                                                   m_inlinePosition,
+                                                   m_cursorVisibility,
+                                                   QVariant()));
+    m_preeditString = qt_TDesC2QStringL(aNewInlineText);
+    QInputMethodEvent event(m_preeditString, attributes);
+    sendEvent(event);
+}
+
+void QCoeFepInputContext::SetInlineEditingCursorVisibilityL(TBool aCursorVisibility)
+{
+    QWidget *w = focusWidget();
+    if (!w)
+        return;
+
+    m_cursorVisibility = aCursorVisibility ? 1 : 0;
+
+    QList<QInputMethodEvent::Attribute> attributes;
+    attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor,
+                                                   m_inlinePosition,
+                                                   m_cursorVisibility,
+                                                   QVariant()));
+    QInputMethodEvent event(m_preeditString, attributes);
+    sendEvent(event);
+}
+
+void QCoeFepInputContext::CancelFepInlineEdit()
+{
+    QList<QInputMethodEvent::Attribute> attributes;
+    QInputMethodEvent event("", attributes);
+    event.setCommitString("", 0, 0);
+    m_preeditString.clear();
+    sendEvent(event);
+
+    m_isEditing = false;
+}
+
+TInt QCoeFepInputContext::DocumentLengthForFep() const
+{
+    QWidget *w = focusWidget();
+    if (!w)
+        return 0;
+
+    QVariant variant = w->inputMethodQuery(Qt::ImSurroundingText);
+    return variant.value<QString>().size() + m_preeditString.size();
+}
+
+TInt QCoeFepInputContext::DocumentMaximumLengthForFep() const
+{
+    QWidget *w = focusWidget();
+    if (!w)
+        return 0;
+
+    QVariant variant = w->inputMethodQuery(Qt::ImMaximumTextLength);
+    int size;
+    if (variant.isValid()) {
+        size = variant.toInt();
+    } else {
+        size = INT_MAX; // Sensible default for S60.
+    }
+    return size;
+}
+
+void QCoeFepInputContext::SetCursorSelectionForFepL(const TCursorSelection& aCursorSelection)
+{
+    QWidget *w = focusWidget();
+    if (!w)
+        return;
+
+    int pos = aCursorSelection.iAnchorPos;
+    int length = aCursorSelection.iCursorPos - pos;
+
+    QList<QInputMethodEvent::Attribute> attributes;
+    attributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, pos, length, QVariant());
+    QInputMethodEvent event(m_preeditString, attributes);
+    sendEvent(event);
+}
+
+void QCoeFepInputContext::GetCursorSelectionForFep(TCursorSelection& aCursorSelection) const
+{
+    QWidget *w = focusWidget();
+    if (!w)
+        return;
+
+    int cursor = w->inputMethodQuery(Qt::ImCursorPosition).toInt() + m_preeditString.size();
+    int anchor = w->inputMethodQuery(Qt::ImAnchorPosition).toInt() + m_preeditString.size();
+    aCursorSelection.iAnchorPos = anchor;
+    aCursorSelection.iCursorPos = cursor;
+}
+
+void QCoeFepInputContext::GetEditorContentForFep(TDes& aEditorContent, TInt aDocumentPosition,
+        TInt aLengthToRetrieve) const
+{
+    QWidget *w = focusWidget();
+    if (!w)
+        return;
+
+    QString text = w->inputMethodQuery(Qt::ImSurroundingText).value<QString>();
+    // FEP expects the preedit string to be part of the editor content, so let's mix it in.
+    int cursor = w->inputMethodQuery(Qt::ImCursorPosition).toInt();
+    text.insert(cursor, m_preeditString);
+    aEditorContent.Copy(qt_QString2TPtrC(text.mid(aDocumentPosition, aLengthToRetrieve)));
+}
+
+void QCoeFepInputContext::GetFormatForFep(TCharFormat& aFormat, TInt /* aDocumentPosition */) const
+{
+    QWidget *w = focusWidget();
+    if (!w)
+        return;
+
+    QFont font = w->inputMethodQuery(Qt::ImFont).value<QFont>();
+    QFontMetrics metrics(font);
+    //QString name = font.rawName();
+    QString name = font.defaultFamily(); // TODO! FIXME! Should be the above.
+    QHBufC hBufC(name);
+    aFormat = TCharFormat(hBufC->Des(), metrics.height());
+}
+
+void QCoeFepInputContext::GetScreenCoordinatesForFepL(TPoint& aLeftSideOfBaseLine, TInt& aHeight,
+        TInt& aAscent, TInt /* aDocumentPosition */) const
+{
+    QWidget *w = focusWidget();
+    if (!w)
+        return;
+
+    QRect rect = w->inputMethodQuery(Qt::ImMicroFocus).value<QRect>();
+    aLeftSideOfBaseLine.iX = rect.left();
+    aLeftSideOfBaseLine.iY = rect.bottom();
+
+    QFont font = w->inputMethodQuery(Qt::ImFont).value<QFont>();
+    QFontMetrics metrics(font);
+    aHeight = metrics.height();
+    aAscent = metrics.ascent();
+}
+
+void QCoeFepInputContext::DoCommitFepInlineEditL()
+{
+    commitCurrentString(true);
+}
+
+void QCoeFepInputContext::commitCurrentString(bool triggeredBySymbian)
+{
+    if (m_preeditString.size() == 0) {
+        return;
+    }
+
+    QList<QInputMethodEvent::Attribute> attributes;
+    QInputMethodEvent event("", attributes);
+    event.setCommitString(m_preeditString, 0, 0);//m_preeditString.size());
+    m_preeditString.clear();
+    sendEvent(event);
+
+    m_isEditing = false;
+
+    if (!triggeredBySymbian) {
+        CCoeEnv::Static()->Fep()->CancelTransaction();
+    }
+}
+
+MCoeFepAwareTextEditor_Extension1* QCoeFepInputContext::Extension1(TBool& aSetToTrue)
+{
+    aSetToTrue = ETrue;
+    return this;
+}
+
+void QCoeFepInputContext::SetStateTransferingOwnershipL(MCoeFepAwareTextEditor_Extension1::CState* aState,
+        TUid /*aTypeSafetyUid*/)
+{
+    // Note: The S60 docs are wrong! See the State() function.
+    if (m_fepState)
+        delete m_fepState;
+    m_fepState = static_cast<CAknEdwinState *>(aState);
+}
+
+MCoeFepAwareTextEditor_Extension1::CState* QCoeFepInputContext::State(TUid /*aTypeSafetyUid*/)
+{
+    // Note: The S60 docs are horribly wrong when describing the
+    // SetStateTransferingOwnershipL function and this function. They say that the former
+    // sets a CState object identified by the TUid, and the latter retrieves it.
+    // In reality, the CState is expected to always be a CAknEdwinState (even if it was not
+    // previously set), and the TUid is ignored. All in all, there is a single CAknEdwinState
+    // per QCoeFepInputContext, which should be deleted if the SetStateTransferingOwnershipL
+    // function is used to set a new one.
+    return m_fepState;
+}
+
+TTypeUid::Ptr QCoeFepInputContext::MopSupplyObject(TTypeUid /*id*/)
+{
+    return TTypeUid::Null();
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_IM
diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp
index 77b0cda3c4..0747f7628a 100644
--- a/src/gui/inputmethod/qinputcontext.cpp
+++ b/src/gui/inputmethod/qinputcontext.cpp
@@ -209,9 +209,21 @@ void QInputContext::setFocusWidget(QWidget *widget)
     way. Although the input events have accept() and ignore()
     methods, leave it untouched.
 
-    \a event is currently restricted to QKeyEvent. But some input
-    method related events such as QWheelEvent or QTabletEvent may be
-    added in future.
+    \a event is currently restricted to events of these types:
+
+    \list
+        \i CloseSoftwareInputPanel
+        \i KeyPress
+        \i KeyRelease
+        \i MouseButtonDblClick
+        \i MouseButtonPress
+        \i MouseButtonRelease
+        \i MouseMove
+        \i RequestSoftwareInputPanel
+    \endlist
+
+    But some input method related events such as QWheelEvent or
+    QTabletEvent may be added in future.
 
     The filtering opportunity is always given to the input context as
     soon as possible. It has to be taken place before any other key
@@ -415,13 +427,6 @@ QTextFormat QInputContext::standardFormat(StandardFormat s) const
     switch (s) {
     case QInputContext::PreeditFormat: {
         fmt.setUnderlineStyle(QTextCharFormat::DashUnderline);
-#ifndef Q_WS_WIN
-        int h1, s1, v1, h2, s2, v2;
-        pal.color(QPalette::Base).getHsv(&h1, &s1, &v1);
-        pal.color(QPalette::Background).getHsv(&h2, &s2, &v2);
-        bg.setHsv(h1, s1, (v1 + v2) / 2);
-        fmt.setBackground(QBrush(bg));
-#endif
         break;
     }
     case QInputContext::SelectionFormat: {
@@ -459,6 +464,31 @@ bool QInputContext::x11FilterEvent(QWidget * /*keywidget*/, XEvent * /*event*/)
 }
 #endif // Q_WS_X11
 
+#ifdef Q_WS_S60
+/*!
+    This function may be overridden only if input method is depending
+    on Symbian and you need raw TWsEvent. Otherwise, this function must not.
+
+    This function is designed to filter raw key events on S60, but
+    other input methods may use this to implement some special
+    features.
+
+    Return true if the \a event has been consumed. Otherwise, the
+    unfiltered \a event will be translated into QEvent and forwarded
+    to filterEvent(). Filtering at both s60FilterEvent() and
+    filterEvent() in single input method is allowed.
+
+    \a keywidget is a client widget into which a text is inputted. \a
+    event is inputted TWsEvent.
+
+    \sa filterEvent()
+*/
+bool QInputContext::s60FilterEvent(QWidget * /*keywidget*/, TWsEvent * /*event*/)
+{
+    return false;
+}
+#endif // Q_WS_S60
+
 QT_END_NAMESPACE
 
 #endif //Q_NO_IM
diff --git a/src/gui/inputmethod/qinputcontext.h b/src/gui/inputmethod/qinputcontext.h
index 1270d26df9..e4e5f9d9f3 100644
--- a/src/gui/inputmethod/qinputcontext.h
+++ b/src/gui/inputmethod/qinputcontext.h
@@ -67,6 +67,10 @@
 
 QT_BEGIN_HEADER
 
+#ifdef Q_WS_S60
+class TWsEvent;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
@@ -76,7 +80,6 @@ class QFont;
 class QPopupMenu;
 class QInputContextPrivate;
 
-
 class Q_GUI_EXPORT QInputContext : public QObject
 {
     Q_OBJECT
@@ -105,6 +108,9 @@ public:
 #if defined(Q_WS_X11)
     virtual bool x11FilterEvent( QWidget *keywidget, XEvent *event );
 #endif // Q_WS_X11
+#if defined(Q_WS_S60)
+    virtual bool s60FilterEvent( QWidget *keywidget, TWsEvent *event );
+#endif // Q_WS_S60
     virtual bool filterEvent( const QEvent *event );
 
     void sendEvent(const QInputMethodEvent &event);
diff --git a/src/gui/inputmethod/qinputcontextfactory.cpp b/src/gui/inputmethod/qinputcontextfactory.cpp
index f11c1b8619..5133b54784 100644
--- a/src/gui/inputmethod/qinputcontextfactory.cpp
+++ b/src/gui/inputmethod/qinputcontextfactory.cpp
@@ -71,6 +71,9 @@
 #ifdef Q_WS_MAC
 #include "qmacinputcontext_p.h"
 #endif
+#ifdef Q_WS_S60
+#include "qcoefepinputcontext_p.h"
+#endif
 
 #include "private/qfactoryloader_p.h"
 #include "qmutex.h"
@@ -145,6 +148,11 @@ QInputContext *QInputContextFactory::create( const QString& key, QObject *parent
         result = new QMacInputContext;
     }
 #endif
+#if defined(Q_WS_S60)
+    if (key == QLatin1String("coefep")) {
+        result = new QCoeFepInputContext;
+    }
+#endif
 #if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
     Q_UNUSED(key);
 #else
@@ -182,6 +190,9 @@ QStringList QInputContextFactory::keys()
 #if defined(Q_WS_MAC)
     result << QLatin1String("mac");
 #endif
+#if defined(Q_WS_S60)
+    result << QLatin1String("coefep");
+#endif
 #if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     result += loader()->keys();
 #endif // QT_NO_LIBRARY
@@ -217,6 +228,10 @@ QStringList QInputContextFactory::languages( const QString &key )
     if (key == QLatin1String("mac"))
         return QStringList(QString());
 #endif
+#if defined(Q_WS_S60)
+    if (key == QLatin1String("coefep"))
+        return QStringList(QString());
+#endif
 #if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
     Q_UNUSED(key);
 #else
@@ -241,6 +256,10 @@ QString QInputContextFactory::displayName( const QString &key )
     if (key == QLatin1String("xim"))
         return QInputContext::tr( "XIM" );
 #endif
+#ifdef Q_WS_S60
+    if (key == QLatin1String("coefep"))
+        return QInputContext::tr( "FEP" );
+#endif
 #if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
     Q_UNUSED(key);
 #else
@@ -272,6 +291,10 @@ QString QInputContextFactory::description( const QString &key )
     if (key == QLatin1String("mac"))
         return QInputContext::tr( "Mac OS X input method" );
 #endif
+#if defined(Q_WS_S60)
+    if (key == QLatin1String("coefep"))
+        return QInputContext::tr( "S60 FEP input method" );
+#endif
 #if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
     Q_UNUSED(key);
 #else
diff --git a/src/gui/inputmethod/qwininputcontext_win.cpp b/src/gui/inputmethod/qwininputcontext_win.cpp
index 741d8da813..da7e84f2f8 100644
--- a/src/gui/inputmethod/qwininputcontext_win.cpp
+++ b/src/gui/inputmethod/qwininputcontext_win.cpp
@@ -695,7 +695,12 @@ void QWinInputContext::updateImeStatus(QWidget *w, bool hasFocus)
 {
     if (!w)
         return;
-    bool e = w->testAttribute(Qt::WA_InputMethodEnabled) && w->isEnabled();
+    // It's always the proxy that carries the hints.
+    QWidget *focusProxyWidget = w->focusProxy();
+    if (!focusProxyWidget)
+        focusProxyWidget = w;
+    bool e = w->testAttribute(Qt::WA_InputMethodEnabled) && w->isEnabled()
+            && !(focusProxyWidget->inputMethodHints() & Qt::ImhExclusiveInputMask);
     bool hasIme = e && hasFocus;
 #ifdef Q_IME_DEBUG
     qDebug("%s HasFocus = %d hasIme = %d e = %d ", w->className(), hasFocus, hasIme, e);
diff --git a/src/gui/inputmethod/qximinputcontext_x11.cpp b/src/gui/inputmethod/qximinputcontext_x11.cpp
index 074b189639..65b5a24bb6 100644
--- a/src/gui/inputmethod/qximinputcontext_x11.cpp
+++ b/src/gui/inputmethod/qximinputcontext_x11.cpp
@@ -612,7 +612,7 @@ void QXIMInputContext::setFocusWidget(QWidget *w)
 
     QInputContext::setFocusWidget(w);
 
-    if (!w)
+    if (!w || w->inputMethodHints() & Qt::ImhExclusiveInputMask)
         return;
 
     ICData *data = ximData.value(w->effectiveWinId());
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 8b6b5cb34b..afcb91818c 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -61,6 +61,7 @@
 #ifndef QT_NO_ACCESSIBILITY
 #include <qaccessible.h>
 #endif
+#include <private/qactiontokeyeventmapper_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -2007,15 +2008,18 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
         if (QApplication::keypadNavigationEnabled()) {
             if (!hasEditFocus()) {
                 setEditFocus(true);
+                QActionToKeyEventMapper::addSoftKey(QAction::BackSoftKey, Qt::Key_Back, this);
                 return;
             }
         }
         break;
     case Qt::Key_Back:
-        if (QApplication::keypadNavigationEnabled() && hasEditFocus())
+        if (QApplication::keypadNavigationEnabled() && hasEditFocus()) {
+            QActionToKeyEventMapper::removeSoftkey(this);
             setEditFocus(false);
-        else
+        } else {
             event->ignore();
+        }
         return;
     default:
         if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index 557e98b612..f90e0fee68 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -312,7 +312,7 @@ public:
      */
     inline bool isPersistent(const QModelIndex &index) const
     {
-        return static_cast<QAbstractItemModelPrivate *>(model->d_ptr)->persistent.indexes.contains(index);
+        return static_cast<QAbstractItemModelPrivate *>(model->d_ptr.data())->persistent.indexes.contains(index);
     }
 
     QModelIndexList selectedDraggableIndexes() const;
diff --git a/src/gui/itemviews/qcolumnview_p.h b/src/gui/itemviews/qcolumnview_p.h
index 3f99220dcd..7b4f774aec 100644
--- a/src/gui/itemviews/qcolumnview_p.h
+++ b/src/gui/itemviews/qcolumnview_p.h
@@ -55,7 +55,7 @@
 
 #include "qcolumnview.h"
 
-#ifndef QT_NO_QCOlUMNVIEW
+#ifndef QT_NO_QCOLUMNVIEW
 
 #include <private/qabstractitemview_p.h>
 
diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp
index c5618b608e..5d7d1ff283 100644
--- a/src/gui/itemviews/qdirmodel.cpp
+++ b/src/gui/itemviews/qdirmodel.cpp
@@ -872,8 +872,10 @@ QModelIndex QDirModel::index(const QString &path, int column) const
         return QModelIndex();
 
     QString absolutePath = QDir(path).absolutePath();
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     absolutePath = absolutePath.toLower();
+#endif
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     // On Windows, "filename......." and "filename" are equivalent
     if (absolutePath.endsWith(QLatin1Char('.'))) {
         int i;
@@ -913,7 +915,10 @@ QModelIndex QDirModel::index(const QString &path, int column) const
         pathElements.pop_front();
         if (childAppended)
             emit const_cast<QDirModel*>(this)->layoutChanged();
-    } else if (pathElements.at(0).endsWith(QLatin1Char(':'))) {
+    } else 
+#endif
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+    if (pathElements.at(0).endsWith(QLatin1Char(':'))) {
         pathElements[0] += QLatin1Char('/');
     }
 #else
@@ -935,11 +940,9 @@ QModelIndex QDirModel::index(const QString &path, int column) const
         for (int j = parent->children.count() - 1; j >= 0; --j) {
             const QFileInfo& fi = parent->children.at(j).info;
             QString childFileName;
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
             childFileName = idx.isValid() ? fi.fileName() : fi.absoluteFilePath();
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
             childFileName = childFileName.toLower();
-#else
-            childFileName = idx.isValid() ? fi.fileName() : fi.absoluteFilePath();
 #endif
             if (childFileName == element) {
                 if (i == pathElements.count() - 1)
@@ -956,7 +959,7 @@ QModelIndex QDirModel::index(const QString &path, int column) const
             if (parent->info.isRoot())
                 newPath = parent->info.absoluteFilePath() + element;
             else
-                newPath= parent->info.absoluteFilePath() + QLatin1Char('/') + element;
+                newPath = parent->info.absoluteFilePath() + QLatin1Char('/') + element;
 #else
             QString newPath = parent->info.absoluteFilePath() + QLatin1Char('/') + element;
 #endif
@@ -1308,6 +1311,8 @@ QString QDirModelPrivate::name(const QModelIndex &index) const
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
         if (name.startsWith(QLatin1Char('/'))) // UNC host
             return info.fileName();
+#endif        
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
         if (name.endsWith(QLatin1Char('/')))
             name.chop(1);
 #endif
diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp
index dd4341b620..b9df4fc999 100644
--- a/src/gui/itemviews/qfileiconprovider.cpp
+++ b/src/gui/itemviews/qfileiconprovider.cpp
@@ -179,7 +179,6 @@ QFileIconProvider::QFileIconProvider()
 
 QFileIconProvider::~QFileIconProvider()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/gui/itemviews/qfileiconprovider.h b/src/gui/itemviews/qfileiconprovider.h
index 7f587f4fb0..165e30f820 100644
--- a/src/gui/itemviews/qfileiconprovider.h
+++ b/src/gui/itemviews/qfileiconprovider.h
@@ -42,8 +42,9 @@
 #ifndef QFILEICONPROVIDER_H
 #define QFILEICONPROVIDER_H
 
-#include <QtGui/qicon.h>
 #include <QtCore/qfileinfo.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtGui/qicon.h>
 
 QT_BEGIN_HEADER
 
@@ -67,7 +68,7 @@ public:
 
 private:
     Q_DECLARE_PRIVATE(QFileIconProvider)
-    QFileIconProviderPrivate *d_ptr;
+    QScopedPointer<QFileIconProviderPrivate> d_ptr;
     Q_DISABLE_COPY(QFileIconProvider)
 };
 
diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp
index 2419c18983..750e20b778 100644
--- a/src/gui/itemviews/qheaderview.cpp
+++ b/src/gui/itemviews/qheaderview.cpp
@@ -2821,16 +2821,12 @@ void QHeaderViewPrivate::setupSectionIndicator(int section, int position)
         sectionIndicator = new QLabel(viewport);
     }
 
-    int x, y, w, h;
+    int w, h;
     int p = q->sectionViewportPosition(section);
     if (orientation == Qt::Horizontal) {
-        x = p;
-        y = 0;
         w = q->sectionSize(section);
         h = viewport->height();
     } else {
-        x = 0;
-        y = p;
         w = viewport->width();
         h = q->sectionSize(section);
     }
@@ -3561,7 +3557,7 @@ bool QHeaderViewPrivate::read(QDataStream &in)
     in >> minimumSectionSize;
 
     in >> align;
-    defaultAlignment = (Qt::Alignment)align;
+    defaultAlignment = Qt::Alignment(align);
 
     in >> global;
     globalResizeMode = (QHeaderView::ResizeMode)global;
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index aff715ce51..2c3d1272aa 100644
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -1325,7 +1325,7 @@ QStyleOptionViewItem QItemDelegate::setOptions(const QModelIndex &index,
     // set text alignment
     value = index.data(Qt::TextAlignmentRole);
     if (value.isValid())
-        opt.displayAlignment = (Qt::Alignment)value.toInt();
+        opt.displayAlignment = Qt::Alignment(value.toInt());
 
     // set foreground brush
     value = index.data(Qt::ForegroundRole);
diff --git a/src/gui/itemviews/qstandarditemmodel.cpp b/src/gui/itemviews/qstandarditemmodel.cpp
index e71d8f94ac..b960fae5d6 100644
--- a/src/gui/itemviews/qstandarditemmodel.cpp
+++ b/src/gui/itemviews/qstandarditemmodel.cpp
@@ -778,8 +778,6 @@ QStandardItem &QStandardItem::operator=(const QStandardItem &other)
 */
 QStandardItem::~QStandardItem()
 {
-    Q_D(QStandardItem);
-    delete d;
 }
 
 /*!
@@ -899,7 +897,7 @@ Qt::ItemFlags QStandardItem::flags() const
     if (!v.isValid())
         return (Qt::ItemIsSelectable|Qt::ItemIsEnabled|Qt::ItemIsEditable
                 |Qt::ItemIsDragEnabled|Qt::ItemIsDropEnabled);
-    return ((Qt::ItemFlags)(v.toInt()));
+    return Qt::ItemFlags(v.toInt());
 }
 
 /*!
@@ -1896,7 +1894,7 @@ void QStandardItem::read(QDataStream &in)
     in >> d->values;
     qint32 flags;
     in >> flags;
-    setFlags((Qt::ItemFlags)flags);
+    setFlags(Qt::ItemFlags(flags));
 }
 
 /*!
diff --git a/src/gui/itemviews/qstandarditemmodel.h b/src/gui/itemviews/qstandarditemmodel.h
index c624615060..c470b80727 100644
--- a/src/gui/itemviews/qstandarditemmodel.h
+++ b/src/gui/itemviews/qstandarditemmodel.h
@@ -240,7 +240,7 @@ protected:
     QStandardItem(const QStandardItem &other);
     QStandardItem(QStandardItemPrivate &dd);
     QStandardItem &operator=(const QStandardItem &other);
-    QStandardItemPrivate *d_ptr;
+    QScopedPointer<QStandardItemPrivate> d_ptr;
 
     void emitDataChanged();
 
diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp
index 7ec2afebd7..5730c86362 100644
--- a/src/gui/itemviews/qstyleditemdelegate.cpp
+++ b/src/gui/itemviews/qstyleditemdelegate.cpp
@@ -322,7 +322,7 @@ void QStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option,
 
     value = index.data(Qt::TextAlignmentRole);
     if (value.isValid() && !value.isNull())
-        option->displayAlignment = (Qt::Alignment)value.toInt();
+        option->displayAlignment = Qt::Alignment(value.toInt());
 
     value = index.data(Qt::ForegroundRole);
     if (qVariantCanConvert<QBrush>(value))
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index e724a7d2cb..7cded49f7c 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -853,7 +853,7 @@ void QTreeModel::sortItems(QList<QTreeWidgetItem*> *items, int column, Qt::SortO
         items->replace(r, item);
         for (int c = 0; c < colCount; ++c) {
             QModelIndex from = createIndex(oldRow, c, item);
-            if (static_cast<QAbstractItemModelPrivate *>(d_ptr)->persistent.indexes.contains(from)) {
+            if (static_cast<QAbstractItemModelPrivate *>(d_ptr.data())->persistent.indexes.contains(from)) {
                 QModelIndex to = createIndex(r, c, item);
                 fromList << from;
                 toList << to;
diff --git a/src/gui/itemviews/qtreewidgetitemiterator.cpp b/src/gui/itemviews/qtreewidgetitemiterator.cpp
index 14aca3ae83..b6f56a0027 100644
--- a/src/gui/itemviews/qtreewidgetitemiterator.cpp
+++ b/src/gui/itemviews/qtreewidgetitemiterator.cpp
@@ -97,7 +97,7 @@ QTreeWidgetItemIterator::QTreeWidgetItemIterator(QTreeWidget *widget, IteratorFl
     Q_ASSERT(widget);
     QTreeModel *model = qobject_cast<QTreeModel*>(widget->model());
     Q_ASSERT(model);
-    d_ptr = new QTreeWidgetItemIteratorPrivate(this, model);
+    d_ptr.reset(new QTreeWidgetItemIteratorPrivate(this, model));
     model->iterators.append(this);
     if (!model->rootItem->children.isEmpty()) current = model->rootItem->children.first();
     if (current && !matchesFlags(current))
@@ -150,7 +150,6 @@ QTreeWidgetItemIterator::QTreeWidgetItemIterator(QTreeWidgetItem *item, Iterator
 QTreeWidgetItemIterator::~QTreeWidgetItemIterator()
 {
     d_func()->m_model->iterators.removeAll(this);
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/gui/itemviews/qtreewidgetitemiterator.h b/src/gui/itemviews/qtreewidgetitemiterator.h
index 0c072840d6..eff9fdbbdc 100644
--- a/src/gui/itemviews/qtreewidgetitemiterator.h
+++ b/src/gui/itemviews/qtreewidgetitemiterator.h
@@ -43,6 +43,7 @@
 #define QTREEWIDGETITEMITERATOR_H
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -105,7 +106,7 @@ public:
 
 private:
     bool matchesFlags(const QTreeWidgetItem *item) const;
-    QTreeWidgetItemIteratorPrivate *d_ptr;
+    QScopedPointer<QTreeWidgetItemIteratorPrivate> d_ptr;
     QTreeWidgetItem *current;
     IteratorFlags flags;
     Q_DECLARE_PRIVATE(QTreeWidgetItemIterator)
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index e6eff6ebc1..530b14694c 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -96,6 +96,27 @@ win32 {
         !contains(DEFINES, QT_NO_DIRECTDRAW):LIBS += ddraw.lib
 }
 
+symbian {
+        SOURCES += \
+                kernel/qapplication_s60.cpp \
+                kernel/qeventdispatcher_s60.cpp \
+                kernel/qwidget_s60.cpp \
+                kernel/qcursor_s60.cpp \
+                kernel/qdesktopwidget_s60.cpp \
+                kernel/qkeymapper_s60.cpp\
+                kernel/qclipboard_s60.cpp\
+                kernel/qdnd_s60.cpp \
+                kernel/qsound_s60.cpp
+                
+        HEADERS += \
+                kernel/qt_s60_p.h \
+                kernel/qeventdispatcher_s60_p.h
+        LIBS += -lbafl -lestor
+
+        INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+}
+
+
 unix:x11 {
 	INCLUDEPATH += ../3rdparty/xorg
 	HEADERS += \
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index e7cb5c2973..afe6269536 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -81,7 +81,8 @@ static QString qt_strippedText(QString s)
 
 QActionPrivate::QActionPrivate() : group(0), enabled(1), forceDisabled(0),
                                    visible(1), forceInvisible(0), checkable(0), checked(0), separator(0), fontSet(false),
-                                   menuRole(QAction::TextHeuristicRole), priority(QAction::NormalPriority), iconVisibleInMenu(-1)
+                                   menuRole(QAction::TextHeuristicRole), softKeyRole(QAction::OptionsSoftKey),
+                                   priority(QAction::NormalPriority), iconVisibleInMenu(-1)
 {
 #ifdef QT3_SUPPORT
     static int qt_static_action_id = -1;
@@ -1407,6 +1408,32 @@ QAction::MenuRole QAction::menuRole() const
 }
 
 /*!
+    \property QAction::softKeyRole
+    \brief the action's softkey role
+    \since 4.6
+
+    This indicates what softkey action this action is. Usually used on mobile
+    platforms to map QActions to hardware keys.
+    
+    The softkey role can be changed any time.
+*/
+void QAction::setSoftKeyRole(SoftKeyRole softKeyRole)
+{
+    Q_D(QAction);
+    if (d->softKeyRole == softKeyRole)
+        return;
+
+    d->softKeyRole = softKeyRole;
+    d->sendDataChanged();
+}
+
+QAction::SoftKeyRole QAction::softKeyRole() const
+{
+    Q_D(const QAction);
+    return d->softKeyRole;
+}
+
+/*!
     \property QAction::iconVisibleInMenu
     \brief Whether or not an action should show an icon in a menu
     \since 4.4
diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h
index cb681c4a49..68f88c5512 100644
--- a/src/gui/kernel/qaction.h
+++ b/src/gui/kernel/qaction.h
@@ -67,6 +67,7 @@ class Q_GUI_EXPORT QAction : public QObject
     Q_DECLARE_PRIVATE(QAction)
 
     Q_ENUMS(MenuRole)
+    Q_ENUMS(SoftKeyRole)
     Q_ENUMS(Priority)
     Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY changed)
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked DESIGNABLE isCheckable NOTIFY toggled)
@@ -85,12 +86,17 @@ class Q_GUI_EXPORT QAction : public QObject
 #endif
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY changed)
     Q_PROPERTY(MenuRole menuRole READ menuRole WRITE setMenuRole NOTIFY changed)
+    Q_PROPERTY(SoftKeyRole softKeyRole READ softKeyRole WRITE setSoftKeyRole NOTIFY changed)
     Q_PROPERTY(bool iconVisibleInMenu READ isIconVisibleInMenu WRITE setIconVisibleInMenu NOTIFY changed)
     Q_PROPERTY(Priority priority READ priority WRITE setPriority)
 
 public:
     enum MenuRole { NoRole, TextHeuristicRole, ApplicationSpecificRole, AboutQtRole,
                     AboutRole, PreferencesRole, QuitRole };
+    enum SoftKeyRole { OptionsSoftKey, SelectSoftKey, BackSoftKey, NextSoftKey, PreviousSoftKey,
+                    OkSoftKey, CancelSoftKey, EditSoftKey, ViewSoftKey, BackSpaceSoftKey,
+                    EndEditSoftKey, RevertEditSoftKey, DeselectSoftKey, FinishSoftKey,
+                    MenuSoftKey, ContextMenuSoftKey, ExitSoftKey };
     enum Priority { LowPriority = 0,
                     NormalPriority = 128,
                     HighPriority = 256};
@@ -176,6 +182,9 @@ public:
     void setMenuRole(MenuRole menuRole);
     MenuRole menuRole() const;
 
+    void setSoftKeyRole(SoftKeyRole softKeyRole);
+    SoftKeyRole softKeyRole() const;
+
     void setIconVisibleInMenu(bool visible);
     bool isIconVisibleInMenu() const;
 
diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h
index 4745ed1ded..4e3651e117 100644
--- a/src/gui/kernel/qaction_p.h
+++ b/src/gui/kernel/qaction_p.h
@@ -102,6 +102,7 @@ public:
     uint separator : 1;
     uint fontSet : 1;
     QAction::MenuRole menuRole;
+    QAction::SoftKeyRole softKeyRole;
     QAction::Priority priority;
     int iconVisibleInMenu : 3;  // Only has values -1, 0, and 1
     QList<QWidget *> widgets;
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index e210556d84..7acba93415 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -75,6 +75,9 @@
 
 #ifdef Q_WS_X11
 #include <private/qt_x11_p.h>
+#endif
+
+#if defined(Q_WS_X11) || defined(Q_WS_S60)
 #include "qinputcontextfactory.h"
 #endif
 
@@ -134,6 +137,8 @@ bool QApplicationPrivate::quitOnLastWindowClosed = true;
 #ifdef Q_WS_WINCE
 int QApplicationPrivate::autoMaximizeThreshold = -1;
 bool QApplicationPrivate::autoSipEnabled = false;
+#else
+bool QApplicationPrivate::autoSipEnabled = true;
 #endif
 
 QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, QApplication::Type type)
@@ -432,7 +437,12 @@ bool Q_GUI_EXPORT qt_tab_all_widgets = true;
 bool qt_in_tab_key_event = false;
 int qt_antialiasing_threshold = -1;
 static int drag_time = 500;
+#ifdef Q_OS_SYMBIAN
+// The screens are a bit too small to for your thumb when using only 4 pixels drag distance.
+static int drag_distance = 8;
+#else
 static int drag_distance = 4;
+#endif
 static Qt::LayoutDirection layout_direction = Qt::LeftToRight;
 QSize QApplicationPrivate::app_strut = QSize(0,0); // no default application strut
 bool QApplicationPrivate::animate_ui = true;
@@ -443,11 +453,16 @@ bool QApplicationPrivate::animate_tooltip = false;
 bool QApplicationPrivate::fade_tooltip = false;
 bool QApplicationPrivate::animate_toolbox = false;
 bool QApplicationPrivate::widgetCount = false;
+bool QApplicationPrivate::auto_sip_on_mouse_focus = false;
 #if defined(Q_WS_WIN) && !defined(Q_WS_WINCE)
 bool QApplicationPrivate::inSizeMove = false;
 #endif
 #ifdef QT_KEYPAD_NAVIGATION
+#  if defined(Q_OS_SYMBIAN)
+bool QApplicationPrivate::keypadNavigation = true;
+#  else
 bool QApplicationPrivate::keypadNavigation = false;
+#  endif
 QWidget *QApplicationPrivate::oldEditFocus = 0;
 #endif
 
@@ -983,7 +998,8 @@ QApplication::~QApplication()
     if (QWidgetPrivate::mapper) {
         QWidgetMapper * myMapper = QWidgetPrivate::mapper;
         QWidgetPrivate::mapper = 0;
-        for (QWidgetMapper::Iterator it = myMapper->begin(); it != myMapper->end(); ++it) {
+        for (QWidgetMapper::ConstIterator it = myMapper->constBegin();
+                it != myMapper->constEnd(); ++it) {
             register QWidget *w = *it;
             if (!w->parent())                        // window
                 w->destroy(true, true);
@@ -995,7 +1011,7 @@ QApplication::~QApplication()
     if (QWidgetPrivate::uncreatedWidgets) {
         QWidgetSet *mySet = QWidgetPrivate::uncreatedWidgets;
         QWidgetPrivate::uncreatedWidgets = 0;
-        for (QWidgetSet::Iterator it = mySet->begin(); it != mySet->end(); ++it) {
+        for (QWidgetSet::ConstIterator it = mySet->constBegin(); it != mySet->constEnd(); ++it) {
             register QWidget *w = *it;
             if (!w->parent())                        // window
                 w->destroy(true, true);
@@ -1062,6 +1078,7 @@ QApplication::~QApplication()
     QApplicationPrivate::animate_tooltip = false;
     QApplicationPrivate::fade_tooltip = false;
     QApplicationPrivate::widgetCount = false;
+    QApplicationPrivate::auto_sip_on_mouse_focus = false;
 
 #ifndef QT_NO_STATEMACHINE
     // trigger unregistering of QStateMachine's GUI types
@@ -1218,11 +1235,15 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis
     \since 4.5
     \brief toggles automatic SIP (software input panel) visibility
 
-    \bold{The auto SIP property is only available as part of Qt for Windows CE.}
-
     Set this property to \c true to automatically display the SIP when entering
     widgets that accept keyboard input. This property only affects widgets with
-    the WA_InputMethodEnabled attribute set.
+    the WA_InputMethodEnabled attribute set, and is typically used to launch
+    a virtual keyboard on devices which have very few or no keys.
+
+    \bold{ The property only has an effect on platforms which use software input
+    panels, such as Windows CE and Symbian.}
+
+    The default is platform dependent.
 */
 
 #ifdef Q_WS_WINCE
@@ -1235,6 +1256,7 @@ int QApplication::autoMaximizeThreshold() const
 {
     return QApplicationPrivate::autoMaximizeThreshold;
 }
+#endif
 
 void QApplication::setAutoSipEnabled(const bool enabled)
 {
@@ -1245,7 +1267,6 @@ bool QApplication::autoSipEnabled() const
 {
     return QApplicationPrivate::autoSipEnabled;
 }
-#endif
 
 #ifndef QT_NO_STYLE_STYLESHEET
 
@@ -1927,6 +1948,10 @@ QString desktopstyle;
                 desktopstyle = QLatin1String("Windows");                // default styles for Windows
 #elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS)
             desktopstyle = QLatin1String("CDE");                        // default style for X11 on Solaris
+#elif defined(Q_WS_S60)
+            desktopstyle = QLatin1String("S60");                        // default style for Symbian with S60
+#elif defined(Q_OS_SYMBIAN)
+            desktopstyle = QLatin1String("Windows");                    // default style for Symbian without S60
 #elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
             desktopstyle = QLatin1String("SGI");                        // default style for X11 on IRIX
 #elif defined(Q_WS_QWS)
@@ -2081,6 +2106,16 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason)
                         prev->setEditFocus(false);
                 }
 #endif
+#ifndef QT_NO_IM
+                if (focus) {
+                    QInputContext *prevIc;
+                    prevIc = prev->inputContext();
+                    if (prevIc && prevIc != focus->inputContext()) {
+                        QEvent closeSIPEvent(QEvent::CloseSoftwareInputPanel);
+                        QApplication::sendEvent(prev, &closeSIPEvent);
+                    }
+                }
+#endif
                 QFocusEvent out(QEvent::FocusOut, reason);
                 QPointer<QWidget> that = prev;
                 QApplication::sendEvent(prev, &out);
@@ -3438,6 +3473,39 @@ Qt::LayoutDirection QApplication::layoutDirection()
     return layout_direction;
 }
 
+/*!
+    \property autoSipOnMouseFocus
+    \since 4.6
+    \brief toggles SIP (software input panel) launch policy
+
+    This property holds whether widgets should request a software input
+    panel when it is focused with the mouse. This is typically used to
+    launch a virtual keyboard on devices which have very few or no keys.
+
+    If the property is set to true, the widget asks for an input panel
+    on the mouse click which causes the widget to be focused. If the
+    property is set to false, the user must click a second time before
+    the widget asks for an input panel.
+
+    \note If the widget is focused by other means than a mouse click,
+          the next click is will trigger an input panel request,
+          regardless of the value of this property.
+
+    The default is platform dependent.
+
+    \sa QEvent::RequestSoftwareInputPanel, QInputContext
+*/
+
+void QApplication::setAutoSipOnMouseFocus(bool enable)
+{
+    QApplicationPrivate::auto_sip_on_mouse_focus = enable;
+}
+
+bool QApplication::autoSipOnMouseFocus()
+{
+    return QApplicationPrivate::auto_sip_on_mouse_focus;
+}
+
 
 /*!
     \obsolete
@@ -3714,6 +3782,14 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
             QPoint relpos = mouse->pos();
 
             if (e->spontaneous()) {
+#ifndef QT_NO_IM
+                QInputContext *ic = w->inputContext();
+                if (ic
+                        && w->testAttribute(Qt::WA_InputMethodEnabled)
+                        && ic->filterEvent(mouse))
+                    return true;
+#endif
+
                 if (e->type() == QEvent::MouseButtonPress) {
                     QApplicationPrivate::giveFocusAccordingToFocusPolicy(w,
                                                                          Qt::ClickFocus,
@@ -4052,6 +4128,20 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
         touchEvent->setAccepted(eventAccepted);
         break;
     }
+    case QEvent::RequestSoftwareInputPanel:
+    case QEvent::CloseSoftwareInputPanel:
+#ifndef QT_NO_IM
+        if (receiver->isWidgetType()) {
+            QWidget *w = static_cast<QWidget *>(receiver);
+            QInputContext *ic = w->inputContext();
+            if (ic && ic->filterEvent(e)) {
+                break;
+            }
+        }
+#endif
+        res = d->notify_helper(receiver, e);
+        break;
+
     case QEvent::WinGesture:
     {
         // only propagate the first gesture event (after the GID_BEGIN)
@@ -4726,7 +4816,7 @@ void QApplicationPrivate::emitLastWindowClosed()
 
     If \a enable is true, Qt::Key_Up and Qt::Key_Down are used to change focus.
 
-    This feature is available in Qt for Embedded Linux only.
+    This feature is available in Qt for Embedded Linux and Symbian only.
 
     \sa keypadNavigationEnabled()
 */
@@ -4737,9 +4827,9 @@ void QApplication::setKeypadNavigationEnabled(bool enable)
 
 /*!
     Returns true if Qt is set to use keypad navigation; otherwise returns
-    false. The default is false.
+    false.  The default value is true on Symbian, but false on other platforms.
 
-    This feature is available in Qt for Embedded Linux only.
+    This feature is available in Qt for Embedded Linux and Symbian only.
 
     \sa setKeypadNavigationEnabled()
 */
@@ -4794,8 +4884,8 @@ bool QApplication::keypadNavigationEnabled()
     from two consecutive mouse clicks
 
     The default value on X11 is 400 milliseconds. On Windows and Mac OS, the
-    operating system's value is used. However, on Windows, calling this
-    function sets the double click interval for all applications.
+    operating system's value is used. However, on Windows and Symbian OS,
+    calling this function sets the double click interval for all applications.
 */
 
 /*!
@@ -4954,8 +5044,7 @@ void QApplication::setInputContext(QInputContext *inputContext)
         qWarning("QApplication::setInputContext: called with 0 input context");
         return;
     }
-    if (d->inputContext)
-        delete d->inputContext;
+    delete d->inputContext;
     d->inputContext = inputContext;
 }
 
@@ -4979,6 +5068,11 @@ QInputContext *QApplication::inputContext() const
             qic = QInputContextFactory::create(QLatin1String("xim"), that);
         that->d_func()->inputContext = qic;
     }
+#elif defined(Q_WS_S60)
+    if (!d->inputContext) {
+        QApplication *that = const_cast<QApplication *>(this);
+        that->d_func()->inputContext = QInputContextFactory::create(QString::fromLatin1("coefep"), that);
+    }
 #endif
     return d->inputContext;
 }
@@ -4996,6 +5090,8 @@ uint QApplicationPrivate::currentPlatform(){
         platform |= KB_Gnome;
     if (X11->desktopEnvironment == DE_CDE)
         platform |= KB_CDE;
+#elif defined(Q_OS_SYMBIAN)
+    platform = KB_S60;
 #endif
     return platform;
 }
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 19ae085a03..fcb3a7ce38 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -61,6 +61,10 @@
 
 QT_BEGIN_HEADER
 
+#if defined(Q_OS_SYMBIAN)
+class TWsEvent;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
@@ -84,6 +88,7 @@ class QApplicationPrivate;
 #endif
 #define qApp (static_cast<QApplication *>(QCoreApplication::instance()))
 
+
 class Q_GUI_EXPORT QApplication : public QCoreApplication
 {
     Q_OBJECT
@@ -92,6 +97,8 @@ class Q_GUI_EXPORT QApplication : public QCoreApplication
     Q_PROPERTY(int cursorFlashTime READ cursorFlashTime WRITE setCursorFlashTime)
     Q_PROPERTY(int doubleClickInterval  READ doubleClickInterval WRITE setDoubleClickInterval)
     Q_PROPERTY(int keyboardInputInterval READ keyboardInputInterval WRITE setKeyboardInputInterval)
+    Q_PROPERTY(bool autoSipOnMouseFocus READ autoSipOnMouseFocus
+               WRITE setAutoSipOnMouseFocus)
 #ifndef QT_NO_WHEELEVENT
     Q_PROPERTY(int wheelScrollLines  READ wheelScrollLines WRITE setWheelScrollLines)
 #endif
@@ -104,8 +111,8 @@ class Q_GUI_EXPORT QApplication : public QCoreApplication
 #endif
 #ifdef Q_WS_WINCE
     Q_PROPERTY(int autoMaximizeThreshold READ autoMaximizeThreshold WRITE setAutoMaximizeThreshold)
-    Q_PROPERTY(bool autoSipEnabled READ autoSipEnabled WRITE setAutoSipEnabled)
 #endif
+    Q_PROPERTY(bool autoSipEnabled READ autoSipEnabled WRITE setAutoSipEnabled)
 
 public:
     enum Type { Tty, GuiClient, GuiServer };
@@ -223,6 +230,12 @@ public:
     virtual int x11ClientMessage(QWidget*, XEvent*, bool passive_only);
     int x11ProcessEvent(XEvent*);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    int s60ProcessEvent(TWsEvent *event);
+    virtual bool s60EventFilter(TWsEvent *aEvent);
+    void symbianHandleCommand(int command);
+    void symbianResourceChange(int type);
+#endif
 #if defined(Q_WS_QWS)
     virtual bool qwsEventFilter(QWSEvent *);
     int qwsProcessEvent(QWSEvent*);
@@ -239,7 +252,6 @@ public:
     void winFocus(QWidget *, bool);
     static void winMouseButtonUp();
 #endif
-
 #ifndef QT_NO_SESSIONMANAGER
     // session management
     bool isSessionRestored() const;
@@ -284,9 +296,11 @@ public Q_SLOTS:
 #ifdef Q_WS_WINCE
     void setAutoMaximizeThreshold(const int threshold);
     int autoMaximizeThreshold() const;
+#endif
     void setAutoSipEnabled(const bool enabled);
     bool autoSipEnabled() const;
-#endif
+    void setAutoSipOnMouseFocus(bool);
+    bool autoSipOnMouseFocus();
     static void closeAllWindows();
     static void aboutQt();
 
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 595f220343..0cd93b9dee 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -100,6 +100,7 @@ extern QSysInfo::MacVersion qt_macver;
 #if defined(Q_WS_QWS)
 class QWSManager;
 class QDirectPainter;
+struct QWSServerCleaner { ~QWSServerCleaner(); };
 #endif
 
 #ifndef QT_NO_TABLET
@@ -294,8 +295,8 @@ public:
     static void emitLastWindowClosed();
 #ifdef Q_WS_WINCE
     static int autoMaximizeThreshold;
-    static bool autoSipEnabled;
 #endif
+    static bool autoSipEnabled;
     static QString desktopStyleKey();
 
     static QGraphicsSystem *graphicsSystem()
@@ -307,7 +308,6 @@ public:
 
     void createEventDispatcher();
     QString appName() const;
-
     static void dispatchEnterLeave(QWidget *enter, QWidget *leave);
 
     //modality
@@ -344,6 +344,7 @@ public:
         KB_KDE = 8,
         KB_Gnome = 16,
         KB_CDE = 32,
+        KB_S60 = 64,
         KB_All = 0xffff
     };
 
@@ -429,6 +430,7 @@ public:
     static bool fade_tooltip;
     static bool animate_toolbox;
     static bool widgetCount; // Coupled with -widgetcount switch
+    static bool auto_sip_on_mouse_focus;
 #ifdef Q_WS_MAC
     static bool native_modal_dialog_active;
 #endif
@@ -456,6 +458,7 @@ public:
 
 #ifdef Q_WS_QWS
     QPointer<QWSManager> last_manager;
+    QWSServerCleaner qwsServerCleaner;
 # ifndef QT_NO_DIRECTPAINTER
     QMap<WId, QDirectPainter *> *directPainters;
 # endif
@@ -495,6 +498,9 @@ public:
     static bool sendMouseEvent(QWidget *receiver, QMouseEvent *event, QWidget *alienWidget,
                                QWidget *native, QWidget **buttonDown, QPointer<QWidget> &lastMouseReceiver,
                                bool spontaneous = true);
+#ifdef Q_OS_SYMBIAN
+    static TUint resolveS60ScanCode(TInt scanCode, TUint keysym);
+#endif
 #if defined(Q_WS_WIN) || defined(Q_WS_X11)
     void sendSyntheticEnterLeave(QWidget *widget);
 #endif
@@ -559,6 +565,10 @@ private:
     QMap<const QScreen*, QRect> maxWindowRects;
 #endif
 
+#ifdef Q_OS_SYMBIAN
+    static QHash<TInt, TUint> scanCodeCache;
+#endif
+
     static QApplicationPrivate *self;
 
     static void giveFocusAccordingToFocusPolicy(QWidget *w,
diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp
index 00695faea5..0f41025538 100644
--- a/src/gui/kernel/qapplication_qws.cpp
+++ b/src/gui/kernel/qapplication_qws.cpp
@@ -163,6 +163,8 @@ bool qws_overrideCursor = false;
 #ifndef QT_NO_QWS_MANAGER
 #include "qdecorationfactory_qws.h"
 
+extern Q_GUI_EXPORT QWSServer *qwsServer;
+
 QT_BEGIN_NAMESPACE
 
 QT_USE_NAMESPACE
@@ -496,8 +498,13 @@ QList<QWSCommand*> *qt_get_server_queue()
 void qt_server_enqueue(const QWSCommand *command)
 {
     QWSCommand *copy = QWSCommand::factory(command->type);
-    copy->copyFrom(command);
-    outgoing.append(copy);
+    QT_TRY {
+        copy->copyFrom(command);
+        outgoing.append(copy);
+    } QT_CATCH(...) {
+        delete copy;
+        QT_RETHROW;
+    }
 }
 
 QWSDisplay::Data::Data(QObject* parent, bool singleProcess)
@@ -2311,7 +2318,7 @@ void qt_init(QApplicationPrivate *priv, int type)
             qws_decoration = QApplication::qwsSetDecoration(decoration);
 #endif // QT_NO_QWS_MANAGER
 #ifndef QT_NO_QWS_INPUTMETHODS
-        qApp->setInputContext(new QWSInputContext);
+        qApp->setInputContext(new QWSInputContext(qApp));
 #endif
     }
 
@@ -3558,10 +3565,10 @@ bool QETWidget::translateKeyEvent(const QWSKeyEvent *event, bool grab) /* grab i
 
 #if defined QT3_SUPPORT && !defined(QT_NO_SHORTCUT)
     if (type == QEvent::KeyPress && !grab
-        && static_cast<QApplicationPrivate*>(qApp->d_ptr)->use_compat()) {
+        && static_cast<QApplicationPrivate*>(qApp->d_ptr.data())->use_compat()) {
         // send accel events if the keyboard is not grabbed
         QKeyEvent a(type, code, state, text, autor, int(text.length()));
-        if (static_cast<QApplicationPrivate*>(qApp->d_ptr)->qt_tryAccelEvent(this, &a))
+        if (static_cast<QApplicationPrivate*>(qApp->d_ptr.data())->qt_tryAccelEvent(this, &a))
             return true;
     }
 #else
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
new file mode 100644
index 0000000000..d47747f039
--- /dev/null
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -0,0 +1,1182 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qapplication_p.h"
+#include "qsessionmanager.h"
+#include "qevent.h"
+#include "qeventdispatcher_s60_p.h"
+#include "qwidget.h"
+#include "qdesktopwidget.h"
+#include "private/qbackingstore_p.h"
+#include "qt_s60_p.h"
+#include "private/qevent_p.h"
+#include "qstring.h"
+#include "qdebug.h"
+#include "qimage.h"
+#include "private/qkeymapper_p.h"
+#include "private/qfont_p.h"
+#ifndef QT_NO_STYLE_S60
+#include "private/qs60style_p.h"
+#endif
+#include "private/qwindowsurface_s60_p.h"
+#include "qpaintengine.h"
+#include "private/qmenubar_p.h"
+
+#include "apgwgnam.h" // For CApaWindowGroupName
+#include <MdaAudioTonePlayer.h>     // For CMdaAudioToneUtility
+
+#if !defined(QT_NO_IM) && defined(Q_WS_S60)
+#include "qinputcontext.h"
+#include <private/qcoefepinputcontext_p.h>
+#endif // !defined(QT_NO_IM) && defined(Q_WS_S60)
+
+#include "private/qstylesheetstyle_p.h"
+
+QT_BEGIN_NAMESPACE
+
+#if defined(QT_DEBUG)
+static bool        appNoGrab        = false;        // Grabbing enabled
+#endif
+
+Q_GUI_EXPORT QS60Data *qt_s60Data = 0;
+extern bool qt_sendSpontaneousEvent(QObject*,QEvent*);
+
+extern QDesktopWidget *qt_desktopWidget; // qapplication.cpp
+
+QWidget *qt_button_down = 0;                     // widget got last button-down
+
+bool qt_nograb()                                // application no-grab option
+{
+#if defined(QT_DEBUG)
+    return appNoGrab;
+#else
+    return false;
+#endif
+}
+
+// Modified from http://www3.symbian.com/faq.nsf/0/0F1464EE96E737E780256D5E00503DD1?OpenDocument
+class QS60Beep : public CBase, public MMdaAudioToneObserver
+{
+public:
+    static QS60Beep* NewL(TInt aFrequency,  TTimeIntervalMicroSeconds iDuration);
+    void Play();
+    ~QS60Beep();
+private:
+    void ConstructL(TInt aFrequency,  TTimeIntervalMicroSeconds iDuration);
+    void MatoPrepareComplete(TInt aError);
+    void MatoPlayComplete(TInt aError);
+private:
+    typedef enum
+        {
+        EBeepNotPrepared,
+        EBeepPrepared,
+        EBeepPlaying
+        } TBeepState;
+private:
+    CMdaAudioToneUtility* iToneUtil;
+    TBeepState iState;
+    TInt iFrequency;
+    TTimeIntervalMicroSeconds iDuration;
+};
+
+QS60Beep::~QS60Beep()
+{
+    delete iToneUtil;   
+}
+
+QS60Beep* QS60Beep::NewL(TInt aFrequency, TTimeIntervalMicroSeconds aDuration)
+{
+    QS60Beep* self=new (ELeave) QS60Beep();
+    CleanupStack::PushL(self);
+    self->ConstructL(aFrequency, aDuration);
+    CleanupStack::Pop();
+    return self;
+};
+
+void QS60Beep::ConstructL(TInt aFrequency, TTimeIntervalMicroSeconds aDuration)
+{
+    iToneUtil=CMdaAudioToneUtility::NewL(*this);
+    iState=EBeepNotPrepared;
+    iFrequency=aFrequency;
+    iDuration=aDuration;
+    iToneUtil->PrepareToPlayTone(iFrequency,iDuration);
+}
+
+void QS60Beep::Play()
+{
+    if(iState!=EBeepNotPrepared){
+        if(iState==EBeepPlaying) {
+            iToneUtil->CancelPlay();
+            iState=EBeepPrepared;
+        }
+    }
+    
+    iToneUtil->Play();
+    iState=EBeepPlaying;
+}
+
+void QS60Beep::MatoPrepareComplete(TInt aError)
+{
+    if(aError==KErrNone) {
+        iState=EBeepPrepared;
+    }
+}
+
+void QS60Beep::MatoPlayComplete(TInt aError)
+{
+    Q_UNUSED(aError);
+    iState=EBeepPrepared;
+}
+
+
+QHash<TInt, TUint> QApplicationPrivate::scanCodeCache;
+
+static Qt::KeyboardModifiers mapToQtModifiers(TUint s60Modifiers)
+{
+    Qt::KeyboardModifiers result = Qt::NoModifier;
+
+    if (s60Modifiers & EModifierKeypad)
+        result |= Qt::KeypadModifier;
+    if (s60Modifiers & EModifierShift || s60Modifiers & EModifierLeftShift
+            || s60Modifiers & EModifierRightShift)
+        result |= Qt::ShiftModifier;
+    if (s60Modifiers & EModifierCtrl || s60Modifiers & EModifierLeftCtrl
+            || s60Modifiers & EModifierRightCtrl)
+        result |= Qt::ControlModifier;
+    if (s60Modifiers & EModifierAlt || s60Modifiers & EModifierLeftAlt
+            || s60Modifiers & EModifierRightAlt)
+        result |= Qt::AltModifier;
+
+    return result;
+}
+
+static void mapS60MouseEventTypeToQt(QEvent::Type *type, Qt::MouseButton *button, const TPointerEvent *pEvent)
+{
+    switch (pEvent->iType) {
+    case TPointerEvent::EButton1Down:
+        *type = QEvent::MouseButtonPress;
+        *button = Qt::LeftButton;
+        break;
+    case TPointerEvent::EButton1Up:
+        *type = QEvent::MouseButtonRelease;
+        *button = Qt::LeftButton;
+        break;
+    case TPointerEvent::EButton2Down:
+        *type = QEvent::MouseButtonPress;
+        *button = Qt::MidButton;
+        break;
+    case TPointerEvent::EButton2Up:
+        *type = QEvent::MouseButtonRelease;
+        *button = Qt::MidButton;
+        break;
+    case TPointerEvent::EButton3Down:
+        *type = QEvent::MouseButtonPress;
+        *button = Qt::RightButton;
+        break;
+    case TPointerEvent::EButton3Up:
+        *type = QEvent::MouseButtonRelease;
+        *button = Qt::RightButton;
+        break;
+    case TPointerEvent::EDrag:
+        *type = QEvent::MouseMove;
+        *button = Qt::NoButton;
+        break;
+    case TPointerEvent::EMove:
+        // Qt makes no distinction between move and drag
+        *type = QEvent::MouseMove;
+        *button = Qt::NoButton;
+        break;
+    default:
+        *type = QEvent::None;
+        *button = Qt::NoButton;
+        break;
+    }
+    if (pEvent->iModifiers & EModifierDoubleClick){
+        *type = QEvent::MouseButtonDblClick;
+    }
+
+    if (*type == QEvent::MouseButtonPress || *type == QEvent::MouseButtonDblClick)
+        QApplicationPrivate::mouse_buttons = QApplicationPrivate::mouse_buttons | (*button);
+    else if (*type == QEvent::MouseButtonRelease)
+        QApplicationPrivate::mouse_buttons = QApplicationPrivate::mouse_buttons &(~(*button));
+
+    QApplicationPrivate::mouse_buttons = QApplicationPrivate::mouse_buttons & Qt::MouseButtonMask;
+}
+
+//### Can be replaced with CAknLongTapDetector if animation is required.
+//NOTE: if CAknLongTapDetector is used make sure it gets variated out of 3.1 and 3.2,.
+//also MLongTapObserver needs to be changed to MAknLongTapDetectorCallBack if CAknLongTapDetector is used.
+class QLongTapTimer : public CTimer
+{
+public:
+    static QLongTapTimer* NewL(QAbstractLongTapObserver *observer);
+    QLongTapTimer(QAbstractLongTapObserver *observer);
+    void ConstructL();
+public:
+    void PointerEventL(const TPointerEvent &event);
+    void RunL();
+protected:
+private:
+    QAbstractLongTapObserver *m_observer;
+    TPointerEvent m_event;
+    QPoint m_pressedCoordinates;
+    int m_dragDistance;
+};
+
+QLongTapTimer* QLongTapTimer::NewL(QAbstractLongTapObserver *observer)
+{
+    QLongTapTimer* self = new QLongTapTimer(observer);
+    self->ConstructL();
+    return self;
+}
+void QLongTapTimer::ConstructL()
+{
+    CTimer::ConstructL();
+}
+
+QLongTapTimer::QLongTapTimer(QAbstractLongTapObserver *observer):CTimer(CActive::EPriorityHigh)
+{
+    m_observer = observer;
+    m_dragDistance = qApp->startDragDistance();
+    CActiveScheduler::Add(this);
+}
+
+void QLongTapTimer::PointerEventL(const TPointerEvent& event)
+{
+    if ( event.iType == TPointerEvent::EDrag || event.iType == TPointerEvent::EButtonRepeat)
+    {
+        QPoint diff(QPoint(event.iPosition.iX,event.iPosition.iY) - m_pressedCoordinates);
+        if (diff.manhattanLength() < m_dragDistance)
+            return;
+    }
+    Cancel();
+    m_event = event;
+    if (event.iType == TPointerEvent::EButton1Down)
+    {   
+        m_pressedCoordinates = QPoint(event.iPosition.iX,event.iPosition.iY);
+        // must be same as KLongTapDelay in aknlongtapdetector.h
+        After(800000);
+    }
+}
+void QLongTapTimer::RunL()
+{
+    if (m_observer)
+        m_observer->HandleLongTapEventL(m_event.iPosition, m_event.iParentPosition);
+}
+
+QSymbianControl::QSymbianControl(QWidget *w)
+    : CCoeControl(), qwidget(w), m_ignoreFocusChanged(false)
+{
+}
+
+void QSymbianControl::ConstructL(bool topLevel, bool desktop)
+{
+    if (!desktop)
+    {
+        if (topLevel)
+            CreateWindowL(S60->windowGroup());
+
+        SetFocusing(true);
+        m_longTapDetector = QLongTapTimer::NewL(this);
+    }
+}
+
+QSymbianControl::~QSymbianControl()
+{
+    S60->appUi()->RemoveFromStack(this);
+    delete m_longTapDetector;
+}
+
+void QSymbianControl::setWidget(QWidget *w)
+{
+    qwidget = w;
+}
+void QSymbianControl::HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& aPenEventScreenLocation )
+{
+    QWidget *alienWidget;
+    QPoint widgetPos = QPoint(aPenEventLocation.iX, aPenEventLocation.iY);
+    QPoint globalPos = QPoint(aPenEventScreenLocation.iX,aPenEventScreenLocation.iY);
+    alienWidget = qwidget->childAt(widgetPos);
+    if (!alienWidget)
+        alienWidget = qwidget;
+    QApplicationPrivate::mouse_buttons = QApplicationPrivate::mouse_buttons &(~Qt::LeftButton);
+    QApplicationPrivate::mouse_buttons = QApplicationPrivate::mouse_buttons | Qt::RightButton;
+    QMouseEvent mEvent(QEvent::MouseButtonPress, alienWidget->mapFrom(qwidget, widgetPos), globalPos,
+        Qt::RightButton, QApplicationPrivate::mouse_buttons, Qt::NoModifier);
+    sendMouseEvent(alienWidget, &mEvent);
+    m_previousEventLongTap = true;
+}
+
+void QSymbianControl::HandlePointerEventL(const TPointerEvent& pEvent)
+{
+    //### refactor me, getting too complex
+    m_longTapDetector->PointerEventL(pEvent);
+    QMouseEvent::Type type;
+    Qt::MouseButton button;
+    mapS60MouseEventTypeToQt(&type, &button, &pEvent);
+
+    if (m_previousEventLongTap)
+        if (type == QEvent::MouseButtonRelease){
+            button = Qt::RightButton;
+            QApplicationPrivate::mouse_buttons = QApplicationPrivate::mouse_buttons & ~Qt::RightButton;
+            m_previousEventLongTap = false;
+        }
+    if (type == QMouseEvent::None)
+        return;
+    
+    // store events for later sending/saving
+    QWidget *alienWidget;
+    typedef QPair<QWidget*,QMouseEvent> Event;
+    QList<Event > events;
+
+    QPoint widgetPos = QPoint(pEvent.iPosition.iX, pEvent.iPosition.iY);
+    TPoint controlScreenPos = PositionRelativeToScreen();
+    QPoint globalPos = QPoint(controlScreenPos.iX, controlScreenPos.iY) + widgetPos;
+    
+    if (type == QEvent::MouseButtonPress || type == QEvent::MouseButtonDblClick)
+    {
+        // get the button press target
+        alienWidget = qwidget->childAt(widgetPos);
+        if (!alienWidget)
+            alienWidget = qwidget;
+        S60->mousePressTarget = alienWidget;
+        //pointer grab
+        SetGloballyCapturing(ETrue);
+        SetPointerCapture(ETrue);
+    }
+    else if (type == QEvent::MouseButtonRelease)
+    {
+        //release pointer grab
+        SetGloballyCapturing(EFalse);
+        SetPointerCapture(EFalse);
+    }
+    alienWidget = S60->mousePressTarget;
+
+    if (alienWidget != S60->lastPointerEventTarget)
+        if (type == QEvent::MouseButtonPress || type == QEvent::MouseButtonDblClick || type == QEvent::MouseMove)
+        {
+            //moved to another widget, create enter and leave events
+            if (S60->lastPointerEventTarget)
+            {
+                QMouseEvent mEventLeave(QEvent::Leave, S60->lastPointerEventTarget->mapFromGlobal(S60->lastCursorPos), S60->lastCursorPos,
+                    button, QApplicationPrivate::mouse_buttons, mapToQtModifiers(pEvent.iModifiers));
+                events.append(Event(S60->lastPointerEventTarget,mEventLeave));
+            }
+            QMouseEvent mEventEnter(QEvent::Enter, alienWidget->mapFromGlobal(globalPos), globalPos,
+                button, QApplicationPrivate::mouse_buttons, mapToQtModifiers(pEvent.iModifiers));        
+
+            events.append(Event(alienWidget,mEventEnter));
+        }
+    S60->lastCursorPos = globalPos;
+    S60->lastPointerEventPos = widgetPos;
+    S60->lastPointerEventTarget = alienWidget;
+    if (alienWidget)
+    {
+        QMouseEvent mEvent(type, alienWidget->mapFromGlobal(globalPos), globalPos,
+            button, QApplicationPrivate::mouse_buttons, mapToQtModifiers(pEvent.iModifiers));
+        events.append(Event(alienWidget,mEvent));
+        QEventDispatcherS60 *dispatcher;
+        // It is theoretically possible for someone to install a different event dispatcher.
+        if ((dispatcher = qobject_cast<QEventDispatcherS60 *>(alienWidget->d_func()->threadData->eventDispatcher)) != 0) {
+            if (dispatcher->excludeUserInputEvents()) {
+                for (int i=0;i < events.count();++i)
+                {
+                    Event next = events[i];
+                    dispatcher->saveInputEvent(this, next.first, new QMouseEvent(next.second));
+                }
+                return;
+            }
+        }
+    }
+    for (int i=0;i < events.count();++i)
+    {
+        Event next = events[i];
+        sendMouseEvent(next.first, &(next.second));
+    }
+}
+
+void QSymbianControl::sendMouseEvent(QWidget *widget, QMouseEvent *mEvent)
+{
+    qt_sendSpontaneousEvent(widget, mEvent);
+}
+
+TKeyResponse QSymbianControl::OfferKeyEventL(const TKeyEvent& keyEvent, TEventCode type)
+{
+    TKeyResponse r = EKeyWasNotConsumed;
+    QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(r = OfferKeyEvent(keyEvent, type));
+    return r;
+}
+
+TKeyResponse QSymbianControl::OfferKeyEvent(const TKeyEvent& keyEvent, TEventCode type)
+{
+    switch (type) {
+    //case EEventKeyDown: // <-- Intentionally left out. See below.
+    case EEventKeyUp:
+    case EEventKey:
+    {
+        // S60 has a confusing way of delivering key events. There are three types of
+        // events: EKeyEvent, EKeyEventDown and EKeyEventUp. When a key is pressed, the
+        // two first events are generated. When releasing the key, the last one is
+        // generated.
+        // Because S60 does not generate keysyms for EKeyEventDown and EKeyEventUp events,
+        // we need to do some special tricks to map it to the Qt way. First, we completely
+        // discard EKeyEventDown events, since they are redundant. Second, since
+        // EKeyEventUp does not give us a keysym, we need to cache the keysyms from
+        // the EKeyEvent events. This is what resolveS60ScanCode does.
+
+
+        // ### hackish way to send Qt application to background when pressing right softkey
+        /*
+        if( keyEvent.iScanCode == EStdKeyDevice1 ) {
+            S60->window_group->SetOrdinalPosition(-1);
+            qApp->setActiveWindow(0);
+            return EKeyWasNotConsumed;
+        }
+        */
+
+        TUint s60Keysym = QApplicationPrivate::resolveS60ScanCode(keyEvent.iScanCode,
+                keyEvent.iCode);
+        int keyCode;
+        if (s60Keysym >= 0x20 && s60Keysym < ENonCharacterKeyBase) {
+            // Normal characters keys.
+            keyCode = s60Keysym;
+        } else {
+            // Special S60 keys.
+            keyCode = qt_keymapper_private()->mapS60KeyToQt(s60Keysym);
+        }
+        Qt::KeyboardModifiers mods = mapToQtModifiers(keyEvent.iModifiers);
+        QKeyEventEx qKeyEvent(type == EEventKeyUp ? QEvent::KeyRelease : QEvent::KeyPress, keyCode,
+                mods, qt_keymapper_private()->translateKeyEvent(keyCode, mods),
+                false, 1, keyEvent.iScanCode, s60Keysym, mods);
+//        WId wid = reinterpret_cast<RWindowGroup *>(keyEvent.Handle())->Child();
+//        if (!wid)
+//             Could happen if window isn't shown yet.
+//            return EKeyWasNotConsumed;
+        QWidget *widget;
+        widget = QWidget::keyboardGrabber();
+        if (!widget) {
+            if (QApplicationPrivate::popupWidgets != 0) {
+                widget = QApplication::activePopupWidget()->focusWidget();
+                if (!widget) {
+                    widget = QApplication::activePopupWidget();
+                }
+            } else {
+                widget = QApplicationPrivate::focus_widget;
+                if (!widget) {
+                    widget = qwidget;
+                }
+            }
+        }
+
+        QEventDispatcherS60 *dispatcher;
+        // It is theoretically possible for someone to install a different event dispatcher.
+        if ((dispatcher = qobject_cast<QEventDispatcherS60 *>(widget->d_func()->threadData->eventDispatcher)) != 0) {
+            if (dispatcher->excludeUserInputEvents()) {
+                dispatcher->saveInputEvent(this, widget, new QKeyEventEx(qKeyEvent));
+                return EKeyWasConsumed;
+            }
+        }
+        return sendKeyEvent(widget, &qKeyEvent);
+    }
+    }
+    return EKeyWasNotConsumed;
+}
+
+void QSymbianControl::sendInputEvent(QWidget *widget, QInputEvent *inputEvent)
+{
+    switch (inputEvent->type()) {
+    case QEvent::KeyPress:
+    case QEvent::KeyRelease:
+        sendKeyEvent(widget, static_cast<QKeyEvent *>(inputEvent));
+        break;
+    case QEvent::MouseButtonDblClick:
+    case QEvent::MouseButtonPress:
+    case QEvent::MouseButtonRelease:
+    case QEvent::MouseMove:
+        sendMouseEvent(widget, static_cast<QMouseEvent *>(inputEvent));
+        break;
+    default:
+        // Shouldn't get here.
+        Q_ASSERT_X(0 == 1, "QSymbianControl::sendInputEvent()", "inputEvent->type() is unknown");
+        break;
+    }
+}
+
+TKeyResponse QSymbianControl::sendKeyEvent(QWidget *widget, QKeyEvent *keyEvent)
+{
+#if !defined(QT_NO_IM) && defined(Q_WS_S60)
+    if (widget && widget->isEnabled() && widget->testAttribute(Qt::WA_InputMethodEnabled)) {
+        QInputContext *qic = widget->inputContext();
+        if(qic && qic->filterEvent(keyEvent))
+            return EKeyWasConsumed;
+    }
+#endif // !defined(QT_NO_IM) && defined(Q_WS_S60)
+
+    if (widget && qt_sendSpontaneousEvent(widget, keyEvent))
+        if (keyEvent->isAccepted())
+            return EKeyWasConsumed;
+
+    return EKeyWasNotConsumed;
+}
+
+#if !defined(QT_NO_IM) && defined(Q_WS_S60)
+TCoeInputCapabilities QSymbianControl::InputCapabilities() const
+{
+    QWidget *w = 0;
+
+    if(qwidget->hasFocus()) {
+        w = qwidget;
+    } else {
+        w = qwidget->focusWidget();
+    }
+
+    QCoeFepInputContext *ic;
+    if (w && w->isEnabled() && w->testAttribute(Qt::WA_InputMethodEnabled)
+            && (ic = qobject_cast<QCoeFepInputContext *>(w->inputContext()))) {
+        return ic->inputCapabilities();
+    } else {
+        return TCoeInputCapabilities(TCoeInputCapabilities::ENone, 0, 0);
+    }
+}
+#endif
+
+void QSymbianControl::Draw(const TRect& r) const
+{
+    QWindowSurface *surface = qwidget->windowSurface();
+    if (!surface)
+        return;
+
+    QPaintEngine *engine = surface->paintDevice()->paintEngine();
+    if (!engine)
+        return;
+    if (engine->type() == QPaintEngine::Raster) {
+        QS60WindowSurface *s60Surface = static_cast<QS60WindowSurface *>(qwidget->windowSurface());
+        CFbsBitmap *bitmap = s60Surface->symbianBitmap();
+        CWindowGc &gc = SystemGc();
+        if (qwidget->d_func()->isOpaque)
+            gc.SetDrawMode(CGraphicsContext::EDrawModeWriteAlpha);
+        gc.BitBlt(r.iTl, bitmap, r);
+    } else {
+        surface->flush(qwidget, QRegion(qt_TRect2QRect(r)), QPoint());
+    }
+}
+
+void QSymbianControl::SizeChanged()
+{
+    CCoeControl::SizeChanged();
+
+    QSize oldSize = qwidget->size();
+    QSize newSize(Size().iWidth, Size().iHeight);
+
+    if (oldSize != newSize) {
+        QRect cr = qwidget->geometry();
+        cr.setSize(newSize);
+        qwidget->data->crect = cr;
+        if (qwidget->isVisible()) {
+            QTLWExtra *tlwExtra = qwidget->d_func()->maybeTopData();
+            bool slowResize = qgetenv("QT_SLOW_TOPLEVEL_RESIZE").toInt();
+            if (!slowResize && tlwExtra)
+                tlwExtra->inTopLevelResize = true;
+            QResizeEvent e(newSize, oldSize);
+            qt_sendSpontaneousEvent(qwidget, &e);
+            if (!qwidget->testAttribute(Qt::WA_StaticContents))
+                qwidget->d_func()->syncBackingStore();
+            if (!slowResize && tlwExtra)
+                tlwExtra->inTopLevelResize = false;
+        }
+    }
+}
+
+void QSymbianControl::PositionChanged()
+{
+    CCoeControl::PositionChanged();
+
+    QPoint oldPos = qwidget->geometry().topLeft();
+    QPoint newPos(Position().iX, Position().iY);
+
+    if (oldPos != newPos) {
+        QRect cr = qwidget->geometry();
+        cr.moveTopLeft(newPos);
+        qwidget->data->crect = cr;
+        QTLWExtra *top = qwidget->d_func()->maybeTopData();
+        if (top)
+            top->normalGeometry = cr;
+        if (qwidget->isVisible()) {
+            QMoveEvent e(newPos, oldPos);
+            qt_sendSpontaneousEvent(qwidget, &e);
+        } else {
+            QMoveEvent * e = new QMoveEvent(newPos, oldPos);
+            QApplication::postEvent(qwidget, e);
+        }
+    }
+}
+
+void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */)
+{
+    if (m_ignoreFocusChanged)
+        return;
+
+    // Popups never get focused, but still receive the FocusChanged when they are hidden.
+    if (QApplicationPrivate::popupWidgets != 0
+            || (qwidget->windowType() & Qt::Popup) == Qt::Popup)
+        return;
+
+    QEvent *deferredFocusEvent = new QEvent(QEvent::SymbianDeferredFocusChanged);
+    QApplication::postEvent(qwidget, deferredFocusEvent);
+}
+
+void QSymbianControl::HandleResourceChange(int resourceType)
+{
+    switch (resourceType) {
+    case KInternalStatusPaneChange:
+    	qwidget->d_func()->setWindowIcon_sys(true);
+    	break;
+    case KUidValueCoeFontChangeEvent:
+        // font change event
+        break;
+#ifdef Q_WS_S60
+    case KEikDynamicLayoutVariantSwitch:
+    {        
+        if (qwidget->isFullScreen()) {
+            SetExtentToWholeScreen();
+        } else if (qwidget->isMaximized()) {
+            TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
+            SetExtent(r.iTl, r.Size());
+        }
+        break;
+    }
+#endif
+    default:
+        break;
+    }
+
+    CCoeControl::HandleResourceChange(resourceType);
+
+}
+void QSymbianControl::CancelLongTapTimer()
+{
+    m_longTapDetector->Cancel();
+}
+
+TTypeUid::Ptr QSymbianControl::MopSupplyObject(TTypeUid id)
+{
+    if (id.iUid == ETypeId)
+        return id.MakePtr(this);
+
+    return CCoeControl::MopSupplyObject(id);
+}
+
+void qt_init(QApplicationPrivate * /* priv */, int)
+{
+    S60 = new QS60Data;
+
+#ifdef QT_NO_DEBUG
+    if (!qgetenv("QT_S60_AUTO_FLUSH_WSERV").isEmpty())
+#endif
+        S60->wsSession().SetAutoFlush(ETrue);
+
+    S60->updateScreenSize();
+
+
+    TDisplayMode mode = S60->screenDevice()->DisplayMode();
+    S60->screenDepth = TDisplayModeUtils::NumDisplayModeBitsPerPixel(mode);
+
+    RProcess me;
+    TSecureId securId = me.SecureId();
+    S60->uid = securId.operator TUid();
+
+    // New code to configure the window group name such that window server knows the associated application's UID
+    CApaWindowGroupName *wgn = CApaWindowGroupName::NewL(S60->wsSession());
+    wgn->SetAppUid(S60->uid);
+    User::LeaveIfError(wgn->SetWindowGroupName((S60->windowGroup())));
+    delete wgn;
+
+/*
+ ### Commented out for now as parameter handling not needed in SOS(yet). Code below will break testlib with -o flag
+    int argc = priv->argc;
+    char **argv = priv->argv;
+
+    // Get command line params
+    int j = argc ? 1 : 0;
+    for (int i=1; i<argc; i++) {
+        if (argv[i] && *argv[i] != '-') {
+            argv[j++] = argv[i];
+            continue;
+        }
+
+#if defined(QT_DEBUG)
+        if (qstrcmp(argv[i], "-nograb") == 0)
+            appNoGrab = !appNoGrab;
+        else
+#endif // QT_DEBUG
+            ;
+    }
+*/
+}
+
+/*****************************************************************************
+  qt_cleanup() - cleans up when the application is finished
+ *****************************************************************************/
+void qt_cleanup()
+{
+    QFontCache::cleanup(); // Has to happen now, since QFontEngineS60 has FBS handles
+// S60 structure and window server session are freed in eventdispatcher destructor as they are needed there
+
+    // It's important that this happens here, before the event dispatcher gets
+    // deleted, because the input context needs the event loop one last time before
+    // it dies.
+    delete QApplicationPrivate::inputContext;
+    QApplicationPrivate::inputContext = 0;
+}
+
+void QApplicationPrivate::initializeWidgetPaletteHash()
+{
+    // TODO: Implement QApplicationPrivate::initializeWidgetPaletteHash()
+    // Possibly a task fot the S60Style guys
+}
+
+void QApplicationPrivate::createEventDispatcher()
+{
+    Q_Q(QApplication);
+    eventDispatcher = new QEventDispatcherS60(q);
+}
+
+QString QApplicationPrivate::appName() const
+{
+    return QCoreApplicationPrivate::appName();
+}
+
+bool QApplicationPrivate::modalState()
+{
+    return false;
+}
+
+void QApplicationPrivate::enterModal_sys(QWidget * /* widget */)
+{
+    // TODO: Implement QApplicationPrivate::enterModal_sys(QWidget *widget)
+}
+
+void QApplicationPrivate::leaveModal_sys(QWidget * /* widget */)
+{
+    // TODO: Implement QApplicationPrivate::leaveModal_sys(QWidget *widget)
+}
+
+void QApplicationPrivate::openPopup(QWidget *popup)
+{
+    if (!QApplicationPrivate::popupWidgets)
+        QApplicationPrivate::popupWidgets = new QWidgetList;
+    QApplicationPrivate::popupWidgets->append(popup);
+
+    if (QApplicationPrivate::popupWidgets->count() == 1 && !qt_nograb()) {
+        Q_ASSERT(popup->testAttribute(Qt::WA_WState_Created));
+        WId id = popup->effectiveWinId();
+        id->SetPointerCapture(true);
+        id->SetGloballyCapturing(true);
+    }
+
+    // popups are not focus-handled by the window system (the first
+    // popup grabbed the keyboard), so we have to do that manually: A
+    // new popup gets the focus
+    if (QApplication::focusWidget())
+        static_cast<QSymbianControl*>(QApplication::focusWidget()->effectiveWinId())->CancelLongTapTimer();
+    QWidget *fw = popup->focusWidget();
+    if (fw) {
+        fw->setFocus(Qt::PopupFocusReason);
+    } else if (QApplicationPrivate::popupWidgets->count() == 1) { // this was the first popup
+        fw = QApplication::focusWidget();
+        if (fw) {
+            QFocusEvent e(QEvent::FocusOut, Qt::PopupFocusReason);
+            q_func()->sendEvent(fw, &e);
+        }
+    }
+}
+
+void QApplicationPrivate::closePopup(QWidget *popup)
+{
+    if (!QApplicationPrivate::popupWidgets)
+        return;
+    QApplicationPrivate::popupWidgets->removeAll(popup);
+
+    if (QApplicationPrivate::popupWidgets->isEmpty()) { // this was the last popup
+        delete QApplicationPrivate::popupWidgets;
+        QApplicationPrivate::popupWidgets = 0;
+        if (!qt_nograb()) {                        // grabbing not disabled
+            Q_ASSERT(popup->testAttribute(Qt::WA_WState_Created));
+            WId id = popup->effectiveWinId();
+            id->SetPointerCapture(false);
+            id->SetGloballyCapturing(false);
+            if (QWidgetPrivate::mouseGrabber != 0)
+                QWidgetPrivate::mouseGrabber->grabMouse();
+
+            if (QWidgetPrivate::keyboardGrabber != 0)
+                QWidgetPrivate::keyboardGrabber->grabKeyboard();
+
+        QWidget *fw = QApplicationPrivate::active_window ? QApplicationPrivate::active_window->focusWidget()
+              : q_func()->focusWidget();
+          if (fw) {
+              if (fw != q_func()->focusWidget()) {
+                  fw->setFocus(Qt::PopupFocusReason);
+              } else {
+                  QFocusEvent e(QEvent::FocusIn, Qt::PopupFocusReason);
+                  q_func()->sendEvent(fw, &e);
+              }
+          }
+        }
+    } else {
+        // popups are not focus-handled by the window system (the
+        // first popup grabbed the keyboard), so we have to do that
+        // manually: A popup was closed, so the previous popup gets
+        // the focus.
+        QWidget* aw = QApplicationPrivate::popupWidgets->last();
+        if (QWidget *fw = QApplication::focusWidget()) {
+            QFocusEvent e(QEvent::FocusOut, Qt::PopupFocusReason);
+            q_func()->sendEvent(fw, &e);
+        }
+    }
+}
+
+QWidget * QApplication::topLevelAt(QPoint const& point)
+{
+    QWidget *found = 0;
+    int lowestZ = INT_MAX;
+    QWidgetList list = QApplication::topLevelWidgets();
+    for (int i = 0; i < list.count(); ++i) {
+        QWidget *widget = list.at(i);
+        if (widget->isVisible() && !(widget->windowType() == Qt::Desktop)) {
+            Q_ASSERT(widget->testAttribute(Qt::WA_WState_Created));
+            if (widget->geometry().adjusted(0,0,1,1).contains(point)) {
+                // At this point we know there is a Qt widget under the point.
+                // Now we need to make sure it is the top most in the z-order.
+                RDrawableWindow* rw = widget->d_func()->topData()->rwindow;
+                int z = rw->OrdinalPosition();
+                if (z < lowestZ) {
+                    lowestZ = z;
+                    found = widget;
+                }
+            }
+            }
+    }
+    return found;
+}
+
+void QApplication::alert(QWidget * /* widget */, int /* duration */)
+{
+    // TODO: Implement QApplication::alert(QWidget *widget, int duration)
+}
+
+int QApplication::doubleClickInterval()
+{
+    TTimeIntervalMicroSeconds32 us;
+    TInt distance;
+    S60->wsSession().GetDoubleClickSettings(us, distance);
+    return (us.Int() / 1000);
+}
+
+void QApplication::setDoubleClickInterval(int ms)
+{
+    TTimeIntervalMicroSeconds32 newUs( ms * 1000);
+    TTimeIntervalMicroSeconds32 us;
+    TInt distance;
+    S60->wsSession().GetDoubleClickSettings(us, distance);
+    if (us != newUs)
+        S60->wsSession().SetDoubleClick(newUs, distance);
+}
+
+int QApplication::keyboardInputInterval()
+{
+    return QApplicationPrivate::keyboard_input_time;
+}
+
+void QApplication::setKeyboardInputInterval(int ms)
+{
+    QApplicationPrivate::keyboard_input_time = ms;
+}
+
+int QApplication::cursorFlashTime()
+{
+    return QApplicationPrivate::cursor_flash_time;
+}
+
+void QApplication::setCursorFlashTime(int msecs)
+{
+    QApplicationPrivate::cursor_flash_time = msecs;
+}
+
+void QApplication::beep()
+{
+    TInt frequency=440;
+    TTimeIntervalMicroSeconds duration(500000);
+    QS60Beep* beep=NULL;
+    TRAPD(err, beep=QS60Beep::NewL(frequency, duration));
+    if(!err) {
+        beep->Play();    
+    }
+    delete beep;
+    beep=NULL;       
+}
+
+int QApplication::s60ProcessEvent(TWsEvent *event)
+{
+    bool handled = s60EventFilter(event);
+    if (handled)
+        return 1;
+
+    // Qt event handling. Handle some events regardless of if the handle is in our
+    // widget map or not.
+    CCoeControl* control = reinterpret_cast<CCoeControl*>(event->Handle());
+    const bool controlInMap = QWidgetPrivate::mapper && QWidgetPrivate::mapper->contains(control);
+    switch (event->Type()) {
+#if !defined(QT_NO_IM) && defined(Q_WS_S60)
+    case EEventKey:
+    case EEventKeyUp:
+    case EEventKeyDown:
+    {
+        // The control doesn't seem to be any of our widgets, so rely on the focused
+        // widget instead. If the user needs the control, it can be found inside the
+        // event structure.
+        QWidget *w = qApp ? qApp->focusWidget() : 0;
+        if (w) {
+            QInputContext *ic = w->inputContext();
+            if (ic && ic->s60FilterEvent(w, event)) {
+                return 1;
+            } else {
+                return 0;
+            }
+        }
+        break;
+    }
+#endif
+    case EEventPointerEnter:
+        if (controlInMap)
+            return 1; // Qt::Enter will be generated in HandlePointerL
+        break;
+    case EEventPointerExit:
+        if (controlInMap) {
+            if (S60) {
+                // mouseEvent outside our window, send leave event to last focused widget
+                QMouseEvent mEvent(QEvent::Leave, S60->lastPointerEventPos, S60->lastCursorPos,
+                    Qt::NoButton, QApplicationPrivate::mouse_buttons, Qt::NoModifier);
+                if (S60->lastPointerEventTarget)
+                    qt_sendSpontaneousEvent(S60->lastPointerEventTarget,&mEvent);
+                S60->lastPointerEventTarget = 0;
+            }
+            return 1;
+        }
+        break;
+    case EEventScreenDeviceChanged:
+        if (S60)
+            S60->updateScreenSize();
+        if (qt_desktopWidget) {
+            QSize oldSize = qt_desktopWidget->size();
+            qt_desktopWidget->data->crect.setWidth(S60->screenWidthInPixels);
+            qt_desktopWidget->data->crect.setHeight(S60->screenHeightInPixels);
+            QResizeEvent e(qt_desktopWidget->size(), oldSize);
+            QApplication::sendEvent(qt_desktopWidget, &e);
+        }
+        return 0; // Propagate to CONE
+    case EEventWindowVisibilityChanged:
+        if (controlInMap) {
+            const TWsVisibilityChangedEvent *visChangedEvent = event->VisibilityChanged();
+            QWidget *w = QWidgetPrivate::mapper->value(control);
+            if (!w->d_func()->maybeTopData())
+                break;
+            if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible) {
+                delete w->d_func()->topData()->backingStore;
+                w->d_func()->topData()->backingStore = 0;
+            } else if ((visChangedEvent->iFlags & TWsVisibilityChangedEvent::EPartiallyVisible)
+                       && !w->d_func()->maybeBackingStore()) {
+                w->d_func()->topData()->backingStore = new QWidgetBackingStore(w);
+                w->update();
+            }
+            return 1;
+        }
+        break;
+    default:
+        break;
+    }
+
+    if (!controlInMap)
+        return -1;
+
+    return 0;
+}
+
+bool QApplication::s60EventFilter(TWsEvent * /* aEvent */)
+{
+    return false;
+}
+
+/*!
+    Handles commands which are typically handled by CAknAppUi::HandleCommandL()
+    Qts Ui integration into Symbian is partially achieved by deriving from CAknAppUi.
+    Currently, exit, menu and softkey commands are handled
+
+    \sa s60EventFilter(), s60ProcessEvent()
+*/
+void QApplication::symbianHandleCommand(int command)
+{
+    switch (command) {
+    case EEikCmdExit:
+#ifdef Q_WS_S60
+    case EAknSoftkeyExit:
+#endif
+        exit();
+        break;
+    default:
+        if (command >= SOFTKEYSTART && command <= SOFTKEYEND) {
+            int index= command-SOFTKEYSTART;
+            QWidget *focused = QApplication::focusWidget();
+            QWidget *softKeySource = focused ? focused : QApplication::activeWindow();
+            const QList<QAction*>& softKeys = softKeySource->softKeys();
+            Q_ASSERT(index < softKeys.count());
+            softKeys.at(index)->activate(QAction::Trigger);
+        }
+#ifdef Q_WS_S60
+        else
+            QMenuBarPrivate::symbianCommands(command);
+#endif
+        break;
+    }
+}
+
+void QApplication::symbianResourceChange(int type)
+{
+    switch (type) {
+#ifdef Q_WS_S60
+    case KEikDynamicLayoutVariantSwitch:
+        {
+        if (S60)
+            S60->updateScreenSize();            
+        
+#ifndef QT_NO_STYLE_S60
+        QS60Style *s60Style = 0;
+
+#ifndef QT_NO_STYLE_STYLESHEET
+        QStyleSheetStyle *proxy = qobject_cast<QStyleSheetStyle*>(QApplication::style());
+        if (proxy)
+            s60Style = qobject_cast<QS60Style*>(proxy->baseStyle());
+        else
+#endif
+            s60Style = qobject_cast<QS60Style*>(QApplication::style());
+
+        if (s60Style)
+            s60Style->handleDynamicLayoutVariantSwitch();
+#endif    
+        }
+        break;
+
+#ifndef QT_NO_STYLE_S60
+    case KAknsMessageSkinChange:
+        if (QS60Style *s60Style = qobject_cast<QS60Style*>(QApplication::style()))
+            s60Style->handleSkinChange();
+        break; 
+#endif
+#endif // Q_WS_S60
+    default:
+        break;
+    }
+}
+
+#ifndef QT_NO_WHEELEVENT
+int QApplication::wheelScrollLines()
+{
+    return QApplicationPrivate::wheel_scroll_lines;
+}
+
+void QApplication::setWheelScrollLines(int n)
+{
+    QApplicationPrivate::wheel_scroll_lines = n;
+}
+#endif //QT_NO_WHEELEVENT
+
+bool QApplication::isEffectEnabled(Qt::UIEffect /* effect */)
+{
+    // TODO: Implement QApplication::isEffectEnabled(Qt::UIEffect effect)
+    return false;
+}
+
+void QApplication::setEffectEnabled(Qt::UIEffect /* effect */, bool /* enable */)
+{
+    // TODO: Implement QApplication::setEffectEnabled(Qt::UIEffect effect, bool enable)
+}
+
+TUint QApplicationPrivate::resolveS60ScanCode(TInt scanCode, TUint keysym)
+{
+    if (keysym) {
+        // If keysym is specified, cache it.
+        scanCodeCache.insert(scanCode, keysym);
+        return keysym;
+    } else {
+        // If not, retrieve the cached version.
+        return scanCodeCache[scanCode];
+    }
+}
+
+
+void QApplicationPrivate::initializeMultitouch_sys()
+{ }
+void QApplicationPrivate::cleanupMultitouch_sys()
+{ }
+
+#ifndef QT_NO_SESSIONMANAGER
+QSessionManager::QSessionManager(QApplication * /* app */, QString & /* id */, QString& /* key */)
+{
+
+}
+
+QSessionManager::~QSessionManager()
+{
+
+}
+
+bool QSessionManager::allowsInteraction()
+{
+    return false;
+}
+
+void QSessionManager::cancel()
+{
+
+}
+#endif //QT_NO_SESSIONMANAGER
+QT_END_NAMESPACE
+
+
diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp
new file mode 100644
index 0000000000..db5e7f3ae0
--- /dev/null
+++ b/src/gui/kernel/qclipboard_s60.cpp
@@ -0,0 +1,277 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qclipboard.h"
+
+#ifndef QT_NO_CLIPBOARD
+
+#include "qapplication.h"
+#include "qbitmap.h"
+#include "qdatetime.h"
+#include "qbuffer.h"
+#include "qwidget.h"
+#include "qevent.h"
+#include <QtDebug>
+
+// Symbian's clipboard
+#include <baclipb.h>
+QT_BEGIN_NAMESPACE
+
+//###  Mime Type mapping to UIDs
+
+const TUid KQtCbDataStream = {0x666777};
+
+
+class QClipboardData
+{
+public:
+    QClipboardData();
+   ~QClipboardData();
+
+    void setSource(QMimeData* s)
+    {
+        if (s == src)
+            return;
+        delete src;
+        src = s;
+    }
+    QMimeData* source()
+    { return src; }
+    bool connected()
+    { return connection; }    
+    void clear();
+    RFs fsSession();
+    
+
+private:
+    QMimeData* src;
+    RFs iFs;
+    bool connection;
+};
+
+QClipboardData::QClipboardData():src(0),connection(true)
+{
+    clear();
+    if (KErrNone != iFs.Connect())
+    {
+        qWarning("QClipboardData::fileserver connnect failed");
+        connection = false;
+    }
+}
+
+QClipboardData::~QClipboardData()
+{
+    iFs.Close();
+    connection = false;
+    delete src;
+}
+
+void QClipboardData::clear()
+{
+    QMimeData* newSrc = new QMimeData;
+    delete src;
+    src = newSrc;
+}
+RFs QClipboardData::fsSession()
+{
+    return iFs;
+}
+
+static QClipboardData *internalCbData = 0;
+
+static void cleanupClipboardData()
+{
+    delete internalCbData;
+    internalCbData = 0;
+}
+
+static QClipboardData *clipboardData()
+{
+    if (internalCbData == 0) {
+        internalCbData = new QClipboardData;
+        if (internalCbData)
+        {
+            if (!internalCbData->connected())
+            {
+                delete internalCbData;
+                internalCbData = 0;
+            }
+            else 
+            {
+                qAddPostRoutine(cleanupClipboardData);
+            }
+        }
+    }
+    return internalCbData;
+}
+
+void writeToStream(const QMimeData* aData, RWriteStream& aStream)
+{
+    QStringList headers = aData->formats();
+    aStream << TCardinality(headers.count());
+    for (QStringList::const_iterator iter= headers.constBegin();iter != headers.constEnd();iter++)
+    {
+        HBufC* stringData = TPtrC(reinterpret_cast<const TUint16*>((*iter).utf16())).AllocLC();
+        QByteArray ba = aData->data((*iter));
+        qDebug() << "copy to clipboard mime: " << *iter << " data: " << ba;
+        // mime type
+        aStream << TCardinality(stringData->Size());
+        aStream << *(stringData);
+        // mime data
+        aStream << TCardinality(ba.size());
+        aStream.WriteL(reinterpret_cast<const uchar*>(ba.constData()),ba.size());
+        CleanupStack::PopAndDestroy(stringData);
+    }    
+}
+
+void readFromStream(QMimeData* aData,RReadStream& aStream)
+{
+    TCardinality mimeTypeCount;
+    aStream >> mimeTypeCount;    
+    for (int i = 0; i< mimeTypeCount;i++)
+    {
+        // mime type
+        TCardinality mimeTypeSize;
+        aStream >> mimeTypeSize;
+        HBufC* mimeTypeBuf = HBufC::NewLC(aStream,mimeTypeSize);
+        QString mimeType = QString::fromUtf16(mimeTypeBuf->Des().Ptr(),mimeTypeBuf->Length());
+        // mime data
+        TCardinality dataSize;
+        aStream >> dataSize;
+        QByteArray ba;
+        ba.reserve(dataSize);
+        aStream.ReadL(reinterpret_cast<uchar*>(ba.data_ptr()->data),dataSize);
+        ba.data_ptr()->size = dataSize;
+        qDebug() << "paste from clipboard mime: " << mimeType << " data: " << ba;
+        aData->setData(mimeType,ba);
+        CleanupStack::PopAndDestroy(mimeTypeBuf);
+
+    }
+}
+
+
+/*****************************************************************************
+  QClipboard member functions
+ *****************************************************************************/
+
+void QClipboard::clear(Mode mode)
+{
+    setText(QString(), mode);
+}
+const QMimeData* QClipboard::mimeData(Mode mode) const
+{
+    if (mode != Clipboard) return 0;
+    QClipboardData *d = clipboardData();
+    if (d)
+    {
+        //###fixme when exceptions are added to Qt
+        TRAPD(err,{
+            RFs fs = d->fsSession();
+            CClipboard* cb = CClipboard::NewForReadingLC(fs);
+            Q_ASSERT(cb);
+            RStoreReadStream stream;
+            TStreamId stid = (cb->StreamDictionary()).At(KQtCbDataStream);
+            stream.OpenLC(cb->Store(),stid);
+            readFromStream(d->source(),stream);
+            CleanupStack::PopAndDestroy(2,cb);
+            return d->source();
+        });
+        if (err != KErrNone){
+            qDebug()<< "clipboard is empty/err: " << err;
+        }
+            
+    }
+    return 0;
+}
+
+
+void QClipboard::setMimeData(QMimeData* src, Mode mode)
+{
+    if (mode != Clipboard) return;
+    QClipboardData *d = clipboardData();
+    if (d)
+    {
+        //###fixme when exceptions are added to Qt
+        TRAPD(err,{
+            RFs fs = d->fsSession();
+            CClipboard* cb = CClipboard::NewForWritingLC(fs);
+            RStoreWriteStream  stream;
+            TStreamId stid = stream.CreateLC(cb->Store());
+            writeToStream(src,stream);
+            d->setSource(src);
+            stream.CommitL();
+            (cb->StreamDictionary()).AssignL(KQtCbDataStream,stid);
+            cb->CommitL();
+            CleanupStack::PopAndDestroy(2,cb);
+        });
+        if (err != KErrNone){
+            qDebug()<< "clipboard write err :" << err;
+        }
+    }
+    emitChanged(QClipboard::Clipboard);      
+}
+
+bool QClipboard::supportsMode(Mode mode) const
+{
+    return (mode == Clipboard);
+}
+
+bool QClipboard::ownsMode(Mode mode) const
+{
+    if (mode == Clipboard)
+        qWarning("QClipboard::ownsClipboard: UNIMPLEMENTED!");
+    return false;
+}
+
+bool QClipboard::event(QEvent * /* e */)
+{
+    return true;
+}
+
+void QClipboard::connectNotify( const char * )
+{
+}
+
+void QClipboard::ownerDestroyed()
+{
+}
+QT_END_NAMESPACE
+#endif // QT_NO_CLIPBOARD
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index 0b47b6f56d..e5ca196823 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -561,7 +561,6 @@ QCursor::operator QVariant() const
 {
     return QVariant(QVariant::Cursor, this);
 }
-
+QT_END_NAMESPACE
 #endif // QT_NO_CURSOR
 
-QT_END_NAMESPACE
diff --git a/src/gui/kernel/qcursor_qws.cpp b/src/gui/kernel/qcursor_qws.cpp
index 7553415d79..efbfcc5b6d 100644
--- a/src/gui/kernel/qcursor_qws.cpp
+++ b/src/gui/kernel/qcursor_qws.cpp
@@ -66,7 +66,11 @@ QCursorData::~QCursorData()
 {
     delete bm;
     delete bmm;
-    QPaintDevice::qwsDisplay()->destroyCursor(id);
+    QT_TRY {
+        QPaintDevice::qwsDisplay()->destroyCursor(id);
+    } QT_CATCH(const std::bad_alloc &) {
+        // do nothing.
+    }
 }
 
 
diff --git a/src/gui/kernel/qcursor_s60.cpp b/src/gui/kernel/qcursor_s60.cpp
new file mode 100644
index 0000000000..a281130af1
--- /dev/null
+++ b/src/gui/kernel/qcursor_s60.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <private/qcursor_p.h>
+#include <qcursor.h>
+#include <qt_s60_p.h>
+
+#ifdef QT_NO_CURSOR
+QT_BEGIN_NAMESPACE
+
+QPoint QCursor::pos()
+{
+    return S60->lastCursorPos;
+}
+
+void QCursor::setPos(int x, int y)
+{
+    S60->lastCursorPos = QPoint(x, y);
+}
+
+QT_END_NAMESPACE
+#endif // QT_NO_CURSOR
diff --git a/src/gui/kernel/qdesktopwidget_s60.cpp b/src/gui/kernel/qdesktopwidget_s60.cpp
new file mode 100644
index 0000000000..a333d62598
--- /dev/null
+++ b/src/gui/kernel/qdesktopwidget_s60.cpp
@@ -0,0 +1,202 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdesktopwidget.h"
+#include "qapplication_p.h"
+#include "qwidget_p.h"
+#include "qt_s60_p.h"
+#include <w32std.h>
+
+#include "hal.h"
+#include "hal_data.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDesktopWidgetPrivate : public QWidgetPrivate
+{
+
+public:
+    QDesktopWidgetPrivate();
+    ~QDesktopWidgetPrivate();
+
+    static void init(QDesktopWidget *that);
+    static void cleanup();
+
+    static int screenCount;
+    static int primaryScreen;
+
+    static QVector<QRect> *rects;
+    static QVector<QRect> *workrects;
+
+    static int refcount;
+};
+
+int QDesktopWidgetPrivate::screenCount = 1;
+int QDesktopWidgetPrivate::primaryScreen = 0;
+QVector<QRect> *QDesktopWidgetPrivate::rects = 0;
+QVector<QRect> *QDesktopWidgetPrivate::workrects = 0;
+int QDesktopWidgetPrivate::refcount = 0;
+
+QDesktopWidgetPrivate::QDesktopWidgetPrivate()
+{
+    ++refcount;
+}
+
+QDesktopWidgetPrivate::~QDesktopWidgetPrivate()
+{
+    if (!--refcount)
+        cleanup();
+}
+
+void QDesktopWidgetPrivate::init(QDesktopWidget *that)
+{
+    int screenCount=0;
+
+    if (HAL::Get(0, HALData::EDisplayNumberOfScreens, screenCount) == KErrNone)
+        QDesktopWidgetPrivate::screenCount = screenCount;
+    else
+        QDesktopWidgetPrivate::screenCount = 0;
+
+    rects = new QVector<QRect>();
+    workrects = new QVector<QRect>();
+
+    rects->resize(QDesktopWidgetPrivate::screenCount);
+    workrects->resize(QDesktopWidgetPrivate::screenCount);
+
+    // ### TODO: Implement proper multi-display support
+    rects->resize(1);
+    rects->replace(0, that->rect());
+    workrects->resize(1);
+    workrects->replace(0, that->rect());
+}
+
+void QDesktopWidgetPrivate::cleanup()
+{
+    delete rects;
+    rects = 0;
+    delete workrects;
+    workrects = 0;
+}
+
+
+QDesktopWidget::QDesktopWidget()
+    : QWidget(*new QDesktopWidgetPrivate, 0, Qt::Desktop)
+{
+    setObjectName(QLatin1String("desktop"));
+    QDesktopWidgetPrivate::init(this);
+}
+
+QDesktopWidget::~QDesktopWidget()
+{
+    QDesktopWidgetPrivate::cleanup();
+}
+
+bool QDesktopWidget::isVirtualDesktop() const
+{
+    return true;
+}
+
+int QDesktopWidget::primaryScreen() const
+{
+    return QDesktopWidgetPrivate::primaryScreen;
+}
+
+int QDesktopWidget::numScreens() const
+{
+    Q_D(const QDesktopWidget);
+    return QDesktopWidgetPrivate::screenCount;
+}
+
+QWidget *QDesktopWidget::screen(int /* screen */)
+{
+    return this;
+}
+
+const QRect QDesktopWidget::availableGeometry(int /* screen */) const
+{
+    TRect clientRect = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
+    return qt_TRect2QRect(clientRect);
+}
+
+const QRect QDesktopWidget::screenGeometry(int /* screen */) const
+{
+    Q_D(const QDesktopWidget);
+    return QRect(0, 0, S60->screenWidthInPixels, S60->screenHeightInPixels);
+    }
+
+int QDesktopWidget::screenNumber(const QWidget * /* widget */) const
+{
+    return QDesktopWidgetPrivate::primaryScreen;
+}
+
+int QDesktopWidget::screenNumber(const QPoint & /* point */) const
+{
+    return QDesktopWidgetPrivate::primaryScreen;
+}
+
+void QDesktopWidget::resizeEvent(QResizeEvent *)
+{
+    Q_D(QDesktopWidget);
+    QVector<QRect> oldrects;
+    oldrects = *d->rects;
+    QVector<QRect> oldworkrects;
+    oldworkrects = *d->workrects;
+    int oldscreencount = d->screenCount;
+
+    QDesktopWidgetPrivate::cleanup();
+    QDesktopWidgetPrivate::init(this);
+
+    for (int i = 0; i < qMin(oldscreencount, d->screenCount); ++i) {
+        QRect oldrect = oldrects[i];
+        QRect newrect = d->rects->at(i);
+        if (oldrect != newrect)
+            emit resized(i);
+    }
+
+    for (int j = 0; j < qMin(oldscreencount, d->screenCount); ++j) {
+        QRect oldrect = oldworkrects[j];
+        QRect newrect = d->workrects->at(j);
+        if (oldrect != newrect)
+            emit workAreaResized(j);
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qdnd_s60.cpp b/src/gui/kernel/qdnd_s60.cpp
new file mode 100644
index 0000000000..c459f8f04f
--- /dev/null
+++ b/src/gui/kernel/qdnd_s60.cpp
@@ -0,0 +1,395 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qapplication.h"
+
+#ifndef QT_NO_DRAGANDDROP
+
+#include "qwidget.h"
+#include "qdatetime.h"
+#include "qbitmap.h"
+#include "qcursor.h"
+#include "qevent.h"
+#include "qpainter.h"
+#include "qdnd_p.h"
+
+#include <COECNTRL.H>
+// pointer cursor
+#include <w32std.h>
+#include <gdi.h>
+QT_BEGIN_NAMESPACE
+//### artistic impression of Symbians default DnD cursor ?
+
+static QPixmap *defaultPm = 0;
+static const int default_pm_hotx = -50;
+static const int default_pm_hoty = -50;
+static const char *const default_pm[] = {
+"13 9 3 1",
+".      c None",
+"       c #000000",
+"X      c #FFFFFF",
+"X X X X X X X",
+" X X X X X X ",
+"X ......... X",
+" X.........X ",
+"X ......... X",
+" X.........X ",
+"X ......... X",
+" X X X X X X ",
+"X X X X X X X",
+};
+//### actions need to be redefined for S60
+// Shift/Ctrl handling, and final drop status
+static Qt::DropAction global_accepted_action = Qt::MoveAction;
+static Qt::DropActions possible_actions = Qt::IgnoreAction;
+
+
+// static variables in place of a proper cross-process solution
+static QDrag *drag_object;
+static bool qt_symbian_dnd_dragging = false;
+
+
+static Qt::KeyboardModifiers oldstate;
+
+class QShapedPixmapWidget
+{
+public:
+    QShapedPixmapWidget(RWsSession aWsSession,RWindowTreeNode* aNode)
+    {
+     sprite = RWsSprite(aWsSession);     
+     cursorSprite.iBitmap = 0; 
+     cursorSprite.iMaskBitmap = 0;
+     cursorSprite.iInvertMask = EFalse;
+     cursorSprite.iOffset = TPoint(0,0);
+     cursorSprite.iInterval = TTimeIntervalMicroSeconds32(0);
+     cursorSprite.iDrawMode = CGraphicsContext::EDrawModePEN;
+     sprite.Construct(*aNode,TPoint(0,0), ESpriteNoShadows | ESpriteNoChildClip);
+     sprite.AppendMember(cursorSprite);
+     sprite.Activate();
+    }
+    ~QShapedPixmapWidget()
+    {
+        sprite.Close();
+        cursorSprite.iBitmap = 0;
+        delete cursorBitmap;
+        cursorBitmap = 0; //redundant...
+    }
+    void disableCursor()
+    {
+        cursorSprite.iBitmap = 0;
+        sprite.UpdateMember(0,cursorSprite);
+    }
+    void enableCursor()
+    {
+        cursorSprite.iBitmap = cursorBitmap;
+        sprite.UpdateMember(0,cursorSprite);
+    }
+    void setPixmap(QPixmap pm)
+    {
+        //### heaplock centralized.
+        QImage temp = pm.toImage();
+        QSize size = pm.size();
+        temp.bits();        
+        CFbsBitmap *curbm = new (ELeave) CFbsBitmap();
+        curbm->Create(TSize(size.width(),size.height()),EColor16MA);
+        curbm->LockHeap(ETrue);
+        memcpy((uchar*)curbm->DataAddress(),temp.bits(),temp.numBytes());
+        curbm->UnlockHeap(ETrue);
+        delete cursorSprite.iBitmap;
+        cursorSprite.iBitmap = curbm;
+        cursorBitmap = curbm;
+        sprite.UpdateMember(0,cursorSprite);
+    }
+    CFbsBitmap *cursorBitmap;
+    RWsPointerCursor pointerCursor;
+    RWsSprite sprite;
+    TSpriteMember cursorSprite;
+
+};
+
+
+static QShapedPixmapWidget *qt_symbian_dnd_deco = 0;
+
+void QDragManager::updatePixmap()
+{
+    if (qt_symbian_dnd_deco) {
+        QPixmap pm;
+        QPoint pm_hot(default_pm_hotx,default_pm_hoty);
+        if (drag_object) {
+            pm = drag_object->pixmap();
+            if (!pm.isNull())
+                pm_hot = drag_object->hotSpot();
+        }
+        if (pm.isNull()) {
+            if (!defaultPm)
+                defaultPm = new QPixmap(default_pm);
+            pm = *defaultPm;
+        }
+        qt_symbian_dnd_deco->setPixmap(pm);
+    }
+}
+
+void QDragManager::timerEvent(QTimerEvent *) { }
+
+void QDragManager::move(const QPoint&) {
+}
+
+void QDragManager::updateCursor()
+{
+}
+
+
+bool QDragManager::eventFilter(QObject *o, QEvent *e)
+{
+ if (beingCancelled) {
+        return false;
+    }
+    if (!o->isWidgetType())
+        return false;
+
+    switch(e->type()) {
+        case QEvent::MouseButtonPress:
+        {
+        }   
+        case QEvent::MouseMove:
+        {
+            if (!object) { //#### this should not happen
+                qWarning("QDragManager::eventFilter: No object");
+                return true;
+            }
+            QDragManager *manager = QDragManager::self();
+            QMimeData *dropData = manager->object ? manager->dragPrivate()->data : manager->dropData;
+            if (manager->object)
+                possible_actions =  manager->dragPrivate()->possible_actions;
+            else
+                possible_actions = Qt::IgnoreAction;
+
+            QMouseEvent *me = (QMouseEvent *)e;
+
+            if (me->buttons()) {
+                Qt::DropAction prevAction = global_accepted_action;
+                QWidget *cw = QApplication::widgetAt(me->globalPos());
+                // map the Coords relative to the window.
+                if (!cw)
+                    return true;
+                TPoint windowPos = cw->effectiveWinId()->PositionRelativeToScreen();
+                qt_symbian_dnd_deco->sprite.SetPosition(TPoint(me->globalX()- windowPos.iX,me->globalY()- windowPos.iY));                                
+
+                while (cw && !cw->acceptDrops() && !cw->isWindow())
+                    cw = cw->parentWidget();
+
+                if (object->target() != cw) {
+                    if (object->target()) {
+                        QDragLeaveEvent dle;
+                        QApplication::sendEvent(object->target(), &dle);
+                        willDrop = false;
+                        global_accepted_action = Qt::IgnoreAction;
+                        updateCursor();
+                        restoreCursor = true;
+                        object->d_func()->target = 0;
+                    }
+                    if (cw && cw->acceptDrops()) {
+                        object->d_func()->target = cw;
+                        QDragEnterEvent dee(cw->mapFromGlobal(me->globalPos()), possible_actions, dropData,
+                                            me->buttons(), me->modifiers());
+                        QApplication::sendEvent(object->target(), &dee);
+                        willDrop = dee.isAccepted() && dee.dropAction() != Qt::IgnoreAction;
+                        global_accepted_action = willDrop ? dee.dropAction() : Qt::IgnoreAction;
+                        updateCursor();
+                        restoreCursor = true;
+                    }
+                } else if (cw) {
+                    QDragMoveEvent dme(cw->mapFromGlobal(me->globalPos()), possible_actions, dropData,
+                                       me->buttons(), me->modifiers());
+                    if (global_accepted_action != Qt::IgnoreAction) {
+                        dme.setDropAction(global_accepted_action);
+                        dme.accept();
+                    }
+                    QApplication::sendEvent(cw, &dme);
+                    willDrop = dme.isAccepted();
+                    global_accepted_action = willDrop ? dme.dropAction() : Qt::IgnoreAction;
+                    updatePixmap();
+                    updateCursor();
+                }
+                if (global_accepted_action != prevAction)
+                    emitActionChanged(global_accepted_action);
+            }
+            return true; // Eat all mouse events
+        }
+
+        case QEvent::MouseButtonRelease:
+        {
+            qApp->removeEventFilter(this);
+            if (restoreCursor) {
+                qt_symbian_dnd_deco->disableCursor();
+                willDrop = false;
+                restoreCursor = false;
+            }
+            if (object && object->target()) {
+
+                QMouseEvent *me = (QMouseEvent *)e;
+
+                QDragManager *manager = QDragManager::self();
+                QMimeData *dropData = manager->object ? manager->dragPrivate()->data : manager->dropData;
+
+                QDropEvent de(object->target()->mapFromGlobal(me->globalPos()), possible_actions, dropData,
+                              me->buttons(), me->modifiers());
+                QApplication::sendEvent(object->target(), &de);
+                if (de.isAccepted())
+                    global_accepted_action = de.dropAction();
+                else
+                    global_accepted_action = Qt::IgnoreAction;
+
+                if (object)
+                    object->deleteLater();
+                drag_object = object = 0;
+            }
+            eventLoop->exit();
+            return true; // Eat all mouse events
+        }
+
+        default:
+             break;
+    }
+    return false;
+}
+
+Qt::DropAction QDragManager::drag(QDrag *o)
+{
+    Q_ASSERT(!qt_symbian_dnd_dragging);
+    if (object == o || !o || !o->source())
+         return Qt::IgnoreAction;
+
+    if (object) {
+        cancel();
+        qApp->removeEventFilter(this);
+        beingCancelled = false;
+    }
+
+    object = drag_object = o;
+    RWsSession winSession = o->source()->effectiveWinId()->ControlEnv()->WsSession();
+    Q_ASSERT(!qt_symbian_dnd_deco);
+    qt_symbian_dnd_deco = new QShapedPixmapWidget(winSession, o->source()->effectiveWinId()->DrawableWindow());
+
+    oldstate = Qt::NoModifier; // #### Should use state that caused the drag
+    willDrop = false;
+    updatePixmap();
+    updateCursor();
+    restoreCursor = true;
+
+    object->d_func()->target = 0;
+    TPoint windowPos = source()->effectiveWinId()->PositionRelativeToScreen();
+    qt_symbian_dnd_deco->sprite.SetPosition(TPoint(QCursor::pos().x()- windowPos.iX ,QCursor::pos().y() - windowPos.iY));
+    
+    QPoint hotspot = drag_object->hotSpot();
+    qt_symbian_dnd_deco->cursorSprite.iOffset = TPoint(- hotspot.x(),- hotspot.y());
+    qt_symbian_dnd_deco->sprite.UpdateMember(0,qt_symbian_dnd_deco->cursorSprite);
+
+    qApp->installEventFilter(this);
+
+    global_accepted_action = Qt::MoveAction;
+    qt_symbian_dnd_dragging = true;
+
+    eventLoop = new QEventLoop;
+    // block
+    (void) eventLoop->exec(QEventLoop::AllEvents);
+    delete eventLoop;
+    eventLoop = 0;
+
+    delete qt_symbian_dnd_deco;
+    qt_symbian_dnd_deco = 0;
+    qt_symbian_dnd_dragging = false;
+
+
+    return global_accepted_action;
+}
+
+
+void QDragManager::cancel(bool deleteSource)
+{
+    beingCancelled = true;
+
+    if (object->target()) {
+        QDragLeaveEvent dle;
+        QApplication::sendEvent(object->target(), &dle);
+    }
+
+    if (drag_object) {
+        if (deleteSource)
+            object->deleteLater();
+        drag_object = object = 0;
+    }
+
+    delete qt_symbian_dnd_deco;
+    qt_symbian_dnd_deco = 0;
+
+    global_accepted_action = Qt::IgnoreAction;
+}
+
+
+void QDragManager::drop()
+{
+}
+
+QVariant QDropData::retrieveData_sys(const QString &mimetype, QVariant::Type type) const
+{
+    if (!drag_object)
+        return QVariant();
+    QByteArray data =  drag_object->mimeData()->data(mimetype);
+    if (type == QVariant::String)
+        return QString::fromUtf8(data);
+    return data;
+}
+
+bool QDropData::hasFormat_sys(const QString &format) const
+{
+    return formats().contains(format);
+}
+
+QStringList QDropData::formats_sys() const
+{
+    if (drag_object)
+        return drag_object->mimeData()->formats();
+    return QStringList();
+}
+
+QT_END_NAMESPACE
+#endif // QT_NO_DRAGANDDROP
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index bc3633c5e0..2a911816df 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -1692,6 +1692,17 @@ Qt::ButtonState QContextMenuEvent::state() const
     several are specified for any character in the string the behaviour
     is undefined.
 
+    \value Selection
+    If set, the edit cursor should be moved to the specified position
+    in the editor text contents. In contrast with \c Cursor, this
+    attribute does not work on the preedit text, but on the surrounding
+    text. The cursor will be moved after the commit string has been
+    committed, and the preedit string will be located at the new edit
+    position.
+    The start position specifies the new position and the length
+    variable can be used to set a selection starting from that point.
+    The value is unused.
+
     \sa Attribute
 */
 
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 11843cb3a8..a1cfbe5e3f 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -245,7 +245,7 @@ public:
     inline QT3_SUPPORT_CONSTRUCTOR QKeyEvent(Type type, int key, int /*ascii*/,
                                            int modifiers, const QString& text = QString(),
                                            bool autorep = false, ushort count = 1)
-        : QInputEvent(type, (Qt::KeyboardModifiers)(modifiers & (int)Qt::KeyButtonMask)), txt(text), k(key),
+        : QInputEvent(type, Qt::KeyboardModifiers(modifiers & (int)Qt::KeyButtonMask)), txt(text), k(key),
           c(count), autor(autorep)
     {
         if (key >= Qt::Key_Back && key <= Qt::Key_MediaLast)
@@ -428,7 +428,8 @@ public:
        TextFormat,
        Cursor,
        Language,
-       Ruby
+       Ruby,
+       Selection
     };
     class Attribute {
     public:
diff --git a/src/gui/kernel/qeventdispatcher_s60.cpp b/src/gui/kernel/qeventdispatcher_s60.cpp
new file mode 100644
index 0000000000..51878df447
--- /dev/null
+++ b/src/gui/kernel/qeventdispatcher_s60.cpp
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qwidget.h>
+
+#include "qeventdispatcher_s60_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QEventDispatcherS60::QEventDispatcherS60(QObject *parent)
+    : QEventDispatcherSymbian(parent),
+      m_noInputEvents(false)
+{
+}
+
+QEventDispatcherS60::~QEventDispatcherS60()
+{
+    for (int c = 0; c < m_deferredInputEvents.size(); ++c) {
+        delete m_deferredInputEvents[c].event;
+    }
+}
+
+bool QEventDispatcherS60::processEvents ( QEventLoop::ProcessEventsFlags flags )
+{
+    bool ret = false;
+
+    QT_TRY {
+        bool oldNoInputEventsValue = m_noInputEvents;
+        if (flags & QEventLoop::ExcludeUserInputEvents) {
+            m_noInputEvents = true;
+        } else {
+            m_noInputEvents = false;
+            ret = sendDeferredInputEvents() || ret;
+        }
+
+        ret = QEventDispatcherSymbian::processEvents(flags) || ret;
+
+        m_noInputEvents = oldNoInputEventsValue;
+    } QT_CATCH (const std::exception& ex) {
+#ifndef QT_NO_EXCEPTIONS
+        CActiveScheduler::Current()->Error(qt_translateExceptionToSymbianError(ex));
+#endif
+    }
+
+    return ret;
+}
+
+bool QEventDispatcherS60::hasPendingEvents()
+{
+    return !m_deferredInputEvents.isEmpty() || QEventDispatcherSymbian::hasPendingEvents();
+}
+
+void QEventDispatcherS60::saveInputEvent(QSymbianControl *control, QWidget *widget, QInputEvent *event)
+{
+    DeferredInputEvent inputEvent = {control, widget, event};
+    m_deferredInputEvents.append(inputEvent);
+    connect(widget, SIGNAL(destroyed(QObject *)), SLOT(removeInputEventsForWidget(QObject *)));
+}
+
+bool QEventDispatcherS60::sendDeferredInputEvents()
+{
+    bool eventsSent = false;
+    while (!m_deferredInputEvents.isEmpty()) {
+        DeferredInputEvent inputEvent = m_deferredInputEvents.takeFirst();
+#ifndef QT_NO_EXCEPTIONS
+        try {
+#endif
+            inputEvent.control->sendInputEvent(inputEvent.widget, inputEvent.event);
+#ifndef QT_NO_EXCEPTIONS
+        } catch (...) {
+            delete inputEvent.event;
+            throw;
+        }
+#endif
+        delete inputEvent.event;
+        eventsSent = true;
+    }
+
+    return eventsSent;
+}
+
+void QEventDispatcherS60::removeInputEventsForWidget(QObject *object)
+{
+    for (int c = 0; c < m_deferredInputEvents.size(); ++c) {
+        if (m_deferredInputEvents[c].widget == object) {
+            delete m_deferredInputEvents[c].event;
+            m_deferredInputEvents.removeAt(c--);
+        }
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qeventdispatcher_s60_p.h b/src/gui/kernel/qeventdispatcher_s60_p.h
new file mode 100644
index 0000000000..e42af95ba6
--- /dev/null
+++ b/src/gui/kernel/qeventdispatcher_s60_p.h
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QEVENTDISPATCHER_S60_P_H
+#define QEVENTDISPATCHER_S60_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qeventdispatcher_symbian_p.h>
+#include "qt_s60_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class Q_GUI_EXPORT QEventDispatcherS60 : public QEventDispatcherSymbian
+{
+    Q_OBJECT
+
+public:
+    QEventDispatcherS60(QObject *parent = 0);
+    ~QEventDispatcherS60();
+
+    bool processEvents ( QEventLoop::ProcessEventsFlags flags );
+    bool hasPendingEvents();
+
+    bool excludeUserInputEvents() { return m_noInputEvents; }
+
+    void saveInputEvent(QSymbianControl *control, QWidget *widget, QInputEvent *event);
+
+private:
+    bool sendDeferredInputEvents();
+
+private Q_SLOTS:
+    void removeInputEventsForWidget(QObject *object);
+
+private:
+    bool m_noInputEvents;
+
+    struct DeferredInputEvent
+    {
+        QSymbianControl *control;
+        QWidget *widget;
+        QInputEvent *event;
+    };
+    QList<DeferredInputEvent> m_deferredInputEvents;
+};
+
+QT_END_NAMESPACE
+
+#endif // QEVENTDISPATCHER_S60_P_H
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 5c06b4c7e7..ba1fcfeadb 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -58,6 +58,7 @@
 #include <qlist.h>
 #include <qlocale.h>
 #include <qevent.h>
+#include <qhash.h>
 
 #if defined (Q_WS_MAC64)
 # include <private/qt_mac_p.h>
@@ -203,6 +204,13 @@ public:
     UInt32 keyboard_dead;
     KeyboardLayoutItem *keyLayout[256];
 #elif defined(Q_WS_QWS)
+#elif defined(Q_OS_SYMBIAN)
+private:
+    QHash<TUint, int> s60ToQtKeyMap;
+    void fillKeyMap();
+public:
+    QString translateKeyEvent(int keySym, Qt::KeyboardModifiers modifiers);
+    int mapS60KeyToQt(TUint s60key);
 #endif
 };
 
diff --git a/src/gui/kernel/qkeymapper_s60.cpp b/src/gui/kernel/qkeymapper_s60.cpp
new file mode 100644
index 0000000000..c13dd516fb
--- /dev/null
+++ b/src/gui/kernel/qkeymapper_s60.cpp
@@ -0,0 +1,247 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "private/qkeymapper_p.h"
+#include <e32keys.h>
+
+QT_BEGIN_NAMESPACE
+
+QKeyMapperPrivate::QKeyMapperPrivate()
+{
+    fillKeyMap();
+}
+
+QKeyMapperPrivate::~QKeyMapperPrivate()
+{
+}
+
+QList<int> QKeyMapperPrivate::possibleKeys(QKeyEvent * /* e */)
+{
+    QList<int> result;
+    return result;
+}
+
+void QKeyMapperPrivate::clearMappings()
+{
+    // stub
+}
+
+QString QKeyMapperPrivate::translateKeyEvent(int keySym, Qt::KeyboardModifiers /* modifiers */)
+{
+    if (keySym >= Qt::Key_Escape)
+        return QString();
+
+    // Symbian doesn't actually use modifiers, but gives us the character code directly.
+
+    return QString(QChar(keySym));
+}
+
+void QKeyMapperPrivate::fillKeyMap()
+{
+    using namespace Qt;
+    static const struct {
+        TUint s60Key;
+        int qtKey;
+    } map[] = {
+        {EKeyBell, Key_unknown},
+        {EKeyBackspace, Key_Backspace},
+        {EKeyTab, Key_Tab},
+        {EKeyLineFeed, Key_unknown},
+        {EKeyVerticalTab, Key_unknown},
+        {EKeyFormFeed, Key_unknown},
+        {EKeyEnter, Key_Enter},
+        {EKeyEscape, Key_Escape},
+        {EKeySpace, Key_Space},
+        {EKeyDelete, Key_Delete},
+        {EKeyPrintScreen, Key_SysReq},
+        {EKeyPause, Key_Pause},
+        {EKeyHome, Key_Home},
+        {EKeyEnd, Key_End},
+        {EKeyPageUp, Key_PageUp},
+        {EKeyPageDown, Key_PageDown},
+        {EKeyInsert, Key_Insert},
+        {EKeyLeftArrow, Key_Left},
+        {EKeyRightArrow, Key_Right},
+        {EKeyUpArrow, Key_Up},
+        {EKeyDownArrow, Key_Down},
+        {EKeyLeftShift, Key_Shift},
+        {EKeyRightShift, Key_Shift},
+        {EKeyLeftAlt, Key_Alt},
+        {EKeyRightAlt, Key_AltGr},
+        {EKeyLeftCtrl, Key_Control},
+        {EKeyRightCtrl, Key_Control},
+        {EKeyLeftFunc, Key_Super_L},
+        {EKeyRightFunc, Key_Super_R},
+        {EKeyCapsLock, Key_CapsLock},
+        {EKeyNumLock, Key_NumLock},
+        {EKeyScrollLock, Key_ScrollLock},
+        {EKeyF1, Key_F1},
+        {EKeyF2, Key_F2},
+        {EKeyF3, Key_F3},
+        {EKeyF4, Key_F4},
+        {EKeyF5, Key_F5},
+        {EKeyF6, Key_F6},
+        {EKeyF7, Key_F7},
+        {EKeyF8, Key_F8},
+        {EKeyF9, Key_F9},
+        {EKeyF10, Key_F10},
+        {EKeyF11, Key_F11},
+        {EKeyF12, Key_F12},
+        {EKeyF13, Key_F13},
+        {EKeyF14, Key_F14},
+        {EKeyF15, Key_F15},
+        {EKeyF16, Key_F16},
+        {EKeyF17, Key_F17},
+        {EKeyF18, Key_F18},
+        {EKeyF19, Key_F19},
+        {EKeyF20, Key_F20},
+        {EKeyF21, Key_F21},
+        {EKeyF22, Key_F22},
+        {EKeyF23, Key_F23},
+        {EKeyF24, Key_F24},
+        {EKeyOff, Key_unknown},
+        {EKeyIncContrast, Key_unknown},
+        {EKeyDecContrast, Key_unknown},
+        {EKeyBacklightOn, Key_unknown},
+        {EKeyBacklightOff, Key_unknown},
+        {EKeyBacklightToggle, Key_unknown},
+        {EKeySliderDown, Key_unknown},
+        {EKeySliderUp, Key_unknown},
+        {EKeyMenu, Key_Menu},
+        {EKeyDictaphonePlay, Key_unknown},
+        {EKeyDictaphoneStop, Key_unknown},
+        {EKeyDictaphoneRecord, Key_unknown},
+        {EKeyHelp, Key_unknown},
+        {EKeyDial, Key_Call},
+        {EKeyScreenDimension0, Key_unknown},
+        {EKeyScreenDimension1, Key_unknown},
+        {EKeyScreenDimension2, Key_unknown},
+        {EKeyScreenDimension3, Key_unknown},
+        {EKeyIncVolume, Key_unknown},
+        {EKeyDecVolume, Key_unknown},
+        {EKeyDevice0, Key_Context1}, // Found by manual testing, left softkey.
+        {EKeyDevice1, Key_Context2}, // Found by manual testing.
+        {EKeyDevice2, Key_unknown},
+        {EKeyDevice3, Key_Select}, // Found by manual testing.
+        {EKeyDevice4, Key_unknown},
+        {EKeyDevice5, Key_unknown},
+        {EKeyDevice6, Key_unknown},
+        {EKeyDevice7, Key_unknown},
+        {EKeyDevice8, Key_unknown},
+        {EKeyDevice9, Key_unknown},
+        {EKeyDeviceA, Key_unknown},
+        {EKeyDeviceB, Key_unknown},
+        {EKeyDeviceC, Key_unknown},
+        {EKeyDeviceD, Key_unknown},
+        {EKeyDeviceE, Key_unknown},
+        {EKeyDeviceF, Key_unknown},
+        {EKeyApplication0, Key_Launch0},
+        {EKeyApplication1, Key_Launch1},
+        {EKeyApplication2, Key_Launch2},
+        {EKeyApplication3, Key_Launch3},
+        {EKeyApplication4, Key_Launch4},
+        {EKeyApplication5, Key_Launch5},
+        {EKeyApplication6, Key_Launch6},
+        {EKeyApplication7, Key_Launch7},
+        {EKeyApplication8, Key_Launch8},
+        {EKeyApplication9, Key_Launch9},
+        {EKeyApplicationA, Key_LaunchA},
+        {EKeyApplicationB, Key_LaunchB},
+        {EKeyApplicationC, Key_LaunchC},
+        {EKeyApplicationD, Key_LaunchD},
+        {EKeyApplicationE, Key_LaunchE},
+        {EKeyApplicationF, Key_LaunchF},
+        {EKeyYes, Key_Yes},
+        {EKeyNo, Key_No},
+        {EKeyIncBrightness, Key_unknown},
+        {EKeyDecBrightness, Key_unknown},
+        {EKeyKeyboardExtend, Key_unknown},
+        {EKeyDevice10, Key_unknown},
+        {EKeyDevice11, Key_unknown},
+        {EKeyDevice12, Key_unknown},
+        {EKeyDevice13, Key_unknown},
+        {EKeyDevice14, Key_unknown},
+        {EKeyDevice15, Key_unknown},
+        {EKeyDevice16, Key_unknown},
+        {EKeyDevice17, Key_unknown},
+        {EKeyDevice18, Key_unknown},
+        {EKeyDevice19, Key_unknown},
+        {EKeyDevice1A, Key_unknown},
+        {EKeyDevice1B, Key_unknown},
+        {EKeyDevice1C, Key_unknown},
+        {EKeyDevice1D, Key_unknown},
+        {EKeyDevice1E, Key_unknown},
+        {EKeyDevice1F, Key_unknown},
+        {EKeyApplication10, Key_unknown},
+        {EKeyApplication11, Key_unknown},
+        {EKeyApplication12, Key_unknown},
+        {EKeyApplication13, Key_unknown},
+        {EKeyApplication14, Key_unknown},
+        {EKeyApplication15, Key_unknown},
+        {EKeyApplication16, Key_unknown},
+        {EKeyApplication17, Key_unknown},
+        {EKeyApplication18, Key_unknown},
+        {EKeyApplication19, Key_unknown},
+        {EKeyApplication1A, Key_unknown},
+        {EKeyApplication1B, Key_unknown},
+        {EKeyApplication1C, Key_unknown},
+        {EKeyApplication1D, Key_unknown},
+        {EKeyApplication1E, Key_unknown},
+        {EKeyApplication1F, Key_unknown}
+    };
+    const int mapSize = int(sizeof(map)/sizeof(map[0]));
+    s60ToQtKeyMap.reserve(mapSize + 5); // +5? docs: Ideally, slightly more than number of items
+    for (int i = 0; i < mapSize; ++i)
+        s60ToQtKeyMap.insert(map[i].s60Key, map[i].qtKey);
+}
+
+int QKeyMapperPrivate::mapS60KeyToQt(TUint s60key)
+{
+    QHash<TUint, int>::const_iterator mapping;
+    mapping = s60ToQtKeyMap.find(s60key);
+    if (mapping != s60ToQtKeyMap.end()) {
+        return *mapping;
+    } else {
+        return Qt::Key_unknown;
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index d27eacd4e4..6563dae57a 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -226,72 +226,72 @@ void Q_AUTOTEST_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mn
     corresponds to the \key Control keys.
 
     \table
-    \header \i StandardKey      \i Windows                              \i Mac OS X                 \i KDE          \i GNOME
-    \row    \i HelpContents     \i F1                                   \i Ctrl+?                   \i F1           \i F1
-    \row    \i WhatsThis        \i Shift+F1                             \i Shift+F1                 \i Shift+F1     \i Shift+F1
-    \row    \i Open             \i Ctrl+O                               \i Ctrl+O                   \i Ctrl+O       \i Ctrl+O
-    \row    \i Close            \i Ctrl+F4, Ctrl+W                      \i Ctrl+W, Ctrl+F4          \i Ctrl+W       \i Ctrl+W
-    \row    \i Save             \i Ctrl+S                               \i Ctrl+S                   \i Ctrl+S       \i Ctrl+S
-    \row    \i Quit             \i                                      \i Ctrl+Q                   \i Qtrl+Q       \i Qtrl+Q
-    \row    \i SaveAs           \i                                      \i Ctrl+Shift+S             \i              \i Ctrl+Shift+S
-    \row    \i New              \i Ctrl+N                               \i Ctrl+N                   \i Ctrl+N       \i Ctrl+N
-    \row    \i Delete           \i Del                                  \i Del, Meta+D              \i Del, Ctrl+D  \i Del, Ctrl+D
-    \row    \i Cut              \i Ctrl+X, Shift+Del                    \i Ctrl+X                   \i Ctrl+X, F20, Shift+Del \i Ctrl+X, F20, Shift+Del 
-    \row    \i Copy             \i Ctrl+C, Ctrl+Ins                     \i Ctrl+C                   \i Ctrl+C, F16, Ctrl+Ins  \i Ctrl+C, F16, Ctrl+Ins
-    \row    \i Paste            \i Ctrl+V, Shift+Ins                    \i Ctrl+V                   \i Ctrl+V, F18, Shift+Ins \i Ctrl+V, F18, Shift+Ins
-    \row    \i Preferences      \i                                      \i Ctrl+,                   \i              \i
-    \row    \i Undo             \i Ctrl+Z, Alt+Backspace                \i Ctrl+Z                   \i Ctrl+Z, F14  \i Ctrl+Z, F14
-    \row    \i Redo             \i Ctrl+Y, Shift+Ctrl+Z, Alt+Shift+Backspace \i Ctrl+Shift+Z, Ctrl+Y     \i Ctrl+Shift+Z \i Ctrl+Shift+Z
-    \row    \i Back             \i Alt+Left, Backspace                  \i Ctrl+[                   \i Alt+Left     \i Alt+Left
-    \row    \i Forward          \i Alt+Right, Shift+Backspace           \i Ctrl+]                   \i Alt+Right    \i Alt+Right
-    \row    \i Refresh          \i F5                                   \i F5                       \i F5           \i Ctrl+R, F5
-    \row    \i ZoomIn           \i Ctrl+Plus                            \i Ctrl+Plus                \i Ctrl+Plus    \i Ctrl+Plus
-    \row    \i ZoomOut          \i Ctrl+Minus                           \i Ctrl+Minus               \i Ctrl+Minus   \i Ctrl+Minus
-    \row    \i Print            \i Ctrl+P                               \i Ctrl+P                   \i Ctrl+P       \i Ctrl+P
-    \row    \i AddTab           \i Ctrl+T                               \i Ctrl+T                   \i Ctrl+Shift+N, Ctrl+T \i Ctrl+T
-    \row    \i NextChild        \i Ctrl+Tab, Forward, Ctrl+F6           \i Ctrl+}, Forward, Ctrl+Tab \i Ctrl+Tab, Forward, Ctrl+Comma \i Ctrl+Tab, Forward
-    \row    \i PreviousChild    \i Ctrl+Shift+Tab, Back, Ctrl+Shift+F6  \i Ctrl+{, Back, Ctrl+Shift+Tab \i Ctrl+Shift+Tab, Back, Ctrl+Period \i Ctrl+Shift+Tab, Back
-    \row    \i Find             \i Ctrl+F                               \i Ctrl+F                   \i Ctrl+F         \i Ctrl+F
-    \row    \i FindNext         \i F3, Ctrl+G                           \i Ctrl+G                   \i F3             \i Ctrl+G, F3
-    \row    \i FindPrevious     \i Shift+F3, Ctrl+Shift+G               \i Ctrl+Shift+G             \i Shift+F3       \i Ctrl+Shift+G, Shift+F3
-    \row    \i Replace          \i Ctrl+H                               \i (none)                   \i Ctrl+R         \i Ctrl+H
-    \row    \i SelectAll        \i Ctrl+A                               \i Ctrl+A                   \i Ctrl+A         \i Ctrl+A 
-    \row    \i Bold             \i Ctrl+B                               \i Ctrl+B                   \i Ctrl+B         \i Ctrl+B
-    \row    \i Italic           \i Ctrl+I                               \i Ctrl+I                   \i Ctrl+I         \i Ctrl+I
-    \row    \i Underline        \i Ctrl+U                               \i Ctrl+U                   \i Ctrl+U         \i Ctrl+U
-    \row    \i MoveToNextChar       \i Right                            \i Right                    \i Right          \i Right
-    \row    \i MoveToPreviousChar   \i Left                             \i Left                     \i Left           \i Left
-    \row    \i MoveToNextWord       \i Ctrl+Right                       \i Alt+Right                \i Ctrl+Right     \i Ctrl+Right
-    \row    \i MoveToPreviousWord   \i Ctrl+Left                        \i Alt+Left                 \i Ctrl+Left      \i Ctrl+Left
-    \row    \i MoveToNextLine       \i Down                             \i Down                     \i Down           \i Down
-    \row    \i MoveToPreviousLine   \i Up                               \i Up                       \i Up             \i Up
-    \row    \i MoveToNextPage       \i PgDown                           \i PgDown, Alt+PgDown, Meta+Down, Meta+PgDown\i PgDown \i PgDown
-    \row    \i MoveToPreviousPage   \i PgUp                             \i PgUp, Alt+PgUp, Meta+Up, Meta+PgUp        \i PgUp   \i PgUp 
-    \row    \i MoveToStartOfLine    \i Home                             \i Ctrl+Left, Meta+Left   \i Home            \i Home
-    \row    \i MoveToEndOfLine      \i End                              \i Ctrl+Right, Meta+Right \i End             \i End
-    \row    \i MoveToStartOfBlock   \i (none)                           \i Alt+Up, Meta+A         \i (none)          \i (none)
-    \row    \i MoveToEndOfBlock     \i (none)                           \i Alt+Down, Meta+E       \i (none)          \i (none)
-    \row    \i MoveToStartOfDocument\i Ctrl+Home                        \i Ctrl+Up, Home          \i Ctrl+Home       \i Ctrl+Home
-    \row    \i MoveToEndOfDocument  \i Ctrl+End                         \i Ctrl+Down, End         \i Ctrl+End        \i Ctrl+End
-    \row    \i SelectNextChar       \i Shift+Right                      \i Shift+Right            \i Shift+Right     \i Shift+Right
-    \row    \i SelectPreviousChar   \i Shift+Left                       \i Shift+Left             \i Shift+Left      \i Shift?left
-    \row    \i SelectNextWord       \i Ctrl+Shift+Right                 \i Alt+Shift+Right        \i Ctrl+Shift+Right \i Ctrl+Shift+Right
-    \row    \i SelectPreviousWord   \i Ctrl+Shift+Left                  \i Alt+Shift+Left         \i Ctrl+Shift+Left \i Ctrl+Shift+Left
-    \row    \i SelectNextLine       \i Shift+Down                       \i Shift+Down             \i Shift+Down     \i Shift+Down
-    \row    \i SelectPreviousLine   \i Shift+Up                         \i Shift+Up               \i Shift+Up       \i Shift+Up
-    \row    \i SelectNextPage       \i Shift+PgDown                     \i Shift+PgDown           \i Shift+PgDown   \i Shift+PgDown
-    \row    \i SelectPreviousPage   \i Shift+PgUp                       \i Shift+PgUp             \i Shift+PgUp     \i Shift+PgUp
-    \row    \i SelectStartOfLine    \i Shift+Home                       \i Ctrl+Shift+Left        \i Shift+Home     \i Shift+Home
-    \row    \i SelectEndOfLine      \i Shift+End                        \i Ctrl+Shift+Right       \i Shift+End      \i Shift+End
-    \row    \i SelectStartOfBlock   \i (none)                           \i Alt+Shift+Up           \i (none)         \i (none)
-    \row    \i SelectEndOfBlock     \i (none)                           \i Alt+Shift+Down         \i (none)         \i (none)
-    \row    \i SelectStartOfDocument\i Ctrl+Shift+Home                  \i Ctrl+Shift+Up, Shift+Home          \i Ctrl+Shift+Home\i Ctrl+Shift+Home
-    \row    \i SelectEndOfDocument  \i Ctrl+Shift+End                   \i Ctrl+Shift+Down, Shift+End        \i Ctrl+Shift+End \i Ctrl+Shift+End
-    \row    \i DeleteStartOfWord    \i Ctrl+Backspace                   \i Alt+Backspace          \i Ctrl+Backspace \i Ctrl+Backspace
-    \row    \i DeleteEndOfWord      \i Ctrl+Del                         \i (none)                 \i Ctrl+Del       \i Ctrl+Del
-    \row    \i DeleteEndOfLine      \i (none)                           \i (none)                 \i Ctrl+K         \i Ctrl+K
-    \row    \i InsertParagraphSeparator     \i Enter                    \i Enter                  \i Enter          \i Enter
-    \row    \i InsertLineSeparator          \i Shift+Enter              \i Meta+Enter             \i Shift+Enter    \i Shift+Enter
+    \header \i StandardKey      \i Windows                              \i Mac OS X                 \i KDE          \i GNOME                                 \i S60
+    \row    \i HelpContents     \i F1                                   \i Ctrl+?                   \i F1           \i F1                                    \i F2
+    \row    \i WhatsThis        \i Shift+F1                             \i Shift+F1                 \i Shift+F1     \i Shift+F1                              \i Shift+F1
+    \row    \i Open             \i Ctrl+O                               \i Ctrl+O                   \i Ctrl+O       \i Ctrl+O                                \i (none)
+    \row    \i Close            \i Ctrl+F4, Ctrl+W                      \i Ctrl+W, Ctrl+F4          \i Ctrl+W       \i Ctrl+W                                \i (none)
+    \row    \i Save             \i Ctrl+S                               \i Ctrl+S                   \i Ctrl+S       \i Ctrl+S                                \i (none)
+    \row    \i Quit             \i                                      \i Ctrl+Q                   \i Qtrl+Q       \i Qtrl+Q                                \i (none)
+    \row    \i SaveAs           \i                                      \i Ctrl+Shift+S             \i              \i Ctrl+Shift+S                          \i (none)
+    \row    \i New              \i Ctrl+N                               \i Ctrl+N                   \i Ctrl+N       \i Ctrl+N                                \i (none)
+    \row    \i Delete           \i Del                                  \i Del, Meta+D              \i Del, Ctrl+D  \i Del, Ctrl+D                           \i Del
+    \row    \i Cut              \i Ctrl+X, Shift+Del                    \i Ctrl+X                   \i Ctrl+X, F20, Shift+Del \i Ctrl+X, F20, Shift+Del      \i Ctrl+X
+    \row    \i Copy             \i Ctrl+C, Ctrl+Ins                     \i Ctrl+C                   \i Ctrl+C, F16, Ctrl+Ins  \i Ctrl+C, F16, Ctrl+Ins       \i Ctrl+C
+    \row    \i Paste            \i Ctrl+V, Shift+Ins                    \i Ctrl+V                   \i Ctrl+V, F18, Shift+Ins \i Ctrl+V, F18, Shift+Ins      \i Ctrl+V
+    \row    \i Preferences      \i                                      \i Ctrl+,                   \i              \i                                       \i (none)
+    \row    \i Undo             \i Ctrl+Z, Alt+Backspace                \i Ctrl+Z                   \i Ctrl+Z, F14  \i Ctrl+Z, F14                           \i Ctrl+Z
+    \row    \i Redo             \i Ctrl+Y, Shift+Ctrl+Z, Alt+Shift+Backspace \i Ctrl+Shift+Z, Ctrl+Y     \i Ctrl+Shift+Z \i Ctrl+Shift+Z                     \i (none)
+    \row    \i Back             \i Alt+Left, Backspace                  \i Ctrl+[                   \i Alt+Left     \i Alt+Left                              \i (none)
+    \row    \i Forward          \i Alt+Right, Shift+Backspace           \i Ctrl+]                   \i Alt+Right    \i Alt+Right                             \i (none)
+    \row    \i Refresh          \i F5                                   \i F5                       \i F5           \i Ctrl+R, F5                            \i (none)
+    \row    \i ZoomIn           \i Ctrl+Plus                            \i Ctrl+Plus                \i Ctrl+Plus    \i Ctrl+Plus                             \i (none)
+    \row    \i ZoomOut          \i Ctrl+Minus                           \i Ctrl+Minus               \i Ctrl+Minus   \i Ctrl+Minus                            \i (none)
+    \row    \i Print            \i Ctrl+P                               \i Ctrl+P                   \i Ctrl+P       \i Ctrl+P                                \i (none)
+    \row    \i AddTab           \i Ctrl+T                               \i Ctrl+T                   \i Ctrl+Shift+N, Ctrl+T \i Ctrl+T                        \i (none)
+    \row    \i NextChild        \i Ctrl+Tab, Forward, Ctrl+F6           \i Ctrl+}, Forward, Ctrl+Tab \i Ctrl+Tab, Forward, Ctrl+Comma \i Ctrl+Tab, Forward   \i (none)
+    \row    \i PreviousChild    \i Ctrl+Shift+Tab, Back, Ctrl+Shift+F6  \i Ctrl+{, Back, Ctrl+Shift+Tab \i Ctrl+Shift+Tab, Back, Ctrl+Period \i Ctrl+Shift+Tab, Back \i (none)
+    \row    \i Find             \i Ctrl+F                               \i Ctrl+F                   \i Ctrl+F         \i Ctrl+F                              \i (none)
+    \row    \i FindNext         \i F3, Ctrl+G                           \i Ctrl+G                   \i F3             \i Ctrl+G, F3                          \i (none)
+    \row    \i FindPrevious     \i Shift+F3, Ctrl+Shift+G               \i Ctrl+Shift+G             \i Shift+F3       \i Ctrl+Shift+G, Shift+F3              \i (none)
+    \row    \i Replace          \i Ctrl+H                               \i (none)                   \i Ctrl+R         \i Ctrl+H                              \i (none)
+    \row    \i SelectAll        \i Ctrl+A                               \i Ctrl+A                   \i Ctrl+A         \i Ctrl+A                              \i (none)
+    \row    \i Bold             \i Ctrl+B                               \i Ctrl+B                   \i Ctrl+B         \i Ctrl+B                              \i (none)
+    \row    \i Italic           \i Ctrl+I                               \i Ctrl+I                   \i Ctrl+I         \i Ctrl+I                              \i (none)
+    \row    \i Underline        \i Ctrl+U                               \i Ctrl+U                   \i Ctrl+U         \i Ctrl+U                              \i (none)
+    \row    \i MoveToNextChar       \i Right                            \i Right                    \i Right          \i Right                               \i Right
+    \row    \i MoveToPreviousChar   \i Left                             \i Left                     \i Left           \i Left                                \i Left
+    \row    \i MoveToNextWord       \i Ctrl+Right                       \i Alt+Right                \i Ctrl+Right     \i Ctrl+Right                          \i Ctrl+Right
+    \row    \i MoveToPreviousWord   \i Ctrl+Left                        \i Alt+Left                 \i Ctrl+Left      \i Ctrl+Left                           \i Ctrl+Left
+    \row    \i MoveToNextLine       \i Down                             \i Down                     \i Down           \i Down                                \i Down
+    \row    \i MoveToPreviousLine   \i Up                               \i Up                       \i Up             \i Up                                  \i Up
+    \row    \i MoveToNextPage       \i PgDown                           \i PgDown, Alt+PgDown, Meta+Down, Meta+PgDown\i PgDown \i PgDown                     \i PgDown
+    \row    \i MoveToPreviousPage   \i PgUp                             \i PgUp, Alt+PgUp, Meta+Up, Meta+PgUp        \i PgUp   \i PgUp                       \i PgUp
+    \row    \i MoveToStartOfLine    \i Home                             \i Ctrl+Left, Meta+Left   \i Home            \i Home                                 \i Home
+    \row    \i MoveToEndOfLine      \i End                              \i Ctrl+Right, Meta+Right \i End             \i End                                  \i End
+    \row    \i MoveToStartOfBlock   \i (none)                           \i Alt+Up, Meta+A         \i (none)          \i (none)                               \i (none)
+    \row    \i MoveToEndOfBlock     \i (none)                           \i Alt+Down, Meta+E       \i (none)          \i (none)                               \i (none)
+    \row    \i MoveToStartOfDocument\i Ctrl+Home                        \i Ctrl+Up, Home          \i Ctrl+Home       \i Ctrl+Home                            \i Ctrl+Home
+    \row    \i MoveToEndOfDocument  \i Ctrl+End                         \i Ctrl+Down, End         \i Ctrl+End        \i Ctrl+End                             \i Ctrl+End
+    \row    \i SelectNextChar       \i Shift+Right                      \i Shift+Right            \i Shift+Right     \i Shift+Right                          \i Shift+Right
+    \row    \i SelectPreviousChar   \i Shift+Left                       \i Shift+Left             \i Shift+Left      \i Shift+Left                           \i Shift+Left
+    \row    \i SelectNextWord       \i Ctrl+Shift+Right                 \i Alt+Shift+Right        \i Ctrl+Shift+Right \i Ctrl+Shift+Right                    \i Ctrl+Shift+Right
+    \row    \i SelectPreviousWord   \i Ctrl+Shift+Left                  \i Alt+Shift+Left         \i Ctrl+Shift+Left \i Ctrl+Shift+Left                      \i Ctrl+Shift+Left
+    \row    \i SelectNextLine       \i Shift+Down                       \i Shift+Down             \i Shift+Down     \i Shift+Down                            \i Shift+Down
+    \row    \i SelectPreviousLine   \i Shift+Up                         \i Shift+Up               \i Shift+Up       \i Shift+Up                              \i Shift+Up
+    \row    \i SelectNextPage       \i Shift+PgDown                     \i Shift+PgDown           \i Shift+PgDown   \i Shift+PgDown                          \i Shift+PgDown
+    \row    \i SelectPreviousPage   \i Shift+PgUp                       \i Shift+PgUp             \i Shift+PgUp     \i Shift+PgUp                            \i Shift+PgUp
+    \row    \i SelectStartOfLine    \i Shift+Home                       \i Ctrl+Shift+Left        \i Shift+Home     \i Shift+Home                            \i Shift+Home
+    \row    \i SelectEndOfLine      \i Shift+End                        \i Ctrl+Shift+Right       \i Shift+End      \i Shift+End                             \i Shift+End
+    \row    \i SelectStartOfBlock   \i (none)                           \i Alt+Shift+Up           \i (none)         \i (none)                                \i (none)
+    \row    \i SelectEndOfBlock     \i (none)                           \i Alt+Shift+Down         \i (none)         \i (none)                                \i (none)
+    \row    \i SelectStartOfDocument\i Ctrl+Shift+Home                  \i Ctrl+Shift+Up, Shift+Home          \i Ctrl+Shift+Home\i Ctrl+Shift+Home           \i Ctrl+Shift+Home
+    \row    \i SelectEndOfDocument  \i Ctrl+Shift+End                   \i Ctrl+Shift+Down, Shift+End        \i Ctrl+Shift+End \i Ctrl+Shift+End             \i Ctrl+Shift+End
+    \row    \i DeleteStartOfWord    \i Ctrl+Backspace                   \i Alt+Backspace          \i Ctrl+Backspace \i Ctrl+Backspace                        \i (none)
+    \row    \i DeleteEndOfWord      \i Ctrl+Del                         \i (none)                 \i Ctrl+Del       \i Ctrl+Del                              \i (none)
+    \row    \i DeleteEndOfLine      \i (none)                           \i (none)                 \i Ctrl+K         \i Ctrl+K                                \i (none)
+    \row    \i InsertParagraphSeparator     \i Enter                    \i Enter                  \i Enter          \i Enter                                 \i (none)
+    \row    \i InsertLineSeparator          \i Shift+Enter              \i Meta+Enter             \i Shift+Enter    \i Shift+Enter                           \i (none)
     \endtable
 
     Note that, since the key sequences used for the standard shortcuts differ
@@ -502,9 +502,9 @@ const QKeyBinding QKeySequencePrivate::keyBindings[] = {
     {QKeySequence::InsertParagraphSeparator,0,          Qt::Key_Return,                         QApplicationPrivate::KB_All},
     {QKeySequence::InsertParagraphSeparator,0,          Qt::Key_Enter,                          QApplicationPrivate::KB_All},
     {QKeySequence::Delete,                  1,          Qt::Key_Delete,                         QApplicationPrivate::KB_All},
-    {QKeySequence::MoveToStartOfLine,       0,          Qt::Key_Home,                           QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
+    {QKeySequence::MoveToStartOfLine,       0,          Qt::Key_Home,                           QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
     {QKeySequence::MoveToStartOfDocument,   0,          Qt::Key_Home,                           QApplicationPrivate::KB_Mac},
-    {QKeySequence::MoveToEndOfLine,         0,          Qt::Key_End,                            QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
+    {QKeySequence::MoveToEndOfLine,         0,          Qt::Key_End,                            QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
     {QKeySequence::MoveToEndOfDocument,     0,          Qt::Key_End,                            QApplicationPrivate::KB_Mac},
     {QKeySequence::MoveToPreviousChar,      0,          Qt::Key_Left,                           QApplicationPrivate::KB_All},
     {QKeySequence::MoveToPreviousLine,      0,          Qt::Key_Up,                             QApplicationPrivate::KB_All},
@@ -513,6 +513,7 @@ const QKeyBinding QKeySequencePrivate::keyBindings[] = {
     {QKeySequence::MoveToPreviousPage,      1,          Qt::Key_PageUp,                         QApplicationPrivate::KB_All},
     {QKeySequence::MoveToNextPage,          1,          Qt::Key_PageDown,                       QApplicationPrivate::KB_All},
     {QKeySequence::HelpContents,            0,          Qt::Key_F1,                             QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
+    {QKeySequence::HelpContents,            0,          Qt::Key_F2,                             QApplicationPrivate::KB_S60},
     {QKeySequence::FindNext,                0,          Qt::Key_F3,                             QApplicationPrivate::KB_X11},
     {QKeySequence::FindNext,                1,          Qt::Key_F3,                             QApplicationPrivate::KB_Win},
     {QKeySequence::Refresh,                 0,          Qt::Key_F5,                             QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
@@ -523,13 +524,14 @@ const QKeyBinding QKeySequencePrivate::keyBindings[] = {
     {QKeySequence::PreviousChild,           0,          Qt::Key_Back,                           QApplicationPrivate::KB_All},
     {QKeySequence::NextChild,               0,          Qt::Key_Forward,                        QApplicationPrivate::KB_All}, 
     {QKeySequence::Forward,                 0,          Qt::SHIFT | Qt::Key_Backspace,          QApplicationPrivate::KB_Win},
+    {QKeySequence::Delete,                  0,          Qt::SHIFT | Qt::Key_Backspace,          QApplicationPrivate::KB_S60},
     {QKeySequence::InsertLineSeparator,     0,          Qt::SHIFT | Qt::Key_Return,             QApplicationPrivate::KB_All},
     {QKeySequence::InsertLineSeparator,     0,          Qt::SHIFT | Qt::Key_Enter,              QApplicationPrivate::KB_All},
     {QKeySequence::Paste,                   0,          Qt::SHIFT | Qt::Key_Insert,             QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11}, 
     {QKeySequence::Cut,                     0,          Qt::SHIFT | Qt::Key_Delete,             QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11}, //## Check if this should work on mac
-    {QKeySequence::SelectStartOfLine,       0,          Qt::SHIFT | Qt::Key_Home,               QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
+    {QKeySequence::SelectStartOfLine,       0,          Qt::SHIFT | Qt::Key_Home,               QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
     {QKeySequence::SelectStartOfDocument,   0,          Qt::SHIFT | Qt::Key_Home,               QApplicationPrivate::KB_Mac},
-    {QKeySequence::SelectEndOfLine,         0,          Qt::SHIFT | Qt::Key_End,                QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
+    {QKeySequence::SelectEndOfLine,         0,          Qt::SHIFT | Qt::Key_End,                QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
     {QKeySequence::SelectEndOfDocument,     0,          Qt::SHIFT | Qt::Key_End,                QApplicationPrivate::KB_Mac},
     {QKeySequence::SelectPreviousChar,      0,          Qt::SHIFT | Qt::Key_Left,               QApplicationPrivate::KB_All},
     {QKeySequence::SelectPreviousLine,      0,          Qt::SHIFT | Qt::Key_Up,                 QApplicationPrivate::KB_All},
@@ -582,15 +584,15 @@ const QKeyBinding QKeySequencePrivate::keyBindings[] = {
     {QKeySequence::DeleteStartOfWord,       0,          Qt::CTRL | Qt::Key_Backspace,           QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_Win},
     {QKeySequence::Copy,                    0,          Qt::CTRL | Qt::Key_Insert,              QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_Win}, 
     {QKeySequence::DeleteEndOfWord,         0,          Qt::CTRL | Qt::Key_Delete,              QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_Win},
-    {QKeySequence::MoveToStartOfDocument,   0,          Qt::CTRL | Qt::Key_Home,                QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
-    {QKeySequence::MoveToEndOfDocument,     0,          Qt::CTRL | Qt::Key_End,                 QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
+    {QKeySequence::MoveToStartOfDocument,   0,          Qt::CTRL | Qt::Key_Home,                QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
+    {QKeySequence::MoveToEndOfDocument,     0,          Qt::CTRL | Qt::Key_End,                 QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
     {QKeySequence::Back,                    0,          Qt::CTRL | Qt::Key_Left,                QApplicationPrivate::KB_Mac}, 
-    {QKeySequence::MoveToPreviousWord,      0,          Qt::CTRL | Qt::Key_Left,                QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11}, 
+    {QKeySequence::MoveToPreviousWord,      0,          Qt::CTRL | Qt::Key_Left,                QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
     {QKeySequence::MoveToStartOfLine,       0,          Qt::CTRL | Qt::Key_Left,                QApplicationPrivate::KB_Mac },
     {QKeySequence::MoveToStartOfDocument,   1,          Qt::CTRL | Qt::Key_Up,                  QApplicationPrivate::KB_Mac},
     {QKeySequence::Forward,                 0,          Qt::CTRL | Qt::Key_Right,               QApplicationPrivate::KB_Mac}, 
     {QKeySequence::MoveToEndOfLine,         0,          Qt::CTRL | Qt::Key_Right,               QApplicationPrivate::KB_Mac },
-    {QKeySequence::MoveToNextWord,          0,          Qt::CTRL | Qt::Key_Right,               QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
+    {QKeySequence::MoveToNextWord,          0,          Qt::CTRL | Qt::Key_Right,               QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
     {QKeySequence::MoveToEndOfDocument,     1,          Qt::CTRL | Qt::Key_Down,                QApplicationPrivate::KB_Mac},
     {QKeySequence::Close,                   1,          Qt::CTRL | Qt::Key_F4,                  QApplicationPrivate::KB_Win},
     {QKeySequence::Close,                   0,          Qt::CTRL | Qt::Key_F4,                  QApplicationPrivate::KB_Mac},
@@ -603,12 +605,12 @@ const QKeyBinding QKeySequencePrivate::keyBindings[] = {
     {QKeySequence::Redo,                    1,          Qt::CTRL | Qt::SHIFT | Qt::Key_Z,       QApplicationPrivate::KB_Mac}, //different priority from above
     {QKeySequence::PreviousChild,           1,          Qt::CTRL | Qt::SHIFT | Qt::Key_Backtab, QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
     {QKeySequence::PreviousChild,           0,          Qt::CTRL | Qt::SHIFT | Qt::Key_Backtab, QApplicationPrivate::KB_Mac },//different priority from above 
-    {QKeySequence::SelectStartOfDocument,   0,          Qt::CTRL | Qt::SHIFT | Qt::Key_Home,    QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
-    {QKeySequence::SelectEndOfDocument,     0,          Qt::CTRL | Qt::SHIFT | Qt::Key_End,     QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
-    {QKeySequence::SelectPreviousWord,      0,          Qt::CTRL | Qt::SHIFT | Qt::Key_Left,    QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
+    {QKeySequence::SelectStartOfDocument,   0,          Qt::CTRL | Qt::SHIFT | Qt::Key_Home,    QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
+    {QKeySequence::SelectEndOfDocument,     0,          Qt::CTRL | Qt::SHIFT | Qt::Key_End,     QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
+    {QKeySequence::SelectPreviousWord,      0,          Qt::CTRL | Qt::SHIFT | Qt::Key_Left,    QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
     {QKeySequence::SelectStartOfLine,       1,          Qt::CTRL | Qt::SHIFT | Qt::Key_Left,    QApplicationPrivate::KB_Mac },
     {QKeySequence::SelectStartOfDocument,   1,          Qt::CTRL | Qt::SHIFT | Qt::Key_Up,      QApplicationPrivate::KB_Mac},
-    {QKeySequence::SelectNextWord,          0,          Qt::CTRL | Qt::SHIFT | Qt::Key_Right,   QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11},
+    {QKeySequence::SelectNextWord,          0,          Qt::CTRL | Qt::SHIFT | Qt::Key_Right,   QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60},
     {QKeySequence::SelectEndOfLine,         1,          Qt::CTRL | Qt::SHIFT | Qt::Key_Right,   QApplicationPrivate::KB_Mac },
     {QKeySequence::SelectEndOfDocument,     1,          Qt::CTRL | Qt::SHIFT | Qt::Key_Down,    QApplicationPrivate::KB_Mac},
     {QKeySequence::PreviousChild,           0,          Qt::CTRL | Qt::SHIFT | Qt::Key_F6,      QApplicationPrivate::KB_Win},
diff --git a/src/gui/kernel/qlayout.cpp b/src/gui/kernel/qlayout.cpp
index 941db8f5f3..f41de1130f 100644
--- a/src/gui/kernel/qlayout.cpp
+++ b/src/gui/kernel/qlayout.cpp
@@ -148,7 +148,12 @@ QLayout::QLayout(QLayoutPrivate &dd, QLayout *lay, QWidget *w)
         } else {
             d->topLevel = true;
             w->d_func()->layout = this;
-            invalidate();
+            QT_TRY {
+                invalidate();
+            } QT_CATCH(...) {
+                w->d_func()->layout = 0;
+                QT_RETHROW;
+            }
         }
     }
 }
@@ -233,7 +238,12 @@ QLayout::QLayout(QWidget *parent, int margin, int spacing, const char *name)
         } else {
             d->topLevel = true;
             parent->d_func()->layout = this;
-            invalidate();
+            QT_TRY {
+                invalidate();
+            } QT_CATCH(...) {
+                parent->d_func()->layout = 0;
+                QT_RETHROW;
+            }
         }
     }
 }
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index 5d565803ec..2b7c391072 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -146,9 +146,8 @@ public:
     QShortcutMap constructor.
 */
 QShortcutMap::QShortcutMap()
+    : d_ptr(new QShortcutMapPrivate(this))
 {
-    d_ptr = new QShortcutMapPrivate(this);
-    Q_ASSERT(d_ptr != 0);
     resetState();
 }
 
@@ -157,8 +156,6 @@ QShortcutMap::QShortcutMap()
 */
 QShortcutMap::~QShortcutMap()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*! \internal
diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h
index 9e7d92c9e6..8962ac7d27 100644
--- a/src/gui/kernel/qshortcutmap_p.h
+++ b/src/gui/kernel/qshortcutmap_p.h
@@ -55,6 +55,7 @@
 
 #include "QtGui/qkeysequence.h"
 #include "QtCore/qvector.h"
+#include "QtCore/qscopedpointer.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -104,7 +105,7 @@ private:
 #ifndef QT_NO_ACTION
     bool correctContext(Qt::ShortcutContext context,QAction *a, QWidget *active_window) const;
 #endif
-    QShortcutMapPrivate *d_ptr;
+    QScopedPointer<QShortcutMapPrivate> d_ptr;
 
     QKeySequence::SequenceMatch find(QKeyEvent *e);
     QKeySequence::SequenceMatch matches(const QKeySequence &seq1, const QKeySequence &seq2) const;
diff --git a/src/gui/kernel/qsound.cpp b/src/gui/kernel/qsound.cpp
index 112a64eeca..73bad86c2a 100644
--- a/src/gui/kernel/qsound.cpp
+++ b/src/gui/kernel/qsound.cpp
@@ -153,6 +153,9 @@ public:
     \o Qt for Embedded Linux
     \o A built-in mixing sound server is used, accessing \c /dev/dsp
     directly. Only the WAVE format is supported.
+    \o Symbian
+    \o CMdaAudioPlayerUtility is used. All formats that Symbian OS or devices support
+    are supported also by Qt.
     \endtable
 
     Note that QSound does not support \l{resources.html}{resources}.
diff --git a/src/gui/kernel/qsound_s60.cpp b/src/gui/kernel/qsound_s60.cpp
new file mode 100644
index 0000000000..c9eedf5b9c
--- /dev/null
+++ b/src/gui/kernel/qsound_s60.cpp
@@ -0,0 +1,206 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+
+#ifndef QT_NO_SOUND
+
+#include "qdir.h"
+#include "qapplication.h"
+#include "qsound.h"
+#include "qsound_p.h"
+#include "qfileinfo.h"
+#include <private/qcore_symbian_p.h>
+
+#include <e32std.h>
+#include <MdaAudioSamplePlayer.h>
+
+QT_BEGIN_NAMESPACE
+
+class QAuServerS60;
+
+class QAuBucketS60 : public QAuBucket, public MMdaAudioPlayerCallback
+{
+public:
+    QAuBucketS60( QAuServerS60 *server, QSound *sound);
+    ~QAuBucketS60();
+
+    void play();
+    void stop();
+    
+    inline QSound* sound() const { return m_sound; }
+    
+public: // from MMdaAudioPlayerCallback
+    void MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration);
+    void MapcPlayComplete(TInt aError);    
+
+private:
+    QSound *m_sound;
+    QAuServerS60 *m_server;    
+    bool m_prepared;
+    bool m_playCalled;    
+    CMdaAudioPlayerUtility* m_playUtility;    
+};
+
+    
+class QAuServerS60 : public QAuServer
+{
+public:
+    QAuServerS60( QObject* parent );
+
+    void init( QSound* s )
+    {
+        QAuBucketS60 *bucket = new QAuBucketS60( this, s );
+        setBucket( s, bucket );
+    }
+
+    void play( QSound* s )
+    {
+        bucket( s )->play();
+    }
+
+    void stop( QSound* s )
+    {
+        bucket( s )->stop();
+    }
+
+    bool okay() { return true; }
+    
+protected:
+    void playCompleted(QAuBucketS60* bucket, int error)  
+    {
+        QSound *sound = bucket->sound();        
+        if(!error) {
+            // We need to handle repeats by ourselves, since with Symbian API we don't
+            // know how many loops have been played when user asks it
+            if( decLoop( sound ) ) {
+                play( sound );
+            }
+        } else {
+            // We don't have a way to inform about errors -> just decrement loops
+            // in order that QSound::isFinished will return true;
+            while(decLoop(sound)) {}
+        }
+    }    
+
+protected:
+    QAuBucketS60* bucket( QSound *s )
+    {
+        return (QAuBucketS60*)QAuServer::bucket( s );
+    }
+    
+    friend class QAuBucketS60;
+
+};
+
+QAuServerS60::QAuServerS60(QObject* parent) :
+    QAuServer(parent)
+{
+    setObjectName(QLatin1String("QAuServerS60"));
+}
+
+
+QAuServer* qt_new_audio_server()
+{
+    return new QAuServerS60(qApp);
+}
+
+QAuBucketS60::QAuBucketS60( QAuServerS60 *server, QSound *sound )
+    : m_sound( sound ), m_server( server ), m_prepared(false), m_playCalled(false)
+{
+    QString filepath = QFileInfo( m_sound->fileName() ).absoluteFilePath();
+    filepath = QDir::toNativeSeparators(filepath);
+    TPtrC filepathPtr(qt_QString2TPtrC(filepath));
+    TRAPD(err, m_playUtility = CMdaAudioPlayerUtility::NewL(*this);
+               m_playUtility->OpenFileL(filepathPtr));
+    if(err){
+        m_server->playCompleted(this, err);
+    }
+}
+
+void QAuBucketS60::play()
+{
+    if(m_prepared) {
+        // OpenFileL call is completed we can start playing immediately
+        m_playUtility->Play();      
+    } else {
+        m_playCalled = true;
+    }
+        
+}
+
+void QAuBucketS60::stop()
+{
+    m_playCalled = false;
+    m_playUtility->Stop();    
+}
+
+void QAuBucketS60::MapcPlayComplete(TInt aError)
+{
+    m_server->playCompleted(this, aError);
+}
+ 
+void QAuBucketS60::MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& /*aDuration*/)    
+{
+    if(aError) {
+        m_server->playCompleted(this, aError);
+    } else {
+        m_prepared = true;    
+        if(m_playCalled){
+            play(); 
+        }
+    }
+}
+
+QAuBucketS60::~QAuBucketS60()
+{
+    if(m_playUtility){
+        m_playUtility->Stop();
+        m_playUtility->Close();
+    }
+    
+    delete m_playUtility;
+}
+
+
+#endif // QT_NO_SOUND
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
new file mode 100644
index 0000000000..bcbe48f62b
--- /dev/null
+++ b/src/gui/kernel/qt_s60_p.h
@@ -0,0 +1,292 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT_S60_P_H
+#define QT_S60_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "QtGui/qwindowdefs.h"
+#include "private/qcore_symbian_p.h"
+#include "qhash.h"
+#include "qpoint.h"
+#include "QtGui/qfont.h"
+#include "QtGui/qimage.h"
+#include "QtGui/qevent.h"
+#include "qpointer.h"
+#include <w32std.h>
+#include <coecntrl.h>
+#include <eikenv.h>
+#include <eikappui.h>
+
+#ifdef Q_WS_S60
+#include <aknutils.h>               // AknLayoutUtils
+#include <avkon.hrh>                // EEikStatusPaneUidTitle
+#include <akntitle.h>               // CAknTitlePane
+#include <akncontext.h>             // CAknContextPane
+#include <eikspane.h>               // CEikStatusPane
+#endif
+    
+QT_BEGIN_NAMESPACE
+
+// Application internal HandleResourceChangeL events, 
+// system evens seems to start with 0x10
+const TInt KInternalStatusPaneChange = 0x50000000;
+
+struct QS60Data;
+extern QS60Data *qt_s60Data;
+
+#define S60 qt_s60Data
+
+class QS60Data
+{
+public:
+    TUid uid;
+    int screenDepth;
+    QPoint lastCursorPos;
+    QPoint lastPointerEventPos;
+    QPointer<QWidget> lastPointerEventTarget;
+    QPointer<QWidget> mousePressTarget;
+    int screenWidthInPixels;
+    int screenHeightInPixels;
+    int screenWidthInTwips;
+    int screenHeightInTwips;
+    int defaultDpiX;
+    int defaultDpiY;
+    static inline void updateScreenSize();
+    static inline RWsSession& wsSession();
+    static inline RWindowGroup& windowGroup();
+    static inline CWsScreenDevice* screenDevice();
+    static inline CCoeAppUi* appUi();
+#ifdef Q_WS_S60
+    static inline CEikStatusPane* statusPane();
+    static inline CCoeControl* statusPaneSubPane(TInt aPaneId);
+    static inline CAknTitlePane* titlePane();
+    static inline CAknContextPane* contextPane();
+    static inline CEikButtonGroupContainer* buttonGroupContainer();
+#endif
+};
+
+class QAbstractLongTapObserver
+{
+public:
+    virtual void HandleLongTapEventL( const TPoint& aPenEventLocation, 
+                                      const TPoint& aPenEventScreenLocation ) = 0;
+};
+class QLongTapTimer;
+
+class QSymbianControl : public CCoeControl, public QAbstractLongTapObserver
+{
+public:
+    DECLARE_TYPE_ID(0x51740000) // Fun fact: the two first values are "Qt" in ASCII.
+
+public:
+    QSymbianControl(QWidget *w);
+    void ConstructL(bool topLevel = false, bool desktop = false);
+    ~QSymbianControl();
+    void HandleResourceChange(int resourceType);
+    void HandlePointerEventL(const TPointerEvent& aPointerEvent);
+    TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType);
+#if !defined(QT_NO_IM) && defined(Q_WS_S60)
+    TCoeInputCapabilities InputCapabilities() const;
+#endif
+    TTypeUid::Ptr MopSupplyObject(TTypeUid id);
+
+    inline QWidget* widget() const { return qwidget; };
+    void setWidget(QWidget *w);
+    void sendInputEvent(QWidget *widget, QInputEvent *inputEvent);
+    void setIgnoreFocusChanged(bool enabled) { m_ignoreFocusChanged = enabled; }
+    void CancelLongTapTimer();
+
+protected:
+    void Draw(const TRect& aRect) const;
+    void SizeChanged();
+    void PositionChanged();
+    void FocusChanged(TDrawNow aDrawNow);
+
+private:
+    TKeyResponse OfferKeyEvent(const TKeyEvent& aKeyEvent,TEventCode aType);
+    TKeyResponse sendKeyEvent(QWidget *widget, QKeyEvent *keyEvent);
+    void sendMouseEvent(QWidget *widget, QMouseEvent *mEvent);
+    void HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& aPenEventScreenLocation );
+
+private:
+    QWidget *qwidget;
+    bool m_ignoreFocusChanged;
+    QLongTapTimer* m_longTapDetector;
+    bool m_previousEventLongTap;
+};
+
+inline void QS60Data::updateScreenSize()
+{
+    TPixelsTwipsAndRotation params;
+    int mode = S60->screenDevice()->CurrentScreenMode();
+    S60->screenDevice()->GetScreenModeSizeAndRotation(mode, params);
+    S60->screenWidthInPixels = params.iPixelSize.iWidth;
+    S60->screenHeightInPixels = params.iPixelSize.iHeight;
+    S60->screenWidthInTwips = params.iTwipsSize.iWidth;
+    S60->screenHeightInTwips = params.iTwipsSize.iHeight;
+
+    TReal inches = S60->screenHeightInTwips / (TReal)KTwipsPerInch;
+    S60->defaultDpiY = S60->screenHeightInPixels / inches;
+    inches = S60->screenWidthInTwips / (TReal)KTwipsPerInch;
+    S60->defaultDpiX = S60->screenWidthInPixels / inches;
+}
+
+inline RWsSession& QS60Data::wsSession()
+{
+    return CCoeEnv::Static()->WsSession();
+}
+
+inline RWindowGroup& QS60Data::windowGroup()
+{
+    return CCoeEnv::Static()->RootWin();
+}
+
+inline CWsScreenDevice* QS60Data::screenDevice()
+{
+    return CCoeEnv::Static()->ScreenDevice();
+}
+
+inline CCoeAppUi* QS60Data::appUi()
+{
+    return CCoeEnv::Static()-> AppUi();
+}
+
+#ifdef Q_WS_S60
+inline CEikStatusPane* QS60Data::statusPane()
+{
+    return CEikonEnv::Static()->AppUiFactory()->StatusPane();
+}
+
+// Returns the application's status pane control, if not present returns NULL.
+inline CCoeControl* QS60Data::statusPaneSubPane( TInt aPaneId )
+{
+    const TUid paneUid = { aPaneId };
+    CEikStatusPane* statusPane = S60->statusPane();
+    if (statusPane && statusPane->PaneCapabilities(paneUid).IsPresent()) {
+        CCoeControl* control = NULL;
+        // ControlL shouldn't leave because the pane is present
+        TRAPD(err, control = statusPane->ControlL(paneUid));
+        return err != KErrNone ? NULL : control;
+    }
+    return NULL;
+}
+
+// Returns the application's title pane, if not present returns NULL.
+inline CAknTitlePane* QS60Data::titlePane()
+{
+    return static_cast<CAknTitlePane*>(S60->statusPaneSubPane(EEikStatusPaneUidTitle));
+}
+
+// Returns the application's title pane, if not present returns NULL.
+inline CAknContextPane* QS60Data::contextPane()
+{
+    return static_cast<CAknContextPane*>(S60->statusPaneSubPane(EEikStatusPaneUidContext));
+}
+
+inline CEikButtonGroupContainer* QS60Data::buttonGroupContainer()
+{
+    return CEikonEnv::Static()->AppUiFactory()->Cba();
+}
+#endif // Q_WS_S60
+
+static inline QFont qt_TFontSpec2QFontL(const TFontSpec &fontSpec)
+{
+    return QFont(
+        qt_TDesC2QStringL(fontSpec.iTypeface.iName),
+        fontSpec.iHeight / KTwipsPerPoint,
+        fontSpec.iFontStyle.StrokeWeight() == EStrokeWeightNormal ? QFont::Normal : QFont::Bold,
+        fontSpec.iFontStyle.Posture() == EPostureItalic
+    );
+}
+
+static inline QImage::Format qt_TDisplayMode2Format(TDisplayMode mode)
+{
+    QImage::Format format;
+    switch(mode) {
+    case EGray2:
+        format = QImage::Format_MonoLSB;
+        break;
+    case EColor256:
+    case EGray256:
+        format = QImage::Format_Indexed8;
+        break;
+    case EColor4K:
+        format = QImage::Format_RGB444;
+        break;
+    case EColor64K:
+        format = QImage::Format_RGB16;
+        break;
+    case EColor16M:
+        format = QImage::Format_RGB666;
+        break;
+    case EColor16MU:
+        format = QImage::Format_RGB32;
+        break;
+    case EColor16MA:
+        format = QImage::Format_ARGB32;
+        break;
+#if !defined(__SERIES60_31__) && !defined(__S60_32__)
+    case EColor16MAP:
+        format = QImage::Format_ARGB32_Premultiplied;
+        break;
+#endif
+    default:
+        format = QImage::Format_Invalid;
+        break;
+    }
+    return format;
+}
+
+
+QT_END_NAMESPACE
+
+#endif // QT_S60_P_H
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 43ac37d176..d7c89a6f32 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -101,6 +101,10 @@
 #endif
 #include <private/qpaintengine_raster_p.h>
 
+#if defined(Q_OS_SYMBIAN)
+#include "private/qt_s60_p.h"
+#endif
+
 #include "qwidget_p.h"
 #include "qaction_p.h"
 #include "qlayout_p.h"
@@ -212,6 +216,7 @@ QWidgetPrivate::QWidgetPrivate(int version)
       , window_event(0)
       , qd_hd(0)
 #endif
+		,imHints(Qt::ImhNone)
 {
     if (!qApp) {
         qFatal("QWidget: Must construct a QApplication before a QPaintDevice");
@@ -402,6 +407,7 @@ void QWidget::setEditFocus(bool on)
         QApplication::sendEvent(f, &event);
         QApplication::sendEvent(f->style(), &event);
     }
+    f->repaint(); // Widget might want to repaint a focus indicator
 }
 #endif
 
@@ -890,6 +896,30 @@ void QWidget::setAutoFillBackground(bool enabled)
     \endlist
 
     \sa QEvent, QPainter, QGridLayout, QBoxLayout
+    
+    \section1 SoftKeys
+    \since 4.6
+    \preliminary
+
+    Softkeys API is a platform independent way of mapping actions to (hardware)keys 
+    and toolbars provided by the underlying platform.
+    
+    There are three major use cases supported. First one is a mobile device 
+    with keypad navigation and no touch ui. Second use case is a mobile
+    device with touch ui. Third use case is desktop. For now the softkey API is 
+    only implemented for Series60.
+    
+    QActions are set to widget(s) via softkey API. Actions in focused widget are 
+    mapped to native toolbar or hardware keys. Even though the API allows to set
+    any amount of widgets there might be physical restrictions to amount of 
+    softkeys that can be used by the device.
+
+    \o Series60: For series60 menu button is automatically mapped to left
+    soft key if there is QMainWindow with QMenuBar in widgets parent hierarchy.
+
+    \sa softKeys()
+    \sa setSoftKey()
+        
 */
 
 QWidgetMapper *QWidgetPrivate::mapper = 0;                // widget with wid
@@ -933,6 +963,23 @@ QRegion qt_dirtyRegion(QWidget *widget)
   \endlist
 */
 
+struct QWidgetExceptionCleaner
+{
+    /* this cleans up when the constructor throws an exception */
+    static inline void cleanup(QWidget *that, QWidgetPrivate *d)
+    {
+#ifndef QT_NO_EXCEPTIONS
+        QWidgetPrivate::uncreatedWidgets->remove(that);
+        if (d->focus_next != that) {
+            if (d->focus_next)
+                d->focus_next->d_func()->focus_prev = d->focus_prev;
+            if (d->focus_prev)
+                d->focus_prev->d_func()->focus_next = d->focus_next;
+        }
+#endif
+    }
+};
+
 /*!
     Constructs a widget which is a child of \a parent, with  widget
     flags set to \a f.
@@ -962,7 +1009,12 @@ QRegion qt_dirtyRegion(QWidget *widget)
 QWidget::QWidget(QWidget *parent, Qt::WindowFlags f)
     : QObject(*new QWidgetPrivate, 0), QPaintDevice()
 {
-    d_func()->init(parent, f);
+    QT_TRY {
+        d_func()->init(parent, f);
+    } QT_CATCH(...) {
+        QWidgetExceptionCleaner::cleanup(this, d_func());
+        QT_RETHROW;
+    }
 }
 
 #ifdef QT3_SUPPORT
@@ -973,8 +1025,13 @@ QWidget::QWidget(QWidget *parent, Qt::WindowFlags f)
 QWidget::QWidget(QWidget *parent, const char *name, Qt::WindowFlags f)
     : QObject(*new QWidgetPrivate, 0), QPaintDevice()
 {
-    d_func()->init(parent , f);
-    setObjectName(QString::fromAscii(name));
+    QT_TRY {
+        d_func()->init(parent , f);
+        setObjectName(QString::fromAscii(name));
+    } QT_CATCH(...) {
+        QWidgetExceptionCleaner::cleanup(this, d_func());
+        QT_RETHROW;
+    }
 }
 #endif
 
@@ -983,7 +1040,13 @@ QWidget::QWidget(QWidget *parent, const char *name, Qt::WindowFlags f)
 QWidget::QWidget(QWidgetPrivate &dd, QWidget* parent, Qt::WindowFlags f)
     : QObject(dd, 0), QPaintDevice()
 {
-    d_func()->init(parent, f);
+    Q_D(QWidget);
+    QT_TRY {
+        d->init(parent, f);
+    } QT_CATCH(...) {
+        QWidgetExceptionCleaner::cleanup(this, d_func());
+        QT_RETHROW;
+    }
 }
 
 /*!
@@ -1265,7 +1328,7 @@ void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow)
     d->create_sys(window, initializeWindow, destroyOldWindow);
 
     // a real toplevel window needs a backing store
-    if (isWindow()) {
+    if (isWindow() && windowType() != Qt::Desktop) {
         delete d->topData()->backingStore;
         // QWidgetBackingStore will check this variable, hence it must be 0
         d->topData()->backingStore = 0;
@@ -1939,6 +2002,9 @@ void QWidgetPrivate::setOpaque(bool opaque)
 #ifdef Q_WS_WIN
     winUpdateIsOpaque();
 #endif
+#ifdef Q_OS_SYMBIAN
+    s60UpdateIsOpaque();
+#endif
 }
 
 void QWidgetPrivate::updateIsTranslucent()
@@ -1952,6 +2018,9 @@ void QWidgetPrivate::updateIsTranslucent()
 #ifdef Q_WS_WIN
     winUpdateIsOpaque();
 #endif
+#ifdef Q_OS_SYMBIAN
+    s60UpdateIsOpaque();
+#endif
 }
 
 /*!
@@ -1986,10 +2055,17 @@ static inline void fillRegion(QPainter *painter, const QRegion &rgn, const QBrus
         extern void qt_mac_fill_background(QPainter *painter, const QRegion &rgn, const QBrush &brush);
         qt_mac_fill_background(painter, rgn, brush);
 #else
-        const QRect rect(rgn.boundingRect());
-        painter->setClipRegion(rgn);
-        painter->drawTiledPixmap(rect, brush.texture(), rect.topLeft());
-#endif
+#if !defined(QT_NO_STYLE_S60)
+        // Defined in qs60style.cpp
+        extern bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QBrush &brush);
+        if (!qt_s60_fill_background(painter, rgn, brush))
+#endif // !defined(QT_NO_STYLE_S60)
+        {
+            const QRect rect(rgn.boundingRect());
+            painter->setClipRegion(rgn);
+            painter->drawTiledPixmap(rect, brush.texture(), rect.topLeft());
+        }
+#endif // Q_WS_MAC
     } else {
         const QVector<QRect> &rects = rgn.rects();
         for (int i = 0; i < rects.size(); ++i)
@@ -2007,7 +2083,7 @@ void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, int
     //If we are painting the viewport of a scrollarea, we must apply an offset to the brush in case we are drawing a texture
     QAbstractScrollArea *scrollArea = qobject_cast<QAbstractScrollArea *>(parent);
     if (scrollArea && scrollArea->viewport() == q) {
-        QObjectData *scrollPrivate = static_cast<QWidget *>(scrollArea)->d_ptr;
+        QObjectData *scrollPrivate = static_cast<QWidget *>(scrollArea)->d_ptr.data();
         QAbstractScrollAreaPrivate *priv = static_cast<QAbstractScrollAreaPrivate *>(scrollPrivate);
         oldBrushOrigin = painter->brushOrigin();
         resetBrushOrigin = true;
@@ -2582,7 +2658,7 @@ bool QWidget::isMaximized() const
  */
 Qt::WindowStates QWidget::windowState() const
 {
-    return (Qt::WindowStates)data->window_state;
+    return Qt::WindowStates(data->window_state);
 }
 
 /*!\internal
@@ -2594,7 +2670,7 @@ Qt::WindowStates QWidget::windowState() const
  */
 void QWidget::overrideWindowState(Qt::WindowStates newstate)
 {
-    QWindowStateChangeEvent e((Qt::WindowStates)data->window_state, true);
+    QWindowStateChangeEvent e(Qt::WindowStates(data->window_state), true);
     data->window_state  = newstate;
     QApplication::sendEvent(this, &e);
 }
@@ -4848,6 +4924,13 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
     d->extra->inRenderWithPainter = false;
 }
 
+#if !defined(Q_OS_SYMBIAN)
+void QWidgetPrivate::setSoftKeys_sys(const QList<QAction*> &softkeys)
+{
+    Q_UNUSED(softkeys)
+}
+#endif // !defined(Q_OS_SYMBIAN)
+
 bool QWidgetPrivate::isAboutToShow() const
 {
     if (data.in_show)
@@ -5669,9 +5752,11 @@ bool QWidget::hasFocus() const
 
 void QWidget::setFocus(Qt::FocusReason reason)
 {
+    Q_D(QWidget);
+
     if (!isEnabled())
         return;
-
+    
     QWidget *f = this;
     while (f->d_func()->extra && f->d_func()->extra->focus_proxy)
         f = f->d_func()->extra->focus_proxy;
@@ -6727,7 +6812,7 @@ void QWidgetPrivate::show_helper()
     // On Windows, show the popup now so that our own focus handling
     // stores the correct old focus widget even if it's stolen in the
     // showevent
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_OS_SYMBIAN)
     if (!isEmbedded && q->windowType() == Qt::Popup)
         qApp->d_func()->openPopup(q);
 #endif
@@ -6744,7 +6829,7 @@ void QWidgetPrivate::show_helper()
 
     show_sys();
 
-#if !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
+#if !defined(Q_WS_WIN) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN)
     if (!isEmbedded && q->windowType() == Qt::Popup)
         qApp->d_func()->openPopup(q);
 #endif
@@ -7314,7 +7399,7 @@ QSize QWidgetPrivate::adjustedSize() const
 #else // all others
         QRect screen = QApplication::desktop()->screenGeometry(q->pos());
 #endif
-#if defined (Q_WS_WINCE)
+#if defined (Q_WS_WINCE) || defined (Q_OS_SYMBIAN)
         s.setWidth(qMin(s.width(), screen.width()));
         s.setHeight(qMin(s.height(), screen.height()));
 #else
@@ -7625,6 +7710,7 @@ bool QWidget::event(QEvent *event)
         }
         break;
     case QEvent::FocusIn:
+        d->setSoftKeys_sys(softKeys());
         focusInEvent((QFocusEvent*)event);
         break;
 
@@ -7774,6 +7860,10 @@ bool QWidget::event(QEvent *event)
             if (w && w->isVisible() && !w->isWindow())
                 QApplication::sendEvent(w, event);
         }
+
+        if (isWindow() && isActiveWindow())
+            d->setSoftKeys_sys(softKeys());
+
         break; }
 
     case QEvent::LanguageChange:
@@ -7940,6 +8030,12 @@ bool QWidget::event(QEvent *event)
         (void) QApplication::sendEvent(this, &mouseEvent);
         break;
     }
+    case QEvent::SymbianDeferredFocusChanged: {
+#ifdef Q_OS_SYMBIAN
+        d->handleSymbianDeferredFocusChanged();
+#endif
+        break;
+    }
 #ifdef Q_WS_WIN
     case QEvent::WinGesture: {
         QWinGestureEvent *ev = static_cast<QWinGestureEvent*>(event);
@@ -8539,7 +8635,7 @@ void QWidget::inputMethodEvent(QInputMethodEvent *event)
 
     \a query specifies which property is queried.
 
-    \sa inputMethodEvent(), QInputMethodEvent, QInputContext
+    \sa inputMethodEvent(), QInputMethodEvent, QInputContext, inputMethodHints
 */
 QVariant QWidget::inputMethodQuery(Qt::InputMethodQuery query) const
 {
@@ -8548,11 +8644,54 @@ QVariant QWidget::inputMethodQuery(Qt::InputMethodQuery query) const
         return QRect(width()/2, 0, 1, height());
     case Qt::ImFont:
         return font();
+    case Qt::ImAnchorPosition:
+        // Fallback.
+        return inputMethodQuery(Qt::ImCursorPosition);
     default:
         return QVariant();
     }
 }
 
+/*!
+    \property QWidget::inputMethodHints
+    \brief What input method specific hints the widget has.
+
+    This is only relevant for input widgets. It is used by
+    the input method to retrieve hints as to how the input method
+    should operate. For example, if the Qt::ImhFormattedNumbersOnly flag
+    is set, the input method may change its visual components to reflect
+    that only numbers can be entered.
+
+    \note The flags are only hints, so the particular input method
+          implementation is free to ignore them. If you want to be
+          sure that a certain type of characters are entered,
+          you should also set a QValidator on the widget.
+
+    The default value is Qt::ImhNone.
+
+    \since 4.6
+
+    \sa inputMethodQuery(), QInputContext
+*/
+Qt::InputMethodHints QWidget::inputMethodHints() const
+{
+    Q_D(const QWidget);
+    return d->imHints;
+}
+
+void QWidget::setInputMethodHints(Qt::InputMethodHints hints)
+{
+    Q_D(QWidget);
+    d->imHints = hints;
+    // Optimisation to update input context only it has already been created.
+    if (d->ic || qApp->d_func()->inputContext) {
+        QInputContext *ic = inputContext();
+        if (ic)
+            ic->update();
+    }
+}
+
+
 #ifndef QT_NO_DRAGANDDROP
 
 /*!
@@ -10363,7 +10502,7 @@ void QWidget::setShortcutAutoRepeat(int id, bool enable)
 */
 void QWidget::updateMicroFocus()
 {
-#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS))
+#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
     Q_D(QWidget);
     // and optimisation to update input context only it has already been created.
     if (d->ic || qApp->d_func()->inputContext) {
@@ -11497,6 +11636,68 @@ void QWidget::clearMask()
     setMask(QRegion());
 }
 
+/*!
+    \preliminary
+    \since 4.6
+    
+    Returns the (possibly empty) list of this widget's softkeys.
+    Returned list cannot be changed. Softkeys should be added
+    and removed via method called setSoftKeys
+
+    \sa setSoftKey(), setSoftKeys()
+*/
+const QList<QAction*>& QWidget::softKeys() const
+{
+    Q_D(const QWidget);
+    if( d->softKeys.count() > 0)
+        return d->softKeys;
+    if (isWindow() || !parentWidget())
+        return d->softKeys;
+
+    return parentWidget()->softKeys();
+}
+
+/*!
+    \preliminary
+    \since 4.6
+    
+    Sets the softkey \a softkey to this widget's list of softkeys,
+    Setting 0 as softkey will clear all the existing softkeys set
+    to the widget
+    A QWidget can have 0 or more softkeys
+
+    \sa softKeys(), setSoftKeys()
+*/
+void QWidget::setSoftKey(QAction *softKey)
+{
+    Q_D(QWidget);
+    qDeleteAll(d->softKeys);
+    d->softKeys.clear();
+    if (softKey)
+        d->softKeys.append(softKey);
+    if ((!QApplication::focusWidget() && this == QApplication::activeWindow())
+        || QApplication::focusWidget() == this)
+        d->setSoftKeys_sys(this->softKeys());
+}
+
+/*!
+    Sets the list of softkeys \a softkeys to this widget's list of softkeys,
+    A QWidget can have 0 or more softkeys
+
+    \sa softKeys(), setSoftKey()
+*/
+void QWidget::setSoftKeys(const QList<QAction*> &softKeys)
+{
+    Q_D(QWidget);
+    qDeleteAll(d->softKeys);
+    d->softKeys.clear();
+        d->softKeys = softKeys;
+
+    if ((!QApplication::focusWidget() && this == QApplication::activeWindow())
+        || QApplication::focusWidget() == this)
+        d->setSoftKeys_sys(this->softKeys());
+}
+
 /*! \fn const QX11Info &QWidget::x11Info() const
     Returns information about the configuration of the X display used to display
     the widget.
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index bc9952c421..c73f633775 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -213,6 +213,7 @@ class Q_GUI_EXPORT QWidget : public QObject, public QPaintDevice
 #endif
     Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET unsetLocale)
     Q_PROPERTY(QString windowFilePath READ windowFilePath WRITE setWindowFilePath DESIGNABLE isWindow)
+    Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints)
 
 public:
     enum RenderFlag {
@@ -555,6 +556,9 @@ public:
     void removeAction(QAction *action);
     QList<QAction*> actions() const;
 #endif
+    const QList<QAction*>& softKeys() const;
+    void setSoftKey(QAction *softKey);
+    void setSoftKeys(const QList<QAction*> &softKeys);
 
     QWidget *parentWidget() const;
 
@@ -675,6 +679,10 @@ protected:
     virtual void inputMethodEvent(QInputMethodEvent *);
 public:
     virtual QVariant inputMethodQuery(Qt::InputMethodQuery) const;
+
+    Qt::InputMethodHints inputMethodHints() const;
+    void setInputMethodHints(Qt::InputMethodHints hints);
+
 protected:
     void resetInputContext();
 protected Q_SLOTS:
@@ -725,6 +733,7 @@ private:
     friend class QGraphicsProxyWidget;
     friend class QGraphicsProxyWidgetPrivate;
     friend class QStyleSheetStyle;
+    friend struct QWidgetExceptionCleaner;
 
 #ifdef Q_WS_MAC
     friend class QCoreGraphicsPaintEnginePrivate;
@@ -746,6 +755,10 @@ private:
     friend bool isWidgetOpaque(const QWidget *);
     friend class QGLWidgetPrivate;
 #endif
+#ifdef Q_OS_SYMBIAN
+    friend class QSymbianControl;
+    friend class QS60WindowSurface;
+#endif
 #ifdef Q_WS_X11
     friend void qt_net_update_user_time(QWidget *tlw, unsigned long timestamp);
     friend void qt_net_remove_user_time(QWidget *tlw);
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 998181e85a..1d9689e9c0 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -80,6 +80,14 @@
 #include "QtGui/qscreen_qws.h"
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+class RDrawableWindow;
+class CCoeControl;
+// The following 2 defines may only be needed for s60. To be seen.
+const int SOFTKEYSTART=5000;
+const int SOFTKEYEND=5004;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 // Extra QWidget data
@@ -162,6 +170,9 @@ struct QTLWExtra {
 #ifndef QT_NO_QWS_MANAGER
     QWSManager *qwsManager;
 #endif
+#elif defined(Q_OS_SYMBIAN) // <--------------------------------------------------------- SYMBIAN
+    uint activated : 1; // RWindowBase::Activated has been called
+    RDrawableWindow *rwindow;
 #endif
 };
 
@@ -243,6 +254,7 @@ public:
     explicit QWidgetPrivate(int version = QObjectPrivateVersion);
     ~QWidgetPrivate();
 
+    void setSoftKeys_sys(const QList<QAction*> &softkeys);
     QWExtra *extraData() const;
     QTLWExtra *topData() const;
     QTLWExtra *maybeTopData() const;
@@ -269,6 +281,10 @@ public:
     QPalette naturalWidgetPalette(uint inheritedMask) const;
 
     void setMask_sys(const QRegion &);
+#ifdef Q_OS_SYMBIAN
+    void handleSymbianDeferredFocusChanged();
+#endif
+
     void raise_sys();
     void lower_sys();
     void stackUnder_sys(QWidget *);
@@ -467,6 +483,7 @@ public:
     QWidget *focus_next;
     QWidget *focus_prev;
     QWidget *focus_child;
+    QList<QAction*> softKeys;
     QLayout *layout;
     QRegion *needsFlush;
     QPaintDevice *redirectDev;
@@ -479,6 +496,7 @@ public:
     static QWidgetSet *uncreatedWidgets;
 #if !defined(QT_NO_IM)
     QPointer<QInputContext> ic;
+    Qt::InputMethodHints imHints;
 #endif
 #ifdef QT_KEYPAD_NAVIGATION
     static QPointer<QWidget> editingWidget;
@@ -638,7 +656,13 @@ public:
     void updateCursor() const;
 #endif
     QScreen* getScreen() const;
+#elif defined(Q_OS_SYMBIAN) // <--------------------------------------------------------- SYMBIAN
+    static QWidget *mouseGrabber;
+    static QWidget *keyboardGrabber;
+    void s60UpdateIsOpaque();
+    void reparentChildren();
 #endif
+
 };
 
 inline QWExtra *QWidgetPrivate::extraData() const
diff --git a/src/gui/kernel/qwidget_qws.cpp b/src/gui/kernel/qwidget_qws.cpp
index 299ed739f5..4ded5cf691 100644
--- a/src/gui/kernel/qwidget_qws.cpp
+++ b/src/gui/kernel/qwidget_qws.cpp
@@ -638,7 +638,8 @@ void QWidgetPrivate::hide_sys()
         q->releaseMouse();
 //        requestWindowRegion(QRegion());
 
-        extra->topextra->backingStore->releaseBuffer();
+        if (extra->topextra->backingStore)
+            extra->topextra->backingStore->releaseBuffer();
 
 
         QWidget::qwsDisplay()->requestFocus(data.winid,false);
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
new file mode 100644
index 0000000000..5b05e5521c
--- /dev/null
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -0,0 +1,1174 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwidget_p.h"
+#include "qdesktopwidget.h"
+#include "qapplication.h"
+#include "qapplication_p.h"
+#include "private/qbackingstore_p.h"
+#include "qevent.h"
+#include "qt_s60_p.h"
+
+#include "qbitmap.h"
+#include "private/qwindowsurface_s60_p.h"
+
+#include <qinputcontext.h>
+
+#ifdef Q_WS_S60
+#include <aknappui.h>
+#endif
+
+QT_BEGIN_NAMESPACE
+
+extern bool qt_nograb();
+
+QWidget *QWidgetPrivate::mouseGrabber = 0;
+QWidget *QWidgetPrivate::keyboardGrabber = 0;
+
+static bool isEqual(const QList<QAction*>& a, const QList<QAction*>& b)
+{
+    if ( a.count() != b.count())
+        return false;
+    int index=0;
+    while (index<a.count()) {
+        if (a.at(index)->softKeyRole() != b.at(index)->softKeyRole())
+            return false;
+        if (a.at(index)->text().compare(b.at(index)->text())!=0)
+            return false;
+        index++;
+    }
+    return true;
+}
+
+
+void QWidgetPrivate::setSoftKeys_sys(const QList<QAction*> &softkeys)
+{
+#ifdef Q_WS_S60
+    Q_Q(QWidget);
+    if (QApplication::focusWidget() && q!=QApplication::focusWidget()) {
+        QList<QAction *> old = QApplication::focusWidget()->softKeys();
+        if (isEqual(old, softkeys ))
+            return;
+    }
+    CEikButtonGroupContainer* nativeContainer = S60->buttonGroupContainer();
+    nativeContainer->SetCommandSetL(R_AVKON_SOFTKEYS_EMPTY_WITH_IDS);
+
+    int position = -1;
+    int command;
+    bool needsExitButton = true;
+
+    for (int index = 0; index < softkeys.count(); index++) {
+        const QAction* softKeyAction = softkeys.at(index);
+        switch (softKeyAction->softKeyRole()) {
+        // Positive Actions go on LSK
+        case QAction::OptionsSoftKey:
+        case QAction::MenuSoftKey:
+        case QAction::ContextMenuSoftKey:
+            command = EAknSoftkeyOptions; //Calls DynInitMenuPane in AppUI
+            position = 0;
+            break;
+        case QAction::SelectSoftKey:
+        case QAction::PreviousSoftKey:
+        case QAction::OkSoftKey:
+        case QAction::EditSoftKey:
+        case QAction::ViewSoftKey:
+        case QAction::EndEditSoftKey:
+        case QAction::FinishSoftKey:
+            command = SOFTKEYSTART + index;
+            position = 0;
+            break;
+        // Negative Actions on the RSK
+        case QAction::BackSoftKey:
+        case QAction::NextSoftKey:
+        case QAction::CancelSoftKey:
+        case QAction::BackSpaceSoftKey:
+        case QAction::RevertEditSoftKey:
+        case QAction::DeselectSoftKey:
+            needsExitButton = false;
+            command = SOFTKEYSTART + index;
+            position = 2;
+            break;
+        case QAction::ExitSoftKey:
+            needsExitButton = false;
+            command = EAknSoftkeyExit; //Calls HandleCommand in AppUI
+            position = 2;
+            break;
+        default:
+            break;
+        }
+
+        if (position != -1) {
+            TPtrC text = qt_QString2TPtrC(softKeyAction->text());
+            nativeContainer->SetCommandL(position, command, text);
+        }
+    }
+
+    if (needsExitButton)
+        nativeContainer->SetCommandL(2, EAknSoftkeyExit, qt_QString2TPtrC(QObject::tr("Exit")));
+
+    nativeContainer->DrawDeferred(); // 3.1 needs an extra invitation
+#else
+    Q_UNUSED(softkeys)
+#endif
+}
+
+void QWidgetPrivate::setWSGeometry(bool /* dontShow */, const QRect & /* rect */)
+{
+
+}
+
+void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
+{
+    Q_Q(QWidget);
+    Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+
+    if ((q->windowType() == Qt::Desktop))
+        return;
+    if (extra) {                                // any size restrictions?
+        w = qMin(w,extra->maxw);
+        h = qMin(h,extra->maxh);
+        w = qMax(w,extra->minw);
+        h = qMax(h,extra->minh);
+    }
+
+    if (q->isWindow())
+        topData()->normalGeometry = QRect(0, 0, -1, -1);
+    else {
+        uint s = data.window_state;
+        s &= ~(Qt::WindowMaximized | Qt::WindowFullScreen);
+        data.window_state = s;
+    }
+
+    QPoint oldPos(q->pos());
+    QSize oldSize(q->size());
+    QRect oldGeom(data.crect);
+
+    bool isResize = w != oldSize.width() || h != oldSize.height();
+    if (!isMove && !isResize)
+        return;
+
+    if (isResize)
+        data.window_state &= ~Qt::WindowMaximized;
+
+    if(q->isWindow()) {
+        if (w == 0 || h == 0) {
+            q->setAttribute(Qt::WA_OutsideWSRange, true);
+            if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
+                hide_sys();
+            data.crect = QRect(x, y, w, h);
+            data.window_state &= ~Qt::WindowFullScreen;
+        } else if (q->isVisible() && q->testAttribute(Qt::WA_OutsideWSRange)) {
+            q->setAttribute(Qt::WA_OutsideWSRange, false);
+
+            // put the window in its place and show it
+            q->internalWinId()->SetRect(TRect(TPoint(x, y), TSize(w, h)));
+            data.crect.setRect(x, y, w, h);
+
+            show_sys();
+        } else {
+            QRect r = QRect(x, y, w, h);
+            data.crect = r;
+            q->internalWinId()->SetRect(TRect(TPoint(x, y), TSize(w, h)));
+            topData()->normalGeometry = data.crect;
+        }
+    } else {
+        data.crect.setRect(x, y, w, h);
+
+        QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData();
+        const bool inTopLevelResize = tlwExtra ? tlwExtra->inTopLevelResize : false;
+
+        if (q->isVisible() && (!inTopLevelResize || q->internalWinId())) {
+            // Top-level resize optimization does not work for native child widgets;
+            // disable it for this particular widget.
+            if (inTopLevelResize)
+                tlwExtra->inTopLevelResize = false;
+            if (!isResize && maybeBackingStore())
+                moveRect(QRect(oldPos, oldSize), x - oldPos.x(), y - oldPos.y());
+            else
+                invalidateBuffer_resizeHelper(oldPos, oldSize);
+
+            if (inTopLevelResize)
+                tlwExtra->inTopLevelResize = true;
+        }
+        if (q->testAttribute(Qt::WA_WState_Created))
+            setWSGeometry();
+    }
+
+    if (q->isVisible()) {
+        if (isMove && q->pos() != oldPos) {
+            QMoveEvent e(q->pos(), oldPos);
+            QApplication::sendEvent(q, &e);
+        }
+        if (isResize) {
+            bool slowResize = qgetenv("QT_SLOW_TOPLEVEL_RESIZE").toInt();
+            const bool setTopLevelResize = !slowResize && q->isWindow() && extra && extra->topextra
+                                           && !extra->topextra->inTopLevelResize;
+            if (setTopLevelResize)
+                extra->topextra->inTopLevelResize = true;
+            QResizeEvent e(q->size(), oldSize);
+            QApplication::sendEvent(q, &e);
+            if (!q->testAttribute(Qt::WA_StaticContents) && q->internalWinId())
+                q->internalWinId()->DrawDeferred();
+            if (setTopLevelResize)
+                extra->topextra->inTopLevelResize = false;
+        }
+    } else {
+        if (isMove && q->pos() != oldPos)
+            q->setAttribute(Qt::WA_PendingMoveEvent, true);
+        if (isResize)
+            q->setAttribute(Qt::WA_PendingResizeEvent, true);
+    }
+}
+
+void QWidgetPrivate::create_sys(WId window, bool /* initializeWindow */, bool destroyOldWindow)
+{
+    Q_Q(QWidget);
+
+    Qt::WindowType type = q->windowType();
+    Qt::WindowFlags &flags = data.window_flags;
+    QWidget *parentWidget = q->parentWidget();
+
+    bool topLevel = (flags & Qt::Window);
+    bool popup = (type == Qt::Popup);
+    bool dialog = (type == Qt::Dialog
+                   || type == Qt::Sheet
+                   || (flags & Qt::MSWindowsFixedSizeDialogHint));
+    bool desktop = (type == Qt::Desktop);
+    //bool tool = (type == Qt::Tool || type == Qt::Drawer);
+
+    WId id = 0;
+
+    if (popup)
+        flags |= Qt::WindowStaysOnTopHint; // a popup stays on top
+
+    TRect clientRect = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
+    int sw = clientRect.Width();
+    int sh = clientRect.Height();
+
+    if (desktop) {
+        TSize screenSize = S60->screenDevice()->SizeInPixels();
+        data.crect.setRect(0, 0, screenSize.iWidth, screenSize.iHeight);
+        q->setAttribute(Qt::WA_DontShowOnScreen);
+    } else if(topLevel && !q->testAttribute(Qt::WA_Resized)){
+        int width = sw;
+        int height = sh;
+        if (extra) {
+            width = qMax(qMin(width, extra->maxw), extra->minw);
+            height = qMax(qMin(height, extra->maxh), extra->minh);
+        }
+        data.crect.setSize(QSize(width, height));
+    }
+
+    CCoeControl *destroyw = 0;
+
+    if(window) {
+        if (destroyOldWindow)
+            destroyw = data.winid;
+        id = window;
+        setWinId(window);
+        TRect tr = window->Rect();
+        data.crect.setRect(tr.iTl.iX, tr.iTl.iY, tr.Width(), tr.Height());
+
+    } else if (topLevel) {
+        if (!q->testAttribute(Qt::WA_Moved) && !q->testAttribute(Qt::WA_DontShowOnScreen))
+            data.crect.moveTopLeft(QPoint(clientRect.iTl.iX, clientRect.iTl.iY));
+        QSymbianControl *control= new QSymbianControl(q);
+        control->ConstructL(true,desktop);
+        if (!desktop) {
+            QTLWExtra *topExtra = topData();
+            topExtra->rwindow = control->DrawableWindow();
+            // Request mouse move events.
+            topExtra->rwindow->PointerFilter(EPointerFilterEnterExit
+                | EPointerFilterMove | EPointerFilterDrag, 0);
+            topExtra->rwindow->EnableVisibilityChangeEvents();
+
+            if (!isOpaque) {
+                RWindow *rwindow = static_cast<RWindow*>(topExtra->rwindow);
+                TDisplayMode gotDM = (TDisplayMode)rwindow->SetRequiredDisplayMode(EColor16MA);
+                if (rwindow->SetTransparencyAlphaChannel() == KErrNone)
+                    rwindow->SetBackgroundColor(TRgb(255, 255, 255, 0));
+            }
+        }
+
+
+        id = (WId)control;
+
+        setWinId(id);
+
+        q->setAttribute(Qt::WA_WState_Created);
+
+        int x, y, w, h;
+        data.crect.getRect(&x, &y, &w, &h);
+        control->SetRect(TRect(TPoint(x, y), TSize(w, h)));
+    } else if (q->testAttribute(Qt::WA_NativeWindow) || paintOnScreen()) { // create native child widget
+        QSymbianControl *control = new QSymbianControl(q);
+        control->ConstructL(!parentWidget);
+        setWinId(control);
+        WId parentw = parentWidget->effectiveWinId();
+        control->SetContainerWindowL(*parentw);
+
+        q->setAttribute(Qt::WA_WState_Created);
+        int x, y, w, h;
+        data.crect.getRect(&x, &y, &w, &h);
+        control->SetRect(TRect(TPoint(x, y), TSize(w, h)));
+    }
+
+    if (destroyw) {
+        destroyw->ControlEnv()->AppUi()->RemoveFromStack(destroyw);
+        CBase::Delete(destroyw);
+    }
+}
+
+
+void QWidgetPrivate::show_sys()
+{
+    Q_Q(QWidget);
+
+    if (q->testAttribute(Qt::WA_OutsideWSRange))
+        return;
+
+    Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+
+    q->setAttribute(Qt::WA_Mapped);
+
+    if (q->testAttribute(Qt::WA_DontShowOnScreen)) {
+        invalidateBuffer(q->rect());
+        return;
+    }
+
+    if (q->isWindow() && q->internalWinId()) {
+
+        WId id = q->internalWinId();
+        if (!extra->topextra->activated) {
+            id->ActivateL();
+            extra->topextra->activated = 1;
+        }
+        TInt stackingFlags;
+        if ((q->windowType() & Qt::Popup) == Qt::Popup) {
+            stackingFlags = ECoeStackFlagRefusesAllKeys | ECoeStackFlagRefusesFocus;
+        } else {
+            stackingFlags = ECoeStackFlagStandard;
+        }
+        id->ControlEnv()->AppUi()->AddToStackL(id, ECoeStackPriorityDefault, stackingFlags);
+        id->MakeVisible(true);
+
+        // Force setting of the icon after window is made visible,
+        // this is needed even WA_SetWindowIcon is not set, as in that case we need
+        // to reset to the application level window icon
+        setWindowIcon_sys(true);
+    }
+
+    invalidateBuffer(q->rect());
+}
+
+void QWidgetPrivate::hide_sys()
+{
+    Q_Q(QWidget);
+    Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+    deactivateWidgetCleanup();
+    WId id = q->internalWinId();
+    if (q->isWindow() && id) {
+        if(id->IsFocused()) // Avoid unnecessry calls to FocusChanged()
+            id->SetFocus(false);
+        id->MakeVisible(false);
+        id->ControlEnv()->AppUi()->RemoveFromStack(id);
+        if (QWidgetBackingStore *bs = maybeBackingStore())
+            bs->releaseBuffer();
+    } else {
+        invalidateBuffer(q->rect());
+    }
+
+    q->setAttribute(Qt::WA_Mapped, false);
+}
+
+void QWidgetPrivate::setFocus_sys()
+{
+    Q_Q(QWidget);
+    if (q->testAttribute(Qt::WA_WState_Created) && q->window()->windowType() != Qt::Popup)
+        if(!q->effectiveWinId()->IsFocused()) // Avoid unnecessry calls to FocusChanged()
+            q->effectiveWinId()->SetFocus(true);
+}
+
+void QWidgetPrivate::handleSymbianDeferredFocusChanged()
+{
+    Q_Q(QWidget);
+    WId control = q->internalWinId();
+    if (!control) {
+        // This could happen if the widget was reparented, while the focuschange
+        // was in the event queue.
+        return;
+    }
+
+    if (control->IsFocused()) {
+        QApplication::setActiveWindow(q);
+#ifdef Q_WS_S60
+        // If widget is fullscreen, hide status pane and button container
+        // otherwise show them.
+        CEikStatusPane* statusPane = S60->statusPane();
+        CEikButtonGroupContainer* buttonGroup = S60->buttonGroupContainer();
+        bool isFullscreen = q->windowState() & Qt::WindowFullScreen;
+        if (statusPane && (statusPane->IsVisible() == isFullscreen))
+            statusPane->MakeVisible(!isFullscreen);
+        if (buttonGroup && (buttonGroup->IsVisible() == isFullscreen))
+            buttonGroup->MakeVisible(!isFullscreen);
+#endif
+    } else {
+        QApplication::setActiveWindow(0);
+    }
+}
+
+void QWidgetPrivate::raise_sys()
+{
+    Q_Q(QWidget);
+    Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+    QTLWExtra *tlwExtra = maybeTopData();
+    if (q->internalWinId() && tlwExtra) {
+        tlwExtra->rwindow->SetOrdinalPosition(0);
+    }
+}
+
+void QWidgetPrivate::lower_sys()
+{
+    Q_Q(QWidget);
+    Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+    QTLWExtra *tlwExtra = maybeTopData();
+    if (q->internalWinId() && tlwExtra) {
+        tlwExtra->rwindow->SetOrdinalPosition(-1);
+    }
+    if(!q->isWindow())
+        invalidateBuffer(q->rect());
+}
+
+void QWidgetPrivate::setModal_sys()
+{
+
+}
+
+void QWidgetPrivate::stackUnder_sys(QWidget* w)
+{
+    Q_Q(QWidget);
+    Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+    QTLWExtra *tlwExtra = maybeTopData();
+    QTLWExtra *tlwExtraSibling = w->d_func()->maybeTopData();
+    if (q->internalWinId() && tlwExtra && w->internalWinId() && tlwExtraSibling)
+        tlwExtra->rwindow->SetOrdinalPosition(tlwExtraSibling->rwindow->OrdinalPosition() + 1);
+    if(!q->isWindow() || !w->internalWinId())
+        invalidateBuffer(q->rect());
+}
+
+void QWidgetPrivate::reparentChildren()
+{
+    Q_Q(QWidget);
+    QObjectList chlist = q->children();
+    for (int i = 0; i < chlist.size(); ++i) { // reparent children
+        QObject *obj = chlist.at(i);
+        if (obj->isWidgetType()) {
+            QWidget *w = (QWidget *)obj;
+            if (!w->testAttribute(Qt::WA_WState_Created))
+                continue;
+            if (!w->isWindow()) {
+                w->d_func()->invalidateBuffer(w->rect());
+                WId parent = q->effectiveWinId();
+                WId child = w->effectiveWinId();
+                if (parent != child)
+                    child->SetParent(parent);
+                // ### TODO: We probably also need to update the component array here
+                w->d_func()->reparentChildren();
+            } else {
+                bool showIt = w->isVisible();
+                QPoint old_pos = w->pos();
+                w->setParent(q, w->windowFlags());
+                w->move(old_pos);
+                if (showIt)
+                    w->show();
+            }
+        }
+    }
+}
+
+void QWidgetPrivate::setParent_sys(QWidget *parent, Qt::WindowFlags f)
+{
+    Q_Q(QWidget);
+    bool wasCreated = q->testAttribute(Qt::WA_WState_Created);
+
+    if (q->isVisible() && q->parentWidget() && parent != q->parentWidget())
+        q->parentWidget()->d_func()->invalidateBuffer(q->geometry());
+
+    if (q->testAttribute(Qt::WA_DropSiteRegistered))
+        q->setAttribute(Qt::WA_DropSiteRegistered, false);
+
+    WId old_winid = wasCreated ? data.winid : 0;
+    if ((q->windowType() == Qt::Desktop))
+        old_winid = 0;
+    setWinId(0);
+
+    // hide and reparent our own window away. Otherwise we might get
+    // destroyed when emitting the child remove event below. See QWorkspace.
+    if (wasCreated && old_winid) {
+        old_winid->MakeVisible(false);
+        old_winid->ControlEnv()->AppUi()->RemoveFromStack(old_winid);
+        old_winid->SetParent(0);
+    }
+
+    QObjectPrivate::setParent_helper(parent);
+    bool explicitlyHidden = q->testAttribute(Qt::WA_WState_Hidden) && q->testAttribute(Qt::WA_WState_ExplicitShowHide);
+
+    data.window_flags = f;
+    data.fstrut_dirty = true;
+    q->setAttribute(Qt::WA_WState_Created, false);
+    q->setAttribute(Qt::WA_WState_Visible, false);
+    q->setAttribute(Qt::WA_WState_Hidden, false);
+    adjustFlags(data.window_flags, q);
+    // keep compatibility with previous versions, we need to preserve the created state
+    // (but we recreate the winId for the widget being reparented, again for compatibility)
+    if (wasCreated || (!q->isWindow() && parent->testAttribute(Qt::WA_WState_Created)))
+        createWinId();
+    if (q->isWindow() || (!parent || parent->isVisible()) || explicitlyHidden)
+        q->setAttribute(Qt::WA_WState_Hidden);
+    q->setAttribute(Qt::WA_WState_ExplicitShowHide, explicitlyHidden);
+
+    if (wasCreated)
+        reparentChildren();
+
+    if (old_winid) {
+        CBase::Delete(old_winid);
+    }
+
+    if (q->testAttribute(Qt::WA_AcceptDrops)
+        || (!q->isWindow() && q->parentWidget() && q->parentWidget()->testAttribute(Qt::WA_DropSiteRegistered)))
+        q->setAttribute(Qt::WA_DropSiteRegistered, true);
+
+    invalidateBuffer(q->rect());
+}
+
+void QWidgetPrivate::setConstraints_sys()
+{
+
+}
+
+
+void QWidgetPrivate::s60UpdateIsOpaque()
+{
+    Q_Q(QWidget);
+
+    if (!q->testAttribute(Qt::WA_WState_Created) || !q->testAttribute(Qt::WA_TranslucentBackground))
+        return;
+
+    if ((data.window_flags & Qt::FramelessWindowHint) == 0)
+        return;
+
+    if (!isOpaque) {
+        QTLWExtra *topExtra = topData();
+        RWindow *rwindow = static_cast<RWindow*>(topExtra->rwindow);
+        TDisplayMode gotDM = (TDisplayMode)rwindow->SetRequiredDisplayMode(EColor16MA);
+        if (rwindow->SetTransparencyAlphaChannel() == KErrNone)
+            rwindow->SetBackgroundColor(TRgb(255, 255, 255, 0));
+    } else {
+        QTLWExtra *topExtra = topData();
+        RWindow *rwindow = static_cast<RWindow*>(topExtra->rwindow);
+        rwindow->SetTransparentRegion(TRegionFix<1>());
+    }
+}
+
+CFbsBitmap* qt_pixmapToNativeBitmapL(QPixmap pixmap, bool invert)
+{
+    CFbsBitmap* fbsBitmap = new(ELeave)CFbsBitmap;
+    TSize size(pixmap.size().width(), pixmap.size().height());
+    TDisplayMode mode(EColor16MU);
+
+    bool isNull = pixmap.isNull();
+    int depth = pixmap.depth();
+
+    // TODO: dummy assumptions from bit amounts for each color
+    // Will fix later on when native pixmap is implemented
+    switch(pixmap.depth()) {
+    case 1:
+		mode = EGray2;
+        break;
+    case 4:
+        mode = EColor16;
+        break;
+    case 8:
+        mode = EColor256;
+        break;
+    case 12:
+        mode = EColor4K;
+        break;
+    case 16:
+        mode = EColor64K;
+        break;
+    case 24:
+        mode = EColor16M;
+        break;
+    case 32:
+        case EColor16MU:
+        break;
+    default:
+        qFatal("Unsupported pixmap depth");
+        break;
+    }
+
+    User::LeaveIfError(fbsBitmap->Create(size, mode));
+    fbsBitmap->LockHeap();
+    QImage image = pixmap.toImage();
+
+    if(invert)
+    	image.invertPixels();
+
+    int height = pixmap.size().height();
+    for(int i=0;i<height;i++ )
+        {
+        TPtr8 scanline(image.scanLine(i), image.bytesPerLine(), image.bytesPerLine());
+        fbsBitmap->SetScanLine( scanline, i );
+        }
+
+    fbsBitmap->UnlockHeap();
+    return fbsBitmap;
+}
+
+void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
+{
+#ifdef Q_WS_S60
+    Q_Q(QWidget);
+
+    if (!q->testAttribute(Qt::WA_WState_Created) || !q->isWindow() )
+        return;
+
+    QTLWExtra* topData = this->topData();
+    if (topData->iconPixmap && !forceReset)
+        // already been set
+        return;
+
+    TRect cPaneRect;
+    TBool found = AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EContextPane, cPaneRect );
+    CAknContextPane* contextPane = S60->contextPane();
+    if (found && contextPane) { // We have context pane with valid metrics
+        QIcon icon = q->windowIcon();
+        if (!icon.isNull()) {
+            // Valid icon -> set it as an context pane picture
+            QSize size = icon.actualSize(QSize(cPaneRect.Size().iWidth, cPaneRect.Size().iHeight));
+            QPixmap pm = icon.pixmap(size);
+            QBitmap mask = pm.mask();
+            if (mask.isNull()) {
+                mask = QBitmap(pm.size());
+                mask.fill(Qt::color1);
+            }
+
+            // Convert to CFbsBitmp
+            // TODO: When QPixmap is adapted to use native CFbsBitmap,
+            // it could be set directly to context pane
+            CFbsBitmap* nBitmap = qt_pixmapToNativeBitmapL(pm, false);
+            CFbsBitmap* nMask = qt_pixmapToNativeBitmapL(mask, true);
+
+            contextPane->SetPicture(nBitmap,nMask);
+        } else {
+            // Icon set to null -> set context pane picture to default
+            contextPane->SetPictureToDefaultL();
+        }
+    } else {
+        // Context pane does not exist, try setting small icon to title pane
+        TRect titlePaneRect;
+        TBool found = AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::ETitlePane, titlePaneRect );
+        CAknTitlePane* titlePane = S60->titlePane();          
+        if (found && titlePane) { // We have title pane with valid metrics
+            // The API to get title_pane graphics size is not public -> assume square space based 
+            // on titlebar font height. CAknBitmap would be optimum, wihtout setting the size, since
+            // then title pane would automatically scale the bitmap. Unfortunately it is not public API
+            const CFont * font = AknLayoutUtils::FontFromId(EAknLogicalFontTitleFont);
+            TSize iconSize(font->HeightInPixels(), font->HeightInPixels());
+                
+            QIcon icon = q->windowIcon();
+            if (!icon.isNull()) {
+                // Valid icon -> set it as an title pane small picture
+                QSize size = icon.actualSize(QSize(iconSize.iWidth, iconSize.iHeight));
+                QPixmap pm = icon.pixmap(size);
+                QBitmap mask = pm.mask();
+                if (mask.isNull()) {
+                    mask = QBitmap(pm.size());
+                    mask.fill(Qt::color1);
+                }
+
+                // Convert to CFbsBitmp
+                // TODO: When QPixmap is adapted to use native CFbsBitmap,
+                // it could be set directly to context pane
+                CFbsBitmap* nBitmap = qt_pixmapToNativeBitmapL(pm, false);
+                CFbsBitmap* nMask = qt_pixmapToNativeBitmapL(mask, true);
+
+                titlePane->SetSmallPicture( nBitmap, nMask, ETrue );
+            } else {
+                // Icon set to null -> set context pane picture to default
+                titlePane->SetSmallPicture( NULL, NULL, EFalse );
+            }
+        }
+    }
+    
+#else
+        Q_UNUSED(forceReset)
+#endif
+}
+
+void QWidgetPrivate::setWindowTitle_sys(const QString &caption)
+{
+#ifdef Q_WS_S60
+    Q_Q(QWidget);
+    if (q->isWindow()) {
+        Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+        CAknTitlePane* titlePane = S60->titlePane();
+        if(titlePane)
+            titlePane->SetTextL(qt_QString2TPtrC(caption));
+    }
+#else
+    Q_UNUSED(caption)
+#endif
+}
+
+void QWidgetPrivate::setWindowIconText_sys(const QString & /*iconText */)
+{
+
+}
+
+void QWidgetPrivate::scroll_sys(int dx, int dy)
+{
+    Q_Q(QWidget);
+
+    scrollChildren(dx, dy);
+    if (!paintOnScreen() || !q->internalWinId() || !q->internalWinId()->OwnsWindow()) {
+        scrollRect(q->rect(), dx, dy);
+    } else {
+        Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+        RDrawableWindow* rw = topData()->rwindow;
+        rw->Scroll(TPoint(dx, dy));
+    }
+}
+
+void QWidgetPrivate::scroll_sys(int dx, int dy, const QRect &r)
+{
+    Q_Q(QWidget);
+
+    if (!paintOnScreen() || !q->internalWinId() || !q->internalWinId()->OwnsWindow()) {
+        scrollRect(r, dx, dy);
+    } else {
+        Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+        RDrawableWindow* rw = topData()->rwindow;
+        rw->Scroll(TPoint(dx, dy), qt_QRect2TRect(r));
+    }
+}
+
+/*!
+    For this function to work in the emulator, you must add:
+       TRANSPARENCY
+    To a line in the wsini.ini file.
+*/
+void QWidgetPrivate::setWindowOpacity_sys(qreal)
+{
+    // ### TODO: Implement uniform window transparency
+}
+
+void QWidgetPrivate::updateFrameStrut()
+{
+
+}
+
+void QWidgetPrivate::updateSystemBackground()
+{
+
+}
+
+void QWidgetPrivate::registerDropSite(bool /* on */)
+{
+
+}
+
+void QWidgetPrivate::createTLSysExtra()
+{
+    extra->topextra->backingStore = 0;
+    extra->topextra->activated = 0;
+    extra->topextra->rwindow = 0;
+}
+
+void QWidgetPrivate::deleteTLSysExtra()
+{
+    delete extra->topextra->backingStore;
+    extra->topextra->backingStore = 0;
+}
+
+void QWidgetPrivate::createSysExtra()
+{
+
+}
+
+void QWidgetPrivate::deleteSysExtra()
+{
+
+}
+
+QWindowSurface *QWidgetPrivate::createDefaultWindowSurface_sys()
+{
+    return new QS60WindowSurface(q_func());
+}
+
+void QWidgetPrivate::setMask_sys(const QRegion& /* region */)
+{
+
+}
+
+int QWidget::metric(PaintDeviceMetric m) const
+{
+    Q_D(const QWidget);
+    int val;
+    if (m == PdmWidth) {
+        val = data->crect.width();
+    } else if (m == PdmHeight) {
+        val = data->crect.height();
+    } else {
+        CWsScreenDevice *scr = S60->screenDevice();
+        switch(m) {
+        case PdmDpiX:
+        case PdmPhysicalDpiX:
+            if (d->extra && d->extra->customDpiX) {
+                val = d->extra->customDpiX;
+            } else {
+                const QWidgetPrivate *p = d;
+                while (p->parent) {
+                    p = static_cast<const QWidget *>(p->parent)->d_func();
+                    if (p->extra && p->extra->customDpiX) {
+                        val = p->extra->customDpiX;
+                        break;
+                    }
+                }
+                if (p == d || !(p->extra && p->extra->customDpiX))
+                    val = S60->defaultDpiX;
+            }
+            break;
+        case PdmDpiY:
+        case PdmPhysicalDpiY:
+            if (d->extra && d->extra->customDpiY) {
+                val = d->extra->customDpiY;
+            } else {
+                const QWidgetPrivate *p = d;
+                while (p->parent) {
+                    p = static_cast<const QWidget *>(p->parent)->d_func();
+                    if (p->extra && p->extra->customDpiY) {
+                        val = p->extra->customDpiY;
+                        break;
+                    }
+                }
+                if (p == d || !(p->extra && p->extra->customDpiY))
+                    val = S60->defaultDpiY;
+            }
+            break;
+        case PdmWidthMM:
+        {
+            TInt twips = scr->HorizontalPixelsToTwips(data->crect.width());
+            val = (int)(twips * (25.4/KTwipsPerInch));
+            break;
+        }
+        case PdmHeightMM:
+        {
+            TInt twips = scr->VerticalPixelsToTwips(data->crect.height());
+            val = (int)(twips * (25.4/KTwipsPerInch));
+            break;
+        }
+        case PdmNumColors:
+            val = TDisplayModeUtils::NumDisplayModeColors(scr->DisplayMode());
+            break;
+        case PdmDepth:
+            val = TDisplayModeUtils::NumDisplayModeBitsPerPixel(scr->DisplayMode());
+            break;
+        default:
+            val = 0;
+            qWarning("QWidget::metric: Invalid metric command");
+        }
+    }
+    return val;
+}
+
+QPaintEngine *QWidget::paintEngine() const
+{
+    return 0;
+}
+
+QPoint QWidget::mapToGlobal(const QPoint &pos) const
+{
+    Q_D(const QWidget);
+    if (!testAttribute(Qt::WA_WState_Created) || !internalWinId()) {
+
+        QPoint p = pos + data->crect.topLeft();
+        return (isWindow() || !parentWidget()) ?  p : parentWidget()->mapToGlobal(p);
+
+    } else if ((d->data.window_flags & Qt::Window) && internalWinId()) { //toplevel
+        QPoint tp = geometry().topLeft();
+        return pos + tp;
+    }
+
+    // This is the native window case. Consider using CCoeControl::PositionRelativeToScreen()
+    // if we decide to go with CCoeControl
+    return QPoint();
+}
+
+QPoint QWidget::mapFromGlobal(const QPoint &pos) const
+{
+    Q_D(const QWidget);
+    if (!testAttribute(Qt::WA_WState_Created) || !internalWinId()) {
+        QPoint p = (isWindow() || !parentWidget()) ?  pos : parentWidget()->mapFromGlobal(pos);
+        return p - data->crect.topLeft();
+    } else if ((d->data.window_flags & Qt::Window) && internalWinId()) { //toplevel
+        QPoint tp = geometry().topLeft();
+        return pos - tp;
+    }
+
+    // ### TODO native window
+    return QPoint();
+}
+
+void QWidget::setWindowState(Qt::WindowStates newstate)
+{
+    Q_D(QWidget);
+    Qt::WindowStates oldstate = windowState();
+    if (oldstate == newstate)
+        return;
+
+    if (isWindow()) {
+        createWinId();
+        Q_ASSERT(testAttribute(Qt::WA_WState_Created));
+        QTLWExtra *top = d->topData();
+
+        // Ensure the initial size is valid, since we store it as normalGeometry below.
+        if (!testAttribute(Qt::WA_Resized) && !isVisible())
+            adjustSize();
+
+        if ((oldstate & Qt::WindowMaximized) != (newstate & Qt::WindowMaximized)) {
+            if ((newstate & Qt::WindowMaximized)) {
+                const QRect normalGeometry = geometry();
+
+                const QRect r = top->normalGeometry;
+                setGeometry(qApp->desktop()->availableGeometry(this));
+                top->normalGeometry = r;
+
+                if (top->normalGeometry.width() < 0)
+                    top->normalGeometry = normalGeometry;
+            } else {
+                // restore original geometry
+                setGeometry(top->normalGeometry);
+            }
+        }
+        if ((oldstate & Qt::WindowFullScreen) != (newstate & Qt::WindowFullScreen)) {
+#ifdef Q_WS_S60
+            CEikStatusPane* statusPane = S60->statusPane();
+            CEikButtonGroupContainer* buttonGroup = S60->buttonGroupContainer();
+#endif
+            if (newstate & Qt::WindowFullScreen) {
+                const QRect normalGeometry = geometry();
+                const QRect r = top->normalGeometry;
+                setGeometry(qApp->desktop()->screenGeometry(this));
+#ifdef Q_WS_S60
+                if (statusPane)
+                    statusPane->MakeVisible(false);
+                if (buttonGroup)
+                    buttonGroup->MakeVisible(false);
+#endif
+                top->normalGeometry = r;
+                if (top->normalGeometry.width() < 0)
+                    top->normalGeometry = normalGeometry;
+            } else {
+#ifdef Q_WS_S60
+                if (statusPane)
+                    statusPane->MakeVisible(true);
+                if (buttonGroup)
+                    buttonGroup->MakeVisible(true);
+#endif
+                if (newstate & Qt::WindowMaximized) {
+                    const QRect r = top->normalGeometry;
+                    setGeometry(qApp->desktop()->availableGeometry(this));
+                    top->normalGeometry = r;
+                } else {
+                    setGeometry(top->normalGeometry);
+                }
+            }
+        }
+        if ((oldstate & Qt::WindowMinimized) != (newstate & Qt::WindowMinimized)) {
+            if (newstate & Qt::WindowMinimized) {
+                if (isVisible()) {
+                    WId id = effectiveWinId();
+                    id->MakeVisible(false);
+                    id->ControlEnv()->AppUi()->RemoveFromStack(id);
+                }
+            } else {
+                if (isVisible()) {
+                    WId id = effectiveWinId();
+                    id->MakeVisible(true);
+                    id->ControlEnv()->AppUi()->AddToStackL(id);
+                }
+                const QRect normalGeometry = geometry();
+                const QRect r = top->normalGeometry;
+                top->normalGeometry = r;
+                if (top->normalGeometry.width() < 0)
+                    top->normalGeometry = normalGeometry;
+            }
+        }
+    }
+
+    data->window_state = newstate;
+
+    if (newstate & Qt::WindowActive)
+        activateWindow();
+
+    QWindowStateChangeEvent e(oldstate);
+    QApplication::sendEvent(this, &e);
+}
+
+
+void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
+{
+    Q_D(QWidget);
+    if (!isWindow() && parentWidget())
+        parentWidget()->d_func()->invalidateBuffer(geometry());
+    d->deactivateWidgetCleanup();
+    if (testAttribute(Qt::WA_WState_Created)) {
+
+#ifndef QT_NO_IM
+        if (d->ic) {
+            delete d->ic;
+        } else {
+            QInputContext *ic = inputContext();
+            if (ic) {
+                ic->widgetDestroyed(this);
+            }
+        }
+#endif
+
+        setAttribute(Qt::WA_WState_Created, false);
+        QObjectList childList = children();
+        for (int i = 0; i < childList.size(); ++i) { // destroy all widget children
+            register QObject *obj = childList.at(i);
+            if (obj->isWidgetType())
+                static_cast<QWidget*>(obj)->destroy(destroySubWindows,
+                                                    destroySubWindows);
+        }
+        if (QWidgetPrivate::mouseGrabber == this)
+            releaseMouse();
+        if (QWidgetPrivate::keyboardGrabber == this)
+            releaseKeyboard();
+        if (destroyWindow && !(windowType() == Qt::Desktop) && internalWinId()) {
+            WId id = internalWinId();
+            if(id->IsFocused()) // Avoid unnecessry calls to FocusChanged()
+                id->SetFocus(false);
+            id->ControlEnv()->AppUi()->RemoveFromStack(id);
+            CBase::Delete(id);
+
+            // Hack to activate window under destroyed one. With this activation
+            // the next visible window will get keyboard focus
+            WId wid = CEikonEnv::Static()->AppUi()->TopFocusedControl();
+            if (wid) {
+                QWidget *widget = QWidget::find(wid);
+                QApplication::setActiveWindow(widget);
+            }
+
+        }
+
+        d->setWinId(0);
+    }
+}
+
+QWidget *QWidget::mouseGrabber()
+{
+    return QWidgetPrivate::mouseGrabber;
+}
+
+QWidget *QWidget::keyboardGrabber()
+{
+    return QWidgetPrivate::keyboardGrabber;
+}
+
+void QWidget::grabKeyboard()
+{
+    if (!qt_nograb()) {
+        if (QWidgetPrivate::keyboardGrabber && QWidgetPrivate::keyboardGrabber != this)
+            QWidgetPrivate::keyboardGrabber->releaseKeyboard();
+
+        // ### TODO: Native keyboard grab
+
+        QWidgetPrivate::keyboardGrabber = this;
+    }
+}
+
+void QWidget::releaseKeyboard()
+{
+    if (!qt_nograb() && QWidgetPrivate::keyboardGrabber == this) {
+        // ### TODO: Native keyboard release
+        QWidgetPrivate::keyboardGrabber = 0;
+    }
+}
+
+void QWidget::grabMouse()
+{
+    if (!qt_nograb()) {
+        if (QWidgetPrivate::mouseGrabber && QWidgetPrivate::mouseGrabber != this)
+            QWidgetPrivate::mouseGrabber->releaseMouse();
+        Q_ASSERT(testAttribute(Qt::WA_WState_Created));
+        WId id = effectiveWinId();
+        id->SetPointerCapture(true);
+        QWidgetPrivate::mouseGrabber = this;
+    }
+}
+
+void QWidget::releaseMouse()
+{
+    if (!qt_nograb() && QWidgetPrivate::mouseGrabber == this) {
+        Q_ASSERT(testAttribute(Qt::WA_WState_Created));
+        WId id = effectiveWinId();
+        id->SetPointerCapture(false);
+        QWidgetPrivate::mouseGrabber = 0;
+    }
+}
+
+void QWidget::activateWindow()
+{
+    Q_D(QWidget);
+    QWidget *tlw = window();
+    if (tlw->isVisible()) {
+        S60->windowGroup().SetOrdinalPosition(0);
+        window()->createWinId();
+        RDrawableWindow* rw = tlw->d_func()->topData()->rwindow;
+        rw->SetOrdinalPosition(0);
+    }
+}
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h
index 7aa29b7be2..b1f4d1a890 100644
--- a/src/gui/kernel/qwindowdefs.h
+++ b/src/gui/kernel/qwindowdefs.h
@@ -131,6 +131,11 @@ QT_END_HEADER
 
 #endif // Q_WS_QWS
 
+#if defined(Q_OS_SYMBIAN)
+class CCoeControl;
+typedef CCoeControl * WId;
+#endif // Q_OS_SYMBIAN
+
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/symbian.pri b/src/gui/kernel/symbian.pri
new file mode 100644
index 0000000000..d267a539f1
--- /dev/null
+++ b/src/gui/kernel/symbian.pri
@@ -0,0 +1,3 @@
+symbian {
+    contains(QT_CONFIG, s60): LIBS+= $$QMAKE_LIBS_S60
+}
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index d226be2e2c..4121be6753 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -82,6 +82,7 @@ SOURCES += \
         DEFINES += QT_RASTER_IMAGEENGINE
         win32:DEFINES += QT_RASTER_PAINTENGINE
         embedded:DEFINES += QT_RASTER_PAINTENGINE
+        symbian:DEFINES += QT_RASTER_PAINTENGINE
         SOURCES +=                                      \
                 painting/qpaintengine_raster.cpp        \
                 painting/qdrawhelper.cpp                \
@@ -152,14 +153,14 @@ unix:x11 {
                 painting/qprintengine_mac.mm \
 }
 
-unix:!mac {
+unix:!mac:!symbian {
         HEADERS += \
                 painting/qprinterinfo_unix_p.h
         SOURCES += \
                 painting/qprinterinfo_unix.cpp
 }
 
-win32|x11|mac|embedded {
+win32|x11|mac|embedded|symbian {
         SOURCES += painting/qbackingstore.cpp
         HEADERS += painting/qbackingstore_p.h
 }
@@ -176,6 +177,13 @@ embedded {
                 painting/qpaintdevice_qws.cpp
 }
 
+symbian {
+        SOURCES += \
+                painting/qpaintdevice_s60.cpp \
+                painting/qregion_s60.cpp \
+                painting/qcolormap_s60.cpp
+}
+
 x11|embedded {
         contains(QT_CONFIG,qtopia) {
             DEFINES += QT_NO_CUPS QT_NO_LPR
@@ -353,3 +361,18 @@ embedded {
 }
 
 
+symbian {
+        HEADERS += painting/qwindowsurface_s60_p.h
+        SOURCES += painting/qwindowsurface_s60.cpp
+        armccIfdefBlock = \
+        "$${LITERAL_HASH}if defined(ARMV6)" \
+        "MACRO QT_HAVE_ARMV6" \
+        "SOURCEPATH 	painting" \
+        "SOURCE			qblendfunctions_armv6_rvct.s" \
+        "SOURCE			qdrawhelper_armv6_rvct.s" \
+        "$${LITERAL_HASH}endif"
+                
+        MMP_RULES += armccIfdefBlock
+        QMAKE_CXXFLAGS.ARMCC *= -O3
+}
+
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index 01c6159929..40c9bf2ddf 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -832,6 +832,10 @@ QWidgetBackingStore::QWidgetBackingStore(QWidget *topLevel)
 
 QWidgetBackingStore::~QWidgetBackingStore()
 {
+    for (int c = 0; c < dirtyWidgets.size(); ++c) {
+        resetWidget(dirtyWidgets.at(c));
+    }
+
     delete windowSurface;
     windowSurface = 0;
     delete dirtyOnScreenWidgets;
diff --git a/src/gui/painting/qblendfunctions_armv6_rvct.s b/src/gui/painting/qblendfunctions_armv6_rvct.s
new file mode 100644
index 0000000000..312bd074c7
--- /dev/null
+++ b/src/gui/painting/qblendfunctions_armv6_rvct.s
@@ -0,0 +1,223 @@
+;/****************************************************************************
+;**
+;** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+;** Contact: Qt Software Information (qt-info@nokia.com)
+;**
+;** This file is part of the QtGui module of the Qt Toolkit.
+;**
+;** $QT_BEGIN_LICENSE:LGPL$
+;** No Commercial Usage
+;** This file contains pre-release code and may not be distributed.
+;** You may use this file in accordance with the terms and conditions
+;** contained in the either Technology Preview License Agreement or the
+;** Beta Release License Agreement.
+;**
+;** GNU Lesser General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU Lesser
+;** General Public License version 2.1 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU Lesser General Public License version 2.1 requirements
+;** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+;**
+;** In addition, as a special exception, Nokia gives you certain
+;** additional rights. These rights are described in the Nokia Qt LGPL
+;** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;** package.
+;**
+;** GNU General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU
+;** General Public License version 3.0 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.GPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU General Public License version 3.0 requirements will be
+;** met: http://www.gnu.org/copyleft/gpl.html.
+;**
+;** If you are unsure which license is appropriate for your use, please
+;** contact the sales department at qt-sales@nokia.com.
+;** $QT_END_LICENSE$
+;**
+;****************************************************************************/
+
+;
+;  W A R N I N G
+;  -------------
+;
+; This file is not part of the Qt API.  It exists purely as an
+; implementation detail.  This header file may change from version to
+; version without notice, or even be removed.
+;
+; We mean it.
+;
+
+
+		ARM
+		PRESERVE8
+
+		INCLUDE		qdrawhelper_armv6_rvct.inc	
+
+
+;-----------------------------------------------------------------------------
+; qt_blend_rgb32_on_rgb32_arm
+; 
+; @brief 
+;
+; @param dest			Destination	pixels						(r0)
+; @param dbpl			Destination bytes per line				(r1)
+; @param src			Source pixels							(r2)
+; @param sbpl			Source bytes per line					(r3)
+; @param w				Width							  (s0 -> r4)
+; @param h				Height							  (s1 -> r5)
+; @param const_alpha	Constant alpha					  (s2 -> r6)
+; 
+;---------------------------------------------------------------------------
+qt_blend_rgb32_on_rgb32_armv6 Function
+		stmfd	sp!, {r4-r12, r14}
+		
+		; read arguments off the stack
+		add		r8, sp, #10 * 4
+		ldmia	r8, {r9-r11}
+		
+		; Reorganize registers
+		
+		mov		r4, r10
+		mov		r5, r1
+		mov		r6, r3
+		
+		mov		r1, r2
+		mov		r2, r9
+		mov		r3, r11
+		
+		; Now we have registers
+		; @param dest			Destination	pixels						(r0)
+		; @param src			Source pixels							(r1)
+		; @param w				Width							  		(r2)
+		; @param const_alpha	Constant alpha					  		(r3)
+		; @param h				Height							  		(r4)
+		; @param dbpl			Destination bytes per line				(r5)
+		; @param sbpl			Source bytes per line					(r6)
+		
+		cmp		r3, #256 ; test if we have fully opaque constant alpha value
+		bne		rgb32_blend_const_alpha ; branch if not
+		
+rgb32_blend_loop
+
+		subs	r4, r4, #1
+		bmi		rgb32_blend_exit	; while(h--)
+		
+rgb321	PixCpySafe r0, r1, r2		
+
+		add		r0, r0, r5 ; dest = dest + dbpl
+		add		r1, r1, r6 ; src = src + sbpl		
+
+		b		rgb32_blend_loop	
+		
+		
+rgb32_blend_const_alpha
+
+		;ldr		r14, =ComponentHalf ; load 0x800080 to r14
+		mov		r14, #0x800000
+		add		r14, r14, #0x80
+		
+		sub		r3, r3, #1	; const_alpha -= 1;
+
+rgb32_blend_loop_const_alpha
+
+		subs	r4, r4, #1
+		bmi		rgb32_blend_exit	; while(h--)
+		
+rgb322	BlendRowSafe PixelSourceOverConstAlpha
+
+		add		r0, r0, r5 ; dest = dest + dbpl
+		add		r1, r1, r6 ; src = src + sbpl		
+
+		b		rgb32_blend_loop_const_alpha
+		
+rgb32_blend_exit		
+		
+		ldmfd	sp!, {r4-r12, pc}		; pop and return
+	
+	
+	
+;-----------------------------------------------------------------------------
+; qt_blend_argb32_on_argb32_arm
+; 
+; @brief 
+;
+; @param dest			Destination	pixels						(r0)
+; @param dbpl			Destination bytes per line				(r1)
+; @param src			Source pixels							(r2)
+; @param sbpl			Source bytes per line					(r3)
+; @param w				Width							  (s0 -> r4)
+; @param h				Height							  (s1 -> r5)
+; @param const_alpha	Constant alpha					  (s2 -> r6)
+; 
+;---------------------------------------------------------------------------
+qt_blend_argb32_on_argb32_armv6 Function
+		stmfd	sp!, {r4-r12, r14}
+		
+	 	; read arguments off the stack
+		add		r8, sp, #10 * 4
+		ldmia	r8, {r9-r11}
+		
+		; Reorganize registers
+		
+		mov		r4, r10
+		mov		r5, r1
+		mov		r6, r3
+		
+		mov		r1, r2
+		mov		r2, r9
+		mov		r3, r11
+		
+		; Now we have registers
+		; @param dest			Destination	pixels						(r0)
+		; @param src			Source pixels							(r1)
+		; @param w				Width							  		(r2)
+		; @param const_alpha	Constant alpha					  		(r3)
+		; @param h				Height							  		(r4)
+		; @param dbpl			Destination bytes per line				(r5)
+		; @param sbpl			Source bytes per line					(r6)
+		
+		;ldr		r14, =ComponentHalf ; load 0x800080 to r14
+		mov		r14, #0x800000
+		add		r14, r14, #0x80
+		
+		cmp		r3, #256 ; test if we have fully opaque constant alpha value
+		bne		argb32_blend_const_alpha ; branch if not
+		
+argb32_blend_loop
+
+		subs	r4, r4, #1
+		bmi		argb32_blend_exit	; while(h--)
+
+argb321	 BlendRowSafe PixelSourceOver
+
+		add		r0, r0, r5 ; dest = dest + dbpl
+		add		r1, r1, r6 ; src = src + sbpl	
+
+		b		argb32_blend_loop
+		
+argb32_blend_const_alpha
+
+		sub		r3, r3, #1	; const_alpha -= 1;
+
+argb32_blend_loop_const_alpha
+
+		subs	r4, r4, #1
+		bmi		argb32_blend_exit	; while(h--)
+		
+argb322	 BlendRowSafe PixelSourceOverConstAlpha
+
+		add		r0, r0, r5 ; dest = dest + dbpl
+		add		r1, r1, r6 ; src = src + sbpl		
+
+		b		argb32_blend_loop_const_alpha
+		
+argb32_blend_exit		
+		
+		ldmfd	sp!, {r4-r12, pc}		; pop and return
+		
+		
+		END ; File end
+		
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index f767bb3ee0..519e02e885 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -221,7 +221,7 @@ bool Q_GUI_EXPORT qHasPixmapTexture(const QBrush& brush)
 {
     if (brush.style() != Qt::TexturePattern)
         return false;
-    QTexturedBrushData *tx_data = static_cast<QTexturedBrushData *>(brush.d);
+    QTexturedBrushData *tx_data = static_cast<QTexturedBrushData *>(brush.d.data());
     return tx_data->m_has_pixmap_texture;
 }
 
@@ -230,6 +230,37 @@ struct QGradientBrushData : public QBrushData
     QGradient gradient;
 };
 
+struct QBrushDataPointerHandler
+{
+    static inline void deleteData(QBrushData *d)
+    {
+        switch (d->style) {
+        case Qt::TexturePattern:
+            delete static_cast<QTexturedBrushData*>(d);
+            break;
+        case Qt::LinearGradientPattern:
+        case Qt::RadialGradientPattern:
+        case Qt::ConicalGradientPattern:
+            delete static_cast<QGradientBrushData*>(d);
+            break;
+        default:
+            delete d;
+        }
+    }
+
+    static inline void cleanup(QBrushData *d)
+    {
+        if (d && !d->ref.deref()) {
+            deleteData(d);
+        }
+    }
+
+    static inline void reset(QBrushData *&d, QBrushData *other)
+    {
+        cleanup(d);
+        d = other;
+    }
+};
 
 /*!
     \class QBrush
@@ -364,20 +395,20 @@ void QBrush::init(const QColor &color, Qt::BrushStyle style)
 {
     switch(style) {
     case Qt::NoBrush:
-        d = nullBrushInstance();
+        d.data_ptr() = nullBrushInstance();
         d->ref.ref();
         if (d->color != color) setColor(color);
         return;
     case Qt::TexturePattern:
-        d = new QTexturedBrushData;
+        d.data_ptr() = new QTexturedBrushData;
         break;
     case Qt::LinearGradientPattern:
     case Qt::RadialGradientPattern:
     case Qt::ConicalGradientPattern:
-        d = new QGradientBrushData;
+        d.data_ptr() = new QGradientBrushData;
         break;
     default:
-        d = new QBrushData;
+        d.data_ptr() = new QBrushData;
         break;
     }
     d->ref = 1;
@@ -391,8 +422,8 @@ void QBrush::init(const QColor &color, Qt::BrushStyle style)
 */
 
 QBrush::QBrush()
+    : d(nullBrushInstance())
 {
-    d = nullBrushInstance();
     Q_ASSERT(d);
     d->ref.ref();
 }
@@ -435,7 +466,7 @@ QBrush::QBrush(Qt::BrushStyle style)
     if (qbrush_check_type(style))
         init(Qt::black, style);
     else {
-        d = nullBrushInstance();
+        d.data_ptr() = nullBrushInstance();
         d->ref.ref();
     }
 }
@@ -451,7 +482,7 @@ QBrush::QBrush(const QColor &color, Qt::BrushStyle style)
     if (qbrush_check_type(style))
         init(color, style);
     else {
-        d = nullBrushInstance();
+        d.data_ptr() = nullBrushInstance();
         d->ref.ref();
     }
 }
@@ -468,7 +499,7 @@ QBrush::QBrush(Qt::GlobalColor color, Qt::BrushStyle style)
     if (qbrush_check_type(style))
         init(color, style);
     else {
-        d = nullBrushInstance();
+        d.data_ptr() = nullBrushInstance();
         d->ref.ref();
     }
 }
@@ -510,8 +541,8 @@ QBrush::QBrush(Qt::GlobalColor color, const QPixmap &pixmap)
 */
 
 QBrush::QBrush(const QBrush &other)
+    : d(other.d.data())
 {
-    d = other.d;
     d->ref.ref();
 }
 
@@ -535,7 +566,7 @@ QBrush::QBrush(const QGradient &gradient)
     };
 
     init(QColor(), enum_table[gradient.type()]);
-    QGradientBrushData *grad = static_cast<QGradientBrushData *>(d);
+    QGradientBrushData *grad = static_cast<QGradientBrushData *>(d.data());
     grad->gradient = gradient;
 }
 
@@ -545,24 +576,11 @@ QBrush::QBrush(const QGradient &gradient)
 
 QBrush::~QBrush()
 {
-    if (!d->ref.deref())
-        cleanUp(d);
 }
 
 void QBrush::cleanUp(QBrushData *x)
 {
-    switch (x->style) {
-    case Qt::TexturePattern:
-        delete static_cast<QTexturedBrushData*>(x);
-        break;
-    case Qt::LinearGradientPattern:
-    case Qt::RadialGradientPattern:
-    case Qt::ConicalGradientPattern:
-        delete static_cast<QGradientBrushData*>(x);
-        break;
-    default:
-        delete x;
-    }
+    QBrushDataPointerHandler::deleteData(x);
 }
 
 
@@ -571,38 +589,36 @@ void QBrush::detach(Qt::BrushStyle newStyle)
     if (newStyle == d->style && d->ref == 1)
         return;
 
-    QBrushData *x;
+    QScopedPointer<QBrushData> x;
     switch(newStyle) {
     case Qt::TexturePattern: {
         QTexturedBrushData *tbd = new QTexturedBrushData;
         if (d->style == Qt::TexturePattern) {
-            QTexturedBrushData *data = static_cast<QTexturedBrushData *>(d);
+            QTexturedBrushData *data = static_cast<QTexturedBrushData *>(d.data());
             if (data->m_has_pixmap_texture)
                 tbd->setPixmap(data->pixmap());
             else
                 tbd->setImage(data->image());
         }
-        x = tbd;
+        x.reset(tbd);
         break;
         }
     case Qt::LinearGradientPattern:
     case Qt::RadialGradientPattern:
     case Qt::ConicalGradientPattern:
-        x = new QGradientBrushData;
-        static_cast<QGradientBrushData *>(x)->gradient =
-            static_cast<QGradientBrushData *>(d)->gradient;
+        x.reset(new QGradientBrushData);
+        static_cast<QGradientBrushData *>(x.data())->gradient =
+            static_cast<QGradientBrushData *>(d.data())->gradient;
         break;
     default:
-        x = new QBrushData;
+        x.reset(new QBrushData);
         break;
     }
     x->ref = 1;
     x->style = newStyle;
     x->color = d->color;
     x->transform = d->transform;
-    if (!d->ref.deref())
-        cleanUp(d);
-    d = x;
+    d.reset(x.take());
 }
 
 
@@ -615,10 +631,11 @@ void QBrush::detach(Qt::BrushStyle newStyle)
 
 QBrush &QBrush::operator=(const QBrush &b)
 {
+    if (this == &b)
+        return *this;
+
     b.d->ref.ref();
-    if (!d->ref.deref())
-        cleanUp(d);
-    d = b.d;
+    d.reset(b.d.data());
     return *this;
 }
 
@@ -713,7 +730,7 @@ QPixmap *QBrush::pixmap() const
 {
     if (d->style != Qt::TexturePattern)
         return 0;
-    QTexturedBrushData *data  = static_cast<QTexturedBrushData*>(d);
+    QTexturedBrushData *data  = static_cast<QTexturedBrushData*>(d.data());
     QPixmap &pixmap = data->pixmap();
     return pixmap.isNull() ? 0 : &pixmap;
 }
@@ -730,7 +747,7 @@ QPixmap *QBrush::pixmap() const
 QPixmap QBrush::texture() const
 {
     return d->style == Qt::TexturePattern
-                     ? ((QTexturedBrushData*) d)->pixmap()
+                     ? (static_cast<QTexturedBrushData *>(d.data()))->pixmap()
                      : QPixmap();
 }
 
@@ -748,7 +765,7 @@ void QBrush::setTexture(const QPixmap &pixmap)
 {
     if (!pixmap.isNull()) {
         detach(Qt::TexturePattern);
-        QTexturedBrushData *data = static_cast<QTexturedBrushData *>(d);
+        QTexturedBrushData *data = static_cast<QTexturedBrushData *>(d.data());
         data->setPixmap(pixmap);
     } else {
         detach(Qt::NoBrush);
@@ -771,7 +788,7 @@ void QBrush::setTexture(const QPixmap &pixmap)
 QImage QBrush::textureImage() const
 {
     return d->style == Qt::TexturePattern
-                     ? ((QTexturedBrushData *) d)->image()
+                     ? (static_cast<QTexturedBrushData *>(d.data()))->image()
                      : QImage();
 }
 
@@ -796,7 +813,7 @@ void QBrush::setTextureImage(const QImage &image)
 {
     if (!image.isNull()) {
         detach(Qt::TexturePattern);
-        QTexturedBrushData *data = static_cast<QTexturedBrushData *>(d);
+        QTexturedBrushData *data = static_cast<QTexturedBrushData *>(d.data());
         data->setImage(image);
     } else {
         detach(Qt::NoBrush);
@@ -812,7 +829,7 @@ const QGradient *QBrush::gradient() const
     if (d->style == Qt::LinearGradientPattern
         || d->style == Qt::RadialGradientPattern
         || d->style == Qt::ConicalGradientPattern) {
-        return &static_cast<const QGradientBrushData *>(d)->gradient;
+        return &static_cast<const QGradientBrushData *>(d.data())->gradient;
     }
     return 0;
 }
@@ -925,16 +942,16 @@ bool QBrush::operator==(const QBrush &b) const
     if (b.d->style == d->style && b.d->color == d->color) {
         switch (d->style) {
         case Qt::TexturePattern: {
-            QPixmap &us = ((QTexturedBrushData *) d)->pixmap();
-            QPixmap &them = ((QTexturedBrushData *) b.d)->pixmap();
+            QPixmap &us = (static_cast<QTexturedBrushData *>(d.data()))->pixmap();
+            QPixmap &them = (static_cast<QTexturedBrushData *>(b.d.data()))->pixmap();
             return ((us.isNull() && them.isNull()) || us.cacheKey() == them.cacheKey());
         }
         case Qt::LinearGradientPattern:
         case Qt::RadialGradientPattern:
         case Qt::ConicalGradientPattern:
             {
-                QGradientBrushData *d1 = static_cast<QGradientBrushData *>(d);
-                QGradientBrushData *d2 = static_cast<QGradientBrushData *>(b.d);
+                QGradientBrushData *d1 = static_cast<QGradientBrushData *>(d.data());
+                QGradientBrushData *d2 = static_cast<QGradientBrushData *>(b.d.data());
                 return d1->gradient == d2->gradient;
             }
         default:
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index 13b5eba1c7..fdb3a8a41e 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -45,6 +45,7 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qvector.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtGui/qcolor.h>
 #include <QtGui/qmatrix.h>
 #include <QtGui/qtransform.h>
@@ -70,6 +71,7 @@ struct QBrushData;
 class QPixmap;
 class QGradient;
 class QVariant;
+struct QBrushDataPointerHandler;
 
 class Q_GUI_EXPORT QBrush
 {
@@ -135,13 +137,13 @@ private:
     friend bool Q_GUI_EXPORT qHasPixmapTexture(const QBrush& brush);
     void detach(Qt::BrushStyle newStyle);
     void init(const QColor &color, Qt::BrushStyle bs);
-    QBrushData *d;
+    QScopedCustomPointer<QBrushData, QBrushDataPointerHandler> d;
     void cleanUp(QBrushData *x);
 
 public:
     inline bool isDetached() const;
     typedef QBrushData * DataPtr;
-    inline DataPtr &data_ptr() { return d; }
+    inline DataPtr &data_ptr() { return d.data_ptr(); }
 };
 
 inline void QBrush::setColor(Qt::GlobalColor acolor)
diff --git a/src/gui/painting/qcolormap_s60.cpp b/src/gui/painting/qcolormap_s60.cpp
new file mode 100644
index 0000000000..1b585982e4
--- /dev/null
+++ b/src/gui/painting/qcolormap_s60.cpp
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qcolormap.h"
+#include "qcolor.h"
+
+QT_BEGIN_NAMESPACE
+
+class QColormapPrivate
+{
+public:
+    inline QColormapPrivate()
+        : ref(1)
+    { }
+
+    QAtomicInt ref;
+};
+
+void QColormap::initialize()
+{
+}
+
+void QColormap::cleanup()
+{
+}
+
+QColormap QColormap::instance(int)
+{
+    return QColormap();
+}
+
+QColormap::QColormap() : d(new QColormapPrivate)
+{}
+
+QColormap::QColormap(const QColormap &colormap) :d (colormap.d)
+{ d->ref.ref(); }
+
+QColormap::~QColormap()
+{
+    if (!d->ref.deref())
+        delete d;
+}
+
+QColormap::Mode QColormap::mode() const
+{ return QColormap::Direct; }
+
+int QColormap::depth() const
+{
+    return 32;
+}
+
+int QColormap::size() const
+{
+    return -1;
+}
+
+uint QColormap::pixel(const QColor &color) const
+{ return color.rgba(); }
+
+const QColor QColormap::colorAt(uint pixel) const
+{ return QColor(pixel); }
+
+const QVector<QColor> QColormap::colormap() const
+{ return QVector<QColor>(); }
+
+QColormap &QColormap::operator=(const QColormap &colormap)
+{ qAtomicAssign(d, colormap.d); return *this; }
+
+QT_END_NAMESPACE
+
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index b6603e4fef..d77ed57026 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -38,15 +38,18 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #include <private/qdrawhelper_p.h>
 #include <private/qpaintengine_raster_p.h>
 #include <private/qpainter_p.h>
 #include <private/qdrawhelper_x86_p.h>
+#include <private/qdrawhelper_armv6_p.h>
 #include <private/qmath_p.h>
 #include <qmath.h>
 
 QT_BEGIN_NAMESPACE
 
+
 #define MASK(src, a) src = BYTE_MUL(src, a)
 
 #if defined(Q_OS_IRIX) && defined(Q_CC_GNU) && __GNUC__ == 3 && __GNUC__ < 4 && QT_POINTER_SIZE == 8
@@ -654,7 +657,15 @@ Q_STATIC_TEMPLATE_FUNCTION
 const uint * QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Operator *, const QSpanData *data,
                                                   int y, int x, int length)
 {
+#ifdef Q_CC_RVCT // needed to avoid compiler crash in RVCT 2.2
+    FetchPixelProc fetch;
+    if (format != QImage::Format_Invalid)
+        fetch = qt_fetchPixel<format>;
+    else
+        fetch = fetchPixelProc[data->texture.format];
+#else
     FetchPixelProc fetch = (format != QImage::Format_Invalid) ? FetchPixelProc(qt_fetchPixel<format>) : fetchPixelProc[data->texture.format];
+#endif
 
     int image_width = data->texture.width;
     int image_height = data->texture.height;
@@ -1203,7 +1214,35 @@ static const uint * QT_FASTCALL fetchConicalGradient(uint *buffer, const Operato
     return b;
 }
 
-
+#if defined(Q_CC_RVCT)
+// Force ARM code generation for comp_func_* -methods
+#  pragma push
+#  pragma arm
+#  if defined(QT_HAVE_ARMV6)
+static __forceinline void preload(const uint *start)
+{
+    asm( "pld [start]" );
+}
+static const uint L2CacheLineLength = 32;
+static const uint L2CacheLineLengthInInts = L2CacheLineLength/sizeof(uint);
+#    define PRELOAD_INIT(x) preload(x);
+#    define PRELOAD_INIT2(x,y) PRELOAD_INIT(x) PRELOAD_INIT(y)
+#    define PRELOAD_COND(x) if (((uint)&x[i])%L2CacheLineLength == 0) preload(&x[i] + L2CacheLineLengthInInts);
+// Two consecutive preloads stall, so space them out a bit by using different modulus.
+#    define PRELOAD_COND2(x,y) if (((uint)&x[i])%L2CacheLineLength == 0) preload(&x[i] + L2CacheLineLengthInInts); \
+         if (((uint)&y[i])%L2CacheLineLength == 16) preload(&y[i] + L2CacheLineLengthInInts);
+#  else
+#    define PRELOAD_INIT(x)
+#    define PRELOAD_INIT2(x,y)
+#    define PRELOAD_COND(x)
+#    define PRELOAD_COND2(x,y)
+#  endif
+#else
+#  define PRELOAD_INIT(x)
+#  define PRELOAD_INIT2(x,y)
+#  define PRELOAD_COND(x)
+#  define PRELOAD_COND2(x,y)
+#endif
 
 /* The constant alpha factor describes an alpha factor that gets applied
    to the result of the composition operation combining it with the destination.
@@ -1236,8 +1275,11 @@ static void QT_FASTCALL comp_func_solid_Clear(uint *dest, int length, uint, uint
         QT_MEMFILL_UINT(dest, length, 0);
     } else {
         int ialpha = 255 - const_alpha;
-        for (int i = 0; i < length; ++i)
+        PRELOAD_INIT(dest)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND(dest)
             dest[i] = BYTE_MUL(dest[i], ialpha);
+        }
     }
 }
 
@@ -1247,8 +1289,11 @@ static void QT_FASTCALL comp_func_Clear(uint *dest, const uint *, int length, ui
         QT_MEMFILL_UINT(dest, length, 0);
     } else {
         int ialpha = 255 - const_alpha;
-        for (int i = 0; i < length; ++i)
+        PRELOAD_INIT(dest)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND(dest)
             dest[i] = BYTE_MUL(dest[i], ialpha);
+        }
     }
 }
 
@@ -1263,8 +1308,11 @@ static void QT_FASTCALL comp_func_solid_Source(uint *dest, int length, uint colo
     } else {
         int ialpha = 255 - const_alpha;
         color = BYTE_MUL(color, const_alpha);
-        for (int i = 0; i < length; ++i)
+        PRELOAD_INIT(dest)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND(dest)
             dest[i] = color + BYTE_MUL(dest[i], ialpha);
+        }
     }
 }
 
@@ -1274,8 +1322,11 @@ static void QT_FASTCALL comp_func_Source(uint *dest, const uint *src, int length
         ::memcpy(dest, src, length * sizeof(uint));
     } else {
         int ialpha = 255 - const_alpha;
-        for (int i = 0; i < length; ++i)
+        PRELOAD_INIT2(dest, src)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             dest[i] = INTERPOLATE_PIXEL_255(src[i], const_alpha, dest[i], ialpha);
+        }
     }
 }
 
@@ -1300,20 +1351,26 @@ static void QT_FASTCALL comp_func_solid_SourceOver(uint *dest, int length, uint
     } else {
         if (const_alpha != 255)
             color = BYTE_MUL(color, const_alpha);
-        for (int i = 0; i < length; ++i)
+        PRELOAD_INIT(dest)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND(dest)
             dest[i] = color + BYTE_MUL(dest[i], qAlpha(~color));
+        }
     }
 }
 
 static void QT_FASTCALL comp_func_SourceOver(uint *dest, const uint *src, int length, uint const_alpha)
 {
+    PRELOAD_INIT2(dest, src)
     if (const_alpha == 255) {
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint s = src[i];
             dest[i] = s + BYTE_MUL(dest[i], qAlpha(~s));
         }
     } else {
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint s = BYTE_MUL(src[i], const_alpha);
             dest[i] = s + BYTE_MUL(dest[i], qAlpha(~s));
         }
@@ -1329,7 +1386,9 @@ static void QT_FASTCALL comp_func_solid_DestinationOver(uint *dest, int length,
 {
     if (const_alpha != 255)
         color = BYTE_MUL(color, const_alpha);
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         dest[i] = d + BYTE_MUL(color, qAlpha(~d));
     }
@@ -1337,13 +1396,16 @@ static void QT_FASTCALL comp_func_solid_DestinationOver(uint *dest, int length,
 
 static void QT_FASTCALL comp_func_DestinationOver(uint *dest, const uint *src, int length, uint const_alpha)
 {
+    PRELOAD_INIT2(dest, src)
     if (const_alpha == 255) {
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint d = dest[i];
             dest[i] = d + BYTE_MUL(src[i], qAlpha(~d));
         }
     } else {
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint d = dest[i];
             uint s = BYTE_MUL(src[i], const_alpha);
             dest[i] = d + BYTE_MUL(s, qAlpha(~d));
@@ -1357,13 +1419,17 @@ static void QT_FASTCALL comp_func_DestinationOver(uint *dest, const uint *src, i
 */
 static void QT_FASTCALL comp_func_solid_SourceIn(uint *dest, int length, uint color, uint const_alpha)
 {
+    PRELOAD_INIT(dest)
     if (const_alpha == 255) {
-        for (int i = 0; i < length; ++i)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND(dest)
             dest[i] = BYTE_MUL(color, qAlpha(dest[i]));
+        }
     } else {
         color = BYTE_MUL(color, const_alpha);
         uint cia = 255 - const_alpha;
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND(dest)
             uint d = dest[i];
             dest[i] = INTERPOLATE_PIXEL_255(color, qAlpha(d), d, cia);
         }
@@ -1372,12 +1438,16 @@ static void QT_FASTCALL comp_func_solid_SourceIn(uint *dest, int length, uint co
 
 static void QT_FASTCALL comp_func_SourceIn(uint *dest, const uint *src, int length, uint const_alpha)
 {
+    PRELOAD_INIT2(dest, src)
     if (const_alpha == 255) {
-        for (int i = 0; i < length; ++i)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             dest[i] = BYTE_MUL(src[i], qAlpha(dest[i]));
+        }
     } else {
         uint cia = 255 - const_alpha;
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint d = dest[i];
             uint s = BYTE_MUL(src[i], const_alpha);
             dest[i] = INTERPOLATE_PIXEL_255(s, qAlpha(d), d, cia);
@@ -1396,19 +1466,25 @@ static void QT_FASTCALL comp_func_solid_DestinationIn(uint *dest, int length, ui
     if (const_alpha != 255) {
         a = BYTE_MUL(a, const_alpha) + 255 - const_alpha;
     }
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         dest[i] = BYTE_MUL(dest[i], a);
     }
 }
 
 static void QT_FASTCALL comp_func_DestinationIn(uint *dest, const uint *src, int length, uint const_alpha)
 {
+    PRELOAD_INIT2(dest, src)
     if (const_alpha == 255) {
-        for (int i = 0; i < length; ++i)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             dest[i] = BYTE_MUL(dest[i], qAlpha(src[i]));
+        }
     } else {
         int cia = 255 - const_alpha;
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint a = BYTE_MUL(qAlpha(src[i]), const_alpha) + cia;
             dest[i] = BYTE_MUL(dest[i], a);
         }
@@ -1422,13 +1498,17 @@ static void QT_FASTCALL comp_func_DestinationIn(uint *dest, const uint *src, int
 
 static void QT_FASTCALL comp_func_solid_SourceOut(uint *dest, int length, uint color, uint const_alpha)
 {
+    PRELOAD_INIT(dest)
     if (const_alpha == 255) {
-        for (int i = 0; i < length; ++i)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND(dest)
             dest[i] = BYTE_MUL(color, qAlpha(~dest[i]));
+        }
     } else {
         color = BYTE_MUL(color, const_alpha);
         int cia = 255 - const_alpha;
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND(dest)
             uint d = dest[i];
             dest[i] = INTERPOLATE_PIXEL_255(color, qAlpha(~d), d, cia);
         }
@@ -1437,12 +1517,16 @@ static void QT_FASTCALL comp_func_solid_SourceOut(uint *dest, int length, uint c
 
 static void QT_FASTCALL comp_func_SourceOut(uint *dest, const uint *src, int length, uint const_alpha)
 {
+    PRELOAD_INIT2(dest, src)
     if (const_alpha == 255) {
-        for (int i = 0; i < length; ++i)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             dest[i] = BYTE_MUL(src[i], qAlpha(~dest[i]));
+        }
     } else {
         int cia = 255 - const_alpha;
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint s = BYTE_MUL(src[i], const_alpha);
             uint d = dest[i];
             dest[i] = INTERPOLATE_PIXEL_255(s, qAlpha(~d), d, cia);
@@ -1460,18 +1544,25 @@ static void QT_FASTCALL comp_func_solid_DestinationOut(uint *dest, int length, u
     uint a = qAlpha(~color);
     if (const_alpha != 255)
         a = BYTE_MUL(a, const_alpha) + 255 - const_alpha;
-    for (int i = 0; i < length; ++i)
+    PRELOAD_INIT(dest)
+    for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         dest[i] = BYTE_MUL(dest[i], a);
+    }
 }
 
 static void QT_FASTCALL comp_func_DestinationOut(uint *dest, const uint *src, int length, uint const_alpha)
 {
+    PRELOAD_INIT2(dest, src)
     if (const_alpha == 255) {
-        for (int i = 0; i < length; ++i)
+        for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             dest[i] = BYTE_MUL(dest[i], qAlpha(~src[i]));
+        }
     } else {
         int cia = 255 - const_alpha;
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint sia = BYTE_MUL(qAlpha(~src[i]), const_alpha) + cia;
             dest[i] = BYTE_MUL(dest[i], sia);
         }
@@ -1490,20 +1581,26 @@ static void QT_FASTCALL comp_func_solid_SourceAtop(uint *dest, int length, uint
         color = BYTE_MUL(color, const_alpha);
     }
     uint sia = qAlpha(~color);
-    for (int i = 0; i < length; ++i)
+    PRELOAD_INIT(dest)
+    for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         dest[i] = INTERPOLATE_PIXEL_255(color, qAlpha(dest[i]), dest[i], sia);
+    }
 }
 
 static void QT_FASTCALL comp_func_SourceAtop(uint *dest, const uint *src, int length, uint const_alpha)
 {
+    PRELOAD_INIT2(dest, src)
     if (const_alpha == 255) {
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint s = src[i];
             uint d = dest[i];
             dest[i] = INTERPOLATE_PIXEL_255(s, qAlpha(d), d, qAlpha(~s));
         }
     } else {
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint s = BYTE_MUL(src[i], const_alpha);
             uint d = dest[i];
             dest[i] = INTERPOLATE_PIXEL_255(s, qAlpha(d), d, qAlpha(~s));
@@ -1523,7 +1620,9 @@ static void QT_FASTCALL comp_func_solid_DestinationAtop(uint *dest, int length,
         color = BYTE_MUL(color, const_alpha);
         a = qAlpha(color) + 255 - const_alpha;
     }
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         dest[i] = INTERPOLATE_PIXEL_255(d, a, color, qAlpha(~d));
     }
@@ -1531,8 +1630,10 @@ static void QT_FASTCALL comp_func_solid_DestinationAtop(uint *dest, int length,
 
 static void QT_FASTCALL comp_func_DestinationAtop(uint *dest, const uint *src, int length, uint const_alpha)
 {
+    PRELOAD_INIT2(dest, src)
     if (const_alpha == 255) {
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint s = src[i];
             uint d = dest[i];
             dest[i] = INTERPOLATE_PIXEL_255(d, qAlpha(s), s, qAlpha(~d));
@@ -1540,6 +1641,7 @@ static void QT_FASTCALL comp_func_DestinationAtop(uint *dest, const uint *src, i
     } else {
         int cia = 255 - const_alpha;
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint s = BYTE_MUL(src[i], const_alpha);
             uint d = dest[i];
             uint a = qAlpha(s) + cia;
@@ -1560,7 +1662,9 @@ static void QT_FASTCALL comp_func_solid_XOR(uint *dest, int length, uint color,
         color = BYTE_MUL(color, const_alpha);
     uint sia = qAlpha(~color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         dest[i] = INTERPOLATE_PIXEL_255(color, qAlpha(~d), d, sia);
     }
@@ -1568,14 +1672,17 @@ static void QT_FASTCALL comp_func_solid_XOR(uint *dest, int length, uint color,
 
 static void QT_FASTCALL comp_func_XOR(uint *dest, const uint *src, int length, uint const_alpha)
 {
+    PRELOAD_INIT2(dest, src)
     if (const_alpha == 255) {
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint d = dest[i];
             uint s = src[i];
             dest[i] = INTERPOLATE_PIXEL_255(s, qAlpha(~d), d, qAlpha(~s));
         }
     } else {
         for (int i = 0; i < length; ++i) {
+            PRELOAD_COND2(dest, src)
             uint d = dest[i];
             uint s = BYTE_MUL(src[i], const_alpha);
             dest[i] = INTERPOLATE_PIXEL_255(s, qAlpha(~d), d, qAlpha(~s));
@@ -1626,7 +1733,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Plus_impl(uint *dest, int
 {
     uint s = color;
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
 #define MIX(mask) (qMin(((qint64(s)&mask) + (qint64(d)&mask)), qint64(mask)))
         d = (MIX(AMASK) | MIX(RMASK) | MIX(GMASK) | MIX(BMASK));
@@ -1646,7 +1755,9 @@ static void QT_FASTCALL comp_func_solid_Plus(uint *dest, int length, uint color,
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Plus_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -1682,7 +1793,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Multiply_impl(uint *dest,
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -1708,7 +1821,9 @@ static void QT_FASTCALL comp_func_solid_Multiply(uint *dest, int length, uint co
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Multiply_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -1746,7 +1861,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Screen_impl(uint *dest, i
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -1772,7 +1889,9 @@ static void QT_FASTCALL comp_func_solid_Screen(uint *dest, int length, uint colo
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Screen_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -1821,7 +1940,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Overlay_impl(uint *dest,
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -1847,7 +1968,9 @@ static void QT_FASTCALL comp_func_solid_Overlay(uint *dest, int length, uint col
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Overlay_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -1890,7 +2013,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Darken_impl(uint *dest, i
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -1916,7 +2041,9 @@ static void QT_FASTCALL comp_func_solid_Darken(uint *dest, int length, uint colo
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Darken_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -1959,7 +2086,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Lighten_impl(uint *dest,
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -1985,7 +2114,9 @@ static void QT_FASTCALL comp_func_solid_Lighten(uint *dest, int length, uint col
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Lighten_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -2038,7 +2169,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_ColorDodge_impl(uint *des
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -2064,7 +2197,9 @@ static void QT_FASTCALL comp_func_solid_ColorDodge(uint *dest, int length, uint
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_ColorDodge_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -2117,7 +2252,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_ColorBurn_impl(uint *dest
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -2143,7 +2280,9 @@ static void QT_FASTCALL comp_func_solid_ColorBurn(uint *dest, int length, uint c
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_ColorBurn_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -2193,7 +2332,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_HardLight_impl(uint *dest
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -2219,7 +2360,9 @@ static void QT_FASTCALL comp_func_solid_HardLight(uint *dest, int length, uint c
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_HardLight_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -2278,7 +2421,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_SoftLight_impl(uint *dest
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -2304,7 +2449,9 @@ static void QT_FASTCALL comp_func_solid_SoftLight(uint *dest, int length, uint c
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_SoftLight_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -2347,7 +2494,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Difference_impl(uint *des
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -2373,7 +2522,9 @@ static void QT_FASTCALL comp_func_solid_Difference(uint *dest, int length, uint
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Difference_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -2410,7 +2561,9 @@ Q_STATIC_TEMPLATE_FUNCTION inline void QT_FASTCALL comp_func_solid_Exclusion_imp
     int sg = qGreen(color);
     int sb = qBlue(color);
 
+    PRELOAD_INIT(dest)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND(dest)
         uint d = dest[i];
         int da = qAlpha(d);
 
@@ -2436,7 +2589,9 @@ static void QT_FASTCALL comp_func_solid_Exclusion(uint *dest, int length, uint c
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Exclusion_impl(uint *dest, const uint *src, int length, const T &coverage)
 {
+    PRELOAD_INIT2(dest, src)
     for (int i = 0; i < length; ++i) {
+        PRELOAD_COND2(dest, src)
         uint d = dest[i];
         uint s = src[i];
 
@@ -2462,6 +2617,11 @@ static void QT_FASTCALL comp_func_Exclusion(uint *dest, const uint *src, int len
         comp_func_Exclusion_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
 
+#if defined(Q_CC_RVCT)
+// Restore pragma state from previous #pragma arm
+#  pragma pop
+#endif
+
 static void QT_FASTCALL rasterop_solid_SourceOrDestination(uint *dest,
                                                            int length,
                                                            uint color,
@@ -7739,6 +7899,96 @@ static uint detectCPUFeatures()
 #endif
 }
 
+#if defined(Q_CC_RVCT) && defined(QT_HAVE_ARMV6)
+// Move these to qdrawhelper_arm.c when all
+// functions are implemented using arm assembly.
+static CompositionFunctionSolid qt_functionForModeSolid_ARMv6[numCompositionFunctions] = {
+        comp_func_solid_SourceOver,
+        comp_func_solid_DestinationOver,
+        comp_func_solid_Clear,
+        comp_func_solid_Source,
+        comp_func_solid_Destination,
+        comp_func_solid_SourceIn,
+        comp_func_solid_DestinationIn,
+        comp_func_solid_SourceOut,
+        comp_func_solid_DestinationOut,
+        comp_func_solid_SourceAtop,
+        comp_func_solid_DestinationAtop,
+        comp_func_solid_XOR,
+        comp_func_solid_Plus,
+        comp_func_solid_Multiply,
+        comp_func_solid_Screen,
+        comp_func_solid_Overlay,
+        comp_func_solid_Darken,
+        comp_func_solid_Lighten,
+        comp_func_solid_ColorDodge,
+        comp_func_solid_ColorBurn,
+        comp_func_solid_HardLight,
+        comp_func_solid_SoftLight,
+        comp_func_solid_Difference,
+        comp_func_solid_Exclusion,
+        rasterop_solid_SourceOrDestination,
+        rasterop_solid_SourceAndDestination,
+        rasterop_solid_SourceXorDestination,
+        rasterop_solid_NotSourceAndNotDestination,
+        rasterop_solid_NotSourceOrNotDestination,
+        rasterop_solid_NotSourceXorDestination,
+        rasterop_solid_NotSource,
+        rasterop_solid_NotSourceAndDestination,
+        rasterop_solid_SourceAndNotDestination
+};
+
+static CompositionFunction qt_functionForMode_ARMv6[numCompositionFunctions] = {
+        comp_func_SourceOver_armv6,
+        comp_func_DestinationOver,
+        comp_func_Clear,
+        comp_func_Source_armv6,
+        comp_func_Destination,
+        comp_func_SourceIn,
+        comp_func_DestinationIn,
+        comp_func_SourceOut,
+        comp_func_DestinationOut,
+        comp_func_SourceAtop,
+        comp_func_DestinationAtop,
+        comp_func_XOR,
+        comp_func_Plus,
+        comp_func_Multiply,
+        comp_func_Screen,
+        comp_func_Overlay,
+        comp_func_Darken,
+        comp_func_Lighten,
+        comp_func_ColorDodge,
+        comp_func_ColorBurn,
+        comp_func_HardLight,
+        comp_func_SoftLight,
+        comp_func_Difference,
+        comp_func_Exclusion,
+        rasterop_SourceOrDestination,
+        rasterop_SourceAndDestination,
+        rasterop_SourceXorDestination,
+        rasterop_NotSourceAndNotDestination,
+        rasterop_NotSourceOrNotDestination,
+        rasterop_NotSourceXorDestination,
+        rasterop_NotSource,
+        rasterop_NotSourceAndDestination,
+        rasterop_SourceAndNotDestination
+};
+
+static void qt_blend_color_argb_armv6(int count, const QSpan *spans, void *userData)
+{
+    QSpanData *data = reinterpret_cast<QSpanData *>(userData);
+
+    CompositionFunctionSolid func = qt_functionForModeSolid_ARMv6[data->rasterBuffer->compositionMode];
+    while (count--) {
+        uint *target = ((uint *)data->rasterBuffer->scanLine(spans->y)) + spans->x;
+        func(target, spans->len, data->solid.color, spans->coverage);
+        ++spans;
+    }
+}
+
+#endif // Q_CC_RVCT && QT_HAVE_ARMV6
+
+
 void qInitDrawhelperAsm()
 {
     static uint features = 0xffffffff;
@@ -7854,6 +8104,20 @@ void qInitDrawhelperAsm()
 
 #endif // QT_NO_DEBUG
 
+#if defined(Q_CC_RVCT) && defined(QT_HAVE_ARMV6)
+        functionForModeAsm = qt_functionForMode_ARMv6;
+        functionForModeSolidAsm = qt_functionForModeSolid_ARMv6;
+
+        qt_memfill32 = qt_memfill32_armv6;
+
+        qDrawHelper[QImage::Format_ARGB32_Premultiplied].blendColor = qt_blend_color_argb_armv6;
+
+        qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_armv6;
+        qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_armv6;
+        qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_armv6;
+        qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_armv6;
+#endif // Q_CC_RVCT && QT_HAVE_ARMV6
+
     if (functionForModeSolidAsm) {
         const int destinationMode = QPainter::CompositionMode_Destination;
         functionForModeSolidAsm[destinationMode] = functionForModeSolid_C[destinationMode];
diff --git a/src/gui/painting/qdrawhelper_armv6_p.h b/src/gui/painting/qdrawhelper_armv6_p.h
new file mode 100644
index 0000000000..a4c1df2835
--- /dev/null
+++ b/src/gui/painting/qdrawhelper_armv6_p.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDRAWHELPER_ARMV6_P_H
+#define QDRAWHELPER_ARMV6_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qdrawhelper_p.h>
+
+QT_BEGIN_NAMESPACE
+
+#if defined(Q_CC_RVCT) && defined(QT_HAVE_ARMV6)
+
+extern "C" void qt_blend_rgb32_on_rgb32_armv6(uchar *destPixels, int dbpl,
+                                            const uchar *srcPixels, int sbpl,
+                                            int w, int h,
+                                            int const_alpha);
+
+extern "C" void qt_blend_argb32_on_argb32_armv6(uchar *destPixels, int dbpl,
+                                            const uchar *srcPixels, int sbpl,
+                                            int w, int h,
+                                            int const_alpha);
+
+extern "C" void qt_memfill32_armv6(quint32 *dest, quint32 value, int count);
+
+extern "C" void comp_func_Source_armv6(uint *dest, const uint *src, int length, uint const_alpha);
+extern "C" void comp_func_SourceOver_armv6(uint *dest, const uint *src, int length, uint const_alpha);
+
+#endif // QT_HAVE_ARMV6
+
+QT_END_NAMESPACE
+
+#endif // QDRAWHELPER_ARMV6_P_H
diff --git a/src/gui/painting/qdrawhelper_armv6_rvct.inc b/src/gui/painting/qdrawhelper_armv6_rvct.inc
new file mode 100644
index 0000000000..b3e0605ddc
--- /dev/null
+++ b/src/gui/painting/qdrawhelper_armv6_rvct.inc
@@ -0,0 +1,496 @@
+;/****************************************************************************
+;**
+;** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+;** Contact: Qt Software Information (qt-info@nokia.com)
+;**
+;** This file is part of the QtGui module of the Qt Toolkit.
+;**
+;** $QT_BEGIN_LICENSE:LGPL$
+;** No Commercial Usage
+;** This file contains pre-release code and may not be distributed.
+;** You may use this file in accordance with the terms and conditions
+;** contained in the either Technology Preview License Agreement or the
+;** Beta Release License Agreement.
+;**
+;** GNU Lesser General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU Lesser
+;** General Public License version 2.1 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU Lesser General Public License version 2.1 requirements
+;** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+;**
+;** In addition, as a special exception, Nokia gives you certain
+;** additional rights. These rights are described in the Nokia Qt LGPL
+;** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;** package.
+;**
+;** GNU General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU
+;** General Public License version 3.0 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.GPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU General Public License version 3.0 requirements will be
+;** met: http://www.gnu.org/copyleft/gpl.html.
+;**
+;** If you are unsure which license is appropriate for your use, please
+;** contact the sales department at qt-sales@nokia.com.
+;** $QT_END_LICENSE$
+;**
+;****************************************************************************/
+
+;
+;  W A R N I N G
+;  -------------
+;
+; This file is not part of the Qt API.  It exists purely as an
+; implementation detail.  This header file may change from version to
+; version without notice, or even be removed.
+;
+; We mean it.
+;
+
+;-----------------------------------------------------------------------------
+; Globals.
+; Earch marcro expects that caller has loaded 0x800080 to r14. 
+;-----------------------------------------------------------------------------
+
+ComponentHalf	EQU	0x800080		
+
+;-----------------------------------------------------------------------------
+; ARM assembly implementations of accelerated graphics operations.
+;
+; Conventions:
+;
+; 	- r0 = Target buffer pointer
+;	- r1 = Source buffer pointer
+; 	- r2 = Length of the buffer to blend
+;	- r3 = Constant alpha for source buffer 
+;
+;-----------------------------------------------------------------------------
+
+; A macro for transparently defining ARM functions
+		MACRO
+$func	Function
+		AREA Function_$func, CODE
+		GLOBAL $func
+		ALIGN 4
+		CODE32
+$func
+		MEND
+		
+		
+;-----------------------------------------------------------------------------
+; Armv6 boosted implementation of BYTE_MUL(...) function found in qdrawhelper_p.h.
+;
+;  @param dst	Destination register where to store the result
+;  @param x     Value to multiply
+;  @param a     Multiplicator byte
+;  @param r14   Component half 0x800080
+;
+;  @note Trashes x, r8
+;-----------------------------------------------------------------------------
+		MACRO
+		ByteMul $dst, $x, $a
+
+		; static inline uint BYTE_MUL(uint x, uint a)
+
+		; uint r8 = (x & 0xff00ff) * a + 0x800080
+		uxtb16	r8, $x	; r8 = r8 & 0x00FF00FF
+		mla		r8, r8, $a, r14
+		
+		; x = ((r >> 8) & 0xff00ff) * a + 0x800080
+		uxtb16	$x, $x, ror #8
+		mla		$x, $x, $a, r14
+
+				
+		; r8 = (r8 + ((r8 >> 8) & 0xff00ff) ) >> 8
+		; r8 &= 0xff00ff
+		uxtab16	r8, r8, r8, ror #8
+		uxtb16	r8, r8, ror #8
+			
+		; x = x + ((x >>8) & 0xff00ff)
+		uxtab16	$x, $x, $x, ror #8
+		
+		; x &= 0xff00ff00
+		; x |= r8
+		uxtb16	$x, $x, ror #8
+		orr		$dst, r8, $x, lsl #8
+		
+		MEND
+		
+;-----------------------------------------------------------------------------
+; Armv6 boosted implementation of INTERPOLATE_PIXEL_255(...) function found in 
+; qdrawhelper_p.h.
+;
+;  @param dst	Destination register where to store the result
+;  @param x     First value to multiply
+;  @param a		Multiplicator byte for first value
+;  @param y     Second value to multiply
+;  @param b     Multiplicator byte for second value
+;  @param r14   Component half 0x800080
+;  
+;
+;  @note Trashes x, r8, r14
+;-----------------------------------------------------------------------------
+		MACRO
+		InterpolatePixel255 $dst, $x, $a, $y, $b
+
+		; static inline uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b)
+
+		; First calculate the parts where we need 0x800080
+
+		; uint r8 = (((x & 0xff00ff) * a) + 0x800080)
+		uxtb16	r8, $x	; r8 = r8 & 0x00FF00FF
+		mla		r8, r8, $a, r14
+		
+		; x = ((((x >> 8) & 0xff00ff) * a) + 0x800080)
+		uxtb16	$x, $x, ror #8
+		mla		$x, $x, $a, r14
+		
+		; Now we are trashing r14 to free it for other purposes
+		
+		; uint r14 = (y & 0xff00ff) * b
+		uxtb16	r14, $y	; r14 = y & 0x00FF00FF
+		mul		r14, r14, $b
+		
+		; r8 = r8 + r14
+		add		r8, r8, r14
+		
+		; r8 = (r8 + ((r8 >> 8) & 0xff00ff) ) >> 8
+		; r8 &= 0xff00ff
+		uxtab16	r8, r8, r8, ror #8
+		uxtb16	r8, r8, ror #8
+		
+		; r14 = ((y >> 8) & 0xff00ff) * b
+		uxtb16	r14, $y, ror #8	; r14 = ((y >> 8) & 0xFF00FF)
+		mul		r14, r14, $b
+		
+		; x = x + r14
+		add		$x, $x, r14
+			
+		; x = x + ((x >>8) & 0xff00ff)
+		uxtab16	$x, $x, $x, ror #8
+		
+		; x &= 0xff00ff00
+		; x |= r8
+		uxtb16	$x, $x, ror #8
+		orr		$dst, r8, $x, lsl #8
+		
+		MEND
+
+;-----------------------------------------------------------------------------
+;
+;-----------------------------------------------------------------------------
+		MACRO
+$label	Blend4Pixels $BlendPixel
+		
+		; Blend first 4 pixels		
+		
+		ldmia	r1!, {r4-r7}
+		ldm		r0, {r9-r12}
+		
+b4p1_$label	$BlendPixel r9, r4, r3
+b4p2_$label	$BlendPixel r10, r5, r3
+b4p3_$label	$BlendPixel r11, r6, r3
+b4p4_$label	$BlendPixel r12, r7, r3
+		
+		stmia 	r0!, {r9-r12}
+		
+		MEND
+
+;-----------------------------------------------------------------------------
+;
+;-----------------------------------------------------------------------------
+		MACRO
+$label	Blend8Pixels $BlendPixel
+		
+b8p1_$label Blend4Pixels $BlendPixel
+b8p2_$label Blend4Pixels $BlendPixel		
+				
+		MEND
+		
+;-----------------------------------------------------------------------------
+;
+;-----------------------------------------------------------------------------
+		MACRO
+$label	Blend16Pixels $BlendPixel
+		
+b16p1_$label Blend8Pixels $BlendPixel
+b16p2_$label Blend8Pixels $BlendPixel		
+				
+		MEND
+		
+;-----------------------------------------------------------------------------
+;
+;-----------------------------------------------------------------------------
+		MACRO
+$label	Blend32Pixels $BlendPixel
+		
+b32p1_$label Blend16Pixels $BlendPixel
+b32p2_$label Blend16Pixels $BlendPixel		
+				
+		MEND
+
+;-----------------------------------------------------------------------------
+; A macro for source over compositing one row of pixels and saving the results 
+; to destination buffer.
+;
+; @param dest			Destination	buffer						(r0)
+; @param src			Source buffer							(r1)
+; @param length			Length									(r2)
+; @param const_alpha	Constant alpha					  		(r3)
+; @param r14 			Component Half (0x800080)		  		(r14)	
+;
+;  @note Advances r0, r1
+;  @note Trashes r2, r4-r12
+;-----------------------------------------------------------------------------
+		MACRO
+$label	BlendRow $BlendPixel
+
+		pld		[r1]
+
+bloop_$label
+		; Blend 32 pixels per loop iteration
+		subs	r2, r2, #32
+		bmi		b_remaining_$label
+
+brp1_$label	Blend32Pixels $BlendPixel
+
+		b		bloop_$label
+
+b_remaining_$label
+		
+		; Remaining 31 pixels
+		
+		addmi	r2, r2, #32
+
+		; Blend 16 pixels
+		tst		r2, #16
+		beq		b_remaining8_$label
+		
+brp2_$label Blend16Pixels $BlendPixel
+	
+b_remaining8_$label	
+		
+		; Blend 8 pixels
+		tst		r2, #8
+		beq		b_remaining4_$label
+		
+brp3_$label Blend8Pixels $BlendPixel			
+		
+b_remaining4_$label		
+		
+		; Blend 4 pixels
+		tst		r2, #4
+		beq		b_remaining3_$label
+		
+brp4_$label Blend4Pixels $BlendPixel			
+
+b_remaining3_$label
+
+		; Remaining 3 pixels
+	
+		tst		r2, #2
+		beq		b_last_$label
+		
+		ldmia 	r1!, {r4-r5}
+		ldm	  	r0,  {r9-r10}
+		
+brp5_$label	$BlendPixel r9, r4, r3
+brp6_$label	$BlendPixel r10, r5, r3
+		
+		stmia 	r0!, {r9-r10}
+
+b_last_$label
+		
+		tst		r2, #1
+		beq		bexit_$label
+		
+		ldr		r4, [r1]
+		ldr		r9, [r0]
+
+bpl_$label	$BlendPixel r9, r4, r3
+		
+		str 	r9, [r0]
+
+bexit_$label
+
+		MEND
+		
+;-----------------------------------------------------------------------------
+; A macro for source over compositing one row of pixels and saving the results 
+; to destination buffer. Restores all registers.
+;
+; @param dest			Destination	buffer						(r0)
+; @param src			Source buffer							(r1)
+; @param length			Length									(r2)
+; @param const_alpha	Constant alpha					  		(r3)
+; @param r14 			Component Half (0x800080)		  		(r14)	
+;
+;  @note Advances r0, r1
+;  @note Trashes r2, r4-r12
+;-----------------------------------------------------------------------------
+		MACRO
+$label	BlendRowSafe $BlendPixel
+
+		stmfd	sp!, {r0-r6} ; Preserves registers only up to r6
+
+brs_$label  BlendRow $BlendPixel		
+
+		ldmfd	sp!, {r0-r6}
+
+		MEND		
+		
+
+;-----------------------------------------------------------------------------
+; Pix Copy. 
+; NOTE! Cache line size of ARM1136JF-S and ARM1136J-S is 32 bytes (8 pixels). 
+;
+; @param dst			Destination	pixels						(r0)
+; @param src			Source pixels							(r1)
+; @param len			Length									(r2)
+;
+;  @note Trashes r3-r10
+;-----------------------------------------------------------------------------
+		MACRO
+$label	PixCpy $dst, $src, $len
+
+		pld		[$src]
+
+pcpy_loop_$label
+		; Copy 8 pixels per loop iteration
+		pld		[$src, #96]
+		subs	$len, $len, #8
+		ldmgeia	$src!, {r3-r10}
+		stmgeia	$dst!, {r3-r10}
+		bgt		pcpy_loop_$label
+
+pcpy_remaining_$label
+
+		; Copy up to 7 remaining pixels
+		
+		; Copy 4 pixels
+		tst		$len, #4
+		ldmneia	$src!, {r3-r6}
+		stmneia	$dst!, {r3-r6}
+
+		tst		$len, #2
+		ldmneia	$src!, {r3-r4}
+		stmneia	$dst!, {r3-r4}
+
+		tst		$len, #1
+		ldrne	r3, [$src]
+		strne 	r3, [$dst]
+
+		MEND
+		
+;-----------------------------------------------------------------------------
+; General Pix Copy. Maximum 8 pixels at time. Restores all registers. 
+;
+; @param dst			Destination	pixels						(r0)
+; @param src			Source pixels							(r1)
+; @param len			Length									(r2)
+;
+;  @note Trashes r3-r10
+;-----------------------------------------------------------------------------
+		MACRO
+$label	PixCpySafe $dst, $src, $len
+
+		stmfd	sp!, {r0-r6} ; Preserves registers only up to r6
+
+pcs_$label  PixCpy $dst, $src, $len
+
+		ldmfd	sp!, {r0-r6}		; pop
+		
+		MEND
+		
+		
+;-----------------------------------------------------------------------------
+; A macro for source over compositing one pixel and saving the result to
+; dst register.
+;
+;  @param dst      Destination register, must contain destination pixel upon entry
+;  @param src 	   Source register, must contain source pixel upon entry
+;  @param const_alpha Constant source alpha
+;  @param r14	   Component half 0x800080
+;
+;  @note Trashes const_alpha, r8
+;-----------------------------------------------------------------------------
+		MACRO
+$label	PixelSourceOver $dst, $src, $const_alpha
+
+		; Negate src and extract alpha
+		mvn		$const_alpha, $src ; bitwise not
+		uxtb	$const_alpha, $const_alpha, ror #24	; r3 = ((r3 & 0xFF000000) >> 24);  
+
+		;cmp		$const_alpha, #255	; test for full transparency ( negated )
+		;beq		exit_$label
+		cmp     $const_alpha, #0	            ; test for full opacity ( negated )
+		moveq	$dst, $src
+		beq		exit_$label
+
+		ByteMul	$dst, $dst, $const_alpha	
+		add		$dst, $src, $dst
+		
+exit_$label
+		MEND
+		
+;-----------------------------------------------------------------------------
+; A macro for source over compositing one pixel and saving the result to
+; dst register.
+;
+;  @param dst      Destination register, must contain destination pixel upon entry
+;  @param src 	   Source register, must contain source pixel upon entry
+;  @param const_alpha Constant source alpha
+;  @param r14	   Component half 0x800080
+;
+;  @note Trashes src, const_alpha, r8
+;-----------------------------------------------------------------------------
+		MACRO
+$label	PixelSourceOverConstAlpha $dst, $src, $const_alpha
+
+		; store alpha because we are going to trash it
+		stmfd	sp!, {$const_alpha}
+
+		ByteMul	$src, $src, $const_alpha
+
+		; Negate src and extract alpha
+		mvn		$const_alpha, $src ; bitwise not
+		uxtb	$const_alpha, $const_alpha, ror #24	; r3 = ((r3 & 0xFF000000) >> 24);  
+
+		ByteMul	$dst, $dst, $const_alpha
+
+		add		$dst, $src, $dst
+
+		; recover alpha
+		ldmfd	sp!, {$const_alpha}
+
+		MEND		
+		
+;-----------------------------------------------------------------------------
+; A macro for source over compositing one pixel and saving the result to
+; a register.
+;
+;  @param dst      Destination register, must contain destination pixel upon entry
+;  @param src 	   Source register, must contain source pixel upon entry
+;  @param const_alpha Constant source alpha
+;  @param r14	   Component half 0x800080
+;
+;  @note Trashes src, r8
+;-----------------------------------------------------------------------------
+		MACRO
+$label	PixelSourceConstAlpha $dst, $src, $const_alpha
+
+		; store r2 and r14 because we are going to trash them
+		stmfd	sp!, {r2, r14}
+
+		rsb		r2, $const_alpha, #255
+		InterpolatePixel255 $dst, $src, $const_alpha, $dst, r2
+
+		; recover r2 and r14
+		ldmfd	sp!, {r2, r14}
+
+		MEND		
+		
+		END ; File end
diff --git a/src/gui/painting/qdrawhelper_armv6_rvct.s b/src/gui/painting/qdrawhelper_armv6_rvct.s
new file mode 100644
index 0000000000..3ffe48b3e3
--- /dev/null
+++ b/src/gui/painting/qdrawhelper_armv6_rvct.s
@@ -0,0 +1,178 @@
+;/****************************************************************************
+;**
+;** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+;** Contact: Qt Software Information (qt-info@nokia.com)
+;**
+;** This file is part of the QtGui module of the Qt Toolkit.
+;**
+;** $QT_BEGIN_LICENSE:LGPL$
+;** No Commercial Usage
+;** This file contains pre-release code and may not be distributed.
+;** You may use this file in accordance with the terms and conditions
+;** contained in the either Technology Preview License Agreement or the
+;** Beta Release License Agreement.
+;**
+;** GNU Lesser General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU Lesser
+;** General Public License version 2.1 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU Lesser General Public License version 2.1 requirements
+;** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+;**
+;** In addition, as a special exception, Nokia gives you certain
+;** additional rights. These rights are described in the Nokia Qt LGPL
+;** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;** package.
+;**
+;** GNU General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU
+;** General Public License version 3.0 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.GPL included in the
+;** packaging of this file.  Please review the following information to
+;** ensure the GNU General Public License version 3.0 requirements will be
+;** met: http://www.gnu.org/copyleft/gpl.html.
+;**
+;** If you are unsure which license is appropriate for your use, please
+;** contact the sales department at qt-sales@nokia.com.
+;** $QT_END_LICENSE$
+;**
+;****************************************************************************/
+
+;
+;  W A R N I N G
+;  -------------
+;
+; This file is not part of the Qt API.  It exists purely as an
+; implementation detail.  This header file may change from version to
+; version without notice, or even be removed.
+;
+; We mean it.
+;
+
+		ARM
+		PRESERVE8
+		
+		INCLUDE		qdrawhelper_armv6_rvct.inc
+		
+;-----------------------------------------------------------------------------
+; qt_memfill32_armv6
+; 
+; @brief Not yet in use!
+;
+; @param dest			Destination	buffer						(r0)
+; @param value			Value									(r1)
+; @param count			Count									(r2)
+; 
+;---------------------------------------------------------------------------
+qt_memfill32_armv6 Function
+		stmfd	sp!, {r4-r12, r14}
+		
+		mov		r3, r1
+		mov		r4, r1
+		mov		r5, r1
+		mov		r6, r1
+		mov		r7, r1
+		mov		r8, r1
+		mov		r9, r1
+	
+mfill_loop
+		; Fill 32 pixels per loop iteration
+		subs	r2, r2, #32
+		stmgeia	r0!, {r1, r3, r4, r5, r6, r7, r8, r9}
+		stmgeia	r0!, {r1, r3, r4, r5, r6, r7, r8, r9}
+		stmgeia	r0!, {r1, r3, r4, r5, r6, r7, r8, r9}
+		stmgeia	r0!, {r1, r3, r4, r5, r6, r7, r8, r9}
+		bgt		mfill_loop
+
+mfill_remaining
+
+		; Fill up to 31 remaining pixels
+		
+		; Fill 16 pixels
+		tst		r2, #16
+		stmneia	r0!, {r1, r3, r4, r5, r6, r7, r8, r9}
+		stmneia	r0!, {r1, r3, r4, r5, r6, r7, r8, r9}
+		
+		; Fill 8 pixels
+		tst		r2, #8
+		stmneia	r0!, {r1, r3, r4, r5, r6, r7, r8, r9}
+		
+		; Fill 4 pixels
+		tst		r2, #4
+		stmneia	r0!, {r1, r3, r4, r5}
+
+		; Fill 2 pixels
+		tst		r2, #2
+		stmneia	r0!, {r1, r3}
+
+		; Fill last one
+		tst		r2, #1
+		strne 	r1, [r0]
+		
+		ldmfd	sp!, {r4-r12, pc}		; pop and return
+					
+;-----------------------------------------------------------------------------
+; comp_func_Source_arm
+; 
+; @brief 
+;
+; @param dest			Destination	buffer						(r0)
+; @param src			Source buffer							(r1)
+; @param length			Length									(r2)
+; @param const_alpha	Constant alpha							(r3)
+; 
+;---------------------------------------------------------------------------
+comp_func_Source_armv6 Function
+		stmfd	sp!, {r4-r12, r14}
+	
+		cmp		r3, #255 ; if(r3 == 255)
+		bne		src2 ; branch if not
+	
+src1	PixCpy	r0, r1, r2
+
+		ldmfd	sp!, {r4-r12, pc}		; pop and return
+
+src2	
+		;ldr		r14, =ComponentHalf ; load 0x800080 to r14
+		mov		r14, #0x800000
+		add		r14, r14, #0x80
+
+src22   BlendRow PixelSourceConstAlpha
+
+		ldmfd	sp!, {r4-r12, pc}		; pop and return
+
+;-----------------------------------------------------------------------------
+; comp_func_SourceOver_arm
+; 
+; @brief 
+;
+; @param dest			Destination	buffer						(r0)
+; @param src			Source buffer							(r1)
+; @param length			Length									(r2)
+; @param const_alpha	Constant alpha							(r3)
+; 
+;---------------------------------------------------------------------------
+comp_func_SourceOver_armv6 Function
+		stmfd	sp!, {r4-r12, r14}
+	
+		;ldr		r14, =ComponentHalf ; load 0x800080 to r14
+		mov		r14, #0x800000
+		add		r14, r14, #0x80
+	
+		cmp		r3, #255 ; if(r3 == 255)
+		bne		srcovr2 ; branch if not
+	
+srcovr1	 BlendRow PixelSourceOver
+		
+		ldmfd	sp!, {r4-r12, pc}		; pop and return
+
+srcovr2
+ 
+srcovr22  BlendRow PixelSourceOverConstAlpha
+
+		ldmfd	sp!, {r4-r12, pc}		; pop and return
+		
+
+		END	; File end		
+		
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h
index 79797167f6..75b39b76dc 100644
--- a/src/gui/painting/qdrawhelper_p.h
+++ b/src/gui/painting/qdrawhelper_p.h
@@ -87,7 +87,7 @@ QT_BEGIN_NAMESPACE
 #if defined(Q_CC_RVCT)
 // RVCT doesn't like static template functions
 #  define Q_STATIC_TEMPLATE_FUNCTION
-#  define Q_STATIC_INLINE_FUNCTION inline
+#  define Q_STATIC_INLINE_FUNCTION static __forceinline
 #else
 #  define Q_STATIC_TEMPLATE_FUNCTION static
 #  define Q_STATIC_INLINE_FUNCTION static inline
@@ -301,19 +301,23 @@ struct QSpanData
 };
 
 
-static inline uint BYTE_MUL_RGB16(uint x, uint a) {
+Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16(uint x, uint a) {
     a += 1;
     uint t = (((x & 0x07e0)*a) >> 8) & 0x07e0;
     t |= (((x & 0xf81f)*(a>>2)) >> 6) & 0xf81f;
     return t;
 }
 
-static inline uint BYTE_MUL_RGB16_32(uint x, uint a) {
+Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16_32(uint x, uint a) {
     uint t = (((x & 0xf81f07e0) >> 5)*a) & 0xf81f07e0;
     t |= (((x & 0x07e0f81f)*a) >> 5) & 0x07e0f81f;
     return t;
 }
 
+#if defined(Q_CC_RVCT)
+#  pragma push
+#  pragma arm
+#endif
 Q_STATIC_INLINE_FUNCTION uint BYTE_MUL(uint x, uint a) {
     uint t = (x & 0xff00ff) * a;
     t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8;
@@ -325,8 +329,11 @@ Q_STATIC_INLINE_FUNCTION uint BYTE_MUL(uint x, uint a) {
     x |= t;
     return x;
 }
+#if defined(Q_CC_RVCT)
+#  pragma pop
+#endif
 
-static inline uint PREMUL(uint x) {
+Q_STATIC_INLINE_FUNCTION uint PREMUL(uint x) {
     uint a = x >> 24;
     uint t = (x & 0xff00ff) * a;
     t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8;
@@ -391,7 +398,7 @@ public:
         return qt_colorConvert<quint16, quint32>(data, 0);
     }
 
-    static inline quint32p fromRawData(quint32 v)
+    Q_STATIC_INLINE_FUNCTION quint32p fromRawData(quint32 v)
     {
         quint32p p;
         p.data = v;
@@ -422,7 +429,7 @@ class qrgb565;
 class qargb8565
 {
 public:
-    static inline bool hasAlpha() { return true; }
+    Q_STATIC_INLINE_FUNCTION bool hasAlpha() { return true; }
 
     inline qargb8565() {}
     inline qargb8565(quint32 v);
@@ -439,8 +446,8 @@ public:
         data[1] &= 0xdf;
         return *this;
     }
-    static inline quint8 alpha(quint8 a) { return (a + 1) >> 3; }
-    static inline quint8 ialpha(quint8 a) { return 0x20 - alpha(a); }
+    Q_STATIC_INLINE_FUNCTION quint8 alpha(quint8 a) { return (a + 1) >> 3; }
+    Q_STATIC_INLINE_FUNCTION quint8 ialpha(quint8 a) { return 0x20 - alpha(a); }
 
     inline qargb8565 byte_mul(quint8 a) const;
     inline qargb8565 operator+(qargb8565 v) const;
@@ -458,7 +465,7 @@ private:
 class qrgb565
 {
 public:
-    static inline bool hasAlpha() { return false; }
+    Q_STATIC_INLINE_FUNCTION bool hasAlpha() { return false; }
 
     qrgb565(int v = 0) : data(v) {}
 
@@ -473,8 +480,8 @@ public:
 
     inline quint8 alpha() const { return 0xff; }
     inline qrgb565 truncedAlpha() { return *this; }
-    static inline quint8 alpha(quint8 a) { return (a + 1) >> 3; }
-    static inline quint8 ialpha(quint8 a) { return 0x20 - alpha(a); }
+    Q_STATIC_INLINE_FUNCTION quint8 alpha(quint8 a) { return (a + 1) >> 3; }
+    Q_STATIC_INLINE_FUNCTION quint8 ialpha(quint8 a) { return 0x20 - alpha(a); }
 
     inline qrgb565 byte_mul(quint8 a) const;
 
@@ -654,7 +661,7 @@ class qrgb555;
 class qargb8555
 {
 public:
-    static inline bool hasAlpha() { return true; }
+    Q_STATIC_INLINE_FUNCTION bool hasAlpha() { return true; }
 
     qargb8555() {}
     inline qargb8555(quint32 v);
@@ -666,8 +673,8 @@ public:
 
     inline quint8 alpha() const { return data[0]; }
     inline qargb8555 truncedAlpha() { data[0] &= 0xf8; return *this; }
-    static inline quint8 alpha(quint8 a) { return (a + 1) >> 3; }
-    static inline quint8 ialpha(quint8 a) { return 0x20 - alpha(a); }
+    Q_STATIC_INLINE_FUNCTION quint8 alpha(quint8 a) { return (a + 1) >> 3; }
+    Q_STATIC_INLINE_FUNCTION quint8 ialpha(quint8 a) { return 0x20 - alpha(a); }
 
     inline qargb8555 operator+(qargb8555 v) const;
     inline qargb8555 byte_mul(quint8 a) const;
@@ -684,7 +691,7 @@ private:
 class qrgb555
 {
 public:
-    static inline bool hasAlpha() { return false; }
+    Q_STATIC_INLINE_FUNCTION bool hasAlpha() { return false; }
 
     inline qrgb555(int v = 0) : data(v) {}
 
@@ -733,8 +740,8 @@ public:
 
     inline quint8 alpha() const { return 0xff; }
     inline qrgb555 truncedAlpha() { return *this; }
-    static inline quint8 alpha(quint8 a) { return (a + 1) >> 3; }
-    static inline quint8 ialpha(quint8 a) { return 0x20 - alpha(a); }
+    Q_STATIC_INLINE_FUNCTION quint8 alpha(quint8 a) { return (a + 1) >> 3; }
+    Q_STATIC_INLINE_FUNCTION quint8 ialpha(quint8 a) { return 0x20 - alpha(a); }
 
     inline bool operator==(const qrgb555 &v) const { return v.data == data; }
     inline bool operator!=(const qrgb555 &v) const { return v.data != data; }
@@ -882,7 +889,7 @@ class qrgb666;
 class qargb6666
 {
 public:
-    static inline bool hasAlpha() { return true; }
+    Q_STATIC_INLINE_FUNCTION bool hasAlpha() { return true; }
 
     inline qargb6666() {}
     inline qargb6666(quint32 v) { *this = qargb6666(quint32p(v)); }
@@ -894,8 +901,8 @@ public:
 
     inline quint8 alpha() const;
     inline qargb6666 truncedAlpha() { return *this; }
-    static inline quint8 alpha(quint8 a) { return (a + 1) >> 2; }
-    static inline quint8 ialpha(quint8 a) { return (255 - a + 1) >> 2; }
+    Q_STATIC_INLINE_FUNCTION quint8 alpha(quint8 a) { return (a + 1) >> 2; }
+    Q_STATIC_INLINE_FUNCTION quint8 ialpha(quint8 a) { return (255 - a + 1) >> 2; }
 
     inline qargb6666 byte_mul(quint8 a) const;
     inline qargb6666 operator+(qargb6666 v) const;
@@ -912,7 +919,7 @@ private:
 class qrgb666
 {
 public:
-    static inline bool hasAlpha() { return false; }
+    Q_STATIC_INLINE_FUNCTION bool hasAlpha() { return false; }
 
     inline qrgb666() {}
     inline qrgb666(quint32 v);
@@ -922,8 +929,8 @@ public:
 
     inline quint8 alpha() const { return 0xff; }
     inline qrgb666 truncedAlpha() { return *this; }
-    static inline quint8 alpha(quint8 a) { return (a + 1) >> 2; }
-    static inline quint8 ialpha(quint8 a) { return (255 - a + 1) >> 2; }
+    Q_STATIC_INLINE_FUNCTION quint8 alpha(quint8 a) { return (a + 1) >> 2; }
+    Q_STATIC_INLINE_FUNCTION quint8 ialpha(quint8 a) { return (255 - a + 1) >> 2; }
 
     inline qrgb666 operator+(qrgb666 v) const;
     inline qrgb666 byte_mul(quint8 a) const;
@@ -1080,7 +1087,7 @@ quint32 qargb6666::rawValue() const
 class qrgb888
 {
 public:
-    static inline bool hasAlpha() { return false; }
+    Q_STATIC_INLINE_FUNCTION bool hasAlpha() { return false; }
 
     inline qrgb888() {}
     inline qrgb888(quint32 v);
@@ -1089,8 +1096,8 @@ public:
 
     inline quint8 alpha() const { return 0xff; }
     inline qrgb888 truncedAlpha() { return *this; }
-    static inline quint8 alpha(quint8 a) { return a; }
-    static inline quint8 ialpha(quint8 a) { return 255 - a; }
+    Q_STATIC_INLINE_FUNCTION quint8 alpha(quint8 a) { return a; }
+    Q_STATIC_INLINE_FUNCTION quint8 ialpha(quint8 a) { return 255 - a; }
 
     inline qrgb888 byte_mul(quint8 a) const;
     inline qrgb888 operator+(qrgb888 v) const;
@@ -1269,7 +1276,7 @@ class qrgb444;
 class qargb4444
 {
 public:
-    static inline bool hasAlpha() { return true; }
+    Q_STATIC_INLINE_FUNCTION bool hasAlpha() { return true; }
 
     inline qargb4444() {}
     inline qargb4444(quint32 v) { *this = qargb4444(quint32p(v)); }
@@ -1283,8 +1290,8 @@ public:
 
     inline quint8 alpha() const { return ((data & 0xf000) >> 8) | ((data & 0xf000) >> 12); }
     inline qargb4444 truncedAlpha() { return *this; }
-    static inline quint8 alpha(quint8 a) { return (a + 1) >> 4; }
-    static inline quint8 ialpha(quint8 a) { return 0x10 - alpha(a); }
+    Q_STATIC_INLINE_FUNCTION quint8 alpha(quint8 a) { return (a + 1) >> 4; }
+    Q_STATIC_INLINE_FUNCTION quint8 ialpha(quint8 a) { return 0x10 - alpha(a); }
     inline qargb4444 byte_mul(quint8 a) const;
 
     inline bool operator==(const qargb4444 &v) const { return data == v.data; }
@@ -1300,7 +1307,7 @@ private:
 class qrgb444
 {
 public:
-    static inline bool hasAlpha() { return false; }
+    Q_STATIC_INLINE_FUNCTION bool hasAlpha() { return false; }
 
     inline qrgb444() {}
     inline qrgb444(quint32 v);
@@ -1312,8 +1319,8 @@ public:
     inline qrgb444 operator+(qrgb444 v) const;
     inline quint8 alpha() const { return 0xff; }
     inline qrgb444 truncedAlpha() { return *this; }
-    static inline quint8 alpha(quint8 a) { return (a + 1) >> 4; }
-    static inline quint8 ialpha(quint8 a) { return 0x10 - alpha(a); }
+    Q_STATIC_INLINE_FUNCTION quint8 alpha(quint8 a) { return (a + 1) >> 4; }
+    Q_STATIC_INLINE_FUNCTION quint8 ialpha(quint8 a) { return 0x10 - alpha(a); }
     inline qrgb444 byte_mul(quint8 a) const;
 
     inline bool operator==(const qrgb444 &v) const { return data == v.data; }
@@ -1774,7 +1781,14 @@ do {                                          \
     }                                         \
 } while (0)
 
+#if defined(Q_CC_RVCT)
+#  pragma push
+#  pragma arm
+#endif
 Q_STATIC_INLINE_FUNCTION int qt_div_255(int x) { return (x + (x>>8) + 0x80) >> 8; }
+#if defined(Q_CC_RVCT)
+#  pragma pop
+#endif
 
 inline ushort qConvertRgb32To16(uint c)
 {
@@ -1817,7 +1831,7 @@ inline int qBlue565(quint16 rgb) {
 }
 
 #if 1
-static inline uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) {
+Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) {
     uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b;
     t >>= 8;
     t &= 0xff00ff;
@@ -1828,7 +1842,11 @@ static inline uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) {
     return x;
 }
 
-static inline uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) {
+#if defined(Q_CC_RVCT)
+#  pragma push
+#  pragma arm
+#endif
+Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) {
     uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b;
     t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8;
     t &= 0xff00ff;
@@ -1839,9 +1857,12 @@ static inline uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) {
     x |= t;
     return x;
 }
+#if defined(Q_CC_RVCT)
+#  pragma pop
+#endif
 #else
 // possible implementation for 64 bit
-static inline uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) {
+Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) {
     ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
     t += (((ulong(y)) | ((ulong(y)) << 24)) & 0x00ff00ff00ff00ff) * b;
     t >>= 8;
@@ -1849,7 +1870,7 @@ static inline uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) {
     return (uint(t)) | (uint(t >> 24));
 }
 
-static inline uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) {
+Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) {
     ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
     t += (((ulong(y)) | ((ulong(y)) << 24)) & 0x00ff00ff00ff00ff) * b;
     t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080);
@@ -1864,7 +1885,7 @@ Q_STATIC_INLINE_FUNCTION uint BYTE_MUL(uint x, uint a) {
     return (uint(t)) | (uint(t >> 24));
 }
 
-static inline uint PREMUL(uint x) {
+Q_STATIC_INLINE_FUNCTION uint PREMUL(uint x) {
     uint a = x >> 24;
     ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
     t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080);
diff --git a/src/gui/painting/qgraphicssystem.cpp b/src/gui/painting/qgraphicssystem.cpp
index 2a99f165af..d4c7a652c9 100644
--- a/src/gui/painting/qgraphicssystem.cpp
+++ b/src/gui/painting/qgraphicssystem.cpp
@@ -44,7 +44,7 @@
 #ifdef Q_WS_X11
 # include <private/qpixmap_x11_p.h>
 #endif
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
 # include <private/qpixmap_raster_p.h>
 #endif
 #ifdef Q_WS_MAC
@@ -64,7 +64,7 @@ QPixmapData *QGraphicsSystem::createDefaultPixmapData(QPixmapData::PixelType typ
 #endif
 #if defined(Q_WS_X11)
     return new QX11PixmapData(type);
-#elif defined(Q_WS_WIN)
+#elif defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
     return new QRasterPixmapData(type);
 #elif defined(Q_WS_MAC)
     return new QMacPixmapData(type);
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp
index ddc66f37ba..bf186e6bb0 100644
--- a/src/gui/painting/qgraphicssystemfactory.cpp
+++ b/src/gui/painting/qgraphicssystemfactory.cpp
@@ -68,7 +68,7 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key)
     if (system.isEmpty()) {
         system = QLatin1String("openvg");
     }
-#elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN)
+#elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN) && !defined(Q_OS_SYMBIAN)
     if (system.isEmpty()) {
         system = QLatin1String("raster");
     }
diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.c
index c41b040e0c..6ab7055a68 100644
--- a/src/gui/painting/qgrayraster.c
+++ b/src/gui/painting/qgrayraster.c
@@ -160,7 +160,12 @@
 #include <private/qrasterdefs_p.h>
 #include <private/qgrayraster_p.h>
 
+// Bug in stdlib.h, see more information from fixed_stdlib.h
+#if (defined __SYMBIAN32__ && !defined __cplusplus)
+#include <fixed_stdlib.h>
+#else
 #include <stdlib.h>
+#endif  // defined __SYMBIAN32__ && !defined __cplusplus
 #include <stdio.h>
 
   /* This macro is used to indicate that a function parameter is unused. */
diff --git a/src/gui/painting/qpaintdevice_s60.cpp b/src/gui/painting/qpaintdevice_s60.cpp
new file mode 100644
index 0000000000..a2c449981f
--- /dev/null
+++ b/src/gui/painting/qpaintdevice_s60.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qpaintdevice.h"
+#include "qpainter.h"
+#include "qwidget.h"
+#include "qbitmap.h"
+#include "qapplication.h"
+#include <private/qapplication_p.h>
+#include "qprinter.h"
+
+QT_BEGIN_NAMESPACE
+
+QPaintDevice::QPaintDevice()
+{
+    painters = 0;
+}
+
+
+QPaintDevice::~QPaintDevice()
+{
+    if (paintingActive())
+        qWarning("QPaintDevice: Cannot destroy paint device that is being "
+                  "painted.  Be sure to QPainter::end() painters!");
+}
+
+int QPaintDevice::metric(PaintDeviceMetric) const
+{
+    qWarning("QPaintDevice::metrics: Device has no metric information");
+    return 0;
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp
index 4fb1832d81..55651466ff 100644
--- a/src/gui/painting/qpaintengine.cpp
+++ b/src/gui/painting/qpaintengine.cpp
@@ -717,7 +717,6 @@ QPaintEngine::QPaintEngine(QPaintEnginePrivate &dptr, PaintEngineFeatures caps)
 */
 QPaintEngine::~QPaintEngine()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h
index 57c9e2d7ea..92aa506c7f 100644
--- a/src/gui/painting/qpaintengine.h
+++ b/src/gui/painting/qpaintengine.h
@@ -44,6 +44,7 @@
 
 #include <QtCore/qnamespace.h>
 #include <QtCore/qobjectdefs.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtGui/qpainter.h>
 
 QT_BEGIN_HEADER
@@ -239,7 +240,7 @@ protected:
     uint selfDestruct : 1;
     uint extended : 1;
 
-    QPaintEnginePrivate *d_ptr;
+    QScopedPointer<QPaintEnginePrivate> d_ptr;
 
 private:
     void setAutoDestruct(bool autoDestr) { selfDestruct = autoDestr; }
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 74456dde49..d9af3f61d5 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -91,6 +91,8 @@
 #    include <private/qfontengine_qpf_p.h>
 #  endif
 #  include <private/qabstractfontengine_p.h>
+#elif defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE)
+#  include <private/qfontengine_s60_p.h>
 #endif
 
 #if defined(Q_WS_WIN64)
@@ -342,6 +344,7 @@ void QRasterPaintEngine::init()
 #else
         (unsigned char *) malloc(d->rasterPoolSize);
 #endif
+    Q_CHECK_PTR(d->rasterPoolBase);
 
     // The antialiasing raster.
     d->grayRaster = new QT_FT_Raster;
@@ -3159,7 +3162,7 @@ void QRasterPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte
     ensurePen();
     ensureState();
 
-#if defined (Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined (Q_WS_WIN) || defined(Q_WS_MAC) || (defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE))
 
     bool drawCached = true;
 
@@ -3192,7 +3195,7 @@ void QRasterPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte
         return;
     }
 
-#else // Q_WS_WIN || Q_WS_MAC
+#else // Q_WS_WIN || Q_WS_MAC || Q_OS_SYMBIAN && QT_NO_FREETYPE
 
     QFontEngine *fontEngine = ti.fontEngine;
 
@@ -3212,7 +3215,7 @@ void QRasterPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte
     }
 #endif // Q_WS_QWS
 
-#if (defined(Q_WS_X11) || defined(Q_WS_QWS)) && !defined(QT_NO_FREETYPE)
+#if (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) && !defined(QT_NO_FREETYPE)
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_QWS_QPF2)
     if (fontEngine->type() == QFontEngine::QPF2) {
@@ -3877,7 +3880,7 @@ static void qt_merge_clip(const QClipData *c1, const QClipData *c2, QClipData *r
 
         // find required length
         int max = qMax(c1_spans[c1_count - 1].x + c1_spans[c1_count - 1].len,
-                       c2_spans[c2_count - 1].x + c2_spans[c2_count - 1].len);
+                c2_spans[c2_count - 1].x + c2_spans[c2_count - 1].len);
         buffer.resize(max);
         memset(buffer.data(), 0, buffer.size() * sizeof(short));
 
@@ -4039,6 +4042,7 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline,
 #else
                 (unsigned char *) malloc(rasterPoolSize);
 #endif
+            Q_CHECK_PTR(rasterPoolBase); // note: we just freed the old rasterPoolBase. I hope it's not fatal.
 
             qt_ft_grays_raster.raster_done(*grayRaster);
             qt_ft_grays_raster.raster_new(0, grayRaster);
@@ -4161,8 +4165,14 @@ int QCustomRasterPaintDevice::bytesPerLine() const
 {
     return (width() * depth() + 7) / 8;
 }
-#endif // Q_WS_QWS
 
+#elif defined(Q_OS_SYMBIAN)
+
+void QRasterBuffer::prepareBuffer(int /* width */, int /* height */)
+{
+}
+
+#endif // Q_OS_SYMBIAN
 
 /*!
     \class QCustomRasterPaintDevice
@@ -4270,95 +4280,109 @@ void QClipData::initialize()
     if (!m_clipLines)
         m_clipLines = (ClipLine *)calloc(sizeof(ClipLine), clipSpanHeight);
 
-    m_spans = (QSpan *)malloc(clipSpanHeight*sizeof(QSpan));
-    allocated = clipSpanHeight;
-
-    if (hasRectClip) {
-        int y = 0;
-        while (y < ymin) {
-            m_clipLines[y].spans = 0;
-            m_clipLines[y].count = 0;
-            ++y;
-        }
-
-        const int len = clipRect.width();
-        count = 0;
-        while (y < ymax) {
-            QSpan *span = m_spans + count;
-            span->x = xmin;
-            span->len = len;
-            span->y = y;
-            span->coverage = 255;
-            ++count;
-
-            m_clipLines[y].spans = span;
-            m_clipLines[y].count = 1;
-            ++y;
-        }
+    Q_CHECK_PTR(m_clipLines);
+    QT_TRY {
+        m_spans = (QSpan *)malloc(clipSpanHeight*sizeof(QSpan));
+		  allocated = clipSpanHeight;
+        Q_CHECK_PTR(m_spans);
+
+        QT_TRY {
+            if (hasRectClip) {
+                int y = 0;
+                while (y < ymin) {
+                    m_clipLines[y].spans = 0;
+                    m_clipLines[y].count = 0;
+                    ++y;
+                }
 
-        while (y < clipSpanHeight) {
-            m_clipLines[y].spans = 0;
-            m_clipLines[y].count = 0;
-            ++y;
-        }
-    } else if (hasRegionClip) {
+                const int len = clipRect.width();
+                count = 0;
+                while (y < ymax) {
+                    QSpan *span = m_spans + count;
+                    span->x = xmin;
+                    span->len = len;
+                    span->y = y;
+                    span->coverage = 255;
+                    ++count;
 
-        const QVector<QRect> rects = clipRegion.rects();
-        const int numRects = rects.size();
+                    m_clipLines[y].spans = span;
+                    m_clipLines[y].count = 1;
+                    ++y;
+                }
 
-        { // resize
-            const int maxSpans = (ymax - ymin) * numRects;
-            if (maxSpans > allocated) {
-                m_spans = (QSpan *)realloc(m_spans, maxSpans * sizeof(QSpan));
-                allocated = maxSpans;
-            }
-        }
+                while (y < clipSpanHeight) {
+                    m_clipLines[y].spans = 0;
+                    m_clipLines[y].count = 0;
+                    ++y;
+                }
+            } else if (hasRegionClip) {
+
+                const QVector<QRect> rects = clipRegion.rects();
+                const int numRects = rects.size();
+
+                { // resize
+                    const int maxSpans = (ymax - ymin) * numRects;
+                    if (maxSpans > allocated) {
+                        QSpan *newSpans = (QSpan *)realloc(m_spans, maxSpans * sizeof(QSpan));
+                        Q_CHECK_PTR(newSpans);
+                        m_spans = newSpans;
+                        allocated = maxSpans;
+                    }
+                }
 
-        int y = 0;
-        int firstInBand = 0;
-        count = 0;
-        while (firstInBand < numRects) {
-            const int currMinY = rects.at(firstInBand).y();
-            const int currMaxY = currMinY + rects.at(firstInBand).height();
+                int y = 0;
+                int firstInBand = 0;
+                count = 0;
+                while (firstInBand < numRects) {
+                    const int currMinY = rects.at(firstInBand).y();
+                    const int currMaxY = currMinY + rects.at(firstInBand).height();
+
+                    while (y < currMinY) {
+                        m_clipLines[y].spans = 0;
+                        m_clipLines[y].count = 0;
+                        ++y;
+                    }
 
-            while (y < currMinY) {
-                m_clipLines[y].spans = 0;
-                m_clipLines[y].count = 0;
-                ++y;
-            }
+                    int lastInBand = firstInBand;
+                    while (lastInBand + 1 < numRects && rects.at(lastInBand+1).top() == y)
+                        ++lastInBand;
 
-            int lastInBand = firstInBand;
-            while (lastInBand + 1 < numRects && rects.at(lastInBand+1).top() == y)
-                ++lastInBand;
+                    while (y < currMaxY) {
 
-            while (y < currMaxY) {
+                        m_clipLines[y].spans = m_spans + count;
+                        m_clipLines[y].count = lastInBand - firstInBand + 1;
 
-                m_clipLines[y].spans = m_spans + count;
-                m_clipLines[y].count = lastInBand - firstInBand + 1;
+                        for (int r = firstInBand; r <= lastInBand; ++r) {
+                            const QRect &currRect = rects.at(r);
+                            QSpan *span = m_spans + count;
+                            span->x = currRect.x();
+                            span->len = currRect.width();
+                            span->y = y;
+                            span->coverage = 255;
+                            ++count;
+                        }
+                        ++y;
+                    }
 
-                for (int r = firstInBand; r <= lastInBand; ++r) {
-                    const QRect &currRect = rects.at(r);
-                    QSpan *span = m_spans + count;
-                    span->x = currRect.x();
-                    span->len = currRect.width();
-                    span->y = y;
-                    span->coverage = 255;
-                    ++count;
+                    firstInBand = lastInBand + 1;
                 }
-                ++y;
-            }
 
-            firstInBand = lastInBand + 1;
-        }
+                Q_ASSERT(count <= allocated);
 
-        Q_ASSERT(count <= allocated);
+                while (y < clipSpanHeight) {
+                    m_clipLines[y].spans = 0;
+                    m_clipLines[y].count = 0;
+                    ++y;
+                }
 
-        while (y < clipSpanHeight) {
-            m_clipLines[y].spans = 0;
-            m_clipLines[y].count = 0;
-            ++y;
+            }
+        } QT_CATCH(...) {
+            free(m_spans);
+            QT_RETHROW;
         }
-
+    } QT_CATCH(...) {
+        free(m_clipLines);
+        QT_RETHROW;
     }
 }
 
@@ -4633,8 +4657,10 @@ static void qt_span_clip(int count, const QSpan *spans, void *userData)
                                            &newspans, newClip->allocated - newClip->count);
                 newClip->count = newspans - newClip->m_spans;
                 if (spans < end) {
+                    QSpan *newSpan = (QSpan *)realloc(newClip->m_spans, newClip->allocated*2*sizeof(QSpan));
+                    Q_CHECK_PTR(newSpan);
+                    newClip->m_spans = newSpan;
                     newClip->allocated *= 2;
-                    newClip->m_spans = (QSpan *)realloc(newClip->m_spans, newClip->allocated*sizeof(QSpan));
                 }
             }
         }
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index ed9b8586dd..81dce4ffd4 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -179,8 +179,7 @@ void QPaintEngineExPrivate::replayClipOperations()
     if (!p || !p->d_ptr)
         return;
 
-    QPainterPrivate *pp = p->d_ptr;
-    QList<QPainterClipInfo> clipInfo = pp->state->clipInfo;
+    QList<QPainterClipInfo> clipInfo = p->d_ptr->state->clipInfo;
 
     QTransform transform = q->state()->matrix;
 
@@ -231,8 +230,7 @@ bool QPaintEngineExPrivate::hasClipOperations() const
     if (!p || !p->d_ptr)
         return false;
 
-    QPainterPrivate *pp = p->d_ptr;
-    QList<QPainterClipInfo> clipInfo = pp->state->clipInfo;
+    QList<QPainterClipInfo> clipInfo = p->d_ptr->state->clipInfo;
 
     return !clipInfo.isEmpty();
 }
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index 7705cc19b4..22354bcda5 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -55,10 +55,10 @@
 
 #include <QtGui/qpaintengine.h>
 
-#include "qpaintengine_p.h"
-#include "qstroker_p.h"
-#include "qpainter_p.h"
-#include "qvectorpath_p.h"
+#include <private/qpaintengine_p.h>
+#include <private/qstroker_p.h>
+#include <private/qpainter_p.h>
+#include <private/qvectorpath_p.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 9c7a7faa68..76e2fcc794 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -75,14 +75,26 @@ QT_BEGIN_NAMESPACE
 #define QGradient_StretchToDevice 0x10000000
 #define QPaintEngine_OpaqueBackground 0x40000000
 
-// use the same rounding as in qrasterizer.cpp (6 bit fixed point)
-static const qreal aliasedCoordinateDelta = 0.5 - 0.015625;
-
 // #define QT_DEBUG_DRAW
 #ifdef QT_DEBUG_DRAW
 bool qt_show_painter_debug_output = true;
 #endif
 
+class QPainterPrivateCleaner
+{
+public:
+    static inline void cleanup(QPainterPrivate *d)
+    {
+        delete d;
+    }
+
+    static inline void reset(QPainterPrivate *&d, QPainterPrivate *other)
+    {
+        delete d;
+        d = other;
+    }
+};
+
 extern QPixmap qt_pixmapForBrush(int style, bool invert);
 
 void qt_format_text(const QFont &font,
@@ -259,14 +271,17 @@ bool QPainterPrivate::attachPainterPrivate(QPainter *q, QPaintDevice *pdev)
         // in 99% of all cases). E.g: A renders B which renders C which renders D.
         sp->d_ptr->d_ptrs_size = 4;
         sp->d_ptr->d_ptrs = (QPainterPrivate **)malloc(4 * sizeof(QPainterPrivate *));
+        Q_CHECK_PTR(sp->d_ptr->d_ptrs);
     } else if (sp->d_ptr->refcount - 1 == sp->d_ptr->d_ptrs_size) {
         // However, to support corner cases we grow the array dynamically if needed.
         sp->d_ptr->d_ptrs_size <<= 1;
         const int newSize = sp->d_ptr->d_ptrs_size * sizeof(QPainterPrivate *);
-        sp->d_ptr->d_ptrs = (QPainterPrivate **)realloc(sp->d_ptr->d_ptrs, newSize);
+        QPainterPrivate ** newPointers = (QPainterPrivate **)realloc(sp->d_ptr->d_ptrs, newSize);
+        Q_CHECK_PTR(newPointers);
+        sp->d_ptr->d_ptrs = newPointers;
     }
-    sp->d_ptr->d_ptrs[++sp->d_ptr->refcount - 2] = q->d_ptr;
-    q->d_ptr = sp->d_ptr;
+    sp->d_ptr->d_ptrs[++sp->d_ptr->refcount - 2] = q->d_ptr.data();
+    q->d_ptr.data_ptr() = sp->d_ptr.data();
 
     Q_ASSERT(q->d_ptr->state);
 
@@ -319,7 +334,7 @@ void QPainterPrivate::detachPainterPrivate(QPainter *q)
 
     d_ptrs[refcount - 1] = 0;
     q->restore();
-    q->d_ptr = original;
+    q->d_ptr.data_ptr() = original;
 
     if (emulationEngine) {
         extended = emulationEngine->real_engine;
@@ -1354,8 +1369,8 @@ void QPainterPrivate::updateState(QPainterState *newState)
 */
 
 QPainter::QPainter()
+    : d_ptr(new QPainterPrivate(this))
 {
-    d_ptr = new QPainterPrivate(this);
 }
 
 /*!
@@ -1387,7 +1402,7 @@ QPainter::QPainter(QPaintDevice *pd)
 {
     Q_ASSERT(pd != 0);
     if (!QPainterPrivate::attachPainterPrivate(this, pd)) {
-        d_ptr = new QPainterPrivate(this);
+        d_ptr.reset(new QPainterPrivate(this));
         begin(pd);
     }
     Q_ASSERT(d_ptr);
@@ -1399,11 +1414,14 @@ QPainter::QPainter(QPaintDevice *pd)
 QPainter::~QPainter()
 {
     d_ptr->inDestructor = true;
-    if (isActive())
-        end();
-    else if (d_ptr->refcount > 1)
-        d_ptr->detachPainterPrivate(this);
-
+    QT_TRY {
+        if (isActive())
+            end();
+        else if (d_ptr->refcount > 1)
+            d_ptr->detachPainterPrivate(this);
+    } QT_CATCH(...) {
+        // don't throw anything in the destructor.
+    }
     if (d_ptr) {
         // Make sure we haven't messed things up.
         Q_ASSERT(d_ptr->inDestructor);
@@ -1411,7 +1429,6 @@ QPainter::~QPainter()
         Q_ASSERT(d_ptr->refcount == 1);
         if (d_ptr->d_ptrs)
             free(d_ptr->d_ptrs);
-        delete d_ptr;
     }
 }
 
@@ -5686,7 +5703,6 @@ void QPainter::drawText(const QPointF &p, const QString &str, int tf, int justif
         engine.justify(line);
     }
     QFixed x = QFixed::fromReal(p.x());
-    QFixed ox = x;
 
     for (int i = 0; i < nItems; ++i) {
         int item = visualOrder[i];
@@ -7412,8 +7428,21 @@ QPaintDevice *QPainter::redirected(const QPaintDevice *device, QPoint *offset)
 
 void qt_painter_removePaintDevice(QPaintDevice *dev)
 {
-    QMutexLocker locker(globalRedirectionsMutex());
-    if(QPaintDeviceRedirectionList *redirections = globalRedirections()) {
+    QMutex *mutex = 0;
+    QT_TRY {
+        mutex = globalRedirectionsMutex();
+    } QT_CATCH(...) {
+        // ignore the missing mutex, since we could be called from
+        // a destructor, and destructors shall not throw
+    }
+    QMutexLocker locker(mutex);
+    QPaintDeviceRedirectionList *redirections = 0;
+    QT_TRY {
+        redirections = globalRedirections();
+    } QT_CATCH(...) {
+        // do nothing - code below is safe with redirections being 0.
+    }
+    if (redirections) {
         for (int i = 0; i < redirections->size(); ) {
             if(redirections->at(i) == dev || redirections->at(i).replacement == dev)
                 redirections->removeAt(i);
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index e9c35eecff..c81f5d472e 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -45,6 +45,7 @@
 #include <QtCore/qnamespace.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qpoint.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtGui/qpixmap.h>
 #include <QtGui/qimage.h>
 #include <QtGui/qtextoption.h>
@@ -78,6 +79,8 @@ class QTextItem;
 class QMatrix;
 class QTransform;
 
+class QPainterPrivateCleaner;
+
 class Q_GUI_EXPORT QPainter
 {
     Q_DECLARE_PRIVATE(QPainter)
@@ -497,7 +500,7 @@ private:
     Q_DISABLE_COPY(QPainter)
     friend class Q3Painter;
 
-    QPainterPrivate *d_ptr;
+    QScopedCustomPointer<QPainterPrivate, QPainterPrivateCleaner> d_ptr;
 
     friend class QFontEngine;
     friend class QFontEngineBox;
diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h
index 8e9d61e541..436477203d 100644
--- a/src/gui/painting/qpainter_p.h
+++ b/src/gui/painting/qpainter_p.h
@@ -63,7 +63,7 @@
 #include "QtGui/qpaintengine.h"
 #include <QtCore/qhash.h>
 
-#include "qpen_p.h"
+#include <private/qpen_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 09972b0949..f9fd61e5b2 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -73,6 +73,24 @@
 
 QT_BEGIN_NAMESPACE
 
+struct QPainterPathPrivateHandler
+{
+    static inline void cleanup(QPainterPathPrivate *d)
+    {
+        // note - we must up-cast to QPainterPathData since QPainterPathPrivate
+        // has a non-virtual destructor!
+        if (d && !d->ref.deref())
+            delete static_cast<QPainterPathData *>(d);
+    }
+
+    static inline void reset(QPainterPathPrivate *&d, QPainterPathPrivate *other)
+    {
+        QPainterPathPrivate *oldD = d;
+        d = other;
+        cleanup(oldD);
+    }
+};
+
 // This value is used to determine the length of control point vectors
 // when approximating arc segments as curves. The factor is multiplied
 // with the radius of the circle.
@@ -506,10 +524,10 @@ QPainterPath::QPainterPath()
     \sa operator=()
 */
 QPainterPath::QPainterPath(const QPainterPath &other)
-    : d_ptr(other.d_ptr)
+    : d_ptr(other.d_ptr.data())
 {
-    if (d_func())
-        d_func()->ref.ref();
+    if (d_ptr)
+        d_ptr->ref.ref();
 }
 
 /*!
@@ -530,9 +548,7 @@ QPainterPath::QPainterPath(const QPointF &startPoint)
 void QPainterPath::detach_helper()
 {
     QPainterPathPrivate *data = new QPainterPathData(*d_func());
-    if (d_ptr && !d_ptr->ref.deref())
-        delete d_ptr;
-    d_ptr = data;
+    d_ptr.reset(data);
 }
 
 /*!
@@ -544,9 +560,7 @@ void QPainterPath::ensureData_helper()
     data->elements.reserve(16);
     QPainterPath::Element e = { 0, 0, QPainterPath::MoveToElement };
     data->elements << e;
-    if (d_ptr && !d_ptr->ref.deref())
-        delete d_ptr;
-    d_ptr = data;
+    d_ptr.reset(data);
     Q_ASSERT(d_ptr != 0);
 }
 
@@ -563,9 +577,7 @@ QPainterPath &QPainterPath::operator=(const QPainterPath &other)
         QPainterPathPrivate *data = other.d_func();
         if (data)
             data->ref.ref();
-        if (d_ptr && !d_ptr->ref.deref())
-            delete d_ptr;
-        d_ptr = data;
+        d_ptr.reset(data);
     }
     return *this;
 }
@@ -575,8 +587,6 @@ QPainterPath &QPainterPath::operator=(const QPainterPath &other)
 */
 QPainterPath::~QPainterPath()
 {
-    if (d_func() && !d_func()->ref.deref())
-        delete d_func();
 }
 
 /*!
@@ -2464,7 +2474,6 @@ QPainterPathStroker::QPainterPathStroker()
 */
 QPainterPathStroker::~QPainterPathStroker()
 {
-    delete d_ptr;
 }
 
 
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h
index 846bd8afa5..5068739e79 100644
--- a/src/gui/painting/qpainterpath.h
+++ b/src/gui/painting/qpainterpath.h
@@ -47,6 +47,7 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qline.h>
 #include <QtCore/qvector.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -56,6 +57,7 @@ QT_MODULE(Gui)
 
 class QFont;
 class QPainterPathPrivate;
+struct QPainterPathPrivateHandler;
 class QPainterPathData;
 class QPainterPathStrokerPrivate;
 class QPolygonF;
@@ -201,7 +203,7 @@ public:
     QPainterPath &operator-=(const QPainterPath &other);
 
 private:
-    QPainterPathPrivate *d_ptr;
+    QScopedCustomPointer<QPainterPathPrivate, QPainterPathPrivateHandler> d_ptr;
 
     inline void ensureData() { if (!d_ptr) ensureData_helper(); }
     void ensureData_helper();
@@ -211,7 +213,7 @@ private:
     void computeBoundingRect() const;
     void computeControlPointRect() const;
 
-    QPainterPathData *d_func() const { return reinterpret_cast<QPainterPathData *>(d_ptr); }
+    QPainterPathData *d_func() const { return reinterpret_cast<QPainterPathData *>(d_ptr.data()); }
 
     friend class QPainterPathData;
     friend class QPainterPathStroker;
@@ -235,6 +237,7 @@ public:
     friend class QPainterPathStrokerPrivate;
     friend class QMatrix;
     friend class QTransform;
+    friend struct QPainterPathPrivateHandler;
 #ifndef QT_NO_DATASTREAM
     friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QPainterPath &);
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPainterPath &);
@@ -285,7 +288,7 @@ public:
 private:
     friend class QX11PaintEngine;
 
-    QPainterPathStrokerPrivate *d_ptr;
+    QScopedPointer<QPainterPathStrokerPrivate> d_ptr;
 };
 
 inline void QPainterPath::moveTo(qreal x, qreal y)
diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h
index b2ab3b4eba..784b75dcfc 100644
--- a/src/gui/painting/qpathclipper_p.h
+++ b/src/gui/painting/qpathclipper_p.h
@@ -160,8 +160,6 @@ public:
     Direction directionTo(int vertex) const;
     int vertex(Direction direction) const;
 
-    bool isBezier() const;
-
 private:
     int m_next[2][2];
 };
@@ -347,11 +345,6 @@ inline int QPathEdge::vertex(Direction direction) const
     return direction == Backward ? first : second;
 }
 
-inline bool QPathEdge::isBezier() const
-{
-    return bezier >= 0;
-}
-
 inline QPathVertex::QPathVertex(const QPointF &p, int e)
     : edge(e)
     , x(p.x())
diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp
index 02a5a02160..bc54b5c34b 100644
--- a/src/gui/painting/qprinter.cpp
+++ b/src/gui/painting/qprinter.cpp
@@ -712,7 +712,6 @@ QPrinter::~QPrinter()
 #ifndef QT_NO_PRINTPREVIEWWIDGET
     delete d->previewEngine;
 #endif
-    delete d;
 }
 
 /*!
diff --git a/src/gui/painting/qprinter.h b/src/gui/painting/qprinter.h
index 90ed20d207..25c2f0c738 100644
--- a/src/gui/painting/qprinter.h
+++ b/src/gui/painting/qprinter.h
@@ -42,8 +42,9 @@
 #ifndef QPRINTER_H
 #define QPRINTER_H
 
-#include <QtGui/qpaintdevice.h>
 #include <QtCore/qstring.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtGui/qpaintdevice.h>
 
 QT_BEGIN_HEADER
 
@@ -288,7 +289,7 @@ private:
 
     Q_DISABLE_COPY(QPrinter)
 
-    QPrinterPrivate *d_ptr;
+    QScopedPointer<QPrinterPrivate> d_ptr;
 
     friend class QPrintDialogPrivate;
     friend class QAbstractPrintDialog;
diff --git a/src/gui/painting/qprinterinfo.h b/src/gui/painting/qprinterinfo.h
index eafdec5cfe..c34e59173e 100644
--- a/src/gui/painting/qprinterinfo.h
+++ b/src/gui/painting/qprinterinfo.h
@@ -53,6 +53,7 @@ QT_MODULE(Gui)
 
 #ifndef QT_NO_PRINTER
 class QPrinterInfoPrivate;
+class QPrinterInfoPrivateCleanup;
 class Q_GUI_EXPORT QPrinterInfo
 {
 Q_DECLARE_PRIVATE(QPrinterInfo)
@@ -76,7 +77,7 @@ public:
 private:
     QPrinterInfo(const QString& name);
 
-    QPrinterInfoPrivate* d_ptr;
+    QScopedCustomPointer<QPrinterInfoPrivate, QPrinterInfoPrivateCleanup> d_ptr;
 };
 
 #endif // QT_NO_PRINTER
diff --git a/src/gui/painting/qprinterinfo_mac.cpp b/src/gui/painting/qprinterinfo_mac.cpp
index c84271cf9e..69320158ae 100644
--- a/src/gui/painting/qprinterinfo_mac.cpp
+++ b/src/gui/painting/qprinterinfo_mac.cpp
@@ -65,6 +65,22 @@ private:
 
 static QPrinterInfoPrivate nullQPrinterInfoPrivate;
 
+class QPrinterInfoPrivateCleanup
+{
+public:
+    static inline void cleanup(QPrinterInfoPrivate *d)
+    {
+        if (d != &nullQPrinterInfoPrivate)
+            delete d;
+    }
+
+    static inline void reset(QPrinterInfoPrivate *&d, QPrinterInfoPrivate *other)
+    {
+        cleanup(d);
+        d = other;
+    }
+};
+
 extern QPrinter::PaperSize qSizeFTopaperSize(const QSizeF& size);
 
 /////////////////////////////////////////////////////////////////////////////
@@ -106,8 +122,8 @@ QPrinterInfo QPrinterInfo::defaultPrinter(){
 /////////////////////////////////////////////////////////////////////////////
 
 QPrinterInfo::QPrinterInfo(const QPrinter& prn)
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
     QList<QPrinterInfo> list = availablePrinters();
     for (int c = 0; c < list.size(); ++c) {
         if (prn.printerName() == list[c].printerName()) {
@@ -115,39 +131,33 @@ QPrinterInfo::QPrinterInfo(const QPrinter& prn)
             return;
         }
     }
-
-    *this = QPrinterInfo();
 }
 
 QPrinterInfo::~QPrinterInfo()
 {
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
 }
 
 QPrinterInfo::QPrinterInfo()
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
 }
 
 QPrinterInfo::QPrinterInfo(const QString& name)
+    : d_ptr(new QPrinterInfoPrivate(name))
 {
-    d_ptr = new QPrinterInfoPrivate(name);
     d_ptr->q_ptr = this;
 }
 
 QPrinterInfo::QPrinterInfo(const QPrinterInfo& src)
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
     *this = src;
 }
 
 QPrinterInfo& QPrinterInfo::operator=(const QPrinterInfo& src)
 {
     Q_ASSERT(d_ptr);
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
-    d_ptr = new QPrinterInfoPrivate(*src.d_ptr);
+    d_ptr.reset(new QPrinterInfoPrivate(*src.d_ptr));
     d_ptr->q_ptr = this;
     return *this;
 }
diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp
index 1ce5e1e89f..b9f1f3b626 100644
--- a/src/gui/painting/qprinterinfo_unix.cpp
+++ b/src/gui/painting/qprinterinfo_unix.cpp
@@ -82,6 +82,22 @@ private:
 
 static QPrinterInfoPrivate nullQPrinterInfoPrivate;
 
+class QPrinterInfoPrivateCleanup
+{
+public:
+    static inline void cleanup(QPrinterInfoPrivate *d)
+    {
+        if (d != &nullQPrinterInfoPrivate)
+            delete d;
+    }
+
+    static inline void reset(QPrinterInfoPrivate *&d, QPrinterInfoPrivate *other)
+    {
+        cleanup(d);
+        d = other;
+    }
+};
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 
@@ -867,19 +883,19 @@ QPrinterInfo QPrinterInfo::defaultPrinter()
 }
 
 QPrinterInfo::QPrinterInfo()
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
 }
 
 QPrinterInfo::QPrinterInfo(const QPrinterInfo& src)
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
     *this = src;
 }
 
 QPrinterInfo::QPrinterInfo(const QPrinter& printer)
+    : d_ptr(new QPrinterInfoPrivate(printer.printerName()))
 {
-    d_ptr = new QPrinterInfoPrivate(printer.printerName());
 
     Q_D(QPrinterInfo);
     d->q_ptr = this;
@@ -929,28 +945,23 @@ QPrinterInfo::QPrinterInfo(const QPrinter& printer)
 #endif
 
     // Printer not found.
-    delete d;
-    d_ptr = &nullQPrinterInfoPrivate;
+    d_ptr.reset(&nullQPrinterInfoPrivate);
 }
 
 QPrinterInfo::QPrinterInfo(const QString& name)
+    : d_ptr(new QPrinterInfoPrivate(name))
 {
-    d_ptr = new QPrinterInfoPrivate(name);
     d_ptr->q_ptr = this;
 }
 
 QPrinterInfo::~QPrinterInfo()
 {
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
 }
 
 QPrinterInfo& QPrinterInfo::operator=(const QPrinterInfo& src)
 {
     Q_ASSERT(d_ptr);
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
-    d_ptr = new QPrinterInfoPrivate(*src.d_ptr);
+    d_ptr.reset(new QPrinterInfoPrivate(*src.d_ptr));
     d_ptr->q_ptr = this;
     return *this;
 }
diff --git a/src/gui/painting/qprinterinfo_win.cpp b/src/gui/painting/qprinterinfo_win.cpp
index bea2e3a0aa..4a92d30999 100644
--- a/src/gui/painting/qprinterinfo_win.cpp
+++ b/src/gui/painting/qprinterinfo_win.cpp
@@ -69,6 +69,22 @@ private:
 
 static QPrinterInfoPrivate nullQPrinterInfoPrivate;
 
+class QPrinterInfoPrivateCleanup
+{
+public:
+    static inline void cleanup(QPrinterInfoPrivate *d)
+    {
+        if (d != &nullQPrinterInfoPrivate)
+            delete d;
+    }
+
+    static inline void reset(QPrinterInfoPrivate *&d, QPrinterInfoPrivate *other)
+    {
+        cleanup(d);
+        d = other;
+    }
+};
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 
@@ -125,25 +141,25 @@ QPrinterInfo QPrinterInfo::defaultPrinter()
 /////////////////////////////////////////////////////////////////////////////
 
 QPrinterInfo::QPrinterInfo()
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
 }
 
 QPrinterInfo::QPrinterInfo(const QString& name)
+    : d_ptr(new QPrinterInfoPrivate(name))
 {
-    d_ptr = new QPrinterInfoPrivate(name);
     d_ptr->q_ptr = this;
 }
 
 QPrinterInfo::QPrinterInfo(const QPrinterInfo& src)
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
     *this = src;
 }
 
 QPrinterInfo::QPrinterInfo(const QPrinter& prn)
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
     QList<QPrinterInfo> list = availablePrinters();
     for (int c = 0; c < list.size(); ++c) {
         if (prn.printerName() == list[c].printerName()) {
@@ -157,16 +173,12 @@ QPrinterInfo::QPrinterInfo(const QPrinter& prn)
 
 QPrinterInfo::~QPrinterInfo()
 {
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
 }
 
 QPrinterInfo& QPrinterInfo::operator=(const QPrinterInfo& src)
 {
     Q_ASSERT(d_ptr);
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
-    d_ptr = new QPrinterInfoPrivate(*src.d_ptr);
+    d_ptr.reset(new QPrinterInfoPrivate(*src.d_ptr));
     d_ptr->q_ptr = this;
     return *this;
 }
diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp
index 58e4b4e3c7..6d1527130f 100644
--- a/src/gui/painting/qrasterizer.cpp
+++ b/src/gui/painting/qrasterizer.cpp
@@ -436,8 +436,11 @@ void QScanConverter::end()
 inline void QScanConverter::allocate(int size)
 {
     if (m_alloc < size) {
-        m_alloc = qMax(size, 2 * m_alloc);
-        m_intersections = (Intersection *)realloc(m_intersections, m_alloc * sizeof(Intersection));
+        int newAlloc = qMax(size, 2 * m_alloc);
+        Intersection *newIntersections = (Intersection *)realloc(m_intersections, newAlloc * sizeof(Intersection));
+        Q_CHECK_PTR(newIntersections);
+        m_alloc = newAlloc;
+        m_intersections = newIntersections;
     }
 }
 
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index d59f3ffa4d..47d24b3bb5 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -3163,6 +3163,7 @@ static void InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, int scanline,
         {
             tmpSLLBlock =
                   (ScanLineListBlock *)malloc(sizeof(ScanLineListBlock));
+            Q_CHECK_PTR(tmpSLLBlock);
             (*SLLBlock)->next = tmpSLLBlock;
             tmpSLLBlock->next = (ScanLineListBlock *)NULL;
             *SLLBlock = tmpSLLBlock;
@@ -3549,6 +3550,8 @@ static void PtsToRegion(register int numFullPtBlocks, register int iCurPtBlock,
  *     Scan converts a polygon by returning a run-length
  *     encoding of the resultant bitmap -- the run-length
  *     encoding is in the form of an array of rectangles.
+ *
+ *     Can return 0 in case of errors.
  */
 static QRegionPrivate *PolygonRegion(const QPoint *Pts, int Count, int rule)
     //Point     *Pts;                /* the pts                 */
@@ -3620,75 +3623,28 @@ static QRegionPrivate *PolygonRegion(const QPoint *Pts, int Count, int rule)
     }
 
 
-    if (rule == EvenOddRule) {
-        /*
-         *  for each scanline
-         */
-        for (y = ET.ymin; y < ET.ymax; ++y) {
-
-            /*
-             *  Add a new edge to the active edge table when we
-             *  get to the next edge.
-             */
-            if (pSLL && y == pSLL->scanline) {
-                loadAET(&AET, pSLL->edgelist);
-                pSLL = pSLL->next;
-            }
-            pPrevAET = &AET;
-            pAET = AET.next;
-
+    QT_TRY {
+        if (rule == EvenOddRule) {
             /*
-             *  for each active edge
+             *  for each scanline
              */
-            while (pAET) {
-                pts->setX(pAET->bres.minor_axis);
-                pts->setY(y);
-                ++pts;
-                ++iPts;
+            for (y = ET.ymin; y < ET.ymax; ++y) {
 
                 /*
-                 *  send out the buffer
+                 *  Add a new edge to the active edge table when we
+                 *  get to the next edge.
                  */
-                if (iPts == NUMPTSTOBUFFER) {
-                    tmpPtBlock = (POINTBLOCK *)malloc(sizeof(POINTBLOCK));
-                    tmpPtBlock->pts = reinterpret_cast<QPoint *>(tmpPtBlock->data);
-                    curPtBlock->next = tmpPtBlock;
-                    curPtBlock = tmpPtBlock;
-                    pts = curPtBlock->pts;
-                    ++numFullPtBlocks;
-                    iPts = 0;
+                if (pSLL && y == pSLL->scanline) {
+                    loadAET(&AET, pSLL->edgelist);
+                    pSLL = pSLL->next;
                 }
-                EVALUATEEDGEEVENODD(pAET, pPrevAET, y)
-            }
-            InsertionSort(&AET);
-        }
-    } else {
-        /*
-         *  for each scanline
-         */
-        for (y = ET.ymin; y < ET.ymax; ++y) {
-            /*
-             *  Add a new edge to the active edge table when we
-             *  get to the next edge.
-             */
-            if (pSLL && y == pSLL->scanline) {
-                loadAET(&AET, pSLL->edgelist);
-                computeWAET(&AET);
-                pSLL = pSLL->next;
-            }
-            pPrevAET = &AET;
-            pAET = AET.next;
-            pWETE = pAET;
+                pPrevAET = &AET;
+                pAET = AET.next;
 
-            /*
-             *  for each active edge
-             */
-            while (pAET) {
                 /*
-                 *  add to the buffer only those edges that
-                 *  are in the Winding active edge table.
+                 *  for each active edge
                  */
-                if (pWETE == pAET) {
+                while (pAET) {
                     pts->setX(pAET->bres.minor_axis);
                     pts->setY(y);
                     ++pts;
@@ -3698,7 +3654,8 @@ static QRegionPrivate *PolygonRegion(const QPoint *Pts, int Count, int rule)
                      *  send out the buffer
                      */
                     if (iPts == NUMPTSTOBUFFER) {
-                        tmpPtBlock = static_cast<POINTBLOCK *>(malloc(sizeof(POINTBLOCK)));
+                        tmpPtBlock = (POINTBLOCK *)malloc(sizeof(POINTBLOCK));
+                        Q_CHECK_PTR(tmpPtBlock);
                         tmpPtBlock->pts = reinterpret_cast<QPoint *>(tmpPtBlock->data);
                         curPtBlock->next = tmpPtBlock;
                         curPtBlock = tmpPtBlock;
@@ -3706,21 +3663,81 @@ static QRegionPrivate *PolygonRegion(const QPoint *Pts, int Count, int rule)
                         ++numFullPtBlocks;
                         iPts = 0;
                     }
-                    pWETE = pWETE->nextWETE;
+                    EVALUATEEDGEEVENODD(pAET, pPrevAET, y)
                 }
-                EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET)
+                InsertionSort(&AET);
             }
-
+        } else {
             /*
-             *  recompute the winding active edge table if
-             *  we just resorted or have exited an edge.
+             *  for each scanline
              */
-            if (InsertionSort(&AET) || fixWAET) {
-                computeWAET(&AET);
-                fixWAET = false;
+            for (y = ET.ymin; y < ET.ymax; ++y) {
+                /*
+                 *  Add a new edge to the active edge table when we
+                 *  get to the next edge.
+                 */
+                if (pSLL && y == pSLL->scanline) {
+                    loadAET(&AET, pSLL->edgelist);
+                    computeWAET(&AET);
+                    pSLL = pSLL->next;
+                }
+                pPrevAET = &AET;
+                pAET = AET.next;
+                pWETE = pAET;
+
+                /*
+                 *  for each active edge
+                 */
+                while (pAET) {
+                    /*
+                     *  add to the buffer only those edges that
+                     *  are in the Winding active edge table.
+                     */
+                    if (pWETE == pAET) {
+                        pts->setX(pAET->bres.minor_axis);
+                        pts->setY(y);
+                        ++pts;
+                        ++iPts;
+
+                        /*
+                         *  send out the buffer
+                         */
+                        if (iPts == NUMPTSTOBUFFER) {
+                            tmpPtBlock = static_cast<POINTBLOCK *>(malloc(sizeof(POINTBLOCK)));
+                            tmpPtBlock->pts = reinterpret_cast<QPoint *>(tmpPtBlock->data);
+                            curPtBlock->next = tmpPtBlock;
+                            curPtBlock = tmpPtBlock;
+                            pts = curPtBlock->pts;
+                            ++numFullPtBlocks;
+                            iPts = 0;
+                        }
+                        pWETE = pWETE->nextWETE;
+                    }
+                    EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET)
+                }
+
+                /*
+                 *  recompute the winding active edge table if
+                 *  we just resorted or have exited an edge.
+                 */
+                if (InsertionSort(&AET) || fixWAET) {
+                    computeWAET(&AET);
+                    fixWAET = false;
+                }
             }
         }
+    } QT_CATCH(...) {
+        FreeStorage(SLLBlock.next);
+        PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, region);
+        for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) {
+            tmpPtBlock = curPtBlock->next;
+            free(curPtBlock);
+            curPtBlock = tmpPtBlock;
+        }
+        free(pETEs);
+        return 0; // this function returns 0 in case of an error
     }
+
     FreeStorage(SLLBlock.next);
     PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, region);
     for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) {
@@ -3919,11 +3936,10 @@ QRegion &QRegion::operator=(const QRegion &r)
 /*!
     \internal
 */
-
 QRegion QRegion::copy() const
 {
     QRegion r;
-    QRegionData *x = new QRegionData;
+    QScopedPointer<QRegionData> x(new QRegionData);
     x->ref = 1;
 #if defined(Q_WS_X11)
     x->rgn = 0;
@@ -3937,7 +3953,7 @@ QRegion QRegion::copy() const
         x->qt_rgn = new QRegionPrivate;
     if (!r.d->ref.deref())
         cleanUp(r.d);
-    r.d = x;
+    r.d = x.take();
     return r;
 }
 
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 84024ce894..8a56d54f2b 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -59,7 +59,7 @@ QT_MODULE(Gui)
 template <class T> class QVector;
 class QVariant;
 
-#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
 struct QRegionPrivate;
 #endif
 
@@ -200,7 +200,7 @@ private:
 #elif defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
         mutable RgnHandle unused; // Here for binary compatability reasons. ### Qt 5 remove.
 #endif
-#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
         QRegionPrivate *qt_rgn;
 #endif
     };
diff --git a/src/gui/painting/qregion_s60.cpp b/src/gui/painting/qregion_s60.cpp
new file mode 100644
index 0000000000..4d96910bbb
--- /dev/null
+++ b/src/gui/painting/qregion_s60.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qbitmap.h"
+#include "qbuffer.h"
+#include "qimage.h"
+#include "qpolygon.h"
+#include "qregion.h"
+
+QT_BEGIN_NAMESPACE
+
+QRegion::QRegionData QRegion::shared_empty = { Q_BASIC_ATOMIC_INITIALIZER(1), 0 };
+
+QT_END_NAMESPACE
diff --git a/src/gui/painting/qtessellator.cpp b/src/gui/painting/qtessellator.cpp
index 31ee4f3ab4..711f99701c 100644
--- a/src/gui/painting/qtessellator.cpp
+++ b/src/gui/painting/qtessellator.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 #ifdef DEBUG
 #define QDEBUG qDebug
 #else
-#define QDEBUG if (1); else qDebug
+#define QDEBUG if (1){} else qDebug
 #endif
 
 static const bool emit_clever = true;
@@ -703,7 +703,6 @@ struct QCoincidingEdge {
     }
 };
 
-
 static void cancelEdges(QCoincidingEdge &e1, QCoincidingEdge &e2)
 {
     if (e1.before) {
diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h
index 9264c9c0dc..df49500d15 100644
--- a/src/gui/painting/qvectorpath_p.h
+++ b/src/gui/painting/qvectorpath_p.h
@@ -55,9 +55,9 @@
 
 #include <QtGui/qpaintengine.h>
 
-#include "qpaintengine_p.h"
-#include "qstroker_p.h"
-#include "qpainter_p.h"
+#include <private/qpaintengine_p.h>
+#include <private/qstroker_p.h>
+#include <private/qpainter_p.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index eddbfd2dad..863237b398 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -105,8 +105,6 @@ QRasterWindowSurface::~QRasterWindowSurface()
 #endif
     if (d_ptr->image)
         delete d_ptr->image;
-
-    delete d_ptr;
 }
 
 
@@ -284,6 +282,12 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
     CGContextFlush(context);
 #endif
 #endif
+
+#ifdef Q_OS_SYMBIAN
+    Q_UNUSED(widget);
+    Q_UNUSED(rgn);
+    Q_UNUSED(offset);
+#endif
 }
 
 void QRasterWindowSurface::setGeometry(const QRect &rect)
diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h
index 996aaef819..b3256b3c87 100644
--- a/src/gui/painting/qwindowsurface_raster_p.h
+++ b/src/gui/painting/qwindowsurface_raster_p.h
@@ -109,7 +109,7 @@ public:
 private:
     void prepareBuffer(QImage::Format format, QWidget *widget);
     Q_DECLARE_PRIVATE(QRasterWindowSurface)
-    QRasterWindowSurfacePrivate *d_ptr;
+    QScopedPointer<QRasterWindowSurfacePrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
new file mode 100644
index 0000000000..e81adccb91
--- /dev/null
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -0,0 +1,234 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qglobal.h> // for Q_WS_WIN define (non-PCH)
+
+#include <QtGui/qpaintdevice.h>
+#include <private/qwidget_p.h>
+#include "qwindowsurface_s60_p.h"
+#include "qt_s60_p.h"
+#include "private/qdrawhelper_p.h"
+
+QT_BEGIN_NAMESPACE
+
+struct QS60WindowSurfacePrivate
+{
+    QImage device;
+    CFbsBitmap *bitmap;
+    uchar* bytes;
+
+    // Since only one CFbsBitmap is allowed to be locked at a time, this is static.
+    static QS60WindowSurface* lockedSurface;
+};
+QS60WindowSurface* QS60WindowSurfacePrivate::lockedSurface = NULL;
+
+QS60WindowSurface::QS60WindowSurface(QWidget* widget)
+    : QWindowSurface(widget), d_ptr(new QS60WindowSurfacePrivate)
+{
+    d_ptr->bytes = 0;
+    d_ptr->bitmap = 0;
+
+    TDisplayMode mode = S60->screenDevice()->DisplayMode();
+    bool isOpaque = qt_widget_private(widget)->isOpaque;
+    if (mode == EColor16MA && isOpaque)
+        mode = EColor16MU; // Faster since 16MU -> 16MA is typically accelerated
+    else if (mode == EColor16MU && !isOpaque)
+        mode = EColor16MA; // Try for transparency anyway
+
+
+    // We create empty CFbsBitmap here -> it will be resized in setGeometry
+    d_ptr->bitmap = new (ELeave) CFbsBitmap;
+    User::LeaveIfError( d_ptr->bitmap->Create(TSize(0, 0), mode ) );
+
+    updatePaintDeviceOnBitmap();
+
+    setStaticContentsSupport(true);
+}
+
+QS60WindowSurface::~QS60WindowSurface()
+{
+    // Ensure that locking and unlocking of this surface were symmetrical
+    Q_ASSERT(QS60WindowSurfacePrivate::lockedSurface != this);
+
+    delete d_ptr->bitmap;
+    delete d_ptr;
+}
+
+void QS60WindowSurface::beginPaint(const QRegion &rgn)
+{
+    if(!d_ptr->bitmap)
+        return;
+
+    Q_ASSERT(!QS60WindowSurfacePrivate::lockedSurface);
+    QS60WindowSurfacePrivate::lockedSurface = this;
+    lockBitmapHeap();
+
+    if (!qt_widget_private(window())->isOpaque) {
+        QRgb *data = reinterpret_cast<QRgb *>(d_ptr->device.bits());
+        const int row_stride = d_ptr->device.bytesPerLine() / 4;
+
+        const QVector<QRect> rects = rgn.rects();
+        for (QVector<QRect>::const_iterator it = rects.begin(); it != rects.end(); ++it) {
+            const int x_start = it->x();
+            const int width = it->width();
+
+            const int y_start = it->y();
+            const int height = it->height();
+
+            QRgb *row = data + row_stride * y_start;
+            for (int y = 0; y < height; ++y) {
+                qt_memfill(row + x_start, 0U, width);
+                row += row_stride;
+            }
+        }
+    }
+}
+
+void QS60WindowSurface::flush(QWidget *widget, const QRegion &region, const QPoint &)
+{
+    const QVector<QRect> subRects = region.rects();
+    for (int i = 0; i < subRects.count(); ++i) {
+        TRect tr = qt_QRect2TRect(subRects[i]);
+        widget->winId()->DrawNow(tr);
+    }
+}
+
+bool QS60WindowSurface::scroll(const QRegion &area, int dx, int dy)
+{
+    QRect rect = area.boundingRect();
+
+    if (dx == 0 && dy == 0)
+        return false;
+
+    if (d_ptr->device.isNull())
+        return false;
+
+    CFbsBitmapDevice *bitmapDevice = CFbsBitmapDevice::NewL(d_ptr->bitmap);
+    CBitmapContext *bitmapContext;
+    TInt err = bitmapDevice->CreateBitmapContext(bitmapContext);
+    if (err != KErrNone) {
+        CBase::Delete(bitmapDevice);
+        return false;
+    }
+    bitmapContext->CopyRect(TPoint(dx, dy), qt_QRect2TRect(rect));
+    CBase::Delete(bitmapContext);
+    CBase::Delete(bitmapDevice);
+    return true;
+}
+
+void QS60WindowSurface::endPaint(const QRegion & /* rgn */)
+{
+    if(!d_ptr->bitmap)
+        return;
+
+    Q_ASSERT(QS60WindowSurfacePrivate::lockedSurface);
+    unlockBitmapHeap();
+    QS60WindowSurfacePrivate::lockedSurface = NULL;
+}
+
+QPaintDevice* QS60WindowSurface::paintDevice()
+{
+    return &d_ptr->device;
+}
+
+void QS60WindowSurface::setGeometry(const QRect& rect)
+{
+    if (rect == geometry())
+        return;
+
+    QWindowSurface::setGeometry(rect);
+
+    TRect nativeRect(qt_QRect2TRect(rect));
+    User::LeaveIfError(d_ptr->bitmap->Resize(nativeRect.Size()));
+
+    if (!rect.isNull())
+        updatePaintDeviceOnBitmap();
+}
+
+void QS60WindowSurface::lockBitmapHeap()
+{
+    if (!QS60WindowSurfacePrivate::lockedSurface)
+        return;
+
+    // Get some local variables to make later code lines more clear to read
+    CFbsBitmap*& bitmap = QS60WindowSurfacePrivate::lockedSurface->d_ptr->bitmap;
+    QImage& device = QS60WindowSurfacePrivate::lockedSurface->d_ptr->device;
+    uchar*& bytes = QS60WindowSurfacePrivate::lockedSurface->d_ptr->bytes;
+
+    bitmap->LockHeap();
+    uchar *newBytes = (uchar*)bitmap->DataAddress();
+    if (newBytes != bytes) {
+        bytes = newBytes;
+
+        // Get some values for QImage creation
+        TDisplayMode mode  = bitmap->DisplayMode();
+        if (mode == EColor16MA
+            && qt_widget_private(QS60WindowSurfacePrivate::lockedSurface->window())->isOpaque)
+            mode = EColor16MU;
+        QImage::Format format = qt_TDisplayMode2Format( mode );
+        TSize bitmapSize = bitmap->SizeInPixels();
+        int bytesPerLine = CFbsBitmap::ScanLineLength( bitmapSize.iWidth, mode);
+
+        device = QImage( bytes, bitmapSize.iWidth, bitmapSize.iHeight, bytesPerLine, format );
+    }
+}
+
+void QS60WindowSurface::unlockBitmapHeap()
+{
+    if (!QS60WindowSurfacePrivate::lockedSurface)
+        return;
+
+    QS60WindowSurfacePrivate::lockedSurface->d_ptr->bitmap->UnlockHeap();
+}
+
+void QS60WindowSurface::updatePaintDeviceOnBitmap()
+{
+    // This forces the actual device to be updated based on CFbsBitmap
+    beginPaint(QRegion());
+    endPaint(QRegion());
+}
+
+CFbsBitmap *QS60WindowSurface::symbianBitmap() const
+{
+    return d_ptr->bitmap;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/painting/qwindowsurface_s60_p.h b/src/gui/painting/qwindowsurface_s60_p.h
new file mode 100644
index 0000000000..40a866d854
--- /dev/null
+++ b/src/gui/painting/qwindowsurface_s60_p.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWINDOWSURFACE_S60_P_H
+#define QWINDOWSURFACE_S60_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qglobal.h>
+#include "private/qwindowsurface_p.h"
+
+class CFbsBitmap;
+
+QT_BEGIN_NAMESPACE
+
+struct QS60WindowSurfacePrivate;
+
+class QS60WindowSurface : public QWindowSurface
+{
+public:
+    QS60WindowSurface(QWidget *widget);
+    ~QS60WindowSurface();
+
+    QPaintDevice *paintDevice();
+    void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
+    bool scroll(const QRegion &area, int dx, int dy);
+
+    void beginPaint(const QRegion &);
+    void endPaint(const QRegion &);
+
+    void setGeometry(const QRect &rect);
+
+    static void lockBitmapHeap();
+    static void unlockBitmapHeap();
+
+    CFbsBitmap *symbianBitmap() const;
+    
+private:
+    void updatePaintDeviceOnBitmap();
+
+private:
+    QS60WindowSurfacePrivate* d_ptr;
+
+};
+
+QT_END_NAMESPACE
+
+#endif // QWINDOWSURFACE_S60_P_H
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
new file mode 100644
index 0000000000..2c486a214a
--- /dev/null
+++ b/src/gui/styles/qs60style.cpp
@@ -0,0 +1,2878 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qs60style_p.h"
+
+#include "qapplication.h"
+#include "qpainter.h"
+#include "qstyleoption.h"
+#include "qevent.h"
+#include "qpixmapcache.h"
+
+#include "qcalendarwidget.h"
+#include "qdial.h"
+#include "qdialog.h"
+#include "qgroupbox.h"
+#include "qheaderview.h"
+#include "qlist.h"
+#include "qlistwidget.h"
+#include "qlistview.h"
+#include "qmenu.h"
+#include "qmenubar.h"
+#include "qpushbutton.h"
+#include "qscrollarea.h"
+#include "qscrollbar.h"
+#include "qtabbar.h"
+#include "qtablewidget.h"
+#include "qtableview.h"
+#include "qtextedit.h"
+#include "qtoolbar.h"
+#include "qtoolbutton.h"
+#include "qtreeview.h"
+
+#include "private/qtoolbarextension_p.h"
+#include "private/qcombobox_p.h"
+#include "private/qwidget_p.h"
+#include "private/qapplication_p.h"
+
+#if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN)
+
+QT_BEGIN_NAMESPACE
+
+// from text/qfont.cpp
+extern Q_GUI_EXPORT int qt_defaultDpiY();
+
+const QS60StylePrivate::SkinElementFlags QS60StylePrivate::KDefaultSkinElementFlags =
+    SkinElementFlags(SF_PointNorth | SF_StateEnabled);
+
+static const QByteArray propertyKeyLayouts = "layouts";
+static const QByteArray propertyKeyCurrentlayout = "currentlayout";
+
+const layoutHeader QS60StylePrivate::m_layoutHeaders[] = {
+// *** generated layout data ***
+{240,320,1,14,true,QLatin1String("QVGA Landscape Mirrored")},
+{240,320,1,14,false,QLatin1String("QVGA Landscape")},
+{320,240,1,14,true,QLatin1String("QVGA Portrait Mirrored")},
+{320,240,1,14,false,QLatin1String("QVGA Portrait")},
+{360,640,1,14,true,QLatin1String("NHD Landscape Mirrored")},
+{360,640,1,14,false,QLatin1String("NHD Landscape")},
+{640,360,1,14,true,QLatin1String("NHD Portrait Mirrored")},
+{640,360,1,14,false,QLatin1String("NHD Portrait")},
+{352,800,1,12,true,QLatin1String("E90 Landscape Mirrored")},
+{352,800,1,12,false,QLatin1String("E90 Landscape")}
+// *** End of generated data ***
+};
+const int QS60StylePrivate::m_numberOfLayouts =
+    (int)sizeof(QS60StylePrivate::m_layoutHeaders)/sizeof(QS60StylePrivate::m_layoutHeaders[0]);
+
+const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
+// *** generated pixel metrics ***
+{5,0,-909,0,0,1,0,0,-1,8,15,22,15,15,7,198,-909,-909,-909,19,15,2,0,0,21,-909,21,-909,4,4,1,-909,-909,0,2,0,0,13,23,17,17,21,21,2,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,51,27,51,4,4,5,10,15,-909,5,58,12,5,0,7,4,4,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{5,0,-909,0,0,1,0,0,-1,8,15,22,15,15,7,198,-909,-909,-909,19,15,2,0,0,21,-909,21,-909,4,4,1,-909,-909,0,2,0,0,13,23,17,17,21,21,2,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,51,27,51,4,4,5,10,15,-909,5,58,12,5,0,4,4,7,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,-909,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,10,15,-909,5,58,13,5,0,7,4,4,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,-909,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,10,15,-909,5,58,13,5,0,4,4,7,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{7,0,-909,0,0,2,0,0,-1,20,53,28,19,19,9,258,-909,-909,-909,29,19,26,0,0,32,-909,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,8,19,-909,7,74,19,7,0,8,5,5,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
+{7,0,-909,0,0,2,0,0,-1,20,53,28,19,19,9,258,-909,-909,-909,29,19,26,0,0,32,-909,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,8,19,-909,7,74,19,7,0,5,5,8,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
+{7,0,-909,0,0,2,0,0,-1,20,52,28,19,19,9,258,-909,-909,-909,29,19,6,0,0,32,-909,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,98,35,98,5,5,6,8,19,-909,7,74,22,7,0,8,5,5,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
+{7,0,-909,0,0,2,0,0,-1,20,52,28,19,19,9,258,-909,-909,-909,29,19,6,0,0,32,-909,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,98,35,98,5,5,6,8,19,-909,7,74,22,7,0,5,5,8,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
+{7,0,-909,0,0,2,0,0,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,-909,32,-909,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,5,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,8,6,5,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1},
+{7,0,-909,0,0,2,0,0,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,-909,32,-909,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,6,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,5,6,8,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1}
+// *** End of generated data ***
+};
+
+const short *QS60StylePrivate::m_pmPointer = QS60StylePrivate::data[0];
+
+// theme background texture
+QPixmap *QS60StylePrivate::m_background = 0;
+
+// theme palette
+QPalette *QS60StylePrivate::m_themePalette = 0;
+
+const struct QS60StylePrivate::frameElementCenter QS60StylePrivate::m_frameElementsData[] = {
+    {SE_ButtonNormal,           QS60StyleEnums::SP_QsnFrButtonTbCenter},
+    {SE_ButtonPressed,          QS60StyleEnums::SP_QsnFrButtonTbCenterPressed},
+    {SE_FrameLineEdit,          QS60StyleEnums::SP_QsnFrInputCenter},
+    {SE_ListHighlight,          QS60StyleEnums::SP_QsnFrListCenter},
+    {SE_OptionsMenu,            QS60StyleEnums::SP_QsnFrPopupCenter},
+    {SE_SettingsList,           QS60StyleEnums::SP_QsnFrSetOptCenter},
+    {SE_TableItem,              QS60StyleEnums::SP_QsnFrCaleCenter},
+    {SE_TableHeaderItem,        QS60StyleEnums::SP_QsnFrCaleHeadingCenter},
+    {SE_ToolTip,                QS60StyleEnums::SP_QsnFrPopupPreviewCenter},
+    {SE_ToolBar,                QS60StyleEnums::SP_QsnFrPopupSubCenter},
+    {SE_ToolBarButton,          QS60StyleEnums::SP_QsnFrSctrlButtonCenter},
+    {SE_ToolBarButtonPressed,   QS60StyleEnums::SP_QsnFrSctrlButtonCenterPressed},
+    {SE_PanelBackground,        QS60StyleEnums::SP_QsnFrSetOptCenter},
+    {SE_ButtonInactive,         QS60StyleEnums::SP_QsnFrButtonCenterInactive},
+    {SE_Editor,                 QS60StyleEnums::SP_QsnFrNotepadCenter},
+};
+
+static const int frameElementsCount =
+    int(sizeof(QS60StylePrivate::m_frameElementsData)/sizeof(QS60StylePrivate::m_frameElementsData[0]));
+
+const int KNotFound = -909;
+const double KTabFontMul = 0.72;
+
+QS60StylePrivate::~QS60StylePrivate()
+{
+    clearCaches(); //deletes also background image
+    deleteThemePalette();
+}
+
+void QS60StylePrivate::drawSkinElement(SkinElements element, QPainter *painter,
+    const QRect &rect, SkinElementFlags flags)
+{
+    switch (element) {
+    case SE_ButtonNormal:
+        drawFrame(SF_ButtonNormal, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ButtonPressed:
+        drawFrame(SF_ButtonPressed, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_FrameLineEdit:
+        drawFrame(SF_FrameLineEdit, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ProgressBarGrooveHorizontal:
+        drawRow(QS60StyleEnums::SP_QgnGrafBarFrameSideL, QS60StyleEnums::SP_QgnGrafBarFrameCenter,
+            QS60StyleEnums::SP_QgnGrafBarFrameSideR, Qt::Horizontal, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ProgressBarGrooveVertical:
+        drawRow(QS60StyleEnums::SP_QgnGrafBarFrameSideL, QS60StyleEnums::SP_QgnGrafBarFrameCenter,
+            QS60StyleEnums::SP_QgnGrafBarFrameSideR, Qt::Vertical, painter, rect, flags | SF_PointEast);
+        break;
+    case SE_ProgressBarIndicatorHorizontal:
+        drawPart(QS60StyleEnums::SP_QgnGrafBarProgress, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ProgressBarIndicatorVertical:
+        drawPart(QS60StyleEnums::SP_QgnGrafBarProgress, painter, rect, flags | SF_PointWest);
+        break;
+    case SE_ScrollBarGrooveHorizontal:
+        drawRow(QS60StyleEnums::SP_QsnCpScrollBgBottom, QS60StyleEnums::SP_QsnCpScrollBgMiddle,
+            QS60StyleEnums::SP_QsnCpScrollBgTop, Qt::Horizontal, painter, rect, flags | SF_PointEast);
+        break;
+    case SE_ScrollBarGrooveVertical:
+        drawRow(QS60StyleEnums::SP_QsnCpScrollBgTop, QS60StyleEnums::SP_QsnCpScrollBgMiddle,
+            QS60StyleEnums::SP_QsnCpScrollBgBottom, Qt::Vertical, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ScrollBarHandleHorizontal:
+        drawRow(QS60StyleEnums::SP_QsnCpScrollHandleBottom, QS60StyleEnums::SP_QsnCpScrollHandleMiddle,
+            QS60StyleEnums::SP_QsnCpScrollHandleTop, Qt::Horizontal, painter, rect, flags | SF_PointEast);
+        break;
+    case SE_ScrollBarHandleVertical:
+        drawRow(QS60StyleEnums::SP_QsnCpScrollHandleTop, QS60StyleEnums::SP_QsnCpScrollHandleMiddle,
+            QS60StyleEnums::SP_QsnCpScrollHandleBottom, Qt::Vertical, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_SliderHandleHorizontal:
+        drawPart(QS60StyleEnums::SP_QgnIndiSliderEdit, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_SliderHandleVertical:
+        drawPart(QS60StyleEnums::SP_QgnIndiSliderEdit, painter, rect, flags | SF_PointEast);
+        break;
+    case SE_TabBarTabEastActive:
+        drawRow(QS60StyleEnums::SP_QgnGrafTabActiveL, QS60StyleEnums::SP_QgnGrafTabActiveM,
+            QS60StyleEnums::SP_QgnGrafTabActiveR, Qt::Vertical, painter, rect, flags | SF_PointEast);
+        break;
+    case SE_TabBarTabEastInactive:
+        drawRow(QS60StyleEnums::SP_QgnGrafTabPassiveL, QS60StyleEnums::SP_QgnGrafTabPassiveM,
+            QS60StyleEnums::SP_QgnGrafTabPassiveR, Qt::Vertical, painter, rect, flags | SF_PointEast);
+        break;
+    case SE_TabBarTabNorthActive:
+        drawRow(QS60StyleEnums::SP_QgnGrafTabActiveL, QS60StyleEnums::SP_QgnGrafTabActiveM,
+            QS60StyleEnums::SP_QgnGrafTabActiveR, Qt::Horizontal, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_TabBarTabNorthInactive:
+        drawRow(QS60StyleEnums::SP_QgnGrafTabPassiveL, QS60StyleEnums::SP_QgnGrafTabPassiveM,
+            QS60StyleEnums::SP_QgnGrafTabPassiveR, Qt::Horizontal, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_TabBarTabSouthActive:
+        drawRow(QS60StyleEnums::SP_QgnGrafTabActiveR, QS60StyleEnums::SP_QgnGrafTabActiveM,
+            QS60StyleEnums::SP_QgnGrafTabActiveL, Qt::Horizontal, painter, rect, flags | SF_PointSouth);
+        break;
+    case SE_TabBarTabSouthInactive:
+        drawRow(QS60StyleEnums::SP_QgnGrafTabPassiveR, QS60StyleEnums::SP_QgnGrafTabPassiveM,
+            QS60StyleEnums::SP_QgnGrafTabPassiveL, Qt::Horizontal, painter, rect, flags | SF_PointSouth);
+        break;
+    case SE_TabBarTabWestActive:
+        drawRow(QS60StyleEnums::SP_QgnGrafTabActiveR, QS60StyleEnums::SP_QgnGrafTabActiveM,
+            QS60StyleEnums::SP_QgnGrafTabActiveL, Qt::Vertical, painter, rect, flags | SF_PointWest);
+        break;
+    case SE_TabBarTabWestInactive:
+        drawRow(QS60StyleEnums::SP_QgnGrafTabPassiveR, QS60StyleEnums::SP_QgnGrafTabPassiveM,
+            QS60StyleEnums::SP_QgnGrafTabPassiveL, Qt::Vertical, painter, rect, flags | SF_PointWest);
+        break;
+    case SE_ListHighlight:
+        drawFrame(SF_ListHighlight, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_OptionsMenu:
+        drawFrame(SF_OptionsMenu, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_SettingsList:
+        drawFrame(SF_SettingsList, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_TableItem:
+        drawFrame(SF_TableItem, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_TableHeaderItem:
+        drawFrame(SF_TableHeaderItem, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ToolTip:
+        drawFrame(SF_ToolTip, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ToolBar:
+        drawFrame(SF_ToolBar, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ToolBarButton:
+        drawFrame(SF_ToolBarButton, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ToolBarButtonPressed:
+        drawFrame(SF_ToolBarButtonPressed, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_PanelBackground:
+        drawFrame(SF_PanelBackground, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ScrollBarHandlePressedHorizontal:
+        drawRow(QS60StyleEnums::SP_QsnCpScrollHandleBottomPressed, QS60StyleEnums::SP_QsnCpScrollHandleMiddlePressed,
+            QS60StyleEnums::SP_QsnCpScrollHandleTopPressed, Qt::Horizontal, painter, rect, flags | SF_PointEast);
+        break;
+    case SE_ScrollBarHandlePressedVertical:
+        drawRow(QS60StyleEnums::SP_QsnCpScrollHandleTopPressed, QS60StyleEnums::SP_QsnCpScrollHandleMiddlePressed,
+            QS60StyleEnums::SP_QsnCpScrollHandleBottomPressed, Qt::Vertical, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_ButtonInactive:
+        drawFrame(SF_ButtonInactive, painter, rect, flags | SF_PointNorth);
+        break;
+    case SE_Editor:
+        drawFrame(SF_Editor, painter, rect, flags | SF_PointNorth);
+        break;        
+    default:
+        break;
+    }
+}
+
+void QS60StylePrivate::drawSkinPart(QS60StyleEnums::SkinParts part,
+    QPainter *painter, const QRect &rect, SkinElementFlags flags)
+{
+    drawPart(part, painter, rect, flags);
+}
+
+short QS60StylePrivate::pixelMetric(int metric)
+{
+    Q_ASSERT(metric < MAX_PIXELMETRICS);
+    const short returnValue = m_pmPointer[metric];
+    return returnValue;
+}
+
+void QS60StylePrivate::setStyleProperty(const char *name, const QVariant &value)
+{
+    if (name == propertyKeyCurrentlayout) {
+        static const QStringList layouts = styleProperty(propertyKeyLayouts).toStringList();
+        const QString layout = value.toString();
+        Q_ASSERT(layouts.contains(layout));
+        const int layoutIndex = layouts.indexOf(layout);
+        setCurrentLayout(layoutIndex);
+        QApplication::setLayoutDirection(m_layoutHeaders[layoutIndex].mirroring ? Qt::RightToLeft : Qt::LeftToRight);
+        clearCaches();
+        refreshUI();
+    }
+}
+
+QVariant QS60StylePrivate::styleProperty(const char *name) const
+{
+    if (name == propertyKeyLayouts) {
+        static QStringList layouts;
+        if (layouts.isEmpty())
+            for (int i = 0; i < m_numberOfLayouts; i++)
+                layouts.append(m_layoutHeaders[i].layoutName);
+        return layouts;
+    }
+    return QVariant();
+}
+
+QColor QS60StylePrivate::stateColor(const QColor &color, const QStyleOption *option)
+{
+    QColor retColor (color);
+    if (option && !(option->state & QStyle::State_Enabled)) {
+        QColor hsvColor = retColor.toHsv();
+        int colorSat = hsvColor.saturation();
+        int colorVal = hsvColor.value();
+        colorSat = (colorSat!=0) ? (colorSat>>1) : 128;
+        colorVal = (colorVal!=0) ? (colorVal>>1) : 128;
+        hsvColor.setHsv(hsvColor.hue(), colorSat, colorVal);
+        retColor = hsvColor.toRgb();
+    }
+    return retColor;
+}
+
+QColor QS60StylePrivate::lighterColor(const QColor &baseColor)
+{
+    QColor result(baseColor);
+    bool modifyColor = false;
+    if (result.saturation() == 0) {
+        result.setHsv(result.hue(), 128, result.value());
+        modifyColor = true;
+    }
+    if (result.value() == 0) {
+        result.setHsv(result.hue(), result.saturation(), 128);
+        modifyColor = true;
+    }
+    if (modifyColor)
+        result = result.lighter(175);
+    else
+        result = result.lighter(225);
+    return result;
+}
+
+bool QS60StylePrivate::drawsOwnThemeBackground(const QWidget *widget)
+{
+    return qobject_cast<const QDialog *> (widget);
+}
+
+QFont QS60StylePrivate::s60Font(
+    QS60StyleEnums::FontCategories fontCategory, int pointSize) const
+{
+    QFont result;
+    int actualPointSize = pointSize;
+    if (actualPointSize <= 0) {
+        const QFont appFont = QApplication::font();
+        actualPointSize = appFont.pointSize();
+        if (actualPointSize <= 0)
+            actualPointSize = appFont.pixelSize() * 72 / qt_defaultDpiY();
+    }
+    Q_ASSERT(actualPointSize > 0);
+    const QPair<QS60StyleEnums::FontCategories, int> key(fontCategory, actualPointSize);
+    if (!m_mappedFontsCache.contains(key)) {
+        result = s60Font_specific(fontCategory, actualPointSize);
+        m_mappedFontsCache.insert(key, result);
+    } else {
+        result = m_mappedFontsCache.value(key);
+        if (result.pointSize() != actualPointSize)
+            result.setPointSize(actualPointSize);
+    }
+    return result;
+}
+
+void QS60StylePrivate::clearCaches(CacheClearReason reason)
+{
+    switch(reason){
+    case CC_LayoutChange:
+        // when layout changes, the colors remain in cache, but graphics and fonts can change
+        m_mappedFontsCache.clear();
+        deleteBackground();
+        QPixmapCache::clear();
+        break;
+    case CC_ThemeChange:
+        m_colorCache.clear();
+        QPixmapCache::clear();
+        deleteBackground();
+        break;
+    case CC_UndefinedChange:
+    default:
+        m_colorCache.clear();
+        m_mappedFontsCache.clear();
+        QPixmapCache::clear();
+        deleteBackground();
+        break;
+    }
+}
+
+// Since S60Style has 'button' and 'tooltip' as a graphic, we don't have any native color which to use
+// for QPalette::Button and QPalette::ToolTipBase. Therefore S60Style needs to guesstimate
+// palette colors by calculating average rgb values for button pixels.
+// Returns Qt::black if there is an issue with the graphics (image is NULL, or no bits() found).
+QColor QS60StylePrivate::colorFromFrameGraphics(SkinFrameElements frame) const
+{
+    const bool cachedColorExists = m_colorCache.contains(frame);
+    if (!cachedColorExists) {
+        const int frameCornerWidth = pixelMetric(PM_Custom_FrameCornerWidth);
+        const int frameCornerHeight = pixelMetric(PM_Custom_FrameCornerHeight);
+        Q_ASSERT(2*frameCornerWidth<32);
+        Q_ASSERT(2*frameCornerHeight<32);
+
+        const QImage frameImage = QS60StylePrivate::frame(frame, QSize(32,32)).toImage();
+        if (frameImage.isNull())
+            return Qt::black;
+
+        const QRgb *pixelRgb = (const QRgb*)frameImage.bits();
+        const int pixels = frameImage.numBytes()/sizeof(QRgb);
+        const int bytesPerLine = frameImage.bytesPerLine();
+        Q_ASSERT(bytesPerLine);
+
+        int estimatedRed = 0;
+        int estimatedGreen = 0;
+        int estimatedBlue = 0;
+
+        int skips = 0;
+        int estimations = 0;
+
+        const int topBorderLastPixel = frameCornerHeight*frameImage.width()-1;
+        const int bottomBorderFirstPixel = frameImage.width()*frameImage.height()-frameCornerHeight*frameImage.width()-1;
+        const int rightBorderFirstPixel = frameImage.width()-frameCornerWidth;
+        const int leftBorderLastPixel = frameCornerWidth;
+
+        while ((skips + estimations) < pixels) {
+            if ((skips+estimations) > topBorderLastPixel &&
+                (skips+estimations) < bottomBorderFirstPixel) {
+                for (int rowIndex = 0; rowIndex < frameImage.width(); rowIndex++) {
+                    if (rowIndex > leftBorderLastPixel &&
+                        rowIndex < rightBorderFirstPixel) {
+                        estimatedRed += qRed(*pixelRgb);
+                        estimatedGreen += qGreen(*pixelRgb);
+                        estimatedBlue += qBlue(*pixelRgb);
+                    }
+                    pixelRgb++;
+                    estimations++;
+                }
+            } else {
+                pixelRgb++;
+                skips++;
+            }
+        }
+        QColor frameColor(estimatedRed/estimations, estimatedGreen/estimations, estimatedBlue/estimations);
+        m_colorCache.insert(frame, frameColor);
+        return !estimations ? Qt::black : frameColor;
+    } else {
+        return m_colorCache.value(frame);
+    }
+
+}
+
+void QS60StylePrivate::setThemePalette(QApplication *app) const
+{
+    Q_UNUSED(app)
+    QPalette widgetPalette = QPalette(Qt::white);
+    setThemePalette(&widgetPalette);
+    QApplication::setPalette(widgetPalette); //calling QApplication::setPalette clears palette hash
+    setThemePaletteHash(&widgetPalette);
+    storeThemePalette(&widgetPalette);
+}
+
+void QS60StylePrivate::setThemePalette(QStyleOption *option) const
+{
+    setThemePalette(&option->palette);
+}
+
+QPalette* QS60StylePrivate::themePalette()
+{
+    return m_themePalette;
+}
+
+void QS60StylePrivate::setBackgroundTexture(QApplication *app) const
+{
+    Q_UNUSED(app)
+    QPalette applicationPalette = QApplication::palette();
+    applicationPalette.setBrush(QPalette::Window, backgroundTexture());
+    QApplication::setPalette(applicationPalette);
+}
+
+void QS60StylePrivate::deleteBackground()
+{
+    if (m_background) {
+        delete m_background;
+        m_background = 0;
+    }
+}
+
+int QS60StylePrivate::focusRectPenWidth()
+{
+    return pixelMetric(QS60Style::PM_DefaultFrameWidth);
+}
+
+void QS60StylePrivate::setCurrentLayout(int index)
+{
+    m_pmPointer = data[index];
+}
+
+void QS60StylePrivate::drawPart(QS60StyleEnums::SkinParts skinPart,
+    QPainter *painter, const QRect &rect, SkinElementFlags flags)
+{
+    static const bool doCache =
+#if defined(Q_WS_S60)
+        // Freezes on 3.1. Anyways, caching is only really needed on touch UI
+        !(QSysInfo::s60Version() == QSysInfo::SV_S60_3_1 || QSysInfo::s60Version() == QSysInfo::SV_S60_3_2);
+#else
+        true;
+#endif
+    const QPixmap skinPartPixMap((doCache ? cachedPart : part)(skinPart, rect.size(), flags));
+    if (!skinPartPixMap.isNull())
+        painter->drawPixmap(rect.topLeft(), skinPartPixMap);
+}
+
+void QS60StylePrivate::drawFrame(SkinFrameElements frameElement, QPainter *painter, const QRect &rect, SkinElementFlags flags)
+{
+    static const bool doCache =
+#if defined(Q_WS_S60)
+        // Freezes on 3.1. Anyways, caching is only really needed on touch UI
+        !(QSysInfo::s60Version() == QSysInfo::SV_S60_3_1 || QSysInfo::s60Version() == QSysInfo::SV_S60_3_2);
+#else
+        true;
+#endif
+    const QPixmap frameElementPixMap((doCache ? cachedFrame : frame)(frameElement, rect.size(), flags));
+    if (!frameElementPixMap.isNull())
+        painter->drawPixmap(rect.topLeft(), frameElementPixMap);
+}
+
+void QS60StylePrivate::drawRow(QS60StyleEnums::SkinParts start,
+    QS60StyleEnums::SkinParts middle, QS60StyleEnums::SkinParts end,
+    Qt::Orientation orientation, QPainter *painter, const QRect &rect,
+    SkinElementFlags flags)
+{
+    QSize startEndSize(partSize(start, flags));
+    startEndSize.scale(rect.size(), Qt::KeepAspectRatio);
+
+    QRect startRect = QRect(rect.topLeft(), startEndSize);
+    QRect middleRect = rect;
+    QRect endRect;
+
+    if (orientation == Qt::Horizontal) {
+        startRect.setWidth(qMin((rect.width() >> 1) - 1, startRect.width()));
+        endRect = startRect.translated(rect.width() - startRect.width(), 0);
+        middleRect.adjust(startRect.width(), 0, -startRect.width(), 0);
+        if (startRect.bottomRight().x() > endRect.topLeft().x()) {
+            const int overlap = (startRect.bottomRight().x() -  endRect.topLeft().x())>>1;
+            startRect.setWidth(startRect.width()-overlap);
+            endRect.adjust(overlap,0,0,0);
+        }
+    } else {
+        startRect.setHeight(qMin((rect.height() >> 1) - 1, startRect.height()));
+        endRect = startRect.translated(0, rect.height() - startRect.height());
+        middleRect.adjust(0, startRect.height(), 0, -startRect.height());
+        if (startRect.topRight().y() > endRect.bottomLeft().y()) {
+            const int overlap = (startRect.topRight().y() - endRect.bottomLeft().y())>>1;
+            startRect.setHeight(startRect.height()-overlap);
+            endRect.adjust(0,overlap,0,0);
+        }
+    }
+
+#if 0
+    painter->save();
+    painter->setOpacity(.3);
+    painter->fillRect(startRect, Qt::red);
+    painter->fillRect(middleRect, Qt::green);
+    painter->fillRect(endRect, Qt::blue);
+    painter->restore();
+#else
+    drawPart(start, painter, startRect, flags);
+    if (middleRect.isValid())
+        drawPart(middle, painter, middleRect, flags);
+    drawPart(end, painter, endRect, flags);
+#endif
+}
+
+QPixmap QS60StylePrivate::cachedPart(QS60StyleEnums::SkinParts part,
+    const QSize &size, SkinElementFlags flags)
+{
+    QPixmap result;
+    const QString cacheKey =
+        QString::fromLatin1("S60Style: SkinParts=%1 QSize=%2|%3 SkinPartFlags=%4")
+            .arg((int)part).arg(size.width()).arg(size.height()).arg((int)flags);
+    if (!QPixmapCache::find(cacheKey, result)) {
+        result = QS60StylePrivate::part(part, size, flags);
+        QPixmapCache::insert(cacheKey, result);
+    }
+    return result;
+}
+
+QPixmap QS60StylePrivate::cachedFrame(SkinFrameElements frame, const QSize &size, SkinElementFlags flags)
+{
+    QPixmap result;
+    const QString cacheKey =
+        QString::fromLatin1("S60Style: SkinFrameElements=%1 QSize=%2|%3 SkinElementFlags=%4")
+            .arg((int)frame).arg(size.width()).arg(size.height()).arg((int)flags);
+    if (!QPixmapCache::find(cacheKey, result)) {
+        result = QS60StylePrivate::frame(frame, size, flags);
+        QPixmapCache::insert(cacheKey, result);
+    }
+    return result;
+}
+
+void QS60StylePrivate::refreshUI()
+{
+    QList<QWidget *> widgets = QApplication::allWidgets();
+
+    for (int i = 0; i < widgets.size(); ++i) {
+        QWidget *widget = widgets.at(i);
+        if (widget == 0)
+            continue;
+
+        if (widget->style()) {
+            widget->style()->polish(widget);
+            QEvent event(QEvent::StyleChange);
+            qApp->sendEvent(widget, &event);
+        }
+        widget->update();
+        widget->updateGeometry();
+    }
+}
+
+void QS60StylePrivate::setFont(QWidget *widget) const
+{
+    QS60StyleEnums::FontCategories fontCategory = QS60StyleEnums::FC_Undefined;
+    if (!widget)
+        return;
+    if (qobject_cast<QPushButton *>(widget)){
+        fontCategory = QS60StyleEnums::FC_Primary;
+    } else if (qobject_cast<QToolButton *>(widget)){
+        fontCategory = QS60StyleEnums::FC_Primary;
+    } else if (qobject_cast<QHeaderView *>(widget)){
+        fontCategory = QS60StyleEnums::FC_Secondary;
+    } else if (qobject_cast<QGroupBox *>(widget)){
+        fontCategory = QS60StyleEnums::FC_Title;
+    }
+    if (fontCategory != QS60StyleEnums::FC_Undefined) {
+        const QFont suggestedFont =
+            s60Font(fontCategory, widget->font().pointSizeF());
+        widget->setFont(suggestedFont);
+    }
+}
+
+void QS60StylePrivate::setThemePalette(QWidget *widget) const
+{
+    if(!widget)
+        return;
+    QPalette widgetPalette = QApplication::palette(widget);
+
+    //header view and its viewport need to be set 100% transparent button color, since drawing code will
+    //draw transparent theme graphics to table column and row headers.
+    if (qobject_cast<QHeaderView *>(widget)){
+        widgetPalette.setColor(QPalette::Active, QPalette::ButtonText,
+            s60Color(QS60StyleEnums::CL_QsnTextColors, 23, 0));
+        QHeaderView* header = qobject_cast<QHeaderView *>(widget);
+        widgetPalette.setColor(QPalette::Button, Qt::transparent );
+        if ( header->viewport() )
+            header->viewport()->setPalette(widgetPalette);
+        QApplication::setPalette(widgetPalette, "QHeaderView");
+    }
+}
+
+void QS60StylePrivate::setThemePalette(QPalette *palette) const
+{
+    if (!palette)
+        return;
+
+    // basic colors
+    palette->setColor(QPalette::WindowText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0));
+    palette->setColor(QPalette::ButtonText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0));
+    palette->setColor(QPalette::Text,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0));
+    palette->setColor(QPalette::ToolTipText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 55, 0));
+    palette->setColor(QPalette::BrightText, palette->color(QPalette::WindowText).lighter());
+    palette->setColor(QPalette::HighlightedText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 10, 0));
+    palette->setColor(QPalette::Link,
+        s60Color(QS60StyleEnums::CL_QsnHighlightColors, 3, 0));
+    palette->setColor(QPalette::LinkVisited, palette->color(QPalette::Link).darker());
+    palette->setColor(QPalette::Highlight,
+        s60Color(QS60StyleEnums::CL_QsnHighlightColors, 2, 0));
+    // set background image as a texture brush
+    palette->setBrush(QPalette::Window, backgroundTexture());
+    // set these as transparent so that styled full screen theme background is visible
+    palette->setColor(QPalette::AlternateBase, Qt::transparent);
+    palette->setBrush(QPalette::Base, Qt::transparent);
+    // set button and tooltipbase based on pixel colors
+    const QColor buttonColor = this->colorFromFrameGraphics(SF_ButtonNormal);
+    palette->setColor(QPalette::Button, buttonColor );
+    const QColor toolTipColor = this->colorFromFrameGraphics(SF_ToolTip);
+    palette->setColor(QPalette::ToolTipBase, toolTipColor );
+    palette->setColor(QPalette::Light, palette->color(QPalette::Button).lighter());
+    palette->setColor(QPalette::Dark, palette->color(QPalette::Button).darker());
+    palette->setColor(QPalette::Midlight, palette->color(QPalette::Button).lighter(125));
+    palette->setColor(QPalette::Mid, palette->color(QPalette::Button).darker(150));
+    palette->setColor(QPalette::Shadow, Qt::black);
+}
+
+void QS60StylePrivate::deleteThemePalette()
+{
+    if (m_themePalette) {
+        delete m_themePalette;
+        m_themePalette = 0;
+    }
+}
+
+void QS60StylePrivate::storeThemePalette(QPalette *palette)
+{
+    deleteThemePalette();
+    //store specified palette for latter use.
+    m_themePalette = new QPalette(*palette);
+}
+
+// set widget specific palettes
+void QS60StylePrivate::setThemePaletteHash(QPalette *palette) const
+{
+    if (!palette)
+        return;
+
+    //store the original palette
+    QPalette widgetPalette = *palette;
+    const QColor mainAreaTextColor =
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0);
+
+    widgetPalette.setColor(QPalette::All, QPalette::WindowText,
+        s60Color(QS60StyleEnums::CL_QsnLineColors, 8, 0));
+    QApplication::setPalette(widgetPalette, "QSlider");
+    // return to original palette after each widget
+    widgetPalette = *palette;
+
+    widgetPalette.setColor(QPalette::Active, QPalette::ButtonText, mainAreaTextColor);
+    widgetPalette.setColor(QPalette::Inactive, QPalette::ButtonText, mainAreaTextColor);
+    const QStyleOption opt;
+    widgetPalette.setColor(QPalette::Disabled, QPalette::ButtonText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 6, &opt));
+    QApplication::setPalette(widgetPalette, "QPushButton");
+    widgetPalette = *palette;
+
+    widgetPalette.setColor(QPalette::Active, QPalette::ButtonText, mainAreaTextColor);
+    widgetPalette.setColor(QPalette::Inactive, QPalette::ButtonText, mainAreaTextColor);
+    QApplication::setPalette(widgetPalette, "QToolButton");
+    widgetPalette = *palette;
+
+    widgetPalette.setColor(QPalette::Active, QPalette::ButtonText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 23, 0));
+    QApplication::setPalette(widgetPalette, "QHeaderView");
+    widgetPalette = *palette;
+
+    widgetPalette.setColor(QPalette::All, QPalette::ButtonText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 8, 0));
+    QApplication::setPalette(widgetPalette, "QMenuBar");
+    widgetPalette = *palette;
+
+    widgetPalette.setColor(QPalette::Active, QPalette::WindowText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 4, 0));
+    QApplication::setPalette(widgetPalette, "QTabBar");
+    widgetPalette = *palette;
+
+    widgetPalette.setColor(QPalette::All, QPalette::Text,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 22, 0));
+    QApplication::setPalette(widgetPalette, "QTableView");
+    widgetPalette = *palette;
+
+    widgetPalette.setColor(QPalette::All, QPalette::HighlightedText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
+    QApplication::setPalette(widgetPalette, "QLineEdit");
+    widgetPalette = *palette;
+
+    widgetPalette.setColor(QPalette::All, QPalette::Text,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 34, 0));
+    widgetPalette.setColor(QPalette::All, QPalette::HighlightedText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
+    QApplication::setPalette(widgetPalette, "QTextEdit");
+    widgetPalette = *palette;
+    
+    widgetPalette.setColor(QPalette::All, QPalette::HighlightedText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
+    QApplication::setPalette(widgetPalette, "QComboBox");
+    widgetPalette = *palette;
+    
+    widgetPalette.setColor(QPalette::WindowText, mainAreaTextColor);
+    widgetPalette.setColor(QPalette::Button, QApplication::palette().color(QPalette::Button));
+    widgetPalette.setColor(QPalette::Dark, mainAreaTextColor.darker());
+    widgetPalette.setColor(QPalette::Light, mainAreaTextColor.lighter());
+    QApplication::setPalette(widgetPalette, "QDial");
+    widgetPalette = *palette;
+
+    widgetPalette.setBrush(QPalette::Window, QBrush());
+    QApplication::setPalette(widgetPalette, "QScrollArea");
+    widgetPalette = *palette;
+}
+
+QSize QS60StylePrivate::partSize(QS60StyleEnums::SkinParts part, SkinElementFlags flags)
+{
+    QSize result(20, 20);
+    switch (part)
+        {
+        case QS60StyleEnums::SP_QgnGrafBarProgress:
+            result.setWidth(pixelMetric(QStyle::PM_ProgressBarChunkWidth));
+            break;
+        case QS60StyleEnums::SP_QgnGrafTabActiveM:
+        case QS60StyleEnums::SP_QgnGrafTabPassiveM:
+        case QS60StyleEnums::SP_QgnGrafTabActiveR:
+        case QS60StyleEnums::SP_QgnGrafTabPassiveR:
+        case QS60StyleEnums::SP_QgnGrafTabPassiveL:
+        case QS60StyleEnums::SP_QgnGrafTabActiveL:
+            break;
+        case QS60StyleEnums::SP_QgnIndiSliderEdit:
+            result.scale(pixelMetric(QStyle::PM_SliderLength),
+                pixelMetric(QStyle::PM_SliderControlThickness), Qt::IgnoreAspectRatio);
+            break;
+
+        case QS60StyleEnums::SP_QsnCpScrollHandleBottomPressed:
+        case QS60StyleEnums::SP_QsnCpScrollHandleTopPressed:
+        case QS60StyleEnums::SP_QsnCpScrollHandleMiddlePressed:
+        case QS60StyleEnums::SP_QsnCpScrollBgBottom:
+        case QS60StyleEnums::SP_QsnCpScrollBgMiddle:
+        case QS60StyleEnums::SP_QsnCpScrollBgTop:
+        case QS60StyleEnums::SP_QsnCpScrollHandleBottom:
+        case QS60StyleEnums::SP_QsnCpScrollHandleMiddle:
+        case QS60StyleEnums::SP_QsnCpScrollHandleTop:
+            result.setHeight(pixelMetric(QStyle::PM_ScrollBarExtent));
+            result.setWidth(pixelMetric(QStyle::PM_ScrollBarSliderMin));
+            break;
+        default:
+            // Generic frame part size gathering.
+            for (int i = 0; i < frameElementsCount; ++i)
+            {
+                switch (m_frameElementsData[i].center - part) {
+                    case 8: /* CornerTl */
+                    case 7: /* CornerTr */
+                    case 6: /* CornerBl */
+                    case 5: /* CornerBr */
+                        result.setWidth(pixelMetric(PM_Custom_FrameCornerWidth));
+                        // Falltrough intended...
+                    case 4: /* SideT */
+                    case 3: /* SideB */
+                        result.setHeight(pixelMetric(PM_Custom_FrameCornerHeight));
+                        break;
+                    case 2: /* SideL */
+                    case 1: /* SideR */
+                        result.setWidth(pixelMetric(PM_Custom_FrameCornerWidth));
+                        break;
+                    case 0: /* center */
+                    default:
+                        break;
+                }
+            }
+            break;
+    }
+    if (flags & (SF_PointEast | SF_PointWest)) {
+        const int temp = result.width();
+        result.setWidth(result.height());
+        result.setHeight(temp);
+    }
+    return result;
+}
+
+/*!
+  \class QS60Style
+  \brief The QS60Style class provides a look and feel suitable for applications on S60.
+  \since 4.6
+  \ingroup appearance
+
+  \sa QMacStyle, QWindowsStyle, QWindowsXPStyle, QWindowsVistaStyle, QPlastiqueStyle, QCleanlooksStyle, QMotifStyle
+*/
+
+QS60Style::~QS60Style()
+{
+}
+
+/*!
+  \reimp
+*/
+void QS60Style::drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget) const
+{
+    const QS60StylePrivate::SkinElementFlags flags = (option->state & State_Enabled) ?  QS60StylePrivate::SF_StateEnabled : QS60StylePrivate::SF_StateDisabled;
+    SubControls sub = option->subControls;
+
+    switch (control) {
+#ifndef QT_NO_SCROLLBAR
+    case CC_ScrollBar:
+        if (const QStyleOptionSlider *optionSlider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
+            const bool horizontal = optionSlider->orientation == Qt::Horizontal;
+
+            const QRect scrollBarSlider = subControlRect(control, optionSlider, SC_ScrollBarSlider, widget);
+            const QRect grooveRect = subControlRect(control, optionSlider, SC_ScrollBarGroove, widget);
+
+            const QS60StylePrivate::SkinElements grooveElement =
+                horizontal ? QS60StylePrivate::SE_ScrollBarGrooveHorizontal : QS60StylePrivate::SE_ScrollBarGrooveVertical;
+            QS60StylePrivate::drawSkinElement(grooveElement, painter, grooveRect, flags);
+
+            const QStyle::SubControls subControls = optionSlider->subControls;
+
+            // select correct slider (horizontal/vertical/pressed)
+            const bool sliderPressed = ((optionSlider->state & QStyle::State_Sunken) && (subControls & SC_ScrollBarSlider));
+            const QS60StylePrivate::SkinElements handleElement =
+                horizontal ?
+                    ( sliderPressed ?
+                        QS60StylePrivate::SE_ScrollBarHandlePressedHorizontal :
+                        QS60StylePrivate::SE_ScrollBarHandleHorizontal ) :
+                    ( sliderPressed ?
+                        QS60StylePrivate::SE_ScrollBarHandlePressedVertical :
+                        QS60StylePrivate::SE_ScrollBarHandleVertical);
+            QS60StylePrivate::drawSkinElement(handleElement, painter, scrollBarSlider, flags);
+        }
+        break;
+#endif // QT_NO_SCROLLBAR
+#ifndef QT_NO_SLIDER
+    case CC_Slider:
+        if (const QStyleOptionSlider *optionSlider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
+
+            // The groove is just a centered line. Maybe a qgn_graf_line_* at some point
+            const QRect sliderGroove = subControlRect(control, optionSlider, SC_SliderGroove, widget);
+            const QPoint sliderGrooveCenter = sliderGroove.center();
+            const bool horizontal = optionSlider->orientation == Qt::Horizontal;
+            painter->save();
+            if (widget)
+                painter->setPen(widget->palette().windowText().color());
+            if (horizontal)
+                painter->drawLine(0, sliderGrooveCenter.y(), sliderGroove.right(), sliderGrooveCenter.y());
+            else
+                painter->drawLine(sliderGrooveCenter.x(), 0, sliderGrooveCenter.x(), sliderGroove.bottom());
+            painter->restore();
+
+            const QRect sliderHandle = subControlRect(control, optionSlider, SC_SliderHandle, widget);
+            const QS60StylePrivate::SkinElements handleElement =
+                horizontal ? QS60StylePrivate::SE_SliderHandleHorizontal : QS60StylePrivate::SE_SliderHandleVertical;
+            QS60StylePrivate::drawSkinElement(handleElement, painter, sliderHandle, flags);
+
+            if (optionSlider->state & State_HasFocus) {
+                QStyleOptionFocusRect fropt;
+                fropt.QStyleOption::operator=(*optionSlider);
+                fropt.rect = subElementRect(SE_SliderFocusRect, optionSlider, widget);
+                drawPrimitive(PE_FrameFocusRect, &fropt, painter, widget);
+            }
+        }
+        break;
+#endif // QT_NO_SLIDER
+#ifndef QT_NO_COMBOBOX
+    case CC_ComboBox:
+        if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
+            const QRect cmbxEditField = subControlRect(CC_ComboBox, option, SC_ComboBoxEditField, widget);
+            const QRect cmbxFrame = subControlRect(CC_ComboBox, option, SC_ComboBoxFrame, widget);
+            const bool direction = cmb->direction == Qt::LeftToRight;
+
+            // Button frame
+            QStyleOptionFrame  buttonOption;
+            buttonOption.QStyleOption::operator=(*cmb);
+            const int maxHeight = cmbxFrame.height();
+            const int maxWidth = cmbxFrame.width() - cmbxEditField.width();
+            const int topLeftPoint = direction ? cmbxEditField.right()+1 : cmbxEditField.left()+1-maxWidth;
+            const QRect buttonRect(topLeftPoint, cmbxEditField.top(), maxWidth, maxHeight);
+            buttonOption.rect = buttonRect;
+            buttonOption.state = cmb->state & (State_Enabled | State_MouseOver);
+            drawPrimitive(PE_PanelButtonCommand, &buttonOption, painter, widget);
+
+            // draw label background - label itself is drawn separately
+            const QS60StylePrivate::SkinElements skinElement = QS60StylePrivate::SE_FrameLineEdit;
+            QS60StylePrivate::drawSkinElement(skinElement, painter, cmbxEditField, flags);
+
+            // Draw the combobox arrow
+            if (sub & SC_ComboBoxArrow) {
+                // Make rect slightly smaller
+                buttonOption.rect.adjust(1, 1, -1, -1);
+                painter->save();
+                painter->setPen(option->palette.buttonText().color());
+                drawPrimitive(PE_IndicatorSpinDown, &buttonOption, painter, widget);
+                painter->restore();
+            }
+
+            if (cmb->subControls & SC_ComboBoxEditField) {
+                if (cmb->state & State_HasFocus && !cmb->editable) {
+                    QStyleOptionFocusRect focus;
+                    focus.QStyleOption::operator=(*cmb);
+                    focus.rect = cmbxEditField;
+                    focus.state |= State_FocusAtBorder;
+                    focus.backgroundColor = cmb->palette.highlight().color();
+                    drawPrimitive(PE_FrameFocusRect, &focus, painter, widget);
+                }
+            }
+        }
+        break;
+#endif // QT_NO_COMBOBOX
+#ifndef QT_NO_TOOLBUTTON
+    case CC_ToolButton:
+        if (const QStyleOptionToolButton *toolBtn = qstyleoption_cast<const QStyleOptionToolButton *>(option)) {
+            const State bflags = toolBtn->state;
+            const QRect button(subControlRect(control, toolBtn, SC_ToolButton, widget));
+            QStyleOptionToolButton toolButton = *toolBtn;
+
+            if (sub&SC_ToolButton) {
+                QStyleOption tool(0);
+                tool.palette = toolBtn->palette;
+
+                // Check if toolbutton is in toolbar.
+                QToolBar *toolBar = 0;
+                if (widget)
+                    toolBar = qobject_cast<QToolBar *>(widget->parentWidget());
+
+                if (bflags & (State_Sunken | State_On | State_Raised)) {
+                    tool.rect = button;
+                    tool.state = bflags;
+
+                    // todo: I'd like to move extension button next to where last button is
+                    // however, the painter seems to want to clip the button rect even if I turn of the clipping.
+                    if (toolBar && (qobject_cast<const QToolBarExtension *>(widget))){
+                        /*QList<QAction *> actionList = toolBar->actions();
+                        const int actionCount = actionList.count();
+                        const int toolbarWidth = toolBar->width();
+                        const int extButtonWidth = pixelMetric(PM_ToolBarExtensionExtent, option, widget);
+                        const int toolBarButtonWidth = pixelMetric(PM_ToolBarIconSize, option, widget);
+                        const int frame = pixelMetric(PM_ToolBarFrameWidth, option, widget);
+                        const int margin = pixelMetric(PM_ToolBarItemMargin, option, widget);
+                        const int border = frame + margin;
+                        const int spacing = pixelMetric(PM_ToolBarItemSpacing, option, widget);
+                        const int toolBarButtonArea = toolbarWidth - extButtonWidth - spacing - 2*border;
+                        const int numberOfVisibleButtons = toolBarButtonArea / toolBarButtonWidth;
+                        // new extension button place is after border and all the other visible buttons (with spacings)
+                        const int newXForExtensionButton = numberOfVisibleButtons * toolBarButtonWidth + (numberOfVisibleButtons-1)*spacing + border;
+                        painter->save();
+                        painter->setClipping(false);
+                        tool.rect.translate(-newXForExtensionButton,0);
+                        painter->restore();*/
+                    }
+
+                    if (toolBar){
+                        /*if (toolBar->orientation() == Qt::Vertical){
+                            // todo: I'd like to make all vertical buttons the same size, but again the painter
+                            // prefers to use clipping for button rects, even though clipping has been set off.
+                            painter->save();
+                            painter->setClipping(false);
+
+                            const int origWidth = tool.rect.width();
+                            const int newWidth = toolBar->width()-2*pixelMetric(PM_ToolBarFrameWidth, option, widget);
+                            painter->translate(origWidth-newWidth,0);
+                            tool.rect.translate(origWidth-tool.rect.width(),0);
+                            tool.rect.setWidth(newWidth);
+
+                            if (option->state & QStyle::State_Sunken)
+                                QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ToolBarButtonPressed, painter, tool.rect, flags);
+                            else
+                                QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ToolBarButton, painter, tool.rect, flags);
+
+                        }*/
+                        if (option->state & QStyle::State_Sunken)
+                            QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ToolBarButtonPressed, painter, tool.rect, flags);
+                        else
+                            QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ToolBarButton, painter, tool.rect, flags);
+                        /*
+                        if (toolBar->orientation() == Qt::Vertical)
+                            painter->restore();
+                            */
+                    } else {
+                        drawPrimitive(PE_PanelButtonTool, &tool, painter, widget);
+                    }
+                }
+            }
+            if (toolBtn->state & State_HasFocus) {
+                QStyleOptionFocusRect fr;
+                fr.QStyleOption::operator=(*toolBtn);
+                const int frameWidth = pixelMetric(PM_DefaultFrameWidth, option, widget);
+                fr.rect.adjust(frameWidth, frameWidth, -frameWidth, -frameWidth);
+                drawPrimitive(PE_FrameFocusRect, &fr, painter, widget);
+            }
+
+            if (toolBtn->features & QStyleOptionToolButton::Arrow) {
+                QStyle::PrimitiveElement pe;
+                switch (toolBtn->arrowType) {
+                    case Qt::LeftArrow:
+                        pe = QStyle::PE_IndicatorArrowLeft;
+                        break;
+                    case Qt::RightArrow:
+                        pe = QStyle::PE_IndicatorArrowRight;
+                        break;
+                    case Qt::UpArrow:
+                        pe = QStyle::PE_IndicatorArrowUp;
+                        break;
+                    case Qt::DownArrow:
+                        pe = QStyle::PE_IndicatorArrowDown;
+                        break;
+                    default:
+                        break; }
+                toolButton.rect = button;
+                drawPrimitive(pe, &toolButton, painter, widget);
+            }
+
+            if (toolBtn->text.length()>0 ||
+                !toolBtn->icon.isNull()) {
+                const int frameWidth = pixelMetric(PM_DefaultFrameWidth, option, widget);
+                toolButton.rect = button.adjusted(frameWidth, frameWidth, -frameWidth, -frameWidth);
+                drawControl(CE_ToolButtonLabel, &toolButton, painter, widget);
+                }
+            }
+        break;
+#endif //QT_NO_TOOLBUTTON
+#ifndef QT_NO_SPINBOX
+    case CC_SpinBox:
+        if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
+            QStyleOptionSpinBox copy = *spinBox;
+            PrimitiveElement pe;
+
+            if (spinBox->subControls & SC_SpinBoxUp) {
+                copy.subControls = SC_SpinBoxUp;
+                QPalette spinBoxPal = spinBox->palette;
+                if (!(spinBox->stepEnabled & QAbstractSpinBox::StepUpEnabled)) {
+                    spinBoxPal.setCurrentColorGroup(QPalette::Disabled);
+                    copy.state &= ~State_Enabled;
+                    copy.palette = spinBoxPal;
+                }
+
+                if (spinBox->activeSubControls == SC_SpinBoxUp && (spinBox->state & State_Sunken)) {
+                    copy.state |= State_On;
+                    copy.state |= State_Sunken;
+                } else {
+                    copy.state |= State_Raised;
+                    copy.state &= ~State_Sunken;
+                }
+                pe = (spinBox->buttonSymbols == QAbstractSpinBox::PlusMinus) ?
+                      PE_IndicatorSpinPlus :
+                      PE_IndicatorSpinUp;
+
+                copy.rect = subControlRect(CC_SpinBox, spinBox, SC_SpinBoxUp, widget);
+                drawPrimitive(PE_PanelButtonBevel, &copy, painter, widget);
+                copy.rect.adjust(1, 1, -1, -1);
+                drawPrimitive(pe, &copy, painter, widget);
+            }
+
+            if (spinBox->subControls & SC_SpinBoxDown) {
+                copy.subControls = SC_SpinBoxDown;
+                copy.state = spinBox->state;
+                QPalette spinBoxPal = spinBox->palette;
+                if (!(spinBox->stepEnabled & QAbstractSpinBox::StepDownEnabled)) {
+                    spinBoxPal.setCurrentColorGroup(QPalette::Disabled);
+                    copy.state &= ~State_Enabled;
+                    copy.palette = spinBoxPal;
+                }
+
+                if (spinBox->activeSubControls == SC_SpinBoxDown && (spinBox->state & State_Sunken)) {
+                    copy.state |= State_On;
+                    copy.state |= State_Sunken;
+                } else {
+                    copy.state |= State_Raised;
+                    copy.state &= ~State_Sunken;
+                }
+                pe = (spinBox->buttonSymbols == QAbstractSpinBox::PlusMinus) ?
+                      PE_IndicatorSpinMinus :
+                      PE_IndicatorSpinDown;
+
+                copy.rect = subControlRect(CC_SpinBox, spinBox, SC_SpinBoxDown, widget);
+                drawPrimitive(PE_PanelButtonBevel, &copy, painter, widget);
+                copy.rect.adjust(1, 1, -1, -1);
+                drawPrimitive(pe, &copy, painter, widget);
+            }
+        }
+        break;
+#endif //QT_NO_SPINBOX
+#ifndef QT_NO_GROUPBOX
+    case CC_GroupBox:
+        if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
+            // Draw frame
+            const QRect textRect = subControlRect(CC_GroupBox, option, SC_GroupBoxLabel, widget);
+            const QRect checkBoxRect = subControlRect(CC_GroupBox, option, SC_GroupBoxCheckBox, widget);
+            if (groupBox->subControls & QStyle::SC_GroupBoxFrame) {
+                QStyleOptionFrameV2 frame;
+                frame.QStyleOption::operator=(*groupBox);
+                frame.features = groupBox->features;
+                frame.lineWidth = groupBox->lineWidth;
+                frame.midLineWidth = groupBox->midLineWidth;
+                frame.rect = subControlRect(CC_GroupBox, option, SC_GroupBoxFrame, widget);
+                drawPrimitive(PE_FrameGroupBox, &frame, painter, widget);
+            }
+
+            // Draw title
+            if ((groupBox->subControls & QStyle::SC_GroupBoxLabel) && !groupBox->text.isEmpty()) {
+                const QColor textColor = groupBox->textColor;
+                painter->save();
+
+                if (textColor.isValid())
+                    painter->setPen(textColor);
+                int alignment = int(groupBox->textAlignment);
+                if (!styleHint(QStyle::SH_UnderlineShortcut, option, widget))
+                    alignment |= Qt::TextHideMnemonic;
+
+                drawItemText(painter, textRect,  Qt::TextShowMnemonic | Qt::AlignHCenter | Qt::AlignVCenter | alignment,
+                             groupBox->palette, groupBox->state & State_Enabled, groupBox->text,
+                             textColor.isValid() ? QPalette::NoRole : QPalette::WindowText);
+                painter->restore();
+
+                if (groupBox->state & State_HasFocus) {
+                    QStyleOptionFocusRect fropt;
+                    fropt.QStyleOption::operator=(*groupBox);
+                    fropt.rect = textRect;
+                    drawPrimitive(PE_FrameFocusRect, &fropt, painter, widget);
+                }
+            }
+
+            // Draw checkbox
+            if (groupBox->subControls & SC_GroupBoxCheckBox) {
+                QStyleOptionButton box;
+                box.QStyleOption::operator=(*groupBox);
+                box.rect = checkBoxRect;
+                drawPrimitive(PE_IndicatorCheckBox, &box, painter, widget);
+            }
+        }
+        break;
+#endif //QT_NO_GROUPBOX
+    default:
+        QCommonStyle::drawComplexControl(control, option, painter, widget);
+    }
+}
+
+/*!
+  \reimp
+*/
+void QS60Style::drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const
+{
+    Q_D(const QS60Style);
+    const QS60StylePrivate::SkinElementFlags flags = (option->state & State_Enabled) ?  QS60StylePrivate::SF_StateEnabled : QS60StylePrivate::SF_StateDisabled;
+    switch (element) {
+    case CE_PushButton:
+        if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option)) {
+
+            drawControl(CE_PushButtonBevel, btn, painter, widget);
+            QStyleOptionButton subopt = *btn;
+            subopt.rect = subElementRect(SE_PushButtonContents, btn, widget);
+
+            drawControl(CE_PushButtonLabel, &subopt, painter, widget);
+            if (btn->state & State_HasFocus) {
+                QStyleOptionFocusRect fropt;
+                fropt.QStyleOption::operator=(*btn);
+                fropt.rect = subElementRect(SE_PushButtonFocusRect, btn, widget);
+                drawPrimitive(PE_FrameFocusRect, &fropt, painter, widget);
+            }
+        }
+        break;
+    case CE_PushButtonBevel:
+        if (const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton *>(option)) {
+            const bool isDisabled = !(option->state & QStyle::State_Enabled);
+            const bool isFlat = button->features & QStyleOptionButton::Flat;
+            QS60StyleEnums::SkinParts skinPart;
+            QS60StylePrivate::SkinElements skinElement;
+            if (!isDisabled) {
+                const bool isPressed = (option->state & QStyle::State_Sunken) ||
+                                       (option->state & QStyle::State_On);
+                if (isFlat) {
+                    skinPart =
+                        isPressed ? QS60StyleEnums::SP_QsnFrButtonTbCenterPressed : QS60StyleEnums::SP_QsnFrButtonTbCenter;
+                } else {
+                    skinElement =
+                        isPressed ? QS60StylePrivate::SE_ButtonPressed : QS60StylePrivate::SE_ButtonNormal;
+                }
+            } else {
+                if (isFlat)
+                    skinPart =QS60StyleEnums::SP_QsnFrButtonCenterInactive;
+                else
+                    skinElement = QS60StylePrivate::SE_ButtonInactive;
+            }
+            if (isFlat)
+                QS60StylePrivate::drawSkinPart(skinPart, painter, option->rect, flags);
+            else
+                QS60StylePrivate::drawSkinElement(skinElement, painter, option->rect, flags);
+            }
+        break;
+#ifndef QT_NO_TOOLBUTTON
+    case CE_ToolButtonLabel:
+        if (const QStyleOptionToolButton *toolBtn = qstyleoption_cast<const QStyleOptionToolButton *>(option)) {
+            QStyleOptionToolButton optionToolButton = *toolBtn;
+
+            if (!optionToolButton.icon.isNull() && (optionToolButton.state & QStyle::State_Sunken)
+                    && (optionToolButton.state & State_Enabled)) {
+
+                    const QIcon::State state = optionToolButton.state & State_On ? QIcon::On : QIcon::Off;
+                    const QPixmap pm(optionToolButton.icon.pixmap(optionToolButton.rect.size().boundedTo(optionToolButton.iconSize),
+                            QIcon::Normal, state));
+                    optionToolButton.icon = generatedIconPixmap(QIcon::Selected, pm, &optionToolButton);
+            }
+
+            QCommonStyle::drawControl(element, &optionToolButton, painter, widget);
+        }
+        break;
+#endif //QT_NO_TOOLBUTTON
+#ifndef QT_NO_COMBOBOX
+    case CE_ComboBoxLabel:
+        if (const QStyleOptionComboBox *comboBox = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
+            QStyleOption optionComboBox = *comboBox;
+            optionComboBox.palette.setColor(QPalette::Active, QPalette::WindowText,
+                optionComboBox.palette.text().color() );
+            optionComboBox.palette.setColor(QPalette::Inactive, QPalette::WindowText,
+                optionComboBox.palette.text().color() );
+            QRect editRect = subControlRect(CC_ComboBox, comboBox, SC_ComboBoxEditField, widget);
+            painter->save();
+            painter->setClipRect(editRect);
+
+            if (!comboBox->currentIcon.isNull()) {
+                QIcon::Mode mode = comboBox->state & State_Enabled ? QIcon::Normal : QIcon::Disabled;
+                QPixmap pixmap = comboBox->currentIcon.pixmap(comboBox->iconSize, mode);
+                QRect iconRect(editRect);
+                iconRect.setWidth(comboBox->iconSize.width() + 4);
+                iconRect = alignedRect(comboBox->direction,
+                                       Qt::AlignLeft | Qt::AlignVCenter,
+                                       iconRect.size(), editRect);
+                if (comboBox->editable)
+                    painter->fillRect(iconRect, optionComboBox.palette.brush(QPalette::Base));
+                drawItemPixmap(painter, iconRect, Qt::AlignCenter, pixmap);
+
+                if (comboBox->direction == Qt::RightToLeft)
+                    editRect.translate(-4 - comboBox->iconSize.width(), 0);
+                else
+                    editRect.translate(comboBox->iconSize.width() + 4, 0);
+            }
+            if (!comboBox->currentText.isEmpty() && !comboBox->editable) {
+                QCommonStyle::drawItemText(painter,
+                            editRect.adjusted(QS60StylePrivate::pixelMetric(PM_Custom_FrameCornerWidth), 0, -1, 0),
+                            visualAlignment(comboBox->direction, Qt::AlignLeft | Qt::AlignVCenter),
+                            comboBox->palette, comboBox->state & State_Enabled, comboBox->currentText);
+            }
+            painter->restore();
+        }
+        break;
+#endif //QT_NO_COMBOBOX
+#ifndef QT_NO_ITEMVIEWS
+    case CE_ItemViewItem:
+        if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(option)) {
+            QStyleOptionViewItemV4 voptAdj = *vopt;
+            painter->save();
+
+            painter->setClipRect(voptAdj.rect);
+            const bool isSelected = (voptAdj.state & QStyle::State_HasFocus);
+
+            bool isVisible = false;
+            int scrollBarWidth = 0;
+            QList<QScrollBar *> scrollBars = qFindChildren<QScrollBar *>(widget);
+            for (int i = 0; i < scrollBars.size(); ++i) {
+                QScrollBar *scrollBar = scrollBars.at(i);
+                if (scrollBar && scrollBar->orientation() == Qt::Vertical) {
+                    isVisible = scrollBar->isVisible();
+                    scrollBarWidth = scrollBar->size().width();
+                    break;
+                }
+            }
+
+            int rightValue = widget ? widget->contentsRect().right() : 0;
+
+            if (isVisible)
+                rightValue -= scrollBarWidth;
+
+            if (voptAdj.rect.right() > rightValue)
+                voptAdj.rect.setRight(rightValue);
+
+            const QRect iconRect = subElementRect(SE_ItemViewItemDecoration, &voptAdj, widget);
+            QRect textRect = subElementRect(SE_ItemViewItemText, &voptAdj, widget);
+
+            // draw themed background for table unless background brush has been defined.
+            if (vopt->backgroundBrush == Qt::NoBrush) {
+                const QStyleOptionViewItemV4 *tableOption = qstyleoption_cast<const QStyleOptionViewItemV4 *>(option);
+                const QTableView *table = qobject_cast<const QTableView *>(widget);
+                if (table && tableOption) {
+                    const QModelIndex index = tableOption->index;
+                    //todo: Draw cell background only once - for the first cell.
+                    QStyleOptionViewItemV4 voptAdj2 = voptAdj;
+                    const QModelIndex indexFirst = table->model()->index(0,0);
+                    const QModelIndex indexLast = table->model()->index(
+                        table->model()->rowCount()-1,table->model()->columnCount()-1);
+                    if (table->viewport())
+                        voptAdj2.rect = QRect( table->visualRect(indexFirst).topLeft(),
+                            table->visualRect(indexLast).bottomRight()).intersect(table->viewport()->rect());
+                    drawPrimitive(PE_PanelItemViewItem, &voptAdj2, painter, widget);
+                }
+            } else { QCommonStyle::drawPrimitive(PE_PanelItemViewItem, option, painter, widget);}
+
+            // draw the focus rect
+            if (isSelected) {
+                const QRect highlightRect = option->rect.adjusted(1,1,-1,-1);
+                QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ListHighlight, painter, highlightRect, flags);
+            }
+
+             // draw the icon
+             const QIcon::Mode mode = (voptAdj.state & QStyle::State_Enabled) ? QIcon::Normal : QIcon::Disabled;
+             const QIcon::State state = voptAdj.state & QStyle::State_Open ? QIcon::On : QIcon::Off;
+             voptAdj.icon.paint(painter, iconRect, voptAdj.decorationAlignment, mode, state);
+
+             // Draw selection check mark. Show check mark only in multi selection modes.
+             if (const QListView *listView = (qobject_cast<const QListView *>(widget))) {
+                 const bool singleSelection =
+                     listView &&
+                     (listView->selectionMode() == QAbstractItemView::SingleSelection ||
+                     listView->selectionMode() == QAbstractItemView::NoSelection);
+                 const QRect selectionRect = subElementRect(SE_ItemViewItemCheckIndicator, &voptAdj, widget);
+                 if (voptAdj.state & QStyle::State_Selected && !singleSelection) {
+                     QStyleOptionViewItemV4 option(voptAdj);
+                     option.rect = selectionRect;
+                     // Draw selection mark.
+                     drawPrimitive(QStyle::PE_IndicatorViewItemCheck, &option, painter, widget);
+                     if ( textRect.right() > selectionRect.left() )
+                         textRect.setRight(selectionRect.left());
+                 } else if (singleSelection &&
+                     voptAdj.features & QStyleOptionViewItemV2::HasCheckIndicator) {
+                     // draw the check mark
+                     if (selectionRect.isValid()) {
+                         QStyleOptionViewItemV4 option(*vopt);
+                         option.rect = selectionRect;
+                         option.state = option.state & ~QStyle::State_HasFocus;
+
+                         switch (vopt->checkState) {
+                         case Qt::Unchecked:
+                             option.state |= QStyle::State_Off;
+                             break;
+                         case Qt::PartiallyChecked:
+                             option.state |= QStyle::State_NoChange;
+                             break;
+                         case Qt::Checked:
+                             option.state |= QStyle::State_On;
+                             break;
+                         }
+                         drawPrimitive(QStyle::PE_IndicatorViewItemCheck, &option, painter, widget);
+                     }
+                 }
+             }
+
+             // draw the text
+            if (!voptAdj.text.isEmpty()) {
+                const QStyleOptionViewItemV4 *tableOption = qstyleoption_cast<const QStyleOptionViewItemV4 *>(option);
+                if (isSelected) {
+                    if (qobject_cast<const QTableView *>(widget) && tableOption)
+                        voptAdj.palette.setColor(
+                            QPalette::Text, QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors, 11, 0));
+                    else
+                        voptAdj.palette.setColor(
+                            QPalette::Text, QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors, 10, 0));
+                }
+                painter->setPen(voptAdj.palette.text().color());
+                d->viewItemDrawText(painter, &voptAdj, textRect);
+            }
+            painter->restore();
+        }
+        break;
+#endif // QT_NO_ITEMVIEWS
+#ifndef QT_NO_TABBAR
+    case CE_TabBarTabShape:
+        if (const QStyleOptionTabV3 *optionTab = qstyleoption_cast<const QStyleOptionTabV3 *>(option)) {
+            QStyleOptionTabV3 optionTabAdj = *optionTab;
+            const bool isSelected = optionTab->state & QStyle::State_Selected;
+            const bool directionMirrored = (optionTab->direction == Qt::RightToLeft);
+            QS60StylePrivate::SkinElements skinElement;
+            switch (optionTab->shape) {
+                case QTabBar::TriangularEast:
+                case QTabBar::RoundedEast:
+                    skinElement = isSelected ? QS60StylePrivate::SE_TabBarTabEastActive:
+                        QS60StylePrivate::SE_TabBarTabEastInactive;
+                    break;
+                case QTabBar::TriangularSouth:
+                case QTabBar::RoundedSouth:
+                    skinElement = isSelected ? QS60StylePrivate::SE_TabBarTabSouthActive:
+                        QS60StylePrivate::SE_TabBarTabSouthInactive;
+                    break;
+                case QTabBar::TriangularWest:
+                case QTabBar::RoundedWest:
+                    skinElement = isSelected ? QS60StylePrivate::SE_TabBarTabWestActive:
+                        QS60StylePrivate::SE_TabBarTabWestInactive;
+                    break;
+                case QTabBar::TriangularNorth:
+                case QTabBar::RoundedNorth:
+                default:
+                    skinElement = isSelected ? QS60StylePrivate::SE_TabBarTabNorthActive:
+                        QS60StylePrivate::SE_TabBarTabNorthInactive;
+                    break;
+            }
+            if (skinElement==QS60StylePrivate::SE_TabBarTabEastInactive||
+                    skinElement==QS60StylePrivate::SE_TabBarTabNorthInactive||
+                    skinElement==QS60StylePrivate::SE_TabBarTabSouthInactive||
+                    skinElement==QS60StylePrivate::SE_TabBarTabWestInactive||
+                    skinElement==QS60StylePrivate::SE_TabBarTabEastActive||
+                    skinElement==QS60StylePrivate::SE_TabBarTabNorthActive||
+                    skinElement==QS60StylePrivate::SE_TabBarTabSouthActive||
+                    skinElement==QS60StylePrivate::SE_TabBarTabWestActive) {
+                const int borderThickness =
+                    QS60StylePrivate::pixelMetric(QStyle::PM_DefaultFrameWidth);
+                const int tabOverlap =
+                    QS60StylePrivate::pixelMetric(QStyle::PM_TabBarTabOverlap) - borderThickness;
+                //todo: draw navi wipe behind tabbar - must be drawn with first draw
+
+                if (skinElement==QS60StylePrivate::SE_TabBarTabEastInactive||
+                        skinElement==QS60StylePrivate::SE_TabBarTabEastActive||
+                        skinElement==QS60StylePrivate::SE_TabBarTabWestInactive||
+                        skinElement==QS60StylePrivate::SE_TabBarTabWestActive){
+                    optionTabAdj.rect.adjust(0, 0, 0, tabOverlap);
+                } else {
+                    if (directionMirrored)
+                        optionTabAdj.rect.adjust(-tabOverlap, 0, 0, 0);
+                    else
+                        optionTabAdj.rect.adjust(0, 0, tabOverlap, 0);
+                    }
+            }
+            QS60StylePrivate::drawSkinElement(skinElement, painter, optionTabAdj.rect, flags);
+        }
+        break;
+    case CE_TabBarTabLabel:
+        if (const QStyleOptionTabV3 *tab = qstyleoption_cast<const QStyleOptionTabV3 *>(option)) {
+            QStyleOptionTabV3 optionTab = *tab;
+            QRect tr = optionTab.rect;
+            const bool directionMirrored = (optionTab.direction == Qt::RightToLeft);
+            const int borderThickness = QS60StylePrivate::pixelMetric(QStyle::PM_DefaultFrameWidth);
+            const int tabOverlap =
+                QS60StylePrivate::pixelMetric(QStyle::PM_TabBarTabOverlap) - borderThickness;
+            const QRect windowRect = painter->window();
+
+            switch (tab->shape) {
+                case QTabBar::TriangularWest:
+                case QTabBar::RoundedWest:
+                case QTabBar::TriangularEast:
+                case QTabBar::RoundedEast:
+                    tr.adjust(0, 0, 0, tabOverlap);
+                    break;
+                case QTabBar::TriangularSouth:
+                case QTabBar::RoundedSouth:
+                case QTabBar::TriangularNorth:
+                case QTabBar::RoundedNorth:
+                default:
+                    if (directionMirrored)
+                        tr.adjust(-tabOverlap, 0, 0, 0);
+                    else
+                        tr.adjust(0, 0, tabOverlap, 0);
+                    break;
+            }
+            painter->save();
+            QFont f = painter->font();
+            f.setPointSizeF(f.pointSizeF() * KTabFontMul);
+            painter->setFont(f);
+
+            if (option->state & QStyle::State_Selected){
+                optionTab.palette.setColor(QPalette::Active, QPalette::WindowText,
+                    QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors, 3, option));
+            }
+
+            const bool verticalTabs = optionTab.shape == QTabBar::RoundedEast
+                                || optionTab.shape == QTabBar::RoundedWest
+                                || optionTab.shape == QTabBar::TriangularEast
+                                || optionTab.shape == QTabBar::TriangularWest;
+            const bool selected = optionTab.state & State_Selected;
+            if (verticalTabs) {
+                painter->save();
+                int newX, newY, newRotation;
+                if (optionTab.shape == QTabBar::RoundedEast || optionTab.shape == QTabBar::TriangularEast) {
+                    newX = tr.width();
+                    newY = tr.y();
+                    newRotation = 90;
+                } else {
+                    newX = 0;
+                    newY = tr.y() + tr.height();
+                    newRotation = -90;
+                }
+                tr.setRect(0, 0, tr.height(), tr.width());
+                QTransform m;
+                m.translate(newX, newY);
+                m.rotate(newRotation);
+                painter->setTransform(m, true);
+            }
+            tr.adjust(0, 0, pixelMetric(QStyle::PM_TabBarTabShiftHorizontal, tab, widget),
+                            pixelMetric(QStyle::PM_TabBarTabShiftVertical, tab, widget));
+
+            if (selected) {
+                tr.setBottom(tr.bottom() - pixelMetric(QStyle::PM_TabBarTabShiftVertical, tab, widget));
+                tr.setRight(tr.right() - pixelMetric(QStyle::PM_TabBarTabShiftHorizontal, tab, widget));
+            }
+
+            int alignment = Qt::AlignCenter | Qt::TextShowMnemonic;
+            if (!styleHint(SH_UnderlineShortcut, &optionTab, widget))
+                alignment |= Qt::TextHideMnemonic;
+            if (!optionTab.icon.isNull()) {
+                QSize iconSize = optionTab.iconSize;
+                int iconExtent = pixelMetric(PM_TabBarIconSize);
+                if (iconSize.height() > iconExtent || iconSize.width() > iconExtent)
+                    iconSize = QSize(iconExtent, iconExtent);
+                QPixmap tabIcon = optionTab.icon.pixmap(iconSize,
+                    (optionTab.state & State_Enabled) ? QIcon::Normal : QIcon::Disabled);
+                if (tab->text.isEmpty())
+                    painter->drawPixmap(tr.center().x() - (tabIcon.height() >>1),
+                                        tr.center().y() - (tabIcon.height() >>1),
+                                        tabIcon);
+                else
+                    painter->drawPixmap(tr.left() + tabOverlap,
+                                        tr.center().y() - (tabIcon.height() >>1),
+                                        tabIcon);
+                tr.setLeft(tr.left() + iconSize.width() + 4);
+            }
+
+            QCommonStyle::drawItemText(painter, tr, alignment, optionTab.palette, tab->state & State_Enabled, tab->text, QPalette::WindowText);
+            if (verticalTabs)
+                painter->restore();
+
+            if (optionTab.state & State_HasFocus) {
+                const int OFFSET = 1 + pixelMetric(PM_DefaultFrameWidth);
+                const int leftBorder = optionTab.rect.left();
+                const int rightBorder = optionTab.rect.right() - 1;
+
+                QStyleOptionFocusRect fropt;
+                fropt.QStyleOption::operator=(*tab);
+                fropt.rect.setRect(leftBorder + 1 + OFFSET, optionTab.rect.y() + OFFSET,
+                                   rightBorder - leftBorder - 2*OFFSET, optionTab.rect.height() - 2*OFFSET);
+                drawPrimitive(PE_FrameFocusRect, &fropt, painter, widget);
+            }
+
+            painter->restore();
+        }
+        break;
+#endif // QT_NO_TABBAR
+#ifndef QT_NO_PROGRESSBAR
+    case CE_ProgressBarContents:
+        if (const QStyleOptionProgressBarV2 *optionProgressBar = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
+            QRect progressRect = optionProgressBar->rect;
+
+            if (optionProgressBar->minimum == optionProgressBar->maximum && optionProgressBar->minimum == 0) {
+                // busy indicator
+                QS60StylePrivate::drawSkinPart(QS60StyleEnums::SP_QgnGrafBarWait, painter, progressRect,flags);
+            } else {
+                const qreal progressFactor = (optionProgressBar->minimum == optionProgressBar->maximum) ? 1.0
+                    : (qreal)optionProgressBar->progress / optionProgressBar->maximum;
+                if (optionProgressBar->orientation == Qt::Horizontal) {
+                    progressRect.setWidth(int(progressRect.width() * progressFactor));
+                    if(optionProgressBar->direction == Qt::RightToLeft)
+                        progressRect.translate(optionProgressBar->rect.width()-progressRect.width(),0);
+                    progressRect.adjust(1, 0, -1, 0);
+                } else {
+                    progressRect.adjust(0, 1, 0, -1);
+                    progressRect.setTop(progressRect.bottom() - int(progressRect.height() * progressFactor));
+                }
+
+                const QS60StylePrivate::SkinElements skinElement = optionProgressBar->orientation == Qt::Horizontal ?
+                    QS60StylePrivate::SE_ProgressBarIndicatorHorizontal : QS60StylePrivate::SE_ProgressBarIndicatorVertical;
+                QS60StylePrivate::drawSkinElement(skinElement, painter, progressRect, flags);
+            }
+        }
+        break;
+    case CE_ProgressBarGroove:
+        if (const QStyleOptionProgressBarV2 *optionProgressBar = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
+            const QS60StylePrivate::SkinElements skinElement = optionProgressBar->orientation == Qt::Horizontal ?
+                QS60StylePrivate::SE_ProgressBarGrooveHorizontal : QS60StylePrivate::SE_ProgressBarGrooveVertical;
+            QS60StylePrivate::drawSkinElement(skinElement, painter, option->rect, flags);
+        }
+        break;
+    case CE_ProgressBarLabel:
+        if (const QStyleOptionProgressBarV2 *progressbar = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
+            QStyleOptionProgressBarV2 optionProgressBar = *progressbar;
+            QCommonStyle::drawItemText(painter, progressbar->rect, flags | Qt::AlignCenter | Qt::TextSingleLine, optionProgressBar.palette,
+                progressbar->state & State_Enabled, progressbar->text, QPalette::WindowText);
+        }
+        break;
+#endif // QT_NO_PROGRESSBAR
+#ifndef QT_NO_MENU
+    case CE_MenuItem:
+        if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
+            QStyleOptionMenuItem optionMenuItem = *menuItem;
+
+            bool drawSubMenuIndicator = false;
+            switch(menuItem->menuItemType) {
+                case QStyleOptionMenuItem::Scroller:
+                case QStyleOptionMenuItem::Separator:
+                    return; // no separators or scrollers in S60 menus
+                case QStyleOptionMenuItem::SubMenu:
+                    drawSubMenuIndicator = true;
+                    break;
+                default:
+                    break;
+            }
+            const bool enabled = optionMenuItem.state & State_Enabled;
+            const bool checkable = optionMenuItem.checkType != QStyleOptionMenuItem::NotCheckable;
+
+            uint text_flags = Qt::AlignLeading | Qt::TextShowMnemonic | Qt::TextDontClip
+                            | Qt::TextSingleLine | Qt::AlignVCenter;
+            if (!styleHint(SH_UnderlineShortcut, menuItem, widget))
+                text_flags |= Qt::TextHideMnemonic;
+
+            QRect iconRect =
+                subElementRect(SE_ItemViewItemDecoration, &optionMenuItem, widget);
+            QRect textRect = subElementRect(SE_ItemViewItemText, &optionMenuItem, widget);
+
+            if ((option->state & State_Selected) && (option->state & State_Enabled))
+                QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ListHighlight, painter, option->rect, flags);
+
+            //todo: move the vertical spacing stuff into subElementRect
+            const int vSpacing = QS60StylePrivate::pixelMetric(QStyle::PM_LayoutVerticalSpacing);
+            if (checkable){
+                QStyleOptionMenuItem optionCheckBox;
+                optionCheckBox.QStyleOption::operator=(*menuItem);
+                optionCheckBox.rect.setWidth(pixelMetric(PM_IndicatorWidth));
+                optionCheckBox.rect.setHeight(pixelMetric(PM_IndicatorHeight));
+                const int moveByX = optionCheckBox.rect.width()+vSpacing;
+                if (optionMenuItem.direction == Qt::LeftToRight) {
+                    textRect.translate(moveByX,0);
+                    iconRect.translate(moveByX, 0);
+                    iconRect.setWidth(iconRect.width()+vSpacing);
+                    textRect.setWidth(textRect.width()-moveByX-vSpacing);
+                } else {
+                    textRect.setWidth(textRect.width()-moveByX);
+                    iconRect.setWidth(iconRect.width()+vSpacing);
+                    iconRect.translate(-optionCheckBox.rect.width()-vSpacing, 0);
+                    optionCheckBox.rect.translate(textRect.width()+iconRect.width(),0);
+                }
+                drawPrimitive(PE_IndicatorMenuCheckMark, &optionCheckBox, painter, widget);
+            }
+            //draw icon and/or checkState
+            QPixmap pix = menuItem->icon.pixmap(pixelMetric(PM_SmallIconSize),
+                enabled ? QIcon::Normal : QIcon::Disabled);
+            const bool itemWithIcon = !pix.isNull();
+            if (itemWithIcon) {
+                drawItemPixmap(painter, iconRect, text_flags, pix);
+                if (optionMenuItem.direction == Qt::LeftToRight)
+                    textRect.translate(vSpacing,0);
+                else
+                    textRect.translate(-vSpacing,0);
+                textRect.setWidth(textRect.width()-vSpacing);
+            }
+
+            //draw indicators
+            if (drawSubMenuIndicator) {
+                QStyleOptionMenuItem arrowOptions;
+                arrowOptions.QStyleOption::operator=(*menuItem);
+                const int indicatorWidth = (pixelMetric(PM_ListViewIconSize, option, widget)>>1) +
+                    pixelMetric(QStyle::PM_LayoutVerticalSpacing, option, widget);
+                if (optionMenuItem.direction == Qt::LeftToRight)
+                    arrowOptions.rect.setLeft(textRect.right());
+                arrowOptions.rect.setWidth(indicatorWidth);
+                //by default sub menu indicator in S60 points to east,so here icon
+                // direction is set to north (and south when in RightToLeft)
+                const QS60StylePrivate::SkinElementFlag arrowDirection = (arrowOptions.direction == Qt::LeftToRight) ?
+                    QS60StylePrivate::SF_PointNorth : QS60StylePrivate::SF_PointSouth;
+                QS60StylePrivate::drawSkinPart(QS60StyleEnums::SP_QgnIndiSubMenu, painter, arrowOptions.rect,
+                    (flags | QS60StylePrivate::SF_ColorSkinned | arrowDirection));
+            }
+
+            //draw text
+            if (!enabled){
+                //In s60, if something becomes disabled, it is removed from menu, so no native look-alike available.
+                optionMenuItem.palette.setColor(QPalette::Disabled, QPalette::Text, QS60StylePrivate::lighterColor(
+                        optionMenuItem.palette.color(QPalette::Disabled, QPalette::Text)));
+                painter->save();
+                painter->setOpacity(0.5);
+            }
+            QCommonStyle::drawItemText(painter, textRect, text_flags,
+                    optionMenuItem.palette, enabled,
+                    optionMenuItem.text, QPalette::Text);
+            if (!enabled)
+                painter->restore();
+        }
+        break;
+    case CE_MenuEmptyArea:
+        break;
+#endif //QT_NO_MENU
+
+#ifndef QT_NO_MENUBAR
+    case CE_MenuBarEmptyArea:
+        break;
+#endif //QT_NO_MENUBAR
+
+    case CE_HeaderSection:
+        if ( const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(option)) {
+            painter->save();
+            QPen linePen = QPen(QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnLineColors, 1, header));
+            const int penWidth = (header->orientation == Qt::Horizontal) ?
+                linePen.width()+QS60StylePrivate::pixelMetric(PM_Custom_BoldLineWidth)
+                : linePen.width()+QS60StylePrivate::pixelMetric(PM_Custom_ThinLineWidth);
+            linePen.setWidth(penWidth);
+            painter->setPen(linePen);
+            if (header->orientation == Qt::Horizontal){
+                painter->drawLine(header->rect.bottomLeft(), header->rect.bottomRight());
+            } else {
+                if ( header->direction == Qt::LeftToRight ) {
+                    painter->drawLine(header->rect.topRight(), header->rect.bottomRight());
+                } else {
+                    painter->drawLine(header->rect.topLeft(), header->rect.bottomLeft());
+                }
+            }
+            painter->restore();
+        }
+        break;
+    case CE_HeaderEmptyArea: // no need to draw this
+        break;
+    case CE_Header:
+        if ( const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(option)) {
+            drawControl(CE_HeaderSection, header, painter, widget);
+            QStyleOptionHeader subopt = *header;
+            subopt.rect = subElementRect(SE_HeaderLabel, header, widget);
+            if (subopt.rect.isValid())
+                drawControl(CE_HeaderLabel, &subopt, painter, widget);
+            if (header->sortIndicator != QStyleOptionHeader::None) {
+                subopt.rect = subElementRect(SE_HeaderArrow, option, widget);
+                drawPrimitive(PE_IndicatorHeaderArrow, &subopt, painter, widget);
+            }
+        }
+        break;
+#ifndef QT_NO_TOOLBAR
+    case CE_ToolBar:
+        if (const QStyleOptionToolBar *toolBar = qstyleoption_cast<const QStyleOptionToolBar *>(option)) {
+            const QToolBar *tbWidget = qobject_cast<const QToolBar *>(widget);
+
+            //toolbar within a toolbar, skip
+            if (!tbWidget || (widget && qobject_cast<QToolBar *>(widget->parentWidget())))
+                break;
+
+            // Normally in S60 5.0+ there is no background for toolbar, but in some cases with versatile QToolBar,
+            // it looks a bit strange. So, lets fillRect with Button.
+            if (!QS60StylePrivate::isToolBarBackground()) {
+                QList<QAction *> actions = tbWidget->actions();
+                bool justToolButtonsInToolBar = true;
+                for (int i = 0; i < actions.size(); ++i) {
+                    QWidget *childWidget = tbWidget->widgetForAction(actions.at(i));
+                    const QToolButton *button = qobject_cast<const QToolButton *>(childWidget);
+                    if (!button){
+                        justToolButtonsInToolBar = false;
+                    }
+                }
+
+                // Draw frame background
+                // for vertical toolbars with text only and
+                // for toolbars with extension buttons and
+                // for toolbars with widgets in them.
+                if (!justToolButtonsInToolBar ||
+                        (tbWidget &&
+                         (tbWidget->orientation() == Qt::Vertical) &&
+                         (tbWidget->toolButtonStyle() == Qt::ToolButtonTextOnly))) {
+                        painter->save();
+                        if (widget)
+                            painter->setBrush(widget->palette().button());
+                        painter->setOpacity(0.3);
+                        painter->fillRect(toolBar->rect, painter->brush());
+                        painter->restore();
+                }
+            } else {
+                QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ToolBar, painter, toolBar->rect, flags);
+            }
+        }
+        break;
+#endif //QT_NO_TOOLBAR
+    case CE_ShapedFrame:
+        if (qobject_cast<const QTextEdit *>(widget)) {
+            QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_Editor, painter, option->rect, flags);
+        } else if (qobject_cast<const QTableView *>(widget)) {
+            QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_TableItem, painter, option->rect, flags);
+        } else if (const QHeaderView *header = qobject_cast<const QHeaderView *>(widget)) {
+            if (header->orientation() == Qt::Horizontal) {
+                QRect headerRect = option->rect;
+                const int frameWidth = QS60StylePrivate::pixelMetric(PM_DefaultFrameWidth);
+                headerRect.adjust(0,frameWidth,-2*frameWidth,0);
+                QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_TableHeaderItem, painter, headerRect, flags);
+            } else {
+                //todo: update to horizontal table graphic
+                QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_TableHeaderItem, painter, option->rect, flags | QS60StylePrivate::SF_PointWest);
+            }
+        }
+        if (option->state & State_HasFocus)
+            drawPrimitive(PE_FrameFocusRect, option, painter, widget);
+        break;
+    case CE_MenuScroller:
+        break;
+    default:
+        QCommonStyle::drawControl(element, option, painter, widget);
+    }
+}
+
+/*!
+  \reimp
+*/
+void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const
+{
+    const QS60StylePrivate::SkinElementFlags flags = (option->state & State_Enabled) ?  QS60StylePrivate::SF_StateEnabled : QS60StylePrivate::SF_StateDisabled;
+    switch (element) {
+#ifndef QT_NO_LINEEDIT
+    case PE_PanelLineEdit:
+        if (const QStyleOptionFrame *lineEdit = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
+#ifndef QT_NO_COMBOBOX
+            if (widget && qobject_cast<const QComboBox *>(widget->parentWidget()))
+                break;
+#endif
+            QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_FrameLineEdit,
+                painter, option->rect, flags);
+
+            if (lineEdit->state & State_HasFocus)
+                drawPrimitive(PE_FrameFocusRect, lineEdit, painter, widget);
+        }
+    break;
+#endif // QT_NO_LINEEDIT
+    case PE_IndicatorCheckBox:
+        {
+            const QRect indicatorRect = option->rect;
+            // Draw checkbox indicator as color skinned graphics.
+            const QS60StyleEnums::SkinParts skinPart = (option->state & QStyle::State_On) ?
+                QS60StyleEnums::SP_QgnIndiCheckboxOn : QS60StyleEnums::SP_QgnIndiCheckboxOff;
+            QS60StylePrivate::drawSkinPart(skinPart, painter, indicatorRect,
+                (flags | QS60StylePrivate::SF_ColorSkinned));
+        }
+        break;
+    case PE_IndicatorViewItemCheck:
+#ifndef QT_NO_ITEMVIEWS
+        if (const QListView *listItem = (qobject_cast<const QListView *>(widget))) {
+            if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(option)) {
+                const bool checkBoxVisible = vopt->features & QStyleOptionViewItemV2::HasCheckIndicator;
+                const bool singleSelection = listItem->selectionMode() ==
+                    QAbstractItemView::SingleSelection || listItem->selectionMode() == QAbstractItemView::NoSelection;
+                // draw either checkbox at the beginning
+                if (checkBoxVisible && singleSelection) {
+                    drawPrimitive(PE_IndicatorCheckBox, option, painter, widget);
+                // ... or normal "tick" selection at the end.
+                } else if (option->state & QStyle::State_Selected) {
+                    QRect tickRect = option->rect;
+                    const int frameBorderWidth = QS60StylePrivate::pixelMetric(PM_Custom_FrameCornerWidth);
+                    // adjust tickmark rect to exclude frame border
+                    tickRect.adjust(0,-frameBorderWidth,0,-frameBorderWidth);
+                    QS60StyleEnums::SkinParts skinPart = QS60StyleEnums::SP_QgnIndiMarkedAdd;
+                    QS60StylePrivate::drawSkinPart(skinPart, painter, tickRect,
+                        (flags | QS60StylePrivate::SF_ColorSkinned));
+                }
+            }
+        }
+#endif //QT_NO_ITEMVIEWS
+        break;
+    case PE_IndicatorRadioButton: {
+            QRect buttonRect = option->rect;
+            //there is empty (a. 33%) space in svg graphics for radiobutton
+            const qreal reduceWidth = (qreal)buttonRect.width()/3.0;
+            const qreal rectWidth = (qreal)option->rect.width() != 0 ? option->rect.width() : 1.0;
+            // Try to occupy the full area
+            const qreal scaler = 1 + (reduceWidth/rectWidth);
+            buttonRect.setWidth((int)((buttonRect.width()-reduceWidth) * scaler));
+            buttonRect.setHeight((int)(buttonRect.height() * scaler));
+            // move the rect up for half of the new height-gain
+            const int newY = (buttonRect.bottomRight().y() - option->rect.bottomRight().y()) >> 1 ;
+            buttonRect.adjust(0,-newY,0,-newY);
+
+            // Draw radiobutton indicator as color skinned graphics.
+            QS60StyleEnums::SkinParts skinPart = (option->state & QStyle::State_On) ?
+                QS60StyleEnums::SP_QgnIndiRadiobuttOn : QS60StyleEnums::SP_QgnIndiRadiobuttOff;
+            QS60StylePrivate::drawSkinPart(skinPart, painter, buttonRect,
+                (flags | QS60StylePrivate::SF_ColorSkinned));
+        }
+        break;
+    case PE_PanelButtonCommand:
+    case PE_PanelButtonTool:
+    case PE_PanelButtonBevel:
+    case PE_FrameButtonBevel: {
+        const bool isPressed = option->state & QStyle::State_Sunken;
+        const QS60StylePrivate::SkinElements skinElement =
+            isPressed ? QS60StylePrivate::SE_ButtonPressed : QS60StylePrivate::SE_ButtonNormal;
+        QS60StylePrivate::drawSkinElement(skinElement, painter, option->rect, flags);
+        }
+        break;
+#ifndef QT_NO_TOOLBUTTON
+    case PE_IndicatorArrowDown:
+    case PE_IndicatorArrowLeft:
+    case PE_IndicatorArrowRight:
+    case PE_IndicatorArrowUp: {
+        QS60StyleEnums::SkinParts skinPart;
+        if (element==PE_IndicatorArrowDown)
+            skinPart = QS60StyleEnums::SP_QgnGrafScrollArrowDown;
+        else if (element==PE_IndicatorArrowLeft)
+            skinPart = QS60StyleEnums::SP_QgnGrafScrollArrowLeft;
+        else if (element==PE_IndicatorArrowRight)
+            skinPart = QS60StyleEnums::SP_QgnGrafScrollArrowRight;
+        else if (element==PE_IndicatorArrowUp)
+            skinPart = QS60StyleEnums::SP_QgnGrafScrollArrowUp;
+
+        QS60StylePrivate::drawSkinPart(skinPart, painter, option->rect, flags);
+        }
+        break;
+#endif //QT_NO_TOOLBUTTON
+#ifndef QT_NO_SPINBOX
+    case PE_IndicatorSpinDown:
+    case PE_IndicatorSpinUp:
+        if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
+            QStyleOptionSpinBox optionSpinBox = *spinBox;
+            const QS60StyleEnums::SkinParts part = (element == PE_IndicatorSpinUp) ?
+                QS60StyleEnums::SP_QgnGrafScrollArrowUp :
+                QS60StyleEnums::SP_QgnGrafScrollArrowDown;
+            const int adjustment = qMin(optionSpinBox.rect.width(), optionSpinBox.rect.height())/6;
+            optionSpinBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? adjustment : -adjustment );
+            QS60StylePrivate::drawSkinPart(part, painter, optionSpinBox.rect,flags);
+        }
+#ifndef QT_NO_COMBOBOX
+        else if (const QStyleOptionFrame *cmb = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
+            // We want to draw down arrow here for comboboxes as well.
+            const QS60StyleEnums::SkinParts part = QS60StyleEnums::SP_QgnGrafScrollArrowDown;
+            QStyleOptionFrame comboBox = *cmb;
+            const int adjustment = qMin(comboBox.rect.width(), comboBox.rect.height())/6;
+            comboBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? adjustment : -adjustment );
+            QS60StylePrivate::drawSkinPart(part, painter, comboBox.rect,flags);
+        }
+#endif //QT_NO_COMBOBOX
+        break;
+    case PE_IndicatorSpinMinus:
+    case PE_IndicatorSpinPlus:
+        if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
+            QStyleOptionSpinBox optionSpinBox = *spinBox;
+            QCommonStyle::drawPrimitive(element, &optionSpinBox, painter, widget);
+        }
+#ifndef QT_NO_COMBOBOX
+        else if (const QStyleOptionFrame *cmb = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
+            // We want to draw down arrow here for comboboxes as well.
+            QStyleOptionFrame comboBox = *cmb;
+            const int frameWidth = QS60StylePrivate::pixelMetric(PM_DefaultFrameWidth);
+            comboBox.rect.adjust(0,frameWidth,0,-frameWidth);
+            QCommonStyle::drawPrimitive(element, &comboBox, painter, widget);
+        }
+#endif //QT_NO_COMBOBOX
+        break;
+#endif //QT_NO_SPINBOX
+    case PE_FrameFocusRect:
+// Calendar widget and combox both do not use styled itemDelegate
+        if (widget && !(false
+#ifndef QT_NO_CALENDARWIDGET
+            || qobject_cast<const QCalendarWidget *>(widget->parent())
+#endif //QT_NO_CALENDARWIDGET
+#ifndef QT_NO_COMBOBOX
+            || qobject_cast<const QComboBoxListView *>(widget)
+#endif //QT_NO_COMBOBOX
+            )) {
+            // no focus selection for touch
+            if (option->state & State_HasFocus && !QS60StylePrivate::isTouchSupported()) {
+                painter->save();
+                const int penWidth = QS60StylePrivate::focusRectPenWidth();
+#ifdef QT_KEYPAD_NAVIGATION
+                const Qt::PenStyle penStyle = widget->hasEditFocus() ? Qt::SolidLine :Qt::DotLine;
+                const qreal opacity = widget->hasEditFocus() ? 0.6 : 0.4;
+#else
+                const Qt::PenStyle penStyle = Qt::SolidLine;
+                const qreal opacity = 0.5;
+#endif
+                painter->setPen(QPen(option->palette.color(QPalette::Text), penWidth, penStyle));
+                painter->setRenderHint(QPainter::Antialiasing);
+                painter->setOpacity(opacity);
+                // Because of Qts coordinate system, we need to tweak the rect by .5 pixels, otherwise it gets blurred.
+                const qreal rectAdjustment = penWidth % 2?.5:0;
+                // Also we try to stay inside the option->rect, with penWidth > 1. Therefore these +1/-1
+                const QRectF adjustedRect = QRectF(option->rect).adjusted(
+                        rectAdjustment + penWidth - 1,
+                        rectAdjustment + penWidth - 1,
+                        -rectAdjustment - penWidth + 1,
+                        -rectAdjustment - penWidth + 1);
+                painter->drawRoundedRect(adjustedRect, penWidth * 1.5, penWidth * 1.5);
+                painter->restore();
+            }
+        }
+        break;
+    case PE_Widget:
+        if (QS60StylePrivate::drawsOwnThemeBackground(widget)
+#ifndef QT_NO_COMBOBOX
+            || qobject_cast<const QComboBoxListView *>(widget)
+#endif //QT_NO_COMBOBOX
+#ifndef QT_NO_MENU
+            || qobject_cast<const QMenu *> (widget)
+#endif //QT_NO_MENU
+            ) {
+            QS60StylePrivate::SkinElements skinElement = QS60StylePrivate::SE_OptionsMenu;
+            QS60StylePrivate::drawSkinElement(skinElement, painter, option->rect, flags);
+        }
+        break;
+    case PE_FrameWindow:
+    case PE_FrameTabWidget:
+        if (const QStyleOptionTabWidgetFrame *tabFrame = qstyleoption_cast<const QStyleOptionTabWidgetFrame *>(option)) {
+            QStyleOptionTabWidgetFrame optionTabFrame = *tabFrame;
+            QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_PanelBackground, painter, optionTabFrame.rect, flags);
+        }
+        break;
+    case PE_IndicatorHeaderArrow:
+        if (const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(option)) {
+            if (header->sortIndicator & QStyleOptionHeader::SortUp)
+                drawPrimitive(PE_IndicatorArrowUp, header, painter, widget);
+            else if (header->sortIndicator & QStyleOptionHeader::SortDown)
+                drawPrimitive(PE_IndicatorArrowDown, header, painter, widget);
+        } // QStyleOptionHeader::None is not drawn => not needed
+        break;
+#ifndef QT_NO_GROUPBOX
+    case PE_FrameGroupBox:
+        if (const QStyleOptionFrameV2 *frame = qstyleoption_cast<const QStyleOptionFrameV2 *>(option))
+            QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_SettingsList, painter, frame->rect, flags);
+        break;
+#endif //QT_NO_GROUPBOX
+
+    // Qt3 primitives are not supported
+    case PE_Q3CheckListController:
+    case PE_Q3CheckListExclusiveIndicator:
+    case PE_Q3CheckListIndicator:
+    case PE_Q3DockWindowSeparator:
+    case PE_Q3Separator:
+        Q_ASSERT(false);
+        break;
+    case PE_Frame:
+        if (const QStyleOptionFrameV3 *frame = qstyleoption_cast<const QStyleOptionFrameV3 *>(option))
+            drawPrimitive(PE_FrameFocusRect, frame, painter, widget);
+        break;
+#ifndef QT_NO_ITEMVIEWS
+    case PE_PanelItemViewItem:
+    case PE_PanelItemViewRow: // ### Qt 5: remove
+        break;
+#endif //QT_NO_ITEMVIEWS
+
+    case PE_IndicatorMenuCheckMark:
+        if (const QStyleOptionMenuItem *checkBox = qstyleoption_cast<const QStyleOptionMenuItem *>(option)){
+            QStyleOptionMenuItem optionCheckBox = *checkBox;
+            if (optionCheckBox.checked)
+                optionCheckBox.state = (optionCheckBox.state | State_On);
+            drawPrimitive(PE_IndicatorCheckBox, &optionCheckBox, painter, widget);
+        }
+        break;
+#ifndef QT_NO_TOOLBAR
+    case PE_IndicatorToolBarHandle:
+        // no toolbar handles in S60/AVKON UI
+    case PE_IndicatorToolBarSeparator:
+        // no separators in S60/AVKON UI
+        break;
+#endif //QT_NO_TOOLBAR
+
+    case PE_PanelMenuBar:
+    case PE_FrameMenu:
+        break; //disable frame in menu
+
+    case PE_IndicatorBranch:
+#if defined(Q_WS_S60)
+        // 3.1 AVKON UI does not have tree view component, use common style for drawing there
+        if (QSysInfo::s60Version() == QSysInfo::SV_S60_3_1) {
+#else
+        if (true) {
+#endif
+            QCommonStyle::drawPrimitive(element, option, painter, widget);
+        } else {
+            const bool rightLine = option->state & State_Item;
+            const bool downLine = option->state & State_Sibling;
+            const bool upLine = option->state & (State_Open | State_Children | State_Item | State_Sibling);
+
+            QS60StyleEnums::SkinParts skinPart;
+            bool drawSkinPart = false;
+            if (rightLine && downLine && upLine) {
+                skinPart = QS60StyleEnums::SP_QgnIndiHlLineBranch;
+                drawSkinPart = true;
+            } else if (rightLine && upLine) {
+                skinPart = QS60StyleEnums::SP_QgnIndiHlLineEnd;
+                drawSkinPart = true;
+            } else if (upLine && downLine) {
+                skinPart = QS60StyleEnums::SP_QgnIndiHlLineStraight;
+                drawSkinPart = true;
+            }
+
+            if ( drawSkinPart )
+                QS60StylePrivate::drawSkinPart(skinPart, painter, option->rect, flags);
+
+            if (option->state & State_Children) {
+                QS60StyleEnums::SkinParts skinPart =
+                        (option->state & State_Open) ? QS60StyleEnums::SP_QgnIndiHlColSuper : QS60StyleEnums::SP_QgnIndiHlExpSuper;
+                int minDimension = qMin(option->rect.width(), option->rect.height());
+                const int resizeValue = minDimension >> 1;
+                minDimension += resizeValue; // Adjust the icon bigger because of empty space in svg icon.
+                QRect iconRect(option->rect.topLeft(), QSize(minDimension, minDimension));
+                int verticalMagic(0);
+                // magic values for positioning svg icon.
+                if (option->rect.width() <= option->rect.height())
+                    verticalMagic = 3;
+                iconRect.translate(3, verticalMagic - resizeValue);
+                QS60StylePrivate::drawSkinPart(skinPart, painter, iconRect, flags);
+            }
+        }
+        break;
+
+        // todo: items are below with #ifdefs "just in case". in final version, remove all non-required cases
+    case PE_FrameLineEdit:
+    case PE_IndicatorButtonDropDown:
+    case PE_IndicatorDockWidgetResizeHandle:
+    case PE_PanelTipLabel:
+    case PE_PanelScrollAreaCorner:
+
+#ifndef QT_NO_TABBAR
+    case PE_IndicatorTabTear: // No tab tear in S60
+#endif // QT_NO_TABBAR
+    case PE_FrameDefaultButton:
+#ifndef QT_NO_DOCKWIDGET
+    case PE_FrameDockWidget:
+#endif //QT_NO_DOCKWIDGET
+#ifndef QT_NO_PROGRESSBAR
+    case PE_IndicatorProgressChunk:
+#endif //QT_NO_PROGRESSBAR
+#ifndef QT_NO_TOOLBAR
+    case PE_PanelToolBar:
+#endif //QT_NO_TOOLBAR
+#ifndef QT_NO_COLUMNVIEW
+    case PE_IndicatorColumnViewArrow:
+    case PE_IndicatorItemViewItemDrop:
+#endif //QT_NO_COLUMNVIEW
+    case PE_FrameTabBarBase: // since tabs are in S60 always in navipane, let's use common style for tab base in Qt.
+    default:
+        QCommonStyle::drawPrimitive(element, option, painter, widget);
+    }
+}
+
+/*! \reimp */
+int QS60Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const
+{
+    int metricValue = QS60StylePrivate::pixelMetric(metric);
+    if (metricValue == KNotFound)
+        metricValue = QCommonStyle::pixelMetric(metric, option, widget);
+
+    if (metric == PM_SubMenuOverlap && widget){
+        const QMenu *menu = qobject_cast<const QMenu *>(widget);
+        if (menu && menu->activeAction() && menu->activeAction()->menu()) {
+            const int menuWidth = menu->activeAction()->menu()->sizeHint().width();
+            metricValue = -menuWidth;
+        }
+    }
+    return metricValue;
+}
+
+/*! \reimp */
+QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt,
+                                  const QSize &csz, const QWidget *widget) const
+{
+    QSize sz(csz);
+    switch (ct) {
+        case CT_PushButton:
+            sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget);
+            if (const QAbstractButton *buttonWidget = (qobject_cast<const QAbstractButton *>(widget)))
+                if (buttonWidget->isCheckable())
+                    sz += QSize(pixelMetric(PM_IndicatorWidth) + pixelMetric(PM_CheckBoxLabelSpacing), 0);
+            break;
+        case CT_LineEdit:
+            if (const QStyleOptionFrame *f = qstyleoption_cast<const QStyleOptionFrame *>(opt))
+                sz += QSize(2*f->lineWidth, 4*f->lineWidth);
+            break;
+        default:
+            sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget);
+            break;
+    }
+    return sz;
+}
+
+/*! \reimp */
+int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *widget,
+                            QStyleHintReturn *hret) const
+{
+    int retValue = -1;
+    switch (sh) {
+        case SH_Table_GridLineColor:
+            retValue = QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnLineColors,2,0).rgb();
+            break;
+        case SH_GroupBox_TextLabelColor:
+            retValue = QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors,6,0).rgb();
+            break;
+        case SH_ScrollBar_ScrollWhenPointerLeavesControl:
+            retValue = true;
+            break;
+        case SH_Slider_SnapToValue:
+            retValue = true;
+            break;
+        case SH_Slider_StopMouseOverSlider:
+            retValue = true;
+            break;
+        case SH_LineEdit_PasswordCharacter:
+            retValue = '*';
+            break;
+        case SH_ComboBox_PopupFrameStyle:
+            retValue = QFrame::NoFrame | QFrame::Plain;
+            break;
+        case SH_Dial_BackgroundRole:
+            retValue = QPalette::Base;
+            break;
+        case SH_ItemView_ActivateItemOnSingleClick:
+            retValue = true;
+            break;
+        case SH_ProgressDialog_TextLabelAlignment:
+            retValue = (QApplication::layoutDirection() == Qt::LeftToRight) ?
+                Qt::AlignLeft :
+                Qt::AlignRight;
+            break;
+        case SH_Menu_SubMenuPopupDelay:
+            retValue = 300;
+            break;
+        case SH_Menu_Scrollable:
+            retValue = true;
+            break;
+        case SH_Menu_SelectionWrap:
+            retValue = true;
+            break;
+        case SH_ItemView_ShowDecorationSelected:
+            retValue = true;
+            break;
+        case SH_ToolBar_Movable:
+            retValue = false;
+            break;
+        case SH_BlinkCursorWhenTextSelected:
+            retValue = true;
+            break;
+        case SH_UnderlineShortcut:
+            retValue = 0;
+            break;
+        default:
+            break;
+    }
+    if (retValue == -1)
+        retValue = QCommonStyle::styleHint(sh, opt, widget, hret);
+    return retValue;
+}
+
+/*! \reimp */
+QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComplex *option, SubControl scontrol, const QWidget *widget) const
+{
+    QRect ret;
+    switch (control) {
+#ifndef QT_NO_SCROLLBAR
+    // This implementation of subControlRect(CC_ScrollBar..) basically just removes the SC_ScrollBarSubLine and SC_ScrollBarAddLine
+    case CC_ScrollBar:
+        if (const QStyleOptionSlider *scrollbarOption = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
+            const QRect scrollBarRect = scrollbarOption->rect;
+            const bool isHorizontal = scrollbarOption->orientation == Qt::Horizontal;
+            const int maxlen = isHorizontal ? scrollBarRect.width() : scrollBarRect.height();
+            int sliderlen;
+
+            // calculate slider length
+            if (scrollbarOption->maximum != scrollbarOption->minimum) {
+                const uint range = scrollbarOption->maximum - scrollbarOption->minimum;
+                sliderlen = (qint64(scrollbarOption->pageStep) * maxlen) / (range + scrollbarOption->pageStep);
+
+                const int slidermin = pixelMetric(PM_ScrollBarSliderMin, scrollbarOption, widget);
+                if (sliderlen < slidermin || range > (INT_MAX>>1))
+                    sliderlen = slidermin;
+                if (sliderlen > maxlen)
+                    sliderlen = maxlen;
+            } else {
+                sliderlen = maxlen;
+            }
+
+            const int sliderstart = sliderPositionFromValue(scrollbarOption->minimum,
+                                                            scrollbarOption->maximum,
+                                                            scrollbarOption->sliderPosition,
+                                                            maxlen - sliderlen,
+                                                            scrollbarOption->upsideDown);
+
+            switch (scontrol) {
+                case SC_ScrollBarSubPage:            // between top/left button and slider
+                    if (isHorizontal)
+                        ret.setRect(0, 0, sliderstart, scrollBarRect.height());
+                    else
+                        ret.setRect(0, 0, scrollBarRect.width(), sliderstart);
+                    break;
+                case SC_ScrollBarAddPage: {         // between bottom/right button and slider
+                    const int addPageLength = sliderstart + sliderlen;
+                    if (isHorizontal)
+                        ret = scrollBarRect.adjusted(addPageLength, 0, 0, 0);
+                    else
+                        ret = scrollBarRect.adjusted(0, addPageLength, 0, 0);
+                    }
+                    break;
+                case SC_ScrollBarGroove:
+                    ret = scrollBarRect;
+                    break;
+                case SC_ScrollBarSlider:
+                    if (scrollbarOption->orientation == Qt::Horizontal)
+                        ret.setRect(sliderstart, 0, sliderlen, scrollBarRect.height());
+                    else
+                        ret.setRect(0, sliderstart, scrollBarRect.width(), sliderlen);
+                    break;
+                case SC_ScrollBarSubLine:            // top/left button
+                case SC_ScrollBarAddLine:            // bottom/right button
+                default:
+                    break;
+            }
+            ret = visualRect(scrollbarOption->direction, scrollBarRect, ret);
+        }
+        break;
+#endif // QT_NO_SCROLLBAR
+    case CC_SpinBox:
+        if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
+            const int frameThickness = spinbox->frame ? pixelMetric(PM_SpinBoxFrameWidth, spinbox, widget) : 0;
+            const int buttonMargin = spinbox->frame ? 2 : 0;
+            const int buttonWidth = QS60StylePrivate::pixelMetric(QStyle::PM_ButtonIconSize) + 2*buttonMargin;
+            QSize buttonSize;
+            buttonSize.setHeight(qMax(8, spinbox->rect.height() - frameThickness));
+            buttonSize.setWidth(buttonWidth);
+            buttonSize = buttonSize.expandedTo(QApplication::globalStrut());
+
+            const int y = frameThickness + spinbox->rect.y();
+            const int x = spinbox->rect.x() + spinbox->rect.width() - frameThickness - 2*buttonSize.width();
+
+            switch (scontrol) {
+                case SC_SpinBoxUp:
+                    if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons)
+                        return QRect();
+                    ret = QRect(x, y, buttonWidth, buttonSize.height());
+                    break;
+                case SC_SpinBoxDown:
+                    if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons)
+                        return QRect();
+                    ret = QRect(x+buttonSize.width(), y, buttonWidth, buttonSize.height());
+                    break;
+                case SC_SpinBoxEditField:
+                    if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons)
+                        ret = QRect(
+                                frameThickness,
+                                frameThickness,
+                                spinbox->rect.width() - 2*frameThickness,
+                                spinbox->rect.height() - 2*frameThickness);
+                    else
+                        ret = QRect(
+                                frameThickness,
+                                frameThickness,
+                                x - frameThickness,
+                                spinbox->rect.height() - 2*frameThickness);
+                    break;
+                case SC_SpinBoxFrame:
+                    ret = spinbox->rect;
+                    break;
+                default:
+                    break;
+            }
+        ret = visualRect(spinbox->direction, spinbox->rect, ret);
+        }
+        break;
+    case CC_ComboBox:
+        if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
+            ret = cmb->rect;
+            const int width = cmb->rect.width();
+            const int height = cmb->rect.height();
+            const int buttonMargin = cmb->frame ? 2 : 0;
+            // lets use spinbox frame here as well, as no combobox specific value available.
+            const int frameThickness = cmb->frame ? pixelMetric(PM_SpinBoxFrameWidth, cmb, widget) : 0;
+            const int buttonWidth = QS60StylePrivate::pixelMetric(QStyle::PM_ButtonIconSize);
+            const int xposMod = (cmb->rect.x()) + width - buttonMargin - buttonWidth;
+            const int ypos = cmb->rect.y();
+
+            QSize buttonSize;
+            buttonSize.setHeight(qMax(8, (cmb->rect.height()>>1) - frameThickness)); //minimum of 8 pixels
+            buttonSize.setWidth(buttonWidth+2*buttonMargin);
+            buttonSize = buttonSize.expandedTo(QApplication::globalStrut());
+            switch (scontrol) {
+                case SC_ComboBoxArrow:
+                    ret.setRect(xposMod, ypos + buttonMargin, buttonWidth, height - 2*buttonMargin);
+                    break;
+                case SC_ComboBoxEditField: {
+                    const int withFrameX = cmb->rect.x() + cmb->rect.width() - frameThickness - buttonSize.width();
+                    ret = QRect(
+                        frameThickness,
+                        frameThickness,
+                        withFrameX - frameThickness,
+                        cmb->rect.height() - 2*frameThickness);
+                    }
+                break;
+            default:
+                break;
+            }
+        }
+        break;
+    case CC_GroupBox:
+        if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
+            ret = QCommonStyle::subControlRect(control, option, scontrol, widget);
+            switch (scontrol) {
+                case SC_GroupBoxCheckBox: //fallthrough
+                case SC_GroupBoxLabel: {
+                    //slightly indent text and boxes, so that dialog border does not mess with them.
+                    const int horizontalSpacing =
+                        QS60StylePrivate::pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
+                    ret.adjust(2,horizontalSpacing-3,0,0);
+                    }
+                    break;
+                case SC_GroupBoxFrame: {
+                    const QRect textBox = subControlRect(control, option, SC_GroupBoxLabel, widget);
+                    const int tbHeight = textBox.height();
+                    ret.translate(0, -ret.y());
+                    // include title to within the groupBox frame
+                    ret.setHeight(ret.height()+tbHeight);
+                    if (widget && ret.bottom() > widget->rect().bottom())
+                        ret.setBottom(widget->rect().bottom());
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        break;
+    default:
+        ret = QCommonStyle::subControlRect(control, option, scontrol, widget);
+    }
+    return ret;
+}
+
+QRect QS60Style::subElementRect(SubElement element, const QStyleOption *opt, const QWidget *widget) const
+{
+    QRect ret;
+    switch (element) {
+        case SE_LineEditContents: {
+            // in S60 the input text box doesn't start from line Edit's TL, but
+            // a bit indented.
+                QRect lineEditRect = opt->rect;
+                const int adjustment = opt->rect.height()>>2;
+                lineEditRect.adjust(adjustment,0,0,0);
+                ret = lineEditRect;
+            }
+            break;
+        case SE_TabBarTearIndicator:
+            ret = QRect(0,0,0,0);
+            break;
+        case SE_TabWidgetTabBar:
+            if (const QStyleOptionTabWidgetFrame *optionTab = qstyleoption_cast<const QStyleOptionTabWidgetFrame *>(opt)) {
+                ret = QCommonStyle::subElementRect(element, opt, widget);
+
+                if (const QStyleOptionTabWidgetFrame *twf = qstyleoption_cast<const QStyleOptionTabWidgetFrame *>(opt)) {
+                    const int tabOverlapNoBorder =
+                        QS60StylePrivate::pixelMetric(QStyle::PM_TabBarTabOverlap);
+                    const int tabOverlap =
+                        tabOverlapNoBorder-QS60StylePrivate::pixelMetric(QStyle::PM_DefaultFrameWidth);
+                    const QTabWidget *tab = qobject_cast<const QTabWidget *>(widget);
+                    int gain = (tab) ? tabOverlap * tab->count() : 0;
+                    switch (twf->shape) {
+                        case QTabBar::RoundedNorth:
+                        case QTabBar::TriangularNorth:
+                        case QTabBar::RoundedSouth:
+                        case QTabBar::TriangularSouth: {
+                            if (widget) {
+                                // make sure that gain does not set the rect outside of widget boundaries
+                                if (twf->direction == Qt::RightToLeft) {
+                                    if ((ret.left() - gain) < widget->rect().left())
+                                        gain = widget->rect().left()-ret.left();
+                                    ret.adjust(-gain,0,0,0);
+                                } else {
+                                    if ((ret.right() + gain) > widget->rect().right())
+                                        gain = widget->rect().right()-ret.right();
+                                    ret.adjust(0,0,gain,0);
+                                    }
+                            }
+                            break;
+                        }
+                        default: {
+                            if (widget) {
+                                if ((ret.bottom() + gain) > widget->rect().bottom())
+                                    gain = widget->rect().bottom()-ret.bottom();
+                                ret.adjust(0,0,0,gain);
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+            break;
+        case SE_ItemViewItemText:
+        case SE_ItemViewItemDecoration:
+            if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+                const QListWidget *listItem = qobject_cast<const QListWidget *>(widget);
+                const bool multiSelection = !listItem ? false :
+                    listItem->selectionMode() == QAbstractItemView::MultiSelection ||
+                    listItem->selectionMode() == QAbstractItemView::ExtendedSelection ||
+                    listItem->selectionMode() == QAbstractItemView::ContiguousSelection;
+                ret = QCommonStyle::subElementRect(element, opt, widget);
+                // If both multiselect & check-state, then remove checkbox and move
+                // text and decoration towards the beginning
+                if (listItem &&
+                    multiSelection &&
+                    (vopt->features & QStyleOptionViewItemV2::HasCheckIndicator)) {
+                    const int verticalSpacing =
+                        QS60StylePrivate::pixelMetric(QStyle::PM_LayoutVerticalSpacing);
+                    //const int horizontalSpacing = QS60StylePrivate::pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
+                    const int checkBoxRectWidth = subElementRect(SE_ItemViewItemCheckIndicator, opt, widget).width();
+                    ret.adjust(-checkBoxRectWidth-verticalSpacing,0,-checkBoxRectWidth-verticalSpacing,0);
+                }
+            } else if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(opt)) {
+                const bool checkable = menuItem->checkType != QStyleOptionMenuItem::NotCheckable;
+                const int indicatorWidth = checkable ?
+                    pixelMetric(PM_ListViewIconSize, opt, widget) :
+                    pixelMetric(PM_SmallIconSize, opt, widget);
+                ret = menuItem->rect;
+
+                if (element == SE_ItemViewItemDecoration) {
+                    if (menuItem->direction == Qt::RightToLeft)
+                        ret.translate(ret.width()-indicatorWidth, 0);
+                    ret.setWidth(indicatorWidth);
+                } else {
+                    ret = menuItem->rect;
+                    if (!menuItem->icon.isNull())
+                        if (menuItem->direction == Qt::LeftToRight)
+                            ret.adjust(indicatorWidth, 0, 0, 0);
+                        else
+                            ret.adjust(0, 0, -indicatorWidth, 0);
+
+                    // Make room for submenu indicator
+                    if (menuItem->menuItemType == QStyleOptionMenuItem::SubMenu){
+                        // submenu indicator is very small, so lets halve the rect
+                        if (menuItem->direction == Qt::LeftToRight)
+                            ret.adjust(0,0,-(indicatorWidth >> 1),0);
+                        else
+                            ret.adjust((indicatorWidth >> 1),0,0,0);
+                    }
+                }
+            }
+            break;
+        case SE_ItemViewItemCheckIndicator:
+            if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+                const QListWidget *listItem = qobject_cast<const QListWidget *>(widget);
+
+                const bool singleSelection = listItem &&
+                    (listItem->selectionMode() == QAbstractItemView::SingleSelection ||
+                     listItem->selectionMode() == QAbstractItemView::NoSelection);
+                const bool checkBoxOnly = (vopt->features & QStyleOptionViewItemV2::HasCheckIndicator) &&
+                    listItem &&
+                    singleSelection;
+
+                // Selection check mark rect.
+                const int indicatorWidth = QS60StylePrivate::pixelMetric(QStyle::PM_IndicatorWidth);
+                const int indicatorHeight = QS60StylePrivate::pixelMetric(QStyle::PM_IndicatorHeight);
+                const int spacing = QS60StylePrivate::pixelMetric(QStyle::PM_CheckBoxLabelSpacing);
+
+                const int itemHeight = opt->rect.height();
+                int heightOffset = 0;
+                if (indicatorHeight < itemHeight)
+                    heightOffset = ((itemHeight - indicatorHeight)>>1);
+                if (checkBoxOnly) {
+                    // Move rect and make it slightly smaller, so that
+                    // a) highlight border does not cross the rect
+                    // b) in s60 list checkbox is smaller than normal checkbox
+                    //todo; magic three
+                    ret.setRect(opt->rect.left()+3, opt->rect.top() + heightOffset,
+                        indicatorWidth-3, indicatorHeight-3);
+                } else {
+                    ret.setRect(opt->rect.right() - indicatorWidth - spacing, opt->rect.top() + heightOffset,
+                        indicatorWidth, indicatorHeight);
+                }
+            } else  {
+                ret = QCommonStyle::subElementRect(element, opt, widget);
+            }
+            break;
+        case SE_HeaderLabel:
+            ret = QCommonStyle::subElementRect(element, opt, widget);
+            if (qstyleoption_cast<const QStyleOptionHeader *>(opt)) {
+                // Subtract area needed for line
+                if (opt->state & State_Horizontal)
+                    ret.setHeight(ret.height() - QS60StylePrivate::pixelMetric(PM_Custom_BoldLineWidth));
+                else
+                    ret.setWidth(ret.width() - QS60StylePrivate::pixelMetric(PM_Custom_ThinLineWidth));
+                }
+            ret = visualRect(opt->direction, opt->rect, ret);
+            break;
+        case SE_FrameContents:
+            if (QS60StylePrivate::isTouchSupported()) {
+                return QCommonStyle::subElementRect(element, opt, widget);
+            } else if (const QStyleOptionFrameV2 *f = qstyleoption_cast<const QStyleOptionFrameV2 *>(opt)) {
+                // We shrink the frame contents by focusFrameWidth, so that we can draw the frame around it in keypad navigation mode.
+                const int frameWidth = QS60StylePrivate::focusRectPenWidth();
+                ret = opt->rect.adjusted(frameWidth, frameWidth, -frameWidth, -frameWidth);
+                ret = visualRect(opt->direction, opt->rect, ret);
+            }
+            break;
+        default:
+            ret = QCommonStyle::subElementRect(element, opt, widget);
+    }
+    return ret;
+}
+
+void QS60Style::polish(QWidget *widget)
+{
+    Q_D(const QS60Style);
+    QCommonStyle::polish(widget);
+
+    if (!widget)
+        return;
+
+    if (false
+#ifndef QT_NO_SCROLLBAR
+        || qobject_cast<QScrollBar *>(widget)
+#endif
+        ) {
+        widget->setAttribute(Qt::WA_OpaquePaintEvent, false);
+    }
+
+    if (QS60StylePrivate::drawsOwnThemeBackground(widget)) {
+        widget->setAttribute(Qt::WA_StyledBackground);
+    } else if (false
+#ifndef QT_NO_MENU
+        || qobject_cast<const QMenu *> (widget)
+#endif // QT_NO_MENU
+    ) {
+        widget->setAttribute(Qt::WA_StyledBackground);
+    } else if (false
+#ifndef QT_NO_COMBOBOX
+        || qobject_cast<const QComboBoxListView *>(widget)
+#endif //QT_NO_COMBOBOX
+        ) {
+        widget->setAttribute(Qt::WA_StyledBackground);
+    }
+    d->setThemePalette(widget);
+    d->setFont(widget);
+}
+
+void QS60Style::unpolish(QWidget *widget)
+{
+    if (false
+    #ifndef QT_NO_SCROLLBAR
+        || qobject_cast<QScrollBar *>(widget)
+    #endif
+        )
+        widget->setAttribute(Qt::WA_OpaquePaintEvent);
+
+    if (QS60StylePrivate::drawsOwnThemeBackground(widget)) {
+        widget->setAttribute(Qt::WA_StyledBackground, false);
+    } else if (false
+#ifndef QT_NO_MENU
+        || qobject_cast<const QMenu *> (widget)
+#endif // QT_NO_MENU
+        ) {
+        widget->setAttribute(Qt::WA_StyledBackground, false);
+    } else if (false
+#ifndef QT_NO_COMBOBOX
+        || qobject_cast<const QComboBoxListView *>(widget)
+#endif //QT_NO_COMBOBOX
+        ) {
+        widget->setAttribute(Qt::WA_StyledBackground, false);
+    }
+
+    if (widget)
+        widget->setPalette(QPalette());
+
+    QCommonStyle::unpolish(widget);
+}
+
+void QS60Style::polish(QApplication *application)
+{
+    Q_D(QS60Style);
+    d->m_originalPalette = application->palette();
+    d->setThemePalette(application);
+}
+
+void QS60Style::unpolish(QApplication *application)
+{
+    Q_UNUSED(application)
+    Q_D(QS60Style);
+    const QPalette newPalette = QApplication::style()->standardPalette();
+    QApplication::setPalette(newPalette);
+    QApplicationPrivate::setSystemPalette(d->m_originalPalette);
+}
+
+void QS60Style::setStyleProperty(const char *name, const QVariant &value)
+{
+    Q_D(QS60Style);
+    d->setStyleProperty_specific(name, value);
+}
+
+QVariant QS60Style::styleProperty(const char *name) const
+{
+    Q_D(const QS60Style);
+    return d->styleProperty_specific(name);
+}
+
+QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon,
+    const QStyleOption *option, const QWidget *widget) const
+{
+    const int iconDimension = QS60StylePrivate::pixelMetric(QStyle::PM_ToolBarIconSize);
+    const QRect iconSize = (!option) ? QRect(0,0,iconDimension,iconDimension) : option->rect;
+    QS60StyleEnums::SkinParts part;
+    QS60StylePrivate::SkinElementFlags adjustedFlags;
+    if (option)
+        adjustedFlags = (option->state & State_Enabled) ?
+            QS60StylePrivate::SF_StateEnabled :
+            QS60StylePrivate::SF_StateDisabled;
+
+    switch(standardIcon) {
+        case QStyle::SP_MessageBoxWarning:
+            part = QS60StyleEnums::SP_QgnNoteWarning;
+            break;
+        case QStyle::SP_MessageBoxInformation:
+            part = QS60StyleEnums::SP_QgnNoteInfo;
+            break;
+        case QStyle::SP_MessageBoxCritical:
+            part = QS60StyleEnums::SP_QgnNoteError;
+            break;
+        case QStyle::SP_MessageBoxQuestion:
+            part = QS60StyleEnums::SP_QgnNoteQuery;
+            break;
+        case QStyle::SP_ArrowRight:
+            part = QS60StyleEnums::SP_QgnIndiNaviArrowRight;
+            break;
+        case QStyle::SP_ArrowLeft:
+            part = QS60StyleEnums::SP_QgnIndiNaviArrowLeft;
+            break;
+        case QStyle::SP_ArrowUp:
+            part = QS60StyleEnums::SP_QgnIndiNaviArrowLeft;
+            adjustedFlags |= QS60StylePrivate::SF_PointEast;
+            break;
+        case QStyle::SP_ArrowDown:
+            part = QS60StyleEnums::SP_QgnIndiNaviArrowLeft;
+            adjustedFlags |= QS60StylePrivate::SF_PointWest;
+            break;
+        case QStyle::SP_ArrowBack:
+            if (QApplication::layoutDirection() == Qt::RightToLeft)
+                return QS60Style::standardIcon(SP_ArrowRight, option, widget);
+            return QS60Style::standardIcon(SP_ArrowLeft, option, widget);
+        case QStyle::SP_ArrowForward:
+            if (QApplication::layoutDirection() == Qt::RightToLeft)
+                return QS60Style::standardIcon(SP_ArrowLeft, option, widget);
+            return QS60Style::standardIcon(SP_ArrowRight, option, widget);
+        case QStyle::SP_ComputerIcon:
+            part = QS60StyleEnums::SP_QgnPropPhoneMemcLarge;
+            break;
+        case QStyle::SP_DirClosedIcon:
+            part = QS60StyleEnums::SP_QgnPropFolderSmall;
+            break;
+        case QStyle::SP_DirOpenIcon:
+            part = QS60StyleEnums::SP_QgnPropFolderCurrent;
+            break;
+        case QStyle::SP_DirIcon:
+            part = QS60StyleEnums::SP_QgnPropFolderSmall;
+            break;
+        case QStyle::SP_FileDialogNewFolder:
+            part = QS60StyleEnums::SP_QgnPropFolderSmallNew;
+            break;
+        case QStyle::SP_FileIcon:
+            part = QS60StyleEnums::SP_QgnPropFileSmall;
+            break;
+        case QStyle::SP_TrashIcon:
+            part = QS60StyleEnums::SP_QgnNoteErased;
+            break;
+        case QStyle::SP_ToolBarHorizontalExtensionButton:
+            part = QS60StyleEnums::SP_QgnIndiSubMenu;
+            if (QApplication::layoutDirection() == Qt::RightToLeft)
+                adjustedFlags |= QS60StylePrivate::SF_PointSouth;
+            break;
+        case QStyle::SP_ToolBarVerticalExtensionButton:
+            adjustedFlags |= QS60StylePrivate::SF_PointEast;
+            part = QS60StyleEnums::SP_QgnIndiSubMenu;
+            break;
+
+        default:
+            return QCommonStyle::standardIconImplementation(standardIcon, option, widget);
+    }
+    const QS60StylePrivate::SkinElementFlags flags = adjustedFlags;
+    const QPixmap cachedPixMap(QS60StylePrivate::cachedPart(part, iconSize.size(), flags));
+    return cachedPixMap.isNull() ?
+        QCommonStyle::standardIconImplementation(standardIcon, option, widget) : QIcon(cachedPixMap);
+}
+
+extern QPoint qt_s60_fill_background_offset(const QWidget *targetWidget);
+
+bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QBrush &brush)
+{
+    const QPixmap backgroundTexture(QS60StylePrivate::backgroundTexture());
+    if (backgroundTexture.cacheKey() != brush.texture().cacheKey())
+        return false;
+
+    const QPaintDevice *target = painter->device();
+    if (target->devType() == QInternal::Widget) {
+        const QWidget *widget = static_cast<const QWidget *>(target);
+        const QVector<QRect> &rects = rgn.rects();
+        for (int i = 0; i < rects.size(); ++i) {
+            const QRect rect(rects.at(i));
+            painter->drawPixmap(rect.topLeft(), backgroundTexture,
+                                rect.translated(qt_s60_fill_background_offset(widget)));
+        }
+    }
+    return true;
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_STYLE_S60 || QT_PLUGIN
diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h
new file mode 100644
index 0000000000..d8e9a40147
--- /dev/null
+++ b/src/gui/styles/qs60style.h
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QS60STYLE_H
+#define QS60STYLE_H
+
+#include <QtGui/qcommonstyle.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+#if !defined(QT_NO_STYLE_S60)
+
+class QS60StylePrivate;
+
+class Q_GUI_EXPORT QS60Style : public QCommonStyle
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QS60Style)
+
+public:
+    QS60Style();
+    ~QS60Style();
+
+    void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = 0) const;
+    void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const;
+    void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const;
+    int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
+    QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w = 0) const;
+    int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0,
+                  QStyleHintReturn *shret = 0) const;
+    QRect subControlRect(ComplexControl control, const QStyleOptionComplex *option, SubControl scontrol, const QWidget *widget = 0) const;
+    QRect subElementRect(SubElement element, const QStyleOption *opt, const QWidget *widget = 0) const;
+    void polish(QWidget *widget);
+    void unpolish(QWidget *widget);
+    void polish(QApplication *application);
+    void unpolish(QApplication *application);
+
+    void setStyleProperty(const char *name, const QVariant &value);
+    QVariant styleProperty(const char *name) const;
+
+#ifndef Q_WS_S60
+    static QStringList partKeys();
+    static QStringList colorListKeys();
+    void setS60Theme(const QHash<QString, QPicture> &parts,
+        const QHash<QPair<QString , int>, QColor> &colors);
+    bool loadS60ThemeFromBlob(const QString &blobFile);
+    bool saveS60ThemeToBlob(const QString &blobFile) const;
+#endif // !Q_WS_S60
+
+#ifdef Q_WS_S60
+public Q_SLOTS:
+    void handleDynamicLayoutVariantSwitch();
+    void handleSkinChange();
+#endif // Q_WS_S60
+
+protected Q_SLOTS:
+    QIcon standardIconImplementation(
+            StandardPixmap standardIcon, const QStyleOption * option = 0, const QWidget * widget = 0 ) const;
+
+private:
+    Q_DISABLE_COPY(QS60Style)
+    friend class QStyleFactory;
+};
+
+#endif // QT_NO_STYLE_S60
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QS60STYLE_H
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
new file mode 100644
index 0000000000..72409784b3
--- /dev/null
+++ b/src/gui/styles/qs60style_p.h
@@ -0,0 +1,501 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QS60STYLE_P_H
+#define QS60STYLE_P_H
+
+#include "qs60style.h"
+#include "qcommonstyle_p.h"
+#include <QtCore/qhash.h>
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+QT_BEGIN_NAMESPACE
+
+const int MAX_NON_CUSTOM_PIXELMETRICS = 92;
+const int CUSTOMVALUESCOUNT = 4;
+enum {
+    PM_Custom_FrameCornerWidth = MAX_NON_CUSTOM_PIXELMETRICS,
+    PM_Custom_FrameCornerHeight,
+    PM_Custom_BoldLineWidth,
+    PM_Custom_ThinLineWidth
+    };
+const int MAX_PIXELMETRICS = MAX_NON_CUSTOM_PIXELMETRICS + CUSTOMVALUESCOUNT;
+
+typedef struct {
+    unsigned short height;
+    unsigned short width;
+    int major_version;
+    int minor_version;
+    bool mirroring; // TODO: (nice to have) Use Qt::LayoutDirection
+    QString layoutName;
+} layoutHeader;
+
+#ifdef Q_OS_SYMBIAN
+NONSHARABLE_CLASS (QS60StyleEnums)
+#else
+class QS60StyleEnums
+#endif
+: public QObject
+{
+#ifndef Q_WS_S60
+    Q_OBJECT
+    Q_ENUMS(FontCategories)
+    Q_ENUMS(SkinParts)
+    Q_ENUMS(ColorLists)
+#endif // !Q_WS_S60
+
+public:
+    // S60 look-and-feel font categories
+    enum FontCategories {
+        FC_Undefined,
+        FC_Primary,
+        FC_Secondary,
+        FC_Title,
+        FC_PrimarySmall,
+        FC_Digital
+    };
+
+    enum SkinParts {
+        SP_QgnGrafBarWait,
+        SP_QgnGrafBarFrameCenter,
+        SP_QgnGrafBarFrameSideL,
+        SP_QgnGrafBarFrameSideR,
+        SP_QgnGrafBarProgress,
+        SP_QgnGrafScrollArrowDown,
+        SP_QgnGrafScrollArrowLeft,
+        SP_QgnGrafScrollArrowRight,
+        SP_QgnGrafScrollArrowUp,
+        SP_QgnGrafTabActiveL,
+        SP_QgnGrafTabActiveM,
+        SP_QgnGrafTabActiveR,
+        SP_QgnGrafTabPassiveL,
+        SP_QgnGrafTabPassiveM,
+        SP_QgnGrafTabPassiveR,
+        SP_QgnIndiCheckboxOff,
+        SP_QgnIndiCheckboxOn,
+        SP_QgnIndiHlColSuper,     // Available in S60 release 3.2 and later.
+        SP_QgnIndiHlExpSuper,     // Available in S60 release 3.2 and later.
+        SP_QgnIndiHlLineBranch,   // Available in S60 release 3.2 and later.
+        SP_QgnIndiHlLineEnd,      // Available in S60 release 3.2 and later.
+        SP_QgnIndiHlLineStraight, // Available in S60 release 3.2 and later.
+        SP_QgnIndiMarkedAdd,
+        SP_QgnIndiNaviArrowLeft,
+        SP_QgnIndiNaviArrowRight,
+        SP_QgnIndiRadiobuttOff,
+        SP_QgnIndiRadiobuttOn,
+        SP_QgnIndiSliderEdit,
+        SP_QgnIndiSubMenu,
+        SP_QgnNoteErased,
+        SP_QgnNoteError,
+        SP_QgnNoteInfo,
+        SP_QgnNoteOk,
+        SP_QgnNoteQuery,
+        SP_QgnNoteWarning,
+        SP_QgnPropFileSmall,
+        SP_QgnPropFolderCurrent,
+        SP_QgnPropFolderSmall,
+        SP_QgnPropFolderSmallNew,
+        SP_QgnPropPhoneMemcLarge,
+        SP_QsnCpScrollHandleBottomPressed, //ScrollBar handle, pressed state
+        SP_QsnCpScrollHandleMiddlePressed,
+        SP_QsnCpScrollHandleTopPressed,
+        SP_QsnBgScreen,
+        SP_QsnCpScrollBgBottom,
+        SP_QsnCpScrollBgMiddle,
+        SP_QsnCpScrollBgTop,
+        SP_QsnCpScrollHandleBottom,
+        SP_QsnCpScrollHandleMiddle,
+        SP_QsnCpScrollHandleTop,
+        SP_QsnFrButtonTbCornerTl,           // Button, normal state
+        SP_QsnFrButtonTbCornerTr,
+        SP_QsnFrButtonTbCornerBl,
+        SP_QsnFrButtonTbCornerBr,
+        SP_QsnFrButtonTbSideT,
+        SP_QsnFrButtonTbSideB,
+        SP_QsnFrButtonTbSideL,
+        SP_QsnFrButtonTbSideR,
+        SP_QsnFrButtonTbCenter,
+        SP_QsnFrButtonTbCornerTlPressed,    // Button, pressed state
+        SP_QsnFrButtonTbCornerTrPressed,
+        SP_QsnFrButtonTbCornerBlPressed,
+        SP_QsnFrButtonTbCornerBrPressed,
+        SP_QsnFrButtonTbSideTPressed,
+        SP_QsnFrButtonTbSideBPressed,
+        SP_QsnFrButtonTbSideLPressed,
+        SP_QsnFrButtonTbSideRPressed,
+        SP_QsnFrButtonTbCenterPressed,
+        SP_QsnFrCaleCornerTl,               // calendar grid item
+        SP_QsnFrCaleCornerTr,
+        SP_QsnFrCaleCornerBl,
+        SP_QsnFrCaleCornerBr,
+        SP_QsnFrCaleGSideT,
+        SP_QsnFrCaleGSideB,
+        SP_QsnFrCaleGSideL,
+        SP_QsnFrCaleGSideR,
+        SP_QsnFrCaleCenter,
+        SP_QsnFrCaleHeadingCornerTl,        // calendar grid header
+        SP_QsnFrCaleHeadingCornerTr,
+        SP_QsnFrCaleHeadingCornerBl,
+        SP_QsnFrCaleHeadingCornerBr,
+        SP_QsnFrCaleHeadingSideT,
+        SP_QsnFrCaleHeadingSideB,
+        SP_QsnFrCaleHeadingSideL,
+        SP_QsnFrCaleHeadingSideR,
+        SP_QsnFrCaleHeadingCenter,
+        SP_QsnFrInputCornerTl,              // Text input field
+        SP_QsnFrInputCornerTr,
+        SP_QsnFrInputCornerBl,
+        SP_QsnFrInputCornerBr,
+        SP_QsnFrInputSideT,
+        SP_QsnFrInputSideB,
+        SP_QsnFrInputSideL,
+        SP_QsnFrInputSideR,
+        SP_QsnFrInputCenter,
+        SP_QsnFrListCornerTl,               // List background
+        SP_QsnFrListCornerTr,
+        SP_QsnFrListCornerBl,
+        SP_QsnFrListCornerBr,
+        SP_QsnFrListSideT,
+        SP_QsnFrListSideB,
+        SP_QsnFrListSideL,
+        SP_QsnFrListSideR,
+        SP_QsnFrListCenter,
+        SP_QsnFrPopupCornerTl,              // Option menu background
+        SP_QsnFrPopupCornerTr,
+        SP_QsnFrPopupCornerBl,
+        SP_QsnFrPopupCornerBr,
+        SP_QsnFrPopupSideT,
+        SP_QsnFrPopupSideB,
+        SP_QsnFrPopupSideL,
+        SP_QsnFrPopupSideR,
+        SP_QsnFrPopupCenter,
+        SP_QsnFrPopupPreviewCornerTl,       // tool tip background
+        SP_QsnFrPopupPreviewCornerTr,
+        SP_QsnFrPopupPreviewCornerBl,
+        SP_QsnFrPopupPreviewCornerBr,
+        SP_QsnFrPopupPreviewSideT,
+        SP_QsnFrPopupPreviewSideB,
+        SP_QsnFrPopupPreviewSideL,
+        SP_QsnFrPopupPreviewSideR,
+        SP_QsnFrPopupPreviewCenter,
+        SP_QsnFrSetOptCornerTl,             // Settings list
+        SP_QsnFrSetOptCornerTr,
+        SP_QsnFrSetOptCornerBl,
+        SP_QsnFrSetOptCornerBr,
+        SP_QsnFrSetOptSideT,
+        SP_QsnFrSetOptSideB,
+        SP_QsnFrSetOptSideL,
+        SP_QsnFrSetOptSideR,
+        SP_QsnFrSetOptCenter,
+        SP_QsnFrPopupSubCornerTl,           // Toolbar background
+        SP_QsnFrPopupSubCornerTr,
+        SP_QsnFrPopupSubCornerBl,
+        SP_QsnFrPopupSubCornerBr,
+        SP_QsnFrPopupSubSideT,
+        SP_QsnFrPopupSubSideB,
+        SP_QsnFrPopupSubSideL,
+        SP_QsnFrPopupSubSideR,
+        SP_QsnFrPopupSubCenter,
+        SP_QsnFrSctrlButtonCornerTl,        // Toolbar button
+        SP_QsnFrSctrlButtonCornerTr,
+        SP_QsnFrSctrlButtonCornerBl,
+        SP_QsnFrSctrlButtonCornerBr,
+        SP_QsnFrSctrlButtonSideT,
+        SP_QsnFrSctrlButtonSideB,
+        SP_QsnFrSctrlButtonSideL,
+        SP_QsnFrSctrlButtonSideR,
+        SP_QsnFrSctrlButtonCenter,
+        SP_QsnFrSctrlButtonCornerTlPressed,    // Toolbar button, pressed
+        SP_QsnFrSctrlButtonCornerTrPressed,
+        SP_QsnFrSctrlButtonCornerBlPressed,
+        SP_QsnFrSctrlButtonCornerBrPressed,
+        SP_QsnFrSctrlButtonSideTPressed,
+        SP_QsnFrSctrlButtonSideBPressed,
+        SP_QsnFrSctrlButtonSideLPressed,
+        SP_QsnFrSctrlButtonSideRPressed,
+        SP_QsnFrSctrlButtonCenterPressed,
+        SP_QsnFrButtonCornerTlInactive,     // Inactive button
+        SP_QsnFrButtonCornerTrInactive,
+        SP_QsnFrButtonCornerBlInactive,
+        SP_QsnFrButtonCornerBrInactive,
+        SP_QsnFrButtonSideTInactive,
+        SP_QsnFrButtonSideBInactive,
+        SP_QsnFrButtonSideLInactive,
+        SP_QsnFrButtonSideRInactive,
+        SP_QsnFrButtonCenterInactive,        
+        SP_QsnFrNotepadCornerTl,
+        SP_QsnFrNotepadCornerTr,
+        SP_QsnFrNotepadCornerBl,
+        SP_QsnFrNotepadCornerBr,
+        SP_QsnFrNotepadSideT,
+        SP_QsnFrNotepadSideB,
+        SP_QsnFrNotepadSideL,
+        SP_QsnFrNotepadSideR,
+        SP_QsnFrNotepadCenter
+    };
+
+    enum ColorLists {
+        CL_QsnHighlightColors,
+        CL_QsnIconColors,
+        CL_QsnLineColors,
+        CL_QsnOtherColors,
+        CL_QsnParentColors,
+        CL_QsnTextColors
+    };
+};
+
+// Private class
+#ifdef Q_OS_SYMBIAN
+NONSHARABLE_CLASS (QS60StylePrivate)
+#else
+class QS60StylePrivate
+#endif
+: public QCommonStylePrivate
+{
+    Q_DECLARE_PUBLIC(QS60Style)
+
+public:
+    QS60StylePrivate();
+    ~QS60StylePrivate();
+
+    enum SkinElements {
+        SE_ButtonNormal,
+        SE_ButtonPressed,
+        SE_FrameLineEdit,
+        SE_ProgressBarGrooveHorizontal,
+        SE_ProgressBarIndicatorHorizontal,
+        SE_ProgressBarGrooveVertical,
+        SE_ProgressBarIndicatorVertical,
+        SE_ScrollBarGrooveHorizontal,
+        SE_ScrollBarGrooveVertical,
+        SE_ScrollBarHandleHorizontal,
+        SE_ScrollBarHandleVertical,
+        SE_SliderHandleHorizontal,
+        SE_SliderHandleVertical,
+        SE_TabBarTabEastActive,
+        SE_TabBarTabEastInactive,
+        SE_TabBarTabNorthActive,
+        SE_TabBarTabNorthInactive,
+        SE_TabBarTabSouthActive,
+        SE_TabBarTabSouthInactive,
+        SE_TabBarTabWestActive,
+        SE_TabBarTabWestInactive,
+        SE_ListHighlight,
+        SE_OptionsMenu,
+        SE_SettingsList,
+        SE_TableItem,
+        SE_TableHeaderItem,
+        SE_ToolTip, //own graphic available on 3.2+ releases,
+        SE_ToolBar,
+        SE_ToolBarButton,
+        SE_ToolBarButtonPressed,
+        SE_PanelBackground,
+        SE_ScrollBarHandlePressedHorizontal, //only for 5.0+
+        SE_ScrollBarHandlePressedVertical,
+        SE_ButtonInactive,
+        SE_Editor,
+    };
+
+    enum SkinFrameElements {
+        SF_ButtonNormal,
+        SF_ButtonPressed,
+        SF_FrameLineEdit,
+        SF_ListHighlight,
+        SF_OptionsMenu,
+        SF_SettingsList,
+        SF_TableItem,
+        SF_TableHeaderItem,
+        SF_ToolTip,
+        SF_ToolBar,
+        SF_ToolBarButton,
+        SF_ToolBarButtonPressed,
+        SF_PanelBackground,
+        SF_ButtonInactive,
+        SF_Editor,
+    };
+
+    enum SkinElementFlag {
+        SF_PointNorth =       0x0001, // North = the default
+        SF_PointEast =        0x0002,
+        SF_PointSouth =       0x0004,
+        SF_PointWest =        0x0008,
+
+        SF_StateEnabled =     0x0010, // Enabled = the default
+        SF_StateDisabled =    0x0020,
+        SF_ColorSkinned =     0x0040,
+    };
+
+    enum CacheClearReason {
+        CC_UndefinedChange = 0,
+        CC_LayoutChange,
+        CC_ThemeChange
+    };
+
+    Q_DECLARE_FLAGS(SkinElementFlags, SkinElementFlag)
+
+    // draws skin element
+    static void drawSkinElement(SkinElements element, QPainter *painter,
+        const QRect &rect, SkinElementFlags flags = KDefaultSkinElementFlags);
+    // draws a specific skin part
+    static void drawSkinPart(QS60StyleEnums::SkinParts part, QPainter *painter,
+        const QRect &rect, SkinElementFlags flags = KDefaultSkinElementFlags);
+    // sets style property
+    void setStyleProperty(const char *name, const QVariant &value);
+    // sets specific style property
+    void setStyleProperty_specific(const char *name, const QVariant &value);
+    // gets style property
+    QVariant styleProperty(const char *name) const;
+    // gets specific style property
+    QVariant styleProperty_specific(const char *name) const;
+    // gets pixel metrics value
+    static short pixelMetric(int metric);
+    // gets color. 'index' is NOT 0-based.
+    // It corresponds to the enum key 1-based numbers of TAknsQsnXYZColorsIndex, not the values.
+    static QColor s60Color(QS60StyleEnums::ColorLists list,
+        int index, const QStyleOption *option);
+    // gets state specific color
+    static QColor stateColor(const QColor &color, const QStyleOption *option);
+    // gets lighter color than base color
+    static QColor lighterColor(const QColor &baseColor);
+    //deduces if the given widget should have separately themeable background
+    static bool drawsOwnThemeBackground(const QWidget *widget);
+
+    QFont s60Font(QS60StyleEnums::FontCategories fontCategory,
+        int pointSize = -1) const;
+    // clears all style caches (fonts, colors, pixmaps)
+    void clearCaches(CacheClearReason reason = CC_UndefinedChange);
+
+    // themed main background oprations
+    void setBackgroundTexture(QApplication *application) const;
+    static void deleteBackground();
+
+    static bool isTouchSupported();
+    static bool isToolBarBackground();
+
+    // calculates average color based on button skin graphics (minus borders).
+    QColor colorFromFrameGraphics(SkinFrameElements frame) const;
+
+    //set theme palette for application
+    void setThemePalette(QApplication *application) const;
+    //set theme palette for style option
+    void setThemePalette(QStyleOption *option) const;
+    //access to theme palette
+    static QPalette* themePalette();
+
+    static int focusRectPenWidth();
+
+    static const layoutHeader m_layoutHeaders[];
+    static const short data[][MAX_PIXELMETRICS];
+
+    void setCurrentLayout(int layoutIndex);
+    void setActiveLayout();
+    // Pointer
+    static short const *m_pmPointer;
+    // number of layouts supported by the style
+    static const int m_numberOfLayouts;
+
+    mutable QHash<QPair<QS60StyleEnums::FontCategories , int>, QFont> m_mappedFontsCache;
+    mutable QHash<SkinFrameElements, QColor> m_colorCache;
+
+    // Has one entry per SkinFrameElements
+    static const struct frameElementCenter {
+        SkinElements element;
+        QS60StyleEnums::SkinParts center;
+    } m_frameElementsData[];
+
+    static QPixmap frame(SkinFrameElements frame, const QSize &size,
+        SkinElementFlags flags = KDefaultSkinElementFlags);
+    static QPixmap backgroundTexture();
+
+private:
+    static void drawPart(QS60StyleEnums::SkinParts part, QPainter *painter,
+        const QRect &rect, SkinElementFlags flags = KDefaultSkinElementFlags);
+    static void drawRow(QS60StyleEnums::SkinParts start, QS60StyleEnums::SkinParts middle,
+        QS60StyleEnums::SkinParts end, Qt::Orientation orientation, QPainter *painter,
+        const QRect &rect, SkinElementFlags flags = KDefaultSkinElementFlags);
+    static void drawFrame(SkinFrameElements frame, QPainter *painter,
+        const QRect &rect, SkinElementFlags flags = KDefaultSkinElementFlags);
+
+    static QPixmap cachedPart(QS60StyleEnums::SkinParts part, const QSize &size,
+        SkinElementFlags flags = KDefaultSkinElementFlags);
+    static QPixmap cachedFrame(SkinFrameElements frame, const QSize &size,
+        SkinElementFlags flags = KDefaultSkinElementFlags);
+
+    static void refreshUI();
+
+    // set S60 font for widget
+    void setFont(QWidget *widget) const;
+    void setThemePalette(QWidget *widget) const;
+    void setThemePalette(QPalette *palette) const;
+    void setThemePaletteHash(QPalette *palette) const;
+    static void storeThemePalette(QPalette *palette);
+    static void deleteThemePalette();
+
+    static QSize partSize(QS60StyleEnums::SkinParts part,
+        SkinElementFlags flags = KDefaultSkinElementFlags);
+    static QPixmap part(QS60StyleEnums::SkinParts part, const QSize &size,
+        SkinElementFlags flags = KDefaultSkinElementFlags);
+
+    static QFont s60Font_specific(QS60StyleEnums::FontCategories fontCategory, int pointSize);
+
+    static QSize screenSize();
+
+    // Contains background texture.
+    static QPixmap *m_background;
+    const static SkinElementFlags KDefaultSkinElementFlags;
+    // defined theme palette
+    static QPalette *m_themePalette;
+    QPalette m_originalPalette;
+};
+
+QT_END_NAMESPACE
+
+#endif // QS60STYLE_P_H
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
new file mode 100644
index 0000000000..63346da95b
--- /dev/null
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -0,0 +1,1372 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qs60style.h"
+#include "qs60style_p.h"
+#include "qpainter.h"
+#include "qstyleoption.h"
+#include "qstyle.h"
+#include "private/qwindowsurface_s60_p.h"
+#include "private/qt_s60_p.h"
+#include "private/qcore_symbian_p.h"
+#include "qapplication.h"
+
+#include <w32std.h>
+#include <aknsconstants.h>
+#include <aknconsts.h>
+#include <aknsitemid.h>
+#include <aknsutils.h>
+#include <aknsdrawutils.h>
+#include <aknsskininstance.h>
+#include <aknsbasicbackgroundcontrolcontext.h>
+#include <avkon.mbg>
+#include <AknFontAccess.h>
+#include <AknLayoutFont.h>
+#include <aknutils.h>
+
+#if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN)
+
+QT_BEGIN_NAMESPACE
+
+enum TDrawType {
+    EDrawIcon,
+    EDrawBackground,
+    ENoDraw
+};
+
+enum TSupportRelease {
+    ES60_None     = 0x0000, //indicates that the commonstyle should draw the graphics
+    ES60_3_1      = 0x0001,
+    ES60_3_2      = 0x0002,
+    ES60_5_0      = 0x0004,
+    ES60_5_1      = 0x0008,
+    ES60_5_2      = 0x0010,
+    // Add all new releases here
+    ES60_AllReleases = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2 
+};
+
+typedef struct {
+    const TAknsItemID &skinID;
+    TDrawType drawType;
+    int supportInfo;
+    int newMajorSkinId;
+    int newMinorSkinId;
+} partMapEntry;
+
+class QS60StyleModeSpecifics
+{
+public:
+    static QPixmap skinnedGraphics(QS60StyleEnums::SkinParts stylepart,
+        const QSize &size, QS60StylePrivate::SkinElementFlags flags);
+    static QPixmap skinnedGraphics(QS60StylePrivate::SkinFrameElements frameElement, const QSize &size, QS60StylePrivate::SkinElementFlags flags);
+    static QPixmap colorSkinnedGraphics(const QS60StyleEnums::SkinParts &stylepart,
+        const QSize &size, QS60StylePrivate::SkinElementFlags flags);
+    static QColor colorValue(const TAknsItemID &colorGroup, int colorIndex);
+    static QPixmap fromFbsBitmap(CFbsBitmap *icon, CFbsBitmap *mask, QS60StylePrivate::SkinElementFlags flags, QImage::Format format);
+    static bool disabledPartGraphic(QS60StyleEnums::SkinParts &part);
+    static bool disabledFrameGraphic(QS60StylePrivate::SkinFrameElements &frame);
+    static QPixmap generateMissingThemeGraphic(QS60StyleEnums::SkinParts &part, const QSize &size, QS60StylePrivate::SkinElementFlags flags);
+
+private:
+    static QPixmap createSkinnedGraphicsL(QS60StyleEnums::SkinParts part,
+        const QSize &size, QS60StylePrivate::SkinElementFlags flags);
+    static QPixmap createSkinnedGraphicsL(QS60StylePrivate::SkinFrameElements frameElement, const QSize &size, QS60StylePrivate::SkinElementFlags flags);
+    static QPixmap colorSkinnedGraphicsL(const QS60StyleEnums::SkinParts &stylepart,
+        const QSize &size, QS60StylePrivate::SkinElementFlags flags);
+    static void frameIdAndCenterId(QS60StylePrivate::SkinFrameElements frameElement, TAknsItemID &frameId, TAknsItemID &centerId);
+    static TRect innerRectFromElement(QS60StylePrivate::SkinFrameElements frameElement, const TRect &outerRect);
+    static void checkAndUnCompressBitmapL(CFbsBitmap*& aOriginalBitmap);
+    static void checkAndUnCompressBitmap(CFbsBitmap*& aOriginalBitmap);
+    static void unCompressBitmapL(const TRect& aTrgRect, CFbsBitmap* aTrgBitmap, CFbsBitmap* aSrcBitmap);
+    static void colorGroupAndIndex(QS60StyleEnums::SkinParts skinID,
+        TAknsItemID &colorGroup, int colorIndex);
+    static void fallbackInfo(const QS60StyleEnums::SkinParts &stylepart, TDes& fallbackFileName, TInt& fallbackIndex);
+    static bool checkSupport(const int supportedRelease);
+    static TAknsItemID checkAndUpdateReleaseSpecificGraphics(int part);
+    // Array to match the skin ID, fallback graphics and Qt widget graphics.
+    static const partMapEntry m_partMap[];
+};
+
+const partMapEntry QS60StyleModeSpecifics::m_partMap[] = {
+    /* SP_QgnGrafBarWait */             {KAknsIIDQgnGrafBarWaitAnim,            EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafBarFrameCenter */      {KAknsIIDQgnGrafBarFrameCenter,         EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafBarFrameSideL */       {KAknsIIDQgnGrafBarFrameSideL,          EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafBarFrameSideR */       {KAknsIIDQgnGrafBarFrameSideR,          EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafBarProgress */         {KAknsIIDQgnGrafBarProgress,            EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafScrollArrowDown */     {KAknsIIDQgnGrafScrollArrowDown,        EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafScrollArrowLeft */     {KAknsIIDQgnGrafScrollArrowLeft,        EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafScrollArrowRight */    {KAknsIIDQgnGrafScrollArrowRight,       EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafScrollArrowUp */       {KAknsIIDQgnGrafScrollArrowUp,          EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafTabActiveL */          {KAknsIIDQgnGrafTabActiveL,             EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafTabActiveM */          {KAknsIIDQgnGrafTabActiveM,             EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafTabActiveR */          {KAknsIIDQgnGrafTabActiveR,             EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafTabPassiveL */         {KAknsIIDQgnGrafTabPassiveL,            EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafTabPassiveM */         {KAknsIIDQgnGrafTabPassiveM,            EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnGrafTabPassiveR */         {KAknsIIDQgnGrafTabPassiveR,            EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnIndiCheckboxOff */         {KAknsIIDQgnIndiCheckboxOff,            EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnIndiCheckboxOn */          {KAknsIIDQgnIndiCheckboxOn,             EDrawIcon,   ES60_AllReleases,    -1,-1},
+    // Following 5 items (SP_QgnIndiHlColSuper - SP_QgnIndiHlLineStraight) are available starting from S60 release 3.2.
+    // In 3.1 CommonStyle drawing is used for these QTreeView elements, since no similar icons in AVKON UI.
+    /* SP_QgnIndiHlColSuper */          {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,            EAknsMajorGeneric, 0x17d5 /* KAknsIIDQgnIndiHlColSuper */},
+    /* SP_QgnIndiHlExpSuper */          {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,            EAknsMajorGeneric, 0x17d6 /* KAknsIIDQgnIndiHlExpSuper */},
+    /* SP_QgnIndiHlLineBranch */        {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,            EAknsMajorGeneric, 0x17d7 /* KAknsIIDQgnIndiHlLineBranch */},
+    /* SP_QgnIndiHlLineEnd */           {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,            EAknsMajorGeneric, 0x17d8 /* KAknsIIDQgnIndiHlLineEnd */},
+    /* SP_QgnIndiHlLineStraight */      {KAknsIIDNone,                          EDrawIcon,   ES60_3_1,            EAknsMajorGeneric, 0x17d9 /* KAknsIIDQgnIndiHlLineStraight */},
+    /* SP_QgnIndiMarkedAdd */           {KAknsIIDQgnIndiMarkedAdd,              EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnIndiNaviArrowLeft */       {KAknsIIDQgnGrafScrollArrowLeft,        EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnIndiNaviArrowRight */      {KAknsIIDQgnGrafScrollArrowRight,       EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnIndiRadiobuttOff */        {KAknsIIDQgnIndiRadiobuttOff,           EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnIndiRadiobuttOn */         {KAknsIIDQgnIndiRadiobuttOn,            EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnIndiSliderEdit */          {KAknsIIDQgnIndiSliderEdit,             EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnIndiSubMenu */             {KAknsIIDQgnIndiSubmenu,                EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnNoteErased */              {KAknsIIDQgnNoteErased,                 EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnNoteError */               {KAknsIIDQgnNoteError,                  EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnNoteInfo */                {KAknsIIDQgnNoteInfo,                   EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnNoteOk */                  {KAknsIIDQgnNoteOk,                     EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnNoteQuery */               {KAknsIIDQgnNoteQuery,                  EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnNoteWarning */             {KAknsIIDQgnNoteWarning,                EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnPropFileSmall */           {KAknsIIDQgnPropFileSmall,              EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnPropFolderCurrent */       {KAknsIIDQgnPropFolderCurrent,          EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnPropFolderSmall */         {KAknsIIDQgnPropFolderSmall,            EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnPropFolderSmallNew */      {KAknsIIDQgnPropFolderSmallNew,         EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QgnPropPhoneMemcLarge */      {KAknsIIDQgnPropPhoneMemcLarge,         EDrawIcon,   ES60_AllReleases,    -1,-1},
+
+    // 3.1 & 3.2 do not have pressed state for scrollbar, so use normal scrollbar graphics instead.
+    /* SP_QsnCpScrollHandleBottomPressed*/ {KAknsIIDQsnCpScrollHandleBottom,    EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorGeneric, 0x20f8}, /*KAknsIIDQsnCpScrollHandleBottomPressed*/
+    /* SP_QsnCpScrollHandleMiddlePressed*/ {KAknsIIDQsnCpScrollHandleMiddle,    EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorGeneric, 0x20f9}, /*KAknsIIDQsnCpScrollHandleMiddlePressed*/
+    /* SP_QsnCpScrollHandleTopPressed*/    {KAknsIIDQsnCpScrollHandleTop,       EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorGeneric, 0x20fa}, /*KAknsIIDQsnCpScrollHandleTopPressed*/
+
+    /* SP_QsnBgScreen */                {KAknsIIDQsnBgScreen,              EDrawBackground,  ES60_AllReleases,    -1,-1},
+
+    /* SP_QsnCpScrollBgBottom */        {KAknsIIDQsnCpScrollBgBottom,           EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QsnCpScrollBgMiddle */        {KAknsIIDQsnCpScrollBgMiddle,           EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QsnCpScrollBgTop */           {KAknsIIDQsnCpScrollBgTop,              EDrawIcon,   ES60_AllReleases,    -1,-1},
+
+    /* SP_QsnCpScrollHandleBottom */    {KAknsIIDQsnCpScrollHandleBottom,       EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QsnCpScrollHandleMiddle */    {KAknsIIDQsnCpScrollHandleMiddle,       EDrawIcon,   ES60_AllReleases,    -1,-1},
+    /* SP_QsnCpScrollHandleTop */       {KAknsIIDQsnCpScrollHandleTop,          EDrawIcon,   ES60_AllReleases,    -1,-1},
+
+    /* SP_QsnFrButtonTbCornerTl */      {KAknsIIDQsnFrButtonTbCornerTl,         ENoDraw,     ES60_AllReleases,    -1,-1}, //todo: use "normal button" from 5.0 onwards
+    /* SP_QsnFrButtonTbCornerTr */      {KAknsIIDQsnFrButtonTbCornerTr,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbCornerBl */      {KAknsIIDQsnFrButtonTbCornerBl,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbCornerBr */      {KAknsIIDQsnFrButtonTbCornerBr,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbSideT */         {KAknsIIDQsnFrButtonTbSideT,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbSideB */         {KAknsIIDQsnFrButtonTbSideB,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbSideL */         {KAknsIIDQsnFrButtonTbSideL,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbSideR */         {KAknsIIDQsnFrButtonTbSideR,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbCenter */        {KAknsIIDQsnFrButtonTbCenter,           EDrawIcon,   ES60_AllReleases,    -1,-1},
+
+    /* SP_QsnFrButtonTbCornerTlPressed */{KAknsIIDQsnFrButtonTbCornerTlPressed, ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbCornerTrPressed */{KAknsIIDQsnFrButtonTbCornerTrPressed, ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbCornerBlPressed */{KAknsIIDQsnFrButtonTbCornerBlPressed, ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbCornerBrPressed */{KAknsIIDQsnFrButtonTbCornerBrPressed, ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbSideTPressed */   {KAknsIIDQsnFrButtonTbSideTPressed,    ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbSideBPressed */   {KAknsIIDQsnFrButtonTbSideBPressed,    ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbSideLPressed */   {KAknsIIDQsnFrButtonTbSideLPressed,    ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbSideRPressed */   {KAknsIIDQsnFrButtonTbSideRPressed,    ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrButtonTbCenterPressed */  {KAknsIIDQsnFrButtonTbCenterPressed,   EDrawIcon,   ES60_AllReleases,    -1,-1},
+
+    /* SP_QsnFrCaleCornerTl */          {KAknsIIDQsnFrCaleCornerTl,             ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleCornerTr */          {KAknsIIDQsnFrCaleCornerTr,             ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleCornerBl */          {KAknsIIDQsnFrCaleCornerBl,             ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleCornerBr */          {KAknsIIDQsnFrCaleCornerBr,             ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleGSideT */            {KAknsIIDQsnFrCaleSideT,                ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleGSideB */            {KAknsIIDQsnFrCaleSideB,                ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleGSideL */            {KAknsIIDQsnFrCaleSideL,                ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleGSideR */            {KAknsIIDQsnFrCaleSideR,                ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleCenter */            {KAknsIIDQsnFrCaleCenter,               ENoDraw,     ES60_AllReleases,    -1,-1},
+
+    /* SP_QsnFrCaleHeadingCornerTl */   {KAknsIIDQsnFrCaleHeadingCornerTl,      ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleHeadingCornerTr */   {KAknsIIDQsnFrCaleHeadingCornerTr,      ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleHeadingCornerBl */   {KAknsIIDQsnFrCaleHeadingCornerBl,      ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleHeadingCornerBr */   {KAknsIIDQsnFrCaleHeadingCornerBr,      ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleHeadingSideT */      {KAknsIIDQsnFrCaleHeadingSideT,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleHeadingSideB */      {KAknsIIDQsnFrCaleHeadingSideB,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleHeadingSideL */      {KAknsIIDQsnFrCaleHeadingSideL,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleHeadingSideR */      {KAknsIIDQsnFrCaleHeadingSideR,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrCaleHeadingCenter */     {KAknsIIDQsnFrCaleHeadingCenter,        ENoDraw,     ES60_AllReleases,    -1,-1},
+
+    /* SP_QsnFrInputCornerTl */         {KAknsIIDQsnFrInputCornerTl,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrInputCornerTr */         {KAknsIIDQsnFrInputCornerTr,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrInputCornerBl */         {KAknsIIDQsnFrInputCornerBl,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrInputCornerBr */         {KAknsIIDQsnFrInputCornerBr,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrInputSideT */            {KAknsIIDQsnFrInputSideT,               ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrInputSideB */            {KAknsIIDQsnFrInputSideB,               ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrInputSideL */            {KAknsIIDQsnFrInputSideL,               ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrInputSideR */            {KAknsIIDQsnFrInputSideR,               ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrInputCenter */           {KAknsIIDQsnFrInputCenter,              ENoDraw,     ES60_AllReleases,    -1,-1},
+
+    /* SP_QsnFrListCornerTl */          {KAknsIIDQsnFrListCornerTl,             ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrListCornerTr */          {KAknsIIDQsnFrListCornerTr,             ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrListCornerBl */          {KAknsIIDQsnFrListCornerBl,             ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrListCornerBr */          {KAknsIIDQsnFrListCornerBr,             ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrListSideT */             {KAknsIIDQsnFrListSideT,                ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrListSideB */             {KAknsIIDQsnFrListSideB,                ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrListSideL */             {KAknsIIDQsnFrListSideL,                ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrListSideR */             {KAknsIIDQsnFrListSideR,                ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrListCenter */            {KAknsIIDQsnFrListCenter,               ENoDraw,     ES60_AllReleases,    -1,-1},
+
+    /* SP_QsnFrPopupCornerTl */         {KAknsIIDQsnFrPopupCornerTl,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrPopupCornerTr */         {KAknsIIDQsnFrPopupCornerTr,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrPopupCornerBl */         {KAknsIIDQsnFrPopupCornerBl,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrPopupCornerBr */         {KAknsIIDQsnFrPopupCornerBr,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrPopupSideT */            {KAknsIIDQsnFrPopupSideT,               ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrPopupSideB */            {KAknsIIDQsnFrPopupSideB,               ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrPopupSideL */            {KAknsIIDQsnFrPopupSideL,               ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrPopupSideR */            {KAknsIIDQsnFrPopupSideR,               ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrPopupCenter */           {KAknsIIDQsnFrPopupCenter,              ENoDraw,     ES60_AllReleases,    -1,-1},
+
+    // ToolTip graphics different in 3.1 vs. 3.2+.
+    /* SP_QsnFrPopupPreviewCornerTl */  {KAknsIIDQsnFrPopupCornerTl,            ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c5}, /* KAknsIIDQsnFrPopupPreviewCornerTl */
+    /* SP_QsnFrPopupPreviewCornerTr */  {KAknsIIDQsnFrPopupCornerTr,            ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c6},
+    /* SP_QsnFrPopupPreviewCornerBl */  {KAknsIIDQsnFrPopupCornerBl,            ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c3},
+    /* SP_QsnFrPopupPreviewCornerBr */  {KAknsIIDQsnFrPopupCornerBr,            ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c4},
+    /* SP_QsnFrPopupPreviewSideT */     {KAknsIIDQsnFrPopupSideT,               ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19ca},
+    /* SP_QsnFrPopupPreviewSideB */     {KAknsIIDQsnFrPopupSideB,               ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c7},
+    /* SP_QsnFrPopupPreviewSideL */     {KAknsIIDQsnFrPopupSideL,               ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c8},
+    /* SP_QsnFrPopupPreviewSideR */     {KAknsIIDQsnFrPopupSideR,               ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c9},
+    /* SP_QsnFrPopupPreviewCenter */    {KAknsIIDQsnFrPopupCenter,              ENoDraw,     ES60_3_1,            EAknsMajorSkin, 0x19c2},
+
+    /* SP_QsnFrSetOptCornerTl */        {KAknsIIDQsnFrSetOptCornerTl,           ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrSetOptCornerTr */        {KAknsIIDQsnFrSetOptCornerTr,           ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrSetOptCornerBl */        {KAknsIIDQsnFrSetOptCornerBl,           ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrSetOptCornerBr */        {KAknsIIDQsnFrSetOptCornerBr,           ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrSetOptSideT */           {KAknsIIDQsnFrSetOptSideT,              ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrSetOptSideB */           {KAknsIIDQsnFrSetOptSideB,              ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrSetOptSideL */           {KAknsIIDQsnFrSetOptSideL,              ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrSetOptSideR */           {KAknsIIDQsnFrSetOptSideR,              ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrSetOptCenter */          {KAknsIIDQsnFrSetOptCenter,             ENoDraw,     ES60_AllReleases,    -1,-1},
+
+    // No toolbar frame for 5.0+ releases.
+    /* SP_QsnFrPopupSubCornerTl */      {KAknsIIDQsnFrPopupSubCornerTl,         ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
+    /* SP_QsnFrPopupSubCornerTr */      {KAknsIIDQsnFrPopupSubCornerTr,         ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
+    /* SP_QsnFrPopupSubCornerBl */      {KAknsIIDQsnFrPopupSubCornerBl,         ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
+    /* SP_QsnFrPopupSubCornerBr */      {KAknsIIDQsnFrPopupSubCornerBr,         ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
+    /* SP_QsnFrPopupSubSideT */         {KAknsIIDQsnFrPopupSubSideT,            ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
+    /* SP_QsnFrPopupSubSideB */         {KAknsIIDQsnFrPopupSubSideB,            ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
+    /* SP_QsnFrPopupSubSideL */         {KAknsIIDQsnFrPopupSubSideL,            ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
+    /* SP_QsnFrPopupSubSideR */         {KAknsIIDQsnFrPopupSubSideR,            ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
+    /* SP_QsnFrPopupSubCenter */        {KAknsIIDQsnFrPopupCenterSubmenu,       ENoDraw,     ES60_3_1 | ES60_3_2, -1,-1},
+
+    // Toolbar graphics is different in 3.1/3.2 vs. 5.0
+    /* SP_QsnFrSctrlButtonCornerTl */   {KAknsIIDQsnFrButtonTbCornerTl,         ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2301}, /* KAknsIIDQgnFrSctrlButtonCornerTl*/
+    /* SP_QsnFrSctrlButtonCornerTr */   {KAknsIIDQsnFrButtonTbCornerTr,         ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2302},
+    /* SP_QsnFrSctrlButtonCornerBl */   {KAknsIIDQsnFrButtonTbCornerBl,         ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2303},
+    /* SP_QsnFrSctrlButtonCornerBr */   {KAknsIIDQsnFrButtonTbCornerBr,         ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2304},
+    /* SP_QsnFrSctrlButtonSideT */      {KAknsIIDQsnFrButtonTbSideT,            ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2305},
+    /* SP_QsnFrSctrlButtonSideB */      {KAknsIIDQsnFrButtonTbSideB,            ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2306},
+    /* SP_QsnFrSctrlButtonSideL */      {KAknsIIDQsnFrButtonTbSideL,            ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2307},
+    /* SP_QsnFrSctrlButtonSideR */      {KAknsIIDQsnFrButtonTbSideR,            ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2308},
+    /* SP_QsnFrSctrlButtonCenter */     {KAknsIIDQsnFrButtonTbCenter,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2309}, /*KAknsIIDQgnFrSctrlButtonCenter*/
+
+    // No pressed state for toolbar button in 3.1/3.2.
+    /* SP_QsnFrSctrlButtonCornerTlPressed */ {KAknsIIDQsnFrButtonTbCornerTl,    ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2621},  /*KAknsIIDQsnFrSctrlButtonCornerTlPressed*/
+    /* SP_QsnFrSctrlButtonCornerTrPressed */ {KAknsIIDQsnFrButtonTbCornerTr,    ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2622},
+    /* SP_QsnFrSctrlButtonCornerBlPressed */ {KAknsIIDQsnFrButtonTbCornerBl,    ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2623},
+    /* SP_QsnFrSctrlButtonCornerBrPressed */ {KAknsIIDQsnFrButtonTbCornerBr,    ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2624},
+    /* SP_QsnFrSctrlButtonSideTPressed */    {KAknsIIDQsnFrButtonTbSideT,       ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2625},
+    /* SP_QsnFrSctrlButtonSideBPressed */    {KAknsIIDQsnFrButtonTbSideB,       ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2626},
+    /* SP_QsnFrSctrlButtonSideLPressed */    {KAknsIIDQsnFrButtonTbSideL,       ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2627},
+    /* SP_QsnFrSctrlButtonSideRPressed */    {KAknsIIDQsnFrButtonTbSideR,       ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2628},
+    /* SP_QsnFrSctrlButtonCenterPressed */   {KAknsIIDQsnFrButtonTbCenter,      ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x2629},
+
+    // No inactive button graphics in 3.1/3.2
+    /* SP_QsnFrButtonCornerTlInactive */ {KAknsIIDQsnFrButtonTbCornerTl,        ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b1}, /*KAknsIIDQsnFrButtonCornerTlInactive*/
+    /* SP_QsnFrButtonCornerTrInactive */ {KAknsIIDQsnFrButtonTbCornerTr,        ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b2},
+    /* SP_QsnFrButtonCornerBlInactive */ {KAknsIIDQsnFrButtonTbCornerBl,        ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b3},
+    /* SP_QsnFrButtonCornerTrInactive */ {KAknsIIDQsnFrButtonTbCornerBr,        ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b4},
+    /* SP_QsnFrButtonSideTInactive */    {KAknsIIDQsnFrButtonTbSideT,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b5},
+    /* SP_QsnFrButtonSideBInactive */    {KAknsIIDQsnFrButtonTbSideB,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b6},
+    /* SP_QsnFrButtonSideLInactive */    {KAknsIIDQsnFrButtonTbSideL,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b7},
+    /* SP_QsnFrButtonSideRInactive */    {KAknsIIDQsnFrButtonTbSideR,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b8},
+    /* SP_QsnFrButtonCenterInactive */   {KAknsIIDQsnFrButtonTbCenter,          EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b9},  
+
+    /* SP_QsnFrNotepadCornerTl */        {KAknsIIDQsnFrNotepadContCornerTl,     ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadCornerTr */        {KAknsIIDQsnFrNotepadContCornerTr,     ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadCornerBl */        {KAknsIIDQsnFrNotepadCornerBl,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadCornerBr */        {KAknsIIDQsnFrNotepadCornerBr,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadSideT */           {KAknsIIDQsnFrNotepadContSideT,        ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadSideB */           {KAknsIIDQsnFrNotepadSideB,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadSideL */           {KAknsIIDQsnFrNotepadSideL,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadSideR */           {KAknsIIDQsnFrNotepadSideR,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadCenter */          {KAknsIIDQsnFrNotepadCenter,           EDrawIcon,   ES60_AllReleases,    -1,-1},
+
+};
+
+QPixmap QS60StyleModeSpecifics::skinnedGraphics(
+    QS60StyleEnums::SkinParts stylepart, const QSize &size,
+    QS60StylePrivate::SkinElementFlags flags)
+{
+    QPixmap themedImage;
+    TRAPD( error, {
+            const QPixmap skinnedImage = createSkinnedGraphicsL(stylepart, size, flags);
+            themedImage = skinnedImage;
+    });
+    if (error)
+        return themedImage = QPixmap();
+    return themedImage;
+}
+
+QPixmap QS60StyleModeSpecifics::skinnedGraphics(
+    QS60StylePrivate::SkinFrameElements frame, const QSize &size, QS60StylePrivate::SkinElementFlags flags)
+{
+    QPixmap themedImage;
+    TRAPD( error, {
+            const QPixmap skinnedImage = createSkinnedGraphicsL(frame, size, flags);
+            themedImage = skinnedImage;
+    });
+    if (error)
+        return themedImage = QPixmap();
+    return themedImage;
+}
+
+QPixmap QS60StyleModeSpecifics::colorSkinnedGraphics(
+    const QS60StyleEnums::SkinParts &stylepart,
+    const QSize &size, QS60StylePrivate::SkinElementFlags flags)
+{
+    QPixmap colorGraphics;
+    TRAPD(error, colorGraphics = colorSkinnedGraphicsL(stylepart, size, flags));
+    return error ? QPixmap() : colorGraphics;
+}
+
+void QS60StyleModeSpecifics::fallbackInfo(const QS60StyleEnums::SkinParts &stylepart, TDes& fallbackFileName, TInt& fallbackIndex)
+{
+    switch(stylepart) {
+        case QS60StyleEnums::SP_QgnGrafBarWait:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_bar_wait_1;
+            break;
+        case QS60StyleEnums::SP_QgnGrafBarFrameCenter:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_bar_frame_center;
+            break;
+        case QS60StyleEnums::SP_QgnGrafBarFrameSideL:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_bar_frame_side_l;
+            break;
+        case QS60StyleEnums::SP_QgnGrafBarFrameSideR:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_bar_frame_side_r;
+            break;
+        case QS60StyleEnums::SP_QgnGrafBarProgress:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_bar_progress;
+            break;
+        case QS60StyleEnums::SP_QgnGrafTabActiveL:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_tab_active_l;
+            break;
+        case QS60StyleEnums::SP_QgnGrafTabActiveM:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_tab_active_m;
+            break;
+        case QS60StyleEnums::SP_QgnGrafTabActiveR:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_tab_active_r;
+            break;
+        case QS60StyleEnums::SP_QgnGrafTabPassiveL:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_tab_passive_l;
+            break;
+        case QS60StyleEnums::SP_QgnGrafTabPassiveM:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_tab_passive_m;
+            break;
+        case QS60StyleEnums::SP_QgnGrafTabPassiveR:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_graf_tab_passive_r;
+            break;
+        case QS60StyleEnums::SP_QgnIndiCheckboxOff:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_indi_checkbox_off;
+            break;
+        case QS60StyleEnums::SP_QgnIndiCheckboxOn:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_indi_checkbox_on;
+            break;
+        case QS60StyleEnums::SP_QgnIndiHlColSuper:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = 0x4456; /* EMbmAvkonQgn_indi_hl_col_super */
+            break;
+        case QS60StyleEnums::SP_QgnIndiHlExpSuper:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = 0x4458; /* EMbmAvkonQgn_indi_hl_exp_super */
+            break;
+        case QS60StyleEnums::SP_QgnIndiHlLineBranch:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = 0x445A; /* EMbmAvkonQgn_indi_hl_line_branch */
+            break;
+        case QS60StyleEnums::SP_QgnIndiHlLineEnd:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = 0x445C; /* EMbmAvkonQgn_indi_hl_line_end */
+            break;
+        case QS60StyleEnums::SP_QgnIndiHlLineStraight:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = 0x445E; /* EMbmAvkonQgn_indi_hl_line_straight */
+            break;
+        case QS60StyleEnums::SP_QgnIndiMarkedAdd:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_indi_marked_add;
+            break;
+        case QS60StyleEnums::SP_QgnIndiNaviArrowLeft:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_indi_navi_arrow_left;
+            break;
+        case QS60StyleEnums::SP_QgnIndiNaviArrowRight:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_indi_navi_arrow_right;
+            break;
+        case QS60StyleEnums::SP_QgnIndiRadiobuttOff:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_indi_radiobutt_off;
+            break;
+        case QS60StyleEnums::SP_QgnIndiRadiobuttOn:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_indi_radiobutt_on;
+            break;
+        case QS60StyleEnums::SP_QgnIndiSliderEdit:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_indi_slider_edit;
+            break;
+        case QS60StyleEnums::SP_QgnIndiSubMenu:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_indi_submenu;
+            break;
+        case QS60StyleEnums::SP_QgnNoteErased:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_note_erased;
+            break;
+        case QS60StyleEnums::SP_QgnNoteError:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_note_error;
+            break;
+        case QS60StyleEnums::SP_QgnNoteInfo:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_note_info;
+            break;
+        case QS60StyleEnums::SP_QgnNoteOk:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_note_ok;
+            break;
+        case QS60StyleEnums::SP_QgnNoteQuery:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_note_query;
+            break;
+        case QS60StyleEnums::SP_QgnNoteWarning:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_note_warning;
+            break;
+        case QS60StyleEnums::SP_QgnPropFileSmall:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_prop_file_small;
+            break;
+        case QS60StyleEnums::SP_QgnPropFolderCurrent:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_prop_folder_current;
+            break;
+        case QS60StyleEnums::SP_QgnPropFolderSmall:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_prop_folder_small;
+            break;
+        case QS60StyleEnums::SP_QgnPropFolderSmallNew:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_prop_folder_small_new;
+            break;
+        case QS60StyleEnums::SP_QgnPropPhoneMemcLarge:
+            fallbackFileName = KAvkonBitmapFile();
+            fallbackIndex = EMbmAvkonQgn_prop_phone_memc_large;
+            break;
+        default:
+            fallbackFileName = KNullDesC();
+            fallbackIndex = -1;
+            break;
+    }
+}
+
+QPixmap QS60StyleModeSpecifics::colorSkinnedGraphicsL(
+    const QS60StyleEnums::SkinParts &stylepart,
+    const QSize &size, QS60StylePrivate::SkinElementFlags flags)
+{
+    const int stylepartIndex = (int)stylepart;
+    const TAknsItemID skinId = m_partMap[stylepartIndex].skinID;
+
+    TInt fallbackGraphicID = -1;
+    HBufC* iconFile = HBufC::NewLC( KMaxFileName );
+    TPtr fileNamePtr = iconFile->Des();
+    fallbackInfo(stylepart, fileNamePtr, fallbackGraphicID);
+
+    TAknsItemID colorGroup = KAknsIIDQsnIconColors;
+    int colorIndex = 0;
+    colorGroupAndIndex(stylepart, colorGroup, colorIndex);
+
+    const bool rotatedBy90or270 =
+        (flags & (QS60StylePrivate::SF_PointEast | QS60StylePrivate::SF_PointWest));
+    const TSize targetSize =
+        rotatedBy90or270?TSize(size.height(), size.width()):TSize(size.width(), size.height());
+    CFbsBitmap *icon = 0;
+    CFbsBitmap *iconMask = 0;
+    const TInt fallbackGraphicsMaskID =
+        fallbackGraphicID == KErrNotFound?KErrNotFound:fallbackGraphicID+1; //masks are auto-generated as next in mif files
+    MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
+    AknsUtils::CreateColorIconLC(
+        skinInstance, skinId, colorGroup, colorIndex, icon, iconMask, fileNamePtr, fallbackGraphicID , fallbackGraphicsMaskID, KRgbBlack);
+    User::LeaveIfError(AknIconUtils::SetSize(icon, targetSize, EAspectRatioNotPreserved));
+    User::LeaveIfError(AknIconUtils::SetSize(iconMask, targetSize, EAspectRatioNotPreserved));
+    QPixmap result = fromFbsBitmap(icon, iconMask, flags, qt_TDisplayMode2Format(icon->DisplayMode()));
+    CleanupStack::PopAndDestroy(3); //icon, iconMask, iconFile
+    return result;
+}
+
+QColor QS60StyleModeSpecifics::colorValue(const TAknsItemID &colorGroup, int colorIndex)
+{
+    TRgb skinnedColor;
+    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+    AknsUtils::GetCachedColor(skin, skinnedColor, colorGroup, colorIndex);
+    return QColor(skinnedColor.Red(),skinnedColor.Green(),skinnedColor.Blue());
+}
+
+QPixmap QS60StyleModeSpecifics::fromFbsBitmap(CFbsBitmap *icon, CFbsBitmap *mask, QS60StylePrivate::SkinElementFlags flags, QImage::Format format)
+{
+    Q_ASSERT(icon);
+    const TSize iconSize = icon->SizeInPixels();
+    const int iconBytesPerLine = CFbsBitmap::ScanLineLength(iconSize.iWidth, icon->DisplayMode());
+    const int iconBytesCount = iconBytesPerLine * iconSize.iHeight;
+
+    QImage iconImage(qt_TSize2QSize(iconSize), format);
+    if (iconImage.isNull())
+        return QPixmap();
+
+    checkAndUnCompressBitmap(icon);
+    if (!icon) //checkAndUnCompressBitmap might set icon to NULL
+        return QPixmap();
+
+    icon->LockHeap();
+    const uchar *const iconBytes = (uchar*)icon->DataAddress();
+    // The icon data needs to be copied, since the color format will be
+    // automatically converted to Format_ARGB32 when setAlphaChannel is called.
+    memcpy(iconImage.bits(), iconBytes, iconBytesCount);
+    icon->UnlockHeap();
+    if (mask) {
+        checkAndUnCompressBitmap(mask);
+        if (mask) { //checkAndUnCompressBitmap might set mask to NULL
+            const TSize maskSize = icon->SizeInPixels();
+            const int maskBytesPerLine = CFbsBitmap::ScanLineLength(maskSize.iWidth, mask->DisplayMode());
+            mask->LockHeap();
+            const uchar *const maskBytes = (uchar *)mask->DataAddress();
+            // Since no other bitmap should be locked, we can just "borrow" the mask data for setAlphaChannel
+            const QImage maskImage(maskBytes, maskSize.iWidth, maskSize.iHeight, maskBytesPerLine, QImage::Format_Indexed8);
+            if (!maskImage.isNull())
+                iconImage.setAlphaChannel(maskImage);
+            mask->UnlockHeap();
+        }
+    }
+
+    QTransform imageTransform;
+    if (flags & QS60StylePrivate::SF_PointEast) {
+        imageTransform.rotate(90);
+    } else if (flags & QS60StylePrivate::SF_PointSouth) {
+        imageTransform.rotate(180);
+        iconImage = iconImage.transformed(imageTransform);
+    } else if (flags & QS60StylePrivate::SF_PointWest) {
+        imageTransform.rotate(270);
+    }
+    if (imageTransform.isRotating())
+        iconImage = iconImage.transformed(imageTransform);
+
+    return QPixmap::fromImage(iconImage);
+}
+
+bool QS60StylePrivate::isTouchSupported()
+{
+    return bool(AknLayoutUtils::PenEnabled());
+}
+
+bool QS60StylePrivate::isToolBarBackground()
+{
+    return (QSysInfo::s60Version() == QSysInfo::SV_S60_3_1 || QSysInfo::s60Version() == QSysInfo::SV_S60_3_2);
+}
+
+QPoint qt_s60_fill_background_offset(const QWidget *targetWidget)
+{
+    CCoeControl *control = targetWidget->effectiveWinId();
+    TPoint globalPos = control ? control->PositionRelativeToScreen() : TPoint(0,0);
+    return QPoint(globalPos.iX, globalPos.iY);
+}
+
+QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsL(
+    QS60StyleEnums::SkinParts part,
+    const QSize &size, QS60StylePrivate::SkinElementFlags flags)
+{
+    if (!size.isValid())
+        return QPixmap();
+
+    // Check release support and change part, if necessary.
+    const TAknsItemID skinId = checkAndUpdateReleaseSpecificGraphics((int)part);
+    const int stylepartIndex = (int)part;
+    const TDrawType drawType = m_partMap[stylepartIndex].drawType;
+    Q_ASSERT(drawType != ENoDraw);
+    const bool rotatedBy90or270 =
+        (flags & (QS60StylePrivate::SF_PointEast | QS60StylePrivate::SF_PointWest));
+    const TSize targetSize =
+        rotatedBy90or270 ? TSize(size.height(), size.width()) : qt_QSize2TSize(size);
+
+    MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
+
+    QPixmap result;
+
+    switch (drawType) {
+        case EDrawIcon: {
+            TInt fallbackGraphicID = -1;
+            HBufC* iconFile = HBufC::NewLC( KMaxFileName );
+            TPtr fileNamePtr = iconFile->Des();
+            fallbackInfo(part, fileNamePtr, fallbackGraphicID);
+            // todo: could we instead use   AknIconUtils::AvkonIconFileName(); to avoid allocating each time?
+
+            CFbsBitmap *icon = 0;
+            CFbsBitmap *iconMask = 0;
+            const TInt fallbackGraphicsMaskID =
+                fallbackGraphicID == KErrNotFound?KErrNotFound:fallbackGraphicID+1; //masks are auto-generated as next in mif files
+    //        QS60WindowSurface::unlockBitmapHeap();
+            AknsUtils::CreateIconLC(skinInstance, skinId, icon, iconMask, fileNamePtr, fallbackGraphicID , fallbackGraphicsMaskID);
+            User::LeaveIfError(AknIconUtils::SetSize(icon, targetSize, EAspectRatioNotPreserved));
+            User::LeaveIfError(AknIconUtils::SetSize(iconMask, targetSize, EAspectRatioNotPreserved));
+            result = fromFbsBitmap(icon, iconMask, flags, qt_TDisplayMode2Format(icon->DisplayMode()));
+            CleanupStack::PopAndDestroy(3); // iconMask, icon, iconFile
+    //        QS60WindowSurface::lockBitmapHeap();
+            break;
+        }
+        case EDrawBackground: {
+    //        QS60WindowSurface::unlockBitmapHeap();
+            CFbsBitmap *background = new (ELeave) CFbsBitmap(); //offscreen
+            CleanupStack::PushL(background);
+            User::LeaveIfError(background->Create(targetSize, EColor16MA));
+
+            CFbsBitmapDevice* dev = CFbsBitmapDevice::NewL(background);
+            CleanupStack::PushL(dev);
+            CFbsBitGc* gc = NULL;
+            User::LeaveIfError(dev->CreateContext(gc));
+            CleanupStack::PushL(gc);
+
+            CAknsBasicBackgroundControlContext* bgContext = CAknsBasicBackgroundControlContext::NewL(
+                skinId,
+                targetSize,
+                EFalse);
+            CleanupStack::PushL(bgContext);
+
+            const TBool drawn = AknsDrawUtils::DrawBackground(
+                skinInstance,
+                bgContext,
+                NULL,
+                *gc,
+                TPoint(),
+                targetSize,
+                KAknsDrawParamDefault | KAknsDrawParamRGBOnly);
+
+            if (drawn)
+                result = fromFbsBitmap(background, NULL, flags, QImage::Format_RGB32);
+
+            CleanupStack::PopAndDestroy(4, background); //background, dev, gc, bgContext
+    //        QS60WindowSurface::lockBitmapHeap();
+            break;
+        }
+    }
+
+    return result;
+}
+
+QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsL(QS60StylePrivate::SkinFrameElements frameElement,
+    const QSize &size, QS60StylePrivate::SkinElementFlags flags)
+{
+    if (!size.isValid())
+        return QPixmap();
+
+    const bool rotatedBy90or270 =
+        (flags & (QS60StylePrivate::SF_PointEast | QS60StylePrivate::SF_PointWest));
+    const TSize targetSize =
+        rotatedBy90or270 ? TSize(size.height(), size.width()) : qt_QSize2TSize(size);
+
+    MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
+    QPixmap result;
+
+//        QS60WindowSurface::unlockBitmapHeap();
+    static const bool canDoEColor16MAP = !(QSysInfo::s60Version() == QSysInfo::SV_S60_3_1 || QSysInfo::s60Version() == QSysInfo::SV_S60_3_2);
+    static const TDisplayMode displayMode = canDoEColor16MAP ? TDisplayMode(13) : EColor16MA; // 13 = EColor16MAP
+    static const TInt drawParam = canDoEColor16MAP ? KAknsDrawParamDefault : KAknsDrawParamNoClearUnderImage|KAknsDrawParamRGBOnly;
+
+    CFbsBitmap *frame = new (ELeave) CFbsBitmap(); //offscreen
+    CleanupStack::PushL(frame);
+    User::LeaveIfError(frame->Create(targetSize, displayMode));
+
+    CFbsBitmapDevice* bitmapDev = CFbsBitmapDevice::NewL(frame);
+    CleanupStack::PushL(bitmapDev);
+    CFbsBitGc* bitmapGc = NULL;
+    User::LeaveIfError(bitmapDev->CreateContext(bitmapGc));
+    CleanupStack::PushL(bitmapGc);
+
+    frame->LockHeap();
+    memset(frame->DataAddress(), 0, frame->SizeInPixels().iWidth * frame->SizeInPixels().iHeight * 4);  // 4: argb bytes
+    frame->UnlockHeap();
+
+    const TRect outerRect(TPoint(0, 0), targetSize);
+    const TRect innerRect = innerRectFromElement(frameElement, outerRect);
+
+    TAknsItemID frameSkinID, centerSkinID;
+    frameSkinID = centerSkinID = checkAndUpdateReleaseSpecificGraphics(QS60StylePrivate::m_frameElementsData[frameElement].center);
+    frameIdAndCenterId(frameElement, frameSkinID, centerSkinID);
+    const TBool drawn = AknsDrawUtils::DrawFrame( skinInstance,
+                           *bitmapGc, outerRect, innerRect,
+                           frameSkinID, centerSkinID,
+                           drawParam );
+
+    if (canDoEColor16MAP) {
+        if (drawn)
+            result = fromFbsBitmap(frame, NULL, flags, QImage::Format_ARGB32_Premultiplied);
+    } else {
+        TDisplayMode maskDepth = EGray2;
+        // Query the skin item for possible frame graphics mask details.
+        if (skinInstance) {
+            CAknsMaskedBitmapItemData* skinMaskedBmp = static_cast<CAknsMaskedBitmapItemData*>(
+                    skinInstance->GetCachedItemData(frameSkinID,EAknsITMaskedBitmap));
+            if (skinMaskedBmp && skinMaskedBmp->Mask())
+                maskDepth = skinMaskedBmp->Mask()->DisplayMode();
+        }
+        if (maskDepth != ENone) {
+            CFbsBitmap *frameMask = new (ELeave) CFbsBitmap(); //offscreen
+            CleanupStack::PushL(frameMask);
+            User::LeaveIfError(frameMask->Create(targetSize, maskDepth));
+
+            CFbsBitmapDevice* maskBitmapDevice = CFbsBitmapDevice::NewL(frameMask);
+            CleanupStack::PushL(maskBitmapDevice);
+            CFbsBitGc* maskBitGc = NULL;
+            User::LeaveIfError(maskBitmapDevice->CreateContext(maskBitGc));
+            CleanupStack::PushL(maskBitGc);
+
+            if (drawn) {
+                //ensure that the mask is really transparent
+                maskBitGc->Activate( maskBitmapDevice );
+                maskBitGc->SetPenStyle(CGraphicsContext::ENullPen);
+                maskBitGc->SetBrushStyle(CGraphicsContext::ESolidBrush);
+                maskBitGc->SetBrushColor(KRgbWhite);
+                maskBitGc->Clear();
+                maskBitGc->SetBrushStyle(CGraphicsContext::ENullBrush);
+
+                AknsDrawUtils::DrawFrame(skinInstance,
+                                           *maskBitGc, outerRect, innerRect,
+                                           frameSkinID, centerSkinID,
+                                           KAknsSDMAlphaOnly |KAknsDrawParamNoClearUnderImage);
+                result = fromFbsBitmap(frame, frameMask, flags, QImage::Format_ARGB32);
+            }
+            CleanupStack::PopAndDestroy(3, frameMask);
+        }
+    }
+    CleanupStack::PopAndDestroy(3, frame); //frame, bitmapDev, bitmapGc
+    return result;
+}
+
+void QS60StyleModeSpecifics::frameIdAndCenterId(QS60StylePrivate::SkinFrameElements frameElement, TAknsItemID &frameId, TAknsItemID &centerId)
+{
+// There are some major mix-ups in skin declarations for some frames.
+// First, the frames are not declared in sequence.
+// Second, the parts use different major than the frame-master.
+
+    switch(frameElement) {
+        case QS60StylePrivate::SF_ToolTip:
+            if (QSysInfo::s60Version()!=QSysInfo::SV_S60_3_1) {
+                centerId.Set(EAknsMajorGeneric, 0x19c2);
+                frameId.Set(EAknsMajorSkin, 0x5300);
+            } else {
+                centerId.Set(KAknsIIDQsnFrPopupCenter);
+                frameId.iMinor = centerId.iMinor - 9;
+            }
+            break;
+        case QS60StylePrivate::SF_ToolBar:
+            if (QSysInfo::s60Version()==QSysInfo::SV_S60_3_1 || QSysInfo::s60Version()==QSysInfo::SV_S60_3_2) {
+                centerId.Set(KAknsIIDQsnFrPopupCenterSubmenu);
+                frameId.Set(KAknsIIDQsnFrPopupSub);
+            }
+            break;
+        case QS60StylePrivate::SF_PanelBackground:
+            // remove center piece for panel graphics, so that only border is drawn
+            centerId.Set(KAknsIIDNone);
+            frameId.Set(KAknsIIDQsnFrSetOpt);
+            break;
+        case QS60StylePrivate::SF_Editor:
+            centerId.Set(KAknsIIDQsnFrNotepadCenter);
+            frameId.Set(KAknsIIDQsnFrNotepadCont);
+            break;
+        default:
+            // center should be correct here
+            frameId.iMinor = centerId.iMinor - 9;
+            break;
+    }
+}
+
+TRect QS60StyleModeSpecifics::innerRectFromElement(QS60StylePrivate::SkinFrameElements frameElement, const TRect &outerRect)
+{
+    TInt widthShrink = QS60StylePrivate::pixelMetric(PM_Custom_FrameCornerWidth);
+    TInt heightShrink = QS60StylePrivate::pixelMetric(PM_Custom_FrameCornerHeight);
+    switch(frameElement) {
+        case QS60StylePrivate::SF_PanelBackground:
+            // panel should have slightly slimmer border to enable thin line of background graphics between closest component
+            widthShrink = widthShrink-2;
+            heightShrink = heightShrink-2;
+            break;
+        case QS60StylePrivate::SF_ToolTip:
+            widthShrink = widthShrink>>1;
+            heightShrink = heightShrink>>1;
+            break;
+        case QS60StylePrivate::SF_ListHighlight:
+            widthShrink = widthShrink-2;
+            heightShrink = heightShrink-2;
+            break;
+        default:
+            break;
+    }
+    TRect innerRect(outerRect);
+    innerRect.Shrink(widthShrink, heightShrink);
+    return innerRect;
+}
+
+bool QS60StyleModeSpecifics::checkSupport(const int supportedRelease)
+{
+    const QSysInfo::S60Version currentRelease = QSysInfo::s60Version();
+    return ( (currentRelease == QSysInfo::SV_S60_3_1 && supportedRelease & ES60_3_1) ||
+             (currentRelease == QSysInfo::SV_S60_3_2 && supportedRelease & ES60_3_2) ||
+             (currentRelease == QSysInfo::SV_S60_5_0 && supportedRelease & ES60_5_0));
+}
+
+TAknsItemID QS60StyleModeSpecifics::checkAndUpdateReleaseSpecificGraphics(int part)
+{
+    TAknsItemID newSkinId;
+    if (!checkSupport(m_partMap[(int)part].supportInfo))
+        newSkinId.Set(m_partMap[(int)part].newMajorSkinId, m_partMap[(int)part].newMinorSkinId);
+    else
+        newSkinId.Set(m_partMap[(int)part].skinID);
+    return newSkinId;
+}
+
+void QS60StyleModeSpecifics::checkAndUnCompressBitmap(CFbsBitmap*& aOriginalBitmap)
+{
+    TRAPD(error, checkAndUnCompressBitmapL(aOriginalBitmap));
+    if (error)
+        aOriginalBitmap = NULL;
+}
+
+void QS60StyleModeSpecifics::checkAndUnCompressBitmapL(CFbsBitmap*& aOriginalBitmap)
+{
+    if (aOriginalBitmap->IsCompressedInRAM()) {
+        const TSize iconSize(aOriginalBitmap->SizeInPixels().iWidth,
+            aOriginalBitmap->SizeInPixels().iHeight);
+        CFbsBitmap* uncompressedBitmap = new (ELeave) CFbsBitmap();
+        CleanupStack::PushL(uncompressedBitmap);
+        User::LeaveIfError(uncompressedBitmap->Create(iconSize,
+            aOriginalBitmap->DisplayMode()));
+        unCompressBitmapL(iconSize, uncompressedBitmap, aOriginalBitmap);
+        CleanupStack::Pop(uncompressedBitmap);
+        User::LeaveIfError(aOriginalBitmap->Duplicate(
+            uncompressedBitmap->Handle()));
+        delete uncompressedBitmap;
+    }
+}
+
+QFont QS60StylePrivate::s60Font_specific(
+    QS60StyleEnums::FontCategories fontCategory, int pointSize)
+{
+    TAknFontCategory aknFontCategory = EAknFontCategoryUndefined;
+    switch (fontCategory) {
+        case QS60StyleEnums::FC_Primary:
+            aknFontCategory = EAknFontCategoryPrimary;
+            break;
+        case QS60StyleEnums::FC_Secondary:
+            aknFontCategory = EAknFontCategorySecondary;
+            break;
+        case QS60StyleEnums::FC_Title:
+            aknFontCategory = EAknFontCategoryTitle;
+            break;
+        case QS60StyleEnums::FC_PrimarySmall:
+            aknFontCategory = EAknFontCategoryPrimarySmall;
+            break;
+        case QS60StyleEnums::FC_Digital:
+            aknFontCategory = EAknFontCategoryDigital;
+            break;
+        case QS60StyleEnums::FC_Undefined:
+        default:
+            break;
+    }
+
+    // Create AVKON font according the given parameters
+    CWsScreenDevice* dev = CCoeEnv::Static()->ScreenDevice();
+    TAknFontSpecification spec(aknFontCategory, TFontSpec(), NULL);
+    if (pointSize > 0) {
+        const TInt pixelSize = dev->VerticalTwipsToPixels(pointSize * KTwipsPerPoint);
+        spec.SetTextPaneHeight(pixelSize + 4); // TODO: Is 4 a reasonable top+bottom margin?
+    }
+
+    QFont result;
+    TRAPD( error, {
+        const CAknLayoutFont* aknFont =
+            AknFontAccess::CreateLayoutFontFromSpecificationL(*dev, spec);
+
+        result = qt_TFontSpec2QFontL(aknFont->DoFontSpecInTwips());
+        if (result.pointSize() != pointSize)
+            result.setPointSize(pointSize); // Correct the font size returned by CreateLayoutFontFromSpecificationL()
+
+        delete aknFont;
+    });
+    if (error) result = QFont();
+    return result;
+}
+
+void QS60StylePrivate::setActiveLayout()
+{
+    const QSize activeScreenSize(screenSize());
+    int activeLayoutIndex = -1;
+    const bool mirrored = !QApplication::isLeftToRight();
+    const short screenHeight = (short)activeScreenSize.height();
+    const short screenWidth = (short)activeScreenSize.width();
+    for (int i=0; i<m_numberOfLayouts; i++) {
+        if (screenHeight==m_layoutHeaders[i].height &&
+            screenWidth==m_layoutHeaders[i].width &&
+            mirrored==m_layoutHeaders[i].mirroring) {
+            activeLayoutIndex = i;
+            break;
+        }
+    }
+
+    //not found, lets try without mirroring info
+    if (activeLayoutIndex==-1){
+        for (int i=0; i<m_numberOfLayouts; i++) {
+            if (screenHeight==m_layoutHeaders[i].height &&
+                screenWidth==m_layoutHeaders[i].width) {
+                activeLayoutIndex = i;
+                break;
+            }
+        }
+    }
+
+    //not found, lets try with either of dimensions
+    if (activeLayoutIndex==-1){
+        const QSysInfo::S60Version currentRelease = QSysInfo::s60Version();
+        const bool landscape = screenHeight < screenWidth;
+
+        activeLayoutIndex = (currentRelease == QSysInfo::SV_S60_3_1 || currentRelease == QSysInfo::SV_S60_3_2) ? 0 : 4;
+        activeLayoutIndex += (!landscape) ? 2 : 0;
+        activeLayoutIndex += (!mirrored) ? 1 : 0;
+    }
+
+    m_pmPointer = data[activeLayoutIndex];
+}
+
+QS60StylePrivate::QS60StylePrivate()
+{
+    // No need to set active layout, if dynamic metrics API is available
+    setActiveLayout();
+}
+
+void QS60StylePrivate::setStyleProperty_specific(const char *name, const QVariant &value)
+{
+    if (name == QLatin1String("foo")) {
+        // BaR
+    } else {
+        setStyleProperty(name, value);
+    }
+}
+
+QVariant QS60StylePrivate::styleProperty_specific(const char *name) const
+{
+    if (name == QLatin1String("foo"))
+        return QLatin1String("Bar");
+    else
+        return styleProperty(name);
+}
+
+QColor QS60StylePrivate::s60Color(QS60StyleEnums::ColorLists list,
+    int index, const QStyleOption *option)
+{
+    static const TAknsItemID *idMap[] = {
+        &KAknsIIDQsnHighlightColors,
+        &KAknsIIDQsnIconColors,
+        &KAknsIIDQsnLineColors,
+        &KAknsIIDQsnOtherColors,
+        &KAknsIIDQsnParentColors,
+        &KAknsIIDQsnTextColors
+    };
+    Q_ASSERT((int)list <= (int)sizeof(idMap)/sizeof(idMap[0]));
+    const QColor color = QS60StyleModeSpecifics::colorValue(*idMap[(int) list], index - 1);
+    return option ? QS60StylePrivate::stateColor(color, option) : color;
+}
+
+// In some cases, the AVKON UI themegraphic is already in 'disabled state'.
+// If so, return true for these parts.
+bool QS60StyleModeSpecifics::disabledPartGraphic(QS60StyleEnums::SkinParts &part)
+{
+    bool disabledGraphic = false;
+    switch(part){
+        // inactive button graphics are available from 5.0 onwards
+        case QS60StyleEnums::SP_QsnFrButtonCornerTlInactive:
+        case QS60StyleEnums::SP_QsnFrButtonCornerTrInactive:
+        case QS60StyleEnums::SP_QsnFrButtonCornerBlInactive:
+        case QS60StyleEnums::SP_QsnFrButtonCornerBrInactive:
+        case QS60StyleEnums::SP_QsnFrButtonSideTInactive:
+        case QS60StyleEnums::SP_QsnFrButtonSideBInactive:
+        case QS60StyleEnums::SP_QsnFrButtonSideLInactive:
+        case QS60StyleEnums::SP_QsnFrButtonSideRInactive:
+        case QS60StyleEnums::SP_QsnFrButtonCenterInactive:
+            if (!(QSysInfo::s60Version()==QSysInfo::SV_S60_3_1 ||
+                  QSysInfo::s60Version()==QSysInfo::SV_S60_3_2))
+                disabledGraphic = true;
+            break;
+        default:
+            break;
+    }
+    return disabledGraphic;
+}
+
+// In some cases, the AVKON UI themegraphic is already in 'disabled state'.
+// If so, return true for these frames.
+bool QS60StyleModeSpecifics::disabledFrameGraphic(QS60StylePrivate::SkinFrameElements &frame)
+{
+    bool disabledGraphic = false;
+    switch(frame){
+        // inactive button graphics are available from 5.0 onwards
+        case QS60StylePrivate::SF_ButtonInactive:
+            if (!(QSysInfo::s60Version()==QSysInfo::SV_S60_3_1 ||
+                  QSysInfo::s60Version()==QSysInfo::SV_S60_3_2))
+                disabledGraphic = true;
+            break;
+        default:
+            break;
+    }
+    return disabledGraphic;
+}
+
+QPixmap QS60StyleModeSpecifics::generateMissingThemeGraphic(QS60StyleEnums::SkinParts &part,
+        const QSize &size, QS60StylePrivate::SkinElementFlags flags)
+{
+    if (!QS60StylePrivate::isTouchSupported())
+        return QPixmap();
+
+    QS60StyleEnums::SkinParts updatedPart = part;
+    switch(part){
+    // AVKON UI has a abnormal handling for scrollbar graphics. It is possible that the root
+    // skin does not contain mandatory graphics for scrollbar pressed states. Therefore, AVKON UI
+    // creates dynamically these graphics by modifying the normal state scrollbar graphics slightly.
+    // S60Style needs to work similarly. Therefore if skingraphics call provides to be a miss
+    // (i.e. result is not valid), style needs to draw normal graphics instead and apply some
+    // modifications (similar to generatedIconPixmap()) to the result.
+    case QS60StyleEnums::SP_QsnCpScrollHandleBottomPressed:
+        updatedPart = QS60StyleEnums::SP_QsnCpScrollHandleBottom;
+        break;
+    case QS60StyleEnums::SP_QsnCpScrollHandleMiddlePressed:
+        updatedPart = QS60StyleEnums::SP_QsnCpScrollHandleMiddle;
+        break;
+    case QS60StyleEnums::SP_QsnCpScrollHandleTopPressed:
+        updatedPart = QS60StyleEnums::SP_QsnCpScrollHandleTop;
+        break;
+    default:
+        break;
+    }
+    if (part==updatedPart) {
+        return QPixmap();
+    } else {
+        QPixmap result = skinnedGraphics(updatedPart, size, flags);
+        QStyleOption opt;
+        QPalette *themePalette = QS60StylePrivate::themePalette();
+        if (themePalette)
+            opt.palette = *themePalette;
+
+        // For now, always generate new icon based on "selected". In the future possibly, expand
+        // this to consist other possibilities as well.
+        result = QApplication::style()->generatedIconPixmap(QIcon::Selected, result, &opt);
+        return result;
+    }
+}
+
+QPixmap QS60StylePrivate::part(QS60StyleEnums::SkinParts part,
+    const QSize &size, SkinElementFlags flags)
+{
+    QS60WindowSurface::unlockBitmapHeap();
+    QPixmap result = (flags & SF_ColorSkinned)?
+          QS60StyleModeSpecifics::colorSkinnedGraphics(part, size, flags)
+        : QS60StyleModeSpecifics::skinnedGraphics(part, size, flags);
+    QS60WindowSurface::lockBitmapHeap();
+
+    if (flags & SF_StateDisabled && !QS60StyleModeSpecifics::disabledPartGraphic(part)) {
+        QStyleOption opt;
+        QPalette *themePalette = QS60StylePrivate::themePalette();
+        if (themePalette)
+            opt.palette = *themePalette;
+        result = QApplication::style()->generatedIconPixmap(QIcon::Disabled, result, &opt);
+    }
+
+    if (!result)
+        result = QS60StyleModeSpecifics::generateMissingThemeGraphic(part, size, flags);
+
+    return result;
+}
+
+QPixmap QS60StylePrivate::frame(SkinFrameElements frame, const QSize &size, SkinElementFlags flags)
+{
+    QS60WindowSurface::unlockBitmapHeap();
+    QPixmap result = QS60StyleModeSpecifics::skinnedGraphics(frame, size, flags);
+    QS60WindowSurface::lockBitmapHeap();
+
+    if (flags & SF_StateDisabled && !QS60StyleModeSpecifics::disabledFrameGraphic(frame)) {
+        QStyleOption opt;
+        QPalette *themePalette = QS60StylePrivate::themePalette();
+        if (themePalette)
+            opt.palette = *themePalette;
+        result = QApplication::style()->generatedIconPixmap(QIcon::Disabled, result, &opt);
+    }
+    return result;
+}
+
+QPixmap QS60StylePrivate::backgroundTexture()
+{
+    if (!m_background) {
+        QPixmap background = part(QS60StyleEnums::SP_QsnBgScreen,
+                QSize(S60->screenWidthInPixels, S60->screenHeightInPixels), SkinElementFlags());
+        m_background = new QPixmap(background);
+    }
+    return *m_background;
+}
+
+// If the public SDK returns compressed images, please let us also uncompress those!
+void QS60StyleModeSpecifics::unCompressBitmapL(const TRect& aTrgRect, CFbsBitmap* aTrgBitmap, CFbsBitmap* aSrcBitmap)
+{
+    if (!aSrcBitmap)
+        User::Leave(KErrArgument);
+    if (!aTrgBitmap)
+        User::Leave(KErrArgument);
+
+   // Note! aSrcBitmap->IsCompressedInRAM() is always ETrue, since this method is called only if that applies!
+   ASSERT(aSrcBitmap->IsCompressedInRAM());
+
+    TDisplayMode displayMode = aSrcBitmap->DisplayMode();
+
+    if (displayMode != aTrgBitmap->DisplayMode())
+        User::Leave(KErrArgument);
+
+    const TSize trgSize = aTrgBitmap->SizeInPixels();
+    const TSize srcSize = aSrcBitmap->SizeInPixels();
+
+    // calculate the valid drawing area
+    TRect drawRect = aTrgRect;
+    drawRect.Intersection(TRect(TPoint(0, 0), trgSize));
+
+    if (drawRect.IsEmpty())
+        return;
+
+    CFbsBitmap* realSource = new (ELeave) CFbsBitmap();
+    CleanupStack::PushL(realSource);
+    User::LeaveIfError(realSource->Create(srcSize, displayMode));
+    CFbsBitmapDevice* dev = CFbsBitmapDevice::NewL(realSource);
+    CleanupStack::PushL(dev);
+    CFbsBitGc* gc = NULL;
+    User::LeaveIfError(dev->CreateContext(gc));
+    CleanupStack::PushL(gc);
+    gc->BitBlt(TPoint(0, 0), aSrcBitmap);
+    CleanupStack::PopAndDestroy(2); // dev, gc
+
+    // Heap lock for FBServ large chunk is only needed with large bitmaps.
+    if (realSource->IsLargeBitmap() || aTrgBitmap->IsLargeBitmap()) {
+        aTrgBitmap->LockHeapLC(ETrue); // fbsheaplock
+    } else {
+        CleanupStack::PushL((TAny*) NULL);
+    }
+
+    TUint32* srcAddress = realSource->DataAddress();
+    TUint32* trgAddress = aTrgBitmap->DataAddress();
+
+    const TInt xSkip = (srcSize.iWidth << 8) / aTrgRect.Width();
+    const TInt ySkip = (srcSize.iHeight << 8) / aTrgRect.Height();
+
+    const TInt drawWidth = drawRect.Width();
+    const TInt drawHeight = drawRect.Height();
+
+    const TRect offsetRect(aTrgRect.iTl, drawRect.iTl);
+    const TInt yPosOffset = ySkip * offsetRect.Height();
+    const TInt xPosOffset = xSkip * offsetRect.Width();
+
+    if ((displayMode == EGray256) || (displayMode == EColor256)) {
+        const TInt srcScanLen8 = CFbsBitmap::ScanLineLength(srcSize.iWidth,
+            displayMode);
+        const TInt trgScanLen8 = CFbsBitmap::ScanLineLength(trgSize.iWidth,
+            displayMode);
+
+        TUint8* trgAddress8 = reinterpret_cast<TUint8*> (trgAddress);
+
+        TInt yPos = yPosOffset;
+        // skip left and top margins in the beginning
+        trgAddress8 += trgScanLen8 * drawRect.iTl.iY + drawRect.iTl.iX;
+
+        for (TInt y = 0; y < drawHeight; y++) {
+            const TUint8* srcAddress8 = reinterpret_cast<const TUint8*> (srcAddress)
+                + (srcScanLen8 * (yPos >> 8));
+
+            TInt xPos = xPosOffset;
+            for (TInt x = 0; x < drawWidth; x++) {
+                *(trgAddress8++) = srcAddress8[xPos >> 8];
+                xPos += xSkip;
+            }
+
+            yPos += ySkip;
+
+            trgAddress8 += trgScanLen8 - drawWidth;
+        }
+    } else if (displayMode == EColor4K || displayMode == EColor64K) {
+        const TInt srcScanLen16 = CFbsBitmap::ScanLineLength(srcSize.iWidth,
+            displayMode) >>1;
+        const TInt trgScanLen16 = CFbsBitmap::ScanLineLength(trgSize.iWidth,
+            displayMode) >>1;
+
+        TUint16* trgAddress16 = reinterpret_cast<TUint16*> (trgAddress);
+
+        TInt yPos = yPosOffset;
+        // skip left and top margins in the beginning
+        trgAddress16 += trgScanLen16 * drawRect.iTl.iY + drawRect.iTl.iX;
+
+        for (TInt y = 0; y < drawHeight; y++) {
+            const TUint16* srcAddress16 = reinterpret_cast<const TUint16*> (srcAddress)
+                + (srcScanLen16 * (yPos >> 8));
+
+            TInt xPos = xPosOffset;
+            for (TInt x = 0; x < drawWidth; x++) {
+                *(trgAddress16++) = srcAddress16[xPos >> 8];
+                xPos += xSkip;
+            }
+
+            yPos += ySkip;
+
+            trgAddress16 += trgScanLen16 - drawWidth;
+        }
+    } else if (displayMode == EColor16MU || displayMode == EColor16MA) {
+        const TInt srcScanLen32 = CFbsBitmap::ScanLineLength(srcSize.iWidth,
+            displayMode) >>2;
+        const TInt trgScanLen32 = CFbsBitmap::ScanLineLength(trgSize.iWidth,
+            displayMode) >>2;
+
+        TUint32* trgAddress32 = reinterpret_cast<TUint32*> (trgAddress);
+
+        TInt yPos = yPosOffset;
+        // skip left and top margins in the beginning
+        trgAddress32 += trgScanLen32 * drawRect.iTl.iY + drawRect.iTl.iX;
+
+        for (TInt y = 0; y < drawHeight; y++) {
+            const TUint32* srcAddress32 = reinterpret_cast<const TUint32*> (srcAddress)
+                + (srcScanLen32 * (yPos >> 8));
+
+            TInt xPos = xPosOffset;
+            for (TInt x = 0; x < drawWidth; x++) {
+                *(trgAddress32++) = srcAddress32[xPos >> 8];
+                xPos += xSkip;
+            }
+
+            yPos += ySkip;
+
+            trgAddress32 += trgScanLen32 - drawWidth;
+        }
+    } else { User::Leave(KErrUnknown);}
+
+    CleanupStack::PopAndDestroy(2); // fbsheaplock, realSource
+}
+
+QSize QS60StylePrivate::screenSize()
+{
+    const TSize screenSize = QS60Data::screenDevice()->SizeInPixels();
+    return QSize(screenSize.iWidth, screenSize.iHeight);
+}
+
+void QS60StyleModeSpecifics::colorGroupAndIndex(
+    QS60StyleEnums::SkinParts skinID, TAknsItemID &colorGroup, int colorIndex)
+{
+    switch(skinID) {
+        case QS60StyleEnums::SP_QgnIndiSubMenu:
+            colorGroup = KAknsIIDQsnIconColors;
+            colorIndex = EAknsCIQsnIconColorsCG1;
+            break;
+        case QS60StyleEnums::SP_QgnIndiRadiobuttOff:
+        case QS60StyleEnums::SP_QgnIndiRadiobuttOn:
+        case QS60StyleEnums::SP_QgnIndiCheckboxOff:
+        case QS60StyleEnums::SP_QgnIndiCheckboxOn:
+            colorGroup = KAknsIIDQsnIconColors;
+            colorIndex = EAknsCIQsnIconColorsCG14;
+            break;
+        default:
+            break;
+    }
+}
+
+/*!
+  Constructs a QS60Style object.
+*/
+QS60Style::QS60Style()
+    : QCommonStyle(*new QS60StylePrivate)
+{
+}
+
+void QS60Style::handleDynamicLayoutVariantSwitch()
+{
+    Q_D(QS60Style);
+    d->clearCaches(QS60StylePrivate::CC_LayoutChange);
+    d->setActiveLayout();
+    d->refreshUI();
+    d->setBackgroundTexture(qApp);
+    foreach (QWidget *widget, QApplication::allWidgets())
+        widget->ensurePolished();
+}
+
+void QS60Style::handleSkinChange()
+{
+    Q_D(QS60Style);
+    d->clearCaches(QS60StylePrivate::CC_ThemeChange);
+    d->setThemePalette(qApp);
+    foreach (QWidget *topLevelWidget, QApplication::allWidgets()){
+        QEvent e(QEvent::StyleChange);
+        QApplication::sendEvent(topLevelWidget, &e);
+        d->setThemePalette(topLevelWidget);
+        topLevelWidget->ensurePolished();
+    }
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_STYLE_S60 || QT_PLUGIN
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
new file mode 100644
index 0000000000..684f23213f
--- /dev/null
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -0,0 +1,449 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qs60style.h"
+#include "qs60style_p.h"
+#include "qfile.h"
+#include "qhash.h"
+#include "qapplication.h"
+#include "qpainter.h"
+#include "qpicture.h"
+#include "qstyleoption.h"
+#include "qtransform.h"
+#include "qlayout.h"
+#include "qpixmapcache.h"
+#include "qmetaobject.h"
+#include "qdebug.h"
+#include "qbuffer.h"
+#include "qdesktopwidget.h"
+
+#if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN)
+
+QT_BEGIN_NAMESPACE
+
+static const quint32 blobVersion = 1;
+static const int pictureSize = 256;
+
+#if defined(Q_CC_GNU)
+#if __GNUC__ >= 2
+#define __FUNCTION__ __func__
+#endif
+#endif
+
+
+bool saveThemeToBlob(const QString &themeBlob,
+    const QHash<QString, QPicture> &partPictures,
+    const QHash<QPair<QString, int>, QColor> &colors)
+{
+    QFile blob(themeBlob);
+    if (!blob.open(QIODevice::WriteOnly)) {
+        qWarning() << __FUNCTION__ << ": Could not create blob: " << themeBlob;
+        return false;
+    }
+
+    QByteArray data;
+    QBuffer dataBuffer(&data);
+    dataBuffer.open(QIODevice::WriteOnly);
+    QDataStream dataOut(&dataBuffer);
+
+    const int colorsCount = colors.count();
+    dataOut << colorsCount;
+    const QList<QPair<QString, int> > colorKeys = colors.keys();
+    for (int i = 0; i < colorsCount; ++i) {
+        const QPair<QString, int> &key = colorKeys.at(i);
+        dataOut << key;
+        const QColor color = colors.value(key);
+        dataOut << color;
+    }
+
+    const int picturesCount = partPictures.count();
+    dataOut << picturesCount;
+    foreach (const QString &key, partPictures.keys()) {
+        const QPicture picture = partPictures.value(key);
+        dataOut << key;
+        dataOut << picture;
+    }
+
+    QDataStream blobOut(&blob);
+    blobOut << blobVersion;
+    blobOut << qCompress(data);
+    return blobOut.status() == QDataStream::Ok;
+}
+
+bool loadThemeFromBlob(const QString &themeBlob,
+    QHash<QString, QPicture> &partPictures,
+    QHash<QPair<QString, int>, QColor> &colors)
+{
+    QFile blob(themeBlob);
+    if (!blob.open(QIODevice::ReadOnly)) {
+        qWarning() << __FUNCTION__ << ": Could not read blob: " << themeBlob;
+        return false;
+    }
+    QDataStream blobIn(&blob);
+
+    quint32 version;
+    blobIn >> version;
+
+    if (version != blobVersion) {
+        qWarning() << __FUNCTION__ << ": Invalid blob version: " << version << " ...expected: " << blobVersion;
+        return false;
+    }
+
+    QByteArray data;
+    blobIn >> data;
+    data = qUncompress(data);
+    QBuffer dataBuffer(&data);
+    dataBuffer.open(QIODevice::ReadOnly);
+    QDataStream dataIn(&dataBuffer);
+
+    int colorsCount;
+    dataIn >> colorsCount;
+    for (int i = 0; i < colorsCount; ++i) {
+        QPair<QString, int> key;
+        dataIn >> key;
+        QColor value;
+        dataIn >> value;
+        colors.insert(key, value);
+    }
+
+    int picturesCount;
+    dataIn >> picturesCount;
+    for (int i = 0; i < picturesCount; ++i) {
+        QString key;
+        dataIn >> key;
+        QPicture value;
+        dataIn >> value;
+        value.setBoundingRect(QRect(0, 0, pictureSize, pictureSize)); // Bug? The forced bounding rect was not deserialized.
+        partPictures.insert(key, value);
+    }
+
+    if (dataIn.status() != QDataStream::Ok) {
+        qWarning() << __FUNCTION__ << ": Invalid data blob: " << themeBlob;
+        return false;
+    }
+    return true;
+}
+
+class QS60StyleModeSpecifics
+{
+public:
+    static QPixmap skinnedGraphics(QS60StyleEnums::SkinParts stylepart,
+        const QSize &size, QS60StylePrivate::SkinElementFlags flags);
+    static QHash<QString, QPicture> m_partPictures;
+    static QHash<QPair<QString , int>, QColor> m_colors;
+};
+QHash<QString, QPicture> QS60StyleModeSpecifics::m_partPictures;
+QHash<QPair<QString , int>, QColor> QS60StyleModeSpecifics::m_colors;
+
+QS60StylePrivate::QS60StylePrivate()
+{
+    setCurrentLayout(0);
+}
+
+QColor QS60StylePrivate::s60Color(QS60StyleEnums::ColorLists list,
+    int index, const QStyleOption *option)
+{
+    const QString listKey = QS60Style::colorListKeys().at(list);
+    return QS60StylePrivate::stateColor(
+        QS60StyleModeSpecifics::m_colors.value(QPair<QString, int>(listKey, index)),
+        option
+    );
+}
+
+QPixmap QS60StylePrivate::part(QS60StyleEnums::SkinParts part, const QSize &size,
+                               QS60StylePrivate::SkinElementFlags flags)
+{
+    const QString partKey = QS60Style::partKeys().at(part);
+    const QPicture partPicture = QS60StyleModeSpecifics::m_partPictures.value(partKey);
+    QSize partSize(partPicture.boundingRect().size());
+    if (flags & (SF_PointEast | SF_PointWest)) {
+        const int temp = partSize.width();
+        partSize.setWidth(partSize.height());
+        partSize.setHeight(temp);
+    }
+    const qreal scaleX = size.width() / (qreal)partSize.width();
+    const qreal scaleY = size.height() / (qreal)partSize.height();
+
+    QImage partImage(size, QImage::Format_ARGB32);
+    partImage.fill(Qt::transparent);
+    QPainter resultPainter(&partImage);
+    QTransform t;
+
+    if (flags & SF_PointEast)
+        t.translate(size.width(), 0);
+    else if (flags & SF_PointSouth)
+        t.translate(size.width(), size.height());
+    else if (flags & SF_PointWest)
+        t.translate(0, size.height());
+
+    t.scale(scaleX, scaleY);
+
+    if (flags & SF_PointEast)
+        t.rotate(90);
+    else if (flags & SF_PointSouth)
+        t.rotate(180);
+    else if (flags & SF_PointWest)
+        t.rotate(270);
+
+    resultPainter.setTransform(t, true);
+    const_cast<QPicture *>(&partPicture)->play(&resultPainter);
+    resultPainter.end();
+
+    QPixmap result = QPixmap::fromImage(partImage);
+    if (flags & SF_StateDisabled) {
+        QStyleOption opt;
+        QPalette *themePalette = QS60StylePrivate::themePalette();
+        if (themePalette)
+            opt.palette = *themePalette;
+        result = QApplication::style()->generatedIconPixmap(QIcon::Disabled, result, &opt);
+    }
+
+    return result;
+}
+
+QPixmap QS60StylePrivate::frame(SkinFrameElements frame, const QSize &size,
+    SkinElementFlags flags)
+{
+    const QS60StyleEnums::SkinParts center =        m_frameElementsData[frame].center;
+    const QS60StyleEnums::SkinParts topLeft =       QS60StyleEnums::SkinParts(center - 8);
+    const QS60StyleEnums::SkinParts topRight =      QS60StyleEnums::SkinParts(center - 7);
+    const QS60StyleEnums::SkinParts bottomLeft =    QS60StyleEnums::SkinParts(center - 6);
+    const QS60StyleEnums::SkinParts bottomRight =   QS60StyleEnums::SkinParts(center - 5);
+    const QS60StyleEnums::SkinParts top =           QS60StyleEnums::SkinParts(center - 4);
+    const QS60StyleEnums::SkinParts bottom =        QS60StyleEnums::SkinParts(center - 3);
+    const QS60StyleEnums::SkinParts left =          QS60StyleEnums::SkinParts(center - 2);
+    const QS60StyleEnums::SkinParts right =         QS60StyleEnums::SkinParts(center - 1);
+
+    // The size of topLeft defines all other sizes
+    const QSize cornerSize(partSize(topLeft));
+    // if frame is so small that corners would cover it completely, draw only center piece
+    const bool drawOnlyCenter =
+         2 * cornerSize.width() + 1 >= size.width() || 2 * cornerSize.height() + 1 >= size.height();
+
+    const int cornerWidth = cornerSize.width();
+    const int cornerHeight = cornerSize.height();
+    const int rectWidth = size.width();
+    const int rectHeight = size.height();
+    const QRect rect(QPoint(), size);
+
+    const QRect topLeftRect = QRect(rect.topLeft(), cornerSize);
+    const QRect topRect = rect.adjusted(cornerWidth, 0, -cornerWidth, -(rectHeight - cornerHeight));
+    const QRect topRightRect = topLeftRect.translated(rectWidth - cornerWidth, 0);
+    const QRect rightRect = rect.adjusted(rectWidth - cornerWidth, cornerHeight, 0, -cornerHeight);
+    const QRect bottomRightRect = topRightRect.translated(0, rectHeight - cornerHeight);
+    const QRect bottomRect = topRect.translated(0, rectHeight - cornerHeight);
+    const QRect bottomLeftRect = topLeftRect.translated(0, rectHeight - cornerHeight);
+    const QRect leftRect = rightRect.translated(cornerWidth - rectWidth, 0);
+    const QRect centerRect = drawOnlyCenter ? rect : rect.adjusted(cornerWidth, cornerWidth, -cornerWidth, -cornerWidth);
+
+    QPixmap result(size);
+    result.fill(Qt::transparent);
+    QPainter painter(&result);
+
+#if 0
+    painter.save();
+    painter.setOpacity(.3);
+    painter.fillRect(topLeftRect, Qt::red);
+    painter.fillRect(topRect, Qt::green);
+    painter.fillRect(topRightRect, Qt::blue);
+    painter.fillRect(rightRect, Qt::green);
+    painter.fillRect(bottomRightRect, Qt::red);
+    painter.fillRect(bottomRect, Qt::blue);
+    painter.fillRect(bottomLeftRect, Qt::green);
+    painter.fillRect(leftRect, Qt::blue);
+    painter.fillRect(centerRect, Qt::red);
+    painter.restore();
+#else
+    drawPart(topLeft, &painter, topLeftRect, flags);
+    drawPart(top, &painter, topRect, flags);
+    drawPart(topRight, &painter, topRightRect, flags);
+    drawPart(right, &painter, rightRect, flags);
+    drawPart(bottomRight, &painter, bottomRightRect, flags);
+    drawPart(bottom, &painter, bottomRect, flags);
+    drawPart(bottomLeft, &painter, bottomLeftRect, flags);
+    drawPart(left, &painter, leftRect, flags);
+    drawPart(center, &painter, centerRect, flags);
+#endif
+
+    return result;
+}
+
+void QS60StylePrivate::setStyleProperty_specific(const char *name, const QVariant &value)
+{
+    setStyleProperty(name, value);
+}
+
+QVariant QS60StylePrivate::styleProperty_specific(const char *name) const
+{
+    return styleProperty(name);
+}
+
+QPixmap QS60StylePrivate::backgroundTexture()
+{
+    if (!m_background) {
+        const QSize size = QApplication::desktop()->screen()->size();
+        QPixmap background = part(QS60StyleEnums::SP_QsnBgScreen, size);
+        m_background = new QPixmap(background);
+    }
+    return *m_background;
+}
+
+
+bool QS60StylePrivate::isTouchSupported()
+{
+#ifdef QT_KEYPAD_NAVIGATION
+    return !QApplication::keypadNavigationEnabled();
+#else
+    return true;
+#endif
+}
+
+bool QS60StylePrivate::isToolBarBackground()
+{
+    return true;
+}
+
+QFont QS60StylePrivate::s60Font_specific(QS60StyleEnums::FontCategories fontCategory, int pointSize)
+{
+    QFont result;
+    result.setPointSize(pointSize);
+    switch (fontCategory) {
+        case QS60StyleEnums::FC_Primary:
+            result.setBold(true);
+            break;
+        case QS60StyleEnums::FC_Secondary:
+        case QS60StyleEnums::FC_Title:
+        case QS60StyleEnums::FC_PrimarySmall:
+        case QS60StyleEnums::FC_Digital:
+        case QS60StyleEnums::FC_Undefined:
+        default:
+            break;
+    }
+    return result;
+}
+
+/*!
+  Constructs a QS60Style object.
+*/
+QS60Style::QS60Style()
+    : QCommonStyle(*new QS60StylePrivate)
+{
+    // Assume, that the resource system has a ':/s60Stylethemes/Default.blob'
+    const QString defaultBlob = QString::fromLatin1(":/s60Stylethemes/Default.blob");
+    if (QFile::exists(defaultBlob))
+        loadS60ThemeFromBlob(defaultBlob);
+}
+
+Q_GLOBAL_STATIC_WITH_INITIALIZER(QStringList, enumPartKeys, {
+    const int enumIndex = QS60StyleEnums::staticMetaObject.indexOfEnumerator("SkinParts");
+    Q_ASSERT(enumIndex >= 0);
+    const QMetaEnum metaEnum = QS60StyleEnums::staticMetaObject.enumerator(enumIndex);
+    for (int i = 0; i < metaEnum.keyCount(); ++i) {
+        const QString enumKey = QString::fromLatin1(metaEnum.key(i));
+        QString partKey;
+        // Following loop does following conversions: "SP_QgnNoteInfo" to "qgn_note_info"...
+        for (int charPosition = 3; charPosition < enumKey.length(); charPosition++) {
+            if (charPosition > 3 && enumKey[charPosition].isUpper())
+                partKey.append(QChar::fromLatin1('_'));
+            partKey.append(enumKey[charPosition].toLower());
+        }
+        x->append(partKey);
+    }
+})
+
+QStringList QS60Style::partKeys()
+{
+    return *enumPartKeys();
+}
+
+Q_GLOBAL_STATIC_WITH_INITIALIZER(QStringList, enumColorListKeys, {
+    const int enumIndex = QS60StyleEnums::staticMetaObject.indexOfEnumerator("ColorLists");
+    Q_ASSERT(enumIndex >= 0);
+    const QMetaEnum metaEnum = QS60StyleEnums::staticMetaObject.enumerator(enumIndex);
+    for (int i = 0; i < metaEnum.keyCount(); i++) {
+        const QString enumKey = QString::fromLatin1(metaEnum.key(i));
+        // Following line does following conversions: CL_QsnTextColors to "text"...
+        x->append(enumKey.mid(6, enumKey.length() - 12).toLower());
+    }
+})
+
+QStringList QS60Style::colorListKeys()
+{
+    return *enumColorListKeys();
+}
+
+void QS60Style::setS60Theme(const QHash<QString, QPicture> &parts,
+    const QHash<QPair<QString , int>, QColor> &colors)
+{
+    Q_D(QS60Style);
+    QS60StyleModeSpecifics::m_partPictures = parts;
+    QS60StyleModeSpecifics::m_colors = colors;
+    d->clearCaches(QS60StylePrivate::CC_ThemeChange);
+    d->setBackgroundTexture(qApp);
+    d->setThemePalette(qApp);
+}
+
+bool QS60Style::loadS60ThemeFromBlob(const QString &blobFile)
+{
+    QHash<QString, QPicture> partPictures;
+    QHash<QPair<QString, int>, QColor> colors;
+
+    if (!loadThemeFromBlob(blobFile, partPictures, colors))
+        return false;
+    setS60Theme(partPictures, colors);
+    return true;
+}
+
+bool QS60Style::saveS60ThemeToBlob(const QString &blobFile) const
+{
+    return saveThemeToBlob(blobFile,
+        QS60StyleModeSpecifics::m_partPictures, QS60StyleModeSpecifics::m_colors);
+}
+
+QPoint qt_s60_fill_background_offset(const QWidget *targetWidget)
+{
+    Q_UNUSED(targetWidget)
+    return QPoint();
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_STYLE_S60 || QT_PLUGIN
diff --git a/src/gui/styles/qstyle_p.h b/src/gui/styles/qstyle_p.h
index 2d6ef22214..11be2f86af 100644
--- a/src/gui/styles/qstyle_p.h
+++ b/src/gui/styles/qstyle_p.h
@@ -65,7 +65,7 @@ class QStyle;
 
 class QStylePrivate: public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QStyle);
+    Q_DECLARE_PUBLIC(QStyle)
 public:
     inline QStylePrivate()
         : layoutSpacingIndex(-1), proxyStyle(0) {}
diff --git a/src/gui/styles/qstyle_s60_simulated.qrc b/src/gui/styles/qstyle_s60_simulated.qrc
new file mode 100644
index 0000000000..72aab9e624
--- /dev/null
+++ b/src/gui/styles/qstyle_s60_simulated.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource prefix="/trolltech/styles/s60style">
+        <file>images/s60themes.dat</file>
+    </qresource>
+</RCC>
diff --git a/src/gui/styles/qstylefactory.cpp b/src/gui/styles/qstylefactory.cpp
index 36f405caff..a1d585ddac 100644
--- a/src/gui/styles/qstylefactory.cpp
+++ b/src/gui/styles/qstylefactory.cpp
@@ -69,6 +69,9 @@
 #ifndef QT_NO_STYLE_WINDOWSMOBILE
 #include "qwindowsmobilestyle.h"
 #endif
+#ifndef QT_NO_STYLE_S60
+#include "qs60style.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -154,6 +157,11 @@ QStyle *QStyleFactory::create(const QString& key)
         ret = new QCDEStyle;
     else
 #endif
+#ifndef QT_NO_STYLE_S60
+    if (style == QLatin1String("s60"))
+        ret = new QS60Style;
+    else
+#endif
 #ifndef QT_NO_STYLE_PLASTIQUE
     if (style == QLatin1String("plastique"))
         ret = new QPlastiqueStyle;
@@ -233,6 +241,10 @@ QStringList QStyleFactory::keys()
     if (!list.contains(QLatin1String("CDE")))
         list << QLatin1String("CDE");
 #endif
+#ifndef QT_NO_STYLE_S60
+    if (!list.contains(QLatin1String("S60")))
+        list << QLatin1String("S60");
+#endif
 #ifndef QT_NO_STYLE_PLASTIQUE
     if (!list.contains(QLatin1String("Plastique")))
         list << QLatin1String("Plastique");
diff --git a/src/gui/styles/qstylesheetstyle_default.cpp b/src/gui/styles/qstylesheetstyle_default.cpp
index b008c12227..91464f7a94 100644
--- a/src/gui/styles/qstylesheetstyle_default.cpp
+++ b/src/gui/styles/qstylesheetstyle_default.cpp
@@ -154,11 +154,12 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
     Value value;
     Pseudo pseudo;
     AttributeSelector attr;
-    
+
     // pixmap based style doesn't support any features
     bool styleIsPixmapBased = baseStyle()->inherits("QMacStyle")
                            || baseStyle()->inherits("QWindowsXPStyle")
-                           || baseStyle()->inherits("QGtkStyle");
+                           || baseStyle()->inherits("QGtkStyle")
+                           || baseStyle()->inherits("QS60Style");
 
 
     /*QLineEdit {
@@ -212,7 +213,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
         ADD_BASIC_SELECTOR;
         ADD_SELECTOR;
 
-        
+
         SET_PROPERTY(QLatin1String("padding-top"), PaddingTop);
         ADD_VALUE(Value::Identifier, QString::fromLatin1("2px"));
         ADD_DECLARATION;
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp
index 4c66bbb79a..bc1df9d546 100644
--- a/src/gui/styles/qwindowsstyle.cpp
+++ b/src/gui/styles/qwindowsstyle.cpp
@@ -122,7 +122,8 @@ static const int windowsItemHMargin      =  3; // menu item hor text margin
 static const int windowsItemVMargin      =  2; // menu item ver text margin
 static const int windowsArrowHMargin     =  6; // arrow horizontal margin
 static const int windowsTabSpacing       = 12; // space between text and tab
-static const int windowsCheckMarkHMargin =  2; // horiz. margins of check mark
+// Save some space and avoid warning.
+//static const int windowsCheckMarkHMargin =  2; // horiz. margins of check mark
 static const int windowsRightBorder      = 15; // right border on windows
 static const int windowsCheckMarkWidth   = 12; // checkmarks width on windows
 
@@ -2485,7 +2486,6 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
 
             bool floating = false;
             bool active = dwOpt->state & State_Active;
-            int menuOffset = 0; //used to center text when floated
             QColor inactiveCaptionTextColor = d->inactiveCaptionText;
             if (dwOpt->movable) {
                 QColor left, right;
@@ -2500,7 +2500,6 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                         left = d->inactiveCaptionColor;
                         right = d->inactiveGradientCaptionColor;
                     }
-                    menuOffset = 2;
                     QBrush fillBrush(left);
                     if (left != right) {
                         QPoint p1(r.x(), r.top() + r.height()/2);
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri
index d255f80c27..277be765d6 100644
--- a/src/gui/styles/styles.pri
+++ b/src/gui/styles/styles.pri
@@ -161,3 +161,19 @@ contains( styles, windowsmobile ) {
 	DEFINES += QT_NO_STYLE_WINDOWSMOBILE
 }
 
+contains( styles, s60 ):contains(QT_CONFIG, s60) {
+	HEADERS += \
+		styles/qs60style.h \
+		styles/qs60style_p.h
+	SOURCES += styles/qs60style.cpp
+	symbian {
+		SOURCES += styles/qs60style_s60.cpp
+		# TODO: fix the following LIBS hack. Line 1 is for armv5, 2 for winscw
+		LIBS += aknicon aknskins aknskinsrv fontutils
+		LIBS += -laknicon -laknskins -laknskinsrv -lfontutils
+	} else {
+		SOURCES += styles/qs60style_simulated.cpp
+	}
+} else {
+	DEFINES += QT_NO_STYLE_S60
+}
diff --git a/src/gui/text/qabstractfontengine_p.h b/src/gui/text/qabstractfontengine_p.h
index 3d0f3485a5..44011738cd 100644
--- a/src/gui/text/qabstractfontengine_p.h
+++ b/src/gui/text/qabstractfontengine_p.h
@@ -91,7 +91,7 @@ public:
     virtual Type type() const { return Proxy; }
     virtual const char *name() const { return "proxy engine"; }
 
-#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
+#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN)
     virtual void draw(QPaintEngine *, qreal, qreal, const QTextItemInt &);
 #endif
 
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index db5ed7c504..99374b5bf8 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -48,6 +48,7 @@
 #include <qfontmetrics.h>
 #include <qbrush.h>
 #include <qimagereader.h>
+#include "private/qfunctions_p.h"
 
 #ifndef QT_NO_CSSPARSER
 
@@ -340,12 +341,12 @@ static const QCssKnownValue styleFeatures[NumKnownStyleFeatures - 1] = {
     { "none", StyleFeature_None }
 };
 
-static bool operator<(const QString &name, const QCssKnownValue &prop)
+Q_STATIC_GLOBAL_OPERATOR bool operator<(const QString &name, const QCssKnownValue &prop)
 {
     return QString::compare(name, QLatin1String(prop.name), Qt::CaseInsensitive) < 0;
 }
 
-static bool operator<(const QCssKnownValue &prop, const QString &name)
+Q_STATIC_GLOBAL_OPERATOR bool operator<(const QCssKnownValue &prop, const QString &name)
 {
     return QString::compare(QLatin1String(prop.name), name, Qt::CaseInsensitive) < 0;
 }
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index dfd5f245aa..a57519957e 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -72,6 +72,9 @@
 #include "qfontengine_qpf_p.h"
 #endif
 #endif
+#ifdef Q_OS_SYMBIAN
+#include "qt_s60_p.h"
+#endif
 
 #include <QMutexLocker>
 
@@ -169,6 +172,8 @@ Q_GUI_EXPORT int qt_defaultDpiX()
     if (!subScreens.isEmpty())
         screen = subScreens.at(0);
     dpi = qRound(screen->width() / (screen->physicalWidth() / qreal(25.4)));
+#elif defined(Q_OS_SYMBIAN)
+    dpi = S60->defaultDpiX;
 #endif // Q_WS_X11
 
     return dpi;
@@ -195,6 +200,8 @@ Q_GUI_EXPORT int qt_defaultDpiY()
     if (!subScreens.isEmpty())
         screen = subScreens.at(0);
     dpi = qRound(screen->height() / (screen->physicalHeight() / qreal(25.4)));
+#elif defined(Q_OS_SYMBIAN)
+    dpi = S60->defaultDpiY;
 #endif // Q_WS_X11
 
     return dpi;
@@ -307,7 +314,7 @@ QFontPrivate *QFontPrivate::smallCapsFontPrivate() const
         font.setPointSizeF(pointSize * .7);
     else
         font.setPixelSize((font.pixelSize() * 7 + 5) / 10);
-    scFont = font.d;
+    scFont = font.d.data();
     if (scFont != this)
         scFont->ref.ref();
     return scFont;
@@ -714,12 +721,11 @@ QFont::QFont(const QFont &font, QPaintDevice *pd)
     const int screen = 0;
 #endif
     if (font.d->dpi != dpi || font.d->screen != screen ) {
-        d = new QFontPrivate(*font.d);
+        d.reset(new QFontPrivate(*font.d));
         d->dpi = dpi;
         d->screen = screen;
     } else {
-        d = font.d;
-        d->ref.ref();
+        d.assign(font.d.data());
     }
 #ifdef Q_WS_WIN
     if (pd->devType() == QInternal::Printer && pd->getDC())
@@ -733,8 +739,7 @@ QFont::QFont(const QFont &font, QPaintDevice *pd)
 QFont::QFont(QFontPrivate *data)
     : resolve_mask(QFont::AllPropertiesResolved)
 {
-    d = data;
-    d->ref.ref();
+    d.assign(data);
 }
 
 /*! \internal
@@ -746,13 +751,13 @@ void QFont::detach()
         if (d->engineData)
             d->engineData->ref.deref();
         d->engineData = 0;
-        if (d->scFont && d->scFont != d)
+        if (d->scFont && d->scFont != d.data())
             d->scFont->ref.deref();
         d->scFont = 0;
         return;
     }
 
-    qAtomicDetach(d);
+    d.detach();
 }
 
 /*!
@@ -761,9 +766,9 @@ void QFont::detach()
     \sa QApplication::setFont(), QApplication::font()
 */
 QFont::QFont()
-    :d(QApplication::font().d), resolve_mask(0)
+    :resolve_mask(0)
 {
-    d->ref.ref();
+    d.assign(QApplication::font().d.data());
 }
 
 /*!
@@ -783,12 +788,16 @@ QFont::QFont()
     setStyleHint() QApplication::font()
 */
 QFont::QFont(const QString &family, int pointSize, int weight, bool italic)
-    :d(new QFontPrivate)
 {
+    d.reset(new QFontPrivate());
     resolve_mask = QFont::FamilyResolved;
 
     if (pointSize <= 0) {
+#ifdef Q_OS_SYMBIAN
+        pointSize = 7;
+#else
         pointSize = 12;
+#endif
     } else {
         resolve_mask |= QFont::SizeResolved;
     }
@@ -811,8 +820,7 @@ QFont::QFont(const QString &family, int pointSize, int weight, bool italic)
 */
 QFont::QFont(const QFont &font)
 {
-    d = font.d;
-    d->ref.ref();
+    d.assign(font.d.data());
     resolve_mask = font.resolve_mask;
 }
 
@@ -821,8 +829,6 @@ QFont::QFont(const QFont &font)
 */
 QFont::~QFont()
 {
-    if (!d->ref.deref())
-        delete d;
 }
 
 /*!
@@ -830,7 +836,7 @@ QFont::~QFont()
 */
 QFont &QFont::operator=(const QFont &font)
 {
-    qAtomicAssign(d, font.d);
+    d.assign(font.d.data());
     resolve_mask = font.resolve_mask;
     return *this;
 }
@@ -1713,7 +1719,7 @@ QFont QFont::resolve(const QFont &other) const
 
     QFont font(*this);
     font.detach();
-    font.d->resolve(resolve_mask, other.d);
+    font.d->resolve(resolve_mask, other.d.data());
 
     return font;
 }
@@ -2166,11 +2172,11 @@ QDataStream &operator<<(QDataStream &s, const QFont &font)
         s << (quint8) font.d->request.styleStrategy;
     s << (quint8) 0
       << (quint8) font.d->request.weight
-      << get_font_bits(s.version(), font.d);
+      << get_font_bits(s.version(), font.d.data());
     if (s.version() >= QDataStream::Qt_4_3)
         s << (quint16)font.d->request.stretch;
     if (s.version() >= QDataStream::Qt_4_4)
-        s << get_extended_font_bits(font.d);
+        s << get_extended_font_bits(font.d.data());
     if (s.version() >= QDataStream::Qt_4_5) {
         s << font.d->letterSpacing.value();
         s << font.d->wordSpacing.value();
@@ -2189,10 +2195,8 @@ QDataStream &operator<<(QDataStream &s, const QFont &font)
 */
 QDataStream &operator>>(QDataStream &s, QFont &font)
 {
-    if (!font.d->ref.deref())
-        delete font.d;
-
-    font.d = new QFontPrivate;
+    font.d.assign(0);
+    font.d.reset(new QFontPrivate);
     font.resolve_mask = QFont::AllPropertiesResolved;
 
     quint8 styleHint, styleStrategy = QFont::PreferDefault, charSet, weight, bits;
@@ -2233,7 +2237,7 @@ QDataStream &operator>>(QDataStream &s, QFont &font)
     font.d->request.styleStrategy = styleStrategy;
     font.d->request.weight = weight;
 
-    set_font_bits(s.version(), bits, font.d);
+    set_font_bits(s.version(), bits, font.d.data());
 
     if (s.version() >= QDataStream::Qt_4_3) {
         quint16 stretch;
@@ -2244,7 +2248,7 @@ QDataStream &operator>>(QDataStream &s, QFont &font)
     if (s.version() >= QDataStream::Qt_4_4) {
         quint8 extendedBits;
         s >> extendedBits;
-        set_extended_font_bits(extendedBits, font.d);
+        set_extended_font_bits(extendedBits, font.d.data());
     }
     if (s.version() >= QDataStream::Qt_4_5) {
         int value;
@@ -2326,7 +2330,7 @@ QDataStream &operator>>(QDataStream &s, QFont &font)
     that is not screen-compatible.
 */
 QFontInfo::QFontInfo(const QFont &font)
-    : d(font.d)
+    : d(font.d.data())
 { d->ref.ref(); }
 
 /*!
@@ -2599,7 +2603,14 @@ QFontCache *QFontCache::instance()
 
 void QFontCache::cleanup()
 {
-    theFontCache()->setLocalData(0);
+    QThreadStorage<QFontCache *> *cache = 0;
+    QT_TRY {
+        cache = theFontCache();
+    } QT_CATCH (const std::bad_alloc &) {
+        // no cache - just ignore
+    }
+    if (cache && cache->hasLocalData())
+        cache->setLocalData(0);
 }
 #endif // QT_NO_THREAD
 
@@ -2612,8 +2623,8 @@ QFontCache::QFontCache()
 QFontCache::~QFontCache()
 {
     {
-        EngineDataCache::Iterator it = engineDataCache.begin(),
-                                 end = engineDataCache.end();
+        EngineDataCache::ConstIterator it = engineDataCache.constBegin(),
+                                 end = engineDataCache.constEnd();
         while (it != end) {
             if (it.value()->ref == 0)
                 delete it.value();
@@ -2623,8 +2634,8 @@ QFontCache::~QFontCache()
             ++it;
         }
     }
-    EngineCache::Iterator it = engineCache.begin(),
-                         end = engineCache.end();
+    EngineCache::ConstIterator it = engineCache.constBegin(),
+                         end = engineCache.constEnd();
     while (it != end) {
         if (--it.value().data->cache_count == 0) {
             if (it.value().data->ref == 0) {
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index cf678912f8..69abe054d1 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -44,6 +44,7 @@
 
 #include <QtGui/qwindowdefs.h>
 #include <QtCore/qstring.h>
+#include <QtCore/qscopedpointer.h>
 
 #if defined(Q_WS_X11) || defined(Q_WS_QWS)
 typedef struct FT_FaceRec_* FT_Face;
@@ -312,7 +313,7 @@ private:
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QFont &);
 #endif
 
-    QFontPrivate *d;
+    QScopedSharedPointer<QFontPrivate> d;
     uint resolve_mask;
 };
 
diff --git a/src/gui/text/qfont_s60.cpp b/src/gui/text/qfont_s60.cpp
new file mode 100644
index 0000000000..533e51f60d
--- /dev/null
+++ b/src/gui/text/qfont_s60.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qfont.h"
+#include "qt_s60_p.h"
+#include <private/qwindowsurface_s60_p.h>
+#include "qmutex.h"
+
+QT_BEGIN_NAMESPACE
+
+#if 1
+#ifdef QT_NO_FREETYPE
+Q_GLOBAL_STATIC(QMutex, lastResortFamilyMutex);
+#endif // QT_NO_FREETYPE
+
+QString QFont::lastResortFamily() const
+{
+#ifdef QT_NO_FREETYPE
+    QMutexLocker locker(lastResortFamilyMutex());
+    static QString family;
+    if (family.isEmpty()) {
+        QS60WindowSurface::unlockBitmapHeap();
+        CFont *font;
+        const TInt err = S60->screenDevice()->GetNearestFontInTwips(font, TFontSpec());
+        Q_ASSERT(err == KErrNone);
+        const TFontSpec spec = font->FontSpecInTwips();
+        family = QString((const QChar *)spec.iTypeface.iName.Ptr(), spec.iTypeface.iName.Length());
+        S60->screenDevice()->ReleaseFont(font);
+        QS60WindowSurface::lockBitmapHeap();
+    }
+    return family;
+#else
+    // For the FreeType case we just hard code the face name, since otherwise on
+    // East Asian systems we may get a name for a stroke based (non-ttf) font.
+
+    // TODO: Get the type face name in a proper way
+
+    const bool isJapaneseOrChineseSystem =
+        User::Language() == ELangJapanese || User::Language() == ELangPrcChinese;
+
+    return QLatin1String(isJapaneseOrChineseSystem?"Heisei Kaku Gothic S60":"Series 60 Sans");
+#endif // QT_NO_FREETYPE
+}
+#else // 0
+QString QFont::lastResortFamily() const
+{
+    return QLatin1String("Series 60 Sans");
+}
+#endif // 0
+
+QString QFont::defaultFamily() const
+{
+    return lastResortFamily();
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 8d5b4603cf..844c3f9d50 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -56,6 +56,11 @@
 #include <stdlib.h>
 #include <limits.h>
 
+#if (defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) && !defined(QT_NO_FREETYPE)
+#  include <ft2build.h>
+#  include FT_TRUETYPE_TABLES_H
+#endif
+
 // #define QFONTDATABASE_DEBUG
 #ifdef QFONTDATABASE_DEBUG
 #  define FD_DEBUG qDebug
@@ -76,6 +81,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#define SMOOTH_SCALABLE 0xffff
+
 extern int qt_defaultDpiY(); // in qfont.cpp
 
 Q_GUI_EXPORT bool qt_enable_test_font = false;
@@ -141,10 +148,10 @@ struct QtFontSize
     QtFontEncoding *encodingID(int id, uint xpoint = 0, uint xres = 0,
                                 uint yres = 0, uint avgwidth = 0, bool add = false);
 #endif // Q_WS_X11
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
     QByteArray fileName;
     int fileIndex;
-#endif
+#endif // defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
 };
 
 
@@ -160,10 +167,13 @@ QtFontEncoding *QtFontSize::encodingID(int id, uint xpoint, uint xres,
 
     if (!add) return 0;
 
-    if (!(count % 4))
-        encodings = (QtFontEncoding *)
+    if (!(count % 4)) {
+        QtFontEncoding *newEncodings = (QtFontEncoding *)
                     realloc(encodings,
                              (((count+4) >> 2) << 2) * sizeof(QtFontEncoding));
+        Q_CHECK_PTR(newEncodings);
+        encodings = newEncodings;
+    }
     encodings[count].encoding = id;
     encodings[count].xpoint = xpoint;
     encodings[count].xres = xres;
@@ -215,12 +225,12 @@ struct QtFontStyle
         delete [] weightName;
         delete [] setwidthName;
 #endif
-#if defined(Q_WS_X11) || defined(Q_WS_QWS)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
         while (count--) {
 #ifdef Q_WS_X11
             free(pixelSizes[count].encodings);
 #endif
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
             pixelSizes[count].fileName.~QByteArray();
 #endif
         }
@@ -238,7 +248,7 @@ struct QtFontStyle
     const char *weightName;
     const char *setwidthName;
 #endif // Q_WS_X11
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
     bool antialiased;
 #endif
 
@@ -267,16 +277,19 @@ QtFontSize *QtFontStyle::pixelSize(unsigned short size, bool add)
     if (!add)
         return 0;
 
-    if (!(count % 8))
-        pixelSizes = (QtFontSize *)
+    if (!(count % 8)) {
+        QtFontSize *newPixelSizes = (QtFontSize *)
                      realloc(pixelSizes,
                               (((count+8) >> 3) << 3) * sizeof(QtFontSize));
+        Q_CHECK_PTR(newPixelSizes);
+        pixelSizes = newPixelSizes;
+    }
     pixelSizes[count].pixelSize = size;
 #ifdef Q_WS_X11
     pixelSizes[count].count = 0;
     pixelSizes[count].encodings = 0;
 #endif
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
     new (&pixelSizes[count].fileName) QByteArray;
     pixelSizes[count].fileIndex = 0;
 #endif
@@ -321,12 +334,16 @@ QtFontStyle *QtFontFoundry::style(const QtFontStyle::Key &key, bool create)
         return 0;
 
 //     qDebug("adding key (weight=%d, style=%d, oblique=%d stretch=%d) at %d", key.weight, key.style, key.oblique, key.stretch, pos);
-    if (!(count % 8))
-        styles = (QtFontStyle **)
+    if (!(count % 8)) {
+        QtFontStyle **newStyles = (QtFontStyle **)
                  realloc(styles, (((count+8) >> 3) << 3) * sizeof(QtFontStyle *));
+        Q_CHECK_PTR(newStyles);
+        styles = newStyles;
+    }
 
+    QtFontStyle *style = new QtFontStyle(key);
     memmove(styles + pos + 1, styles + pos, (count-pos)*sizeof(QtFontStyle *));
-    styles[pos] = new QtFontStyle(key);
+    styles[pos] = style;
     count++;
     return styles[pos];
 }
@@ -358,7 +375,7 @@ struct QtFontFamily
         fixedPitchComputed(false),
 #endif
         name(n), count(0), foundries(0)
-#if defined(Q_WS_QWS)
+#if defined(Q_WS_QWS) ||   defined(Q_OS_SYMBIAN) && !defined(QT_NO_FREETYPE)
         , bogusWritingSystems(false)
 #endif
     {
@@ -388,7 +405,7 @@ struct QtFontFamily
 #endif
 
     QString name;
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11) ||   defined(Q_OS_SYMBIAN) && !defined(QT_NO_FREETYPE)
     QByteArray fontFilename;
     int fontFileIndex;
 #endif
@@ -398,7 +415,7 @@ struct QtFontFamily
     int count;
     QtFontFoundry **foundries;
 
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) ||   defined(Q_OS_SYMBIAN) && !defined(QT_NO_FREETYPE)
     bool bogusWritingSystems;
     QStringList fallbackFamilies;
 #endif
@@ -431,10 +448,13 @@ QtFontFoundry *QtFontFamily::foundry(const QString &f, bool create)
     if (!create)
         return 0;
 
-    if (!(count % 8))
-        foundries = (QtFontFoundry **)
+    if (!(count % 8)) {
+        QtFontFoundry **newFoundries = (QtFontFoundry **)
                     realloc(foundries,
                              (((count+8) >> 3) << 3) * sizeof(QtFontFoundry *));
+        Q_CHECK_PTR(newFoundries);
+        foundries = newFoundries;
+    }
 
     foundries[count] = new QtFontFoundry(f);
     return foundries[count++];
@@ -442,7 +462,7 @@ QtFontFoundry *QtFontFamily::foundry(const QString &f, bool create)
 
 // ### copied to tools/makeqpf/qpf2.cpp
 
-#if (defined(Q_WS_QWS) && !defined(QT_NO_FREETYPE)) || defined(Q_WS_WIN) || (defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA))
+#if (defined(Q_WS_QWS) && !defined(QT_NO_FREETYPE)) || defined(Q_WS_WIN)  || defined(Q_OS_SYMBIAN) || (defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA))
 // see the Unicode subset bitfields in the MSDN docs
 static int requiredUnicodeBits[QFontDatabase::WritingSystemsCount][2] = {
         // Any,
@@ -563,6 +583,15 @@ static QList<QFontDatabase::WritingSystem> determineWritingSystemsFromTrueTypeBi
 }
 #endif
 
+#if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE)
+// class with virtual destructor, derived in qfontdatabase_s60.cpp
+class QFontDatabaseS60Store
+{
+public:
+    virtual ~QFontDatabaseS60Store() {};
+};
+#endif
+
 class QFontDatabasePrivate
 {
 public:
@@ -571,6 +600,9 @@ public:
 #if defined(Q_WS_QWS)
           , stream(0)
 #endif
+#if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE)
+          , s60Store(0)
+#endif
     { }
     ~QFontDatabasePrivate() {
         free();
@@ -582,6 +614,12 @@ public:
         ::free(families);
         families = 0;
         count = 0;
+#if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE)
+        if (s60Store) {
+            delete s60Store;
+            s60Store = 0;
+        }
+#endif
         // don't clear the memory fonts!
     }
 
@@ -609,17 +647,22 @@ public:
 
 #if defined(Q_WS_QWS)
     bool loadFromCache(const QString &fontPath);
+    void addQPF2File(const QByteArray &file);
+#endif // Q_WS_QWS
+#if defined(Q_WS_QWS) ||   defined(Q_OS_SYMBIAN) && !defined(QT_NO_FREETYPE)
     void addFont(const QString &familyname, const char *foundryname, int weight,
                  bool italic, int pixelSize, const QByteArray &file, int fileIndex,
                  bool antialiased,
                  const QList<QFontDatabase::WritingSystem> &writingSystems = QList<QFontDatabase::WritingSystem>());
-    void addQPF2File(const QByteArray &file);
 #ifndef QT_NO_FREETYPE
     QStringList addTTFile(const QByteArray &file, const QByteArray &fontData = QByteArray());
+#endif // QT_NO_FREETYPE
 #endif
-
+#if defined(Q_WS_QWS)
     QDataStream *stream;
     QStringList fallbackFamilies;
+#elif defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE)
+    const QFontDatabaseS60Store *s60Store;
 #endif
 };
 
@@ -654,17 +697,133 @@ QtFontFamily *QFontDatabasePrivate::family(const QString &f, bool create)
         pos++;
 
     // qDebug("adding family %s at %d total=%d", f.latin1(), pos, count);
-    if (!(count % 8))
-        families = (QtFontFamily **)
+    if (!(count % 8)) {
+        QtFontFamily **newFamilies = (QtFontFamily **)
                    realloc(families,
                             (((count+8) >> 3) << 3) * sizeof(QtFontFamily *));
+        Q_CHECK_PTR(newFamilies);
+        families = newFamilies;
+    }
 
+    QtFontFamily *family = new QtFontFamily(f);
     memmove(families + pos + 1, families + pos, (count-pos)*sizeof(QtFontFamily *));
-    families[pos] = new QtFontFamily(f);
+    families[pos] = family;
     count++;
     return families[pos];
 }
 
+#if defined(Q_WS_QWS) ||   defined(Q_OS_SYMBIAN) && !defined(QT_NO_FREETYPE)
+void QFontDatabasePrivate::addFont(const QString &familyname, const char *foundryname, int weight, bool italic, int pixelSize,
+                                   const QByteArray &file, int fileIndex, bool antialiased,
+                                   const QList<QFontDatabase::WritingSystem> &writingSystems)
+{
+//    qDebug() << "Adding font" << familyname << weight << italic << pixelSize << file << fileIndex << antialiased;
+    QtFontStyle::Key styleKey;
+    styleKey.style = italic ? QFont::StyleItalic : QFont::StyleNormal;
+    styleKey.weight = weight;
+    styleKey.stretch = 100;
+    QtFontFamily *f = family(familyname, true);
+
+    if (writingSystems.isEmpty()) {
+        for (int ws = 1; ws < QFontDatabase::WritingSystemsCount; ++ws) {
+            f->writingSystems[ws] = QtFontFamily::Supported;
+        }
+        f->bogusWritingSystems = true;
+    } else {
+        for (int i = 0; i < writingSystems.count(); ++i) {
+            f->writingSystems[writingSystems.at(i)] = QtFontFamily::Supported;
+        }
+    }
+
+    QtFontFoundry *foundry = f->foundry(QString::fromLatin1(foundryname), true);
+    QtFontStyle *style = foundry->style(styleKey,  true);
+    style->smoothScalable = (pixelSize == 0);
+    style->antialiased = antialiased;
+    QtFontSize *size = style->pixelSize(pixelSize?pixelSize:SMOOTH_SCALABLE, true);
+    size->fileName = file;
+    size->fileIndex = fileIndex;
+
+#if defined(Q_WS_QWS)
+    if (stream) {
+        *stream << familyname << foundry->name << weight << quint8(italic) << pixelSize
+                << file << fileIndex << quint8(antialiased);
+        *stream << quint8(writingSystems.count());
+        for (int i = 0; i < writingSystems.count(); ++i)
+            *stream << quint8(writingSystems.at(i));
+    }
+#else // ..in case of defined(Q_OS_SYMBIAN) && !defined(QT_NO_FREETYPE)
+    f->fontFilename = file;
+    f->fontFileIndex = fileIndex;
+#endif
+}
+#endif
+
+#if (defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) && !defined(QT_NO_FREETYPE)
+QStringList QFontDatabasePrivate::addTTFile(const QByteArray &file, const QByteArray &fontData)
+{
+    QStringList families;
+    extern FT_Library qt_getFreetype();
+    FT_Library library = qt_getFreetype();
+
+    int index = 0;
+    int numFaces = 0;
+    do {
+        FT_Face face;
+        FT_Error error;
+        if (!fontData.isEmpty()) {
+            error = FT_New_Memory_Face(library, (const FT_Byte *)fontData.constData(), fontData.size(), index, &face);
+        } else {
+            error = FT_New_Face(library, file, index, &face);
+        }
+        if (error != FT_Err_Ok) {
+            qDebug() << "FT_New_Face failed with index" << index << ":" << hex << error;
+            break;
+        }
+        numFaces = face->num_faces;
+
+        int weight = QFont::Normal;
+        bool italic = face->style_flags & FT_STYLE_FLAG_ITALIC;
+
+        if (face->style_flags & FT_STYLE_FLAG_BOLD)
+            weight = QFont::Bold;
+
+        QList<QFontDatabase::WritingSystem> writingSystems;
+        // detect symbol fonts
+        for (int i = 0; i < face->num_charmaps; ++i) {
+            FT_CharMap cm = face->charmaps[i];
+            if (cm->encoding == ft_encoding_adobe_custom
+                    || cm->encoding == ft_encoding_symbol) {
+                writingSystems.append(QFontDatabase::Symbol);
+                break;
+            }
+        }
+        if (writingSystems.isEmpty()) {
+            TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, ft_sfnt_os2);
+            if (os2) {
+                quint32 unicodeRange[4] = {
+                    os2->ulUnicodeRange1, os2->ulUnicodeRange2, os2->ulUnicodeRange3, os2->ulUnicodeRange4
+                };
+                quint32 codePageRange[2] = {
+                    os2->ulCodePageRange1, os2->ulCodePageRange2
+                };
+
+                writingSystems = determineWritingSystemsFromTrueTypeBits(unicodeRange, codePageRange);
+                //for (int i = 0; i < writingSystems.count(); ++i)
+                //    qDebug() << QFontDatabase::writingSystemName(writingSystems.at(i));
+            }
+        }
+
+        QString family = QString::fromAscii(face->family_name);
+        families.append(family);
+        addFont(family, /*foundry*/ "", weight, italic,
+                /*pixelsize*/ 0, file, index, /*antialias*/ true, writingSystems);
+
+        FT_Done_Face(face);
+        ++index;
+    } while (index < numFaces);
+    return families;
+}
+#endif
 
 static const int scriptForWritingSystem[] = {
     QUnicodeTables::Common, // Any
@@ -814,7 +973,7 @@ static void initFontDef(const QtFontDesc &desc, const QFontDef &request, QFontDe
 #endif
 #endif
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
 static void getEngineData(const QFontPrivate *d, const QFontCache::Key &key)
 {
     // look for the requested font in the engine data cache
@@ -866,8 +1025,6 @@ QMutex *qt_fontdatabase_mutex()
     return fontDatabaseMutex();
 }
 
-#define SMOOTH_SCALABLE 0xffff
-
 QT_BEGIN_INCLUDE_NAMESPACE
 #if defined(Q_WS_X11)
 #  include "qfontdatabase_x11.cpp"
@@ -877,6 +1034,8 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #  include "qfontdatabase_win.cpp"
 #elif defined(Q_WS_QWS)
 #  include "qfontdatabase_qws.cpp"
+#elif defined(Q_OS_SYMBIAN)
+#  include "qfontdatabase_s60.cpp"
 #endif
 QT_END_INCLUDE_NAMESPACE
 
@@ -2254,7 +2413,16 @@ QString QFontDatabase::writingSystemSample(WritingSystem writingSystem)
         sample += QChar(0xac2f);
         break;
     case Vietnamese:
+    {
+        static const char vietnameseUtf8[] = {
+            char(0xef), char(0xbb), char(0xbf), char(0xe1), char(0xbb), char(0x97),
+            char(0xe1), char(0xbb), char(0x99),
+            char(0xe1), char(0xbb), char(0x91),
+            char(0xe1), char(0xbb), char(0x93),
+        };
+        sample += QString::fromUtf8(vietnameseUtf8, sizeof(vietnameseUtf8));
         break;
+    }
     case Ogham:
         sample += QChar(0x1681);
         sample += QChar(0x1682);
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index 4fffc33b38..e0a7c4181b 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -151,7 +151,7 @@ public:
 private:
     static void createDatabase();
     static void parseFontName(const QString &name, QString &foundry, QString &family);
-#if defined(Q_WS_QWS)
+#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
     static QFontEngine *findFont(int script, const QFontPrivate *fp, const QFontDef &request);
 #endif
     static void load(const QFontPrivate *d, int script);
@@ -165,6 +165,7 @@ private:
     friend class QFontDialogPrivate;
     friend class QFontEngineMultiXLFD;
     friend class QFontEngineMultiQWS;
+    friend class QFontEngineMultiS60;
 
     QFontDatabasePrivate *d;
 };
diff --git a/src/gui/text/qfontdatabase_qws.cpp b/src/gui/text/qfontdatabase_qws.cpp
index 34239ff3b6..040750868b 100644
--- a/src/gui/text/qfontdatabase_qws.cpp
+++ b/src/gui/text/qfontdatabase_qws.cpp
@@ -50,7 +50,6 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include FT_TRUETYPE_TABLES_H
 
 #endif
 #include "qfontengine_qpf_p.h"
@@ -83,44 +82,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
 
 const quint8 DatabaseVersion = 4;
 
-void QFontDatabasePrivate::addFont(const QString &familyname, const char *foundryname, int weight, bool italic, int pixelSize,
-                                   const QByteArray &file, int fileIndex, bool antialiased,
-                                   const QList<QFontDatabase::WritingSystem> &writingSystems)
-{
-//    qDebug() << "Adding font" << familyname << weight << italic << pixelSize << file << fileIndex << antialiased;
-    QtFontStyle::Key styleKey;
-    styleKey.style = italic ? QFont::StyleItalic : QFont::StyleNormal;
-    styleKey.weight = weight;
-    styleKey.stretch = 100;
-    QtFontFamily *f = family(familyname, true);
-
-    if (writingSystems.isEmpty()) {
-        for (int ws = 1; ws < QFontDatabase::WritingSystemsCount; ++ws) {
-            f->writingSystems[ws] = QtFontFamily::Supported;
-        }
-        f->bogusWritingSystems = true;
-    } else {
-        for (int i = 0; i < writingSystems.count(); ++i) {
-            f->writingSystems[writingSystems.at(i)] = QtFontFamily::Supported;
-        }
-    }
-
-    QtFontFoundry *foundry = f->foundry(QString::fromLatin1(foundryname), true);
-    QtFontStyle *style = foundry->style(styleKey,  true);
-    style->smoothScalable = (pixelSize == 0);
-    style->antialiased = antialiased;
-    QtFontSize *size = style->pixelSize(pixelSize?pixelSize:SMOOTH_SCALABLE, true);
-    size->fileName = file;
-    size->fileIndex = fileIndex;
-
-    if (stream) {
-        *stream << familyname << foundry->name << weight << quint8(italic) << pixelSize
-                << file << fileIndex << quint8(antialiased);
-        *stream << quint8(writingSystems.count());
-        for (int i = 0; i < writingSystems.count(); ++i)
-            *stream << quint8(writingSystems.at(i));
-    }
-}
+// QFontDatabasePrivate::addFont() went into qfontdatabase.cpp
 
 #ifndef QT_NO_QWS_QPF2
 void QFontDatabasePrivate::addQPF2File(const QByteArray &file)
@@ -180,74 +142,9 @@ void QFontDatabasePrivate::addQPF2File(const QByteArray &file)
     QT_CLOSE(f);
 #endif
 }
-#endif
-
-#ifndef QT_NO_FREETYPE
-QStringList QFontDatabasePrivate::addTTFile(const QByteArray &file, const QByteArray &fontData)
-{
-    QStringList families;
-    extern FT_Library qt_getFreetype();
-    FT_Library library = qt_getFreetype();
-
-    int index = 0;
-    int numFaces = 0;
-    do {
-        FT_Face face;
-        FT_Error error;
-        if (!fontData.isEmpty()) {
-            error = FT_New_Memory_Face(library, (const FT_Byte *)fontData.constData(), fontData.size(), index, &face);
-        } else {
-            error = FT_New_Face(library, file, index, &face);
-        }
-        if (error != FT_Err_Ok) {
-            qDebug() << "FT_New_Face failed with index" << index << ":" << hex << error;
-            break;
-        }
-        numFaces = face->num_faces;
-
-        int weight = QFont::Normal;
-        bool italic = face->style_flags & FT_STYLE_FLAG_ITALIC;
-
-        if (face->style_flags & FT_STYLE_FLAG_BOLD)
-            weight = QFont::Bold;
-
-        QList<QFontDatabase::WritingSystem> writingSystems;
-        // detect symbol fonts
-        for (int i = 0; i < face->num_charmaps; ++i) {
-            FT_CharMap cm = face->charmaps[i];
-            if (cm->encoding == ft_encoding_adobe_custom
-                    || cm->encoding == ft_encoding_symbol) {
-                writingSystems.append(QFontDatabase::Symbol);
-                break;
-            }
-        }
-        if (writingSystems.isEmpty()) {
-            TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, ft_sfnt_os2);
-            if (os2) {
-                quint32 unicodeRange[4] = {
-                    os2->ulUnicodeRange1, os2->ulUnicodeRange2, os2->ulUnicodeRange3, os2->ulUnicodeRange4
-                };
-                quint32 codePageRange[2] = {
-                    os2->ulCodePageRange1, os2->ulCodePageRange2
-                };
-
-                writingSystems = determineWritingSystemsFromTrueTypeBits(unicodeRange, codePageRange);
-                //for (int i = 0; i < writingSystems.count(); ++i)
-                //    qDebug() << QFontDatabase::writingSystemName(writingSystems.at(i));
-            }
-        }
+#endif // QT_NO_QWS_QPF2
 
-        QString family = QString::fromAscii(face->family_name);
-        families.append(family);
-        addFont(family, /*foundry*/ "", weight, italic,
-                /*pixelsize*/ 0, file, index, /*antialias*/ true, writingSystems);
-
-        FT_Done_Face(face);
-        ++index;
-    } while (index < numFaces);
-    return families;
-}
-#endif
+// QFontDatabasePrivate::addTTFile() went into qfontdatabase.cpp
 
 static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt);
 
@@ -671,8 +568,8 @@ QFontEngine *loadSingleEngine(int script, const QFontPrivate *fp,
             QFontEngineQPF *fe = new QFontEngineQPF(request, res.data(), res.size());
             if (fe->isValid())
                 return fe;
-            qDebug() << "fontengine is not valid! " << size->fileName;
             delete fe;
+            qDebug() << "fontengine is not valid! " << size->fileName;
         } else {
             qDebug() << "Resource not valid" << size->fileName;
         }
@@ -682,8 +579,8 @@ QFontEngine *loadSingleEngine(int script, const QFontPrivate *fp,
             QFontEngineQPF *fe = new QFontEngineQPF(request, f);
             if (fe->isValid())
                 return fe;
-            qDebug() << "fontengine is not valid!";
             delete fe; // will close f
+            qDebug() << "fontengine is not valid!";
         }
 #endif
     } else
@@ -701,70 +598,67 @@ QFontEngine *loadSingleEngine(int script, const QFontPrivate *fp,
         bool shareFonts = !dontShareFonts;
 #endif
 
-        QFontEngine *engine = 0;
+        QScopedPointer<QFontEngine> engine;
 
 #ifndef QT_NO_LIBRARY
         QFontEngineFactoryInterface *factory = qobject_cast<QFontEngineFactoryInterface *>(loader()->instance(foundry->name));
-            if (factory) {
-                QFontEngineInfo info;
-                info.setFamily(request.family);
-                info.setPixelSize(request.pixelSize);
-                info.setStyle(QFont::Style(request.style));
-                info.setWeight(request.weight);
-                // #### antialiased
-
-                QAbstractFontEngine *customEngine = factory->create(info);
-                if (customEngine) {
-                    engine = new QProxyFontEngine(customEngine, def);
-
-                    if (shareFonts) {
-                        QVariant hint = customEngine->fontProperty(QAbstractFontEngine::CacheGlyphsHint);
-                        if (hint.isValid())
-                            shareFonts = hint.toBool();
-                        else
-                            shareFonts = (pixelSize < 64);
-                    }
+        if (factory) {
+            QFontEngineInfo info;
+            info.setFamily(request.family);
+            info.setPixelSize(request.pixelSize);
+            info.setStyle(QFont::Style(request.style));
+            info.setWeight(request.weight);
+            // #### antialiased
+
+            QAbstractFontEngine *customEngine = factory->create(info);
+            if (customEngine) {
+                engine.reset(new QProxyFontEngine(customEngine, def));
+
+                if (shareFonts) {
+                    QVariant hint = customEngine->fontProperty(QAbstractFontEngine::CacheGlyphsHint);
+                    if (hint.isValid())
+                        shareFonts = hint.toBool();
+                    else
+                        shareFonts = (pixelSize < 64);
                 }
+            }
         }
 #endif // QT_NO_LIBRARY
-            if (!engine && !file.isEmpty() && QFile::exists(file) || privateDb()->isApplicationFont(file)) {
+        if ((engine.isNull() && !file.isEmpty() && QFile::exists(file)) || privateDb()->isApplicationFont(file)) {
             QFontEngine::FaceId faceId;
             faceId.filename = file.toLocal8Bit();
             faceId.index = size->fileIndex;
 
 #ifndef QT_NO_FREETYPE
 
-            QFontEngineFT *fte = new QFontEngineFT(def);
+            QScopedPointer<QFontEngineFT> fte(new QFontEngineFT(def));
             if (fte->init(faceId, style->antialiased,
                           style->antialiased ? QFontEngineFT::Format_A8 : QFontEngineFT::Format_Mono)) {
 #ifdef QT_NO_QWS_QPF2
-                return fte;
+                return fte.take();
 #else
-                engine = fte;
                 // try to distinguish between bdf and ttf fonts we can pre-render
                 // and don't try to share outline fonts
                 shareFonts = shareFonts
                              && !fte->defaultGlyphs()->outline_drawing
                              && !fte->getSfntTable(MAKE_TAG('h', 'e', 'a', 'd')).isEmpty();
+                engine.reset(fte.take());
 #endif
-            } else {
-                delete fte;
             }
 #endif // QT_NO_FREETYPE
         }
-        if (engine) {
+        if (!engine.isNull()) {
 #if !defined(QT_NO_QWS_QPF2) && !defined(QT_FONTS_ARE_RESOURCES)
             if (shareFonts) {
-                QFontEngineQPF *fe = new QFontEngineQPF(def, -1, engine);
-                engine = 0;
+                QScopedPointer<QFontEngineQPF> fe(new QFontEngineQPF(def, -1, engine.data()));
+                engine.take();
                 if (fe->isValid())
-                    return fe;
+                    return fe.take();
                 qWarning("Initializing QFontEngineQPF failed for %s", qPrintable(file));
-                engine = fe->takeRenderingEngine();
-                delete fe;
+                engine.reset(fe->takeRenderingEngine());
             }
 #endif
-            return engine;
+            return engine.take();
         }
     } else
     {
@@ -791,20 +685,22 @@ QFontEngine *loadEngine(int script, const QFontPrivate *fp,
                         QtFontFamily *family, QtFontFoundry *foundry,
                         QtFontStyle *style, QtFontSize *size)
 {
-    QFontEngine *fe = loadSingleEngine(script, fp, request, family, foundry,
-                                       style, size);
-    if (fe
+    QScopedPointer<QFontEngine> engine(loadSingleEngine(script, fp, request, family, foundry,
+                                       style, size));
+    if (!engine.isNull()
         && script == QUnicodeTables::Common
-        && !(request.styleStrategy & QFont::NoFontMerging) && !fe->symbol) {
+        && !(request.styleStrategy & QFont::NoFontMerging) && !engine->symbol) {
 
         QStringList fallbacks = privateDb()->fallbackFamilies;
 
         if (family && !family->fallbackFamilies.isEmpty())
             fallbacks = family->fallbackFamilies;
 
-        fe = new QFontEngineMultiQWS(fe, script, fallbacks);
+        QFontEngine *fe = new QFontEngineMultiQWS(engine.data(), script, fallbacks);
+        engine.take();
+        engine.reset(fe);
     }
-    return fe;
+    return engine.take();
 }
 
 static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
new file mode 100644
index 0000000000..416c3d1dcd
--- /dev/null
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -0,0 +1,414 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <private/qapplication_p.h>
+#include "qdir.h"
+#include "qfont_p.h"
+#include "qfontengine_s60_p.h"
+#include "qabstractfileengine.h"
+#include "qdesktopservices.h"
+#include "qt_s60_p.h"
+#include "qendian.h"
+#include <private/qwindowsurface_s60_p.h>
+#include <private/qcore_symbian_p.h>
+#if defined(QT_NO_FREETYPE)
+#include <OPENFONT.H>
+#endif
+
+QT_BEGIN_NAMESPACE
+
+QFileInfoList alternativeFilePaths(const QString &path, const QStringList &nameFilters,
+    QDir::Filters filters = QDir::NoFilter, QDir::SortFlags sort = QDir::NoSort,
+    bool uniqueFileNames = true)
+{
+    QFileInfoList result;
+
+    // Prepare a 'soft to hard' drive list: W:, X: ... A:, Z:
+    QStringList driveStrings;
+    foreach (const QFileInfo &drive, QDir::drives())
+        driveStrings.append(drive.absolutePath());
+    driveStrings.sort();
+    const QString zDriveString("Z:/");
+    driveStrings.removeAll(zDriveString);
+    driveStrings.prepend(zDriveString);
+    
+    QStringList uniqueFileNameList;
+    for (int i = driveStrings.count() - 1; i >= 0; --i) {
+        const QDir dirOnDrive(driveStrings.at(i) + path);
+        const QFileInfoList entriesOnDrive = dirOnDrive.entryInfoList(nameFilters, filters, sort);
+        if (uniqueFileNames) {
+            foreach(const QFileInfo &entry, entriesOnDrive) {
+                if (!uniqueFileNameList.contains(entry.fileName())) {
+                    uniqueFileNameList.append(entry.fileName());
+                    result.append(entry);
+                }
+            }
+        } else {
+            result.append(entriesOnDrive);
+        }
+    }
+    return result;
+}
+
+#if defined(QT_NO_FREETYPE)
+class QFontDatabaseS60StoreImplementation : public QFontDatabaseS60Store
+{
+public:
+    QFontDatabaseS60StoreImplementation();
+    ~QFontDatabaseS60StoreImplementation();
+
+    const QFontEngineS60Extensions *extension(const QString &typeface) const;
+
+private:
+    RHeap* m_heap;
+    CFontStore *m_store;
+    COpenFontRasterizer *m_rasterizer;
+    mutable QHash<QString, const QFontEngineS60Extensions *> m_extensions;
+};
+
+QFontDatabaseS60StoreImplementation::QFontDatabaseS60StoreImplementation()
+{
+    m_heap = User::ChunkHeap(NULL, 0x1000, 0x100000);
+    m_store = CFontStore::NewL(m_heap);
+    m_rasterizer = COpenFontRasterizer::NewL(TUid::Uid(0x101F7F5E));
+    m_store->InstallRasterizerL(m_rasterizer);
+
+    QStringList filters;
+    filters.append(QString::fromLatin1("*.ttf"));
+    filters.append(QString::fromLatin1("*.ccc"));
+    const QFileInfoList fontFiles = alternativeFilePaths(QString::fromLatin1("resource\\Fonts"), filters);
+    foreach (const QFileInfo &fontFileInfo, fontFiles) {
+        const QString fontFile = QDir::toNativeSeparators(fontFileInfo.absoluteFilePath());
+        m_store->AddFileL(qt_QString2TPtrC(fontFile));
+    }
+}
+QFontDatabaseS60StoreImplementation::~QFontDatabaseS60StoreImplementation()
+{
+    qDeleteAll(m_extensions);
+    delete m_rasterizer;
+    delete m_store;
+    m_heap->Close();
+}
+
+const QFontEngineS60Extensions *QFontDatabaseS60StoreImplementation::extension(const QString &typeface) const
+{
+    if (!m_extensions.contains(typeface)) {
+        CFont* font = NULL;
+        TFontSpec spec(qt_QString2TPtrC(typeface), 1);
+        spec.iHeight = 1;
+        const TInt err = m_store->GetNearestFontToDesignHeightInPixels(font, spec);
+        Q_ASSERT(err == KErrNone && font);
+        CBitmapFont *bitmapFont = static_cast<CBitmapFont*>(font);
+        m_extensions.insert(typeface, new QFontEngineS60Extensions(bitmapFont->OpenFont()));
+    }
+    return m_extensions.value(typeface);
+}
+#else
+class QFontEngineFTS60 : public QFontEngineFT
+{
+public:
+    QFontEngineFTS60(const QFontDef &fd);
+};
+
+QFontEngineFTS60::QFontEngineFTS60(const QFontDef &fd)
+    : QFontEngineFT(fd)
+{
+    default_hint_style = HintFull;
+}
+#endif // defined(QT_NO_FREETYPE)
+
+/*
+ QFontEngineS60::pixelsToPoints, QFontEngineS60::pointsToPixels, QFontEngineMultiS60::QFontEngineMultiS60
+ and QFontEngineMultiS60::QFontEngineMultiS60 should be in qfontengine_s60.cpp. But since also the
+ Freetype based font rendering need them, they are here.
+*/
+qreal QFontEngineS60::pixelsToPoints(qreal pixels, Qt::Orientation orientation)
+{
+    return (orientation == Qt::Horizontal?
+        S60->screenDevice()->HorizontalPixelsToTwips(pixels)
+        :S60->screenDevice()->VerticalPixelsToTwips(pixels)) / KTwipsPerPoint;
+}
+
+qreal QFontEngineS60::pointsToPixels(qreal points, Qt::Orientation orientation)
+{
+    const int twips = points * KTwipsPerPoint;
+    return orientation == Qt::Horizontal?
+        S60->screenDevice()->HorizontalTwipsToPixels(twips)
+        :S60->screenDevice()->VerticalTwipsToPixels(twips);
+}
+
+QFontEngineMultiS60::QFontEngineMultiS60(QFontEngine *first, int script, const QStringList &fallbackFamilies)
+    : QFontEngineMulti(fallbackFamilies.size() + 1)
+    , m_script(script)
+    , m_fallbackFamilies(fallbackFamilies)
+{
+    engines[0] = first;
+    first->ref.ref();
+    fontDef = engines[0]->fontDef;
+}
+
+void QFontEngineMultiS60::loadEngine(int at)
+{
+    Q_ASSERT(at < engines.size());
+    Q_ASSERT(engines.at(at) == 0);
+
+    QFontDef request = fontDef;
+    request.styleStrategy |= QFont::NoFontMerging;
+    request.family = m_fallbackFamilies.at(at-1);
+    engines[at] = QFontDatabase::findFont(m_script,
+                                          /*fontprivate*/0,
+                                          request);
+    Q_ASSERT(engines[at]);
+}
+
+static void initializeDb()
+{
+    QFontDatabasePrivate *db = privateDb();
+    if(!db || db->count)
+        return;
+
+#if defined(QT_NO_FREETYPE)
+    if (!db->s60Store)
+        db->s60Store = new QFontDatabaseS60StoreImplementation;
+
+    QS60WindowSurface::unlockBitmapHeap();
+    const int numTypeFaces = QS60Data::screenDevice()->NumTypefaces();
+    const QFontDatabaseS60StoreImplementation *store = dynamic_cast<const QFontDatabaseS60StoreImplementation*>(db->s60Store);
+    Q_ASSERT(store);
+    for (int i = 0; i < numTypeFaces; i++) {
+        TTypefaceSupport typefaceSupport;
+        QS60Data::screenDevice()->TypefaceSupport(typefaceSupport, i);
+        CFont *font; // We have to get a font instance in order to know all the details
+        TFontSpec fontSpec(typefaceSupport.iTypeface.iName, 11);
+        QS60Data::screenDevice()->GetNearestFontInPixels(font, fontSpec);
+        if (font->TypeUid() == KCFbsFontUid) {
+            TOpenFontFaceAttrib faceAttrib;
+            const CFbsFont *cfbsFont = dynamic_cast<const CFbsFont *>(font);
+            Q_ASSERT(cfbsFont);
+            cfbsFont->GetFaceAttrib(faceAttrib);
+
+            QtFontStyle::Key styleKey;
+            styleKey.style = faceAttrib.IsItalic()?QFont::StyleItalic:QFont::StyleNormal;
+            styleKey.weight = faceAttrib.IsBold()?QFont::Bold:QFont::Normal;
+
+            QString familyName((const QChar *)typefaceSupport.iTypeface.iName.Ptr(), typefaceSupport.iTypeface.iName.Length());
+            QtFontFamily *family = db->family(familyName, true);
+            family->fixedPitch = faceAttrib.IsMonoWidth();
+            QtFontFoundry *foundry = family->foundry(QString(), true);
+            QtFontStyle *style = foundry->style(styleKey, true);
+            style->smoothScalable = typefaceSupport.iIsScalable;
+            style->pixelSize(0, true);
+
+            const QFontEngineS60Extensions *extension = store->extension(familyName);
+            const QByteArray os2Table = extension->getSfntTable(MAKE_TAG('O', 'S', '/', '2'));
+            const unsigned char* data = reinterpret_cast<const unsigned char*>(os2Table.constData());
+            const unsigned char* ulUnicodeRange = data + 42;
+            quint32 unicodeRange[4] = {
+                qFromBigEndian<quint32>(ulUnicodeRange),
+                qFromBigEndian<quint32>(ulUnicodeRange + 4),
+                qFromBigEndian<quint32>(ulUnicodeRange + 8),
+                qFromBigEndian<quint32>(ulUnicodeRange + 12)
+            };
+            const unsigned char* ulCodePageRange = data + 78;
+            quint32 codePageRange[2] = {
+                qFromBigEndian<quint32>(ulCodePageRange),
+                qFromBigEndian<quint32>(ulCodePageRange + 4)
+            };
+            const QList<QFontDatabase::WritingSystem> writingSystems =
+                determineWritingSystemsFromTrueTypeBits(unicodeRange, codePageRange);
+            foreach (const QFontDatabase::WritingSystem system, writingSystems)
+                family->writingSystems[system] = QtFontFamily::Supported;
+        }
+        QS60Data::screenDevice()->ReleaseFont(font);
+    }
+    QS60WindowSurface::lockBitmapHeap();
+#else // defined(QT_NO_FREETYPE)
+    QDir dir(QDesktopServices::storageLocation(QDesktopServices::FontsLocation));
+    dir.setNameFilters(QStringList() << QLatin1String("*.ttf")
+                       << QLatin1String("*.ttc") << QLatin1String("*.pfa")
+                       << QLatin1String("*.pfb"));
+    for (int i = 0; i < int(dir.count()); ++i) {
+        const QByteArray file = QFile::encodeName(dir.absoluteFilePath(dir[i]));
+        db->addTTFile(file);
+    }
+#endif // defined(QT_NO_FREETYPE)
+}
+
+static inline void load(const QString &family = QString(), int script = -1)
+{
+    Q_UNUSED(family)
+    Q_UNUSED(script)
+    initializeDb();
+}
+
+static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
+{
+    Q_UNUSED(fnt);
+}
+
+bool QFontDatabase::supportsThreadedFontRendering()
+{
+    return false;
+}
+
+static
+QFontDef cleanedFontDef(const QFontDef &req)
+{
+    QFontDef result = req;
+    if (result.pixelSize <= 0) {
+        result.pixelSize = QFontEngineS60::pointsToPixels(qMax(qreal(1.0), result.pointSize));
+        result.pointSize = 0;
+    }
+    return result;
+}
+
+QFontEngine *QFontDatabase::findFont(int script, const QFontPrivate *, const QFontDef &req)
+{
+    const QFontCache::Key key(cleanedFontDef(req), script);
+
+    if (!privateDb()->count)
+        initializeDb();
+
+    QFontEngine *fe = QFontCache::instance()->findEngine(key);
+    if (!fe) {
+        // Making sure that fe->fontDef.family will be an existing font.
+        initializeDb();
+        QFontDatabasePrivate *db = privateDb();
+        QtFontDesc desc;
+        QList<int> blacklistedFamilies;
+        match(script, req, req.family, QString(), -1, &desc, blacklistedFamilies);
+        if (!desc.family) // falling back to application font
+            desc.family = db->family(QApplication::font().defaultFamily());
+        Q_ASSERT(desc.family);
+
+        // Making sure that desc.family supports the requested script
+        QtFontDesc mappedDesc;
+        bool supportsScript = false;
+        do {
+            match(script, req, QString(), QString(), -1, &mappedDesc, blacklistedFamilies);
+            if (mappedDesc.family == desc.family) {
+                supportsScript = true;
+                break;
+            }
+            blacklistedFamilies.append(mappedDesc.familyIndex);
+        } while (mappedDesc.family);
+        if (!supportsScript) {
+            blacklistedFamilies.clear();
+            match(script, req, QString(), QString(), -1, &mappedDesc, blacklistedFamilies);
+            if (mappedDesc.family)
+                desc = mappedDesc;
+        }
+
+        const QString fontFamily = desc.family->name;
+        QFontDef request = req;
+        request.family = fontFamily;
+#if defined(QT_NO_FREETYPE)
+        const QFontDatabaseS60StoreImplementation *store = dynamic_cast<const QFontDatabaseS60StoreImplementation*>(db->s60Store);
+        Q_ASSERT(store);
+        const QFontEngineS60Extensions *extension = store->extension(fontFamily);
+        fe = new QFontEngineS60(request, extension);
+#else
+        QFontEngine::FaceId faceId;
+        const QtFontFamily * const reqQtFontFamily = db->family(fontFamily);
+        faceId.filename = reqQtFontFamily->fontFilename;
+        faceId.index = reqQtFontFamily->fontFileIndex;
+
+        QFontEngineFTS60 *fte = new QFontEngineFTS60(cleanedFontDef(request));
+        if (fte->init(faceId, true, QFontEngineFT::Format_A8))
+            fe = fte;
+        else
+            delete fte;
+#endif
+
+        Q_ASSERT(fe);
+        if (script == QUnicodeTables::Common
+            && !(req.styleStrategy & QFont::NoFontMerging)
+            && !fe->symbol) {
+
+            QStringList commonFonts;
+            for (int ws = 1; ws < QFontDatabase::WritingSystemsCount; ++ws) {
+                if (scriptForWritingSystem[ws] != script)
+                    continue;
+                for (int i = 0; i < db->count; ++i) {
+                    if (db->families[i]->writingSystems[ws] & QtFontFamily::Supported)
+                        commonFonts.append(db->families[i]->name);
+                }
+            }
+
+            // Hack: Prioritize .ccc fonts
+            const QString niceEastAsianFont(QLatin1String("Sans MT 936_S60"));
+            if (commonFonts.removeAll(niceEastAsianFont) > 0)
+                commonFonts.prepend(niceEastAsianFont);
+
+            fe = new QFontEngineMultiS60(fe, script, commonFonts);
+        }
+    }
+    fe->ref.ref();
+    QFontCache::instance()->insertEngine(key, fe);
+    return fe;
+}
+
+void QFontDatabase::load(const QFontPrivate *d, int script)
+{
+    QFontEngine *fe = 0;
+    QFontDef req = d->request;
+ 
+    if (!d->engineData) {
+        const QFontCache::Key key(cleanedFontDef(req), script);
+        getEngineData(d, key);
+    }
+
+    // the cached engineData could have already loaded the engine we want
+    if (d->engineData->engines[script])
+        fe = d->engineData->engines[script];
+
+    if (!fe) {
+        if (qt_enable_test_font && req.family == QLatin1String("__Qt__Box__Engine__")) {
+            fe = new QTestFontEngine(req.pixelSize);
+            fe->fontDef = req;
+        } else {
+            fe = findFont(script, d, req);
+        }
+        d->engineData->engines[script] = fe;
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 05b36950b0..730137eb30 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -185,18 +185,20 @@ QFontEngine::QFontEngine()
 
 QFontEngine::~QFontEngine()
 {
-    for (GlyphPointerHash::iterator it = m_glyphPointerHash.begin(), end = m_glyphPointerHash.end();
-         it != end; ++it) {
-        for (QList<QFontEngineGlyphCache*>::iterator it2 = it.value().begin(), end2 = it.value().end();
-            it2 != end2; ++it2)
-                delete *it2;
+    for (GlyphPointerHash::const_iterator it = m_glyphPointerHash.constBegin(),
+            end = m_glyphPointerHash.constEnd(); it != end; ++it) {
+        for (QList<QFontEngineGlyphCache*>::const_iterator it2 = it.value().constBegin(),
+                end2 = it.value().constEnd(); it2 != end2; ++it2) {
+            delete *it2;
+        }
     }
     m_glyphPointerHash.clear();
-    for (GlyphIntHash::iterator it = m_glyphIntHash.begin(), end = m_glyphIntHash.end();
-         it != end; ++it) {
-        for (QList<QFontEngineGlyphCache*>::iterator it2 = it.value().begin(), end2 = it.value().end();
-            it2 != end2; ++it2)
-                delete *it2;
+    for (GlyphIntHash::const_iterator it = m_glyphIntHash.constBegin(),
+            end = m_glyphIntHash.constEnd(); it != end; ++it) {
+        for (QList<QFontEngineGlyphCache*>::const_iterator it2 = it.value().constBegin(),
+                end2 = it.value().constEnd(); it2 != end2; ++it2) {
+            delete *it2;
+        }
     }
     m_glyphIntHash.clear();
     qHBFreeFace(hbFace);
@@ -812,7 +814,7 @@ QFontEngineGlyphCache *QFontEngine::glyphCache(QFontEngineGlyphCache::Type key,
     return 0;
 }
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS)
+#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
 static inline QFixed kerning(int left, int right, const QFontEngine::KernPair *pairs, int numPairs)
 {
     uint left_right = (left << 16) + right;
@@ -1034,9 +1036,8 @@ quint32 QFontEngine::getTrueTypeGlyphIndex(const uchar *cmap, uint unicode)
             return 0;
         quint16 segCountX2 = qFromBigEndian<quint16>(cmap + 6);
         const unsigned char *ends = cmap + 14;
-        quint16 endIndex = 0;
         int i = 0;
-        for (; i < segCountX2/2 && (endIndex = qFromBigEndian<quint16>(ends + 2*i)) < unicode; i++) {}
+        for (; i < segCountX2/2 && qFromBigEndian<quint16>(ends + 2*i) < unicode; i++) {}
 
         const unsigned char *idx = ends + segCountX2 + 2 + 2*i;
         quint16 startIndex = qFromBigEndian<quint16>(idx);
@@ -1103,6 +1104,18 @@ quint32 QFontEngine::getTrueTypeGlyphIndex(const uchar *cmap, uint unicode)
     return 0;
 }
 
+Q_GLOBAL_STATIC_WITH_INITIALIZER(QVector<QRgb>, qt_grayPalette, {
+    x->resize(256);
+    QRgb *it = x->data();
+    for (int i = 0; i < x->size(); ++i, ++it)
+        *it = 0xff000000 | i | (i<<8) | (i<<16);
+});
+
+const QVector<QRgb> &QFontEngine::grayPalette()
+{
+    return *qt_grayPalette();
+}
+
 // ------------------------------------------------------------------
 // The box font engine
 // ------------------------------------------------------------------
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index d210cb43d8..499d28c2fe 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -191,6 +191,9 @@ HB_Error QFreetypeFace::getPointInOutline(HB_Glyph glyph, int flags, hb_uint32 p
 /*
  * One font file can contain more than one font (bold/italic for example)
  * find the right one and return it.
+ *
+ * Returns the freetype face or 0 in case of an empty file or any other problems
+ * (like not being able to open the file)
  */
 QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id)
 {
@@ -203,7 +206,7 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id)
 
     QFreetypeFace *freetype = freetypeData->faces.value(face_id, 0);
     if (!freetype) {
-        freetype = new QFreetypeFace;
+        QScopedPointer<QFreetypeFace> newFreetype(new QFreetypeFace);
         FT_Face face;
         QFile file(QString::fromUtf8(face_id.filename));
         if (face_id.filename.startsWith(":qmemoryfonts/")) {
@@ -212,84 +215,82 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id)
             QByteArray idx = face_id.filename;
             idx.remove(0, 14); // remove ':qmemoryfonts/'
             bool ok = false;
-            freetype->fontData = qt_fontdata_from_index(idx.toInt(&ok));
+            newFreetype->fontData = qt_fontdata_from_index(idx.toInt(&ok));
             if (!ok)
-                freetype->fontData = QByteArray();
+                newFreetype->fontData = QByteArray();
         } else if (!(file.fileEngine()->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::LocalDiskFlag)) {
             if (!file.open(QIODevice::ReadOnly)) {
-                delete freetype;
                 return 0;
             }
-            freetype->fontData = file.readAll();
+            newFreetype->fontData = file.readAll();
         }
-        if (!freetype->fontData.isEmpty()) {
-            if (FT_New_Memory_Face(freetypeData->library, (const FT_Byte *)freetype->fontData.constData(), freetype->fontData.size(), face_id.index, &face)) {
-                delete freetype;
+        if (!newFreetype->fontData.isEmpty()) {
+            if (FT_New_Memory_Face(freetypeData->library, (const FT_Byte *)newFreetype->fontData.constData(), newFreetype->fontData.size(), face_id.index, &face)) {
                 return 0;
             }
         } else if (FT_New_Face(freetypeData->library, face_id.filename, face_id.index, &face)) {
-            delete freetype;
             return 0;
         }
-        freetype->face = face;
-
-        freetype->hbFace = qHBNewFace(face, hb_getSFntTable);
-        freetype->ref = 0;
-        freetype->xsize = 0;
-        freetype->ysize = 0;
-        freetype->matrix.xx = 0x10000;
-        freetype->matrix.yy = 0x10000;
-        freetype->matrix.xy = 0;
-        freetype->matrix.yx = 0;
-        freetype->unicode_map = 0;
-        freetype->symbol_map = 0;
+        newFreetype->face = face;
+
+        newFreetype->hbFace = qHBNewFace(face, hb_getSFntTable);
+        newFreetype->ref = 0;
+        newFreetype->xsize = 0;
+        newFreetype->ysize = 0;
+        newFreetype->matrix.xx = 0x10000;
+        newFreetype->matrix.yy = 0x10000;
+        newFreetype->matrix.xy = 0;
+        newFreetype->matrix.yx = 0;
+        newFreetype->unicode_map = 0;
+        newFreetype->symbol_map = 0;
 #ifndef QT_NO_FONTCONFIG
-        freetype->charset = 0;
+        newFreetype->charset = 0;
 #endif
 
-        memset(freetype->cmapCache, 0, sizeof(freetype->cmapCache));
+        memset(newFreetype->cmapCache, 0, sizeof(newFreetype->cmapCache));
 
-        for (int i = 0; i < freetype->face->num_charmaps; ++i) {
-            FT_CharMap cm = freetype->face->charmaps[i];
+        for (int i = 0; i < newFreetype->face->num_charmaps; ++i) {
+            FT_CharMap cm = newFreetype->face->charmaps[i];
             switch(cm->encoding) {
             case FT_ENCODING_UNICODE:
-                freetype->unicode_map = cm;
+                newFreetype->unicode_map = cm;
                 break;
             case FT_ENCODING_APPLE_ROMAN:
             case FT_ENCODING_ADOBE_LATIN_1:
-                if (!freetype->unicode_map || freetype->unicode_map->encoding != FT_ENCODING_UNICODE)
-                    freetype->unicode_map = cm;
+                if (!newFreetype->unicode_map || newFreetype->unicode_map->encoding != FT_ENCODING_UNICODE)
+                    newFreetype->unicode_map = cm;
                 break;
             case FT_ENCODING_ADOBE_CUSTOM:
             case FT_ENCODING_MS_SYMBOL:
-                if (!freetype->symbol_map)
-                    freetype->symbol_map = cm;
+                if (!newFreetype->symbol_map)
+                    newFreetype->symbol_map = cm;
                 break;
             default:
                 break;
             }
         }
 
-        if (!FT_IS_SCALABLE(freetype->face) && freetype->face->num_fixed_sizes == 1)
-            FT_Set_Char_Size (face, X_SIZE(freetype->face, 0), Y_SIZE(freetype->face, 0), 0, 0);
+        if (!FT_IS_SCALABLE(newFreetype->face) && newFreetype->face->num_fixed_sizes == 1)
+            FT_Set_Char_Size (face, X_SIZE(newFreetype->face, 0), Y_SIZE(newFreetype->face, 0), 0, 0);
 # if 0
         FcChar8 *name;
         FcPatternGetString(pattern, FC_FAMILY, 0, &name);
         qDebug("%s: using maps: default: %x unicode: %x, symbol: %x", name,
-               freetype->face->charmap ? freetype->face->charmap->encoding : 0,
-               freetype->unicode_map ? freetype->unicode_map->encoding : 0,
-               freetype->symbol_map ? freetype->symbol_map->encoding : 0);
+               newFreetype->face->charmap ? newFreetype->face->charmap->encoding : 0,
+               newFreetype->unicode_map ? newFreetype->unicode_map->encoding : 0,
+               newFreetype->symbol_map ? newFreetype->symbol_map->encoding : 0);
 
         for (int i = 0; i < 256; i += 8)
             qDebug("    %x: %d %d %d %d %d %d %d %d", i,
-                   FcCharSetHasChar(freetype->charset, i), FcCharSetHasChar(freetype->charset, i),
-                   FcCharSetHasChar(freetype->charset, i), FcCharSetHasChar(freetype->charset, i),
-                   FcCharSetHasChar(freetype->charset, i), FcCharSetHasChar(freetype->charset, i),
-                   FcCharSetHasChar(freetype->charset, i), FcCharSetHasChar(freetype->charset, i));
+                   FcCharSetHasChar(newFreetype->charset, i), FcCharSetHasChar(newFreetype->charset, i),
+                   FcCharSetHasChar(newFreetype->charset, i), FcCharSetHasChar(newFreetype->charset, i),
+                   FcCharSetHasChar(newFreetype->charset, i), FcCharSetHasChar(newFreetype->charset, i),
+                   FcCharSetHasChar(newFreetype->charset, i), FcCharSetHasChar(newFreetype->charset, i));
 #endif
 
-        FT_Set_Charmap(freetype->face, freetype->unicode_map);
-        freetypeData->faces.insert(face_id, freetype);
+        FT_Set_Charmap(newFreetype->face, newFreetype->unicode_map);
+        freetypeData->faces.insert(face_id, newFreetype.data());
+        freetype = newFreetype.take();
     }
     freetype->ref.ref();
     return freetype;
@@ -606,6 +607,7 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd)
     kerning_pairs_loaded = false;
     transform = false;
     antialias = true;
+    freetype = 0;
     default_load_flags = 0;
     default_hint_style = HintNone;
     subpixelType = Subpixel_None;
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index fa7a6c27a3..aa1cd0a3f8 100644
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -119,6 +119,7 @@ struct QFreetypeFace
     static void addBitmapToPath(FT_GlyphSlot slot, const QFixedPoint &point, QPainterPath *path, bool = false);
 
 private:
+    friend class QScopedPointer<QFreetypeFace>;
     QFreetypeFace() : _lock(QMutex::Recursive) {}
     ~QFreetypeFace() {}
     QAtomicInt ref;
@@ -255,7 +256,7 @@ public:
     QGlyphSet *loadTransformedGlyphSet(const QTransform &matrix);
     bool loadGlyphs(QGlyphSet *gs, glyph_t *glyphs, int num_glyphs, GlyphFormat format = Format_Render);
 
-#if defined(Q_WS_QWS)
+#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
     virtual void draw(QPaintEngine * /*p*/, qreal /*x*/, qreal /*y*/, const QTextItemInt & /*si*/) {}
 #endif
 
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 2113fffdd9..2b27d41e29 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -70,7 +70,7 @@
 #   include "private/qcore_mac_p.h"
 #endif
 
-#include "qfontengineglyphcache_p.h"
+#include <private/qfontengineglyphcache_p.h>
 
 struct glyph_metrics_t;
 typedef unsigned int glyph_t;
@@ -112,6 +112,10 @@ public:
         QPF1,
         QPF2,
         Proxy,
+
+        // S60 types
+        S60FontEngine, // Cannot be simply called "S60". Reason is qt_s60Data.h
+
         TestFontEngine = 0x1000
     };
 
@@ -163,7 +167,7 @@ public:
     virtual void recalcAdvances(QGlyphLayout *, QTextEngine::ShaperFlags) const {}
     virtual void doKerning(QGlyphLayout *, QTextEngine::ShaperFlags) const;
 
-#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
+#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN)
     virtual void draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &si) = 0;
 #endif
     virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
@@ -230,7 +234,7 @@ public:
     bool symbol;
     mutable HB_FontRec hbFont;
     mutable HB_Face hbFace;
-#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS)
+#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
     struct KernPair {
         uint left_right;
         QFixed adjust;
@@ -246,6 +250,9 @@ public:
 
     int glyphFormat;
 
+protected:
+    static const QVector<QRgb> &grayPalette();
+
 private:
     /// remove old entries from the glyph cache. Helper method for the setGlyphCache ones.
     void expireGlyphCache();
@@ -321,7 +328,7 @@ public:
     virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QTextEngine::ShaperFlags flags) const;
     virtual void recalcAdvances(QGlyphLayout *, QTextEngine::ShaperFlags) const;
 
-#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
+#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN)
     void draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &si);
 #endif
     virtual void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags);
@@ -618,4 +625,8 @@ QT_END_NAMESPACE
 #   include "private/qfontengine_win_p.h"
 #endif
 
+#if defined(Q_OS_SYMBIAN) && !defined(QT_NO_FREETYPE)
+#   include "private/qfontengine_ft_p.h"
+#endif
+
 #endif // QFONTENGINE_P_H
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp
index ed8abb8c39..e7826cc2ae 100644
--- a/src/gui/text/qfontengine_qpf.cpp
+++ b/src/gui/text/qfontengine_qpf.cpp
@@ -326,8 +326,8 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng
         fileName.replace(QLatin1Char(' '), QLatin1Char('_'));
         fileName.prepend(qws_fontCacheDir());
 
-        const QByteArray encodedName = QFile::encodeName(fileName);
-        if (::access(encodedName, F_OK) == 0) {
+        encodedFileName = QFile::encodeName(fileName);
+        if (::access(encodedFileName, F_OK) == 0) {
 #if defined(DEBUG_FONTENGINE)
             qDebug() << "found existing qpf:" << fileName;
 #endif
@@ -506,15 +506,21 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng
 #endif
 #if defined(Q_WS_QWS)
     if (isValid() && renderingFontEngine)
-        qt_fbdpy->sendFontCommand(QWSFontCommand::StartedUsingFont, QFile::encodeName(fileName));
+        qt_fbdpy->sendFontCommand(QWSFontCommand::StartedUsingFont, encodedFileName);
 #endif
 }
 
 QFontEngineQPF::~QFontEngineQPF()
 {
 #if defined(Q_WS_QWS)
-    if (isValid() && renderingFontEngine)
-        qt_fbdpy->sendFontCommand(QWSFontCommand::StoppedUsingFont, QFile::encodeName(fileName));
+    if (isValid() && renderingFontEngine) {
+        QT_TRY {
+            qt_fbdpy->sendFontCommand(QWSFontCommand::StoppedUsingFont, encodedFileName);
+        } QT_CATCH(...) {
+            qDebug("QFontEngineQPF::~QFontEngineQPF: Out of memory");
+            // ignore.
+        }
+    }
 #endif
     delete renderingFontEngine;
     if (fontData) {
@@ -1165,6 +1171,11 @@ void QPFGenerator::writeTaggedQFixed(QFontEngineQPF::HeaderTag tag, QFixed value
 
 #endif // QT_NO_QWS_QPF2
 
+/*
+    Creates a new multi qws engine.
+
+    This function takes ownership of the QFontEngine, increasing it's refcount.
+*/
 QFontEngineMultiQWS::QFontEngineMultiQWS(QFontEngine *fe, int _script, const QStringList &fallbacks)
     : QFontEngineMulti(fallbacks.size() + 1),
       fallbackFamilies(fallbacks), script(_script)
diff --git a/src/gui/text/qfontengine_qpf_p.h b/src/gui/text/qfontengine_qpf_p.h
index bf6862aaa3..0fc0730dc7 100644
--- a/src/gui/text/qfontengine_qpf_p.h
+++ b/src/gui/text/qfontengine_qpf_p.h
@@ -243,6 +243,7 @@ private:
     quint32 glyphDataOffset;
     quint32 glyphDataSize;
     QString fileName;
+    QByteArray encodedFileName;
     bool readOnly;
 
     QFreetypeFace *freetype;
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp
new file mode 100644
index 0000000000..f485afbf89
--- /dev/null
+++ b/src/gui/text/qfontengine_s60.cpp
@@ -0,0 +1,324 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qfontengine_s60_p.h"
+#include "qtextengine_p.h"
+#include "qglobal.h"
+#include <private/qapplication_p.h>
+#include <private/qwindowsurface_s60_p.h>
+#include "qimage.h"
+#include "qt_s60_p.h"
+
+#include <e32base.h>
+#include <e32std.h>
+#include <EIKENV.H>
+#include <GDI.H>
+
+QT_BEGIN_NAMESPACE
+
+QFontEngineS60Extensions::QFontEngineS60Extensions(COpenFont *font)
+    : m_font(font)
+    , m_cmap(0)
+    , m_symbolCMap(false)
+{
+    TAny *shapingExtension = NULL;
+    m_font->ExtendedInterface(KUidOpenFontShapingExtension, shapingExtension);
+    m_shapingExtension = static_cast<MOpenFontShapingExtension*>(shapingExtension);
+    TAny *trueTypeExtension = NULL;
+    m_font->ExtendedInterface(KUidOpenFontTrueTypeExtension, trueTypeExtension);
+    m_trueTypeExtension = static_cast<MOpenFontTrueTypeExtension*>(trueTypeExtension);
+    Q_ASSERT(m_shapingExtension && m_trueTypeExtension);
+}
+
+QByteArray QFontEngineS60Extensions::getSfntTable(uint tag) const
+{
+    Q_ASSERT(m_trueTypeExtension->HasTrueTypeTable(tag));
+    TInt error = KErrNone;
+    TInt tableByteLength = 0;
+    TAny *table = m_trueTypeExtension->GetTrueTypeTable(error, tag, &tableByteLength);
+    QByteArray result(static_cast<const char*>(table), tableByteLength);
+    m_trueTypeExtension->ReleaseTrueTypeTable(table);
+    return result;
+}
+
+const unsigned char *QFontEngineS60Extensions::cmap() const
+{
+    if (!m_cmap) {
+        m_cmapTable = getSfntTable(MAKE_TAG('c', 'm', 'a', 'p'));
+        int size = 0;
+        m_cmap = QFontEngineS60::getCMap(reinterpret_cast<const uchar *>(m_cmapTable.constData()), m_cmapTable.size(), &m_symbolCMap, &size);
+    }
+    return m_cmap;
+}
+
+QPainterPath QFontEngineS60Extensions::glyphOutline(glyph_t glyph) const
+{
+    QPainterPath result;
+    QPolygonF polygon;
+    TInt glyphIndex = glyph;
+    TInt pointNumber = 0;
+    TInt x, y;
+    while (m_shapingExtension->GlyphPointInFontUnits(glyphIndex, pointNumber++, x, y)) {
+        const QPointF point(qreal(x) / 0xffff, qreal(y) / 0xffff);
+        if (polygon.contains(point)) {
+            result.addPolygon(polygon);
+            result.closeSubpath();
+            polygon.clear();
+        } else {
+            polygon.append(point);
+        }
+    }
+    return result;
+}
+
+// duplicated from qfontengine_xyz.cpp
+static inline unsigned int getChar(const QChar *str, int &i, const int len)
+{
+    unsigned int uc = str[i].unicode();
+    if (uc >= 0xd800 && uc < 0xdc00 && i < len-1) {
+        uint low = str[i+1].unicode();
+       if (low >= 0xdc00 && low < 0xe000) {
+            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
+            ++i;
+        }
+    }
+    return uc;
+}
+
+QFontEngineS60::QFontEngineS60(const QFontDef &request, const QFontEngineS60Extensions *extensions)
+    : m_extensions(extensions)
+{
+    QFontEngine::fontDef = request;
+    m_fontSizeInPixels = (request.pixelSize >= 0)?
+        request.pixelSize:pointsToPixels(request.pointSize);
+    QS60WindowSurface::unlockBitmapHeap();
+    m_textRenderBitmap = new (ELeave) CFbsBitmap();
+    const TSize bitmapSize(1, 1); // It is just a dummy bitmap that I need to keep the font alive (or maybe not)
+    User::LeaveIfError(m_textRenderBitmap->Create(bitmapSize, EGray256));
+    m_textRenderBitmapDevice = CFbsBitmapDevice::NewL(m_textRenderBitmap);
+    User::LeaveIfError(m_textRenderBitmapDevice->CreateContext(m_textRenderBitmapGc));
+    cache_cost = sizeof(QFontEngineS60) + bitmapSize.iHeight * bitmapSize.iWidth * 4;
+
+    TFontSpec fontSpec(qt_QString2TPtrC(request.family), m_fontSizeInPixels);
+    fontSpec.iFontStyle.SetBitmapType(EAntiAliasedGlyphBitmap);
+    fontSpec.iFontStyle.SetPosture(request.style == QFont::StyleNormal?EPostureUpright:EPostureItalic);
+    fontSpec.iFontStyle.SetStrokeWeight(request.weight > QFont::Normal?EStrokeWeightBold:EStrokeWeightNormal);
+    const TInt errorCode = m_textRenderBitmapDevice->GetNearestFontInPixels(m_font, fontSpec);
+    Q_ASSERT(errorCode == 0);
+    m_textRenderBitmapGc->UseFont(m_font);
+    QS60WindowSurface::lockBitmapHeap();
+}
+
+QFontEngineS60::~QFontEngineS60()
+{
+    QS60WindowSurface::unlockBitmapHeap();
+    m_textRenderBitmapGc->DiscardFont();
+    delete m_textRenderBitmapGc;
+    m_textRenderBitmapGc = NULL;
+    m_textRenderBitmapDevice->ReleaseFont(m_font);
+    delete m_textRenderBitmapDevice;
+    m_textRenderBitmapDevice = NULL;
+    delete m_textRenderBitmap;
+    m_textRenderBitmap = NULL;
+    QS60WindowSurface::lockBitmapHeap();
+}
+
+bool QFontEngineS60::stringToCMap(const QChar *characters, int len, QGlyphLayout *glyphs, int *nglyphs, QTextEngine::ShaperFlags flags) const
+{
+    if (*nglyphs < len) {
+        *nglyphs = len;
+        return false;
+    }
+
+    HB_Glyph *g = glyphs->glyphs;
+    const unsigned char* cmap = m_extensions->cmap();
+    for (int i = 0; i < len; ++i) {
+        const unsigned int uc = getChar(characters, i, len);
+        *g++ = QFontEngine::getTrueTypeGlyphIndex(cmap, uc);
+    }
+
+    glyphs->numGlyphs = g - glyphs->glyphs;
+    *nglyphs = glyphs->numGlyphs;
+
+    if (flags & QTextEngine::GlyphIndicesOnly)
+        return true;
+
+    recalcAdvances(glyphs, flags);
+    return true;
+}
+
+void QFontEngineS60::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFlags flags) const
+{
+    Q_UNUSED(flags);
+    for (int i = 0; i < glyphs->numGlyphs; i++) {
+        const glyph_metrics_t bbox = boundingBox_const(glyphs->glyphs[i]);
+        glyphs->advances_x[i] = glyphs->offsets[i].x = bbox.xoff;
+        glyphs->advances_y[i] = glyphs->offsets[i].y = bbox.yoff;
+    }
+}
+
+QImage QFontEngineS60::alphaMapForGlyph(glyph_t glyph)
+{
+    TOpenFontCharMetrics metrics;
+    const TUint8 *glyphBitmapBytes;
+    TSize glyphBitmapSize;
+    getCharacterData(glyph, metrics, glyphBitmapBytes, glyphBitmapSize);
+    QImage result(glyphBitmapBytes, glyphBitmapSize.iWidth, glyphBitmapSize.iHeight, glyphBitmapSize.iWidth, QImage::Format_Indexed8);
+    result.setColorTable(grayPalette());
+
+    // The above setColorTable() call detached the image data anyway, so why not shape tha data a bit, while we can.
+    // CFont::GetCharacterData() returns 8-bit data that obviously was 4-bit data before, and converted to 8-bit incorrectly.
+    // The data values are 0x00, 0x10 ... 0xe0, 0xf0. So, a real opaque 0xff is never reached, which we get punished
+    // for every time we want to blit this glyph in the raster paint engine.
+    // "Fix" is to convert all 0xf0 to 0xff. Is fine, quality wise, and I assume faster than correcting all values.
+    // Blitting is however, evidentially faster now.
+    const int bpl = result.bytesPerLine();
+    for (int row = 0; row < result.height(); ++row) {
+        uchar *scanLine = result.scanLine(row);
+        for (int column = 0; column < bpl; ++column) {
+            if (*scanLine == 0xf0)
+                *scanLine = 0xff;
+            scanLine++;
+        }
+    }
+
+    return result;
+}
+
+glyph_metrics_t QFontEngineS60::boundingBox(const QGlyphLayout &glyphs)
+{
+   if (glyphs.numGlyphs == 0)
+        return glyph_metrics_t();
+
+    QFixed w = 0;
+    for (int i = 0; i < glyphs.numGlyphs; ++i)
+        w += glyphs.effectiveAdvance(i);
+
+    return glyph_metrics_t(0, -ascent(), w, ascent()+descent()+1, w, 0);
+}
+
+glyph_metrics_t QFontEngineS60::boundingBox_const(glyph_t glyph) const
+{
+    TOpenFontCharMetrics metrics;
+    const TUint8 *glyphBitmapBytes;
+    TSize glyphBitmapSize;
+    getCharacterData(glyph, metrics, glyphBitmapBytes, glyphBitmapSize);
+    TRect glyphBounds;
+    metrics.GetHorizBounds(glyphBounds);
+    const glyph_metrics_t result(
+        glyphBounds.iTl.iX,
+        glyphBounds.iTl.iY,
+        glyphBounds.Width(),
+        glyphBounds.Height(),
+        metrics.HorizAdvance(),
+        0
+    );
+    return result;
+}
+
+glyph_metrics_t QFontEngineS60::boundingBox(glyph_t glyph)
+{
+    return boundingBox_const(glyph);
+}
+
+QFixed QFontEngineS60::ascent() const
+{
+    return m_font->FontMaxAscent();
+}
+
+QFixed QFontEngineS60::descent() const
+{
+    return m_font->FontMaxDescent();
+}
+
+QFixed QFontEngineS60::leading() const
+{
+    return 0;
+}
+
+qreal QFontEngineS60::maxCharWidth() const
+{
+    return m_font->MaxCharWidthInPixels();
+}
+
+const char *QFontEngineS60::name() const
+{
+    return "QFontEngineS60";
+}
+
+bool QFontEngineS60::canRender(const QChar *string, int len)
+{
+    const unsigned char *cmap = m_extensions->cmap();
+    for (int i = 0; i < len; ++i) {
+        const unsigned int uc = getChar(string, i, len);
+        if (QFontEngine::getTrueTypeGlyphIndex(cmap, uc) == 0)
+            return false;
+    }
+    return true;
+}
+
+QByteArray QFontEngineS60::getSfntTable(uint tag) const
+{
+    return m_extensions->getSfntTable(tag);
+}
+
+QFontEngine::Type QFontEngineS60::type() const
+{
+    return QFontEngine::S60FontEngine;
+}
+
+void QFontEngineS60::getCharacterData(glyph_t glyph, TOpenFontCharMetrics& metrics, const TUint8*& bitmap, TSize& bitmapSize) const
+{
+    // Setting the most significant bit tells GetCharacterData
+    // that 'code' is a Glyph ID, rather than a UTF-16 value
+    const TUint specialCode = (TUint)glyph | 0x80000000;
+
+    const CFont::TCharacterDataAvailability availability =
+        m_font->GetCharacterData(specialCode, metrics, bitmap, bitmapSize);
+    const glyph_t fallbackGlyph = '?';
+    if (availability != CFont::EAllCharacterData) {
+        const CFont::TCharacterDataAvailability fallbackAvailability =
+            m_font->GetCharacterData(fallbackGlyph, metrics, bitmap, bitmapSize);
+        Q_ASSERT(fallbackAvailability == CFont::EAllCharacterData);
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h
new file mode 100644
index 0000000000..2998de8d4f
--- /dev/null
+++ b/src/gui/text/qfontengine_s60_p.h
@@ -0,0 +1,146 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QFONTENGINE_S60_P_H
+#define QFONTENGINE_S60_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qconfig.h"
+#include "qfontengine_p.h"
+#include "qsize.h"
+#include <OPENFONT.H>
+
+class CFbsBitmap;
+class CFbsBitmapDevice;
+class CFbsBitGc;
+class CFont;
+
+QT_BEGIN_NAMESPACE
+
+// ..gives us access to truetype tables, UTF-16<->GlyphID mapping, and glyph outlines
+class QFontEngineS60Extensions
+{
+public:
+    QFontEngineS60Extensions(COpenFont *font);
+
+    QByteArray getSfntTable(uint tag) const;
+    const unsigned char *cmap() const;
+    QPainterPath glyphOutline(glyph_t glyph) const;
+
+private:
+    COpenFont *m_font;
+    const MOpenFontShapingExtension *m_shapingExtension;
+    mutable MOpenFontTrueTypeExtension *m_trueTypeExtension;
+    mutable const unsigned char *m_cmap;
+    mutable bool m_symbolCMap;
+    mutable QByteArray m_cmapTable;
+};
+
+class QFontEngineS60 : public QFontEngine
+{
+public:
+    QFontEngineS60(const QFontDef &fontDef, const QFontEngineS60Extensions *extensions);
+    ~QFontEngineS60();
+
+    bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QTextEngine::ShaperFlags flags) const;
+    void recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFlags flags) const;
+
+    QImage alphaMapForGlyph(glyph_t glyph);
+
+    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs);
+    glyph_metrics_t boundingBox_const(glyph_t glyph) const; // Const correctnes quirk.
+    glyph_metrics_t boundingBox(glyph_t glyph);
+
+    QFixed ascent() const;
+    QFixed descent() const;
+    QFixed leading() const;
+    qreal maxCharWidth() const;
+    qreal minLeftBearing() const { return 0; }
+    qreal minRightBearing() const { return 0; }
+
+    QByteArray getSfntTable(uint tag) const;
+
+    static qreal pixelsToPoints(qreal pixels, Qt::Orientation orientation = Qt::Horizontal);
+    static qreal pointsToPixels(qreal points, Qt::Orientation orientation = Qt::Horizontal);
+
+    const char *name() const;
+
+    bool canRender(const QChar *string, int len);
+
+    Type type() const;
+
+private:
+    friend class QFontPrivate;
+
+    QFixed glyphAdvance(HB_Glyph glyph) const;
+    void getCharacterData(glyph_t glyph, TOpenFontCharMetrics& metrics, const TUint8*& bitmap, TSize& bitmapSize) const;
+
+    CFbsBitmap *m_textRenderBitmap;
+    CFbsBitmapDevice *m_textRenderBitmapDevice;
+    CFbsBitGc *m_textRenderBitmapGc;
+    CFont* m_font;
+    const QFontEngineS60Extensions *m_extensions;
+    qreal m_fontSizeInPixels;
+};
+
+class QFontEngineMultiS60 : public QFontEngineMulti
+{
+public:
+    QFontEngineMultiS60(QFontEngine *first, int script, const QStringList &fallbackFamilies);
+    void loadEngine(int at);
+
+    int m_script;
+    QStringList m_fallbackFamilies;
+};
+
+QT_END_NAMESPACE
+
+#endif // QFONTENGINE_S60_P_H
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 012c0f6c7e..2f3a7913f5 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -164,7 +164,7 @@ extern int qt_defaultDpi();
     metrics that are compatible with a certain paint device.
 */
 QFontMetrics::QFontMetrics(const QFont &font)
-    : d(font.d)
+    : d(font.d.data())
 {
     d->ref.ref();
 }
@@ -196,7 +196,7 @@ QFontMetrics::QFontMetrics(const QFont &font, QPaintDevice *paintdevice)
         d->dpi = dpi;
         d->screen = screen;
     } else {
-        d = font.d;
+        d = font.d.data();
         d->ref.ref();
     }
 
@@ -1005,7 +1005,7 @@ QFontMetricsF &QFontMetricsF::operator=(const QFontMetrics &other)
     metrics that are compatible with a certain paint device.
 */
 QFontMetricsF::QFontMetricsF(const QFont &font)
-    : d(font.d)
+    : d(font.d.data())
 {
     d->ref.ref();
 }
@@ -1037,7 +1037,7 @@ QFontMetricsF::QFontMetricsF(const QFont &font, QPaintDevice *paintdevice)
         d->dpi = dpi;
         d->screen = screen;
     } else {
-        d = font.d;
+        d = font.d.data();
         d->ref.ref();
     }
 
diff --git a/src/gui/text/qfragmentmap_p.h b/src/gui/text/qfragmentmap_p.h
index c780845c60..c2ba2b4f3c 100644
--- a/src/gui/text/qfragmentmap_p.h
+++ b/src/gui/text/qfragmentmap_p.h
@@ -214,6 +214,7 @@ private:
 
 template <class Fragment>
 QFragmentMapData<Fragment>::QFragmentMapData()
+    : fragments(0)
 {
     init();
 }
@@ -222,6 +223,7 @@ template <class Fragment>
 void QFragmentMapData<Fragment>::init()
 {
     fragments = (Fragment *)malloc(64*fragmentSize);
+    Q_CHECK_PTR(fragments);
     head->tag = (((quint32)'p') << 24) | (((quint32)'m') << 16) | (((quint32)'a') << 8) | 'p'; //TAG('p', 'm', 'a', 'p');
     head->root = 0;
     head->freelist = 1;
@@ -247,7 +249,9 @@ uint QFragmentMapData<Fragment>::createFragment()
         // need to create some free space
         uint needed = qAllocMore((freePos+1)*fragmentSize, 0);
         Q_ASSERT(needed/fragmentSize > head->allocated);
-        fragments = (Fragment *)realloc(fragments, needed);
+        Fragment *newFragments = (Fragment *)realloc(fragments, needed);
+        Q_CHECK_PTR(newFragments);
+        fragments = newFragments;
         head->allocated = needed/fragmentSize;
         F(freePos).right = 0;
     }
@@ -787,6 +791,8 @@ public:
     QFragmentMap() {}
     ~QFragmentMap()
     {
+        if (!data.fragments)
+            return; // in case of out-of-memory, we won't have fragments
         for (Iterator it = begin(); !it.atEnd(); ++it)
             it.value()->free();
     }
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index b2ad6867de..88f8028742 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -1611,6 +1611,9 @@ void QTextControlPrivate::mouseMoveEvent(Qt::MouseButtons buttons, const QPointF
         if (cursor.position() != oldCursorPos)
             emit q->cursorPositionChanged();
         _q_updateCurrentCharFormatAndSelection();
+        if (QInputContext *ic = inputContext()) {
+            ic->update();
+        }
     } else {
         //emit q->visibilityRequest(QRectF(mousePos, QSizeF(1, 1)));
         if (cursor.position() != oldCursorPos)
@@ -1813,13 +1816,18 @@ bool QTextControlPrivate::dropEvent(const QMimeData *mimeData, const QPointF &po
 
 void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
 {
+    Q_Q(QTextControl);
     if (!(interactionFlags & Qt::TextEditable) || cursor.isNull()) {
         e->ignore();
         return;
     }
-    cursor.beginEditBlock();
+    bool isGettingInput = !e->commitString().isEmpty() || !e->preeditString().isEmpty()
+            || e->replacementLength() > 0;
 
-    cursor.removeSelectedText();
+    if (isGettingInput) {
+        cursor.beginEditBlock();
+        cursor.removeSelectedText();
+    }
 
     // insert commit string
     if (!e->commitString().isEmpty() || e->replacementLength()) {
@@ -1829,6 +1837,18 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
         c.insertText(e->commitString());
     }
 
+    for (int i = 0; i < e->attributes().size(); ++i) {
+        const QInputMethodEvent::Attribute &a = e->attributes().at(i);
+        if (a.type == QInputMethodEvent::Selection) {
+            QTextCursor oldCursor = cursor;
+            int blockStart = a.start + cursor.block().position();
+            cursor.setPosition(blockStart, QTextCursor::MoveAnchor);
+            cursor.setPosition(blockStart + a.length, QTextCursor::KeepAnchor);
+            q->ensureCursorVisible();
+            repaintOldAndNewSelection(oldCursor);
+        }
+    }
+
     QTextBlock block = cursor.block();
     QTextLayout *layout = block.layout();
     layout->setPreeditArea(cursor.position() - block.position(), e->preeditString());
@@ -1852,7 +1872,9 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
         }
     }
     layout->setAdditionalFormats(overrides);
-    cursor.endEditBlock();
+
+    if (isGettingInput)
+        cursor.endEditBlock();
 }
 
 QVariant QTextControl::inputMethodQuery(Qt::InputMethodQuery property) const
@@ -1865,11 +1887,15 @@ QVariant QTextControl::inputMethodQuery(Qt::InputMethodQuery property) const
     case Qt::ImFont:
         return QVariant(d->cursor.charFormat().font());
     case Qt::ImCursorPosition:
-        return QVariant(d->cursor.selectionEnd() - block.position());
+        return QVariant(d->cursor.position() - block.position());
     case Qt::ImSurroundingText:
         return QVariant(block.text());
     case Qt::ImCurrentSelection:
         return QVariant(d->cursor.selectedText());
+    case Qt::ImMaximumTextLength:
+        return QVariant(); // No limit.
+    case Qt::ImAnchorPosition:
+        return QVariant(qBound(0, d->cursor.anchor() - block.position(), block.length()));
     default:
         return QVariant();
     }
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 407fcb67a2..b00d2da411 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2069,10 +2069,12 @@ void QTextEngine::LayoutData::reallocate(int totalGlyphs)
 
     int newAllocated = space_charAttributes + space_glyphs + space_logClusters;
     Q_ASSERT(newAllocated >= allocated);
-    void **old_mem = memory;
-    memory = (void **)::realloc(memory_on_stack ? 0 : old_mem, newAllocated*sizeof(void *));
-    if (memory_on_stack && memory)
-        memcpy(memory, old_mem, allocated*sizeof(void *));
+    void **newMem = memory;
+    newMem = (void **)::realloc(memory_on_stack ? 0 : memory, newAllocated*sizeof(void *));
+    Q_CHECK_PTR(newMem);
+    if (memory_on_stack && newMem)
+        memcpy(newMem, memory, allocated*sizeof(void *));
+    memory = newMem;
     memory_on_stack = false;
 
     void **m = memory;
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 5efbbe9e8e..699c41a208 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -367,7 +367,7 @@ QTextLayout::QTextLayout(const QString& text, const QFont &font, QPaintDevice *p
     QFont f(font);
     if (paintdevice)
         f = QFont(font, paintdevice);
-    d = new QTextEngine((text.isNull() ? (const QString&)QString::fromLatin1("") : text), f.d);
+    d = new QTextEngine((text.isNull() ? (const QString&)QString::fromLatin1("") : text), f.d.data());
 }
 
 /*!
diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp
index 524db4f7cb..6709f87e92 100644
--- a/src/gui/text/qtextoption.cpp
+++ b/src/gui/text/qtextoption.cpp
@@ -117,7 +117,13 @@ QTextOption &QTextOption::operator=(const QTextOption &o)
 {
     if (this == &o)
         return *this;
-    delete d; d = 0;
+
+    QTextOptionPrivate* dNew = 0;
+    if (o.d)
+        dNew = new QTextOptionPrivate(*o.d);
+    delete d;
+    d = dNew;
+
     align = o.align;
     wordWrap = o.wordWrap;
     design = o.design;
@@ -125,8 +131,6 @@ QTextOption &QTextOption::operator=(const QTextOption &o)
     unused = o.unused;
     f = o.f;
     tab = o.tab;
-    if (o.d)
-        d = new QTextOptionPrivate(*o.d);
     return *this;
 }
 
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index 2b6c894794..11ea2a72f7 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -432,6 +432,13 @@ void QTextTablePrivate::fragmentRemoved(const QChar &type, uint fragment)
     QTextFramePrivate::fragmentRemoved(type, fragment);
 }
 
+/*!
+    /fn void QTextTablePrivate::update() const
+
+    This function is usually called when the table is "dirty".
+    It seems to update all kind of table information.
+
+*/
 void QTextTablePrivate::update() const
 {
     Q_Q(const QTextTable);
@@ -439,7 +446,9 @@ void QTextTablePrivate::update() const
     nRows = (cells.size() + nCols-1)/nCols;
 //     qDebug(">>>> QTextTablePrivate::update, nRows=%d, nCols=%d", nRows, nCols);
 
-    grid = (int *)realloc(grid, nRows*nCols*sizeof(int));
+    int* newGrid = (int *)realloc(grid, nRows*nCols*sizeof(int));
+    Q_CHECK_PTR(newGrid);
+    grid = newGrid;
     memset(grid, 0, nRows*nCols*sizeof(int));
 
     QTextDocumentPrivate *p = pieceTable;
@@ -463,7 +472,9 @@ void QTextTablePrivate::update() const
         cellIndices[i] = cell;
 
         if (r + rowspan > nRows) {
-            grid = (int *)realloc(grid, sizeof(int)*(r + rowspan)*nCols);
+            newGrid = (int *)realloc(grid, sizeof(int)*(r + rowspan)*nCols);
+            Q_CHECK_PTR(newGrid);
+            grid = newGrid;
             memset(grid + (nRows*nCols), 0, sizeof(int)*(r+rowspan-nRows)*nCols);
             nRows = r + rowspan;
         }
diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp
index ccb4e6b6df..e4e54cfc54 100644
--- a/src/gui/text/qzip.cpp
+++ b/src/gui/text/qzip.cpp
@@ -705,7 +705,7 @@ void QZipWriterPrivate::addEntry(EntryType type, const QString &fileName, const
 */
 QZipReader::QZipReader(const QString &archive, QIODevice::OpenMode mode)
 {
-    QFile *f = new QFile(archive);
+    QScopedPointer<QFile> f(new QFile(archive));
     f->open(mode);
     QZipReader::Status status;
     if (f->error() == QFile::NoError)
@@ -721,7 +721,8 @@ QZipReader::QZipReader(const QString &archive, QIODevice::OpenMode mode)
             status = FileError;
     }
 
-    d = new QZipReaderPrivate(f, /*ownDevice=*/true);
+    d = new QZipReaderPrivate(f.data(), /*ownDevice=*/true);
+    f.take();
     d->status = status;
 }
 
@@ -979,7 +980,7 @@ void QZipReader::close()
 */
 QZipWriter::QZipWriter(const QString &fileName, QIODevice::OpenMode mode)
 {
-    QFile *f = new QFile(fileName);
+    QScopedPointer<QFile> f(new QFile(fileName));
     f->open(mode);
     QZipWriter::Status status;
     if (f->error() == QFile::NoError)
@@ -995,7 +996,8 @@ QZipWriter::QZipWriter(const QString &fileName, QIODevice::OpenMode mode)
             status = QZipWriter::FileError;
     }
 
-    d = new QZipWriterPrivate(f, /*ownDevice=*/true);
+    d = new QZipWriterPrivate(f.data(), /*ownDevice=*/true);
+    f.take();
     d->status = status;
 }
 
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index fc33d4358f..e4d24ff739 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -106,9 +106,27 @@ embedded {
 	DEFINES += QT_NO_FONTCONFIG
 }
 
+symbian {
+	SOURCES += \
+		text/qfont_s60.cpp
+	contains(QT_CONFIG, freetype) {
+		SOURCES += \
+			text/qfontengine_ft.cpp
+		HEADERS += \
+			text/qfontengine_ft_p.h
+		DEFINES += \
+			QT_NO_FONTCONFIG
+	} else {
+		SOURCES += \
+			text/qfontengine_s60.cpp
+		HEADERS += \
+			text/qfontengine_s60_p.h
+		LIBS += -lfntstr -lecom
+	}
+}
+
 contains(QT_CONFIG, freetype) {
     SOURCES += \
-	../3rdparty/freetype/builds/unix/ftsystem.c \
 	../3rdparty/freetype/src/base/ftbase.c \
 	../3rdparty/freetype/src/base/ftbbox.c \
 	../3rdparty/freetype/src/base/ftdebug.c \
@@ -152,10 +170,19 @@ contains(QT_CONFIG, freetype) {
           ../3rdparty/freetype/src/autofit/afloader.c\
           ../3rdparty/freetype/src/autofit/autofit.c
 
+    symbian {
+        SOURCES += \
+            ../3rdparty/freetype/src/base/ftsystem.c
+    } else {
+        SOURCES += \
+            ../3rdparty/freetype/builds/unix/ftsystem.c
+        INCLUDEPATH += \
+            ../3rdparty/freetype/builds/unix
+    }
+
     INCLUDEPATH += \
 	../3rdparty/freetype/src \
-	../3rdparty/freetype/include \
-	../3rdparty/freetype/builds/unix
+	../3rdparty/freetype/include
 
     DEFINES += FT2_BUILD_LIBRARY FT_CONFIG_OPTION_SYSTEM_ZLIB
     
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index a0a3756eb3..b823100538 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -482,7 +482,7 @@ QMatchData QCompletionEngine::filterHistory()
     for (int i = 0; i < source->rowCount(); i++) {
         QString str = source->index(i, c->column).data().toString();
         if (str.startsWith(c->prefix, c->cs)
-#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+#if (!defined(Q_OS_WIN) || defined(Q_OS_WINCE)) && !defined(Q_OS_SYMBIAN)
             && (!dirModel || QDir::toNativeSeparators(str) != QDir::separator())
 #endif
             )
@@ -990,7 +990,7 @@ void QCompleter::setModel(QAbstractItemModel *model)
         delete oldModel;
 #ifndef QT_NO_DIRMODEL
     if (qobject_cast<QDirModel *>(model)) {
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
         setCaseSensitivity(Qt::CaseInsensitive);
 #else
         setCaseSensitivity(Qt::CaseSensitive);
@@ -1656,7 +1656,7 @@ QString QCompleter::pathFromIndex(const QModelIndex& index) const
         idx = parent.sibling(parent.row(), index.column());
     } while (idx.isValid());
 
-#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+#if (!defined(Q_OS_WIN) || defined(Q_OS_WINCE)) && !defined(Q_OS_SYMBIAN)
     if (list.count() == 1) // only the separator or some other text
         return list[0];
     list[0].clear() ; // the join below will provide the separator
@@ -1690,7 +1690,10 @@ QStringList QCompleter::splitPath(const QString& path) const
 
     QString pathCopy = QDir::toNativeSeparators(path);
     QString sep = QDir::separator();
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_OS_SYMBIAN)
+    if (pathCopy == QLatin1String("\\"))
+        return QStringList(pathCopy);
+#elif defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     if (pathCopy == QLatin1String("\\") || pathCopy == QLatin1String("\\\\"))
         return QStringList(pathCopy);
     QString doubleSlash(QLatin1String("\\\\"));
@@ -1703,7 +1706,9 @@ QStringList QCompleter::splitPath(const QString& path) const
     QRegExp re(QLatin1Char('[') + QRegExp::escape(sep) + QLatin1Char(']'));
     QStringList parts = pathCopy.split(re);
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_OS_SYMBIAN)
+    // Do nothing
+#elif defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     if (!doubleSlash.isEmpty())
         parts[0].prepend(doubleSlash);
 #else
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 8177fb75b5..eb2d92ef1f 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -53,6 +53,8 @@
 #include "qdesktopservices_win.cpp"
 #elif defined(Q_WS_MAC)
 #include "qdesktopservices_mac.cpp"
+#elif defined(Q_OS_SYMBIAN)
+#include "qdesktopservices_s60.cpp"
 #endif
 
 #include <qhash.h>
@@ -285,6 +287,11 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme)
 
     \note The storage location returned can be a directory that does not exist; i.e., it
     may need to be created by the system or the user.
+    
+    \note On Symbian OS, DataLocation and ApplicationsLocation always point to appropriate
+    folder on same drive with executable. FontsLocation always points to folder on ROM drive.
+    Rest of the standard locations point to folder on same drive with executable, except 
+    that if executable is in ROM the folder from C drive is returned.
 
     \note On Mac OS X, DataLocation does not include QCoreApplication::organizationName.
     Use code like this to add it:
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp
new file mode 100644
index 0000000000..77cf254989
--- /dev/null
+++ b/src/gui/util/qdesktopservices_s60.cpp
@@ -0,0 +1,410 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// This flag changes the implementation to use S60 CDcoumentHandler
+// instead of apparch when opening the files
+#undef USE_DOCUMENTHANDLER
+
+#include <qcoreapplication.h>
+#include <qdir.h>
+#include <qurl.h>
+#include <private/qcore_symbian_p.h>
+
+#include <miutset.h>                // KUidMsgTypeSMTP
+#include <txtrich.h>                // CRichText
+#include <f32file.h>                // TDriveUnit etc
+#include <eikenv.h>                 // CEikonEnv
+#include <apgcli.h>                 // RApaLsSession
+#include <apgtask.h>                // TApaTaskList, TApaTask
+#include <rsendas.h>                // RSendAs
+#include <rsendasmessage.h>         // RSendAsMessage
+
+#ifdef Q_WS_S60
+#  include <pathinfo.h>               // PathInfo
+#  ifdef USE_DOCUMENTHANDLER
+#    include <documenthandler.h>        // CDocumentHandler
+#  endif
+#elif defined(USE_DOCUMENTHANDLER)
+#  error CDocumentHandler requires support for S60
+#endif
+
+QT_BEGIN_NAMESPACE
+
+_LIT(KSysBin, "\\Sys\\Bin\\");
+_LIT(KTempDir, "\\System\\Temp\\");
+_LIT(KBrowserPrefix, "4 " );
+_LIT(KFontsDir, "z:\\resource\\Fonts\\");
+const TUid KUidBrowser = { 0x10008D39 };
+
+static void handleMailtoSchemeL(const QUrl &url)
+{
+    QString recipient = url.path();
+    QString subject = url.queryItemValue("subject");
+    QString body = url.queryItemValue("body");
+    QString to = url.queryItemValue("to");
+    QString cc = url.queryItemValue("cc");
+    QString bcc = url.queryItemValue("bcc");
+
+    // these fields might have comma separated addresses
+    QStringList recipients = recipient.split(",");
+    QStringList tos = to.split(",");
+    QStringList ccs = cc.split(",");
+    QStringList bccs = bcc.split(",");
+
+
+	RSendAs sendAs;
+	User::LeaveIfError(sendAs.Connect());
+	CleanupClosePushL(sendAs);
+
+
+    CSendAsAccounts* accounts = CSendAsAccounts::NewL();
+    CleanupStack::PushL(accounts);
+    sendAs.AvailableAccountsL(KUidMsgTypeSMTP, *accounts);
+    TInt count = accounts->Count();
+    CleanupStack::PopAndDestroy(accounts);
+
+	if(!count) {
+        // TODO: we should try to create account if count == 0
+        // CSendUi would provide account creation service for us, but it requires ridicilous
+        // capabilities: LocalServices NetworkServices ReadDeviceData ReadUserData WriteDeviceData WriteUserData
+        User::Leave(KErrNotSupported);	
+	} else {
+        RSendAsMessage sendAsMessage;    
+        sendAsMessage.CreateL(sendAs, KUidMsgTypeSMTP);
+        CleanupClosePushL(sendAsMessage);
+        
+        
+        // Subject
+        sendAsMessage.SetSubjectL(qt_QString2TPtrC(subject));
+        
+        // Body
+        sendAsMessage.SetBodyTextL(qt_QString2TPtrC(body));
+        
+        // To
+        foreach(QString item, recipients)
+         sendAsMessage.AddRecipientL(qt_QString2TPtrC(item), RSendAsMessage::ESendAsRecipientTo );
+        
+        foreach(QString item, tos)
+         sendAsMessage.AddRecipientL(qt_QString2TPtrC(item), RSendAsMessage::ESendAsRecipientTo );
+        
+        // Cc
+        foreach(QString item, ccs)
+         sendAsMessage.AddRecipientL(qt_QString2TPtrC(item), RSendAsMessage::ESendAsRecipientCc );
+        
+        // Bcc
+        foreach(QString item, bccs)
+         sendAsMessage.AddRecipientL(qt_QString2TPtrC(item), RSendAsMessage::ESendAsRecipientBcc );
+        
+        // send the message
+        sendAsMessage.LaunchEditorAndCloseL();
+        
+        // sendAsMessage (already closed)
+        CleanupStack::Pop();
+	}
+	// sendAs
+	CleanupStack::PopAndDestroy();             
+}
+
+static bool handleMailtoScheme(const QUrl &url)
+{
+    TRAPD(err, handleMailtoSchemeL(url));
+    return err ? false : true;
+}
+
+static void handleOtherSchemesL(const TDesC& aUrl)
+{
+    // Other schemes are at the moment passed to WEB browser
+	HBufC* buf16 = HBufC::NewLC( aUrl.Length() + KBrowserPrefix.iTypeLength );
+	buf16->Des().Copy( KBrowserPrefix ); // Prefix used to launch correct browser view
+	buf16->Des().Append( aUrl );
+
+    TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
+    TApaTask task = taskList.FindApp( KUidBrowser );
+    if ( task.Exists() )
+        {
+        // Switch to existing browser instance
+        HBufC8* param8 = HBufC8::NewLC( buf16->Length() );
+        param8->Des().Append( buf16->Des() );
+        task.SendMessage( TUid::Uid( 0 ), *param8 ); // Uid is not used
+        CleanupStack::PopAndDestroy( param8 );
+        }
+    else
+        {
+        // Start a new browser instance
+	    RApaLsSession appArcSession;
+	    User::LeaveIfError( appArcSession.Connect() );
+	    CleanupClosePushL<RApaLsSession>( appArcSession );
+	    TThreadId id;
+        appArcSession.StartDocument( *buf16, KUidBrowser , id );
+	    CleanupStack::PopAndDestroy(); // appArcSession
+        }
+
+    CleanupStack::PopAndDestroy( buf16 );
+}
+
+static bool handleOtherSchemes(const QUrl &url)
+{
+    TRAPD( err, handleOtherSchemesL(qt_QString2TPtrC(url.toEncoded())));
+    return err ? false : true;
+}
+
+static TDriveUnit exeDrive()
+{
+    RProcess me;
+    TFileName processFileName = me.FileName();
+    TDriveUnit drive(processFileName);
+    return drive;
+}
+
+static TDriveUnit writableExeDrive()
+{
+    TDriveUnit drive = exeDrive();
+    if( drive.operator TInt() == EDriveZ )
+        return TDriveUnit( EDriveC );
+    return drive;
+}
+
+static TPtrC writableDataRoot()
+{
+    TDriveUnit drive = exeDrive();
+#ifdef Q_WS_S60
+    switch( drive.operator TInt() ){
+        case EDriveC:
+            return PathInfo::PhoneMemoryRootPath();
+            break;
+        case EDriveE:
+            return PathInfo::MemoryCardRootPath();
+            break;
+        case EDriveZ:
+            // It is not possible to write on ROM drive ->
+            // return phone mem root path instead
+            return PathInfo::PhoneMemoryRootPath();
+            break;
+        default:
+            // TODO: Should we return drive root similar to MemoryCardRootPath
+            return PathInfo::PhoneMemoryRootPath();
+            break;
+    }
+#else
+#warning No fallback implementation of writableDataRoot()
+    return 0;
+#endif
+}
+
+static void openDocumentL(const TDesC& aUrl)
+{
+#ifndef USE_DOCUMENTHANDLER
+    // Start app associated to file MIME type by using RApaLsSession
+	// Apparc base method cannot be used to open app in embedded mode,
+	// but seems to be most stable way at the moment
+    RApaLsSession appArcSession;
+    User::LeaveIfError( appArcSession.Connect() );
+    CleanupClosePushL<RApaLsSession>( appArcSession );
+    TThreadId id;
+    // ESwitchFiles means do not start another instance
+    // Leaves if file does not exist, leave is trapped in openDocument and false returned to user.
+    User::LeaveIfError( appArcSession.StartDocument( aUrl, id,
+    		RApaLsSession::ESwitchFiles ) ); // ELaunchNewApp
+    CleanupStack::PopAndDestroy(); // appArcSession
+#else
+    // This is an alternative way to launch app associated to MIME type
+	// CDocumentHandler would support opening apps in embedded mode,
+	// but our Qt application window group seems to always get switched on top of embedded one
+	// -> Cannot use menus etc of embedded app -> used
+
+	CDocumentHandler* docHandler = CDocumentHandler::NewLC();
+	TDataType temp;
+	//Standalone file opening fails for some file-types at least in S60 3.1 emulator
+	//For example .txt file fails with KErrAlreadyInUse and music files with KERN-EXEC 0
+	//Workaround is to use OpenFileEmbeddedL
+	//docHandler->OpenFileL(aUrl, temp);
+
+	// Opening file with CDocumentHandler will leave if file does not exist
+	// Leave is trapped in openDocument and false returned to user.
+	docHandler->OpenFileEmbeddedL(aUrl, temp);
+	CleanupStack::PopAndDestroy(docHandler);
+#endif
+}
+
+#ifdef USE_SCHEMEHANDLER
+// The schemehandler component only exist in private SDK. This implementation
+// exist here just for convenience in case that we need to use it later on
+// The schemehandle based implementation is not yet tested.
+
+// The biggest advantage of schemehandler is that it can handle
+// wide range of schemes and is extensible by plugins
+static bool handleUrl(const QUrl &url)
+{
+	if (!url.isValid())
+		return false;
+
+    TRAPD( err, handleUrlL(qt_QString2TPtrC(url.toString())));
+    return err ? false : true;
+}
+
+static void handleUrlL(const TDesC& aUrl)
+{
+    CSchemeHandler* schemeHandler = CSchemeHandler::NewL( aUrl );
+    CleanupStack::PushL( schemeHandler );
+    schemeHandler->HandleUrlStandaloneL(); // Process the Url in standalone mode
+    CleanupStack::PopAndDestroy();
+}
+static bool launchWebBrowser(const QUrl &url)
+{
+	return handleUrl(url);
+}
+
+static bool openDocument(const QUrl &file)
+{
+	return handleUrl(url);
+}
+#endif
+
+static bool launchWebBrowser(const QUrl &url)
+{
+    if (!url.isValid())
+        return false;
+
+    if (url.scheme() == QLatin1String("mailto")) {
+        return handleMailtoScheme(url);
+    }
+    return handleOtherSchemes( url );
+}
+
+static bool openDocument(const QUrl &file)
+{
+    if (!file.isValid())
+        return false;
+
+    QString filePath = file.toLocalFile();
+    filePath = QDir::toNativeSeparators(filePath);
+    TRAPD(err, openDocumentL(qt_QString2TPtrC(filePath)));
+    return err ? false : true;
+}
+
+QString QDesktopServices::storageLocation(StandardLocation type)
+{
+    TFileName path;
+
+    switch (type) {
+    case DesktopLocation:
+        qWarning("QDesktopServices::storageLocation %d not implemented", type);
+        break;
+    case DocumentsLocation:
+        path.Append(writableDataRoot());
+        break;
+    case FontsLocation:
+        path.Append(KFontsDir);
+        break;
+    case ApplicationsLocation:
+        path.Append(exeDrive().Name());
+        path.Append(KSysBin);
+        break;
+    case MusicLocation:
+        path.Append(writableDataRoot());
+#ifdef Q_WS_S60
+        path.Append(PathInfo::SoundsPath());
+#endif
+        break;
+    case MoviesLocation:
+        path.Append(writableDataRoot());
+#ifdef Q_WS_S60
+        path.Append(PathInfo::VideosPath());
+#endif
+        break;
+    case PicturesLocation:
+        path.Append(writableDataRoot());
+#ifdef Q_WS_S60
+        path.Append(PathInfo::ImagesPath());
+#endif
+        break;
+    case TempLocation:
+        path.Append(writableExeDrive().Name());
+        path.Append(KTempDir);
+        //return QDir::tempPath(); break;
+        break;
+    case HomeLocation:
+        path.Append(writableDataRoot());
+        //return QDir::homePath(); break;
+        break;
+    case DataLocation:
+    	CEikonEnv::Static()->FsSession().PrivatePath( path );
+        // TODO: Should we actually return phone mem if data is on ROM?
+        path.Insert( 0, exeDrive().Name() );
+        break;
+    default:
+        break;
+    }
+
+    // Convert to cross-platform format and clean the path
+    QString nativePath = QString::fromUtf16(path.Ptr(), path.Length());
+    QString qtPath = QDir::fromNativeSeparators(nativePath);
+    qtPath = QDir::cleanPath(qtPath);
+
+    // Note: The storage location returned can be a directory that does not exist;
+    // i.e., it may need to be created by the system or the user.
+    return  qtPath;
+}
+
+typedef QString (*LocalizerFunc)(QString&);
+
+static QString defaultLocalizedDirectoryName(QString&)
+{
+    return QString();
+}
+
+QString QDesktopServices::displayName(StandardLocation type)
+{
+    static LocalizerFunc ptrLocalizerFunc = NULL;
+
+    if (!ptrLocalizerFunc) {
+        ptrLocalizerFunc = reinterpret_cast<LocalizerFunc>
+            (qt_resolveS60PluginFunc(S60Plugin_LocalizedDirectoryName));
+        if (!ptrLocalizerFunc)
+            ptrLocalizerFunc = &defaultLocalizedDirectoryName;
+    }
+
+    QString rawPath = storageLocation(type);
+    return ptrLocalizerFunc(rawPath);
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri
index e628229f0c..cdbb7ccb55 100644
--- a/src/gui/util/util.pri
+++ b/src/gui/util/util.pri
@@ -38,3 +38,8 @@ embedded {
 !embedded:!x11:mac {
 		OBJECTIVE_SOURCES += util/qsystemtrayicon_mac.mm
 }
+
+symbian {
+    LIBS += -lsendas2 -letext -lapmime
+    contains(QT_CONFIG, s60): LIBS += -lplatformenv -lcommonui
+}
diff --git a/src/gui/widgets/qabstractscrollarea.cpp b/src/gui/widgets/qabstractscrollarea.cpp
index dd92e17eb2..391e09535c 100644
--- a/src/gui/widgets/qabstractscrollarea.cpp
+++ b/src/gui/widgets/qabstractscrollarea.cpp
@@ -287,8 +287,8 @@ void QAbstractScrollAreaPrivate::init()
     scrollBarContainers[Qt::Vertical]->setVisible(false);
     QObject::connect(vbar, SIGNAL(valueChanged(int)), q, SLOT(_q_vslide(int)));
     QObject::connect(vbar, SIGNAL(rangeChanged(int,int)), q, SLOT(_q_showOrHideScrollBars()), Qt::QueuedConnection);
-    viewportFilter = new QAbstractScrollAreaFilter(this);
-    viewport->installEventFilter(viewportFilter);
+    viewportFilter.reset(new QAbstractScrollAreaFilter(this));
+    viewport->installEventFilter(viewportFilter.data());
     viewport->setFocusProxy(q);
     q->setFocusPolicy(Qt::WheelFocus);
     q->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
@@ -500,7 +500,12 @@ QAbstractScrollArea::QAbstractScrollArea(QAbstractScrollAreaPrivate &dd, QWidget
     :QFrame(dd, parent)
 {
     Q_D(QAbstractScrollArea);
-    d->init();
+    QT_TRY {
+        d->init();
+    } QT_CATCH(...) {
+        d->viewportFilter.reset();
+        QT_RETHROW;
+    }
 }
 
 /*!
@@ -512,7 +517,12 @@ QAbstractScrollArea::QAbstractScrollArea(QWidget *parent)
     :QFrame(*new QAbstractScrollAreaPrivate, parent)
 {
     Q_D(QAbstractScrollArea);
-    d->init();
+    QT_TRY {
+        d->init();
+    } QT_CATCH(...) {
+        d->viewportFilter.reset();
+        QT_RETHROW;
+    }
 }
 
 
@@ -522,7 +532,8 @@ QAbstractScrollArea::QAbstractScrollArea(QWidget *parent)
 QAbstractScrollArea::~QAbstractScrollArea()
 {
     Q_D(QAbstractScrollArea);
-    delete d->viewportFilter;
+    // reset it here, otherwise we'll have a dangling pointer in ~QWidget
+    d->viewportFilter.reset();
 }
 
 
@@ -546,7 +557,7 @@ void QAbstractScrollArea::setViewport(QWidget *widget)
         d->viewport = widget;
         d->viewport->setParent(this);
         d->viewport->setFocusProxy(this);
-        d->viewport->installEventFilter(d->viewportFilter);
+        d->viewport->installEventFilter(d->viewportFilter.data());
         d->layoutChildren();
         if (isVisible())
             d->viewport->show();
diff --git a/src/gui/widgets/qabstractscrollarea_p.h b/src/gui/widgets/qabstractscrollarea_p.h
index aef8ac5d4f..f8ea843e30 100644
--- a/src/gui/widgets/qabstractscrollarea_p.h
+++ b/src/gui/widgets/qabstractscrollarea_p.h
@@ -98,7 +98,7 @@ public:
 
     inline bool viewportEvent(QEvent *event)
     { return q_func()->viewportEvent(event); }
-    QObject *viewportFilter;
+    QScopedPointer<QObject> viewportFilter;
 
 #ifdef Q_WS_WIN
     bool singleFingerPanEnabled;
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp
index 6865a56d73..19712d3f15 100644
--- a/src/gui/widgets/qabstractslider.cpp
+++ b/src/gui/widgets/qabstractslider.cpp
@@ -687,8 +687,9 @@ void QAbstractSlider::wheelEvent(QWheelEvent * e)
     Q_D(QAbstractSlider);
     e->ignore();
     if (e->orientation() != d->orientation && !rect().contains(e->pos()))
+    {
         return;
-
+    }
     static qreal offset = 0;
     static QAbstractSlider *offset_owner = 0;
     if (offset_owner != this){
diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp
index 7fa26aeb41..bcc5c923e4 100644
--- a/src/gui/widgets/qabstractspinbox.cpp
+++ b/src/gui/widgets/qabstractspinbox.cpp
@@ -663,7 +663,6 @@ void QAbstractSpinBox::setLineEdit(QLineEdit *lineEdit)
         d->edit->setParent(this);
 
     d->edit->setFrame(false);
-    d->edit->setAttribute(Qt::WA_InputMethodEnabled, false);
     d->edit->setFocusProxy(this);
     d->edit->setAcceptDrops(false);
 
@@ -694,6 +693,18 @@ void QAbstractSpinBox::interpretText()
     d->interpret(EmitIfChanged);
 }
 
+/*
+    Reimplemented in 4.6, so be careful.
+ */
+/*!
+    \reimp
+*/
+QVariant QAbstractSpinBox::inputMethodQuery(Qt::InputMethodQuery query) const
+{
+    Q_D(const QAbstractSpinBox);
+    return d->edit->inputMethodQuery(query);
+}
+
 /*!
     \reimp
 */
diff --git a/src/gui/widgets/qabstractspinbox.h b/src/gui/widgets/qabstractspinbox.h
index d8b97579ed..e65f27b557 100644
--- a/src/gui/widgets/qabstractspinbox.h
+++ b/src/gui/widgets/qabstractspinbox.h
@@ -122,6 +122,8 @@ public:
     void interpretText();
     bool event(QEvent *event);
 
+    QVariant inputMethodQuery(Qt::InputMethodQuery) const;
+
     virtual QValidator::State validate(QString &input, int &pos) const;
     virtual void fixup(QString &input) const;
 
diff --git a/src/gui/widgets/qactiontokeyeventmapper.cpp b/src/gui/widgets/qactiontokeyeventmapper.cpp
new file mode 100644
index 0000000000..280b1c6a6a
--- /dev/null
+++ b/src/gui/widgets/qactiontokeyeventmapper.cpp
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qapplication.h"
+#include "qevent.h"
+#include "qactiontokeyeventmapper_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QActionToKeyEventMapper::QActionToKeyEventMapper(QAction *softKeyAction, Qt::Key key, QObject *parent)
+    : QObject(parent)
+    , m_softKeyAction(softKeyAction)
+    , m_key(key)
+{
+
+}
+
+QString QActionToKeyEventMapper::roleText(QAction::SoftKeyRole role)
+{
+    switch (role) {
+    case QAction::OptionsSoftKey:
+        return QAction::tr("Options");
+    case QAction::SelectSoftKey:
+        return QAction::tr("Select");
+    case QAction::BackSoftKey:
+        return QAction::tr("Back");
+    case QAction::NextSoftKey:
+        return QAction::tr("Next");
+    case QAction::PreviousSoftKey:
+        return QAction::tr("Previous");
+    case QAction::OkSoftKey:
+        return QAction::tr("Ok");
+    case QAction::CancelSoftKey:
+        return QAction::tr("Cancel");
+    case QAction::EditSoftKey:
+        return QAction::tr("Edit");
+    case QAction::ViewSoftKey:
+        return QAction::tr("View");
+    default:
+        return QString();
+    };
+}
+void QActionToKeyEventMapper::addSoftKey(QAction::SoftKeyRole standardRole, Qt::Key key, QWidget *actionWidget)
+{
+    QAction *action = new QAction(actionWidget);
+    action->setSoftKeyRole(standardRole);
+    action->setText(roleText(standardRole));
+    QActionToKeyEventMapper *softKey = new QActionToKeyEventMapper(action, key, actionWidget);
+    connect(action, SIGNAL(triggered()), softKey, SLOT(sendKeyEvent()));
+    connect(action, SIGNAL(destroyed()), softKey, SLOT(deleteLater()));
+    actionWidget->setSoftKey(action);
+}
+
+void QActionToKeyEventMapper::removeSoftkey(QWidget *focussedWidget)
+{
+    focussedWidget->setSoftKey(0);
+}
+
+void QActionToKeyEventMapper::sendKeyEvent()
+{
+    QApplication::postEvent(parent(), new QKeyEvent(QEvent::KeyPress, m_key, Qt::NoModifier));
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/gui/widgets/qactiontokeyeventmapper_p.h b/src/gui/widgets/qactiontokeyeventmapper_p.h
new file mode 100644
index 0000000000..c54e6129a8
--- /dev/null
+++ b/src/gui/widgets/qactiontokeyeventmapper_p.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QACTIONTOKEYEVENTMAPPER_P_H
+#define QACTIONTOKEYEVENTMAPPER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qobject.h>
+#include "QtGui/qaction.h"
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QActionToKeyEventMapper : public QObject
+{
+    Q_OBJECT
+public:
+    QActionToKeyEventMapper(QAction *softKeyAction, Qt::Key key, QObject *parent);
+    static QString roleText(QAction::SoftKeyRole role);
+    static void addSoftKey(QAction::SoftKeyRole standardRole, Qt::Key key, QWidget *actionWidget);
+    static void removeSoftkey(QWidget *focussedWidget);
+private:
+    QAction *m_softKeyAction;
+    Qt::Key m_key;
+private Q_SLOTS:
+    void sendKeyEvent();
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif //QACTIONTOKEYEVENTMAPPER_P_H
diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/gui/widgets/qcalendarwidget.cpp
index 2586c56d8a..7f29ec71a8 100644
--- a/src/gui/widgets/qcalendarwidget.cpp
+++ b/src/gui/widgets/qcalendarwidget.cpp
@@ -2142,14 +2142,11 @@ QSize QCalendarWidget::minimumSizeHint() const
     int end = 53;
     int rows = 7;
     int cols = 8;
-    int startRow = 0;
-    int startCol = 0;
 
     const int marginH = (style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1) * 2;
 
     if (horizontalHeaderFormat() == QCalendarWidget::NoHorizontalHeader) {
         rows = 6;
-        startRow = 1;
     } else {
         for (int i = 1; i <= 7; i++) {
             QFontMetrics fm(d->m_model->formatForCell(0, i).font());
@@ -2160,7 +2157,6 @@ QSize QCalendarWidget::minimumSizeHint() const
 
     if (verticalHeaderFormat() == QCalendarWidget::NoVerticalHeader) {
         cols = 7;
-        startCol = 1;
     } else {
         for (int i = 1; i <= 6; i++) {
             QFontMetrics fm(d->m_model->formatForCell(i, 0).font());
@@ -2527,13 +2523,6 @@ void QCalendarWidget::setDateRange(const QDate &min, const QDate &max)
     if (!min.isValid() || !max.isValid())
         return;
 
-    QDate minimum = min;
-    QDate maximum = max;
-    if (min > max) {
-        minimum = max;
-        maximum = min;
-    }
-
     QDate oldDate = d->m_model->m_date;
     d->m_model->setRange(min, max);
     d->yearEdit->setMinimum(d->m_model->m_minimumDate.year());
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index 097f3d0f70..b6fae10107 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -64,7 +64,7 @@
 #include <private/qabstractitemmodel_p.h>
 #include <private/qabstractscrollarea_p.h>
 #include <qdebug.h>
-
+#include <private/qactiontokeyeventmapper_p.h>
 #ifdef Q_WS_X11
 #include <private/qt_x11_p.h>
 #endif
@@ -629,6 +629,9 @@ bool QComboBoxPrivateContainer::eventFilter(QObject *o, QEvent *e)
         case Qt::Key_Select:
 #endif
             if (view->currentIndex().isValid() && (view->currentIndex().flags() & Qt::ItemIsEnabled) ) {
+#ifdef QT_KEYPAD_NAVIGATION
+                QActionToKeyEventMapper::removeSoftkey(this);
+#endif
                 combo->hidePopup();
                 emit itemSelected(view->currentIndex());
             }
@@ -641,6 +644,7 @@ bool QComboBoxPrivateContainer::eventFilter(QObject *o, QEvent *e)
         case Qt::Key_Escape:
 #ifdef QT_KEYPAD_NAVIGATION
         case Qt::Key_Back:
+            QActionToKeyEventMapper::removeSoftkey(this);
 #endif
             combo->hidePopup();
             return true;
@@ -2454,6 +2458,11 @@ void QComboBox::showPopup()
 
     container->setUpdatesEnabled(updatesEnabled);
     container->update();
+#ifdef QT_KEYPAD_NAVIGATION
+    if (QApplication::keypadNavigationEnabled())
+        view()->setEditFocus(true);
+    QActionToKeyEventMapper::addSoftKey(QAction::CancelSoftKey, Qt::Key_Back, view());
+#endif
 }
 
 /*!
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp
index 5ddf7f7744..db57b4388f 100644
--- a/src/gui/widgets/qdatetimeedit.cpp
+++ b/src/gui/widgets/qdatetimeedit.cpp
@@ -1126,23 +1126,25 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event)
     case Qt::Key_Left:
     case Qt::Key_Right:
         if (event->key() == Qt::Key_Left || event->key() == Qt::Key_Right) {
+            if (
 #ifdef QT_KEYPAD_NAVIGATION
-            if (!QApplication::keypadNavigationEnabled() || !hasEditFocus()) {
-                select = false;
-                break;
-            }
-#else
-            if (!(event->modifiers() & Qt::ControlModifier)) {
+                QApplication::keypadNavigationEnabled() && !hasEditFocus()
+                || !QApplication::keypadNavigationEnabled() &&
+#endif
+                !(event->modifiers() & Qt::ControlModifier)) {
                 select = false;
                 break;
             }
 #ifdef Q_WS_MAC
-            else {
+            else
+#ifdef QT_KEYPAD_NAVIGATION
+                if (!QApplication::keypadNavigationEnabled())
+#endif
+            {
                 select = (event->modifiers() & Qt::ShiftModifier);
                 break;
             }
 #endif
-#endif // QT_KEYPAD_NAVIGATION
         }
         // else fall through
     case Qt::Key_Backtab:
@@ -2386,6 +2388,7 @@ void QDateTimeEditPrivate::init(const QVariant &var)
         q->setCalendarPopup(true);
 #endif
     updateTimeSpec();
+    q->setInputMethodHints(Qt::ImhPreferNumbers);
     setLayoutItemMargins(QStyle::SE_DateTimeEditLayoutItem);
 }
 
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp
index e0f5bc9656..01d4890587 100644
--- a/src/gui/widgets/qlineedit.cpp
+++ b/src/gui/widgets/qlineedit.cpp
@@ -509,7 +509,13 @@ void QLineEdit::setEchoMode(EchoMode mode)
     Q_D(QLineEdit);
     if (mode == (EchoMode)d->control->echoMode())
         return;
-    setAttribute(Qt::WA_InputMethodEnabled, d->shouldEnableInputMethod());
+    Qt::InputMethodHints imHints = inputMethodHints();
+    if (mode == Password) {
+        imHints |= Qt::ImhHiddenText;
+    } else {
+        imHints &= ~Qt::ImhHiddenText;
+    }
+    setInputMethodHints(imHints);
     d->control->setEchoMode(mode);
     update();
 #ifdef Q_WS_MAC
@@ -1487,6 +1493,13 @@ void QLineEdit::mouseReleaseEvent(QMouseEvent* e)
         }
     }
 #endif
+
+    if (e->button() == Qt::LeftButton && qApp->autoSipEnabled()
+            && (!d->clickCausedFocus || qApp->autoSipOnMouseFocus())) {
+        QEvent event(QEvent::RequestSoftwareInputPanel);
+        QApplication::sendEvent(this, &event);
+    }
+    d->clickCausedFocus = 0;
 }
 
 /*! \reimp
@@ -1649,6 +1662,15 @@ QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property) const
         return QVariant(text());
     case Qt::ImCurrentSelection:
         return QVariant(selectedText());
+    case Qt::ImMaximumTextLength:
+        return QVariant(maxLength());
+    case Qt::ImAnchorPosition:
+        if (d->selstart == d->selend)
+            return QVariant(d->cursor);
+        else if (d->selstart == d->cursor)
+            return QVariant(d->selend);
+        else
+            return QVariant(d->selstart);
     default:
         return QVariant();
     }
@@ -1667,6 +1689,8 @@ void QLineEdit::focusInEvent(QFocusEvent *e)
             d->control->moveCursor(d->control->nextMaskBlank(0));
         else if (!d->control->hasSelectedText())
             selectAll();
+    } else if (e->reason() == Qt::MouseFocusReason) {
+        d->clickCausedFocus = 1;
     }
 #ifdef QT_KEYPAD_NAVIGATION
     if (!QApplication::keypadNavigationEnabled() || (hasEditFocus() && e->reason() == Qt::PopupFocusReason))
diff --git a/src/gui/widgets/qmacnativewidget_mac.h b/src/gui/widgets/qmacnativewidget_mac.h
index 6b6bee1070..5c654b5916 100644
--- a/src/gui/widgets/qmacnativewidget_mac.h
+++ b/src/gui/widgets/qmacnativewidget_mac.h
@@ -64,7 +64,7 @@ protected:
     bool event(QEvent *ev);
 
 private:
-    Q_DECLARE_PRIVATE_D(QWidget::d_ptr, QMacNativeWidget)
+    Q_DECLARE_PRIVATE(QMacNativeWidget)
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index c51bed9510..b75b5ea457 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -481,6 +481,11 @@ void QMainWindow::setMenuBar(QMenuBar *menuBar)
         oldMenuBar->deleteLater();
     }
     d->layout->setMenuBar(menuBar);
+    if (menuBar) {
+        QAction* menu = new QAction(QString::fromLatin1("Options"), this);
+        menu->setSoftKeyRole(QAction::MenuSoftKey);
+        setSoftKey(menu);
+    }
 }
 
 /*!
@@ -1396,7 +1401,16 @@ bool QMainWindow::event(QEvent *event)
            }
            break;
 #endif
-
+#ifndef QT_NO_MENUBAR
+        case QEvent::WindowActivate:
+            if (d->layout->menuBar()) {
+                // ### TODO: This is evil, there is no need to create a new action every time
+                QAction* menu = new QAction(QString::fromLatin1("Options"), this);
+                menu->setSoftKeyRole(QAction::MenuSoftKey);
+                setSoftKey(menu);
+            }
+            break;
+#endif
         default:
             break;
     }
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 0b85eec670..d0620af0d6 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -60,6 +60,7 @@
 #ifndef QT_NO_WHATSTHIS
 # include <qwhatsthis.h>
 #endif
+#include <private/qactiontokeyeventmapper_p.h>
 
 #include "qmenu_p.h"
 #include "qmenubar_p.h"
@@ -556,8 +557,14 @@ void QMenuPrivate::setCurrentAction(QAction *action, int popup, SelectionReason
                     //when the action has no QWidget, the QMenu itself should
                     // get the focus
                     // Since the menu is a pop-up, it uses the popup reason.
-                    if (!q->hasFocus())
+                    if (!q->hasFocus()) {
                         q->setFocus(Qt::PopupFocusReason);
+#ifdef QT_KEYPAD_NAVIGATION
+                        // TODO: aportale, remove KEYPAD_NAVIGATION_HACK when softkey stack
+                        //       handles focus related and user related actions separately...
+                        QActionToKeyEventMapper::addSoftKey(QAction::CancelSoftKey, Qt::Key_Back, q);
+#endif
+                    }
                 }
             }
         } else { //action is a separator
@@ -1774,6 +1781,22 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     QRect screen = d->popupGeometry(QApplication::desktop()->screenNumber(p));
     const int desktopFrame = style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, this);
     bool adjustToDesktop = !window()->testAttribute(Qt::WA_DontShowOnScreen);
+#ifdef QT_KEYPAD_NAVIGATION
+    if (!atAction && QApplication::keypadNavigationEnabled()) {
+        // Try to have one item activated
+        if (d->defaultAction && d->defaultAction->isEnabled()) {
+            atAction = d->defaultAction;
+            // TODO: This works for first level menus, not yet sub menus
+        } else {
+            foreach (QAction *action, d->actions)
+                if (action->isEnabled()) {
+                    atAction = action;
+                    break;
+                }
+        }
+        d->currentAction = atAction;
+    }
+#endif
     if (d->ncols > 1) {
         pos.setY(screen.top()+desktopFrame);
     } else if (atAction) {
@@ -1901,6 +1924,9 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
 #ifndef QT_NO_ACCESSIBILITY
     QAccessible::updateAccessibility(this, 0, QAccessible::PopupMenuStart);
 #endif
+#ifdef QT_KEYPAD_NAVIGATION
+    QActionToKeyEventMapper::addSoftKey(QAction::CancelSoftKey, Qt::Key_Back, this);
+#endif
 }
 
 /*!
@@ -2559,6 +2585,7 @@ void QMenu::keyPressEvent(QKeyEvent *e)
     case Qt::Key_Escape:
 #ifdef QT_KEYPAD_NAVIGATION
     case Qt::Key_Back:
+        QActionToKeyEventMapper::removeSoftkey(this);
 #endif
         key_consumed = true;
         if (d->tornoff) {
@@ -2834,6 +2861,16 @@ void QMenu::actionEvent(QActionEvent *e)
         d->wce_menu->syncAction(e->action());
 #endif
 
+#ifdef Q_WS_S60
+    if (!d->symbian_menu)
+        d->symbian_menu = new QMenuPrivate::QSymbianMenuPrivate;
+    if (e->type() == QEvent::ActionAdded)
+        d->symbian_menu->addAction(e->action(), d->symbian_menu->findAction(e->before()));
+    else if (e->type() == QEvent::ActionRemoved)
+        d->symbian_menu->removeAction(e->action());
+    else if (e->type() == QEvent::ActionChanged)
+        d->symbian_menu->syncAction(e->action());
+#endif
     if (isVisible()) {
         d->updateActionRects();
 	resize(sizeHint());
diff --git a/src/gui/widgets/qmenu.h b/src/gui/widgets/qmenu.h
index c8be540f02..41890c46dd 100644
--- a/src/gui/widgets/qmenu.h
+++ b/src/gui/widgets/qmenu.h
@@ -52,11 +52,19 @@
 #endif
 
 QT_BEGIN_HEADER
+#ifdef Q_WS_S60
+    class CEikMenuPane;
+#endif
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
 
+#ifdef Q_WS_S60
+    IMPORT_C void qt_symbian_show_toplevel(CEikMenuPane* menuPane);
+    IMPORT_C void qt_symbian_show_submenu(CEikMenuPane* menuPane, int id);
+#endif
+
 #ifndef QT_NO_MENU
 
 class QMenuPrivate;
@@ -145,7 +153,6 @@ public:
     HMENU wceMenu(bool create = false);
 #endif
 
-
     bool separatorsCollapsible() const;
     void setSeparatorsCollapsible(bool collapse);
 
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index 8697771c9c..0218dc7b5f 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -61,6 +61,9 @@
 #include "QtCore/qbasictimer.h"
 #include "private/qwidget_p.h"
 
+#ifdef Q_WS_S60
+class CEikMenuPane;
+#endif
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_MENU
@@ -120,6 +123,15 @@ struct QWceMenuAction {
     QWceMenuAction() : menuHandle(0), command(0) {}
 };
 #endif
+#ifdef Q_WS_S60
+struct QSymbianMenuAction {
+    uint command;
+    int parent;
+    CEikMenuPane* menuPane;
+    QPointer<QAction> action;
+    QSymbianMenuAction() : command(0) {}
+};
+#endif
 
 class QMenuPrivate : public QWidgetPrivate
 {
@@ -135,6 +147,9 @@ public:
 #if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR)
                       ,wce_menu(0)
 #endif
+#ifdef Q_WS_S60
+                      ,symbian_menu(0)
+#endif
 #ifdef QT3_SUPPORT
                       ,emitHighlighted(false)
 #endif
@@ -148,6 +163,10 @@ public:
 #if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR)
         delete wce_menu;
 #endif
+#ifdef Q_WS_S60
+        delete symbian_menu;
+#endif
+
     }
     void init();
 
@@ -319,7 +338,28 @@ public:
     HMENU wceMenu(bool create = false);
     QAction* wceCommands(uint command);
 #endif
-
+#if defined(Q_WS_S60)
+    struct QSymbianMenuPrivate {
+        QList<QSymbianMenuAction*> actionItems;
+        QSymbianMenuPrivate();
+        ~QSymbianMenuPrivate();
+        void addAction(QAction *, QSymbianMenuAction* =0);
+        void addAction(QSymbianMenuAction *, QSymbianMenuAction* =0);
+        void syncAction(QSymbianMenuAction *);
+        inline void syncAction(QAction *a) { syncAction(findAction(a)); }
+        void removeAction(QSymbianMenuAction *);
+        void rebuild(bool reCreate = false);
+        inline void removeAction(QAction *a) { removeAction(findAction(a)); }
+        inline QSymbianMenuAction *findAction(QAction *a) {
+            for(int i = 0; i < actionItems.size(); i++) {
+                QSymbianMenuAction *act = actionItems[i];
+                if(a == act->action)
+                    return act;
+            }
+            return 0;
+        }
+    } *symbian_menu;
+#endif
     QPointer<QWidget> noReplayFor;
 };
 
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
new file mode 100644
index 0000000000..76057e74ef
--- /dev/null
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -0,0 +1,423 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmenu.h"
+#include "qapplication.h"
+#include "qevent.h"
+#include "qstyle.h"
+#include "qdebug.h"
+#include "qwidgetaction.h"
+#include <private/qapplication_p.h>
+#include <private/qmenu_p.h>
+#include <private/qmenubar_p.h>
+#include <qt_s60_p.h>
+#include <QtCore/qlibrary.h>
+
+#ifdef Q_WS_S60
+#include <eikmenub.h>
+#include <eikmenup.h>
+#include <eikaufty.h>
+#include <eikbtgpc.h>
+#include <avkon.rsg>
+#endif
+
+#if !defined(QT_NO_MENUBAR) && defined(Q_WS_S60)
+
+QT_BEGIN_NAMESPACE
+
+typedef QMultiHash<QWidget *, QMenuBarPrivate *> MenuBarHash;
+Q_GLOBAL_STATIC(MenuBarHash, menubars)
+
+#define QT_FIRST_MENU_ITEM 32000
+
+struct SymbianMenuItem
+{
+    int id;
+    CEikMenuPaneItem::SData menuItemData;
+    QList<SymbianMenuItem*> children;
+    QAction* action;
+};
+
+static QList<SymbianMenuItem*> symbianMenus;
+static QList<QMenuBar*> nativeMenuBars;
+static uint qt_symbian_menu_static_cmd_id = QT_FIRST_MENU_ITEM;
+static QPointer<QWidget> widgetWithContextMenu;
+static QList<QAction*> contextMenuActionList;
+static QAction contextAction(0);
+static int contexMenuCommand=0;
+
+bool menuExists()
+{
+    QWidget *w = qApp->activeWindow();
+    QMenuBarPrivate *mb = menubars()->value(w);
+    if ((!mb) && !menubars()->count()) 
+        return false;
+    return true;
+}
+
+static bool hasContextMenu(QWidget* widget)
+{
+    if (!widget)
+        return false;
+    const Qt::ContextMenuPolicy policy = widget->contextMenuPolicy();
+    if (policy != Qt::NoContextMenu && policy != Qt::PreventContextMenu ) {
+        return true;
+    }
+    return false;
+}
+// ### FIX THIS, copy/paste of original (faulty) stripped text implementation.
+// Implementation should be removed from QAction implementation to some generic place
+static QString qt_strippedText_copy_from_qaction(QString s)
+{
+    s.remove(QString::fromLatin1("..."));
+    int i = 0;
+    while (i < s.size()) {
+        ++i;
+        if (s.at(i-1) != QLatin1Char('&'))
+            continue;
+        if (i < s.size() && s.at(i) == QLatin1Char('&'))
+            ++i;
+        s.remove(i-1,1);
+    }
+    return s.trimmed();
+};
+
+static SymbianMenuItem* qt_symbian_find_menu(int id, const QList<SymbianMenuItem*> &parent)
+{
+    int index=0;
+    while (index < parent.count()) {
+        SymbianMenuItem* temp = parent[index];
+        if (temp->menuItemData.iCascadeId == id)
+           return temp;
+        else if (temp->menuItemData.iCascadeId != 0) {
+            SymbianMenuItem* result = qt_symbian_find_menu( id, temp->children);
+            if (result)
+                return result;
+        }
+        index++;
+    }
+    return 0;
+}
+
+static SymbianMenuItem* qt_symbian_find_menu_item(int id, const QList<SymbianMenuItem*> &parent)
+{
+    int index=0;
+    while (index < parent.count()) {
+        SymbianMenuItem* temp = parent[index];
+        if (temp->menuItemData.iCascadeId != 0) {
+            SymbianMenuItem* result = qt_symbian_find_menu_item( id, temp->children);
+            if (result)
+                return result;
+        }
+        else if (temp->menuItemData.iCommandId == id)
+            return temp;
+        index++;
+
+    }
+    return 0;
+}
+
+static void qt_symbian_insert_action(QSymbianMenuAction* action, QList<SymbianMenuItem*>* parent)
+{
+    if (action->action->isVisible()) {
+        if (action->action->isSeparator())
+            return;
+
+// ### FIX THIS, the qt_strippedText2 doesn't work perfectly for stripping & marks. Same bug is in QAction
+//     New really working method is needed in a place where the implementation isn't copy/pasted
+        QString text = qt_strippedText_copy_from_qaction(action->action->text());
+        TPtrC menuItemText(qt_QString2TPtrC(text));
+
+        if (action->action->menu()) {
+            SymbianMenuItem* menuItem = new SymbianMenuItem();
+            menuItem->menuItemData.iCascadeId = action->command;
+            menuItem->menuItemData.iCommandId = action->command;
+            menuItem->menuItemData.iFlags = 0;
+            menuItem->menuItemData.iText = menuItemText;
+            menuItem->action = action->action;
+            if (action->action->menu()->actions().size() == 0 || !action->action->isEnabled() )
+                menuItem->menuItemData.iFlags |= EEikMenuItemDimmed;
+            parent->append(menuItem);
+
+            if (action->action->menu()->actions().size() > 0) {
+                for (int c2= 0; c2 < action->action->menu()->actions().size(); ++c2) {
+                    QSymbianMenuAction *symbianAction2 = new QSymbianMenuAction;
+                    symbianAction2->action = action->action->menu()->actions().at(c2);
+                    QMenu * menu = symbianAction2->action->menu();
+                    symbianAction2->command = qt_symbian_menu_static_cmd_id++;
+                    qt_symbian_insert_action(symbianAction2, &(menuItem->children));
+                }
+            }
+
+        } else {
+            SymbianMenuItem* menuItem = new SymbianMenuItem();
+            menuItem->menuItemData.iCascadeId = 0;
+            menuItem->menuItemData.iCommandId = action->command;
+            menuItem->menuItemData.iFlags = 0;
+            menuItem->menuItemData.iText = menuItemText;
+            menuItem->action = action->action;
+            if (!action->action->isEnabled()){
+                menuItem->menuItemData.iFlags += EEikMenuItemDimmed;
+            }
+            
+            if (action->action->isCheckable()) {
+                if (action->action->isChecked())
+                    menuItem->menuItemData.iFlags += EEikMenuItemCheckBox | EEikMenuItemSymbolOn;
+                else
+                    menuItem->menuItemData.iFlags += EEikMenuItemCheckBox;
+            }
+            parent->append(menuItem);
+        }
+    }
+}
+
+void deleteAll(QList<SymbianMenuItem*> *items)
+{
+    while (!items->isEmpty()) {
+        SymbianMenuItem* temp = items->takeFirst();
+        deleteAll(&temp->children);
+        delete temp;
+    }
+}
+
+static void rebuildMenu()
+{
+    widgetWithContextMenu = 0;
+    QMenuBarPrivate *mb = 0;
+    QWidget *w = qApp->activeWindow();
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget) {
+        if (hasContextMenu(focusWidget))
+            widgetWithContextMenu = focusWidget;
+    }
+
+    if (w) {
+        mb = menubars()->value(w);
+        qt_symbian_menu_static_cmd_id = QT_FIRST_MENU_ITEM;
+        deleteAll( &symbianMenus );
+        if (!mb)
+            return;
+        mb->symbian_menubar->rebuild();
+    }
+}
+
+Q_GUI_EXPORT void qt_symbian_show_toplevel( CEikMenuPane* menuPane)
+{
+    if (!menuExists())
+        return;
+    rebuildMenu();
+    for (int i = 0; i < symbianMenus.count(); ++i)
+        menuPane->AddMenuItemL(symbianMenus.at(i)->menuItemData);
+}
+
+Q_GUI_EXPORT void qt_symbian_show_submenu( CEikMenuPane* menuPane, int id)
+{
+    SymbianMenuItem* menu = qt_symbian_find_menu(id, symbianMenus);
+    if (menu) {
+        for (int i = 0; i < menu->children.count(); ++i)
+            menuPane->AddMenuItemL(menu->children.at(i)->menuItemData);
+    }
+}
+
+void QMenuBarPrivate::symbianCommands(int command)
+{
+    if (command == contexMenuCommand && !widgetWithContextMenu.isNull()) {
+        QContextMenuEvent* event = new QContextMenuEvent(QContextMenuEvent::Keyboard, QPoint(0,0));
+        QCoreApplication::postEvent(widgetWithContextMenu, event);
+    }
+    
+    int size = nativeMenuBars.size();
+    for (int i = 0; i < nativeMenuBars.size(); ++i) {
+    SymbianMenuItem* menu = qt_symbian_find_menu_item(command, symbianMenus);
+    if (!menu)
+            continue;
+
+        emit nativeMenuBars.at(i)->triggered(menu->action);
+    menu->action->activate(QAction::Trigger);
+        break;
+    }
+}
+
+void QMenuBarPrivate::symbianCreateMenuBar(QWidget *parent)
+{
+    Q_Q(QMenuBar);
+    if (parent && parent->isWindow()){
+        menubars()->insert(q->window(), this);
+        symbian_menubar = new QSymbianMenuBarPrivate(this);
+        nativeMenuBars.append(q);
+    }
+}
+
+void QMenuBarPrivate::symbianDestroyMenuBar()
+{
+    Q_Q(QMenuBar);
+    int index = nativeMenuBars.indexOf(q);
+    nativeMenuBars.removeAt(index);
+    menubars()->remove(q->window(), this);
+    rebuildMenu();
+    if (symbian_menubar)
+        delete symbian_menubar;
+    symbian_menubar = 0;
+}
+
+QMenuBarPrivate::QSymbianMenuBarPrivate::QSymbianMenuBarPrivate(QMenuBarPrivate *menubar)
+{
+    d = menubar;
+}
+
+QMenuBarPrivate::QSymbianMenuBarPrivate::~QSymbianMenuBarPrivate()
+{
+    deleteAll( &symbianMenus );
+    symbianMenus.clear();
+    d = 0;
+    rebuild();
+}
+
+QMenuPrivate::QSymbianMenuPrivate::QSymbianMenuPrivate()
+{
+}
+
+QMenuPrivate::QSymbianMenuPrivate::~QSymbianMenuPrivate()
+{
+
+}
+
+void QMenuPrivate::QSymbianMenuPrivate::addAction(QAction *a, QSymbianMenuAction *before)
+{
+    QSymbianMenuAction *action = new QSymbianMenuAction;
+    action->action = a;
+    action->command = qt_symbian_menu_static_cmd_id++;
+    addAction(action, before);
+}
+
+void QMenuPrivate::QSymbianMenuPrivate::addAction(QSymbianMenuAction *action, QSymbianMenuAction *before)
+{
+    if (!action)
+        return;
+    int before_index = actionItems.indexOf(before);
+    if (before_index < 0) {
+        before = 0;
+        before_index = actionItems.size();
+    }
+    actionItems.insert(before_index, action);
+}
+
+
+void QMenuPrivate::QSymbianMenuPrivate::syncAction(QSymbianMenuAction *)
+{
+    rebuild();
+}
+
+void QMenuPrivate::QSymbianMenuPrivate::removeAction(QSymbianMenuAction *action)
+{
+    actionItems.removeAll(action);
+    delete action;
+    action = 0;
+    rebuild();
+}
+
+void QMenuPrivate::QSymbianMenuPrivate::rebuild(bool)
+{
+}
+
+void QMenuBarPrivate::QSymbianMenuBarPrivate::addAction(QAction *a, QSymbianMenuAction *before)
+{
+    QSymbianMenuAction *action = new QSymbianMenuAction;
+    action->action = a;
+    action->command = qt_symbian_menu_static_cmd_id++;
+    addAction(action, before);
+}
+
+void QMenuBarPrivate::QSymbianMenuBarPrivate::addAction(QSymbianMenuAction *action, QSymbianMenuAction *before)
+{
+    if (!action)
+        return;
+    int before_index = actionItems.indexOf(before);
+    if (before_index < 0) {
+        before = 0;
+        before_index = actionItems.size();
+    }
+    actionItems.insert(before_index, action);
+}
+
+void QMenuBarPrivate::QSymbianMenuBarPrivate::syncAction(QSymbianMenuAction*)
+{
+    rebuild();
+}
+
+void QMenuBarPrivate::QSymbianMenuBarPrivate::removeAction(QSymbianMenuAction *action)
+{
+    actionItems.removeAll(action);
+    delete action;
+    rebuild();
+}
+
+void QMenuBarPrivate::QSymbianMenuBarPrivate::insertNativeMenuItems(const QList<QAction*> &actions)
+{
+    for (int i = 0; i <actions.size(); ++i) {
+        QSymbianMenuAction *symbianActionTopLevel = new QSymbianMenuAction;
+        symbianActionTopLevel->action = actions.at(i);
+        symbianActionTopLevel->parent = 0;
+        symbianActionTopLevel->command = qt_symbian_menu_static_cmd_id++;
+        qt_symbian_insert_action(symbianActionTopLevel, &symbianMenus);
+    }
+}
+
+
+
+void QMenuBarPrivate::QSymbianMenuBarPrivate::rebuild()
+{
+    contexMenuCommand = 0;
+    qt_symbian_menu_static_cmd_id = QT_FIRST_MENU_ITEM;
+    deleteAll( &symbianMenus );
+    if (d)
+        insertNativeMenuItems(d->actions);
+
+    contextMenuActionList.clear();
+    if (widgetWithContextMenu) {
+        contexMenuCommand = qt_symbian_menu_static_cmd_id;
+        contextAction.setText(QMenuBar::tr("Actions"));
+        contextMenuActionList.append(&contextAction);
+        insertNativeMenuItems(contextMenuActionList);
+    }
+}
+QT_END_NAMESPACE
+
+#endif //QT_NO_MENUBAR
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index 4a900d6b44..eaf03b3727 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -738,6 +738,12 @@ void QMenuBarPrivate::init()
             q->hide();
     }
 #endif
+#ifdef Q_WS_S60
+    symbianCreateMenuBar(q->parentWidget());
+    if(symbian_menubar)
+        q->hide();
+#endif
+
     q->setBackgroundRole(QPalette::Button);
     oldWindow = oldParent = 0;
 #ifdef QT3_SUPPORT
@@ -809,6 +815,10 @@ QMenuBar::~QMenuBar()
     if (qt_wince_is_mobile())
         d->wceDestroyMenuBar();
 #endif
+#ifdef Q_WS_S60
+    Q_D(QMenuBar);
+    d->symbianDestroyMenuBar();
+#endif
 }
 
 /*!
@@ -1064,6 +1074,12 @@ void QMenuBar::setVisible(bool visible)
     if (isNativeMenuBar())
         return;
 #endif
+#ifdef Q_WS_S60
+    Q_D(QMenuBar);
+    if(d->symbian_menubar)
+        return;
+#endif
+
     QWidget::setVisible(visible);
 }
 
@@ -1276,6 +1292,17 @@ void QMenuBar::actionEvent(QActionEvent *e)
             nativeMenuBar->syncAction(e->action());
     }
 #endif
+#ifdef Q_WS_S60
+    if(d->symbian_menubar) {
+        if(e->type() == QEvent::ActionAdded)
+            d->symbian_menubar->addAction(e->action(), d->symbian_menubar->findAction(e->before()));
+        else if(e->type() == QEvent::ActionRemoved)
+            d->symbian_menubar->removeAction(e->action());
+        else if(e->type() == QEvent::ActionChanged)
+            d->symbian_menubar->syncAction(e->action());
+    }
+#endif
+
     if(e->type() == QEvent::ActionAdded) {
         connect(e->action(), SIGNAL(triggered()), this, SLOT(_q_actionTriggered()));
         connect(e->action(), SIGNAL(hovered()), this, SLOT(_q_actionHovered()));
@@ -1362,6 +1389,11 @@ void QMenuBarPrivate::handleReparent()
     if (qt_wince_is_mobile() && wce_menubar)
         wce_menubar->rebuild();
 #endif
+#ifdef Q_WS_S60
+    if (symbian_menubar)
+        symbian_menubar->rebuild();
+#endif
+
 }
 
 #ifdef QT3_SUPPORT
@@ -1596,7 +1628,7 @@ QRect QMenuBar::actionGeometry(QAction *act) const
 QSize QMenuBar::minimumSizeHint() const
 {
     Q_D(const QMenuBar);
-#if defined(Q_WS_MAC) || defined(Q_WS_WINCE)
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
     const bool as_gui_menubar = !isNativeMenuBar();
 #else
     const bool as_gui_menubar = true;
@@ -1652,7 +1684,7 @@ QSize QMenuBar::minimumSizeHint() const
 QSize QMenuBar::sizeHint() const
 {
     Q_D(const QMenuBar);
-#if defined(Q_WS_MAC) || defined(Q_WS_WINCE)
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
     const bool as_gui_menubar = !isNativeMenuBar();
 #else
     const bool as_gui_menubar = true;
@@ -1710,7 +1742,7 @@ QSize QMenuBar::sizeHint() const
 int QMenuBar::heightForWidth(int) const
 {
     Q_D(const QMenuBar);
-#if defined(Q_WS_MAC) || defined(Q_WS_WINCE)
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
     const bool as_gui_menubar = !isNativeMenuBar();
 #else
     const bool as_gui_menubar = true;
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h
index b890b7bfbd..004562f009 100644
--- a/src/gui/widgets/qmenubar_p.h
+++ b/src/gui/widgets/qmenubar_p.h
@@ -61,6 +61,13 @@
 #include "qguifunctions_wince.h"
 #endif
 
+#ifndef QT_NO_MENUBAR
+#ifdef Q_WS_S60
+class CCoeControl;
+class CEikMenuBar;
+#endif
+#endif
+
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_MENUBAR
@@ -82,7 +89,11 @@ public:
 #ifdef Q_WS_WINCE
                          , wce_menubar(0), wceClassicMenu(false)
 #endif
-    { }
+#ifdef Q_WS_S60
+                         , symbian_menubar(0)
+#endif
+
+        { }
     ~QMenuBarPrivate()
         {
 #ifdef Q_WS_MAC
@@ -91,6 +102,9 @@ public:
 #ifdef Q_WS_WINCE
             delete wce_menubar;
 #endif
+#ifdef Q_WS_S60
+            delete symbian_menubar;
+#endif
         }
 
     void init();
@@ -225,6 +239,35 @@ public:
     void wceRefresh();
     bool wceEmitSignals(QList<QWceMenuAction*> actions, uint command);
 #endif
+#ifdef Q_WS_S60
+    void symbianCreateMenuBar(QWidget *);
+    void symbianDestroyMenuBar();
+    struct QSymbianMenuBarPrivate {
+        QList<QSymbianMenuAction*> actionItems;
+        QMenuBarPrivate *d;
+        QSymbianMenuBarPrivate(QMenuBarPrivate *menubar);
+        ~QSymbianMenuBarPrivate();
+        void addAction(QAction *, QSymbianMenuAction* =0);
+        void addAction(QSymbianMenuAction *, QSymbianMenuAction* =0);
+        void syncAction(QSymbianMenuAction *);
+        inline void syncAction(QAction *a) { syncAction(findAction(a)); }
+        void removeAction(QSymbianMenuAction *);
+        void rebuild();
+        inline void removeAction(QAction *a) { removeAction(findAction(a)); }
+        inline QSymbianMenuAction *findAction(QAction *a) {
+            for(int i = 0; i < actionItems.size(); i++) {
+                QSymbianMenuAction *act = actionItems[i];
+                if(a == act->action)
+                    return act;
+            }
+            return 0;
+        }
+        void insertNativeMenuItems(const QList<QAction*> &actions);
+
+    } *symbian_menubar;
+    static void symbianCommands(int command);
+
+#endif
 };
 #endif
 
diff --git a/src/gui/widgets/qmenudata.h b/src/gui/widgets/qmenudata.h
index 7d0228fa6c..521b5fc4cd 100644
--- a/src/gui/widgets/qmenudata.h
+++ b/src/gui/widgets/qmenudata.h
@@ -67,6 +67,8 @@ private:
     friend class QMenuBar;
     void setId(int);
     void setSignalValue(int);
+    
+    Q_DISABLE_COPY(QMenuItem);
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp
index 82026d4471..7d9d2b5bb0 100644
--- a/src/gui/widgets/qplaintextedit.cpp
+++ b/src/gui/widgets/qplaintextedit.cpp
@@ -74,6 +74,11 @@
 
 QT_BEGIN_NAMESPACE
 
+static inline bool shouldEnableInputMethod(QPlainTextEdit *plaintextedit)
+{
+    return !plaintextedit->isReadOnly();
+}
+
 class QPlainTextDocumentLayoutPrivate : public QAbstractTextDocumentLayoutPrivate
 {
     Q_DECLARE_PUBLIC(QPlainTextDocumentLayout)
@@ -721,7 +726,8 @@ QPlainTextEditPrivate::QPlainTextEditPrivate()
       tabChangesFocus(false),
       lineWrap(QPlainTextEdit::WidgetWidth),
       wordWrap(QTextOption::WrapAtWordBoundaryOrAnywhere),
-      topLine(0), pageUpDownLastCursorYIsValid(false)
+      clickCausedFocus(0),topLine(0), 
+      pageUpDownLastCursorYIsValid(false)
 {
     showCursorOnInitialShow = true;
     backgroundVisible = false;
@@ -1925,6 +1931,13 @@ void QPlainTextEdit::mouseReleaseEvent(QMouseEvent *e)
         d->autoScrollTimer.stop();
         d->ensureCursorVisible();
     }
+
+    if (e->button() == Qt::LeftButton && qApp->autoSipEnabled()
+            && (!d->clickCausedFocus || qApp->autoSipOnMouseFocus())) {
+        QEvent event(QEvent::RequestSoftwareInputPanel);
+        QApplication::sendEvent(this, &event);
+    }
+    d->clickCausedFocus = 0;
 }
 
 /*! \reimp
@@ -2059,6 +2072,9 @@ QVariant QPlainTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const
 void QPlainTextEdit::focusInEvent(QFocusEvent *e)
 {
     Q_D(QPlainTextEdit);
+    if (e->reason() == Qt::MouseFocusReason) {
+        d->clickCausedFocus = 1;
+    }
     QAbstractScrollArea::focusInEvent(e);
     d->sendControlEvent(e);
 }
@@ -2325,7 +2341,7 @@ void QPlainTextEdit::setReadOnly(bool ro)
     } else {
         flags = Qt::TextEditorInteraction;
     }
-    setAttribute(Qt::WA_InputMethodEnabled, !ro);
+    setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(this));
     d->control->setTextInteractionFlags(flags);
 }
 
diff --git a/src/gui/widgets/qplaintextedit_p.h b/src/gui/widgets/qplaintextedit_p.h
index ae584e0265..739fd89fd1 100644
--- a/src/gui/widgets/qplaintextedit_p.h
+++ b/src/gui/widgets/qplaintextedit_p.h
@@ -92,7 +92,10 @@ public:
         return r;
     }
     inline QRectF cursorRect() { return cursorRect(textCursor()); }
-    void ensureCursorVisible() { textEdit->ensureCursorVisible(); }
+    void ensureCursorVisible() {
+        textEdit->ensureCursorVisible();
+        emit microFocusChanged();
+    }
 
 
     QPlainTextEdit *textEdit;
@@ -149,6 +152,7 @@ public:
     uint backgroundVisible : 1;
     uint centerOnScroll : 1;
     uint inDrag : 1;
+    uint clickCausedFocus : 1;
 
     int topLine;
 
diff --git a/src/gui/widgets/qprintpreviewwidget.cpp b/src/gui/widgets/qprintpreviewwidget.cpp
index fb1b6ea725..f5f7e738a0 100644
--- a/src/gui/widgets/qprintpreviewwidget.cpp
+++ b/src/gui/widgets/qprintpreviewwidget.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qprintpreviewwidget.h"
+#include "private/qwidget_p.h"
 #include <private/qprinter_p.h>
 
 #include <QtCore/qmath.h>
@@ -170,12 +171,12 @@ protected:
 
 } // anonymous namespace
 
-class QPrintPreviewWidgetPrivate
+class QPrintPreviewWidgetPrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QPrintPreviewWidget)
 public:
-    QPrintPreviewWidgetPrivate(QPrintPreviewWidget *q)
-        : q_ptr(q), scene(0), curPage(1),
+    QPrintPreviewWidgetPrivate()
+        : scene(0), curPage(1),
           viewMode(QPrintPreviewWidget::SinglePageView),
           zoomMode(QPrintPreviewWidget::FitInView),
           zoomFactor(1), initialized(false), fitting(true)
@@ -194,7 +195,6 @@ public:
     void setZoomFactor(qreal zoomFactor);
     int calcCurrentPage();
 
-    QPrintPreviewWidget *q_ptr;
     GraphicsView *graphicsView;
     QGraphicsScene *scene;
 
@@ -518,7 +518,7 @@ void QPrintPreviewWidgetPrivate::setZoomFactor(qreal _zoomFactor)
     \sa QWidget::setWindowFlags()
 */
 QPrintPreviewWidget::QPrintPreviewWidget(QPrinter *printer, QWidget *parent, Qt::WindowFlags flags)
-    : QWidget(parent, flags), d_ptr(new QPrintPreviewWidgetPrivate(this))
+    : QWidget(*new QPrintPreviewWidgetPrivate, parent, flags)
 {
     Q_D(QPrintPreviewWidget);
     d->printer = printer;
@@ -534,7 +534,7 @@ QPrintPreviewWidget::QPrintPreviewWidget(QPrinter *printer, QWidget *parent, Qt:
     preview.
 */
 QPrintPreviewWidget::QPrintPreviewWidget(QWidget *parent, Qt::WindowFlags flags)
-    : QWidget(parent, flags), d_ptr(new QPrintPreviewWidgetPrivate(this))
+    : QWidget(*new QPrintPreviewWidgetPrivate, parent, flags)
 {
     Q_D(QPrintPreviewWidget);
     d->printer = new QPrinter;
@@ -551,7 +551,6 @@ QPrintPreviewWidget::~QPrintPreviewWidget()
     Q_D(QPrintPreviewWidget);
     if (d->ownPrinter)
         delete d->printer;
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/gui/widgets/qprintpreviewwidget.h b/src/gui/widgets/qprintpreviewwidget.h
index 99b14bf437..d74bf93968 100644
--- a/src/gui/widgets/qprintpreviewwidget.h
+++ b/src/gui/widgets/qprintpreviewwidget.h
@@ -111,7 +111,7 @@ Q_SIGNALS:
     void previewChanged();
 
 private:
-    QPrintPreviewWidgetPrivate *d_ptr;
+    void *dummy; // ### remove in Qt 5.0
     Q_PRIVATE_SLOT(d_func(), void _q_fit())
     Q_PRIVATE_SLOT(d_func(), void _q_updateCurrentPage())
 };
diff --git a/src/gui/widgets/qspinbox.cpp b/src/gui/widgets/qspinbox.cpp
index 7441df4b7e..193b15cef7 100644
--- a/src/gui/widgets/qspinbox.cpp
+++ b/src/gui/widgets/qspinbox.cpp
@@ -78,6 +78,8 @@ public:
     QChar thousand;
 
     inline void init() {
+        Q_Q(QSpinBox);
+        q->setInputMethodHints(Qt::ImhDigitsOnly);
         setLayoutItemMargins(QStyle::SE_SpinBoxLayoutItem);
     }
 };
@@ -98,6 +100,11 @@ public:
     // variables
     int decimals;
     QChar delimiter, thousand;
+
+    inline void init() {
+        Q_Q(QDoubleSpinBox);
+        q->setInputMethodHints(Qt::ImhFormattedNumbersOnly);
+    }
 };
 
 
@@ -599,6 +606,8 @@ void QSpinBox::fixup(QString &input) const
 QDoubleSpinBox::QDoubleSpinBox(QWidget *parent)
     : QAbstractSpinBox(*new QDoubleSpinBoxPrivate(parent), parent)
 {
+    Q_D(QDoubleSpinBox);
+    d->init();
 }
 
 /*!
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index e80df92c03..2de661aa67 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -76,6 +76,10 @@ QT_BEGIN_NAMESPACE
 
 
 #ifndef QT_NO_TEXTEDIT
+static inline bool shouldEnableInputMethod(QTextEdit *textedit)
+{
+    return !textedit->isReadOnly();
+}
 
 class QTextEditControl : public QTextControl
 {
@@ -107,7 +111,8 @@ QTextEditPrivate::QTextEditPrivate()
     : control(0),
       autoFormatting(QTextEdit::AutoNone), tabChangesFocus(false),
       lineWrap(QTextEdit::WidgetWidth), lineWrapColumnOrWidth(0),
-      wordWrap(QTextOption::WrapAtWordBoundaryOrAnywhere), textFormat(Qt::AutoText)
+      wordWrap(QTextOption::WrapAtWordBoundaryOrAnywhere), clickCausedFocus(0),
+      textFormat(Qt::AutoText)
 {
     ignoreAutomaticScrollbarAdjustment = false;
     preferRichText = false;
@@ -1566,6 +1571,12 @@ void QTextEdit::mouseReleaseEvent(QMouseEvent *e)
         d->autoScrollTimer.stop();
         ensureCursorVisible();
     }
+    if (e->button() == Qt::LeftButton && qApp->autoSipEnabled()
+            && (!d->clickCausedFocus || qApp->autoSipOnMouseFocus())) {
+        QEvent event(QEvent::RequestSoftwareInputPanel);
+        QApplication::sendEvent(this, &event);
+    }
+    d->clickCausedFocus = 0;
 }
 
 /*! \reimp
@@ -1702,6 +1713,9 @@ QVariant QTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const
 void QTextEdit::focusInEvent(QFocusEvent *e)
 {
     Q_D(QTextEdit);
+    if (e->reason() == Qt::MouseFocusReason) {
+        d->clickCausedFocus = 1;
+    }
     QAbstractScrollArea::focusInEvent(e);
     d->sendControlEvent(e);
 }
@@ -2066,7 +2080,7 @@ void QTextEdit::setReadOnly(bool ro)
     } else {
         flags = Qt::TextEditorInteraction;
     }
-    setAttribute(Qt::WA_InputMethodEnabled, !ro);
+    setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(this));
     d->control->setTextInteractionFlags(flags);
 }
 
diff --git a/src/gui/widgets/qtextedit_p.h b/src/gui/widgets/qtextedit_p.h
index 249331e8a7..cf87a8643b 100644
--- a/src/gui/widgets/qtextedit_p.h
+++ b/src/gui/widgets/qtextedit_p.h
@@ -123,6 +123,7 @@ public:
     uint preferRichText : 1;
     uint showCursorOnInitialShow : 1;
     uint inDrag : 1;
+    uint clickCausedFocus : 1;
 
     // Qt3 COMPAT only, for setText
     Qt::TextFormat textFormat;
diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri
index 8f24facf90..45679025b6 100644
--- a/src/gui/widgets/widgets.pri
+++ b/src/gui/widgets/widgets.pri
@@ -81,8 +81,8 @@ HEADERS += \
         widgets/qtoolbararealayout_p.h \
         widgets/qplaintextedit.h \
         widgets/qplaintextedit_p.h \
-        widgets/qprintpreviewwidget.h
-
+        widgets/qprintpreviewwidget.h \
+        widgets/qactiontokeyeventmapper_p.h
 SOURCES += \
         widgets/qabstractbutton.cpp \
         widgets/qabstractslider.cpp \
@@ -143,8 +143,8 @@ SOURCES += \
         widgets/qwidgetanimator.cpp \
         widgets/qtoolbararealayout.cpp \
         widgets/qplaintextedit.cpp \
-        widgets/qprintpreviewwidget.cpp
-
+        widgets/qprintpreviewwidget.cpp \
+        widgets/qactiontokeyeventmapper.cpp
 
 !embedded:mac {
     HEADERS += widgets/qmacnativewidget_mac.h \
@@ -165,3 +165,7 @@ wince*: {
     RC_FILE = widgets/qmenu_wince.rc
     !static: QMAKE_WRITE_DEFAULT_RC = 1
 }
+
+symbian*: {
+    SOURCES += widgets/qmenu_symbian.cpp
+}
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index b00f4a4148..8e7232314a 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -314,8 +314,10 @@ void QFtpDTP::connectToHost(const QString & host, quint16 port)
 {
     bytesFromSocket.clear();
 
-    if (socket)
+    if (socket) {
         delete socket;
+        socket = 0;
+    }
     socket = new QTcpSocket(this);
     socket->setObjectName(QLatin1String("QFtpDTP Passive state socket"));
     connect(socket, SIGNAL(connected()), SLOT(socketConnected()));
@@ -1661,11 +1663,12 @@ QFtp::QFtp(QObject *parent, const char *name)
 */
 int QFtp::connectToHost(const QString &host, quint16 port)
 {
-    d_func()->pi.transferConnectionExtended = true;
     QStringList cmds;
     cmds << host;
     cmds << QString::number((uint)port);
-    return d_func()->addCommand(new QFtpCommand(ConnectToHost, cmds));
+    int id = d_func()->addCommand(new QFtpCommand(ConnectToHost, cmds));
+    d_func()->pi.transferConnectionExtended = true;
+    return id;
 }
 
 /*!
@@ -1724,9 +1727,10 @@ int QFtp::close()
 */
 int QFtp::setTransferMode(TransferMode mode)
 {
+    int id = d_func()->addCommand(new QFtpCommand(SetTransferMode, QStringList()));
     d_func()->pi.transferConnectionExtended = true;
     d_func()->transferMode = mode;
-    return d_func()->addCommand(new QFtpCommand(SetTransferMode, QStringList()));
+    return id;
 }
 
 /*!
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index faa239870b..bb72f89bf3 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -625,7 +625,6 @@ QHttpHeader::QHttpHeader(QHttpHeaderPrivate &dd, const QHttpHeader &header)
 */
 QHttpHeader::~QHttpHeader()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/network/access/qhttp.h b/src/network/access/qhttp.h
index b1c536517d..e524350a41 100644
--- a/src/network/access/qhttp.h
+++ b/src/network/access/qhttp.h
@@ -46,6 +46,7 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qpair.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -108,7 +109,7 @@ protected:
 
     QHttpHeader(QHttpHeaderPrivate &dd, const QString &str = QString());
     QHttpHeader(QHttpHeaderPrivate &dd, const QHttpHeader &header);
-    QHttpHeaderPrivate *d_ptr;
+    QScopedPointer<QHttpHeaderPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QHttpHeader)
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 75ab837a21..20e4802011 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -81,8 +81,10 @@ QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &host
 QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate()
 {
     for (int i = 0; i < channelCount; ++i) {
-        channels[i].socket->close();
-        delete channels[i].socket;
+        if (channels[i].socket) {
+            channels[i].socket->close();
+            delete channels[i].socket;
+        }
     }
     delete []channels;
 }
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index a62399908c..c11b1a6d4d 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -477,8 +477,6 @@ bool QHttpNetworkReplyPrivate::parseStatus(const QByteArray &status)
 qint64 QHttpNetworkReplyPrivate::readHeader(QAbstractSocket *socket)
 {
     qint64 bytes = 0;
-    char crlfcrlf[5];
-    crlfcrlf[4] = '\0';
     char c = 0;
     bool allHeaders = false;
     while (!allHeaders && socket->bytesAvailable()) {
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 5c85735750..293f857bcc 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -684,10 +684,15 @@ void QNetworkAccessHttpBackend::replyFinished()
     // store the SSL configuration now
     // once we call finished(), we won't have access to httpReply anymore
     QSslConfiguration sslConfig = httpReply->sslConfiguration();
-    if (pendingSslConfiguration)
+    if (pendingSslConfiguration) {
         *pendingSslConfiguration = sslConfig;
-    else if (!sslConfig.isNull())
-        pendingSslConfiguration = new QSslConfiguration(sslConfig);
+    } else if (!sslConfig.isNull()) {
+        QT_TRY {
+            pendingSslConfiguration = new QSslConfiguration(sslConfig);
+        } QT_CATCH(...) {
+            qWarning("QNetworkAccess: could not allocate a QSslConfiguration object for a SSL connection.");
+        }
+    }
 #endif
 
     finished();
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index e1d6634328..8569ecd2e8 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -768,8 +768,8 @@ void QNetworkAccessManagerPrivate::createCookieJar() const
     if (!cookieJarCreated) {
         // keep the ugly hack in here
         QNetworkAccessManagerPrivate *that = const_cast<QNetworkAccessManagerPrivate *>(this);
-        that->cookieJarCreated = true;
         that->cookieJar = new QNetworkCookieJar(that->q_func());
+        that->cookieJarCreated = true;
     }
 }
 
diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp
index 854bd17729..dd5edb0bf2 100644
--- a/src/network/access/qnetworkcookie.cpp
+++ b/src/network/access/qnetworkcookie.cpp
@@ -97,6 +97,43 @@ QT_BEGIN_NAMESPACE
 
 /*!
     Create a new QNetworkCookie object, initializing the cookie name
+    and its value to empty QByteArray
+
+    A cookie is only valid if it has a name. However, the value is
+    opaque to the application and being empty may have significance to
+    the remote server.
+*/
+QNetworkCookie::QNetworkCookie()
+    : d(new QNetworkCookiePrivate)
+{
+    qRegisterMetaType<QNetworkCookie>();
+    qRegisterMetaType<QList<QNetworkCookie> >();
+
+    d->name = QByteArray();
+    d->value = QByteArray();
+}
+
+/*!
+    Create a new QNetworkCookie object, initializing the cookie name
+    to \a name and its value to empty QByteArray.
+
+    A cookie is only valid if it has a name. However, the value is
+    opaque to the application and being empty may have significance to
+    the remote server.
+*/
+QNetworkCookie::QNetworkCookie( const QByteArray &name )
+    : d(new QNetworkCookiePrivate)
+{
+    qRegisterMetaType<QNetworkCookie>();
+    qRegisterMetaType<QList<QNetworkCookie> >();
+
+    d->name = name;
+    d->value = QByteArray();
+}
+
+
+/*!
+    Create a new QNetworkCookie object, initializing the cookie name
     to \a name and its value to \a value.
 
     A cookie is only valid if it has a name. However, the value is
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index ef309a8d64..922a6f54f5 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -67,7 +67,9 @@ public:
         Full
     };
 
-    QNetworkCookie(const QByteArray &name = QByteArray(), const QByteArray &value = QByteArray());
+    QNetworkCookie();  
+    QNetworkCookie(const QByteArray &name );
+    QNetworkCookie(const QByteArray &name, const QByteArray &value );
     QNetworkCookie(const QNetworkCookie &other);
     ~QNetworkCookie();
     QNetworkCookie &operator=(const QNetworkCookie &other);
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index 50aaa6a9bd..3b00451f47 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -45,6 +45,7 @@
 
 #include "qnetworkdiskcache.h"
 #include "qnetworkdiskcache_p.h"
+#include "QtCore/qscopedpointer.h"
 
 #include <qfile.h>
 #include <qdir.h>
@@ -196,8 +197,7 @@ QIODevice *QNetworkDiskCache::prepare(const QNetworkCacheMetaData &metaData)
             break;
         }
     }
-
-    QCacheItem *cacheItem = new QCacheItem;
+    QScopedPointer<QCacheItem> cacheItem(new QCacheItem);
     cacheItem->metaData = metaData;
 
     QIODevice *device = 0;
@@ -206,16 +206,20 @@ QIODevice *QNetworkDiskCache::prepare(const QNetworkCacheMetaData &metaData)
         device = &(cacheItem->data);
     } else {
         QString templateName = d->tmpCacheFileName();
-        cacheItem->file = new QTemporaryFile(templateName, &cacheItem->data);
-        if (!cacheItem->file->open()) {
+        QT_TRY {
+            cacheItem->file = new QTemporaryFile(templateName, &cacheItem->data);
+        } QT_CATCH(...) {
+            cacheItem->file = 0;
+        }
+        if (!cacheItem->file || !cacheItem->file->open()) {
             qWarning() << "QNetworkDiskCache::prepare() unable to open temporary file";
-            delete cacheItem;
+            cacheItem.reset();
             return 0;
         }
         cacheItem->writeHeader(cacheItem->file);
         device = cacheItem->file;
     }
-    d->inserting[device] = cacheItem;
+    d->inserting[device] = cacheItem.take();
     return device;
 }
 
@@ -374,31 +378,28 @@ QIODevice *QNetworkDiskCache::data(const QUrl &url)
     qDebug() << "QNetworkDiskCache::data()" << url;
 #endif
     Q_D(QNetworkDiskCache);
-    QBuffer *buffer = 0;
+    QScopedPointer<QBuffer> buffer;
     if (!url.isValid())
-        return buffer;
+        return 0;
     if (d->lastItem.metaData.url() == url && d->lastItem.data.isOpen()) {
-        buffer = new QBuffer;
+        buffer.reset(new QBuffer);
         buffer->setData(d->lastItem.data.data());
     } else {
-        QFile *file = new QFile(d->cacheFileName(url));
-        if (!file->open(QFile::ReadOnly | QIODevice::Unbuffered)) {
-            delete file;
+        QScopedPointer<QFile> file(new QFile(d->cacheFileName(url)));
+        if (!file->open(QFile::ReadOnly | QIODevice::Unbuffered))
             return 0;
-        }
-        if (!d->lastItem.read(file, true)) {
+
+        if (!d->lastItem.read(file.data(), true)) {
             file->close();
             remove(url);
-            delete file;
             return 0;
         }
         if (d->lastItem.data.isOpen()) {
             // compressed
-            buffer = new QBuffer;
+            buffer.reset(new QBuffer);
             buffer->setData(d->lastItem.data.data());
-            delete file;
         } else {
-            buffer = new QBuffer;
+            buffer.reset(new QBuffer);
             // ### verify that QFile uses the fd size and not the file name
             qint64 size = file->size() - file->pos();
             const uchar *p = 0;
@@ -406,16 +407,15 @@ QIODevice *QNetworkDiskCache::data(const QUrl &url)
             p = file->map(file->pos(), size);
 #endif
             if (p) {
-                file->setParent(buffer);
                 buffer->setData((const char *)p, size);
+                file.take()->setParent(buffer.data());
             } else {
                 buffer->setData(file->readAll());
-                delete file;
             }
         }
     }
     buffer->open(QBuffer::ReadOnly);
-    return buffer;
+    return buffer.take();
 }
 
 /*!
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index c1fc87d86d..caa8669191 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -221,10 +221,9 @@ public:
         url = other.url;
 
 #ifndef QT_NO_OPENSSL
+        sslConfiguration = 0;
         if (other.sslConfiguration)
             sslConfiguration = new QSslConfiguration(*other.sslConfiguration);
-        else
-            sslConfiguration = 0;
 #endif
     }
 
@@ -243,6 +242,18 @@ public:
 };
 
 /*!
+    Constructs a QNetworkRequest object with empty QUrl.
+
+    \sa url(), setUrl()
+*/
+QNetworkRequest::QNetworkRequest()
+    : d(new QNetworkRequestPrivate)
+{
+    d->url = QUrl();
+}
+
+
+/*!
     Constructs a QNetworkRequest object with \a url as the URL to be
     requested.
 
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index 1ea7934631..a53aed3e66 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -87,7 +87,9 @@ public:
         AlwaysCache
     };
 
-    explicit QNetworkRequest(const QUrl &url = QUrl());
+
+    explicit QNetworkRequest();
+    explicit QNetworkRequest(const QUrl &url);     
     QNetworkRequest(const QNetworkRequest &other);
     ~QNetworkRequest();
     QNetworkRequest &operator=(const QNetworkRequest &other);
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index 8aa6ff4c58..bf07aabe0d 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -20,7 +20,8 @@ SOURCES += kernel/qauthenticator.cpp \
            kernel/qnetworkproxy.cpp \
 	   kernel/qnetworkinterface.cpp
 
-unix:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
+symbian: SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_symbian.cpp
+unix:!symbian:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
 win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp
 
 mac:LIBS+= -framework SystemConfiguration
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 9230b3a94e..634a9b8899 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -523,7 +523,7 @@ QHostAddress::QHostAddress(const struct sockaddr *sockaddr)
     Constructs a copy of the given \a address.
 */
 QHostAddress::QHostAddress(const QHostAddress &address)
-    : d(new QHostAddressPrivate(*address.d))
+    : d(new QHostAddressPrivate(*address.d.data()))
 {
 }
 
@@ -559,7 +559,6 @@ QHostAddress::QHostAddress(SpecialAddress address)
 */
 QHostAddress::~QHostAddress()
 {
-    delete d;
 }
 
 /*!
@@ -568,7 +567,7 @@ QHostAddress::~QHostAddress()
 */
 QHostAddress &QHostAddress::operator=(const QHostAddress &address)
 {
-    *d = *address.d;
+    *d.data() = *address.d.data();
     return *this;
 }
 
diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h
index e8e9d9a7ec..e92ca14ab6 100644
--- a/src/network/kernel/qhostaddress.h
+++ b/src/network/kernel/qhostaddress.h
@@ -44,6 +44,7 @@
 
 #include <QtCore/qpair.h>
 #include <QtCore/qstring.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qabstractsocket.h>
 
 struct sockaddr;
@@ -130,7 +131,7 @@ public:
     static QPair<QHostAddress, int> parseSubnet(const QString &subnet);
 
 protected:
-    QHostAddressPrivate *d;
+    QScopedPointer<QHostAddressPrivate> d;
 };
 
 inline bool operator ==(QHostAddress::SpecialAddress address1, const QHostAddress &address2)
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index de1a9e99d6..7d89d68d15 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -42,6 +42,7 @@
 #include "qhostinfo.h"
 #include "qhostinfo_p.h"
 
+#include "QtCore/qscopedpointer.h"
 #include <qabstracteventdispatcher.h>
 #include <private/qunicodetables_p.h>
 #include <qcoreapplication.h>
@@ -165,24 +166,24 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver,
     // Support for IDNA
     QString lookup = QString::fromLatin1(QUrl::toAce(name));
 
-    QHostInfoResult *result = new QHostInfoResult;
-    result->autoDelete = false;
-    QObject::connect(result, SIGNAL(resultsReady(QHostInfo)),
+    QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
+    result.data()->autoDelete = false;
+    QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
                      receiver, member);
-    int id = result->lookupId = theIdCounter.fetchAndAddRelaxed(1);
+    int id = result.data()->lookupId = theIdCounter.fetchAndAddRelaxed(1);
 
     if (lookup.isEmpty()) {
         QHostInfo info(id);
         info.setError(QHostInfo::HostNotFound);
         info.setErrorString(QObject::tr("No host name given"));
-        QMetaObject::invokeMethod(result, "emitResultsReady", Qt::QueuedConnection,
+        QMetaObject::invokeMethod(result.data(), "emitResultsReady", Qt::QueuedConnection,
                                   Q_ARG(QHostInfo, info));
-        result->autoDelete = true;
+        result.take()->autoDelete = true;
         return id;
     }
 
     QHostInfoAgent *agent = theAgent();
-    agent->addHostName(lookup, result);
+    agent->addHostName(lookup, result.take());
 
 #if !defined QT_NO_THREAD
     if (!agent->isRunning())
@@ -327,7 +328,7 @@ QHostInfo::QHostInfo(int id)
     Constructs a copy of \a other.
 */
 QHostInfo::QHostInfo(const QHostInfo &other)
-    : d(new QHostInfoPrivate(*other.d))
+    : d(new QHostInfoPrivate(*other.d.data()))
 {
 }
 
@@ -337,7 +338,7 @@ QHostInfo::QHostInfo(const QHostInfo &other)
 */
 QHostInfo &QHostInfo::operator=(const QHostInfo &other)
 {
-    *d = *other.d;
+    *d.data() = *other.d.data();
     return *this;
 }
 
@@ -346,7 +347,6 @@ QHostInfo &QHostInfo::operator=(const QHostInfo &other)
 */
 QHostInfo::~QHostInfo()
 {
-    delete d;
 }
 
 /*!
diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h
index 2be809f9a6..f33c87a19a 100644
--- a/src/network/kernel/qhostinfo.h
+++ b/src/network/kernel/qhostinfo.h
@@ -43,6 +43,7 @@
 #define QHOSTINFO_H
 
 #include <QtCore/qlist.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qhostaddress.h>
 
 QT_BEGIN_HEADER
@@ -91,7 +92,7 @@ public:
     static QString localDomainName();
 
 private:
-    QHostInfoPrivate *d;
+    QScopedPointer<QHostInfoPrivate> d;
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index 64e9e29c42..a63659e4d9 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -41,8 +41,6 @@
 
 //#define QHOSTINFO_DEBUG
 
-static const int RESOLVER_TIMEOUT = 2000;
-
 #include "qplatformdefs.h"
 
 #include "qhostinfo_p.h"
@@ -151,7 +149,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
     if (address.setAddress(hostName)) {
         // Reverse lookup
 // Reverse lookups using getnameinfo are broken on darwin, use gethostbyaddr instead.
-#if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN)
+#if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN) && !defined (Q_OS_SYMBIAN)
         sockaddr_in sa4;
 #ifndef QT_NO_IPV6
         sockaddr_in6 sa6;
@@ -326,6 +324,7 @@ QString QHostInfo::localDomainName()
     if (local_res_ninit) {
         // using thread-safe version
         res_state_ptr state = res_state_ptr(qMalloc(sizeof(*state)));
+        Q_CHECK_PTR(state);
         memset(state, 0, sizeof(*state));
         local_res_ninit(state);
         QString domainName = QUrl::fromAce(state->defdname);
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp
index 9cab861e05..953722c67d 100644
--- a/src/network/kernel/qnetworkinterface.cpp
+++ b/src/network/kernel/qnetworkinterface.cpp
@@ -170,7 +170,7 @@ QNetworkAddressEntry::QNetworkAddressEntry()
     object \a other.
 */
 QNetworkAddressEntry::QNetworkAddressEntry(const QNetworkAddressEntry &other)
-    : d(new QNetworkAddressEntryPrivate(*other.d))
+    : d(new QNetworkAddressEntryPrivate(*other.d.data()))
 {
 }
 
@@ -179,7 +179,7 @@ QNetworkAddressEntry::QNetworkAddressEntry(const QNetworkAddressEntry &other)
 */
 QNetworkAddressEntry &QNetworkAddressEntry::operator=(const QNetworkAddressEntry &other)
 {
-    *d = *other.d;
+    *d.data() = *other.d.data();
     return *this;
 }
 
@@ -188,7 +188,6 @@ QNetworkAddressEntry &QNetworkAddressEntry::operator=(const QNetworkAddressEntry
 */
 QNetworkAddressEntry::~QNetworkAddressEntry()
 {
-    delete d;
 }
 
 /*!
@@ -604,8 +603,13 @@ QDebug operator<<(QDebug debug, const QNetworkInterface &networkInterface)
                     << ", hardware address = " << networkInterface.hardwareAddress()
                     << ", flags = ";
     flagsDebug(debug, networkInterface.flags());
+#if defined(Q_CC_RVCT)    
+    // RVCT gets confused with << networkInterface.addressEntries(), reason unknown.
+    debug.nospace() << ")\n";
+#else
     debug.nospace() << ", entries = " << networkInterface.addressEntries()
                     << ")\n";
+#endif   
     return debug.space();
 }
 #endif
diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h
index 93849a0109..052ecd80cb 100644
--- a/src/network/kernel/qnetworkinterface.h
+++ b/src/network/kernel/qnetworkinterface.h
@@ -43,6 +43,7 @@
 #define QNETWORKINTERFACE_H
 
 #include <QtCore/qshareddata.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qhostaddress.h>
 
 #ifndef QT_NO_NETWORKINTERFACE
@@ -79,7 +80,7 @@ public:
     void setBroadcast(const QHostAddress &newBroadcast);
 
 private:
-    QNetworkAddressEntryPrivate *d;
+    QScopedPointer<QNetworkAddressEntryPrivate> d;
 };
 
 class QNetworkInterfacePrivate;
diff --git a/src/network/kernel/qnetworkinterface_symbian.cpp b/src/network/kernel/qnetworkinterface_symbian.cpp
new file mode 100644
index 0000000000..59f1c02956
--- /dev/null
+++ b/src/network/kernel/qnetworkinterface_symbian.cpp
@@ -0,0 +1,203 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//#define QNETWORKINTERFACE_DEBUG
+
+//#include "qset.h"
+#include "qnetworkinterface.h"
+#include "qnetworkinterface_p.h"
+//#include <private/qnativesocketengine_p.h>
+//#include "qalgorithms.h"
+
+
+#ifndef QT_NO_NETWORKINTERFACE
+
+#include <in_sock.h>
+#include <in_iface.h>
+#include <es_sock.h>
+
+//#include <sys/types.h>
+//#include <sys/socket.h>
+//#include <errno.h>
+//#include <net/if.h>
+//#include <qplatformdefs.h>
+
+QT_BEGIN_NAMESPACE
+
+
+static QNetworkInterface::InterfaceFlags convertFlags( const TSoInetInterfaceInfo& aInfo )
+{
+    QNetworkInterface::InterfaceFlags flags = 0;
+    flags |= (aInfo.iState == EIfUp) ? QNetworkInterface::IsUp : QNetworkInterface::InterfaceFlag(0);
+    // We do not have separate flag for running in Symbian OS
+    flags |= (aInfo.iState == EIfUp) ? QNetworkInterface::IsRunning : QNetworkInterface::InterfaceFlag(0);
+    flags |= (aInfo.iFeatures&KIfCanBroadcast) ? QNetworkInterface::CanBroadcast : QNetworkInterface::InterfaceFlag(0);    
+    flags |= (aInfo.iFeatures&KIfIsLoopback) ? QNetworkInterface::IsLoopBack : QNetworkInterface::InterfaceFlag(0);
+    flags |= (aInfo.iFeatures&KIfIsPointToPoint) ? QNetworkInterface::IsPointToPoint : QNetworkInterface::InterfaceFlag(0);
+    flags |= (aInfo.iFeatures&KIfCanMulticast) ? QNetworkInterface::CanMulticast : QNetworkInterface::InterfaceFlag(0);
+    return flags;
+}
+
+QString qstringFromDesc( const TDesC& aData ) 
+{
+    return QString::fromUtf16(aData.Ptr(), aData.Length());
+}
+
+static QList<QNetworkInterfacePrivate *> interfaceListing()
+{
+    TInt err( KErrNone );
+    QList<QNetworkInterfacePrivate *> interfaces;
+    
+    // Connect to Native socket server
+    RSocketServ socketServ;
+    err = socketServ.Connect();
+    if( err )
+        return interfaces;
+    
+    // Open dummy socket for interface queries
+    RSocket socket;
+    err = socket.Open( socketServ, _L("udp"));
+    if( err )
+    {
+        socketServ.Close();
+        return interfaces;    
+    }
+
+    // Ask socket to start enumerating interfaces
+    err =  socket.SetOpt( KSoInetEnumInterfaces, KSolInetIfCtrl );
+    if( err )
+    {
+        socket.Close();
+        socketServ.Close();
+        return interfaces;    
+    }    
+
+    int ifindex = 0;
+    TPckgBuf<TSoInetInterfaceInfo> infoPckg;
+    TSoInetInterfaceInfo &info = infoPckg();
+    while( socket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, infoPckg) == KErrNone )
+    {
+        // Do not include IPv6 addresses because netmask and broadcast address cannot be determined correctly
+        if( info.iName != KNullDesC && info.iAddress.IsV4Mapped() )
+        {
+            TName address;        
+            QNetworkAddressEntry entry;            
+            QNetworkInterfacePrivate *iface = 0;            
+            
+            iface = new QNetworkInterfacePrivate; 
+            iface->index = ifindex++;
+            interfaces << iface;
+            iface->name = qstringFromDesc( info.iName );
+            iface->flags = convertFlags( info );
+            
+            if( /*info.iFeatures&KIfHasHardwareAddr &&*/ info.iHwAddr.Family() != KAFUnspec )
+            {
+                for ( TInt i = sizeof(SSockAddr); i < sizeof(SSockAddr) + info.iHwAddr.GetUserLen(); i++ ) 
+                {
+                    address.AppendNumFixedWidth(info.iHwAddr[i], EHex, 2);
+                    if( ( i + 1) < sizeof(SSockAddr) + info.iHwAddr.GetUserLen() )
+                        address.Append( _L(":") );
+                }  
+                address.UpperCase();                
+                iface->hardwareAddress = qstringFromDesc( address );
+            }
+             
+            // Get the address of the interface
+            info.iAddress.Output(address);
+            entry.setIp( QHostAddress( qstringFromDesc( address ) ) );                
+
+            // Get the interface netmask            
+            // TODO: For some reason netmask is always 0.0.0.0                    
+            //info.iNetMask.Output(address);
+            //entry.setNetmask( QHostAddress( qstringFromDesc( address ) ) );     
+            
+            // Workaround: Let Symbian determine netmask based on IP address class
+            // TODO: works only for IPv4
+            TInetAddr netmask;
+            netmask.NetMask( info.iAddress );
+            netmask.Output(address);
+            entry.setNetmask( QHostAddress( qstringFromDesc( address ) ) );                  
+            
+            // Get the interface broadcast address
+            if (iface->flags & QNetworkInterface::CanBroadcast) 
+            {
+                // For some reason broadcast address is always 0.0.0.0
+                // info.iBrdAddr.Output(address);
+                // entry.setBroadcast( QHostAddress( qstringFromDesc( address ) ) );                    
+                
+                // Workaround: Let Symbian determine broadcast address based on IP address
+                // TODO: works only for IPv4
+                TInetAddr broadcast;
+                broadcast.NetBroadcast( info.iAddress );   
+                broadcast.Output(address);
+                entry.setBroadcast( QHostAddress( qstringFromDesc( address ) ) );
+                }
+          
+            // Add new entry to interface address entries
+            iface->addressEntries << entry; 
+            
+#if defined(QNETWORKINTERFACE_DEBUG)                
+            qDebug("\n       Found network interface %s, interface flags:\n\
+                IsUp = %d, IsRunning = %d, CanBroadcast = %d,\n\
+                IsLoopBack = %d, IsPointToPoint = %d, CanMulticast = %d, \n\
+                ip = %s, netmask = %s, broadcast = %s,\n\
+                hwaddress = %s", 
+                iface->name.toLatin1().constData(),
+                iface->flags & QNetworkInterface::IsUp, iface->flags & QNetworkInterface::IsRunning, iface->flags & QNetworkInterface::CanBroadcast,
+                iface->flags & QNetworkInterface::IsLoopBack, iface->flags & QNetworkInterface::IsPointToPoint, iface->flags & QNetworkInterface::CanMulticast,
+                entry.ip().toString().toLatin1().constData(), entry.netmask().toString().toLatin1().constData(), entry.broadcast().toString().toLatin1().constData(),
+                iface->hardwareAddress.toLatin1().constData());                
+#endif                    
+        }
+    }
+    socket.Close();
+    socketServ.Close();    
+    return interfaces;
+}
+
+QList<QNetworkInterfacePrivate *> QNetworkInterfaceManager::scan()
+{
+    return interfaceListing();
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_NETWORKINTERFACE
diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp
index 87902c3fa8..1d700c38f0 100644
--- a/src/network/kernel/qnetworkinterface_win.cpp
+++ b/src/network/kernel/qnetworkinterface_win.cpp
@@ -110,6 +110,8 @@ static QHash<QHostAddress, QHostAddress> ipv4Netmasks()
     if (retval == ERROR_BUFFER_OVERFLOW) {
         // need more memory
         pAdapter = (IP_ADAPTER_INFO *)qMalloc(bufSize);
+        if (!pAdapter)
+            return ipv4netmasks;
         // try again
         if (ptrGetAdaptersInfo(pAdapter, &bufSize) != ERROR_SUCCESS) {
             qFree(pAdapter);
@@ -151,7 +153,8 @@ static QList<QNetworkInterfacePrivate *> interfaceListingWinXP()
     if (retval == ERROR_BUFFER_OVERFLOW) {
         // need more memory
         pAdapter = (IP_ADAPTER_ADDRESSES *)qMalloc(bufSize);
-
+        if (!pAdapter)
+            return interfaces;
         // try again
         if (ptrGetAdaptersAddresses(AF_UNSPEC, flags, NULL, pAdapter, &bufSize) != ERROR_SUCCESS) {
             qFree(pAdapter);
@@ -231,7 +234,8 @@ static QList<QNetworkInterfacePrivate *> interfaceListingWin2k()
     if (retval == ERROR_BUFFER_OVERFLOW) {
         // need more memory
         pAdapter = (IP_ADAPTER_INFO *)qMalloc(bufSize);
-
+        if (!pAdapter)
+            return interfaces;
         // try again
         if (ptrGetAdaptersInfo(pAdapter, &bufSize) != ERROR_SUCCESS) {
             qFree(pAdapter);
@@ -301,7 +305,8 @@ QString QHostInfo::localDomainName()
     pinfo = &info;
     if (ptrGetNetworkParams(pinfo, &bufSize) == ERROR_BUFFER_OVERFLOW) {
         pinfo = (FIXED_INFO *)qMalloc(bufSize);
-
+        if (!pinfo)
+            return QString();
         // try again
         if (ptrGetNetworkParams(pinfo, &bufSize) != ERROR_SUCCESS) {
             qFree(pinfo);
diff --git a/src/network/network.pro b/src/network/network.pro
index d476b56722..59cffd0a10 100644
--- a/src/network/network.pro
+++ b/src/network/network.pro
@@ -3,6 +3,13 @@
 TARGET   = QtNetwork
 QPRO_PWD = $$PWD
 DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE
+#DEFINES += QLOCALSERVER_DEBUG QLOCALSOCKET_DEBUG
+#DEFINES += QNETWORKDISKCACHE_DEBUG
+#DEFINES += QSSLSOCKET_DEBUG
+#DEFINES += QHOSTINFO_DEBUG
+#DEFINES += QABSTRACTSOCKET_DEBUG QNATIVESOCKETENGINE_DEBUG
+#DEFINES += QTCPSOCKETENGINE_DEBUG QTCPSOCKET_DEBUG QTCPSERVER_DEBUG QSSLSOCKET_DEBUG
+#DEFINES += QUDPSOCKET_DEBUG QUDPSERVER_DEBUG
 QT = core
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000
 
@@ -15,3 +22,10 @@ include(socket/socket.pri)
 include(ssl/ssl.pri)
 
 QMAKE_LIBS += $$QMAKE_LIBS_NETWORK
+
+
+symbian {
+   TARGET.UID3=0x2001B2DE
+   LIBS += -lesock -linsock
+}
+        
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index c8ddce0016..035d5b6db0 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1067,8 +1067,9 @@ void QAbstractSocketPrivate::_q_abortConnectionAttempt()
 #if defined(QABSTRACTSOCKET_DEBUG)
     qDebug("QAbstractSocketPrivate::_q_abortConnectionAttempt() (timed out)");
 #endif
-    if (socketEngine)
+    if (socketEngine) {
         socketEngine->setWriteNotificationEnabled(false);
+    }
     connectTimer->stop();
 
     if (addresses.isEmpty()) {
diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp
index 1a50dc48c7..7bb0b01327 100644
--- a/src/network/socket/qlocalserver.cpp
+++ b/src/network/socket/qlocalserver.cpp
@@ -274,6 +274,10 @@ QLocalSocket *QLocalServer::nextPendingConnection()
     if (d->pendingConnections.isEmpty())
         return 0;
     QLocalSocket *nextSocket = d->pendingConnections.dequeue();
+#ifdef Q_OS_SYMBIAN
+    if(!d->socketNotifier)
+        return nextSocket;
+#endif
 #ifndef QT_LOCALSOCKET_TCP
     if (d->pendingConnections.size() <= d->maxPendingConnections)
 #ifndef Q_OS_WIN
diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp
index 3df6b6aa4a..14a0c7869e 100644
--- a/src/network/socket/qlocalserver_unix.cpp
+++ b/src/network/socket/qlocalserver_unix.cpp
@@ -111,6 +111,24 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
     ::memcpy(addr.sun_path, fullServerName.toLatin1().data(),
              fullServerName.toLatin1().size() + 1);
 
+#ifdef Q_OS_SYMBIAN
+    // In SYMBIAN OS it can currently happen that accept is called twice,
+    // once from waitForNewConnection and once via QSocketNotfier activity
+    //
+    // As an workaround, we set the socket to non blocking so possible
+    // subsequent call to accept will not block in any case
+    // 
+    // This change can be removed once more generic fix to select thread
+    // syncronization problem is implemented.
+    int flags = fcntl(listenSocket, F_GETFL, 0);
+    if (-1 == flags
+        || -1 == (fcntl(listenSocket, F_SETFL, flags | O_NONBLOCK))) {
+        setError(QLatin1String("QLocalServer::listen"));
+        closeServer();
+        return false;        
+    }    
+#endif    
+    
     // bind
     if(-1 == QT_SOCKET_BIND(listenSocket, (sockaddr *)&addr, sizeof(sockaddr_un))) {
         setError(QLatin1String("QLocalServer::listen"));
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp
index 08d94efa55..835b922721 100644
--- a/src/network/socket/qlocalsocket_unix.cpp
+++ b/src/network/socket/qlocalsocket_unix.cpp
@@ -242,7 +242,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode)
                         QLatin1String("QLocalSocket::connectToServer"));
         return;
     }
-
+#ifndef Q_OS_SYMBIAN
     // set non blocking so we can try to connect and it wont wait
     int flags = fcntl(d->connectingSocket, F_GETFL, 0);
     if (-1 == flags
@@ -251,6 +251,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode)
                 QLatin1String("QLocalSocket::connectToServer"));
         return;
     }
+#endif
 
     // _q_connectToSocket does the actual connecting
     d->connectingName = name;
@@ -305,10 +306,11 @@ void QLocalSocketPrivate::_q_connectToSocket()
         case ETIMEDOUT:
             errorOccurred(QLocalSocket::SocketTimeoutError, function);
             break;
+        case EINPROGRESS:            
         case EAGAIN:
             // Try again later, all of the sockets listening are full
             if (!delayConnect) {
-                delayConnect = new QSocketNotifier(connectingSocket, QSocketNotifier::Write);
+                delayConnect = new QSocketNotifier(connectingSocket, QSocketNotifier::Write, q);
                 q->connect(delayConnect, SIGNAL(activated(int)), q, SLOT(_q_connectToSocket()));
             }
             if (!connectTimer) {
@@ -519,9 +521,9 @@ bool QLocalSocket::waitForConnected(int msec)
     if (state() != ConnectingState)
         return (state() == ConnectedState);
 
-    fd_set readfds;
-    FD_ZERO(&readfds);
-    FD_SET(d->connectingSocket, &readfds);
+    fd_set fds;
+    FD_ZERO(&fds);
+    FD_SET(d->connectingSocket, &fds);
 
     timeval timeout;
     timeout.tv_sec = msec / 1000;
@@ -537,7 +539,14 @@ bool QLocalSocket::waitForConnected(int msec)
     timer.start();
     while (state() == ConnectingState
            && (-1 == msec || timer.elapsed() < msec)) {
-        result = ::select(d->connectingSocket + 1, &readfds, 0, 0, &timeout);
+#ifdef Q_OS_SYMBIAN           
+        // On Symbian, ready-to-write is signaled when non-blocking socket 
+        // connect is finised. Is ready-to-read really used on other 
+        // UNIX paltforms when using non-blocking AF_UNIX socket? 
+        result = ::select(d->connectingSocket + 1, 0, &fds, 0, &timeout);
+#else
+        result = ::select(d->connectingSocket + 1, &fds, 0, 0, &timeout);        
+#endif        
         if (-1 == result && errno != EINTR) {
             d->errorOccurred( QLocalSocket::UnknownSocketError,
                     QLatin1String("QLocalSocket::waitForConnected"));
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index aa70b0c1d5..666c86e44a 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -381,11 +381,13 @@ bool QNativeSocketEngine::initialize(QAbstractSocket::SocketType socketType, QAb
         return false;
     }
 
+    
     // Make sure we receive out-of-band data
+    // On Symbian OS this works only with native IP stack, not with WinSock
     if (socketType == QAbstractSocket::TcpSocket
         && !setOption(ReceiveOutOfBandData, 1)) {
         qWarning("QNativeSocketEngine::initialize unable to inline out-of-band data");
-    }
+    }   
 
     // Set the send and receive buffer sizes to a magic size, found
     // most optimal for our platforms.
@@ -1086,10 +1088,13 @@ protected:
 bool QExceptionNotifier::event(QEvent *e)
 {
     if (e->type() == QEvent::SockAct) {
-        engine->exceptionNotification();
+        if (engine->state() == QAbstractSocket::ConnectingState)
+            engine->connectionNotification();
+        else
+            engine->exceptionNotification();
         return true;
     }
-    return QSocketNotifier::event(e);
+    return QSocketNotifier::event(e);    
 }
 
 void QNativeSocketEngine::setReadNotificationEnabled(bool enable)
diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h
index 24dc344484..0a5c19d098 100644
--- a/src/network/socket/qnativesocketengine_p.h
+++ b/src/network/socket/qnativesocketengine_p.h
@@ -52,7 +52,6 @@
 //
 // We mean it.
 //
-
 #include "QtNetwork/qhostaddress.h"
 #include "private/qabstractsocketengine_p.h"
 #ifndef Q_OS_WIN
@@ -61,8 +60,139 @@
 #  include <winsock2.h>
 #endif
 
+#ifdef Q_OS_SYMBIAN
+#include <private/qeventdispatcher_symbian_p.h>
+#include<unistd.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
+static inline int qt_socket_connect(int s, const struct sockaddr * addrptr, socklen_t namelen)
+{
+	return ::connect(s, addrptr, namelen);
+}
+#if defined(connect)
+# undef connect
+#endif
+
+static inline int qt_socket_bind(int s, const struct sockaddr * addrptr, socklen_t namelen)
+{
+	return ::bind(s, addrptr, namelen);
+}
+#if defined(bind)
+# undef bind
+#endif
+
+static inline int qt_socket_write(int socket, const char *data, qint64 len)
+{
+	return ::write(socket, data, len);
+}
+#if defined(write)
+# undef write
+#endif
+
+static inline int qt_socket_read(int socket, char *data, qint64 len)
+{
+	return ::read(socket, data, len);
+}
+#if defined(read)
+# undef read
+#endif
+
+static inline int qt_socket_recv(int socket, void *data, size_t length, int flags)
+{
+	return ::recv(socket, data, length, flags);
+}
+#if defined(recv)
+# undef recv
+#endif
+
+static inline int qt_socket_recvfrom(int socket, void *data, size_t length,
+	                                 int flags, struct sockaddr *address,
+	                                 socklen_t *address_length)
+{
+	return ::recvfrom(socket, data, length, flags, address, address_length);
+}
+#if defined(recvfrom)
+# undef recvfrom
+#endif
+
+static inline int qt_socket_sendto(int socket, const void *data, size_t length,
+	                               int flags, const struct sockaddr *dest_addr,
+	                               socklen_t dest_length)
+{
+	return ::sendto(socket, data, length, flags, dest_addr, dest_length);
+}
+#if defined(sendto)
+# undef sendto
+#endif
+static inline int qt_socket_close(int socket)
+{
+	return ::close(socket);
+}
+#if defined(close)
+# undef close
+#endif
+
+static inline int qt_socket_fcntl(int socket, int command, int option)
+{
+	return ::fcntl(socket, command, option);
+}
+#if defined(fcntl)
+# undef fcntl
+#endif
+
+static inline int qt_socket_ioctl(int socket, int command, char *option)
+{
+	return ::ioctl(socket, command, option);
+}
+#if defined(ioctl)
+# undef ioctl
+#endif
+
+static inline int qt_socket_getsockname(int socket, struct sockaddr *address, socklen_t *address_len)
+{
+	return ::getsockname(socket, address, address_len);
+}
+#if defined(getsockname)
+# undef getsockname
+#endif
+
+static inline int qt_socket_getpeername(int socket, struct sockaddr *address, socklen_t *address_len)
+{
+	return ::getpeername(socket, address, address_len);
+}
+#if defined(getpeername)
+# undef getpeername
+#endif
+
+static inline int qt_socket_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout)
+{
+	return ::select(nfds, readfds, writefds, exceptfds, timeout);
+}
+
+#if defined(select)
+# undef select
+#endif
+
+static inline int qt_socket_getsockopt(int socket, int level, int optname, void *optval, socklen_t *optlen)
+{
+	return ::getsockopt(socket, level, optname, optval, optlen);
+}
+
+#if defined(getsockopt)
+# undef getsockopt
+#endif
+
+static inline int qt_socket_setsockopt(int socket, int level, int optname, void *optval, socklen_t optlen)
+{
+	return ::setsockopt(socket, level, optname, optval, optlen);
+}
+
+#if defined(setsockopt)
+# undef setsockopt
+#endif
+
 // Use our own defines and structs which we know are correct
 #  define QT_SS_MAXSIZE 128
 #  define QT_SS_ALIGNSIZE (sizeof(qint64))
@@ -183,6 +313,12 @@ public:
 
     int socketDescriptor;
 
+#if !defined(QT_NO_IPV6)
+    struct sockaddr_storage aa;
+#else
+    struct sockaddr_in aa;
+#endif    
+    
     QSocketNotifier *readNotifier, *writeNotifier, *exceptNotifier;
 
 #ifdef Q_OS_WIN
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index 6f9ee1afb0..7584357461 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 //#define QNATIVESOCKETENGINE_DEBUG
-
 #include "qnativesocketengine_p.h"
 #include "private/qnet_unix_p.h"
 #include "qiodevice.h"
@@ -60,12 +59,21 @@
 #include <arpa/inet.h>
 #endif
 
+#ifdef Q_OS_SYMBIAN
+#include <private/qeventdispatcher_symbian_p.h>
+#endif
+
 #if defined QNATIVESOCKETENGINE_DEBUG
 #include <qstring.h>
 #include <ctype.h>
 #endif
 
+#ifdef Q_OS_SYMBIAN // ### TODO: Are these headers right?
+#include <sys/socket.h>
+#include <netinet/in.h>
+#else
 #include <netinet/tcp.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -103,6 +111,7 @@ static QByteArray qt_prettyDebug(const char *data, int len, int maxSize)
 
 static void qt_ignore_sigpipe()
 {
+#ifndef Q_NO_POSIX_SIGNALS
     // Set to ignore SIGPIPE once only.
     static QBasicAtomicInt atom = Q_BASIC_ATOMIC_INITIALIZER(0);
     if (atom.testAndSetRelaxed(0, 1)) {
@@ -111,6 +120,10 @@ static void qt_ignore_sigpipe()
         noaction.sa_handler = SIG_IGN;
         ::sigaction(SIGPIPE, &noaction, 0);
     }
+#else
+    // Posix signals are not supported by the underlying platform
+    // so we don't need to ignore sigpipe signal explicitly
+#endif
 }
 
 /*
@@ -129,7 +142,7 @@ static inline void qt_socket_getPortAndAddress(const qt_sockaddr *s, quint16 *po
             *addr = tmpAddress;
 #ifndef QT_NO_IPV6IFNAME
             char scopeid[IFNAMSIZ];
-            if (::if_indextoname(s->a6.sin6_scope_id, scopeid) > 0) {
+            if (::if_indextoname(s->a6.sin6_scope_id, scopeid)) {
                 addr->setScopeId(QLatin1String(scopeid));
             } else
 #endif
@@ -190,7 +203,8 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc
     }
 
     // Ensure that the socket is closed on exec*().
-    ::fcntl(socket, F_SETFD, FD_CLOEXEC);
+    qt_socket_fcntl(socket, F_SETFD, FD_CLOEXEC);
+
     socketDescriptor = socket;
     return true;
 }
@@ -237,8 +251,9 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co
 
     int v = -1;
     QT_SOCKOPTLEN_T len = sizeof(v);
-    if (::getsockopt(socketDescriptor, level, n, (char *) &v, &len) != -1)
+    if (qt_socket_getsockopt(socketDescriptor, level, n, (char *) &v, &len) != -1)
         return v;
+
     return -1;
 }
 
@@ -268,14 +283,14 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt
     case QNativeSocketEngine::NonBlockingSocketOption: {
         // Make the socket nonblocking.
 #if !defined(Q_OS_VXWORKS)
-        int flags = ::fcntl(socketDescriptor, F_GETFL, 0);
+        int flags = qt_socket_fcntl(socketDescriptor, F_GETFL, 0);
         if (flags == -1) {
 #ifdef QNATIVESOCKETENGINE_DEBUG
             perror("QNativeSocketEnginePrivate::setOption(): fcntl(F_GETFL) failed");
 #endif
             return false;
         }
-        if (::fcntl(socketDescriptor, F_SETFL, flags | O_NONBLOCK) == -1) {
+        if (qt_socket_fcntl(socketDescriptor, F_SETFL, flags | O_NONBLOCK) == -1) {
 #ifdef QNATIVESOCKETENGINE_DEBUG
             perror("QNativeSocketEnginePrivate::setOption(): fcntl(F_SETFL) failed");
 #endif
@@ -293,7 +308,9 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt
         return true;
     }
     case QNativeSocketEngine::AddressReusable:
-#ifdef SO_REUSEPORT
+#ifdef Q_OS_SYMBIAN
+        n = SO_REUSEADDR;
+#elif SO_REUSEPORT
         n = SO_REUSEPORT;
 #else
         n = SO_REUSEADDR;
@@ -313,11 +330,15 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt
         break;
     }
 
-    return ::setsockopt(socketDescriptor, level, n, (char *) &v, sizeof(v)) == 0;
+    return qt_socket_setsockopt(socketDescriptor, level, n, (char *) &v, sizeof(v)) == 0;
 }
 
 bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16 port)
 {
+#ifdef QNATIVESOCKETENGINE_DEBUG
+    qDebug("QNativeSocketEnginePrivate::nativeConnect() : %d ", socketDescriptor);
+#endif	
+	
     struct sockaddr_in sockAddrIPv4;
     struct sockaddr *sockAddrPtr = 0;
     QT_SOCKLEN_T sockAddrSize = 0;
@@ -356,7 +377,8 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16
         // unreachable
     }
 
-    int connectResult = QT_SOCKET_CONNECT(socketDescriptor, sockAddrPtr, sockAddrSize);
+    int connectResult = qt_socket_connect(socketDescriptor, sockAddrPtr, sockAddrSize);
+
     if (connectResult == -1) {
         switch (errno) {
         case EISCONN:
@@ -459,7 +481,8 @@ bool QNativeSocketEnginePrivate::nativeBind(const QHostAddress &address, quint16
             // unreachable
         }
 
-    int bindResult = QT_SOCKET_BIND(socketDescriptor, sockAddrPtr, sockAddrSize);
+    int bindResult = qt_socket_bind(socketDescriptor, sockAddrPtr, sockAddrSize);
+
     if (bindResult < 0) {
         switch(errno) {
         case EADDRINUSE:
@@ -527,8 +550,15 @@ int QNativeSocketEnginePrivate::nativeAccept()
 #if defined (QNATIVESOCKETENGINE_DEBUG)
     qDebug("QNativeSocketEnginePrivate::nativeAccept() == %i", acceptedDescriptor);
 #endif
-    // Ensure that the socket is closed on exec*()
-    ::fcntl(acceptedDescriptor, F_SETFD, FD_CLOEXEC);
+
+    //check if we have vaild descriptor at all
+    if(acceptedDescriptor > 0) {
+        // Ensure that the socket is closed on exec*()
+        qt_socket_fcntl(acceptedDescriptor, F_SETFD, FD_CLOEXEC);
+    } else {
+        qWarning("QNativeSocketEnginePrivate::nativeAccept() - acceptedDescriptor <= 0");
+    }
+
     return acceptedDescriptor;
 }
 
@@ -558,7 +588,7 @@ bool QNativeSocketEnginePrivate::nativeHasPendingDatagrams() const
     ssize_t readBytes;
     do {
         char c;
-        readBytes = ::recvfrom(socketDescriptor, &c, 1, MSG_PEEK, &storage.a, &storageSize);
+        readBytes = qt_socket_recvfrom(socketDescriptor, &c, 1, MSG_PEEK, &storage.a, &storageSize);
     } while (readBytes == -1 && errno == EINTR);
 
     // If there's no error, or if our buffer was too small, there must be a
@@ -572,16 +602,25 @@ bool QNativeSocketEnginePrivate::nativeHasPendingDatagrams() const
     return result;
 }
 
+#ifdef Q_OS_SYMBIAN
+qint64 QNativeSocketEnginePrivate::nativePendingDatagramSize() const
+{
+    size_t nbytes = 0;
+    qt_socket_ioctl(socketDescriptor, E32IONREAD, (char *) &nbytes);
+    return qint64(nbytes-28);
+}
+#else
 qint64 QNativeSocketEnginePrivate::nativePendingDatagramSize() const
 {
     QVarLengthArray<char, 8192> udpMessagePeekBuffer(8192);
     ssize_t recvResult = -1;
+
     for (;;) {
         // the data written to udpMessagePeekBuffer is discarded, so
         // this function is still reentrant although it might not look
         // so.
-        recvResult = ::recv(socketDescriptor, udpMessagePeekBuffer.data(),
-                            udpMessagePeekBuffer.size(), MSG_PEEK);
+        recvResult = qt_socket_recv(socketDescriptor, udpMessagePeekBuffer.data(),
+            udpMessagePeekBuffer.size(), MSG_PEEK);
         if (recvResult == -1 && errno == EINTR)
             continue;
 
@@ -597,7 +636,7 @@ qint64 QNativeSocketEnginePrivate::nativePendingDatagramSize() const
 
     return qint64(recvResult);
 }
-
+#endif
 qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxSize,
                                                     QHostAddress *address, quint16 *port)
 {
@@ -609,7 +648,7 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxS
     ssize_t recvFromResult = 0;
     do {
         char c;
-        recvFromResult = ::recvfrom(socketDescriptor, maxSize ? data : &c, maxSize ? maxSize : 1,
+        recvFromResult = qt_socket_recvfrom(socketDescriptor, maxSize ? data : &c, maxSize ? maxSize : 1,
                                     0, &aa.a, &sz);
     } while (recvFromResult == -1 && errno == EINTR);
 
@@ -660,7 +699,6 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l
 
     // ignore the SIGPIPE signal
     qt_ignore_sigpipe();
-
     ssize_t sentBytes = qt_safe_sendto(socketDescriptor, data, len,
                                        0, sockAddrPtr, sockAddrSize);
 
@@ -698,7 +736,7 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters()
 
     // Determine local address
     memset(&sa, 0, sizeof(sa));
-    if (::getsockname(socketDescriptor, &sa.a, &sockAddrSize) == 0) {
+    if (qt_socket_getsockname(socketDescriptor, &sa.a, &sockAddrSize) == 0) {
         qt_socket_getPortAndAddress(&sa, &localPort, &localAddress);
 
         // Determine protocol family
@@ -722,13 +760,13 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters()
     }
 
     // Determine the remote address
-    if (!::getpeername(socketDescriptor, &sa.a, &sockAddrSize))
+    if (!qt_socket_getpeername(socketDescriptor, &sa.a, &sockAddrSize))
         qt_socket_getPortAndAddress(&sa, &peerPort, &peerAddress);
 
     // Determine the socket type (UDP/TCP)
     int value = 0;
     QT_SOCKOPTLEN_T valueSize = sizeof(int);
-    if (::getsockopt(socketDescriptor, SOL_SOCKET, SO_TYPE, (char *) &value, &valueSize) == 0) {
+    if (qt_socket_getsockopt(socketDescriptor, SOL_SOCKET, SO_TYPE, &value, &valueSize) == 0) {
         if (value == SOCK_STREAM)
             socketType = QAbstractSocket::TcpSocket;
         else if (value == SOCK_DGRAM)
@@ -759,7 +797,7 @@ void QNativeSocketEnginePrivate::nativeClose()
 #if defined (QNATIVESOCKETENGINE_DEBUG)
     qDebug("QNativeSocketEngine::nativeClose()");
 #endif
-    ::close(socketDescriptor);
+    qt_socket_close(socketDescriptor);
 }
 
 qint64 QNativeSocketEnginePrivate::nativeWrite(const char *data, qint64 len)
@@ -773,7 +811,8 @@ qint64 QNativeSocketEnginePrivate::nativeWrite(const char *data, qint64 len)
     // of an interrupting signal.
     ssize_t writtenBytes;
     do {
-        writtenBytes = QT_WRITE(socketDescriptor, data, len);
+        writtenBytes = qt_socket_write(socketDescriptor, data, len);
+        // writtenBytes = QT_WRITE(socketDescriptor, data, len); ### TODO S60: Should this line be removed or the one above it?
     } while (writtenBytes < 0 && errno == EINTR);
 
     if (writtenBytes < 0) {
@@ -815,7 +854,7 @@ qint64 QNativeSocketEnginePrivate::nativeRead(char *data, qint64 maxSize)
 
     ssize_t r = 0;
     do {
-        r = ::read(socketDescriptor, data, maxSize);
+        r = qt_socket_read(socketDescriptor, data, maxSize);
     } while (r == -1 && errno == EINTR);
 
     if (r < 0) {
@@ -833,6 +872,9 @@ qint64 QNativeSocketEnginePrivate::nativeRead(char *data, qint64 maxSize)
         case EIO:
             setError(QAbstractSocket::NetworkError, ReadErrorString);
             break;
+#ifdef Q_OS_SYMBIAN
+        case EPIPE:
+#endif
         case ECONNRESET:
 #if defined(Q_OS_VXWORKS)
         case ESHUTDOWN:
@@ -863,11 +905,40 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) co
     tv.tv_sec = timeout / 1000;
     tv.tv_usec = (timeout % 1000) * 1000;
 
+#ifdef Q_OS_SYMBIAN
+    fd_set fdexec;
+    FD_ZERO(&fdexec);
+    FD_SET(socketDescriptor, &fdexec);
+#endif
+
     int retval;
     if (selectForRead)
+#ifndef Q_OS_SYMBIAN
         retval = qt_safe_select(socketDescriptor + 1, &fds, 0, 0, timeout < 0 ? 0 : &tv);
+#else
+        retval = qt_safe_select(socketDescriptor + 1, &fds, 0, &fdexec, timeout < 0 ? 0 : &tv);
+#endif
     else
+#ifndef Q_OS_SYMBIAN
         retval = qt_safe_select(socketDescriptor + 1, 0, &fds, 0, timeout < 0 ? 0 : &tv);
+#else
+        retval = qt_safe_select(socketDescriptor + 1, 0, &fds, &fdexec, timeout < 0 ? 0 : &tv);
+#endif
+
+#ifdef Q_OS_SYMBIAN
+        bool selectForExec = false;
+        if(retval != 0) {
+            if(retval < 0) {
+                qWarning("nativeSelect(....) returned < 0 for socket %d", socketDescriptor);
+            }
+            selectForExec = FD_ISSET(socketDescriptor, &fdexec);
+        }
+        if(selectForExec) {
+            qWarning("nativeSelect (selectForRead %d, retVal %d, errno %d) Unexpected expectfds ready in fd %d", 
+                    selectForRead, retval, errno, socketDescriptor);
+			}
+#endif
+
     return retval;
 }
 
@@ -884,17 +955,69 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool c
     if (checkWrite)
         FD_SET(socketDescriptor, &fdwrite);
 
+#ifdef Q_OS_SYMBIAN
+    fd_set fdexec;
+    FD_ZERO(&fdexec);
+    FD_SET(socketDescriptor, &fdexec);
+#endif
+
     struct timeval tv;
     tv.tv_sec = timeout / 1000;
     tv.tv_usec = (timeout % 1000) * 1000;
 
     int ret;
+#ifndef Q_OS_SYMBIAN
     ret = qt_safe_select(socketDescriptor + 1, &fdread, &fdwrite, 0, timeout < 0 ? 0 : &tv);
+#else
+    QTime timer;
+    timer.start();
+
+    do {
+        ret = qt_socket_select(socketDescriptor + 1, &fdread, &fdwrite, &fdexec, timeout < 0 ? 0 : &tv);
+        bool selectForExec = false;
+        if(ret != 0) {
+            if(ret < 0) {
+                qWarning("nativeSelect(....) returned < 0 for socket %d", socketDescriptor);
+            }
+            selectForExec = FD_ISSET(socketDescriptor, &fdexec);
+        }
+        if(selectForExec) {
+            qWarning("nativeSelect (checkRead %d, checkWrite %d, ret %d, errno %d): Unexpected expectfds ready in fd %d",
+                    checkRead, checkWrite, ret, errno, socketDescriptor);
+            if (checkRead)
+                FD_SET(socketDescriptor, &fdread);
+            if (checkWrite)
+                FD_SET(socketDescriptor, &fdwrite);
+
+            if ((ret == -1) && ( errno == ECONNREFUSED || errno == EPIPE ))
+                ret = 1;
+
+        }
+
+        if (ret != -1 || errno != EINTR) {
+            break;
+        }
+
+        if (timeout > 0) {
+            // recalculate the timeout
+            int t = timeout - timer.elapsed();
+            if (t < 0) {
+                // oops, timeout turned negative?
+                ret = -1;
+                break;
+            }
+
+            tv.tv_sec = t / 1000;
+            tv.tv_usec = (t % 1000) * 1000;
+        }
+    } while (true);
+#endif
+
     if (ret <= 0)
         return ret;
-
     *selectForRead = FD_ISSET(socketDescriptor, &fdread);
     *selectForWrite = FD_ISSET(socketDescriptor, &fdwrite);
+
     return ret;
 }
 
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index d226f21da5..25873c6f76 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -59,7 +59,11 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifdef Q_OS_SYMBIAN
+static const int MaxWriteBufferSize = 4*1024;
+#else
 static const int MaxWriteBufferSize = 128*1024;
+#endif
 
 //#define QSOCKS5SOCKETLAYER_DEBUG
 
@@ -1844,9 +1848,9 @@ QSocks5SocketEngineHandler::createSocketEngine(QAbstractSocket::SocketType socke
         QSOCKS5_DEBUG << "not proxying";
         return 0;
     }
-    QSocks5SocketEngine *engine = new QSocks5SocketEngine(parent);
+    QScopedPointer<QSocks5SocketEngine> engine(new QSocks5SocketEngine(parent));
     engine->setProxy(proxy);
-    return engine;
+    return engine.take();
 }
 
 QAbstractSocketEngine *QSocks5SocketEngineHandler::createSocketEngine(int socketDescriptor, QObject *parent)
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index 2126fef70b..8bb92b7508 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -354,7 +354,12 @@ void QTcpServer::close()
 
     if (d->socketEngine) {
         d->socketEngine->close();
-        d->socketEngine->deleteLater();
+        QT_TRY {
+            d->socketEngine->deleteLater();
+        } QT_CATCH(const std::bad_alloc &) {
+            // in out of memory situations, the socketEngine
+            // will be deleted in ~QTcpServer (it's a child-object of this)
+        }
         d->socketEngine = 0;
     }
 
diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp
index 797becb780..32f72dfe34 100644
--- a/src/network/socket/qudpsocket.cpp
+++ b/src/network/socket/qudpsocket.cpp
@@ -94,6 +94,13 @@
 
     This enum describes the different flags you can pass to modify the
     behavior of QUdpSocket::bind().
+    
+    \note On Symbian OS bind flags behaviour depends on process capabilties.
+    If process has NetworkControl capability, the bind attempt with 
+    ReuseAddressHint will always succeed even the address and port is already
+    bound by another socket with any flags. If process does not have 
+    NetworkControl capability, the bind attempt to address and port already 
+    bound by another socket will always fail.
 
     \value ShareAddress Allow other services to bind to the same address
     and port. This is useful when multiple processes share
@@ -349,6 +356,9 @@ qint64 QUdpSocket::pendingDatagramSize() const
     as even if they are sent successfully, they are likely to be
     fragmented by the IP layer before arriving at their final
     destination.
+    
+    \warning In S60 5.0 and earlier versions, the writeDatagram return
+    value is not reliable for large datagrams.
 
     \warning Calling this function on a connected UDP socket may
     result in an error and no packet being sent. If you are using a
@@ -368,6 +378,16 @@ qint64 QUdpSocket::writeDatagram(const char *data, qint64 size, const QHostAddre
         return -1;
 
     qint64 sent = d->socketEngine->writeDatagram(data, size, address, port);
+#ifdef Q_OS_SYMBIAN
+    if( QSysInfo::s60Version() <= QSysInfo::SV_S60_5_0 ) {
+        // This is evil hack, but for some reason native RSocket::SendTo returns 0,
+        // for large datagrams (such as 600 bytes). Based on comments from Open C team
+        // this should happen only in platforms <= S60 5.0.
+        // As an workaround, we just set sent = size
+        if( sent == 0 )
+            sent = size;
+    }            
+#endif    
     d->cachedSocketDescriptor = d->socketEngine->socketDescriptor();
 
     if (sent >= 0) {
diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri
index 17e49d2c3f..2bafe1325a 100644
--- a/src/network/socket/socket.pri
+++ b/src/network/socket/socket.pri
@@ -43,5 +43,3 @@ wince*: {
 
     DEFINES += QT_LOCALSOCKET_TCP
 }
-
-
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 9d8cfb09d9..018b2c258a 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -159,7 +159,7 @@ QSslCertificate::QSslCertificate(const QByteArray &data, QSsl::EncodingFormat fo
 /*!
     Constructs an identical copy of \a other.
 */
-QSslCertificate::QSslCertificate(const QSslCertificate &other) : d(other.d)
+QSslCertificate::QSslCertificate(const QSslCertificate &other) : d(other.d.data())
 {
     d->ref.ref();
 }
@@ -169,8 +169,6 @@ QSslCertificate::QSslCertificate(const QSslCertificate &other) : d(other.d)
 */
 QSslCertificate::~QSslCertificate()
 {
-    if (!d->ref.deref())
-        delete d;
 }
 
 /*!
@@ -179,7 +177,7 @@ QSslCertificate::~QSslCertificate()
 */
 QSslCertificate &QSslCertificate::operator=(const QSslCertificate &other)
 {
-    qAtomicAssign(d, other.d);
+    d.assign(other.d.data());
     return *this;
 }
 
@@ -245,12 +243,7 @@ void QSslCertificate::clear()
 {
     if (isNull())
         return;
-    if (d->ref == 1)
-        delete d;
-    else
-        d->ref.deref();
-
-    d = new QSslCertificatePrivate;
+    d.reset(new QSslCertificatePrivate);
 }
 
 /*!
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index cdb9f1573e..ebb83197e6 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -118,7 +118,7 @@ public:
     Qt::HANDLE handle() const;
 
 private:
-    QSslCertificatePrivate *d;
+    QScopedSharedPointer<QSslCertificatePrivate> d;
     friend class QSslCertificatePrivate;
     friend class QSslSocketBackendPrivate;
 };
diff --git a/src/network/ssl/qsslcipher.cpp b/src/network/ssl/qsslcipher.cpp
index 504099f646..ced5bfa6cf 100644
--- a/src/network/ssl/qsslcipher.cpp
+++ b/src/network/ssl/qsslcipher.cpp
@@ -103,7 +103,7 @@ QSslCipher::QSslCipher(const QString &name, QSsl::SslProtocol protocol)
 QSslCipher::QSslCipher(const QSslCipher &other)
     : d(new QSslCipherPrivate)
 {
-    *d = *other.d;
+    *d.data() = *other.d.data();
 }
 
 /*!
@@ -111,7 +111,6 @@ QSslCipher::QSslCipher(const QSslCipher &other)
 */
 QSslCipher::~QSslCipher()
 {
-    delete d;
 }
 
 /*!
@@ -120,7 +119,7 @@ QSslCipher::~QSslCipher()
 */
 QSslCipher &QSslCipher::operator=(const QSslCipher &other)
 {
-    *d = *other.d;
+    *d.data() = *other.d.data();
     return *this;
 }
 
diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h
index 94e5c7e488..aecc6f3a93 100644
--- a/src/network/ssl/qsslcipher.h
+++ b/src/network/ssl/qsslcipher.h
@@ -44,6 +44,7 @@
 #define QSSLCIPHER_H
 
 #include <QtCore/qstring.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qssl.h>
 
 QT_BEGIN_HEADER
@@ -78,7 +79,7 @@ public:
     QSsl::SslProtocol protocol() const;
 
 private:
-    QSslCipherPrivate *d;
+    QScopedPointer<QSslCipherPrivate> d;
     friend class QSslSocketBackendPrivate;
 };
 
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index 8b14d3251c..78ebc3366c 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -110,6 +110,23 @@ public:
 
     \sa QSslCertificate
 */
+
+// RVCT compiler in debug build does not like about default values in const-
+// So as an workaround we define all constructor overloads here explicitly
+QSslError::QSslError()
+    : d(new QSslErrorPrivate)
+{
+    d->error = QSslError::NoError;
+    d->certificate = QSslCertificate();
+}
+
+QSslError::QSslError(SslError error)
+    : d(new QSslErrorPrivate)
+{
+    d->error = error;
+    d->certificate = QSslCertificate();
+}
+
 QSslError::QSslError(SslError error, const QSslCertificate &certificate)
     : d(new QSslErrorPrivate)
 {
@@ -123,7 +140,7 @@ QSslError::QSslError(SslError error, const QSslCertificate &certificate)
 QSslError::QSslError(const QSslError &other)
     : d(new QSslErrorPrivate)
 {
-    *d = *other.d;
+    *d.data() = *other.d.data();
 }
 
 /*!
@@ -131,7 +148,6 @@ QSslError::QSslError(const QSslError &other)
 */
 QSslError::~QSslError()
 {
-    delete d;
 }
 
 /*!
@@ -141,7 +157,7 @@ QSslError::~QSslError()
 */
 QSslError &QSslError::operator=(const QSslError &other)
 {
-    *d = *other.d;
+    *d.data() = *other.d.data();
     return *this;
 }
 
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h
index dcf694a2fc..c3e91a68db 100644
--- a/src/network/ssl/qsslerror.h
+++ b/src/network/ssl/qsslerror.h
@@ -86,8 +86,14 @@ public:
         UnspecifiedError = -1
     };
 
-    QSslError(SslError error = NoError, const QSslCertificate &certificate = QSslCertificate());
+    // RVCT compiler in debug build does not like about default values in const-
+    // So as an workaround we define all constructor overloads here explicitly
+    QSslError();
+    QSslError(SslError error);
+    QSslError(SslError error, const QSslCertificate &certificate);
+
     QSslError(const QSslError &other);
+
     ~QSslError();
     QSslError &operator=(const QSslError &other);
     bool operator==(const QSslError &other) const;
@@ -99,7 +105,7 @@ public:
     QSslCertificate certificate() const;
     
 private:
-    QSslErrorPrivate *d;
+    QScopedPointer<QSslErrorPrivate> d;
 };
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp
index c7eb692952..7087339397 100644
--- a/src/network/ssl/qsslkey.cpp
+++ b/src/network/ssl/qsslkey.cpp
@@ -269,7 +269,7 @@ QSslKey::QSslKey(QIODevice *device, QSsl::KeyAlgorithm algorithm, QSsl::Encoding
 /*!
     Constructs an identical copy of \a other.
 */
-QSslKey::QSslKey(const QSslKey &other) : d(other.d)
+QSslKey::QSslKey(const QSslKey &other) : d(other.d.data())
 {
     d->ref.ref();
 }
@@ -279,8 +279,6 @@ QSslKey::QSslKey(const QSslKey &other) : d(other.d)
 */
 QSslKey::~QSslKey()
 {
-    if (!d->ref.deref())
-        delete d;
 }
 
 /*!
@@ -291,7 +289,7 @@ QSslKey::~QSslKey()
 */
 QSslKey &QSslKey::operator=(const QSslKey &other)
 {
-    qAtomicAssign(d, other.d);
+    d.assign(other.d.data());
     return *this;
 }
 
@@ -312,10 +310,13 @@ bool QSslKey::isNull() const
 */
 void QSslKey::clear()
 {
-    if (!d->ref.deref()) {
-        delete d;
-        d = new QSslKeyPrivate;
-    }
+    d.reset(new QSslKeyPrivate);
+
+    //### old code: is this really correct???
+    //if (!d->ref.deref()) {
+    //    delete d;
+    //    d = new QSslKeyPrivate;
+    //}
 }
 
 /*!
diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h
index 1efc7d51b9..a85691be4d 100644
--- a/src/network/ssl/qsslkey.h
+++ b/src/network/ssl/qsslkey.h
@@ -45,6 +45,7 @@
 
 #include <QtCore/qnamespace.h>
 #include <QtCore/qbytearray.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qssl.h>
 
 QT_BEGIN_HEADER
@@ -92,7 +93,7 @@ public:
     inline bool operator!=(const QSslKey &key) const { return !operator==(key); }
 
 private:
-    QSslKeyPrivate *d;
+    QScopedSharedPointer<QSslKeyPrivate> d;
     friend class QSslCertificate;
 };
 
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h
index 7dc9fab822..f923924faa 100644
--- a/src/network/ssl/qsslsocket_openssl_p.h
+++ b/src/network/ssl/qsslsocket_openssl_p.h
@@ -77,6 +77,10 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/x509_vfy.h>
+#ifdef Q_OS_SYMBIAN
+#include <openssl/dsa.h>
+#include <openssl/rsa.h>
+#endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
 typedef _STACK STACK;
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 0fea2dff08..6b777e3715 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -254,10 +254,16 @@ DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c,
 DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG)
 DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG)
 
+#ifdef Q_OS_SYMBIAN
+#define RESOLVEFUNC(func, ordinal, lib) \
+    if (!(_q_##func = _q_PTR_##func(lib->resolve(#ordinal)))) \
+        qWarning("QSslSocket: cannot resolve "#func);
+#else
 #define RESOLVEFUNC(func) \
     if (!(_q_##func = _q_PTR_##func(libs.first->resolve(#func)))     \
         && !(_q_##func = _q_PTR_##func(libs.second->resolve(#func)))) \
         qWarning("QSslSocket: cannot resolve "#func);
+#endif
 
 #if !defined QT_LINKED_OPENSSL
 
@@ -358,7 +364,24 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
     pair.first = ssleay32;
     pair.second = libeay32;
     return pair;
+# elif defined(Q_OS_SYMBIAN)
+     QLibrary *libssl = new QLibrary(QLatin1String("libssl"));
+    if (!libssl->load()) {
+        // Cannot find ssleay32.dll
+        delete libssl;
+        return pair;
+    }
 
+    QLibrary *libcrypto = new QLibrary(QLatin1String("libcrypto"));
+    if (!libcrypto->load()) {
+        delete libcrypto;
+        delete libssl;
+        return pair;
+    }
+
+    pair.first = libssl;
+    pair.second = libcrypto;
+    return pair;
 # elif defined(Q_OS_UNIX)
     QLibrary *&libssl = pair.first;
     QLibrary *&libcrypto = pair.second;
@@ -460,6 +483,127 @@ bool q_resolveOpenSslSymbols()
         // failed to load them
         return false;
 
+#ifdef Q_OS_SYMBIAN
+#ifdef SSLEAY_MACROS
+    RESOLVEFUNC(ASN1_dup, 125, libs.second )
+#endif
+    RESOLVEFUNC(ASN1_STRING_data, 71, libs.second )
+    RESOLVEFUNC(ASN1_STRING_length, 76, libs.second )
+    RESOLVEFUNC(BIO_ctrl, 184, libs.second )
+    RESOLVEFUNC(BIO_free, 209, libs.second )
+    RESOLVEFUNC(BIO_new, 222, libs.second )
+    RESOLVEFUNC(BIO_new_mem_buf, 230, libs.second )
+    RESOLVEFUNC(BIO_read, 244, libs.second )
+    RESOLVEFUNC(BIO_s_mem, 251, libs.second )
+    RESOLVEFUNC(BIO_write, 269, libs.second )
+    RESOLVEFUNC(BN_num_bits, 387, libs.second )
+    RESOLVEFUNC(CRYPTO_free, 469, libs.second )
+    RESOLVEFUNC(CRYPTO_num_locks, 500, libs.second )
+    RESOLVEFUNC(CRYPTO_set_id_callback, 513, libs.second )
+    RESOLVEFUNC(CRYPTO_set_locking_callback, 516, libs.second )
+    RESOLVEFUNC(DSA_free, 594, libs.second )
+    RESOLVEFUNC(ERR_error_string, 744, libs.second )
+    RESOLVEFUNC(ERR_get_error, 749, libs.second )
+    RESOLVEFUNC(EVP_des_ede3_cbc, 919, libs.second )
+    RESOLVEFUNC(EVP_PKEY_assign, 859, libs.second )
+    RESOLVEFUNC(EVP_PKEY_free, 867, libs.second )
+    RESOLVEFUNC(EVP_PKEY_get1_DSA, 869, libs.second )
+    RESOLVEFUNC(EVP_PKEY_get1_RSA, 870, libs.second )
+    RESOLVEFUNC(EVP_PKEY_new, 876, libs.second )
+    RESOLVEFUNC(EVP_PKEY_type, 882, libs.second )
+    RESOLVEFUNC(OBJ_nid2sn, 1036, libs.second )
+    RESOLVEFUNC(OBJ_obj2nid, 1037, libs.second )
+#ifdef SSLEAY_MACROS // ### verify
+    RESOLVEFUNC(PEM_ASN1_read_bio, 1180, libs.second )
+#else
+    RESOLVEFUNC(PEM_read_bio_DSAPrivateKey, 1219, libs.second )
+    RESOLVEFUNC(PEM_read_bio_RSAPrivateKey, 1228, libs.second )
+    RESOLVEFUNC(PEM_write_bio_DSAPrivateKey, 1260, libs.second )
+    RESOLVEFUNC(PEM_write_bio_RSAPrivateKey, 1271, libs.second )
+#endif
+    RESOLVEFUNC(PEM_read_bio_DSA_PUBKEY, 1220, libs.second )
+    RESOLVEFUNC(PEM_read_bio_RSA_PUBKEY, 1230, libs.second )
+    RESOLVEFUNC(PEM_write_bio_DSA_PUBKEY, 1261, libs.second )
+    RESOLVEFUNC(PEM_write_bio_RSA_PUBKEY, 1273, libs.second )
+    RESOLVEFUNC(RAND_seed, 1426, libs.second )
+    RESOLVEFUNC(RAND_status, 1429, libs.second )
+    RESOLVEFUNC(RSA_free, 1450, libs.second )
+    RESOLVEFUNC(sk_free, 2571, libs.second )
+    RESOLVEFUNC(sk_num, 2576, libs.second )
+    RESOLVEFUNC(sk_value, 2585, libs.second )
+    RESOLVEFUNC(SSL_CIPHER_description, 11, libs.first )
+    RESOLVEFUNC(SSL_CTX_check_private_key, 21, libs.first )
+    RESOLVEFUNC(SSL_CTX_ctrl, 22, libs.first )
+    RESOLVEFUNC(SSL_CTX_free, 24, libs.first )
+    RESOLVEFUNC(SSL_CTX_new, 35, libs.first )
+    RESOLVEFUNC(SSL_CTX_set_cipher_list, 40, libs.first )
+    RESOLVEFUNC(SSL_CTX_set_default_verify_paths, 44, libs.first )
+    RESOLVEFUNC(SSL_CTX_set_verify, 56, libs.first )
+    RESOLVEFUNC(SSL_CTX_set_verify_depth, 57, libs.first )
+    RESOLVEFUNC(SSL_CTX_use_certificate, 64, libs.first )
+    RESOLVEFUNC(SSL_CTX_use_certificate_file, 67, libs.first )
+    RESOLVEFUNC(SSL_CTX_use_PrivateKey, 58, libs.first )
+    RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey, 61, libs.first )
+    RESOLVEFUNC(SSL_CTX_use_PrivateKey_file, 60, libs.first )
+    RESOLVEFUNC(SSL_accept, 82, libs.first )
+    RESOLVEFUNC(SSL_clear, 92, libs.first )
+    RESOLVEFUNC(SSL_connect, 93, libs.first )
+    RESOLVEFUNC(SSL_free, 99, libs.first )
+    RESOLVEFUNC(SSL_get_ciphers, 104, libs.first )
+    RESOLVEFUNC(SSL_get_current_cipher, 106, libs.first )
+    RESOLVEFUNC(SSL_get_error, 110, libs.first )
+    RESOLVEFUNC(SSL_get_peer_cert_chain, 117, libs.first )
+    RESOLVEFUNC(SSL_get_peer_certificate, 118, libs.first )
+    RESOLVEFUNC(SSL_get_verify_result, 132, libs.first )
+    RESOLVEFUNC(SSL_library_init, 137, libs.first )
+    RESOLVEFUNC(SSL_load_error_strings, 139, libs.first )
+    RESOLVEFUNC(SSL_new, 140, libs.first )
+    RESOLVEFUNC(SSL_read, 143, libs.first )
+    RESOLVEFUNC(SSL_set_accept_state, 148, libs.first )
+    RESOLVEFUNC(SSL_set_bio, 149, libs.first )
+    RESOLVEFUNC(SSL_set_connect_state, 152, libs.first )
+    RESOLVEFUNC(SSL_shutdown, 173, libs.first )
+    RESOLVEFUNC(SSL_write, 188, libs.first )
+    RESOLVEFUNC(SSLv2_client_method, 192, libs.first )
+    RESOLVEFUNC(SSLv3_client_method, 195, libs.first )
+    RESOLVEFUNC(SSLv23_client_method, 189, libs.first )
+    RESOLVEFUNC(TLSv1_client_method, 198, libs.first )
+    RESOLVEFUNC(SSLv2_server_method, 194, libs.first )
+    RESOLVEFUNC(SSLv3_server_method, 197, libs.first )
+    RESOLVEFUNC(SSLv23_server_method, 191, libs.first )
+    RESOLVEFUNC(TLSv1_server_method, 200, libs.first )
+    RESOLVEFUNC(X509_NAME_oneline, 1830, libs.second )
+    RESOLVEFUNC(X509_PUBKEY_get, 1844, libs.second )
+    RESOLVEFUNC(X509_STORE_free, 1939, libs.second )
+    RESOLVEFUNC(X509_STORE_new, 1942, libs.second )
+    RESOLVEFUNC(X509_STORE_add_cert, 1936, libs.second )
+    RESOLVEFUNC(X509_STORE_CTX_free, 1907, libs.second )
+    RESOLVEFUNC(X509_STORE_CTX_init, 1919, libs.second )
+    RESOLVEFUNC(X509_STORE_CTX_new, 1920, libs.second )
+    RESOLVEFUNC(X509_STORE_CTX_set_purpose, 1931, libs.second )
+    RESOLVEFUNC(X509_cmp, 1992, libs.second )
+#ifndef SSLEAY_MACROS
+    RESOLVEFUNC(X509_dup, 1997, libs.second )
+#endif
+    RESOLVEFUNC(X509_EXTENSION_get_object, 1785, libs.second )
+    RESOLVEFUNC(X509_free, 2001, libs.second )
+    RESOLVEFUNC(X509_get_ext, 2012, libs.second )
+    RESOLVEFUNC(X509_get_ext_count, 2016, libs.second )
+    RESOLVEFUNC(X509_get_ext_d2i, 2017, libs.second )
+    RESOLVEFUNC(X509_get_issuer_name, 2018, libs.second )
+    RESOLVEFUNC(X509_get_subject_name, 2022, libs.second )
+    RESOLVEFUNC(X509_verify_cert, 2069, libs.second )
+    RESOLVEFUNC(d2i_X509, 2309, libs.second )
+    RESOLVEFUNC(i2d_X509, 2489, libs.second )
+#ifdef SSLEAY_MACROS
+    RESOLVEFUNC(i2d_DSAPrivateKey, 2395, libs.second )
+    RESOLVEFUNC(i2d_RSAPrivateKey, 2476, libs.second )
+    RESOLVEFUNC(d2i_DSAPrivateKey, 2220, libs.second )
+    RESOLVEFUNC(d2i_RSAPrivateKey, 2296, libs.second )
+#endif
+    RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf, 1153, libs.second )
+    RESOLVEFUNC(OPENSSL_add_all_algorithms_conf, 1152, libs.second )    
+#else // Q_OS_SYMBIAN
 #ifdef SSLEAY_MACROS
     RESOLVEFUNC(ASN1_dup)
 #endif
@@ -579,6 +723,7 @@ bool q_resolveOpenSslSymbols()
 #endif
     RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf)
     RESOLVEFUNC(OPENSSL_add_all_algorithms_conf)
+#endif // Q_OS_SYMBIAN    
     symbolsResolved = true;
     delete libs.first;
     delete libs.second;
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 196e19d7f6..6021d5da41 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -1,6 +1,12 @@
 # OpenSSL support; compile in QSslSocket.
 contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
-    include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri)
+    
+
+symbian {
+	INCLUDEPATH *= $$OS_LAYER_SSL_SYSTEMINCLUDE
+} else {
+	include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri) 
+}
 
     HEADERS += ssl/qssl.h \
                ssl/qsslcertificate.h \
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index a3475c72bf..62090a5719 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1199,7 +1199,7 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
 
     if (d->ctx->d_ptr->active_engine) {
         QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(d->ctx->d_ptr->active_engine);
-        QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr);
+        QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr.data());
         p->transferMode(BrushDrawingMode);
         p->drawable.doneCurrent();
     }
@@ -1283,7 +1283,7 @@ bool QGL2PaintEngineEx::end()
     if (ctx->d_ptr->active_engine != this) {
         QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(ctx->d_ptr->active_engine);
         if (engine && engine->isActive()) {
-            QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr);
+            QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr.data());
             p->transferMode(BrushDrawingMode);
             p->drawable.doneCurrent();
         }
@@ -1315,7 +1315,7 @@ void QGL2PaintEngineEx::ensureActive()
     if (isActive() && ctx->d_ptr->active_engine != this) {
         QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(ctx->d_ptr->active_engine);
         if (engine && engine->isActive()) {
-            QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr);
+            QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr.data());
             p->transferMode(BrushDrawingMode);
             p->drawable.doneCurrent();
         }
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 48d09cecff..e124c2ede3 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1599,8 +1599,8 @@ Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg()
 */
 
 QGLContext::QGLContext(const QGLFormat &format, QPaintDevice *device)
+    : d_ptr(new QGLContextPrivate(this))
 {
-    d_ptr = new QGLContextPrivate(this);
     Q_D(QGLContext);
     d->init(device, format);
 }
@@ -1622,8 +1622,8 @@ QGLContext::QGLContext(const QGLFormat &format, QPaintDevice *device)
     \sa format(), isValid()
 */
 QGLContext::QGLContext(const QGLFormat &format)
+    : d_ptr(new QGLContextPrivate(this))
 {
-    d_ptr = new QGLContextPrivate(this);
     Q_D(QGLContext);
     d->init(0, format);
 }
@@ -1641,7 +1641,6 @@ QGLContext::~QGLContext()
 
     QGLSignalProxy::instance()->emitAboutToDestroyContext(this);
     reset();
-    delete d;
 }
 
 void QGLContextPrivate::cleanup()
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 31b9543b04..9ee200b1ad 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -45,6 +45,7 @@
 #include <QtGui/qwidget.h>
 #include <QtOpenGL/qglcolormap.h>
 #include <QtCore/qmap.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -348,7 +349,7 @@ protected:
     static QGLContext* currentCtx;
 
 private:
-    QGLContextPrivate* d_ptr;
+    QScopedPointer<QGLContextPrivate> d_ptr;
 
     friend class QGLPixelBuffer;
     friend class QGLPixelBufferPrivate;
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index abec78a193..0577f9a108 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -736,7 +736,6 @@ QGLFramebufferObject::~QGLFramebufferObject()
             glDeleteRenderbuffers(1, &d->depth_stencil_buffer);
         glDeleteFramebuffers(1, &d->fbo);
     }
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h
index bd60198934..108bbb400b 100644
--- a/src/opengl/qglframebufferobject.h
+++ b/src/opengl/qglframebufferobject.h
@@ -129,7 +129,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QGLFramebufferObject)
-    QGLFramebufferObjectPrivate *d_ptr;
+    QScopedPointer<QGLFramebufferObjectPrivate> d_ptr;
     friend class QGLDrawable;
 };
 
diff --git a/src/opengl/qglpaintdevice_qws.cpp b/src/opengl/qglpaintdevice_qws.cpp
index 2093464705..60816de2d0 100644
--- a/src/opengl/qglpaintdevice_qws.cpp
+++ b/src/opengl/qglpaintdevice_qws.cpp
@@ -68,8 +68,6 @@ QWSGLPaintDevice::QWSGLPaintDevice(QWidget *widget) :
 
 QWSGLPaintDevice::~QWSGLPaintDevice()
 {
-    Q_D(QWSGLPaintDevice);
-    delete d;
 }
 
 QPaintEngine* QWSGLPaintDevice::paintEngine() const
diff --git a/src/opengl/qglpaintdevice_qws_p.h b/src/opengl/qglpaintdevice_qws_p.h
index 9aeb11f61a..ec7d6c8fc3 100644
--- a/src/opengl/qglpaintdevice_qws_p.h
+++ b/src/opengl/qglpaintdevice_qws_p.h
@@ -53,6 +53,7 @@
 // We mean it.
 //
 
+#include <QtCore/qscopedpointer.h>
 #include <QPaintDevice>
 
 QT_BEGIN_NAMESPACE
@@ -76,7 +77,7 @@ public:
 
 private:
     friend class QWSGLWindowSurface;
-    QWSGLPaintDevicePrivate *d_ptr;
+    QScopedPointer<QWSGLPaintDevicePrivate> d_ptr;
 };
 
 
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp
index 440694d5f0..e40a0377ee 100644
--- a/src/opengl/qglpixelbuffer.cpp
+++ b/src/opengl/qglpixelbuffer.cpp
@@ -191,7 +191,6 @@ QGLPixelBuffer::~QGLPixelBuffer()
     delete d->qctx;
     if (current && current != d->qctx)
         current->makeCurrent();
-    delete d_ptr;
 }
 
 /*! \fn bool QGLPixelBuffer::makeCurrent()
diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h
index 46ca67e864..06894c0013 100644
--- a/src/opengl/qglpixelbuffer.h
+++ b/src/opengl/qglpixelbuffer.h
@@ -107,7 +107,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QGLPixelBuffer)
-    QGLPixelBufferPrivate *d_ptr;
+    QScopedPointer<QGLPixelBufferPrivate> d_ptr;
     friend class QGLDrawable;
     friend class QGLWindowSurface;
 };
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index 685d0f56b6..63ce73a495 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -5420,7 +5420,7 @@ void QOpenGLPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
         QPainter *p = painter();
         QBrush oldBrush = p->brush();
         p->setBrush(brush);
-        qt_draw_helper(p->d_ptr, painterPathFromVectorPath(path), QPainterPrivate::FillDraw);
+        qt_draw_helper(p->d_ptr.data(), painterPathFromVectorPath(path), QPainterPrivate::FillDraw);
         p->setBrush(oldBrush);
         return;
     }
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 7a962e4ded..a9ecffcdb1 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -1323,7 +1323,7 @@ QPainterState *QVGPaintEngine::createState(QPainterState *orig) const
         return new QVGPainterState();
     } else {
         Q_D(const QVGPaintEngine);
-        QVGPaintEnginePrivate *d2 = const_cast<QVGPaintEnginePrivate*>(d);
+        QVGPaintEnginePrivate *d2 = const_cast<QVGPaintEnginePrivate*>(d.data());
         QVGPainterState *origState = static_cast<QVGPainterState *>(orig);
         origState->savedDirty = d2->dirty;
         d2->dirty = 0;
diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h
index bb019be7c4..ebd769ef91 100644
--- a/src/openvg/qpixmapdata_vg_p.h
+++ b/src/openvg/qpixmapdata_vg_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtGui/private/qpixmap_raster_p.h>
-#include "qvg_p.h"
+#include <private/qvg_p.h>
 #if !defined(QT_NO_EGL)
 #include <QtGui/private/qegl_p.h>
 #endif
diff --git a/src/phonon/phonon.pro b/src/phonon/phonon.pro
index 9e7879f360..04698397f4 100644
--- a/src/phonon/phonon.pro
+++ b/src/phonon/phonon.pro
@@ -113,3 +113,17 @@ contains(QT_CONFIG, dbus) {
 }
 
 contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
+
+symbian: {
+    # Phonon depends on numeric_limits. Enabling STL support in Qt
+    # would bring in link dependencies, and we don't need that for
+    # numeric_limits, hence we here merely ensure we bring in the necessary
+    # header.
+    INCLUDEPATH *= $$OS_LAYER_STDCPP_SYSTEMINCLUDE
+
+	# Without this setting, code using numeric_limits will fail
+	# for winscw, although armv5 works fine no matter what.
+    QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
+    
+    TARGET.UID3 = 0x2001E624
+}
diff --git a/src/plugins/codecs/cn/cn.pro b/src/plugins/codecs/cn/cn.pro
index a7b8b60508..b0a8a91779 100644
--- a/src/plugins/codecs/cn/cn.pro
+++ b/src/plugins/codecs/cn/cn.pro
@@ -12,3 +12,5 @@ SOURCES		= qgb18030codec.cpp \
 
 target.path += $$[QT_INSTALL_PLUGINS]/codecs
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001E615
diff --git a/src/plugins/codecs/jp/jp.pro b/src/plugins/codecs/jp/jp.pro
index 8626912148..6480e43418 100644
--- a/src/plugins/codecs/jp/jp.pro
+++ b/src/plugins/codecs/jp/jp.pro
@@ -23,3 +23,5 @@ unix {
 
 target.path += $$[QT_INSTALL_PLUGINS]/codecs
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001E614
diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp
index 76353a3cb4..cdc66192a0 100644
--- a/src/plugins/codecs/jp/qeucjpcodec.cpp
+++ b/src/plugins/codecs/jp/qeucjpcodec.cpp
@@ -79,7 +79,6 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_TEXTCODEC
 
-static const uchar Esc = 0x1b;
 static const uchar Ss2 = 0x8e;        // Single Shift 2
 static const uchar Ss3 = 0x8f;        // Single Shift 3
 
diff --git a/src/plugins/codecs/kr/kr.pro b/src/plugins/codecs/kr/kr.pro
index 9199e33c2e..1cc28d80a5 100644
--- a/src/plugins/codecs/kr/kr.pro
+++ b/src/plugins/codecs/kr/kr.pro
@@ -16,3 +16,5 @@ wince*: {
 
 target.path += $$[QT_INSTALL_PLUGINS]/codecs
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001B2E5
diff --git a/src/plugins/codecs/tw/tw.pro b/src/plugins/codecs/tw/tw.pro
index 8039f4bb01..2ebb94f013 100644
--- a/src/plugins/codecs/tw/tw.pro
+++ b/src/plugins/codecs/tw/tw.pro
@@ -12,3 +12,5 @@ SOURCES  = qbig5codec.cpp \
 
 target.path += $$[QT_INSTALL_PLUGINS]/codecs
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001B2E4
diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
index 2e105eeabc..5c5a31ebd1 100644
--- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro
+++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
@@ -9,3 +9,5 @@ QT += xml svg
 QTDIR_build:DESTDIR  = $$QT_BUILD_TREE/plugins/iconengines
 target.path += $$[QT_INSTALL_PLUGINS]/iconengines
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001B2E3
diff --git a/src/plugins/imageformats/gif/gif.pro b/src/plugins/imageformats/gif/gif.pro
index 74586b2c20..8a5c51a587 100644
--- a/src/plugins/imageformats/gif/gif.pro
+++ b/src/plugins/imageformats/gif/gif.pro
@@ -8,3 +8,5 @@ SOURCES += main.cpp \
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001E61A
diff --git a/src/plugins/imageformats/ico/ico.pro b/src/plugins/imageformats/ico/ico.pro
index 73665cd729..eadff416e3 100644
--- a/src/plugins/imageformats/ico/ico.pro
+++ b/src/plugins/imageformats/ico/ico.pro
@@ -10,3 +10,5 @@ SOURCES += main.cpp \
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001E616
diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro
index f3109024cb..f8893a08e0 100644
--- a/src/plugins/imageformats/jpeg/jpeg.pro
+++ b/src/plugins/imageformats/jpeg/jpeg.pro
@@ -13,6 +13,10 @@ wince*: {
 	contains(CE_ARCH,x86):CONFIG += exceptions_off
 }
 
+symbian: {
+	QMAKE_CXXFLAGS.CW += -W nounusedarg
+}
+
 contains(QT_CONFIG, system-jpeg) {
         unix:LIBS += -ljpeg
         win32:LIBS += libjpeg.lib
@@ -71,3 +75,5 @@ contains(QT_CONFIG, system-jpeg) {
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001E61B
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
index f0943f5580..e391ebc70e 100644
--- a/src/plugins/imageformats/mng/mng.pro
+++ b/src/plugins/imageformats/mng/mng.pro
@@ -7,6 +7,10 @@ HEADERS += qmnghandler.h
 SOURCES += main.cpp \
            qmnghandler.cpp
 
+symbian: {
+	QMAKE_CXXFLAGS.CW += -W nounused
+}
+
 contains(QT_CONFIG, system-mng) {
         unix:LIBS += -lmng
         win32:LIBS += libmng.lib
@@ -47,3 +51,5 @@ contains(QT_CONFIG, system-zlib) {
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001E619
diff --git a/src/plugins/imageformats/mng/qmnghandler.cpp b/src/plugins/imageformats/mng/qmnghandler.cpp
index 9ac9b7d604..297a2cc884 100644
--- a/src/plugins/imageformats/mng/qmnghandler.cpp
+++ b/src/plugins/imageformats/mng/qmnghandler.cpp
@@ -375,8 +375,6 @@ QMngHandler::QMngHandler()
 
 QMngHandler::~QMngHandler()
 {
-    Q_D(QMngHandler);
-    delete d;
 }
 
 /*! \reimp */
diff --git a/src/plugins/imageformats/mng/qmnghandler.h b/src/plugins/imageformats/mng/qmnghandler.h
index b017134b1c..b9e37bf235 100644
--- a/src/plugins/imageformats/mng/qmnghandler.h
+++ b/src/plugins/imageformats/mng/qmnghandler.h
@@ -42,6 +42,7 @@
 #ifndef QMNGHANDLER_H
 #define QMNGHANDLER_H
 
+#include <QtCore/qscopedpointer.h>
 #include <QtGui/qimageiohandler.h>
 
 QT_BEGIN_NAMESPACE
@@ -74,7 +75,7 @@ class QMngHandler : public QImageIOHandler
 
     private:
     Q_DECLARE_PRIVATE(QMngHandler)
-    QMngHandlerPrivate *d_ptr;
+    QScopedPointer<QMngHandlerPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro
index 747d556216..bcf4c21ddf 100644
--- a/src/plugins/imageformats/svg/svg.pro
+++ b/src/plugins/imageformats/svg/svg.pro
@@ -9,3 +9,5 @@ QT += xml svg
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001E618
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index 8930cf3c25..312f99c4cc 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -56,6 +56,9 @@ contains(QT_CONFIG, system-tiff) {
             wince*: {
                SOURCES += ../../../corelib/kernel/qfunctions_wince.cpp
             }
+            symbian*: {
+               SOURCES += ../../../3rdparty/libtiff/port/lfind.c
+            }
 }
 
 contains(QT_CONFIG, system-zlib) {
@@ -68,3 +71,5 @@ contains(QT_CONFIG, system-zlib) {
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target
+
+symbian:TARGET.UID3=0x2001E617
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index cf4edf1b13..76056a3277 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,12 +1,13 @@
 TEMPLATE = subdirs
 
 SUBDIRS	*= accessible imageformats sqldrivers iconengines script
-unix {
+unix:!symbian {
         contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs
 } else {
         SUBDIRS *= codecs
 }
 !embedded:SUBDIRS *= graphicssystems
 embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
-!win32:!embedded:!mac:SUBDIRS *= inputmethods
+!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods
+symbian:SUBDIRS += s60
 contains(QT_CONFIG, phonon): SUBDIRS *= phonon
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index 82a1459602..b14f839749 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -13,3 +13,9 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 include(../qt_targets.pri)
 
 wince*:LIBS += $$QMAKE_LIBS_GUI
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+    TARGET.CAPABILITY = All -Tcb        
+    load(armcc_warnings)
+}
diff --git a/src/plugins/s60/3_1/3_1.pro b/src/plugins/s60/3_1/3_1.pro
new file mode 100644
index 0000000000..568a33ccf1
--- /dev/null
+++ b/src/plugins/s60/3_1/3_1.pro
@@ -0,0 +1,8 @@
+include(../s60pluginbase.pri)
+
+TARGET  = qts60plugin_3_1
+
+SOURCES += ../src/qlocale_3_1.cpp \
+    ../src/qdesktopservices_3_1.cpp
+
+TARGET.UID3=0x2001E620
diff --git a/src/plugins/s60/3_2/3_2.pro b/src/plugins/s60/3_2/3_2.pro
new file mode 100644
index 0000000000..97409d3f86
--- /dev/null
+++ b/src/plugins/s60/3_2/3_2.pro
@@ -0,0 +1,15 @@
+include(../s60pluginbase.pri)
+
+TARGET  = qts60plugin_3_2
+
+contains(S60_VERSION, 3.1) {
+    SOURCES += ../src/qlocale_3_1.cpp \
+        ../src/qdesktopservices_3_1.cpp
+} else {
+    SOURCES += ../src/qlocale_3_2.cpp \
+        ../src/qdesktopservices_3_2.cpp
+    LIBS += -ldirectorylocalizer
+    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+}
+
+TARGET.UID3=0x2001E621
diff --git a/src/plugins/s60/5_0/5_0.pro b/src/plugins/s60/5_0/5_0.pro
new file mode 100644
index 0000000000..878a466a37
--- /dev/null
+++ b/src/plugins/s60/5_0/5_0.pro
@@ -0,0 +1,15 @@
+include(../s60pluginbase.pri)
+
+TARGET  = qts60plugin_5_0
+
+contains(S60_VERSION, 3.1) {
+    SOURCES += ../src/qlocale_3_1.cpp \
+        ../src/qdesktopservices_3_1.cpp
+} else {
+    SOURCES += ../src/qlocale_3_2.cpp \
+        ../src/qdesktopservices_3_2.cpp
+    LIBS += -ldirectorylocalizer    
+    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+}
+
+TARGET.UID3=0x2001E622
diff --git a/src/plugins/s60/bwins/qts60pluginu.def b/src/plugins/s60/bwins/qts60pluginu.def
new file mode 100644
index 0000000000..549f71f138
--- /dev/null
+++ b/src/plugins/s60/bwins/qts60pluginu.def
@@ -0,0 +1,7 @@
+EXPORTS
+	?defaultFormatL@@YAXAAVTTime@@AAVTDes16@@ABVTDesC16@@ABVTLocale@@@Z @ 1 NONAME ; void defaultFormatL(class TTime &, class TDes16 &, class TDesC16 const &, class TLocale const &)
+	?defaultGetTimeFormatSpec@@YA?AVTPtrC16@@AAVTExtendedLocale@@@Z @ 2 NONAME ; class TPtrC16 defaultGetTimeFormatSpec(class TExtendedLocale &)
+	?defaultGetLongDateFormatSpec@@YA?AVTPtrC16@@AAVTExtendedLocale@@@Z @ 3 NONAME ; class TPtrC16 defaultGetLongDateFormatSpec(class TExtendedLocale &)
+	?defaultGetShortDateFormatSpec@@YA?AVTPtrC16@@AAVTExtendedLocale@@@Z @ 4 NONAME ; class TPtrC16 defaultGetShortDateFormatSpec(class TExtendedLocale &)
+	?localizedDirectoryName@@YA?AVQString@@AAV1@@Z @ 5 NONAME ; class QString localizedDirectoryName(class QString &)
+
diff --git a/src/plugins/s60/eabi/qts60pluginu.def b/src/plugins/s60/eabi/qts60pluginu.def
new file mode 100644
index 0000000000..a433a5d30f
--- /dev/null
+++ b/src/plugins/s60/eabi/qts60pluginu.def
@@ -0,0 +1,7 @@
+EXPORTS
+	_Z14defaultFormatLR5TTimeR6TDes16RK7TDesC16RK7TLocale @ 1 NONAME
+	_Z24defaultGetTimeFormatSpecR15TExtendedLocale @ 2 NONAME
+	_Z28defaultGetLongDateFormatSpecR15TExtendedLocale @ 3 NONAME
+	_Z29defaultGetShortDateFormatSpecR15TExtendedLocale @ 4 NONAME
+	_Z22localizedDirectoryNameR7QString @ 5 NONAME
+
diff --git a/src/plugins/s60/s60.pro b/src/plugins/s60/s60.pro
new file mode 100644
index 0000000000..8ae639c82b
--- /dev/null
+++ b/src/plugins/s60/s60.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+symbian:SUBDIRS = 3_1 3_2 5_0
diff --git a/src/plugins/s60/s60pluginbase.pri b/src/plugins/s60/s60pluginbase.pri
new file mode 100644
index 0000000000..62100f929a
--- /dev/null
+++ b/src/plugins/s60/s60pluginbase.pri
@@ -0,0 +1,15 @@
+# Note: These version based 'plugins' are not an actual Qt plugins, 
+# they are just regular runtime loaded libraries
+include(../../qpluginbase.pri)
+
+CONFIG  -= plugin
+MMP_RULES -= EXPORTUNFROZEN
+
+defBlock = \
+    "$${LITERAL_HASH}ifdef WINSCW" \
+    "DEFFILE ../bwins/qts60plugin.def" \
+    "$${LITERAL_HASH}else" \
+    "DEFFILE ../eabi/qts60plugin.def" \
+    "$${LITERAL_HASH}endif"
+
+MMP_RULES += defBlock
\ No newline at end of file
diff --git a/src/plugins/s60/src/qdesktopservices_3_1.cpp b/src/plugins/s60/src/qdesktopservices_3_1.cpp
new file mode 100644
index 0000000000..0551a74297
--- /dev/null
+++ b/src/plugins/s60/src/qdesktopservices_3_1.cpp
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qglobal.h>
+#include <qstring.h>
+
+EXPORT_C QString localizedDirectoryName(QString&)
+{
+    qWarning("QDesktopServices::displayName() not implemented for this platform version");
+    return QString();
+}
+
diff --git a/src/plugins/s60/src/qdesktopservices_3_2.cpp b/src/plugins/s60/src/qdesktopservices_3_2.cpp
new file mode 100644
index 0000000000..cbdc81064a
--- /dev/null
+++ b/src/plugins/s60/src/qdesktopservices_3_2.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <private/qcore_symbian_p.h>
+#include <qstring.h>
+#include <qdir.h>
+
+#ifdef Q_WS_S60
+#include <e32base.h>                 // CBase -> Required by cdirectorylocalizer.h
+#include <cdirectorylocalizer.h>     // CDirectoryLocalizer
+
+EXPORT_C QString localizedDirectoryName(QString& rawPath)
+{
+    QString ret;
+
+    TRAPD(err,
+        CDirectoryLocalizer* localizer = CDirectoryLocalizer::NewL();
+        CleanupStack::PushL(localizer);
+        localizer->SetFullPath(qt_QString2TPtrC(QDir::toNativeSeparators(rawPath)));
+        if(localizer->IsLocalized()){
+            TPtrC locName(localizer->LocalizedName());
+            ret = qt_TDesC2QStringL(locName);
+        }
+        CleanupStack::PopAndDestroy(localizer);
+    )
+
+    if (err != KErrNone)
+        ret = QString();
+
+    return ret;
+}
+#else
+
+EXPORT_C QString localizedDirectoryName(QString& /* rawPath */)
+{
+    qWarning("QDesktopServices::displayName() not implemented for this platform version");
+    return QString();
+}
+#endif
+
diff --git a/src/plugins/s60/src/qlocale_3_1.cpp b/src/plugins/s60/src/qlocale_3_1.cpp
new file mode 100644
index 0000000000..b2e6a5db79
--- /dev/null
+++ b/src/plugins/s60/src/qlocale_3_1.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <e32std.h>
+
+EXPORT_C void defaultFormatL(TTime&, TDes& des, const TDesC&, const TLocale&)
+{
+    des.Zero();
+}
+
+EXPORT_C TPtrC defaultGetTimeFormatSpec(TExtendedLocale&)
+{
+    return TPtrC(KNullDesC);
+}
+
+EXPORT_C TPtrC defaultGetLongDateFormatSpec(TExtendedLocale&)
+{
+    return TPtrC(KNullDesC);
+}
+
+EXPORT_C TPtrC defaultGetShortDateFormatSpec(TExtendedLocale&)
+{
+    return TPtrC(KNullDesC);
+}
diff --git a/src/plugins/s60/src/qlocale_3_2.cpp b/src/plugins/s60/src/qlocale_3_2.cpp
new file mode 100644
index 0000000000..7a3a7e5dfb
--- /dev/null
+++ b/src/plugins/s60/src/qlocale_3_2.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <exception>
+#include <e32std.h>
+#include <e32base.h>
+
+EXPORT_C TPtrC defaultGetLongDateFormatSpec(TExtendedLocale& locale)
+{
+    return locale.GetLongDateFormatSpec();
+}
+
+EXPORT_C TPtrC defaultGetShortDateFormatSpec(TExtendedLocale& locale)
+{
+    return locale.GetShortDateFormatSpec();
+}
+
+EXPORT_C TPtrC defaultGetTimeFormatSpec(TExtendedLocale& locale)
+{
+    return locale.GetTimeFormatSpec();
+}
+
+EXPORT_C void defaultFormatL(TTime& time, TDes& des, const TDesC& format, const TLocale& locale)
+{
+    time.FormatL(des, format, locale);
+}
diff --git a/src/plugins/sqldrivers/sqldrivers.pro b/src/plugins/sqldrivers/sqldrivers.pro
index 39c58d4f2b..2bd5f2c18c 100644
--- a/src/plugins/sqldrivers/sqldrivers.pro
+++ b/src/plugins/sqldrivers/sqldrivers.pro
@@ -9,3 +9,7 @@ contains(sql-plugins, db2)	: SUBDIRS += db2
 contains(sql-plugins, sqlite)	: SUBDIRS += sqlite
 contains(sql-plugins, sqlite2)	: SUBDIRS += sqlite2
 contains(sql-plugins, ibase)	: SUBDIRS += ibase
+
+contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+    symbian:contains(CONFIG, system-sqlite): SUBDIRS += sqlite_symbian
+    }
diff --git a/src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip b/src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip
new file mode 100644
index 0000000000..923cca4e47
--- /dev/null
+++ b/src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
new file mode 100644
index 0000000000..057434102b
--- /dev/null
+++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
@@ -0,0 +1,6 @@
+# Use subdirs template to suppress generation of unnecessary files
+TEMPLATE = subdirs
+
+# We just want to extract the zip file containing sqlite binaries for Symbian
+BLD_INF_RULES.prj_exports +=  ":zip SQLite3_v9.2.zip"
+
diff --git a/src/qbase.pri b/src/qbase.pri
index 0ab04e61f0..1fb74276e9 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -89,6 +89,13 @@ win32 {
     INCLUDEPATH += tmp
     !static: DEFINES+=QT_MAKEDLL
 }
+symbian {
+    !static {
+        DEFINES+=QT_MAKEDLL
+        TARGET.CAPABILITY = All -Tcb        
+    }
+    load(armcc_warnings)
+}
 win32-borland:INCLUDEPATH += kernel
 
 aix-g++* {
@@ -110,7 +117,7 @@ embedded:DEPENDPATH += ;$$EMBEDDED_H
 #install directives
 include(qt_install.pri)
 
-unix {
+unix:!symbian {
    CONFIG     += create_libtool create_pc explicitlib
    QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS]
    QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS]
@@ -130,7 +137,7 @@ unix {
 }
 
 contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
-DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
+DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
 contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT
 DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code
 
diff --git a/src/qt3support/itemviews/q3table.cpp b/src/qt3support/itemviews/q3table.cpp
index 6c3e90c191..9d1ae978ef 100644
--- a/src/qt3support/itemviews/q3table.cpp
+++ b/src/qt3support/itemviews/q3table.cpp
@@ -166,6 +166,7 @@ private:
     QTimer *stretchTimer, *widgetStretchTimer;
     Q3TableHeaderPrivate *d;
 
+    Q_DISABLE_COPY(Q3TableHeader)
 };
 
 #ifdef _WS_QWS_
diff --git a/src/qt3support/other/q3accel.cpp b/src/qt3support/other/q3accel.cpp
index 71037fa870..61d26bc809 100644
--- a/src/qt3support/other/q3accel.cpp
+++ b/src/qt3support/other/q3accel.cpp
@@ -206,7 +206,7 @@ bool Q_COMPAT_EXPORT qt_tryComposeUnicode(QWidget* w, QKeyEvent*  e){
 void Q3AccelManager::setFuncPtr() {
     if (qApp->d_func()->qt_compat_used)
         return;
-    QApplicationPrivate *data = static_cast<QApplicationPrivate*>(qApp->d_ptr);
+    QApplicationPrivate *data = static_cast<QApplicationPrivate*>(qApp->d_ptr.data());
     data->qt_tryAccelEvent = qt_tryAccelEvent;
     data->qt_tryComposeUnicode = qt_tryComposeUnicode;
     data->qt_dispatchAccelEvent = qt_dispatchAccelEvent;
diff --git a/src/qt3support/painting/q3painter.h b/src/qt3support/painting/q3painter.h
index a6f733df15..3bb80d7555 100644
--- a/src/qt3support/painting/q3painter.h
+++ b/src/qt3support/painting/q3painter.h
@@ -82,6 +82,8 @@ public:
 
 private:
     QRect adjustedRectangle(const QRect &r);
+    
+    Q_DISABLE_COPY(Q3Painter)
 };
 
 void inline Q3Painter::drawRect(const QRect &r)
diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby
new file mode 100644
index 0000000000..8a0e03cc41
--- /dev/null
+++ b/src/s60installs/qt.iby
@@ -0,0 +1,102 @@
+#ifndef QT_IBY
+#define QT_IBY
+
+#include <bldvariant.hrh>
+
+// Dependancies for more than one module
+#include <base.iby>
+#include <openenv.iby> // QtCore, QtGui, QtNetwork, QtOpenGL, QSvgIconEngine, 
+#include <cone.iby> // QtGui, QtOpenGL
+#include <stdcpp.iby> // for std C++ support
+
+// QtGui dependancies
+#include <bafl.iby>
+#include <store.iby>
+#include <fntstore.iby>
+#include <ecom.iby>
+#include <fontutils.iby>
+#include <fepbase.iby>
+#include <fbserv.iby>
+#include <bitgdi.iby>
+#include <gdi.iby>
+#include <wserv.iby>
+#include <apparc.iby>
+#include <uikon.iby>
+#include <etext.iby>
+#include <emime.iby>
+#include <eikstd.iby>
+#include <mmf.iby>
+#include <avkon.iby>
+#include <commonui.iby>
+#include <platformenv.iby>
+#include <senduiservices.iby>
+#include <aknicon.iby>
+#include <aknskins.iby>
+
+// QtNetwork dependancies
+#include <esock_core.iby>
+#include <insock.iby>
+
+// QtOpenGL dependancies
+///@todo Problem here as we need libegl.dll and libglesv2.dll but they may come from a variety of places
+/// depending on the platform we're on
+
+#warning("qt.iby: hack - BINARY_SELECTION_ORDER really needs to be at the baseport/device level as it depends on the device type");
+BINARY_SELECTION_ORDER ARMV6,ARMV5 // hack - this really needs to be at the baseport/device level as it depends on the device type
+
+file=ABI_DIR\BUILD_DIR\QtCore.dll            SHARED_LIB_DIR\QtCore.dll       PAGED
+file=ABI_DIR\BUILD_DIR\QtGui.dll             SHARED_LIB_DIR\QtGui.dll        PAGED
+file=ABI_DIR\BUILD_DIR\QtOpenGL.dll          SHARED_LIB_DIR\QtOpenGL.dll     PAGED
+file=ABI_DIR\BUILD_DIR\QtOpenVG.dll          SHARED_LIB_DIR\QtOpenVG.dll     PAGED
+file=ABI_DIR\BUILD_DIR\QtSvg.dll             SHARED_LIB_DIR\QtSvg.dll        PAGED
+file=ABI_DIR\BUILD_DIR\QtXml.dll             SHARED_LIB_DIR\QtXml.dll        PAGED
+file=ABI_DIR\BUILD_DIR\QtNetwork.dll         SHARED_LIB_DIR\QtNetwork.dll    PAGED
+file=ABI_DIR\BUILD_DIR\QtScript.dll          SHARED_LIB_DIR\QtScript.dll     PAGED
+file=ABI_DIR\BUILD_DIR\QtTest.dll            SHARED_LIB_DIR\QtTest.dll       PAGED
+
+// imageformats
+file=ABI_DIR\BUILD_DIR\qgif.dll              SHARED_LIB_DIR\qgif.dll         PAGED
+file=ABI_DIR\BUILD_DIR\qico.dll              SHARED_LIB_DIR\qico.dll         PAGED
+file=ABI_DIR\BUILD_DIR\qjpeg.dll             SHARED_LIB_DIR\qjpeg.dll        PAGED
+file=ABI_DIR\BUILD_DIR\qmng.dll              SHARED_LIB_DIR\qmng.dll         PAGED
+file=ABI_DIR\BUILD_DIR\qsvg.dll              SHARED_LIB_DIR\qsvg.dll         PAGED
+file=ABI_DIR\BUILD_DIR\qtiff.dll             SHARED_LIB_DIR\qtiff.dll        PAGED
+
+// codecs
+file=ABI_DIR\BUILD_DIR\qcncodecs.dll         SHARED_LIB_DIR\qcncodecs.dll    PAGED
+file=ABI_DIR\BUILD_DIR\qjpcodecs.dll         SHARED_LIB_DIR\qjpcodecs.dll    PAGED
+file=ABI_DIR\BUILD_DIR\qkrcodecs.dll         SHARED_LIB_DIR\qkrcodecs.dll    PAGED
+file=ABI_DIR\BUILD_DIR\qtwcodecs.dll         SHARED_LIB_DIR\qtwcodecs.dll    PAGED
+
+// iconengines
+file=ABI_DIR\BUILD_DIR\qsvgicon.dll          SHARED_LIB_DIR\qsvgicon.dll     PAGED
+
+// graphicssystems
+file=ABI_DIR\BUILD_DIR\qvggraphicssystem.dll SHARED_LIB_DIR\qvggraphicssystem.dll     PAGED
+
+S60_APP_RESOURCE(s60main)
+
+// imageformats stubs
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qgif.qtplugin         resource\qt\plugins\imageformats\qgif.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qico.qtplugin         resource\qt\plugins\imageformats\qico.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qjpeg.qtplugin        resource\qt\plugins\imageformats\qjpeg.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qmng.qtplugin         resource\qt\plugins\imageformats\qmng.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qsvg.qtplugin         resource\qt\plugins\imageformats\qsvg.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qtiff.qtplugin        resource\qt\plugins\imageformats\qtiff.qtplugin
+
+// codecs stubs
+data=\epoc32\winscw\c\resource\qt\plugins\codecs\qcncodecs.qtplugin          resource\qt\plugins\codecs\qcncodecs.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\codecs\qjpcodecs.qtplugin          resource\qt\plugins\codecs\qjpcodecs.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\codecs\qkrcodecs.qtplugin          resource\qt\plugins\codecs\qkrcodecs.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\codecs\qtwcodecs.qtplugin          resource\qt\plugins\codecs\qtwcodecs.qtplugin
+
+// iconengines stubs
+data=\epoc32\winscw\c\resource\qt\plugins\iconengines\qsvgicon.qtplugin      resource\qt\plugins\iconengines\qsvgicon.qtplugin
+
+// graphicssystems
+data=\epoc32\winscw\c\resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin      resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin
+
+// Stub sis file
+data=ZSYSTEM\install\qt.sis    System\Install\qt.sis
+
+#endif // __QT_IBY__
diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro
new file mode 100644
index 0000000000..bd5c67faea
--- /dev/null
+++ b/src/s60installs/qt_libs.pro
@@ -0,0 +1,80 @@
+# Use subdirs template to suppress generation of unnecessary files
+TEMPLATE = subdirs
+
+symbian: {
+    load(data_caging_paths)
+
+    SUBDIRS=
+    TARGET = "QtLibs pre-release"
+    TARGET.UID3 = 0x2001E61C
+    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+
+    qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc 
+    qtresources.path = $$APP_RESOURCE_DIR
+
+    qtlibraries.sources = \ 
+        QtCore.dll \
+        QtXml.dll \
+        QtGui.dll \
+        QtNetwork.dll \
+        QtScript.dll \
+        QtTest.dll \
+        QtSql.dll \
+        qts60plugin_3_1.dll \
+        qts60plugin_3_2.dll \
+        qts60plugin_5_0.dll
+        
+
+    # TODO: This should be conditional in PKG file, see commented code below
+    # However we don't yet have such mechanism in place
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        contains(CONFIG, system-sqlite): qtlibraries.sources += sqlite3.dll 
+    }    
+    
+    #; EXISTS statement does not resolve !. Lets check the most common drives
+    #IF NOT EXISTS("c:\sys\bin\sqlite3.dll") AND NOT EXISTS("e:\sys\bin\sqlite3.dll") AND NOT EXISTS("z:\sys\bin\sqlite3.dll")
+    #"\Epoc32\release\armv5\UREL\sqlite3.dll"-"!:\sys\bin\sqlite3.dll"
+    #ENDIF      
+
+    qtlibraries.path = /sys/bin
+    qtlibraries.depends = "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}"
+    contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
+        qtlibraries.depends += "(0x200110CB), 1, 5, 1, {\"Open C LIBSSL Common\"}"
+    }
+    contains(CONFIG, stl) {
+        qtlibraries.depends += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}"
+    }
+    
+    !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
+    imageformats_plugins.path = $$QT_PLUGINS_BASE_DIR/imageformats
+
+    codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
+    codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
+ 
+    DEPLOYMENT += qtresources qtlibraries imageformats_plugins codecs_plugins graphicssystems_plugins
+
+    contains(QT_CONFIG, svg): {	
+       qtlibraries.sources += QtSvg.dll
+       imageformats_plugins.sources += qsvg.dll
+       iconengines_plugins.sources = qsvgicon.dll
+       iconengines_plugins.path = $$QT_PLUGINS_BASE_DIR/iconengines
+       DEPLOYMENT += iconengines_plugins
+    }
+
+    contains(QT_CONFIG, phonon): {
+       qtlibraries.sources += Phonon.dll
+    }    
+
+    graphicssystems_plugins.path = $$QT_PLUGINS_BASE_DIR/graphicssystems
+    contains(QT_CONFIG, openvg) {
+        qtlibraries.sources = QtOpenVG.dll
+        graphicssystems_plugins.sources += qvggraphicssystem.dll
+    }
+
+    BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
+    BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CORE_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)"
+}
diff --git a/src/s60installs/qtdemoapps.iby b/src/s60installs/qtdemoapps.iby
new file mode 100644
index 0000000000..d888135d8c
--- /dev/null
+++ b/src/s60installs/qtdemoapps.iby
@@ -0,0 +1,15 @@
+#ifndef QTDEMOAPPS_IBY
+#define QTDEMOAPPS_IBY
+
+// A subset of Qt demo & example applications
+
+// Note that star requires OpenVG and the Qt OpenVG paint engine
+S60_APP_EXE(star)
+S60_APP_RESOURCE(star)
+data=\epoc32\data\Z\private\10003a3f\import\Apps\star_reg.rsc   \private\10003a3f\import\apps\star_reg.rsc
+
+S60_APP_EXE(wiggly)
+S60_APP_RESOURCE(wiggly)
+data=\epoc32\data\Z\private\10003a3f\import\Apps\wiggly_reg.rsc   \private\10003a3f\import\apps\wiggly_reg.rsc
+
+#endif // QTDEMOAPPS_IBY
diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp
new file mode 100644
index 0000000000..d7daf4a716
--- /dev/null
+++ b/src/s60main/qts60main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// INCLUDE FILES
+#include <exception>
+#include <eikstart.h>
+#include "qts60mainapplication.h"
+
+/**
+ * factory function to create the QtS60Main application class
+ */
+LOCAL_C CApaApplication* NewApplication()
+	{
+	return new CQtS60MainApplication;
+	}
+
+/**
+ * A normal Symbian OS executable provides an E32Main() function which is
+ * called by the operating system to start the program.
+ */
+GLDEF_C TInt E32Main()
+	{
+	return EikStart::RunApplication( NewApplication );
+	}
+
diff --git a/src/s60main/qts60main_mcrt0.cpp b/src/s60main/qts60main_mcrt0.cpp
new file mode 100644
index 0000000000..49a47bdb8a
--- /dev/null
+++ b/src/s60main/qts60main_mcrt0.cpp
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// MCRT0.CPP
+//
+// © Portions copyright (c) 2005-2006 Nokia Corporation.  All rights reserved.
+// Copyright (c) Symbian Software Ltd 1997-2004.  All rights reserved.
+//
+
+// EPOC32 version of crt0.c for C programs which always want multi-threaded support
+
+#include <e32std.h>
+#include <e32base.h>
+#include "estlib.h"
+
+#ifdef __ARMCC__
+__asm int CallMain(int argc, char *argv[], char *envp[])
+{
+       import main
+       code32
+       b main
+}
+#define CALLMAIN(argc, argv, envp) CallMain(argc, argv, envp)
+#else
+extern "C" int main (int argc, char *argv[], char *envp[]);
+#define CALLMAIN(argc, argv, envp) main(argc, argv, envp)
+#endif
+
+// Dummy function to handle GCCE toolchain problem
+extern "C" GLDEF_C int __GccGlueInit()
+{
+    return 0;
+}
+
+extern "C" IMPORT_C void exit (int ret);
+
+GLDEF_C TInt QtMainWrapper()
+{
+    int argc=0;
+    char **argv=0;
+    char **envp=0;
+    // get args & environment
+    __crt0(argc,argv,envp);
+    CleanupArrayDelete<char*>::PushL(argv);
+    CleanupArrayDelete<char*>::PushL(envp);
+    //Call user(application)'s main
+	int ret = 0;
+	try
+		{
+		ret = CALLMAIN(argc, argv, envp);
+    	}
+    catch (...)
+    	{
+    	User::Leave(KErrGeneral);
+    	}
+    CleanupStack::PopAndDestroy(2,argv);
+    return ret;
+}
+
+
+#ifdef __GCC32__
+
+/* stub function inserted into main() by GCC */
+extern "C" void __gccmain (void) {}
+
+/* Default GCC entrypoint */
+extern "C" TInt _mainCRTStartup (void) 
+{
+    extern TInt _E32Startup();
+    return _E32Startup();
+}
+
+#endif /* __GCC32__ */
+
+#ifdef __EABI__
+
+// standard entrypoint for C runtime, expected by some linkers
+// Symbian OS does not currently use this function
+extern "C" void __main() {}
+#endif
diff --git a/src/s60main/qts60mainapplication.cpp b/src/s60main/qts60mainapplication.cpp
new file mode 100644
index 0000000000..2fada3d51f
--- /dev/null
+++ b/src/s60main/qts60mainapplication.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// INCLUDE FILES
+#include <exception>
+#include "qts60maindocument.h"
+#include "qts60mainapplication.h"
+#include <bautils.h>
+#include <coemain.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+
+_LIT( KQtWrapperResourceFile,"\\resource\\apps\\s60main.rsc" );
+
+// -----------------------------------------------------------------------------
+// CQtS60MainApplication::CreateDocumentL()
+// Creates CApaDocument object
+// -----------------------------------------------------------------------------
+//
+CApaDocument* CQtS60MainApplication::CreateDocumentL()
+    {
+    // Create an QtS60Main document, and return a pointer to it
+    return (static_cast<CApaDocument*>( CQtS60MainDocument::NewL( *this ) ) );
+    }
+
+// -----------------------------------------------------------------------------
+// CQtS60MainApplication::AppDllUid()
+// Returns application UID
+// -----------------------------------------------------------------------------
+//
+TUid CQtS60MainApplication::AppDllUid() const
+    {
+    // Return the UID for the QtS60Main application
+    return ProcessUid();
+    }
+
+// -----------------------------------------------------------------------------
+// CQtS60MainApplication::ResourceFileName()
+// Returns application resource filename
+// -----------------------------------------------------------------------------
+//
+TFileName CQtS60MainApplication::ResourceFileName() const
+    {
+    TFindFile finder(iCoeEnv->FsSession());
+    TInt err = finder.FindByDir(KQtWrapperResourceFile, KNullDesC);
+    if (err == KErrNone)
+        return finder.File();
+    return KNullDesC();
+    }
+
+
+// End of File
+
diff --git a/src/s60main/qts60mainapplication.h b/src/s60main/qts60mainapplication.h
new file mode 100644
index 0000000000..70b6909ae1
--- /dev/null
+++ b/src/s60main/qts60mainapplication.h
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef __QtS60MainAPPLICATION_H__
+#define __QtS60MainAPPLICATION_H__
+
+// INCLUDES
+#include <aknapp.h>
+
+// CLASS DECLARATION
+
+static TUid ProcessUid()
+    {
+    RProcess me;
+    TSecureId securId = me.SecureId();
+    me.Close();
+    return securId.operator TUid();
+    }
+
+/**
+* CQtS60MainApplication application class.
+* Provides factory to create concrete document object.
+* An instance of CQtS60MainApplication is the application part of the
+* AVKON application framework for the QtS60Main example application.
+*/
+class CQtS60MainApplication : public CAknApplication
+    {
+    public: // Functions from base classes
+
+        /**
+        * From CApaApplication, AppDllUid.
+        * @return Application's UID (KUidQtS60MainApp).
+        */
+        TUid AppDllUid() const;
+
+        /**
+        * From CApaApplication, ResourceFileName
+        * @return Application's resource filename (KUidQtS60MainApp).
+        */
+        TFileName ResourceFileName() const;
+
+    protected: // Functions from base classes
+
+        /**
+        * From CApaApplication, CreateDocumentL.
+        * Creates CQtS60MainDocument document object. The returned
+        * pointer in not owned by the CQtS60MainApplication object.
+        * @return A pointer to the created document object.
+        */
+        CApaDocument* CreateDocumentL();
+    };
+
+#endif // __QtS60MainAPPLICATION_H__
+
+// End of File
+
diff --git a/src/s60main/qts60mainappui.cpp b/src/s60main/qts60mainappui.cpp
new file mode 100644
index 0000000000..85badcc127
--- /dev/null
+++ b/src/s60main/qts60mainappui.cpp
@@ -0,0 +1,210 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// INCLUDE FILES
+#include <exception>
+#include <avkon.hrh>
+#include <eikmenub.h>
+#include <eikmenup.h>
+#include <barsread.h>
+#include <s60main.rsg>
+#include <avkon.rsg>
+
+#include "qts60mainappui.h"
+#include <QtGui/qapplication.h>
+#include <QtGui/qmenu.h>
+#include <QtGui/private/qt_s60_p.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+
+// -----------------------------------------------------------------------------
+// CQtS60MainAppUi::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CQtS60MainAppUi::ConstructL()
+{
+    // Initialise app UI with standard value.
+    // ENoAppResourceFile and ENonStandardResourceFile makes UI to work without
+    // resource files in most SDKs. S60 3rd FP1 public seems to require resource file
+    // even these flags are defined
+    BaseConstructL(CAknAppUi::EAknEnableSkin);
+
+    CEikButtonGroupContainer* nativeContainer = Cba();
+    nativeContainer->SetCommandSetL(R_AVKON_SOFTKEYS_EMPTY_WITH_IDS);
+    
+    // Create async callback to call Qt main,
+    // this is required to give S60 app FW to finish starting correctly
+    TCallBack callBack( OpenCMainStaticCallBack, this );
+    iAsyncCallBack = new(ELeave) CAsyncCallBack( callBack, CActive::EPriorityIdle );
+    iAsyncCallBack->Call();
+}
+
+// -----------------------------------------------------------------------------
+// CQtS60MainAppUi::CQtS60MainAppUi()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+CQtS60MainAppUi::CQtS60MainAppUi()
+{
+    // No implementation required
+}
+
+// -----------------------------------------------------------------------------
+// CQtS60MainAppUi::~CQtS60MainAppUi()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CQtS60MainAppUi::~CQtS60MainAppUi()
+{
+    delete iAsyncCallBack;
+}
+
+// -----------------------------------------------------------------------------
+// CQtS60MainAppUi::HandleCommandL()
+// Takes care of command handling.
+// -----------------------------------------------------------------------------
+//
+void CQtS60MainAppUi::HandleCommandL( TInt aCommand )
+{
+    if (qApp)
+        qApp->symbianHandleCommand(aCommand);
+}
+
+// -----------------------------------------------------------------------------
+// CQtS60MainAppUi::HandleResourceChangeL()
+// Takes care of event handling.
+// -----------------------------------------------------------------------------
+//
+void CQtS60MainAppUi::HandleResourceChangeL(TInt aType)
+{
+    CAknAppUi::HandleResourceChangeL(aType);
+    
+    if (qApp)
+        qApp->symbianResourceChange(aType);
+}
+
+void CQtS60MainAppUi::HandleWsEventL(const TWsEvent& aEvent, CCoeControl *control)
+{
+    int result = 0;
+    if (qApp)
+        QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(
+            result = qApp->s60ProcessEvent(const_cast<TWsEvent*>(&aEvent))
+        );
+
+    if (result <= 0)
+        CAknAppUi::HandleWsEventL(aEvent, control);
+}
+
+
+// -----------------------------------------------------------------------------
+//  Called by the framework when the application status pane
+//  size is changed.  Passes the new client rectangle to the
+//  AppView
+// -----------------------------------------------------------------------------
+//
+void CQtS60MainAppUi::HandleStatusPaneSizeChange()
+{
+    HandleResourceChangeL(KInternalStatusPaneChange);
+    HandleStackedControlsResourceChange(KInternalStatusPaneChange);
+}
+
+// -----------------------------------------------------------------------------
+//  Called asynchronously from ConstructL() - passes call to nan static method
+// -----------------------------------------------------------------------------
+//
+TInt CQtS60MainAppUi::OpenCMainStaticCallBack(  TAny* aObject )
+{
+    CQtS60MainAppUi* myObj = static_cast<CQtS60MainAppUi*>( aObject );
+    myObj->OpenCMainCallBack();
+    return 0;
+}
+
+#include "qtS60main_mcrt0.cpp"
+
+// -----------------------------------------------------------------------------
+//  Invokes Qt main, the Qt main will block and when we return from there
+//  application should be closed. -> Call Exit();
+// -----------------------------------------------------------------------------
+//
+void CQtS60MainAppUi::OpenCMainCallBack()
+{
+    TInt ret;
+    TRAPD(err, ret = QtMainWrapper());
+    Q_UNUSED(ret);
+    Q_UNUSED(err);
+    Exit();
+}
+
+void CQtS60MainAppUi::DynInitMenuBarL(TInt, CEikMenuBar *)
+{
+}
+
+void CQtS60MainAppUi::DynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane)
+{
+    if (aResourceId == R_QT_WRAPPERAPP_MENU){
+        if (aMenuPane->NumberOfItemsInPane() <= 1)
+            qt_symbian_show_toplevel(aMenuPane);
+        
+    }
+    else if( aResourceId != R_AVKON_MENUPANE_FEP_DEFAULT && aResourceId != R_AVKON_MENUPANE_EDITTEXT_DEFAULT && aResourceId != R_AVKON_MENUPANE_LANGUAGE_DEFAULT  ){
+        qt_symbian_show_submenu(aMenuPane, aResourceId);
+    }
+}
+
+void CQtS60MainAppUi::RestoreMenuL(CCoeControl* aMenuWindow,TInt aMenuId,TMenuType aMenuType)
+{
+    if ((aMenuId==R_QT_WRAPPERAPP_MENUBAR) || (aMenuId == R_AVKON_MENUPANE_FEP_DEFAULT)) {
+        TResourceReader reader;
+        iCoeEnv->CreateResourceReaderLC(reader,aMenuId);
+        aMenuWindow->ConstructFromResourceL(reader);
+        CleanupStack::PopAndDestroy();
+    }
+
+    if (aMenuType==EMenuPane)
+        DynInitMenuPaneL(aMenuId,(CEikMenuPane*)aMenuWindow);
+    else
+        DynInitMenuBarL(aMenuId,(CEikMenuBar*)aMenuWindow);
+   }
+
+// End of File
+
diff --git a/src/s60main/qts60mainappui.h b/src/s60main/qts60mainappui.h
new file mode 100644
index 0000000000..6bdeb2e64f
--- /dev/null
+++ b/src/s60main/qts60mainappui.h
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef __QtS60MainAPPUI_H__
+#define __QtS60MainAPPUI_H__
+
+// INCLUDES
+#include <aknappui.h>
+
+// FORWARD DECLARATIONS
+
+// CLASS DECLARATION
+/**
+* CQtS60MainAppUi application UI class.
+* Interacts with the user through the UI and request message processing
+* from the handler class
+*/
+class CQtS60MainAppUi : public CAknAppUi
+    {
+    public: // Constructors and destructor
+
+        /**
+        * ConstructL.
+        * 2nd phase constructor.
+        */
+        void ConstructL();
+
+        /**
+        * CQtS60MainAppUi.
+        * C++ default constructor. This needs to be public due to
+        * the way the framework constructs the AppUi
+        */
+        CQtS60MainAppUi();
+
+        /**
+        * ~CQtS60MainAppUi.
+        * Virtual Destructor.
+        */
+        virtual ~CQtS60MainAppUi();
+
+    protected:
+        void RestoreMenuL(CCoeControl* aMenuWindow,TInt aMenuId,TMenuType aMenuType);
+        void DynInitMenuBarL(TInt aResourceId, CEikMenuBar *aMenuBar);
+        void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane);
+
+    private:  // Functions from base classes
+
+        /**
+        * From CEikAppUi, HandleCommandL.
+        * Takes care of command handling.
+        * @param aCommand Command to be handled.
+        */
+        void HandleCommandL( TInt aCommand );
+
+        /**
+        * From CAknAppUi, HandleResourceChangeL
+        * Handles resource change events such as layout switches in global level.
+        * @param aType event type.
+        */
+        void HandleResourceChangeL(TInt aType);
+        
+        /**
+        *  HandleStatusPaneSizeChange.
+        *  Called by the framework when the application status pane
+		*  size is changed.
+        */
+		void HandleStatusPaneSizeChange();
+
+        /**
+        *  Static callback method for invoking Qt main.
+        *  Called asynchronously from ConstructL() - passes call to non static method.
+        */
+        static TInt OpenCMainStaticCallBack(  TAny* aObject );
+
+        /**
+        *  Callback method for invoking Qt main.
+        *  Called from static OpenCMainStaticCallBack.
+        */
+        void OpenCMainCallBack();
+
+    protected:
+        void HandleWsEventL(const TWsEvent& aEvent, CCoeControl* aDestination);
+
+
+    private: // Data
+
+        /**
+        * Async callback object to call Qt main
+        * Owned by CQtS60MainAppUi
+        */
+        CAsyncCallBack* iAsyncCallBack;
+
+    };
+
+#endif // __QtS60MainAPPUI_H__
+
+// End of File
+
diff --git a/src/s60main/qts60maindocument.cpp b/src/s60main/qts60maindocument.cpp
new file mode 100644
index 0000000000..eb7ea4235d
--- /dev/null
+++ b/src/s60main/qts60maindocument.cpp
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// INCLUDE FILES
+#include <exception>
+#include "qts60mainappui.h"
+#include "qts60maindocument.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CQtS60MainDocument::NewL()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CQtS60MainDocument* CQtS60MainDocument::NewL( CEikApplication& aApp )
+    {
+    CQtS60MainDocument* self = NewLC( aApp );
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CQtS60MainDocument::NewLC()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CQtS60MainDocument* CQtS60MainDocument::NewLC( CEikApplication& aApp )
+    {
+    CQtS60MainDocument* self = new ( ELeave ) CQtS60MainDocument( aApp );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CQtS60MainDocument::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CQtS60MainDocument::ConstructL()
+    {
+    // No implementation required
+    }
+
+// -----------------------------------------------------------------------------
+// CQtS60MainDocument::CQtS60MainDocument()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+CQtS60MainDocument::CQtS60MainDocument( CEikApplication& aApp )
+    : CAknDocument( aApp )
+    {
+    // No implementation required
+    }
+
+// ---------------------------------------------------------------------------
+// CQtS60MainDocument::~CQtS60MainDocument()
+// Destructor.
+// ---------------------------------------------------------------------------
+//
+CQtS60MainDocument::~CQtS60MainDocument()
+    {
+    // No implementation required
+    }
+
+// ---------------------------------------------------------------------------
+// CQtS60MainDocument::CreateAppUiL()
+// Constructs CreateAppUi.
+// ---------------------------------------------------------------------------
+//
+CEikAppUi* CQtS60MainDocument::CreateAppUiL()
+    {
+    // Create the application user interface, and return a pointer to it;
+    // the framework takes ownership of this object
+    return ( static_cast <CEikAppUi*> ( new ( ELeave )CQtS60MainAppUi ) );
+    }
+
+// End of File
+
diff --git a/src/s60main/qts60maindocument.h b/src/s60main/qts60maindocument.h
new file mode 100644
index 0000000000..a95e6200f1
--- /dev/null
+++ b/src/s60main/qts60maindocument.h
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef __QTS60MAINDOCUMENT_H__
+#define __QTS60MAINDOCUMENT_H__
+
+// INCLUDES
+#include <akndoc.h>
+
+// FORWARD DECLARATIONS
+class CQtS60MainAppUi;
+class CEikApplication;
+
+
+// CLASS DECLARATION
+
+/**
+* CQtS60MainDocument application class.
+* An instance of class CQtS60MainDocument is the Document part of the
+* AVKON application framework for the QtS60Main application.
+*/
+class CQtS60MainDocument : public CAknDocument
+    {
+    public: // Constructors and destructor
+
+        /**
+        * NewL.
+        * Two-phased constructor.
+        * Construct a CQtS60MainDocument for the AVKON application aApp
+        * using two phase construction, and return a pointer
+        * to the created object.
+        * @param aApp Application creating this document.
+        * @return A pointer to the created instance of CQtS60MainDocument.
+        */
+        static CQtS60MainDocument* NewL( CEikApplication& aApp );
+
+        /**
+        * NewLC.
+        * Two-phased constructor.
+        * Construct a CQtS60MainDocument for the AVKON application aApp
+        * using two phase construction, and return a pointer
+        * to the created object.
+        * @param aApp Application creating this document.
+        * @return A pointer to the created instance of CQtS60MainDocument.
+        */
+        static CQtS60MainDocument* NewLC( CEikApplication& aApp );
+
+        /**
+        * ~CQtS60MainDocument
+        * Virtual Destructor.
+        */
+        virtual ~CQtS60MainDocument();
+
+    public: // Functions from base classes
+
+        /**
+        * CreateAppUiL
+        * From CEikDocument, CreateAppUiL.
+        * Create a CQtS60MainAppUi object and return a pointer to it.
+        * The object returned is owned by the Uikon framework.
+        * @return Pointer to created instance of AppUi.
+        */
+        CEikAppUi* CreateAppUiL();
+
+    private: // Constructors
+
+        /**
+        * ConstructL
+        * 2nd phase constructor.
+        */
+        void ConstructL();
+
+        /**
+        * CQtS60MainDocument.
+        * C++ default constructor.
+        * @param aApp Application creating this document.
+        */
+        CQtS60MainDocument( CEikApplication& aApp );
+
+    };
+
+#endif // __QTS60MAINDOCUMENT_H__
+
+// End of File
+
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
new file mode 100644
index 0000000000..f74943f54b
--- /dev/null
+++ b/src/s60main/s60main.pro
@@ -0,0 +1,55 @@
+# Additional Qt project file for qtmain lib on Symbian
+TEMPLATE = lib
+TARGET	 = qtmain
+DESTDIR	 = $$QMAKE_LIBDIR_QT
+QT       =
+
+CONFIG	+= staticlib warn_on
+CONFIG	-= qt shared
+
+symbian {
+    # Note: UID only needed for ensuring that no filename generation conflicts occur
+    TARGET.UID3 = 0x2001E61F 
+    CONFIG      +=  png zlib
+    CONFIG	-=  jpeg
+    INCLUDEPATH	+=  tmp $$QMAKE_INCDIR_QT/QtCore $$MW_LAYER_SYSTEMINCLUDE
+    SOURCES	 =  qts60main.cpp \
+                    qts60mainapplication.cpp \
+                    qts60mainappui.cpp \
+                    qts60maindocument.cpp
+
+    HEADERS      =  qts60mainapplication.h \
+                    qts60mainappui.h \
+                    qts60maindocument.h
+                    
+    # This block serves the minimalistic resource file for S60 3.1 platforms.                
+    # Note there is no way to ifdef S60 version in mmp file, that is why the resource
+    # file is always compiled for WINSCW
+    minimalAppResource31 = \
+        "START RESOURCE s60main.rss" \
+        "HEADER" \
+        "TARGETPATH resource\apps" \
+        "END"
+    MMP_RULES += minimalAppResource31                   
+
+    # s60main needs to be built in ARM mode for GCCE to work.
+    MMP_RULES+="ALWAYS_BUILD_AS_ARM"
+
+    # staticlib should not have any lib depencies in s60
+    # This seems not to work, some hard coded libs are still added as dependency
+    LIBS =    
+} else {
+    error("$$_FILE_ is intended only for Symbian!")
+}
+
+symbian-abld: {
+    # abld build commands generated resources after the static library is built, and
+    # we have dependency to resource from static lib -> resources need to be generated 
+    # explicitly before library
+    rsgFix2.commands = "-$(DEL_FILE) $(EPOCROOT)Epoc32\Data\z\resource\apps\s60main.rsc >NUL 2>&1"    
+    rsgFix.commands = "-$(ABLD) resource $(PLATFORM) $(CFG) 2>NUL"
+    QMAKE_EXTRA_TARGETS += rsgFix rsgFix2
+    PRE_TARGETDEPS += rsgFix rsgFix2
+}
+
+include(../qbase.pri)
diff --git a/src/s60main/s60main.rss b/src/s60main/s60main.rss
new file mode 100644
index 0000000000..6e8004ccac
--- /dev/null
+++ b/src/s60main/s60main.rss
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Even S60 application have ENoAppResourceFile and ENonStandardResourceFile
+// flags set, the S60 3rd Edition FP1 emulator requires applications to have
+// very minimalistic application resource file, otherwise apps refures to start
+// This file serves the minimalistic resource file for S60 3.1 platforms.
+
+//  RESOURCE IDENTIFIER
+NAME QTMA    // 4 letter ID
+
+//  INCLUDES
+//#include <eikon.rh>
+#include <appinfo.rh>
+#include <eikon.rh>
+#include <avkon.rsg>
+#include <avkon.rh>
+#include <avkon.mbg>
+
+//  RESOURCE DEFINITIONS
+RESOURCE RSS_SIGNATURE
+    {
+    }
+
+RESOURCE TBUF r_default_document_name
+    {
+    buf="QTMA";
+    }
+
+RESOURCE EIK_APP_INFO
+    {
+    menubar = r_qt_wrapperapp_menubar;
+    cba = R_AVKON_SOFTKEYS_EXIT;
+    }
+
+RESOURCE MENU_BAR r_qt_wrapperapp_menubar
+    {
+    titles =
+        {
+        MENU_TITLE { menu_pane = r_qt_wrapperapp_menu; }
+        };
+    }
+
+RESOURCE MENU_PANE r_qt_wrapperapp_menu
+    {
+    }
+// End of File
+
diff --git a/src/script/qscriptable.cpp b/src/script/qscriptable.cpp
index 5da9e95143..455cc98368 100644
--- a/src/script/qscriptable.cpp
+++ b/src/script/qscriptable.cpp
@@ -118,8 +118,6 @@ QScriptable::QScriptable()
 */
 QScriptable::~QScriptable()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
diff --git a/src/script/qscriptable.h b/src/script/qscriptable.h
index 1015a00848..76a0496375 100644
--- a/src/script/qscriptable.h
+++ b/src/script/qscriptable.h
@@ -46,6 +46,8 @@
 
 #ifndef QT_NO_SCRIPT
 
+#include <QtCore/qscopedpointer.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -73,7 +75,7 @@ public:
     QScriptValue argument(int index) const;
 
 private:
-    QScriptablePrivate *d_ptr;
+    QScopedPointer<QScriptablePrivate> d_ptr;
 
     Q_DISABLE_COPY(QScriptable)
     Q_DECLARE_PRIVATE(QScriptable)
diff --git a/src/script/qscriptclass.cpp b/src/script/qscriptclass.cpp
index a964d1bffa..1a0cdfe480 100644
--- a/src/script/qscriptclass.cpp
+++ b/src/script/qscriptclass.cpp
@@ -457,8 +457,6 @@ QScriptClass::QScriptClass(QScriptEngine *engine, QScriptClassPrivate &dd)
 */
 QScriptClass::~QScriptClass()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
diff --git a/src/script/qscriptclass.h b/src/script/qscriptclass.h
index dec53e832d..707047056d 100644
--- a/src/script/qscriptclass.h
+++ b/src/script/qscriptclass.h
@@ -47,6 +47,7 @@
 #ifndef QT_NO_SCRIPT
 
 #include <QtCore/qvariant.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtScript/qscriptvalue.h>
 
 QT_BEGIN_HEADER
@@ -103,7 +104,7 @@ public:
 
 protected:
     QScriptClass(QScriptEngine *engine, QScriptClassPrivate &dd);
-    QScriptClassPrivate *d_ptr;
+    QScopedPointer<QScriptClassPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QScriptClass)
diff --git a/src/script/qscriptclasspropertyiterator.cpp b/src/script/qscriptclasspropertyiterator.cpp
index 88ea2cc620..bb07b08a51 100644
--- a/src/script/qscriptclasspropertyiterator.cpp
+++ b/src/script/qscriptclasspropertyiterator.cpp
@@ -111,8 +111,6 @@ QScriptClassPropertyIterator::QScriptClassPropertyIterator(const QScriptValue &o
 */
 QScriptClassPropertyIterator::~QScriptClassPropertyIterator()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
diff --git a/src/script/qscriptclasspropertyiterator.h b/src/script/qscriptclasspropertyiterator.h
index 03d9c71a7b..1570410e23 100644
--- a/src/script/qscriptclasspropertyiterator.h
+++ b/src/script/qscriptclasspropertyiterator.h
@@ -46,6 +46,7 @@
 
 #ifndef QT_NO_SCRIPT
 
+#include <QtCore/qscopedpointer.h>
 #include <QtScript/qscriptvalue.h>
 
 QT_BEGIN_HEADER
@@ -80,7 +81,7 @@ public:
 
 protected:
     QScriptClassPropertyIterator(const QScriptValue &object, QScriptClassPropertyIteratorPrivate &dd);
-    QScriptClassPropertyIteratorPrivate *d_ptr;
+    QScopedPointer<QScriptClassPropertyIteratorPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QScriptClassPropertyIterator)
diff --git a/src/script/qscriptcontext.cpp b/src/script/qscriptcontext.cpp
index 62d5ea8469..6a3e945d4a 100644
--- a/src/script/qscriptcontext.cpp
+++ b/src/script/qscriptcontext.cpp
@@ -219,8 +219,6 @@ QScriptContext::QScriptContext():
 */
 QScriptContext::~QScriptContext()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
diff --git a/src/script/qscriptcontext.h b/src/script/qscriptcontext.h
index c8094dae62..5a86cba3bd 100644
--- a/src/script/qscriptcontext.h
+++ b/src/script/qscriptcontext.h
@@ -46,6 +46,7 @@
 
 #ifndef QT_NO_SCRIPT
 
+#include <QtCore/qscopedpointer.h>
 #include <QtScript/qscriptvalue.h>
 
 QT_BEGIN_HEADER
@@ -111,7 +112,7 @@ public:
 private:
     QScriptContext();
 
-    QScriptContextPrivate *d_ptr;
+    QScopedPointer<QScriptContextPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptContext)
     Q_DISABLE_COPY(QScriptContext)
diff --git a/src/script/qscriptcontextinfo.cpp b/src/script/qscriptcontextinfo.cpp
index 7590e57d1e..d22ee85ee2 100644
--- a/src/script/qscriptcontextinfo.cpp
+++ b/src/script/qscriptcontextinfo.cpp
@@ -204,13 +204,12 @@ QScriptContextInfoPrivate::~QScriptContextInfoPrivate()
   previously created QScriptContextInfo.
 */
 QScriptContextInfo::QScriptContextInfo(const QScriptContext *context)
+    : d_ptr(0)
 {
     if (context) {
-        d_ptr = new QScriptContextInfoPrivate(context);
+        d_ptr.data_ptr() = new QScriptContextInfoPrivate(context);
         d_ptr->q_ptr = this;
         d_ptr->ref.ref();
-    } else {
-        d_ptr = 0;
     }
 }
 
@@ -218,7 +217,7 @@ QScriptContextInfo::QScriptContextInfo(const QScriptContext *context)
   Constructs a new QScriptContextInfo from the \a other info.
 */
 QScriptContextInfo::QScriptContextInfo(const QScriptContextInfo &other)
-    : d_ptr(other.d_ptr)
+    : d_ptr(other.d_ptr.data())
 {
     if (d_ptr)
         d_ptr->ref.ref();
@@ -239,10 +238,6 @@ QScriptContextInfo::QScriptContextInfo()
 */
 QScriptContextInfo::~QScriptContextInfo()
 {
-    if (d_ptr && !d_ptr->ref.deref()) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
 }
 
 /*!
@@ -251,15 +246,7 @@ QScriptContextInfo::~QScriptContextInfo()
 */
 QScriptContextInfo &QScriptContextInfo::operator=(const QScriptContextInfo &other)
 {
-    if (d_ptr == other.d_ptr)
-        return *this;
-    if (d_ptr && !d_ptr->ref.deref()) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
-    d_ptr = other.d_ptr;
-    if (d_ptr)
-        d_ptr->ref.ref();
+    d_ptr.assign(other.d_ptr.data());
     return *this;
 }
 
@@ -510,7 +497,7 @@ QDataStream &operator<<(QDataStream &out, const QScriptContextInfo &info)
 Q_SCRIPT_EXPORT QDataStream &operator>>(QDataStream &in, QScriptContextInfo &info)
 {
     if (!info.d_ptr) {
-        info.d_ptr = new QScriptContextInfoPrivate();
+        info.d_ptr.data_ptr() = new QScriptContextInfoPrivate();
         info.d_ptr->ref.ref();
     }
 
diff --git a/src/script/qscriptcontextinfo.h b/src/script/qscriptcontextinfo.h
index c0c5090a98..3540060894 100644
--- a/src/script/qscriptcontextinfo.h
+++ b/src/script/qscriptcontextinfo.h
@@ -48,6 +48,7 @@
 
 #include <QtCore/qlist.h>
 #include <QtCore/qstringlist.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -104,7 +105,7 @@ public:
     bool operator!=(const QScriptContextInfo &other) const;
 
 private:
-    QScriptContextInfoPrivate *d_ptr;
+    QScopedSharedPointer<QScriptContextInfoPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptContextInfo)
 };
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp
index 911d714832..744cf2a0ac 100644
--- a/src/script/qscriptengine.cpp
+++ b/src/script/qscriptengine.cpp
@@ -330,10 +330,6 @@ QScriptEngine::~QScriptEngine()
     Q_D(QScriptEngine);
     d->m_frameRepository.release(currentContext());
     d->objectAllocator.destruct();
-#ifdef QT_NO_QOBJECT
-    delete d_ptr;
-    d_ptr = 0;
-#endif
 }
 
 /*!
@@ -1778,7 +1774,7 @@ QScriptValue QScriptEngine::objectById(qint64 id) const
   Constructs a new QScriptSyntaxCheckResult from the \a other result.
 */
 QScriptSyntaxCheckResult::QScriptSyntaxCheckResult(const QScriptSyntaxCheckResult &other)
-    : d_ptr(other.d_ptr)
+    : d_ptr(other.d_ptr.data())
 {
     if (d_ptr)
         d_ptr->ref.ref();
@@ -1807,10 +1803,6 @@ QScriptSyntaxCheckResult::QScriptSyntaxCheckResult()
 */
 QScriptSyntaxCheckResult::~QScriptSyntaxCheckResult()
 {
-    if (d_ptr && !d_ptr->ref.deref()) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
 }
 
 /*!
@@ -1864,15 +1856,7 @@ QString QScriptSyntaxCheckResult::errorMessage() const
 */
 QScriptSyntaxCheckResult &QScriptSyntaxCheckResult::operator=(const QScriptSyntaxCheckResult &other)
 {
-    if (d_ptr == other.d_ptr)
-        return *this;
-    if (d_ptr && !d_ptr->ref.deref()) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
-    d_ptr = other.d_ptr;
-    if (d_ptr)
-        d_ptr->ref.ref();
+    d_ptr.assign(other.d_ptr.data());
     return *this;
 }
 
diff --git a/src/script/qscriptengine.h b/src/script/qscriptengine.h
index 91e076f69c..794c965560 100644
--- a/src/script/qscriptengine.h
+++ b/src/script/qscriptengine.h
@@ -47,6 +47,7 @@
 #ifndef QT_NO_SCRIPT
 
 #include <QtCore/qvariant.h>
+#include <QtCore/qscopedpointer.h>
 
 #ifndef QT_NO_QOBJECT
 #include <QtCore/qobject.h>
@@ -114,7 +115,7 @@ public:
 private:
     QScriptSyntaxCheckResult();
     QScriptSyntaxCheckResult(QScriptSyntaxCheckResultPrivate *d);
-    QScriptSyntaxCheckResultPrivate *d_ptr;
+    QScopedSharedPointer<QScriptSyntaxCheckResultPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptSyntaxCheckResult)
     friend class QScriptEnginePrivate;
@@ -282,7 +283,7 @@ private:
 
 protected:
 #ifdef QT_NO_QOBJECT
-    QScriptEnginePrivate *d_ptr;
+    QScopedPointer<QScriptEnginePrivate> d_ptr;
 
     QScriptEngine(QScriptEnginePrivate &dd);
 #else
diff --git a/src/script/qscriptengine_p.cpp b/src/script/qscriptengine_p.cpp
index ffb5a27d49..4ac4403b5f 100644
--- a/src/script/qscriptengine_p.cpp
+++ b/src/script/qscriptengine_p.cpp
@@ -1711,6 +1711,8 @@ QScriptEnginePrivate::QScriptEnginePrivate()
     m_maxCallDepth = 640;
 #elif defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6)
     m_maxCallDepth = 360;
+#elif defined(Q_OS_SYMBIAN)
+    m_maxCallDepth = 128; //stack size limitation of 80k, has headroom for other stack vars.
 #else
     m_maxCallDepth = 512;
 #endif
diff --git a/src/script/qscriptengineagent.cpp b/src/script/qscriptengineagent.cpp
index 38178f7314..68c0a419a0 100644
--- a/src/script/qscriptengineagent.cpp
+++ b/src/script/qscriptengineagent.cpp
@@ -173,8 +173,6 @@ QScriptEngineAgent::QScriptEngineAgent(QScriptEngineAgentPrivate &dd, QScriptEng
 */
 QScriptEngineAgent::~QScriptEngineAgent()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
diff --git a/src/script/qscriptengineagent.h b/src/script/qscriptengineagent.h
index 7b3c30d410..e71560cf19 100644
--- a/src/script/qscriptengineagent.h
+++ b/src/script/qscriptengineagent.h
@@ -47,6 +47,7 @@
 #ifndef QT_NO_SCRIPT
 
 #include <QtCore/qvariant.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -96,7 +97,7 @@ public:
 
 protected:
     QScriptEngineAgent(QScriptEngineAgentPrivate &dd, QScriptEngine *engine);
-    QScriptEngineAgentPrivate *d_ptr;
+    QScopedPointer<QScriptEngineAgentPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QScriptEngineAgent)
diff --git a/src/script/qscriptstring.cpp b/src/script/qscriptstring.cpp
index 23ba729cb5..137c6d0c8c 100644
--- a/src/script/qscriptstring.cpp
+++ b/src/script/qscriptstring.cpp
@@ -54,6 +54,29 @@
 
 QT_BEGIN_NAMESPACE
 
+/*! \internal */
+struct QScriptStringPrivatePointerHandler
+{
+    static inline void cleanup(QScriptStringPrivate *d)
+    {
+        if (!d || d->ref.deref())
+            return;
+
+        if (d->nameId) {
+            d->engine->uninternString(d);
+        } else {
+            // the engine has already been deleted
+            delete d;
+        }
+    }
+
+    static inline void reset(QScriptStringPrivate *&d, QScriptStringPrivate *other)
+    {
+        cleanup(d);
+        d = other;
+    }
+};
+
 /*!
   \since 4.4
   \class QScriptString
@@ -108,8 +131,8 @@ QScriptStringPrivate *QScriptStringPrivate::get(const QScriptString &q)
 void QScriptStringPrivate::init(QScriptString &q, QScriptStringPrivate *d)
 {
     Q_ASSERT(q.d_ptr == 0);
-    q.d_ptr = d;
-    q.d_ptr->ref.ref();
+    q.d_ptr.data_ptr() = d;
+    d->ref.ref();
 }
 
 /*!
@@ -124,7 +147,7 @@ QScriptString::QScriptString()
   Constructs a new QScriptString that is a copy of \a other.
 */
 QScriptString::QScriptString(const QScriptString &other)
-    : d_ptr(other.d_ptr)
+    : d_ptr(other.d_ptr.data())
 {
     if (d_ptr)
         d_ptr->ref.ref();
@@ -135,15 +158,6 @@ QScriptString::QScriptString(const QScriptString &other)
 */
 QScriptString::~QScriptString()
 {
-    if (d_ptr && !d_ptr->ref.deref()) {
-        if (isValid()) {
-            d_ptr->engine->uninternString(d_ptr);
-        } else {
-            // the engine has already been deleted
-            delete d_ptr;
-        }
-        d_ptr = 0;
-    }
 }
 
 /*!
@@ -153,15 +167,7 @@ QScriptString &QScriptString::operator=(const QScriptString &other)
 {
     if (d_ptr == other.d_ptr)
         return *this;
-    if (d_ptr && !d_ptr->ref.deref()) {
-        if (isValid()) {
-            d_ptr->engine->uninternString(d_ptr);
-        } else {
-            // the engine has already been deleted
-            delete d_ptr;
-        }
-    }
-    d_ptr = other.d_ptr;
+    d_ptr.reset(other.d_ptr.data());
     if (d_ptr)
         d_ptr->ref.ref();
     return *this;
diff --git a/src/script/qscriptstring.h b/src/script/qscriptstring.h
index db4d59a412..7256ee9af5 100644
--- a/src/script/qscriptstring.h
+++ b/src/script/qscriptstring.h
@@ -46,6 +46,8 @@
 
 #ifndef QT_NO_SCRIPT
 
+#include <QtCore/qscopedpointer.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -54,6 +56,7 @@ QT_MODULE(Script)
 
 class QScriptEngine;
 class QScriptStringPrivate;
+struct QScriptStringPrivatePointerHandler;
 
 class Q_SCRIPT_EXPORT QScriptString
 {
@@ -73,7 +76,7 @@ public:
     operator QString() const;
 
 private:
-    QScriptStringPrivate *d_ptr;
+    QScopedCustomPointer<QScriptStringPrivate, QScriptStringPrivatePointerHandler> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptString)
 };
diff --git a/src/script/qscriptvalue.cpp b/src/script/qscriptvalue.cpp
index 520e76f1fe..884a4c0aba 100644
--- a/src/script/qscriptvalue.cpp
+++ b/src/script/qscriptvalue.cpp
@@ -57,6 +57,28 @@
 
 QT_BEGIN_NAMESPACE
 
+/*! \internal
+ */
+struct QScriptValuePrivatePointerHandler
+{
+    static inline void cleanup(QScriptValuePrivate *d)
+    {
+        if (!d || d->ref.deref())
+            return;
+        if (d->engine) {
+            QScriptEnginePrivate::get(d->engine)->unregisterValue(d);
+        } else {
+            delete d;
+        }
+    }
+
+    static inline void reset(QScriptValuePrivate *&d, QScriptValuePrivate *other)
+    {
+        cleanup(d);
+        d = other;
+    }
+};
+
 /*!
   \since 4.3
   \class QScriptValue
@@ -194,14 +216,6 @@ QScriptValue::QScriptValue()
 */
 QScriptValue::~QScriptValue()
 {
-    if (d_ptr && !d_ptr->ref.deref()) {
-        if (engine()) {
-            QScriptEnginePrivate::get(engine())->unregisterValue(d_ptr);
-        } else {
-            delete d_ptr;
-        }
-        d_ptr = 0;
-    }
 }
 
 /*!
@@ -212,7 +226,7 @@ QScriptValue::~QScriptValue()
   the new script value (i.e., the object itself is not copied).
 */
 QScriptValue::QScriptValue(const QScriptValue &other)
-    : d_ptr(other.d_ptr)
+    : d_ptr(other.d_ptr.data())
 {
     if (d_ptr)
         d_ptr->ref.ref();
@@ -225,13 +239,12 @@ QScriptValue::QScriptValue(const QScriptValue &other)
   registers it with the script \a engine.
 */
 QScriptValue::QScriptValue(QScriptEngine *engine, QScriptValue::SpecialValue value)
+    : d_ptr(0)
 {
     if (engine) {
         QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(engine);
-        d_ptr = eng_p->registerValue(QScriptValueImpl(value));
+        d_ptr.data_ptr() = eng_p->registerValue(QScriptValueImpl(value));
         d_ptr->ref.ref();
-    } else {
-        d_ptr = 0;
     }
 }
 
@@ -244,13 +257,12 @@ QScriptValue::QScriptValue(QScriptEngine *engine, QScriptValue::SpecialValue val
   registers it with the script \a engine.
 */
 QScriptValue::QScriptValue(QScriptEngine *engine, bool val)
+    : d_ptr(0)
 {
     if (engine) {
         QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(engine);
-        d_ptr = eng_p->registerValue(QScriptValueImpl(val));
+        d_ptr.data_ptr() = eng_p->registerValue(QScriptValueImpl(val));
         d_ptr->ref.ref();
-    } else {
-        d_ptr = 0;
     }
 }
 
@@ -262,13 +274,12 @@ QScriptValue::QScriptValue(QScriptEngine *engine, bool val)
   registers it with the script \a engine.
 */
 QScriptValue::QScriptValue(QScriptEngine *engine, int val)
+    : d_ptr(0)
 {
     if (engine) {
         QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(engine);
-        d_ptr = eng_p->registerValue(QScriptValueImpl(val));
+        d_ptr.data_ptr() = eng_p->registerValue(QScriptValueImpl(val));
         d_ptr->ref.ref();
-    } else {
-        d_ptr = 0;
     }
 }
 
@@ -280,13 +291,12 @@ QScriptValue::QScriptValue(QScriptEngine *engine, int val)
   registers it with the script \a engine.
  */
 QScriptValue::QScriptValue(QScriptEngine *engine, uint val)
+    : d_ptr(0)
 {
     if (engine) {
         QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(engine);
-        d_ptr = eng_p->registerValue(QScriptValueImpl(val));
+        d_ptr.data_ptr() = eng_p->registerValue(QScriptValueImpl(val));
         d_ptr->ref.ref();
-    } else {
-        d_ptr = 0;
     }
 }
 
@@ -298,13 +308,12 @@ QScriptValue::QScriptValue(QScriptEngine *engine, uint val)
   registers it with the script \a engine.
 */
 QScriptValue::QScriptValue(QScriptEngine *engine, qsreal val)
+    : d_ptr(0)
 {
     if (engine) {
         QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(engine);
-        d_ptr = eng_p->registerValue(QScriptValueImpl(val));
+        d_ptr.data_ptr() = eng_p->registerValue(QScriptValueImpl(val));
         d_ptr->ref.ref();
-    } else {
-        d_ptr = 0;
     }
 }
 
@@ -316,15 +325,14 @@ QScriptValue::QScriptValue(QScriptEngine *engine, qsreal val)
   registers it with the script \a engine.
 */
 QScriptValue::QScriptValue(QScriptEngine *engine, const QString &val)
+    : d_ptr(0)
 {
     if (engine) {
         QScriptValueImpl v;
         QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(engine);
         eng_p->newString(&v, val);
-        d_ptr = eng_p->registerValue(v);
+        d_ptr.data_ptr() = eng_p->registerValue(v);
         d_ptr->ref.ref();
-    } else {
-        d_ptr = 0;
     }
 }
 
@@ -338,15 +346,14 @@ QScriptValue::QScriptValue(QScriptEngine *engine, const QString &val)
 
 #ifndef QT_NO_CAST_FROM_ASCII
 QScriptValue::QScriptValue(QScriptEngine *engine, const char *val)
+    : d_ptr(0)
 {
     if (engine) {
         QScriptValueImpl v;
         QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(engine);
         eng_p->newString(&v, QString::fromAscii(val));
-        d_ptr = eng_p->registerValue(v);
+        d_ptr.data_ptr() = eng_p->registerValue(v);
         d_ptr->ref.ref();
-    } else {
-        d_ptr = 0;
     }
 }
 #endif
@@ -464,14 +471,7 @@ QScriptValue &QScriptValue::operator=(const QScriptValue &other)
 {
     if (d_ptr == other.d_ptr)
         return *this;
-    if (d_ptr && !d_ptr->ref.deref()) {
-        if (engine()) {
-            QScriptEnginePrivate::get(engine())->unregisterValue(d_ptr);
-        } else {
-            delete d_ptr;
-        }
-    }
-    d_ptr = other.d_ptr;
+    d_ptr.reset(other.d_ptr.data());
     if (d_ptr)
         d_ptr->ref.ref();
     return *this;
diff --git a/src/script/qscriptvalue.h b/src/script/qscriptvalue.h
index 15a11e3df1..8125d017b4 100644
--- a/src/script/qscriptvalue.h
+++ b/src/script/qscriptvalue.h
@@ -47,6 +47,7 @@
 #ifndef QT_NO_SCRIPT
 
 #include <QtCore/qlist.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -71,6 +72,7 @@ typedef QList<QScriptValue> QScriptValueList;
 typedef double qsreal;
 
 class QScriptValuePrivate;
+struct QScriptValuePrivatePointerHandler;
 class Q_SCRIPT_EXPORT QScriptValue
 {
 public:
@@ -216,12 +218,12 @@ public:
 
 private:
     // force compile error, prevent QScriptValue(bool) to be called
-    inline QScriptValue(void *) { Q_ASSERT(false); }
+    inline QScriptValue(void *);
     // force compile error, prevent QScriptValue(QScriptEngine*, bool) to be called
-    inline QScriptValue(QScriptEngine *, void *) { Q_ASSERT(false); }
+    inline QScriptValue(QScriptEngine *, void *);
 
 private:
-    QScriptValuePrivate *d_ptr;
+    QScopedCustomPointer<QScriptValuePrivate, QScriptValuePrivatePointerHandler> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptValue)
 };
diff --git a/src/script/qscriptvalue_p.h b/src/script/qscriptvalue_p.h
index 20adb29cd1..ce9959b117 100644
--- a/src/script/qscriptvalue_p.h
+++ b/src/script/qscriptvalue_p.h
@@ -91,7 +91,7 @@ inline QScriptValueImpl QScriptValuePrivate::valueOf(const QScriptValue &value)
 
 inline void QScriptValuePrivate::init(QScriptValue &value, QScriptValuePrivate *p)
 {
-    value.d_ptr = p;
+    value.d_ptr.data_ptr() = p;
     value.d_ptr->ref.ref();
 }
 
diff --git a/src/script/qscriptvalueimplfwd_p.h b/src/script/qscriptvalueimplfwd_p.h
index 0953713c36..ade23ada56 100644
--- a/src/script/qscriptvalueimplfwd_p.h
+++ b/src/script/qscriptvalueimplfwd_p.h
@@ -92,6 +92,17 @@ public:
         StringTypeHint
     };
 
+    QScript::Type m_type;
+    union {
+        bool m_bool_value;
+        int m_int_value;
+        qsreal m_number_value;
+        void *m_ptr_value;
+        QScriptObject *m_object_value;
+        QScriptNameIdImpl *m_string_value;
+        QString *m_lazy_string_value;
+    };
+
     inline QScriptValueImpl();
     inline QScriptValueImpl(QScriptValue::SpecialValue val);
     inline QScriptValueImpl(bool val);
@@ -222,16 +233,6 @@ public:
 
     bool detectedCycle() const;
 
-    QScript::Type m_type;
-    union {
-        bool m_bool_value;
-        int m_int_value;
-        qsreal m_number_value;
-        void *m_ptr_value;
-        QScriptObject *m_object_value;
-        QScriptNameIdImpl *m_string_value;
-        QString *m_lazy_string_value;
-    };
 };
 
 QT_END_NAMESPACE
diff --git a/src/script/qscriptvalueiterator.cpp b/src/script/qscriptvalueiterator.cpp
index 359a849258..6f83d5c3d3 100644
--- a/src/script/qscriptvalueiterator.cpp
+++ b/src/script/qscriptvalueiterator.cpp
@@ -115,12 +115,11 @@ QScriptValueIteratorPrivate::~QScriptValueIteratorPrivate()
   first property).
 */
 QScriptValueIterator::QScriptValueIterator(const QScriptValue &object)
+    : d_ptr(0)
 {
     QScriptValueImpl val = QScriptValuePrivate::valueOf(object);
-    if (!val.isObject()) {
-        d_ptr = 0;
-    } else {
-        d_ptr = new QScriptValueIteratorPrivate();
+    if (val.isObject()) {
+        d_ptr.reset(new QScriptValueIteratorPrivate());
         d_ptr->it = new QScriptValueIteratorImpl(val);
     }
 }
@@ -130,10 +129,6 @@ QScriptValueIterator::QScriptValueIterator(const QScriptValue &object)
 */
 QScriptValueIterator::~QScriptValueIterator()
 {
-    if (d_ptr) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
 }
 
 /*!
@@ -311,13 +306,10 @@ void QScriptValueIterator::remove()
 */
 QScriptValueIterator& QScriptValueIterator::operator=(QScriptValue &object)
 {
-    if (d_ptr) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
+    d_ptr.reset();
     QScriptValueImpl val = QScriptValuePrivate::valueOf(object);
     if (val.isObject()) {
-        d_ptr = new QScriptValueIteratorPrivate();
+        d_ptr.reset(new QScriptValueIteratorPrivate());
         d_ptr->it = new QScriptValueIteratorImpl(val);
     }
     return *this;
diff --git a/src/script/qscriptvalueiterator.h b/src/script/qscriptvalueiterator.h
index 2242c6850c..c8684eae37 100644
--- a/src/script/qscriptvalueiterator.h
+++ b/src/script/qscriptvalueiterator.h
@@ -46,6 +46,8 @@
 
 #ifndef QT_NO_SCRIPT
 
+#include <QtCore/qscopedpointer.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -84,7 +86,7 @@ public:
     QScriptValueIterator& operator=(QScriptValue &value);
 
 private:
-    QScriptValueIteratorPrivate *d_ptr;
+    QScopedPointer<QScriptValueIteratorPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptValueIterator)
     Q_DISABLE_COPY(QScriptValueIterator)
diff --git a/src/script/script.pro b/src/script/script.pro
index 9aa9bc21b3..47925277ad 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -10,3 +10,5 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
 
 include(../qbase.pri)
 include(script.pri)
+
+symbian:TARGET.UID3=0x2001B2E1
diff --git a/src/scripttools/debugging/qscriptbreakpointdata.cpp b/src/scripttools/debugging/qscriptbreakpointdata.cpp
index 8adf7aba85..677aa15ea6 100644
--- a/src/scripttools/debugging/qscriptbreakpointdata.cpp
+++ b/src/scripttools/debugging/qscriptbreakpointdata.cpp
@@ -136,7 +136,6 @@ QScriptBreakpointData::QScriptBreakpointData(const QScriptBreakpointData &other)
 */
 QScriptBreakpointData::~QScriptBreakpointData()
 {
-    delete d_ptr;
 }
 
 /*!
@@ -355,7 +354,7 @@ bool QScriptBreakpointData::operator!=(const QScriptBreakpointData &other) const
 */
 QDataStream &operator<<(QDataStream &out, const QScriptBreakpointData &data)
 {
-    const QScriptBreakpointDataPrivate *d = data.d_ptr;
+    const QScriptBreakpointDataPrivate *d = data.d_ptr.data();
     out << d->scriptId;
     out << d->fileName;
     out << d->lineNumber;
@@ -377,7 +376,7 @@ QDataStream &operator<<(QDataStream &out, const QScriptBreakpointData &data)
 */
 QDataStream &operator>>(QDataStream &in, QScriptBreakpointData &data)
 {
-    QScriptBreakpointDataPrivate *d = data.d_ptr;
+    QScriptBreakpointDataPrivate *d = data.d_ptr.data();
     in >> d->scriptId;
     in >> d->fileName;
     in >> d->lineNumber;
diff --git a/src/scripttools/debugging/qscriptbreakpointdata_p.h b/src/scripttools/debugging/qscriptbreakpointdata_p.h
index 00b37e5422..6fcb3f3965 100644
--- a/src/scripttools/debugging/qscriptbreakpointdata_p.h
+++ b/src/scripttools/debugging/qscriptbreakpointdata_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
-
+#include <QtCore/qscopedpointer.h>
 #include <QtCore/qmap.h>
 
 QT_BEGIN_NAMESPACE
@@ -114,7 +114,7 @@ public:
     bool operator!=(const QScriptBreakpointData &other) const;
 
 private:
-    QScriptBreakpointDataPrivate *d_ptr;
+    QScopedPointer<QScriptBreakpointDataPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptBreakpointData)
 };
diff --git a/src/scripttools/debugging/qscriptdebuggerbackend.cpp b/src/scripttools/debugging/qscriptdebuggerbackend.cpp
index 7f4211c3a1..a677a1f9a1 100644
--- a/src/scripttools/debugging/qscriptdebuggerbackend.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerbackend.cpp
@@ -385,7 +385,6 @@ QScriptDebuggerBackend::QScriptDebuggerBackend()
 QScriptDebuggerBackend::~QScriptDebuggerBackend()
 {
     detach();
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/scripttools/debugging/qscriptdebuggerbackend_p.h b/src/scripttools/debugging/qscriptdebuggerbackend_p.h
index 3f0843b1e4..759a304df9 100644
--- a/src/scripttools/debugging/qscriptdebuggerbackend_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerbackend_p.h
@@ -144,7 +144,7 @@ protected:
 
 protected:
     QScriptDebuggerBackend(QScriptDebuggerBackendPrivate &dd);
-    QScriptDebuggerBackendPrivate *d_ptr;
+    QScopedPointer<QScriptDebuggerBackendPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QScriptDebuggerBackend)
diff --git a/src/scripttools/debugging/qscriptdebuggercommand.cpp b/src/scripttools/debugging/qscriptdebuggercommand.cpp
index b2809db06e..03670fc33b 100644
--- a/src/scripttools/debugging/qscriptdebuggercommand.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercommand.cpp
@@ -119,7 +119,6 @@ QScriptDebuggerCommand::QScriptDebuggerCommand(const QScriptDebuggerCommand &oth
 */
 QScriptDebuggerCommand::~QScriptDebuggerCommand()
 {
-    delete d_ptr;
 }
 
 /*!
@@ -666,7 +665,7 @@ QScriptDebuggerCommand QScriptDebuggerCommand::clearExceptionsCommand()
 */
 QDataStream &operator<<(QDataStream &out, const QScriptDebuggerCommand &command)
 {
-    const QScriptDebuggerCommandPrivate *d = command.d_ptr;
+    const QScriptDebuggerCommandPrivate *d = command.d_ptr.data();
     out << (quint32)d->type;
     out << (qint32)d->attributes.size();
     QHash<QScriptDebuggerCommand::Attribute, QVariant>::const_iterator it;
@@ -686,7 +685,7 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerCommand &command)
 */
 QDataStream &operator>>(QDataStream &in, QScriptDebuggerCommand &command)
 {
-    QScriptDebuggerCommandPrivate *d = command.d_ptr;
+    QScriptDebuggerCommandPrivate *d = command.d_ptr.data();
 
     quint32 type;
     in >> type;
diff --git a/src/scripttools/debugging/qscriptdebuggercommand_p.h b/src/scripttools/debugging/qscriptdebuggercommand_p.h
index 9960d423f7..8e44fcfbd9 100644
--- a/src/scripttools/debugging/qscriptdebuggercommand_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommand_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
-
+#include <QtCore/qscopedpointer.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qvariant.h>
 
@@ -255,7 +255,7 @@ public:
     static QScriptDebuggerCommand clearExceptionsCommand();
 
 private:
-    QScriptDebuggerCommandPrivate *d_ptr;
+    QScopedPointer<QScriptDebuggerCommandPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptDebuggerCommand)
 };
diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
index 56ff912928..2718097b61 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp
@@ -98,7 +98,6 @@ QScriptDebuggerCommandExecutor::QScriptDebuggerCommandExecutor()
 
 QScriptDebuggerCommandExecutor::~QScriptDebuggerCommandExecutor()
 {
-    delete d_ptr;
 }
 
 static bool isPrefixOf(const QString &prefix, const QString &what)
diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h b/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h
index 8640b168aa..0da0d87c2a 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -74,7 +75,7 @@ public:
 
 protected:
     QScriptDebuggerCommandExecutor(QScriptDebuggerCommandExecutorPrivate &dd);
-    QScriptDebuggerCommandExecutorPrivate *d_ptr;
+    QScopedPointer<QScriptDebuggerCommandExecutorPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QScriptDebuggerCommandExecutor)
diff --git a/src/scripttools/debugging/qscriptdebuggerconsole.cpp b/src/scripttools/debugging/qscriptdebuggerconsole.cpp
index 76f2819d5f..054233bfd4 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsole.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsole.cpp
@@ -199,7 +199,6 @@ QScriptDebuggerConsole::QScriptDebuggerConsole()
 
 QScriptDebuggerConsole::~QScriptDebuggerConsole()
 {
-    delete d_ptr;
 }
 
 void QScriptDebuggerConsole::loadScriptedCommands(const QString &scriptsPath,
diff --git a/src/scripttools/debugging/qscriptdebuggerconsole_p.h b/src/scripttools/debugging/qscriptdebuggerconsole_p.h
index 1912b122eb..2e4a726c9b 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsole_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsole_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
+#include <QtCore/qscopedpointer.h>
 
 #include "qscriptdebuggerconsolehistorianinterface_p.h"
 
@@ -109,7 +110,7 @@ public:
     void bumpSessionId();
 
 private:
-    QScriptDebuggerConsolePrivate *d_ptr;
+    QScopedPointer<QScriptDebuggerConsolePrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptDebuggerConsole)
     Q_DISABLE_COPY(QScriptDebuggerConsole)
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp
index 5fd2bdbb22..f8b712a820 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp
@@ -72,7 +72,6 @@ QScriptDebuggerConsoleCommand::QScriptDebuggerConsoleCommand()
 
 QScriptDebuggerConsoleCommand::~QScriptDebuggerConsoleCommand()
 {
-    delete d_ptr;
 }
 
 QScriptDebuggerConsoleCommand::QScriptDebuggerConsoleCommand(QScriptDebuggerConsoleCommandPrivate &dd)
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h
index 784fd10bd2..c3801504ee 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
-
+#include <QtCore/qscopedpointer.h>
 #include <QtCore/qlist.h>
 
 QT_BEGIN_NAMESPACE
@@ -91,7 +91,7 @@ public:
 
 protected:
     QScriptDebuggerConsoleCommand(QScriptDebuggerConsoleCommandPrivate &dd);
-    QScriptDebuggerConsoleCommandPrivate *d_ptr;
+    QScopedPointer<QScriptDebuggerConsoleCommandPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommand)
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
index dc27b980e9..8dad683990 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
@@ -90,7 +90,7 @@ QScriptDebuggerConsoleCommandGroupData::QScriptDebuggerConsoleCommandGroupData(
 
 QScriptDebuggerConsoleCommandGroupData::QScriptDebuggerConsoleCommandGroupData(
     const QScriptDebuggerConsoleCommandGroupData &other)
-    : d_ptr(other.d_ptr)
+    : d_ptr(other.d_ptr.data())
 {
     if (d_ptr)
         d_ptr->ref.ref();
@@ -98,22 +98,12 @@ QScriptDebuggerConsoleCommandGroupData::QScriptDebuggerConsoleCommandGroupData(
 
 QScriptDebuggerConsoleCommandGroupData::~QScriptDebuggerConsoleCommandGroupData()
 {
-    if (d_ptr && !d_ptr->ref.deref()) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
 }
 
 QScriptDebuggerConsoleCommandGroupData &QScriptDebuggerConsoleCommandGroupData::operator=(
     const QScriptDebuggerConsoleCommandGroupData &other)
 {
-    if (d_ptr == other.d_ptr)
-        return *this;
-    if (d_ptr && !d_ptr->ref.deref())
-        delete d_ptr;
-    d_ptr = other.d_ptr;
-    if (d_ptr)
-        d_ptr->ref.ref();
+    d_ptr.assign(other.d_ptr.data());
     return *this;
 }
 
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h
index 4ae7b194e4..5e23628b43 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
-
+#include <QtCore/qscopedpointer.h>
 #include <QtCore/qmap.h>
 
 QT_BEGIN_NAMESPACE
@@ -82,7 +82,7 @@ public:
         const QScriptDebuggerConsoleCommandGroupData &other);
 
 private:
-    QScriptDebuggerConsoleCommandGroupDataPrivate *d_ptr;
+    QScopedSharedPointer<QScriptDebuggerConsoleCommandGroupDataPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandGroupData)
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp
index 7095d11bd5..f746e7a838 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp
@@ -105,7 +105,6 @@ QScriptDebuggerConsoleCommandManager::QScriptDebuggerConsoleCommandManager()
 
 QScriptDebuggerConsoleCommandManager::~QScriptDebuggerConsoleCommandManager()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h
index ee5b4739c0..c6de5b1766 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
-
+#include <QtCore/qscopedpointer.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qlist.h>
 
@@ -86,7 +86,7 @@ public:
     QStringList completions(const QString &prefix) const;
 
 private:
-    QScriptDebuggerConsoleCommandManagerPrivate *d_ptr;
+    QScopedPointer<QScriptDebuggerConsoleCommandManagerPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandManager)
 };
diff --git a/src/scripttools/debugging/qscriptdebuggerevent.cpp b/src/scripttools/debugging/qscriptdebuggerevent.cpp
index a901a29b85..535bc8da35 100644
--- a/src/scripttools/debugging/qscriptdebuggerevent.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerevent.cpp
@@ -97,7 +97,6 @@ QScriptDebuggerEvent::QScriptDebuggerEvent(const QScriptDebuggerEvent &other)
 
 QScriptDebuggerEvent::~QScriptDebuggerEvent()
 {
-    delete d_ptr;
 }
 
 QScriptDebuggerEvent &QScriptDebuggerEvent::operator=(const QScriptDebuggerEvent &other)
@@ -276,7 +275,7 @@ bool QScriptDebuggerEvent::operator!=(const QScriptDebuggerEvent &other) const
 */
 QDataStream &operator<<(QDataStream &out, const QScriptDebuggerEvent &event)
 {
-    const QScriptDebuggerEventPrivate *d = event.d_ptr;
+    const QScriptDebuggerEventPrivate *d = event.d_ptr.data();
     out << (quint32)d->type;
     out << (qint32)d->attributes.size();
     QHash<QScriptDebuggerEvent::Attribute, QVariant>::const_iterator it;
@@ -296,7 +295,7 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerEvent &event)
 */
 QDataStream &operator>>(QDataStream &in, QScriptDebuggerEvent &event)
 {
-    QScriptDebuggerEventPrivate *d = event.d_ptr;
+    QScriptDebuggerEventPrivate *d = event.d_ptr.data();
 
     quint32 type;
     in >> type;
diff --git a/src/scripttools/debugging/qscriptdebuggerevent_p.h b/src/scripttools/debugging/qscriptdebuggerevent_p.h
index 110e84ecf1..8c4e460da8 100644
--- a/src/scripttools/debugging/qscriptdebuggerevent_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerevent_p.h
@@ -57,6 +57,7 @@
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qvariant.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -137,7 +138,7 @@ public:
     bool operator!=(const QScriptDebuggerEvent &other) const;
 
 private:
-    QScriptDebuggerEventPrivate *d_ptr;
+    QScopedPointer<QScriptDebuggerEventPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptDebuggerEvent)
 };
diff --git a/src/scripttools/debugging/qscriptdebuggerfrontend.cpp b/src/scripttools/debugging/qscriptdebuggerfrontend.cpp
index 54eb214e7b..237f7dda46 100644
--- a/src/scripttools/debugging/qscriptdebuggerfrontend.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerfrontend.cpp
@@ -143,7 +143,6 @@ QScriptDebuggerFrontend::QScriptDebuggerFrontend()
 
 QScriptDebuggerFrontend::~QScriptDebuggerFrontend()
 {
-    delete d_ptr;
 }
 
 QScriptDebuggerFrontend::QScriptDebuggerFrontend(QScriptDebuggerFrontendPrivate &dd)
diff --git a/src/scripttools/debugging/qscriptdebuggerfrontend_p.h b/src/scripttools/debugging/qscriptdebuggerfrontend_p.h
index be17bcd03c..1f7b2ef853 100644
--- a/src/scripttools/debugging/qscriptdebuggerfrontend_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerfrontend_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
-
+#include <QtCore/qscopedpointer.h>
 #include <QtCore/qstring.h>
 
 #include "qscriptdebuggercommandschedulerinterface_p.h"
@@ -90,7 +90,7 @@ protected:
 
 protected:
     QScriptDebuggerFrontend(QScriptDebuggerFrontendPrivate &dd);
-    QScriptDebuggerFrontendPrivate *d_ptr;
+    QScopedPointer<QScriptDebuggerFrontendPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QScriptDebuggerFrontend)
diff --git a/src/scripttools/debugging/qscriptdebuggerjob.cpp b/src/scripttools/debugging/qscriptdebuggerjob.cpp
index af16f63016..7a38b15925 100644
--- a/src/scripttools/debugging/qscriptdebuggerjob.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerjob.cpp
@@ -85,7 +85,6 @@ QScriptDebuggerJob::QScriptDebuggerJob(QScriptDebuggerJobPrivate &dd)
 
 QScriptDebuggerJob::~QScriptDebuggerJob()
 {
-    delete d_ptr;
 }
 
 void QScriptDebuggerJob::finish()
diff --git a/src/scripttools/debugging/qscriptdebuggerjob_p.h b/src/scripttools/debugging/qscriptdebuggerjob_p.h
index 8f30d3958a..099ad16344 100644
--- a/src/scripttools/debugging/qscriptdebuggerjob_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerjob_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -76,7 +77,7 @@ public:
 
 protected:
     QScriptDebuggerJob(QScriptDebuggerJobPrivate &dd);
-    QScriptDebuggerJobPrivate *d_ptr;
+    QScopedPointer<QScriptDebuggerJobPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QScriptDebuggerJob)
diff --git a/src/scripttools/debugging/qscriptdebuggerresponse.cpp b/src/scripttools/debugging/qscriptdebuggerresponse.cpp
index 49dd731e9a..12f930c392 100644
--- a/src/scripttools/debugging/qscriptdebuggerresponse.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerresponse.cpp
@@ -101,7 +101,6 @@ QScriptDebuggerResponse::QScriptDebuggerResponse(const QScriptDebuggerResponse &
 
 QScriptDebuggerResponse::~QScriptDebuggerResponse()
 {
-    delete d_ptr;
 }
 
 QScriptDebuggerResponse &QScriptDebuggerResponse::operator=(const QScriptDebuggerResponse &other)
@@ -320,7 +319,7 @@ bool QScriptDebuggerResponse::operator!=(const QScriptDebuggerResponse &other) c
 */
 QDataStream &operator<<(QDataStream &out, const QScriptDebuggerResponse &response)
 {
-    const QScriptDebuggerResponsePrivate *d = response.d_ptr;
+    const QScriptDebuggerResponsePrivate *d = response.d_ptr.data();
     out << (quint32)d->error;
     out << d->result;
     out << d->async;
@@ -336,7 +335,7 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerResponse &respons
 */
 QDataStream &operator>>(QDataStream &in, QScriptDebuggerResponse &response)
 {
-    QScriptDebuggerResponsePrivate *d = response.d_ptr;
+    QScriptDebuggerResponsePrivate *d = response.d_ptr.data();
 
     quint32 error;
     in >> error;
diff --git a/src/scripttools/debugging/qscriptdebuggerresponse_p.h b/src/scripttools/debugging/qscriptdebuggerresponse_p.h
index acee92d077..645cab00e7 100644
--- a/src/scripttools/debugging/qscriptdebuggerresponse_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerresponse_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
-
+#include <QtCore/qscopedpointer.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qvariant.h>
 
@@ -127,7 +127,7 @@ public:
     bool operator!=(const QScriptDebuggerResponse &other) const;
 
 private:
-    QScriptDebuggerResponsePrivate *d_ptr;
+    QScopedPointer<QScriptDebuggerResponsePrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptDebuggerResponse)
 };
diff --git a/src/scripttools/debugging/qscriptdebuggervalue.cpp b/src/scripttools/debugging/qscriptdebuggervalue.cpp
index a7f28fac00..e3d72698af 100644
--- a/src/scripttools/debugging/qscriptdebuggervalue.cpp
+++ b/src/scripttools/debugging/qscriptdebuggervalue.cpp
@@ -94,7 +94,7 @@ QScriptDebuggerValue::QScriptDebuggerValue(const QScriptValue &value)
     : d_ptr(0)
 {
     if (value.isValid()) {
-        d_ptr = new QScriptDebuggerValuePrivate;
+        d_ptr.reset(new QScriptDebuggerValuePrivate);
         if (value.isUndefined())
             d_ptr->type = UndefinedValue;
         else if (value.isNull())
@@ -157,7 +157,7 @@ QScriptDebuggerValue::QScriptDebuggerValue(ValueType type)
 }
 
 QScriptDebuggerValue::QScriptDebuggerValue(const QScriptDebuggerValue &other)
-    : d_ptr(other.d_ptr)
+    : d_ptr(other.d_ptr.data())
 {
     if (d_ptr)
         d_ptr->ref.ref();
@@ -165,21 +165,11 @@ QScriptDebuggerValue::QScriptDebuggerValue(const QScriptDebuggerValue &other)
 
 QScriptDebuggerValue::~QScriptDebuggerValue()
 {
-    if (d_ptr && !d_ptr->ref.deref()) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
 }
 
 QScriptDebuggerValue &QScriptDebuggerValue::operator=(const QScriptDebuggerValue &other)
 {
-    if (d_ptr == other.d_ptr)
-        return *this;
-    if (d_ptr && !d_ptr->ref.deref())
-        delete d_ptr;
-    d_ptr = other.d_ptr;
-    if (d_ptr)
-        d_ptr->ref.ref();
+    d_ptr.assign(other.d_ptr.data());
     return *this;
 }
 
diff --git a/src/scripttools/debugging/qscriptdebuggervalue_p.h b/src/scripttools/debugging/qscriptdebuggervalue_p.h
index ea7d87b0c7..e701313e25 100644
--- a/src/scripttools/debugging/qscriptdebuggervalue_p.h
+++ b/src/scripttools/debugging/qscriptdebuggervalue_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
-
+#include <QtCore/qscopedpointer.h>
 #include <QtCore/qlist.h>
 
 QT_BEGIN_NAMESPACE
@@ -103,7 +103,7 @@ public:
     bool operator!=(const QScriptDebuggerValue &other) const;
 
 private:
-    QScriptDebuggerValuePrivate *d_ptr;
+    QScopedSharedPointer<QScriptDebuggerValuePrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptDebuggerValue)
 };
diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
index 79322fbede..917e45d18f 100644
--- a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
+++ b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
@@ -106,7 +106,7 @@ QScriptDebuggerValueProperty::QScriptDebuggerValueProperty(const QString &name,
   Constructs a QScriptDebuggerValueProperty that is a copy of the \a other property.
 */
 QScriptDebuggerValueProperty::QScriptDebuggerValueProperty(const QScriptDebuggerValueProperty &other)
-    : d_ptr(other.d_ptr)
+    : d_ptr(other.d_ptr.data())
 {
     if (d_ptr)
         d_ptr->ref.ref();
@@ -117,10 +117,6 @@ QScriptDebuggerValueProperty::QScriptDebuggerValueProperty(const QScriptDebugger
 */
 QScriptDebuggerValueProperty::~QScriptDebuggerValueProperty()
 {
-    if (d_ptr && !d_ptr->ref.deref()) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
 }
 
 /*!
@@ -128,13 +124,7 @@ QScriptDebuggerValueProperty::~QScriptDebuggerValueProperty()
 */
 QScriptDebuggerValueProperty &QScriptDebuggerValueProperty::operator=(const QScriptDebuggerValueProperty &other)
 {
-    if (d_ptr == other.d_ptr)
-        return *this;
-    if (d_ptr && !d_ptr->ref.deref())
-        delete d_ptr;
-    d_ptr = other.d_ptr;
-    if (d_ptr)
-        d_ptr->ref.ref();
+    d_ptr.assign(other.d_ptr.data());
     return *this;
 }
 
diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h
index 79f30c249e..5e8f72a9b3 100644
--- a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h
+++ b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h
@@ -55,6 +55,7 @@
 
 #include <QtCore/qobjectdefs.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtScript/qscriptvalue.h>
 
 QT_BEGIN_NAMESPACE
@@ -85,7 +86,7 @@ public:
     bool isValid() const;
 
 private:
-    QScriptDebuggerValuePropertyPrivate *d_ptr;
+    QScopedSharedPointer<QScriptDebuggerValuePropertyPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptDebuggerValueProperty)
 };
diff --git a/src/scripttools/debugging/qscriptscriptdata.cpp b/src/scripttools/debugging/qscriptscriptdata.cpp
index d7740998ec..bfbe3c765d 100644
--- a/src/scripttools/debugging/qscriptscriptdata.cpp
+++ b/src/scripttools/debugging/qscriptscriptdata.cpp
@@ -98,7 +98,7 @@ QScriptScriptData::QScriptScriptData(const QString &contents, const QString &fil
 }
 
 QScriptScriptData::QScriptScriptData(const QScriptScriptData &other)
-    : d_ptr(other.d_ptr)
+    : d_ptr(other.d_ptr.data())
 {
     if (d_ptr)
         d_ptr->ref.ref();
@@ -106,21 +106,11 @@ QScriptScriptData::QScriptScriptData(const QScriptScriptData &other)
 
 QScriptScriptData::~QScriptScriptData()
 {
-    if (d_ptr && !d_ptr->ref.deref()) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
 }
 
 QScriptScriptData &QScriptScriptData::operator=(const QScriptScriptData &other)
 {
-    if (d_ptr == other.d_ptr)
-        return *this;
-    if (d_ptr && !d_ptr->ref.deref())
-        delete d_ptr;
-    d_ptr = other.d_ptr;
-    if (d_ptr)
-        d_ptr->ref.ref();
+    d_ptr.assign(other.d_ptr.data());
     return *this;
 }
 
@@ -191,7 +181,7 @@ bool QScriptScriptData::operator!=(const QScriptScriptData &other) const
 
 QDataStream &operator<<(QDataStream &out, const QScriptScriptData &data)
 {
-    const QScriptScriptDataPrivate *d = data.d_ptr;
+    const QScriptScriptDataPrivate *d = data.d_ptr.data();
     if (d) {
         out << d->contents;
         out << d->fileName;
@@ -207,10 +197,10 @@ QDataStream &operator<<(QDataStream &out, const QScriptScriptData &data)
 QDataStream &operator>>(QDataStream &in, QScriptScriptData &data)
 {
     if (!data.d_ptr) {
-        data.d_ptr = new QScriptScriptDataPrivate();
+        data.d_ptr.reset(new QScriptScriptDataPrivate());
         data.d_ptr->ref.ref();
     }
-    QScriptScriptDataPrivate *d = data.d_ptr;
+    QScriptScriptDataPrivate *d = data.d_ptr.data();
     in >> d->contents;
     in >> d->fileName;
     qint32 ln;
diff --git a/src/scripttools/debugging/qscriptscriptdata_p.h b/src/scripttools/debugging/qscriptscriptdata_p.h
index e1eef1455e..d5ef52df5d 100644
--- a/src/scripttools/debugging/qscriptscriptdata_p.h
+++ b/src/scripttools/debugging/qscriptscriptdata_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qobjectdefs.h>
-
+#include <QtCore/qscopedpointer.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qmap.h>
 
@@ -91,7 +91,7 @@ public:
     bool operator!=(const QScriptScriptData &other) const;
 
 private:
-    QScriptScriptDataPrivate *d_ptr;
+    QScopedSharedPointer<QScriptScriptDataPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptScriptData)
 };
diff --git a/src/scripttools/debugging/qscriptstdmessagehandler.cpp b/src/scripttools/debugging/qscriptstdmessagehandler.cpp
index ee3e879c41..0d5fba931a 100644
--- a/src/scripttools/debugging/qscriptstdmessagehandler.cpp
+++ b/src/scripttools/debugging/qscriptstdmessagehandler.cpp
@@ -66,7 +66,6 @@ QScriptStdMessageHandler::QScriptStdMessageHandler()
 
 QScriptStdMessageHandler::~QScriptStdMessageHandler()
 {
-    delete d_ptr;
 }
 
 void QScriptStdMessageHandler::message(QtMsgType type, const QString &text,
diff --git a/src/scripttools/debugging/qscriptstdmessagehandler_p.h b/src/scripttools/debugging/qscriptstdmessagehandler_p.h
index 06d417e510..6242c9476d 100644
--- a/src/scripttools/debugging/qscriptstdmessagehandler_p.h
+++ b/src/scripttools/debugging/qscriptstdmessagehandler_p.h
@@ -53,6 +53,8 @@
 // We mean it.
 //
 
+#include <QtCore/qscopedpointer.h>
+
 #include "qscriptmessagehandlerinterface_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -71,7 +73,7 @@ public:
                  const QVariant &data = QVariant());
 
 private:
-    QScriptStdMessageHandlerPrivate *d_ptr;
+    QScopedPointer<QScriptStdMessageHandlerPrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QScriptStdMessageHandler)
diff --git a/src/scripttools/debugging/qscriptvalueproperty.cpp b/src/scripttools/debugging/qscriptvalueproperty.cpp
index 64978ee3f1..3844459335 100644
--- a/src/scripttools/debugging/qscriptvalueproperty.cpp
+++ b/src/scripttools/debugging/qscriptvalueproperty.cpp
@@ -95,7 +95,7 @@ QScriptValueProperty::QScriptValueProperty(const QString &name,
   Constructs a QScriptValueProperty that is a copy of the \a other property.
 */
 QScriptValueProperty::QScriptValueProperty(const QScriptValueProperty &other)
-    : d_ptr(other.d_ptr)
+    : d_ptr(other.d_ptr.data())
 {
     if (d_ptr)
         d_ptr->ref.ref();
@@ -106,10 +106,6 @@ QScriptValueProperty::QScriptValueProperty(const QScriptValueProperty &other)
 */
 QScriptValueProperty::~QScriptValueProperty()
 {
-    if (d_ptr && !d_ptr->ref.deref()) {
-        delete d_ptr;
-        d_ptr = 0;
-    }
 }
 
 /*!
@@ -117,13 +113,7 @@ QScriptValueProperty::~QScriptValueProperty()
 */
 QScriptValueProperty &QScriptValueProperty::operator=(const QScriptValueProperty &other)
 {
-    if (d_ptr == other.d_ptr)
-        return *this;
-    if (d_ptr && !d_ptr->ref.deref())
-        delete d_ptr;
-    d_ptr = other.d_ptr;
-    if (d_ptr)
-        d_ptr->ref.ref();
+    d_ptr.assign(other.d_ptr.data());
     return *this;
 }
 
diff --git a/src/scripttools/debugging/qscriptvalueproperty_p.h b/src/scripttools/debugging/qscriptvalueproperty_p.h
index 83d6b6c2d1..b752272268 100644
--- a/src/scripttools/debugging/qscriptvalueproperty_p.h
+++ b/src/scripttools/debugging/qscriptvalueproperty_p.h
@@ -55,6 +55,7 @@
 
 #include <QtCore/qobjectdefs.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qscopedpointer.h>
 #include <QtScript/qscriptvalue.h>
 
 QT_BEGIN_NAMESPACE
@@ -81,7 +82,7 @@ public:
     bool isValid() const;
 
 private:
-    QScriptValuePropertyPrivate *d_ptr;
+    QScopedSharedPointer<QScriptValuePropertyPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptValueProperty)
 };
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
index faf0936ace..5878db2a0f 100644
--- a/src/scripttools/scripttools.pro
+++ b/src/scripttools/scripttools.pro
@@ -10,3 +10,5 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript
 include(../qbase.pri)
 
 include(debugging/debugging.pri)
+
+symbian:TARGET.UID3=0x2001E625
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index 8e1091bf5f..1b74fb9fc3 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -117,8 +117,6 @@ public:
     QSqlRecord rInf;
 };
 
-static const uint initial_cache_size = 128;
-
 QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res) : q(res), access(0),
     stmt(0), skippedStatus(false), skipRow(false), utf8(false)
 {
diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp
index b5288506ab..4bb56a3c3f 100644
--- a/src/sql/kernel/qsqlfield.cpp
+++ b/src/sql/kernel/qsqlfield.cpp
@@ -159,11 +159,20 @@ public:
 
     \sa setRequiredStatus() setLength() setPrecision() setDefaultValue() setGenerated() setReadOnly()
 */
+QSqlField::QSqlField()
+{
+    d = new QSqlFieldPrivate(QString(),  QVariant::Invalid);
+}
+
+QSqlField::QSqlField(const QString& fieldName)
+{
+    d = new QSqlFieldPrivate(fieldName,  QVariant::Invalid);
+}
+
 QSqlField::QSqlField(const QString& fieldName, QVariant::Type type)
 {
     d = new QSqlFieldPrivate(fieldName, type);
 }
-
 /*!
     Constructs a copy of \a other.
 */
diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h
index 2c3b52af2e..d70af1565f 100644
--- a/src/sql/kernel/qsqlfield.h
+++ b/src/sql/kernel/qsqlfield.h
@@ -58,9 +58,9 @@ class Q_SQL_EXPORT QSqlField
 public:
     enum RequiredStatus { Unknown = -1, Optional = 0, Required = 1 };
 
-    QSqlField(const QString& fieldName = QString(),
-              QVariant::Type type = QVariant::Invalid);
-
+    QSqlField();
+    QSqlField(const QString& fieldName);
+    QSqlField(const QString& fieldName, QVariant::Type type);
     QSqlField(const QSqlField& other);
     QSqlField& operator=(const QSqlField& other);
     bool operator==(const QSqlField& other) const;
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index 93c9d9f2a3..2a1ba6492f 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -53,7 +53,9 @@
 QT_BEGIN_NAMESPACE
 
 struct QHolder {
-    QHolder(const QString& hldr = QString(), int index = -1): holderName(hldr), holderPos(index) {}
+    QHolder(): holderName(QString()), holderPos(-1) {}
+    QHolder(const QString& hldr): holderName(hldr), holderPos(-1) {}
+    QHolder(const QString& hldr, int index): holderName(hldr), holderPos(index) {}
     bool operator==(const QHolder& h) const { return h.holderPos == holderPos && h.holderName == holderName; }
     bool operator!=(const QHolder& h) const { return h.holderPos != holderPos || h.holderName != holderName; }
     QString holderName;
diff --git a/src/sql/sql.pro b/src/sql/sql.pro
index 3cca4e0b3a..60be7486e0 100644
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@@ -17,3 +17,11 @@ include(kernel/kernel.pri)
 include(drivers/drivers.pri)
 include(models/models.pri)
 
+symbian: {
+    TARGET.UID3=0x2001E61D
+    
+    # Workaroud for problems with paging this dll
+    MMP_RULES -= PAGED
+    MMP_RULES *= UNPAGED
+}
+
diff --git a/src/src.pro b/src/src.pro
index 34db728c45..872dbef8f7 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -5,6 +5,9 @@ unset(SRC_SUBDIRS)
 win32:SRC_SUBDIRS += src_winmain
 wince*:{
   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
+} else:symbian {
+  SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_script src_testlib
+  SRC_SUBDIRS += $$QT_SOURCE_TREE/src/s60installs/qt_libs.pro
 } else {
     SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib
     !vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
@@ -30,6 +33,8 @@ contains(QT_CONFIG, webkit)  {
 contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools
 SRC_SUBDIRS += src_plugins
 
+src_s60main.subdir = $$QT_SOURCE_TREE/src/s60main
+src_s60main.target = sub-s60main
 src_winmain.subdir = $$QT_SOURCE_TREE/src/winmain
 src_winmain.target = sub-winmain
 src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap
@@ -84,7 +89,7 @@ src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebCore
 src_webkit.target = sub-webkit
 
 #CONFIG += ordered
-!wince*:!ordered {
+!wince*:!symbian:!ordered {
    src_tools_moc.depends = src_tools_bootstrap
    src_tools_rcc.depends = src_tools_bootstrap
    src_tools_uic.depends = src_tools_bootstrap
@@ -119,6 +124,7 @@ src_webkit.target = sub-webkit
    }
 }
 
+!symbian {
 # This creates a sub-src rule
 sub_src_target.CONFIG = recursive
 sub_src_target.recurse = $$SRC_SUBDIRS
@@ -167,6 +173,7 @@ 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/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index 4e7aadcebc..e7ef4b316f 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -41,8 +41,8 @@
 #ifndef QGRAPHICSSVGITEM_H
 #define QGRAPHICSSVGITEM_H
 
-#include <QtGui/qgraphicsitem.h>
 #include <QtCore/qobject.h>
+#include <QtGui/qgraphicsitem.h>
 
 #ifndef QT_NO_GRAPHICSSVGITEM
 
@@ -89,9 +89,9 @@ private:
 
     // Q_DECLARE_PRIVATE_WITH_BASE(QGraphicsSvgItem, QObject)
     inline QGraphicsSvgItemPrivate *d_func()
-    { return reinterpret_cast<QGraphicsSvgItemPrivate *>(QObject::d_ptr); }
+    { return reinterpret_cast<QGraphicsSvgItemPrivate *>(QObject::d_ptr.data()); }
     inline const QGraphicsSvgItemPrivate *d_func() const
-    { return reinterpret_cast<const QGraphicsSvgItemPrivate *>(QObject::d_ptr); }
+    { return reinterpret_cast<const QGraphicsSvgItemPrivate *>(QObject::d_ptr.data()); }
     friend class QGraphicsSvgItemPrivate;
 
     Q_PRIVATE_SLOT(d_func(), void _q_repaintItem())
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 842752b59b..948647962b 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -567,7 +567,6 @@ QSvgGenerator::~QSvgGenerator()
     if (d->owns_iodevice)
         delete d->engine->outputDevice();
     delete d->engine;
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h
index 0b448341cf..5b60a05b31 100644
--- a/src/svg/qsvggenerator.h
+++ b/src/svg/qsvggenerator.h
@@ -49,6 +49,7 @@
 #include <QtCore/qnamespace.h>
 #include <QtCore/qiodevice.h>
 #include <QtCore/qobjectdefs.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -100,7 +101,7 @@ protected:
     int metric(QPaintDevice::PaintDeviceMetric metric) const;
 
 private:
-    QSvgGeneratorPrivate *d_ptr;
+    QScopedPointer<QSvgGeneratorPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index aef0786e89..662940a5c4 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -40,6 +40,8 @@ SOURCES += \
 
 INCLUDEPATH += ../3rdparty/harfbuzz/src
 
+symbian:TARGET.UID3=0x2001B2E2
+
 #zlib support
 contains(QT_CONFIG, zlib) {
    INCLUDEPATH += ../3rdparty/zlib
diff --git a/src/testlib/3rdparty/cycle_p.h b/src/testlib/3rdparty/cycle_p.h
index b4b687628e..a2924230ad 100644
--- a/src/testlib/3rdparty/cycle_p.h
+++ b/src/testlib/3rdparty/cycle_p.h
@@ -190,6 +190,7 @@ INLINE_ELAPSED(__inline__)
 #endif
 
 /* Visual C++ -- thanks to Morten Nissov for his help with this */
+#if defined(_MSC_VER)
 #if _MSC_VER >= 1200 && (_M_IX86 >= 500 || (defined(_WIN32_WCE) && defined(_X86_))) && !defined(HAVE_TICK_COUNTER)
 #include <windows.h>
 typedef LARGE_INTEGER CycleCounterTicks;
@@ -215,6 +216,7 @@ static __inline double elapsed(CycleCounterTicks t1, CycleCounterTicks t0)
 #define HAVE_TICK_COUNTER
 #define TIME_MIN 5000.0   /* unreliable pentium IV cycle counter */
 #endif
+#endif
 
 #if _MSC_VER >= 1400 && defined(_WIN32_WCE) && !defined(HAVE_TICK_COUNTER)
 #include <windows.h>
@@ -491,4 +493,21 @@ INLINE_ELAPSED(inline)
 #define HAVE_TICK_COUNTER
 #endif
 
+/*----------------------------------------------------------------*/
+/* Symbian */
+#if defined(__SYMBIAN32__) && !defined(HAVE_TICK_COUNTER)
+#include <e32std.h>
+
+typedef TUint32 CycleCounterTicks;
+
+static inline CycleCounterTicks getticks(void)
+{
+    return User::FastCounter();
+}
+
+INLINE_ELAPSED(inline)
+
+#define HAVE_TICK_COUNTER
+#endif
+
 #endif // QBENCHLIB_CYCLE_H
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index 9cdf23237b..35ff3766bf 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -218,6 +218,7 @@ void QTest::setIterationCountHint(int count)
 {
     QBenchmarkTestMethodData::current->adjustIterationCount(count);
 }
+
 /*! \internal
 */
 void QTest::setIterationCount(int count)
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index 7bebaa13f6..db221dd34a 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -54,6 +54,10 @@
 #include "windows.h"
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+#include <e32debug.h>
+#endif
+
 #ifdef Q_OS_WINCE
 #include <QtCore/QString>
 #endif
@@ -159,6 +163,12 @@ namespace QTest {
         // OutputDebugString is not threadsafe
         OutputDebugStringA(str);
         LeaveCriticalSection(&outputCriticalSection);
+#elif defined(Q_OS_SYMBIAN)
+        TPtrC8 ptr(reinterpret_cast<const TUint8*>(str));
+        HBufC* hbuffer = HBufC::NewL(ptr.Length());
+        hbuffer->Des().Copy(ptr);
+        RDebug::Print(_L("[QTestLib Message] %S"), hbuffer);
+        delete hbuffer;
 #endif
         QAbstractTestLogger::outputString(str);
     }
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 8cdfab0cd3..7a6e26859b 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -251,10 +251,17 @@ int main(int argc, char *argv[]) \
 
 #include <QtTest/qtest_gui.h>
 
+#ifdef QT_KEYPAD_NAVIGATION
+#  define QTEST_DISABLE_KEYPAD_NAVIGATION QApplication::setKeypadNavigationEnabled(false);
+#else
+#  define QTEST_DISABLE_KEYPAD_NAVIGATION
+#endif
+
 #define QTEST_MAIN(TestObject) \
 int main(int argc, char *argv[]) \
 { \
     QApplication app(argc, argv); \
+    QTEST_DISABLE_KEYPAD_NAVIGATION \
     TestObject tc; \
     return QTest::qExec(&tc, argc, argv); \
 }
diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h
index c40f0adc38..24dae2e45c 100644
--- a/src/testlib/qtest_global.h
+++ b/src/testlib/qtest_global.h
@@ -52,7 +52,7 @@ QT_MODULE(Test)
 
 #ifdef QTEST_EMBED
 # define Q_TESTLIB_EXPORT
-#elif !defined(QT_SHARED)
+#elif !defined(QT_SHARED) && !(defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT))
 # define Q_TESTLIB_EXPORT
 #else
 # ifdef QTESTLIB_MAKEDLL
@@ -62,10 +62,11 @@ QT_MODULE(Test)
 # endif
 #endif
 
-#if (defined (Q_CC_MSVC) && _MSC_VER < 1310) || defined (Q_CC_SUN) || defined (Q_CC_XLC) || (defined (Q_CC_GNU) && (__GNUC__ - 0 < 3))
+#if (defined (Q_CC_MSVC) && _MSC_VER < 1310) || defined (Q_CC_SUN) || defined (Q_CC_XLC) || (defined (Q_CC_GNU) && (__GNUC__ - 0 < 3)) || defined (Q_CC_NOKIAX86)
 # define QTEST_NO_SPECIALIZATIONS
 #endif
 
+
 #if (defined Q_CC_HPACC) && (defined __ia64)
 # ifdef Q_TESTLIB_EXPORT
 #  undef Q_TESTLIB_EXPORT
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index ac4ca830c1..e6508f2478 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -303,10 +303,15 @@ QT_BEGIN_NAMESPACE
     the \a TestClass, and executes all tests in the order they were defined.
     Use this macro to build stand-alone executables.
 
+    \bold {Note:} On platforms that have keypad navigation enabled by default (eg: Symbian),
+    this macro will forcfully disable it to simplify the usage of key events when writing
+    autotests. If you wish to write a test case that uses keypad navigation, you should
+    enable it either in the \c {initTestCase()} or \c {init()} functions of your test case.
+
     Example:
     \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 11
 
-    \sa QTEST_APPLESS_MAIN(), QTest::qExec()
+    \sa QTEST_APPLESS_MAIN(), QTest::qExec(), QApplication::setKeypadNavigationEnabled()
 */
 
 /*! \macro QTEST_APPLESS_MAIN(TestClass)
@@ -1470,7 +1475,7 @@ static void qInvokeTestMethods(QObject *testObject)
     QTestLog::stopLogging();
 }
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
 class FatalSignalHandler
 {
 public:
@@ -1619,6 +1624,11 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
     }
 #endif
 
+#ifdef Q_OS_SYMBIAN
+//### FIX THIS temporary hack to delay execution of symbian os tests. Used to get emulator to stable state before running testcase
+    qSleep(3000);
+#endif
+
     QTestResult::reset();
 
     QTEST_ASSERT(testObject);
@@ -1641,13 +1651,13 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
     } else
 #endif
     {
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
         FatalSignalHandler handler;
 #endif
         qInvokeTestMethods(testObject);
     }
 
- #ifndef QT_NO_EXCEPTIONS
+#ifndef QT_NO_EXCEPTIONS
      } catch (...) {
          QTestResult::addFailure("Caught unhandled exception", __FILE__, __LINE__);
          if (QTestResult::currentTestFunction()) {
@@ -1661,13 +1671,13 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
              IOPMAssertionRelease(powerID);
          }
 #endif
- #ifdef Q_OS_WIN
+//#  ifdef Q_OS_WIN
          // rethrow exception to make debugging easier
          throw;
- #endif
-         return -1;
+//#  endif
+         return 1;
      }
- #endif
+#  endif
 
     currentTestObject = 0;
 #ifdef QT_MAC_USE_COCOA
@@ -1970,7 +1980,7 @@ bool QTest::compare_helper(bool success, const char *msg, char *val1, char *val2
 \internal
  */
 template <>
-bool QTest::qCompare<float>(float const &t1, float const &t2, const char *actual, const char *expected,
+Q_TESTLIB_EXPORT bool QTest::qCompare<float>(float const &t1, float const &t2, const char *actual, const char *expected,
                     const char *file, int line)
 {
     return qFuzzyCompare(t1, t2)
@@ -1983,7 +1993,7 @@ bool QTest::qCompare<float>(float const &t1, float const &t2, const char *actual
 \internal
  */
 template <>
-bool QTest::qCompare<double>(double const &t1, double const &t2, const char *actual, const char *expected,
+Q_TESTLIB_EXPORT bool QTest::qCompare<double>(double const &t1, double const &t2, const char *actual, const char *expected,
                     const char *file, int line)
 {
     return qFuzzyCompare(t1, t2)
@@ -1993,7 +2003,7 @@ bool QTest::qCompare<double>(double const &t1, double const &t2, const char *act
 }
 
 #define COMPARE_IMPL2(TYPE, FORMAT) \
-template <> char *QTest::toString<TYPE >(const TYPE &t) \
+template <> Q_TESTLIB_EXPORT char *QTest::toString<TYPE >(const TYPE &t) \
 { \
     char *msg = new char[128]; \
     qt_snprintf(msg, 128, #FORMAT, t); \
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index d33ed050b8..95fa51215d 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -125,6 +125,7 @@ namespace QTest
         return 0;
     }
 
+
     Q_TESTLIB_EXPORT char *toHexRepresentation(const char *ba, int length);
     Q_TESTLIB_EXPORT char *toString(const char *);
     Q_TESTLIB_EXPORT char *toString(const void *);
@@ -178,6 +179,7 @@ namespace QTest
                              toString<T>(t1), toString<T>(t2), actual, expected, file, line);
     }
 
+
     template <>
     Q_TESTLIB_EXPORT bool qCompare<float>(float const &t1, float const &t2,
                     const char *actual, const char *expected, const char *file, int line);
@@ -233,7 +235,7 @@ namespace QTest
         return qCompare<qreal>(qreal(t1), t2, actual, expected, file, line);
     }
 
-#elif defined(QT_COORD_TYPE) || defined(QT_ARCH_ARM) || defined(QT_NO_FPU) || defined(QT_ARCH_WINDOWSCE)
+#elif defined(QT_COORD_TYPE) || defined(QT_ARCH_ARM) || defined(QT_NO_FPU) || defined(QT_ARCH_WINDOWSCE) || defined(QT_ARCH_SYMBIAN)
     template <>
     inline bool qCompare<qreal, double>(qreal const &t1, double const &t2, const char *actual,
                                  const char *expected, const char *file, int line)
@@ -289,6 +291,28 @@ namespace QTest
         return compare_string_helper(t1, t2, actual, expected, file, line);
     }
 #else  /* QTEST_NO_SPECIALIZATIONS */
+
+// In Symbian we have QTEST_NO_SPECIALIZATIONS defined, but still float related specialization
+// should be used. If QTEST_NO_SPECIALIZATIONS is enabled we get ambiguous overload errors.
+#if defined(QT_ARCH_SYMBIAN)
+    template <typename T1, typename T2>
+    bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);
+
+    template <>
+    inline bool qCompare<qreal, double>(qreal const &t1, double const &t2, const char *actual,
+                                 const char *expected, const char *file, int line)
+    {
+        return qCompare<float>(float(t1), float(t2), actual, expected, file, line);
+    }
+
+    template <>
+    inline bool qCompare<double, qreal>(double const &t1, qreal const &t2, const char *actual,
+                                 const char *expected, const char *file, int line)
+    {
+        return qCompare<float>(float(t1), float(t2), actual, expected, file, line);
+    }
+#endif
+
     inline bool qCompare(const char *t1, const char *t2, const char *actual,
                          const char *expected, const char *file, int line)
     {
@@ -322,6 +346,17 @@ namespace QTest
         return compare_string_helper(t1, t2, actual, expected, file, line);
     }
 
+    // NokiaX86 and RVCT do not like implicitly comparing bool with int
+#ifndef QTEST_NO_SPECIALIZATIONS
+    template <>
+#endif
+    inline bool qCompare(bool const &t1, int const &t2,
+                    const char *actual, const char *expected, const char *file, int line)
+    {
+        return qCompare<int>(int(t1), t2, actual, expected, file, line);
+    }
+
+
     template <class T>
     inline bool qTest(const T& actual, const char *elementName, const char *actualStr,
                      const char *expected, const char *file, int line)
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index 9740c210c5..00780b46b5 100644
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -44,7 +44,7 @@ SOURCES = qtestcase.cpp \
     qtestlightxmlstreamer.cpp \
     qtestlogger.cpp \
     qtestfilelogger.cpp
-DEFINES += QT_NO_CAST_TO_ASCII \
+DEFINES *= QT_NO_CAST_TO_ASCII \
     QT_NO_CAST_FROM_ASCII \
     QTESTLIB_MAKEDLL \
     QT_NO_DATASTREAM
@@ -67,3 +67,5 @@ QMAKE_TARGET_DESCRIPTION = Qt \
     Unit \
     Testing \
     Library
+
+symbian:TARGET.UID3=0x2001B2DF
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
index b4f9b2ff12..6261b3058d 100644
--- a/src/tools/bootstrap/bootstrap.pri
+++ b/src/tools/bootstrap/bootstrap.pri
@@ -55,7 +55,7 @@ hpux-acc*|hpuxi-acc* {
    unix:LIBS += -lz
 #  win32:LIBS += libz.lib
 }
-win32:LIBS += -luser32
+win32:!win32-mwc:LIBS += -luser32
 
 mac {
     CONFIG -= incremental
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp
index bc58769498..b16adf433d 100644
--- a/src/tools/moc/preprocessor.cpp
+++ b/src/tools/moc/preprocessor.cpp
@@ -515,7 +515,12 @@ void Preprocessor::substituteMacro(const MacroName &macro, Symbols &substituted,
     Symbols saveSymbols = symbols;
     int saveIndex = index;
 
-    symbols = macros.value(macro).symbols;
+    // This is a workaround for a compiler bug that did not like the QHash::value function that
+    // simply did: "return T();" This code should essentially do the same thing but declares the
+    // default instance outside and calls the other QHash::value() implementation that returns
+    // 'dummy' as the default value now.
+    Macro dummy;
+    symbols = macros.value(macro, dummy).symbols;
     index = 0;
 
     safeset += macro;
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index fe3ecf37f9..1fa784b627 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -512,8 +512,8 @@ public:
     bool setContent(QXmlInputSource *source, QXmlReader *reader, QString *errorMsg, int *errorLine, int *errorColumn);
 
     // Attributes
-    QDomDocumentTypePrivate* doctype() { return type; };
-    QDomImplementationPrivate* implementation() { return impl; };
+    QDomDocumentTypePrivate* doctype() { return type.data(); };
+    QDomImplementationPrivate* implementation() { return impl.data(); };
     QDomElementPrivate* documentElement();
 
     // Factories
@@ -537,8 +537,8 @@ public:
     void clear();
 
     // Variables
-    QDomImplementationPrivate* impl;
-    QDomDocumentTypePrivate* type;
+    QScopedSharedPointer<QDomImplementationPrivate> impl;
+    QScopedSharedPointer<QDomDocumentTypePrivate> type;
 
     void saveDocument(QTextStream& stream, const int indent, QDomNode::EncodingPolicy encUsed) const;
 
@@ -3060,7 +3060,7 @@ QDomNamedNodeMapPrivate::~QDomNamedNodeMapPrivate()
 
 QDomNamedNodeMapPrivate* QDomNamedNodeMapPrivate::clone(QDomNodePrivate* p)
 {
-    QDomNamedNodeMapPrivate* m = new QDomNamedNodeMapPrivate(p);
+    QScopedPointer<QDomNamedNodeMapPrivate> m(new QDomNamedNodeMapPrivate(p));
     m->readonly = readonly;
     m->appendToParent = appendToParent;
 
@@ -3073,7 +3073,7 @@ QDomNamedNodeMapPrivate* QDomNamedNodeMapPrivate::clone(QDomNodePrivate* p)
 
     // we are no longer interested in ownership
     m->ref.deref();
-    return m;
+    return m.take();
 }
 
 void QDomNamedNodeMapPrivate::clearMap()
@@ -3499,13 +3499,18 @@ QDomDocumentTypePrivate::~QDomDocumentTypePrivate()
 void QDomDocumentTypePrivate::init()
 {
     entities = new QDomNamedNodeMapPrivate(this);
-    notations = new QDomNamedNodeMapPrivate(this);
-    publicId.clear();
-    systemId.clear();
-    internalSubset.clear();
-
-    entities->setAppendToParent(true);
-    notations->setAppendToParent(true);
+    QT_TRY {
+        notations = new QDomNamedNodeMapPrivate(this);
+        publicId.clear();
+        systemId.clear();
+        internalSubset.clear();
+
+        entities->setAppendToParent(true);
+        notations->setAppendToParent(true);
+    } QT_CATCH(...) {
+        delete entities;
+        QT_RETHROW;
+    }
 }
 
 QDomNodePrivate* QDomDocumentTypePrivate::cloneNode(bool deep)
@@ -6147,8 +6152,8 @@ QDomDocumentPrivate::QDomDocumentPrivate()
     : QDomNodePrivate(0),
       nodeListTime(1)
 {
-    impl = new QDomImplementationPrivate;
-    type = new QDomDocumentTypePrivate(this, this);
+    impl.reset(new QDomImplementationPrivate);
+    type.reset(new QDomDocumentTypePrivate(this, this));
 
     name = QLatin1String("#document");
 }
@@ -6157,8 +6162,8 @@ QDomDocumentPrivate::QDomDocumentPrivate(const QString& aname)
     : QDomNodePrivate(0),
       nodeListTime(1)
 {
-    impl = new QDomImplementationPrivate;
-    type = new QDomDocumentTypePrivate(this, this);
+    impl.reset(new QDomImplementationPrivate);
+    type.reset(new QDomDocumentTypePrivate(this, this));
     type->name = aname;
 
     name = QLatin1String("#document");
@@ -6168,12 +6173,11 @@ QDomDocumentPrivate::QDomDocumentPrivate(QDomDocumentTypePrivate* dt)
     : QDomNodePrivate(0),
       nodeListTime(1)
 {
-    impl = new QDomImplementationPrivate;
+    impl.reset(new QDomImplementationPrivate);
     if (dt != 0) {
-        type = dt;
-        type->ref.ref();
+        type.assign(dt);
     } else {
-        type = new QDomDocumentTypePrivate(this, this);
+        type.reset(new QDomDocumentTypePrivate(this, this));
     }
 
     name = QLatin1String("#document");
@@ -6183,31 +6187,19 @@ QDomDocumentPrivate::QDomDocumentPrivate(QDomDocumentPrivate* n, bool deep)
     : QDomNodePrivate(n, deep),
       nodeListTime(1)
 {
-    impl = n->impl->clone();
-    // Reference count is down to 0, so we set it to 1 here.
-    impl->ref.ref();
-    type = (QDomDocumentTypePrivate*)n->type->cloneNode();
+    impl.assign(n->impl->clone());
+    type.assign((QDomDocumentTypePrivate*)n->type->cloneNode());
     type->setParent(this);
-    // Reference count is down to 0, so we set it to 1 here.
-    type->ref.ref();
 }
 
 QDomDocumentPrivate::~QDomDocumentPrivate()
 {
-    if (!impl->ref.deref())
-        delete impl;
-    if (!type->ref.deref())
-        delete type;
 }
 
 void QDomDocumentPrivate::clear()
 {
-    if (!impl->ref.deref())
-        delete impl;
-    if (!type->ref.deref())
-        delete type;
-    impl = 0;
-    type = 0;
+    impl.assign(0);
+    type.assign(0);
     QDomNodePrivate::clear();
 }
 
@@ -6228,8 +6220,8 @@ bool QDomDocumentPrivate::setContent(QXmlInputSource *source, bool namespaceProc
 bool QDomDocumentPrivate::setContent(QXmlInputSource *source, QXmlReader *reader, QString *errorMsg, int *errorLine, int *errorColumn)
 {
     clear();
-    impl = new QDomImplementationPrivate;
-    type = new QDomDocumentTypePrivate(this, this);
+    impl.reset(new QDomImplementationPrivate);
+    type.reset(new QDomDocumentTypePrivate(this, this));
 
     bool namespaceProcessing = reader->feature(QLatin1String("http://xml.org/sax/features/namespaces"))
         && !reader->feature(QLatin1String("http://xml.org/sax/features/namespace-prefixes"));
@@ -7447,20 +7439,22 @@ bool QDomHandler::characters(const QString&  ch)
     if (node == doc)
         return false;
 
-    QDomNodePrivate *n;
+    QScopedPointer<QDomNodePrivate> n;
     if (cdata) {
-        n = doc->createCDATASection(ch);
+        n.reset(doc->createCDATASection(ch));
     } else if (!entityName.isEmpty()) {
-        QDomEntityPrivate* e = new QDomEntityPrivate(doc, 0, entityName,
-                QString(), QString(), QString());
+        QScopedPointer<QDomEntityPrivate> e(new QDomEntityPrivate(doc, 0, entityName,
+                QString(), QString(), QString()));
         e->value = ch;
-        doc->doctype()->appendChild(e);
-        n = doc->createEntityReference(entityName);
+        doc->doctype()->appendChild(e.data());
+        e.take();
+        n.reset(doc->createEntityReference(entityName));
     } else {
-        n = doc->createTextNode(ch);
+        n.reset(doc->createTextNode(ch));
     }
     n->setLocation(locator->lineNumber(), locator->columnNumber());
-    node->appendChild(n);
+    node->appendChild(n.data());
+    n.take();
 
     return true;
 }
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 3b1726b7d8..96a509d02d 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -272,10 +272,11 @@ class QXmlDefaultHandlerPrivate
 
 class QXmlSimpleReaderPrivate
 {
+public:
+    ~QXmlSimpleReaderPrivate();
 private:
     // functions
-    QXmlSimpleReaderPrivate();
-    ~QXmlSimpleReaderPrivate();
+    QXmlSimpleReaderPrivate(QXmlSimpleReader *reader);
     void initIncrementalParsing();
 
     // used to determine if elements are correctly nested
@@ -312,7 +313,9 @@ private:
 
     // used for parsing of entity references
     struct XmlRef {
-        XmlRef(const QString &_name = QString(), const QString &_value = QString())
+        XmlRef()
+            : index(0) {}
+        XmlRef(const QString &_name, const QString &_value)
             : name(_name), value(_value), index(0) {}
         bool isEmpty() const { return index == value.length(); }
         QChar next() { return value.at(index++); }
@@ -358,7 +361,7 @@ private:
     bool contentCharDataRead;
 
     // helper classes
-    QXmlLocator *locator;
+    QScopedPointer<QXmlLocator> locator;
     QXmlNamespaceSupport namespaceSupport;
 
     // error string
@@ -553,8 +556,8 @@ private:
 
 QXmlParseException::QXmlParseException(const QString& name, int c, int l,
                                        const QString& p, const QString& s)
+    : d(new QXmlParseExceptionPrivate)
 {
-    d = new QXmlParseExceptionPrivate;
     d->msg = name;
     d->column = c;
     d->line = l;
@@ -565,9 +568,10 @@ QXmlParseException::QXmlParseException(const QString& name, int c, int l,
 /*!
     Creates a copy of \a other.
 */
-QXmlParseException::QXmlParseException(const QXmlParseException& other)
+QXmlParseException::QXmlParseException(const QXmlParseException& other) :
+     d(new QXmlParseExceptionPrivate(*other.d))
 {
-    d = new QXmlParseExceptionPrivate(*other.d);
+
 }
 
 /*!
@@ -575,7 +579,6 @@ QXmlParseException::QXmlParseException(const QXmlParseException& other)
 */
 QXmlParseException::~QXmlParseException()
 {
-    delete d;
 }
 
 /*!
@@ -944,8 +947,9 @@ void QXmlNamespaceSupport::popContext()
 */
 void QXmlNamespaceSupport::reset()
 {
+    QXmlNamespaceSupportPrivate *newD = new QXmlNamespaceSupportPrivate;
     delete d;
-    d = new QXmlNamespaceSupportPrivate;
+    d = newD;
 }
 
 
@@ -1276,18 +1280,23 @@ void QXmlInputSource::init()
 {
     d = new QXmlInputSourcePrivate;
 
-    d->inputDevice = 0;
-    d->inputStream = 0;
+    QT_TRY {
+        d->inputDevice = 0;
+        d->inputStream = 0;
 
-    setData(QString());
+        setData(QString());
 #ifndef QT_NO_TEXTCODEC
-    d->encMapper = 0;
+        d->encMapper = 0;
 #endif
-    d->nextReturnedEndOfData = true; // first call to next() will call fetchData()
+        d->nextReturnedEndOfData = true; // first call to next() will call fetchData()
 
-    d->encodingDeclBytes.clear();
-    d->encodingDeclChars.clear();
-    d->lookingForEncodingDecl = true;
+        d->encodingDeclBytes.clear();
+        d->encodingDeclChars.clear();
+        d->lookingForEncodingDecl = true;
+    } QT_CATCH(...) {
+        delete(d);
+        QT_RETHROW;
+    }
 }
 
 /*!
@@ -2731,9 +2740,24 @@ inline void QXmlSimpleReaderPrivate::refClear()
     refValueLen = 0; refArrayPos = 0;
 }
 
-QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate()
+QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader)
 {
+    q_ptr = reader;
     parseStack = 0;
+
+    locator.reset(new QXmlSimpleReaderLocator(reader));
+    entityRes  = 0;
+    dtdHnd     = 0;
+    contentHnd = 0;
+    errorHnd   = 0;
+    lexicalHnd = 0;
+    declHnd    = 0;
+
+    // default feature settings
+    useNamespaces = true;
+    useNamespacePrefixes = false;
+    reportWhitespaceCharData = true;
+    reportEntities = false;
 }
 
 QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate()
@@ -2743,8 +2767,10 @@ QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate()
 
 void QXmlSimpleReaderPrivate::initIncrementalParsing()
 {
-    delete parseStack;
-    parseStack = new QStack<ParseState>;
+    if( parseStack )
+        parseStack->clear();
+    else
+        parseStack = new QStack<ParseState>;
 }
 
 /*********************************************
@@ -3111,25 +3137,8 @@ static NameChar determineNameChar(QChar ch)
 
 */
 QXmlSimpleReader::QXmlSimpleReader()
+    : d_ptr(new QXmlSimpleReaderPrivate(this))
 {
-    d_ptr = new QXmlSimpleReaderPrivate();
-    Q_D(QXmlSimpleReader);
-    d->q_ptr = this;
-
-    d->locator = new QXmlSimpleReaderLocator(this);
-
-    d->entityRes  = 0;
-    d->dtdHnd     = 0;
-    d->contentHnd = 0;
-    d->errorHnd   = 0;
-    d->lexicalHnd = 0;
-    d->declHnd    = 0;
-
-    // default feature settings
-    d->useNamespaces = true;
-    d->useNamespacePrefixes = false;
-    d->reportWhitespaceCharData = true;
-    d->reportEntities = false;
 }
 
 /*!
@@ -3137,9 +3146,6 @@ QXmlSimpleReader::QXmlSimpleReader()
 */
 QXmlSimpleReader::~QXmlSimpleReader()
 {
-    Q_D(QXmlSimpleReader);
-    delete d->locator;
-    delete d;
 }
 
 /*!
@@ -3422,7 +3428,7 @@ bool QXmlSimpleReader::parse(const QXmlInputSource *input, bool incremental)
 
     // call the handler
     if (d->contentHnd) {
-        d->contentHnd->setDocumentLocator(d->locator);
+        d->contentHnd->setDocumentLocator(d->locator.data());
         if (!d->contentHnd->startDocument()) {
             d->reportParseError(d->contentHnd->errorString());
             d->tags.clear();
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index 6ccd44ea4d..18dc332550 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -47,6 +47,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -203,7 +204,7 @@ public:
     QString message() const;
 
 private:
-    QXmlParseExceptionPrivate *d;
+    QScopedPointer<QXmlParseExceptionPrivate> d;
 };
 
 
@@ -272,7 +273,7 @@ public:
 private:
     Q_DISABLE_COPY(QXmlSimpleReader)
     Q_DECLARE_PRIVATE(QXmlSimpleReader)
-    QXmlSimpleReaderPrivate* d_ptr;
+    QScopedPointer<QXmlSimpleReaderPrivate> d_ptr;
 
     friend class QXmlSimpleReaderLocator;
 };
diff --git a/src/xml/xml.pro b/src/xml/xml.pro
index 0c7133cf0e..8d1bf68103 100644
--- a/src/xml/xml.pro
+++ b/src/xml/xml.pro
@@ -18,3 +18,5 @@ win32-borland {
 include(dom/dom.pri)
 include(sax/sax.pri)
 include(stream/stream.pri)
+
+symbian:TARGET.UID3=0x2001B2E0
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
index 06f03e6e39..847d899987 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
@@ -302,7 +302,6 @@ QAbstractXmlNodeModel::QAbstractXmlNodeModel(QAbstractXmlNodeModelPrivate *d) :
  */
 QAbstractXmlNodeModel::~QAbstractXmlNodeModel()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h
index 3d44547b4e..71cd93e3bd 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h
@@ -44,6 +44,7 @@
 
 #include <QtXmlPatterns/QXmlName>
 #include <QtCore/QSharedData>
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
@@ -343,7 +344,7 @@ protected:
         return QXmlNodeModelIndex::create(data, this, additionalData);
     }
 
-    QAbstractXmlNodeModelPrivate *d_ptr;
+    QScopedPointer<QAbstractXmlNodeModelPrivate> d_ptr;
 private:
     friend class QPatternist::ItemMappingIterator<QXmlNodeModelIndex, QXmlNodeModelIndex, const QAbstractXmlNodeModel *, QExplicitlySharedDataPointer<QPatternist::DynamicContext> >;
     friend class QPatternist::SequenceMappingIterator<QXmlNodeModelIndex, QXmlNodeModelIndex, const QAbstractXmlNodeModel *>;
diff --git a/src/xmlpatterns/api/qabstractxmlreceiver.cpp b/src/xmlpatterns/api/qabstractxmlreceiver.cpp
index 38f7594cc9..89bf93974d 100644
--- a/src/xmlpatterns/api/qabstractxmlreceiver.cpp
+++ b/src/xmlpatterns/api/qabstractxmlreceiver.cpp
@@ -224,7 +224,6 @@ QAbstractXmlReceiver::QAbstractXmlReceiver() : d_ptr(0)
  */
 QAbstractXmlReceiver::~QAbstractXmlReceiver()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/xmlpatterns/api/qabstractxmlreceiver.h b/src/xmlpatterns/api/qabstractxmlreceiver.h
index 3093ad243a..d75b54ca40 100644
--- a/src/xmlpatterns/api/qabstractxmlreceiver.h
+++ b/src/xmlpatterns/api/qabstractxmlreceiver.h
@@ -43,6 +43,7 @@
 #define QABSTRACTXMLRECEIVER_H
 
 #include <QtCore/QVariant>
+#include <QtCore/QScopedPointer>
 #include <QtXmlPatterns/QXmlNodeModelIndex>
 
 QT_BEGIN_HEADER
@@ -90,7 +91,7 @@ public:
 
 protected:
     QAbstractXmlReceiver(QAbstractXmlReceiverPrivate *d);
-    QAbstractXmlReceiverPrivate *d_ptr;
+    QScopedPointer<QAbstractXmlReceiverPrivate> d_ptr;
 
     void sendAsNode(const QPatternist::Item &outputItem);
 private:
diff --git a/src/xmlpatterns/api/qxmlresultitems.cpp b/src/xmlpatterns/api/qxmlresultitems.cpp
index 8b62222786..a623a78ad9 100644
--- a/src/xmlpatterns/api/qxmlresultitems.cpp
+++ b/src/xmlpatterns/api/qxmlresultitems.cpp
@@ -85,7 +85,6 @@ QXmlResultItems::QXmlResultItems() : d_ptr(new QXmlResultItemsPrivate())
  */
 QXmlResultItems::~QXmlResultItems()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h
index c3e3393b40..6fc8d523f3 100644
--- a/src/xmlpatterns/api/qxmlresultitems.h
+++ b/src/xmlpatterns/api/qxmlresultitems.h
@@ -43,6 +43,7 @@
 #define QXMLRESULTITEMS
 
 #include <QtCore/QString>
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
@@ -66,7 +67,7 @@ public:
 private:
     friend class QXmlQuery;
     Q_DECLARE_PRIVATE(QXmlResultItems)
-    QXmlResultItemsPrivate *d_ptr;
+    QScopedPointer<QXmlResultItemsPrivate> d_ptr;
     Q_DISABLE_COPY(QXmlResultItems)
 };
 
diff --git a/src/xmlpatterns/data/qabstractfloatcasters.cpp b/src/xmlpatterns/data/qabstractfloatcasters.cpp
index 62477ebea3..2d20a49977 100644
--- a/src/xmlpatterns/data/qabstractfloatcasters.cpp
+++ b/src/xmlpatterns/data/qabstractfloatcasters.cpp
@@ -63,9 +63,19 @@ template <const bool isDouble>
 Item BooleanToAbstractFloatCaster<isDouble>::castFrom(const Item &from,
                                                            const QExplicitlySharedDataPointer<DynamicContext> &context) const
 {
+#if defined(Q_CC_RVCT)
+    // RVCT doesn't like using template parameter in trinary operator when the trinary operator result is
+    // passed directly into another constructor. 
+    bool tempDouble = isDouble;
+    if(from.template as<AtomicValue>()->evaluateEBV(context))
+        return tempDouble ? toItem(CommonValues::DoubleOne) : toItem(CommonValues::FloatOne);
+    else
+        return tempDouble ? toItem(CommonValues::DoubleZero) : toItem(CommonValues::FloatZero);
+#else
     if(from.template as<AtomicValue>()->evaluateEBV(context))
         return isDouble ? toItem(CommonValues::DoubleOne) : toItem(CommonValues::FloatOne);
     else
         return isDouble ? toItem(CommonValues::DoubleZero) : toItem(CommonValues::FloatZero);
+#endif    
 }
 
diff --git a/src/xmlpatterns/data/qschemanumeric.cpp b/src/xmlpatterns/data/qschemanumeric.cpp
index eb1a236547..0f95c0121c 100644
--- a/src/xmlpatterns/data/qschemanumeric.cpp
+++ b/src/xmlpatterns/data/qschemanumeric.cpp
@@ -51,8 +51,7 @@
 #include "qschemanumeric_p.h"
 
 /**
- * @file
- * @short Contains class Numeric. This file was originally called qnumeric.cpp,
+ * @file Contains class Numeric. This file was originally called qnumeric.cpp,
  * but was renamed to stay consistent with qschemanumeric_p.h
  */
 
diff --git a/src/xmlpatterns/functions/qcomparingaggregator.cpp b/src/xmlpatterns/functions/qcomparingaggregator.cpp
index 80260baade..1a7d201dbb 100644
--- a/src/xmlpatterns/functions/qcomparingaggregator.cpp
+++ b/src/xmlpatterns/functions/qcomparingaggregator.cpp
@@ -203,8 +203,13 @@ ComparingAggregator<oper, result>::typeCheck(const StaticContext::Ptr &context,
 
     if(!m_operands.first()->staticType()->cardinality().allowsMany())
         return m_operands.first();
-
+    
+#if defined(Q_CC_RVCT)
+    // explicit scope needed in RVCT
+    ComparingAggregator<oper, result>::prepareComparison(fetchComparator(t1, t1, context));
+#else
     prepareComparison(fetchComparator(t1, t1, context));
+#endif
 
     return me;
 }
diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h
index 11b25dbc13..73c1adc4ff 100644
--- a/src/xmlpatterns/functions/qsequencefns_p.h
+++ b/src/xmlpatterns/functions/qsequencefns_p.h
@@ -146,13 +146,28 @@ namespace QPatternist
          */
         virtual Expression::Ptr compress(const StaticContext::Ptr &context)
         {
+#if defined(Q_CC_RVCT) && !defined(QT_NO_DEBUG)
+            // RVCT doesn't like using template parameter in trinary operator when the trinary operator result is
+            // passed directly into another constructor. 
+            bool tempAssert = (Id == IDExistsFN || Id == IDEmptyFN);
+            Q_ASSERT(tempAssert);
+#else
             Q_ASSERT(Id == IDExistsFN || Id == IDEmptyFN);
+#endif            
+
             const Expression::Ptr me(FunctionCall::compress(context));
 
             if(me != this)
                 return me;
 
+#if defined(Q_CC_RVCT)
+            // RVCT doesn't like using template parameter in trinary operator when the trinary operator result is
+            // passed directly into another constructor. 
+            Expression::ID tempId = Id;
+            const Cardinality myCard((tempId == IDExistsFN) ? Cardinality::oneOrMore() : Cardinality::empty());
+#else
             const Cardinality myCard((Id == IDExistsFN) ? Cardinality::oneOrMore() : Cardinality::empty());
+#endif            
 
             const Cardinality card(m_operands.first()->staticType()->cardinality());
             if(myCard.isMatch(card))
diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp
index 7d8617c849..7d18196ce5 100644
--- a/tests/arthur/common/paintcommands.cpp
+++ b/tests/arthur/common/paintcommands.cpp
@@ -351,7 +351,7 @@ void PaintCommands::staticInit()
                       "^gradient_setCoordinateMode\\s+(\\w*)$",
                       "gradient_setCoordinateMode <coordinate method enum>",
                       "gradient_setCoordinateMode ObjectBoundingMode");
-
+#ifdef QT3_SUPPORT
     DECL_PAINTCOMMANDSECTION("qt3 drawing ops");
     DECL_PAINTCOMMAND("qt3_drawArc", command_qt3_drawArc,
                       "^qt3_drawArc\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
@@ -377,7 +377,7 @@ void PaintCommands::staticInit()
                       "^qt3_drawRoundRect\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s*(-?\\w)?\\s*(-?\\w)?$",
                       "qt3_drawRoundRect <x> <y> <w> <h> [rx] [ry]",
                       "qt3_drawRoundRect 10 10 20 20 3 3");
-
+#endif
     DECL_PAINTCOMMANDSECTION("drawing ops");
     DECL_PAINTCOMMAND("drawPoint", command_drawPoint,
                       "^drawPoint\\s+(-?[\\w.]*)\\s+(-?[\\w.]*)$",
@@ -1237,6 +1237,7 @@ void PaintCommands::command_drawArc(QRegExp re)
     m_painter->drawArc(x, y, w, h, angle, sweep);
 }
 
+#ifdef QT3_SUPPORT
 /***************************************************************************************************/
 void PaintCommands::command_qt3_drawRect(QRegExp re)
 {
@@ -1352,7 +1353,7 @@ void PaintCommands::command_qt3_drawArc(QRegExp re)
     static_cast<Q3Painter*>(m_painter)->drawArc(x, y, w, h, angle, sweep);
 #endif
 }
-
+#endif //QT3_SUPPORT
 /***************************************************************************************************/
 void PaintCommands::command_drawText(QRegExp re)
 {
diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h
index 91aad0f689..2c346d7be7 100644
--- a/tests/arthur/common/paintcommands.h
+++ b/tests/arthur/common/paintcommands.h
@@ -181,12 +181,14 @@ private:
     void command_gradient_setCoordinateMode(QRegExp re);
 
     // commands: drawing ops
+#ifdef QT3_SUPPORT
     void command_qt3_drawArc(QRegExp re);
     void command_qt3_drawChord(QRegExp re);
     void command_qt3_drawEllipse(QRegExp re);
     void command_qt3_drawPie(QRegExp re);
     void command_qt3_drawRect(QRegExp re);
     void command_qt3_drawRoundRect(QRegExp re);
+#endif
     void command_drawArc(QRegExp re);
     void command_drawChord(QRegExp re);
     void command_drawConvexPolygon(QRegExp re);
diff --git a/tests/arthur/common/qengines.cpp b/tests/arthur/common/qengines.cpp
index ce1afe419c..00677ac36f 100644
--- a/tests/arthur/common/qengines.cpp
+++ b/tests/arthur/common/qengines.cpp
@@ -101,6 +101,7 @@ void QtEngines::init()
         m_engines << new GLEngine;
 #endif
 
+#ifndef QT_NO_PRINTER
     m_engines << new PDFEngine
 #ifdef Q_WS_X11
               << new PSEngine
@@ -109,7 +110,8 @@ void QtEngines::init()
 			  << new WinPrintEngine
 #endif
         ;
-
+#endif //QT_NO_PRINTER
+    
     m_foreignEngines << new RSVGEngine;
 }
 
@@ -433,7 +435,7 @@ void WidgetEngine::cleanup()
     delete m_widget;
 }
 
-
+#ifndef QT_NO_PRINTER
 PDFEngine::PDFEngine()
 {
 }
@@ -606,6 +608,7 @@ void PSEngine::cleanup()
     delete printer; printer = 0;
 }
 #endif
+#endif //QT_NO_PRINTER
 
 RSVGEngine::RSVGEngine()
 {
diff --git a/tests/arthur/common/qengines.h b/tests/arthur/common/qengines.h
index 38ec480d11..b7c835320d 100644
--- a/tests/arthur/common/qengines.h
+++ b/tests/arthur/common/qengines.h
@@ -158,6 +158,7 @@ private:
     WidgetEngineWidget *m_widget;
 };
 
+#ifndef QT_NO_PRINTER
 class PDFEngine : public QEngine
 {
 public:
@@ -218,7 +219,7 @@ private:
     QString   m_tempFile;
 };
 #endif
-
+#endif //QT_NO_PRINTER
 
 class RSVGEngine : public QEngine
 {
diff --git a/tests/arthur/lance/lance.pro b/tests/arthur/lance/lance.pro
index ee9e08b6c6..3692f21afa 100644
--- a/tests/arthur/lance/lance.pro
+++ b/tests/arthur/lance/lance.pro
@@ -12,6 +12,12 @@ RESOURCES += icons.qrc
 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
 contains(QT_CONFIG, qt3support):QT += qt3support
 
-QT += xml svg
+symbian*: {
+    testData.sources = $$QT_BUILD_TREE/tests/arthur/data/qps
+    testData.path = .
+    DEPLOYMENT += testData
+}
+
+QT += xml svg 
 
 
diff --git a/tests/arthur/lance/main.cpp b/tests/arthur/lance/main.cpp
index f95b426238..b199cd50b8 100644
--- a/tests/arthur/lance/main.cpp
+++ b/tests/arthur/lance/main.cpp
@@ -199,7 +199,6 @@ static void displayCommands()
            "  pixmap_load filename name_in_script\n"
            "  image_load filename name_in_script\n");
 }
-
 static InteractiveWidget *interactive_widget = 0;
 
 static void runInteractive()
@@ -581,6 +580,7 @@ int main(int argc, char **argv)
 
             case PrinterType:
             {
+#ifndef QT_NO_PRINTER
                 PaintCommands pcmd(QStringList(), 800, 800);
                 pcmd.setVerboseMode(verboseMode);
                 pcmd.setType(type);
@@ -608,11 +608,13 @@ int main(int argc, char **argv)
                 }
 
                 Q_ASSERT(!p.paintingActive());
+#endif
                 break;
             }
             case PsType:
             case PdfType:
             {
+#ifndef QT_NO_PRINTER
                 PaintCommands pcmd(QStringList(), 800, 800);
                 pcmd.setVerboseMode(verboseMode);
                 pcmd.setType(type);
@@ -635,6 +637,7 @@ int main(int argc, char **argv)
                 pt.end();
 
                 printf("write file: %s\n", qPrintable(file));
+#endif
                 break;
             }
             case GrabType:
@@ -657,7 +660,6 @@ int main(int argc, char **argv)
                 printf("%s grabbed to %s\n", qPrintable(files.at(j)), qPrintable(filename));
                 break;
             }
-
             default:
                 break;
             }
@@ -668,7 +670,6 @@ int main(int argc, char **argv)
         QObject::connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));
         app.exec();
     }
-
     delete activeWidget;
 #endif
     return 0;
diff --git a/tests/auto/JoinResults.py b/tests/auto/JoinResults.py
new file mode 100644
index 0000000000..8a98572f60
--- /dev/null
+++ b/tests/auto/JoinResults.py
@@ -0,0 +1,66 @@
+import string, sys, os, datetime, time, re
+import socket
+
+Enviroment=''
+RstPath=''
+QtVersion=''
+
+def JoinResults():
+    timestamp = time.localtime()
+
+    #result_qt_WITH_symbian_ON_2008-05-15_09-42-48_USING_4.4.0-rc1.xml
+    rstFileName = time.strftime(RstPath+'\\result\\result_qt_WITH_symbian_ON_%Y-%m-%d_%H-%M-%S_USING_'+QtVersion+'.xml', timestamp)
+    rst = open(rstFileName,'w')
+
+    rst.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n')
+    rst.write('<Testrun>\n')
+    rst.write('<Environment>\n')
+    rst.write('<HostName>'+socket.gethostname()+'</HostName>\n')
+    rst.write('<MakeSpec>symbian-'+Enviroment+'</MakeSpec>\n')
+    rst.write('</Environment>\n')
+    rst.write(time.strftime('<Timestamp date="%Y-%m-%d" time="%H:%M:%S"/>\n',timestamp))
+
+
+    for root, dirs, files in os.walk(RstPath):
+        for name in files:
+            if not re.search('result_qt_WITH_', name ) and \
+                re.match(name.split('.')[1], 'xml'):
+                rst.write('<TestCase name="'+name.split('.')[0]+'">\n')
+                path = root+'/'+name
+                temp = open(path,'r')
+                templines = temp.readlines()
+                Validate( templines )
+                rst.writelines(templines);
+                temp.close()
+                rst.write('</TestCase>\n')
+
+    rst.write('</Testrun>\n')
+    rst.close
+
+def Validate(lines):
+    regexp1 = re.compile('\s*</TestFunction>\s*')
+    regexp2 = re.compile('\s*<TestFunction name=\s*')
+    regexp1Flag = False
+    regexp2Flag = False
+    for index, line in enumerate(lines):
+        if len(line) > 0 and regexp1.search(line):
+            if regexp1Flag:
+                lines[index] = ''
+            else:
+                regexp1Flag = True
+        elif len(line) > 0 and regexp2.search(line):
+            if regexp2Flag:
+                lines[index] = ''
+            else:
+                regexp2Flag = True
+        else:
+            regexp1Flag = False
+            regexp2Flag = False
+
+
+if __name__ == '__main__':
+    Enviroment = sys.argv[1]
+    RstPath = sys.argv[2]
+    QtVersion = sys.argv[3]
+
+    JoinResults()
diff --git a/tests/auto/_Categories/Qt3Support.txt b/tests/auto/_Categories/Qt3Support.txt
new file mode 100644
index 0000000000..a55523c383
--- /dev/null
+++ b/tests/auto/_Categories/Qt3Support.txt
@@ -0,0 +1,51 @@
+q3accel
+q3action
+q3actiongroup
+q3buttongroup
+q3canvas
+q3checklistitem
+q3combobox
+q3cstring
+q3databrowser
+q3dateedit
+q3datetimeedit
+q3deepcopy
+q3dict
+q3dns
+q3dockwindow
+q3filedialog
+q3frame
+q3groupbox
+q3hbox
+q3header
+q3iconview
+q3listbox
+q3listview
+q3listviewitemiterator
+q3mainwindow
+q3popupmenu
+q3process
+q3progressbar
+q3progressdialog
+q3ptrlist
+q3richtext
+q3scrollview
+q3semaphore
+q3serversocket
+q3socket
+q3socketdevice
+q3sqlcursor
+q3sqlselectcursor
+q3stylesheet
+q3tabdialog
+q3table
+q3textbrowser
+q3textedit
+q3textstream
+q3timeedit
+q3toolbar
+q3uridrag
+q3urloperator
+q3valuelist
+q3valuevector
+q3widgetstack
diff --git a/tests/auto/_Categories/QtCore.txt b/tests/auto/_Categories/QtCore.txt
new file mode 100644
index 0000000000..7238bf88dd
--- /dev/null
+++ b/tests/auto/_Categories/QtCore.txt
@@ -0,0 +1,108 @@
+# QtCore
+
+collections
+exceptionsafety
+qabstractitemmodel
+#Requires STL
+qalgorithms 
+qatomicint
+qatomicpointer
+qbitarray
+qbuffer
+qbytearray
+qbytearraymatcher
+qcache
+qchar
+qcoreapplication
+qcryptographichash
+qdatastream
+qdate
+qdatetime
+qdebug
+qdir
+qdiriterator
+qevent
+qeventloop
+qexplicitlyshareddatapointer
+qfile cetest-subdir: test
+qfileinfo
+qfilesystemwatcher
+qflags
+qfuture
+qfuturewatcher
+qgetputenv
+qglobal
+qhash
+qiodevice
+qlibrary cetest-subdir: tst
+qline
+qlist
+qlocale cetest-subdir: test
+qmap
+qmetaobject
+qmetatype
+qmutex
+qmutexlocker
+qnumeric
+qobject cetest-pro: tst_qobject.pro
+qobjectperformance
+qobjectrace
+qplugin cetest-pro: tst_qplugin.pro
+qpluginloader cetest-subdir: tst
+qpoint
+qpointer
+qprocess cetest-subdir: test
+qqueue
+qrand
+qreadlocker
+qreadwritelock
+qrect
+qregexp
+qresourceengine
+qsemaphore
+qset
+qsettings
+qsharedmemory cetest-subdir: test
+qsharedpointer
+qsignalmapper
+qsignalspy
+qsize
+qsizef
+qsocketnotifier
+#Requires STL
+qstl 
+qstring
+qstringlist
+qstringmatcher
+qsysinfo
+qsystemsemaphore cetest-subdir: test
+#qtconcurrentfilter Not supported yet for s60 -> skip(std)
+# Uses std, though unclear if it is actually needed. To be re-investigated when QT_NO_CONCURRENT is removed.
+#qtconcurrentiteratekernel
+#qtconcurrentmap not supported yet for s60 -> skip(std)
+qtconcurrentrun
+qtconcurrentthreadengine
+qtemporaryfile
+qtextboundaryfinder
+qtextcodec
+qtextstream cetest-subdir: test
+qthread
+qthreadonce
+qthreadpool
+qthreadstorage
+qtime
+qtimeline
+qtimer
+# Requires MD5 Qt solutions to work
+#qtmd5
+qtranslator
+qurl
+quuid
+qvariant
+qvarlengtharray
+qvector
+qwaitcondition
+qwineventnotifier
+qwritelocker
+q_func_info
+utf8
diff --git a/tests/auto/_Categories/QtDBus.txt b/tests/auto/_Categories/QtDBus.txt
new file mode 100644
index 0000000000..26490f1460
--- /dev/null
+++ b/tests/auto/_Categories/QtDBus.txt
@@ -0,0 +1,15 @@
+qdbusabstractadaptor
+qdbusconnection
+qdbuscontext
+qdbusinterface
+qdbuslocalcalls
+qdbusmarshall
+qdbusmetaobject
+qdbusmetatype
+qdbuspendingcall
+qdbuspendingreply
+qdbusperformance
+qdbusreply
+qdbusserver
+qdbusthreading
+qdbusxmlparser
diff --git a/tests/auto/_Categories/QtGui.txt b/tests/auto/_Categories/QtGui.txt
new file mode 100644
index 0000000000..b03a870bfc
--- /dev/null
+++ b/tests/auto/_Categories/QtGui.txt
@@ -0,0 +1,192 @@
+languagechange
+modeltest
+qabstractbutton
+qabstractitemview
+#qabstractprintdialog NO PRINTING SUPPORT
+qabstractproxymodel
+qabstractscrollarea
+qabstractslider
+qabstractspinbox
+qabstracttextdocumentlayout
+#qaccessibility Requires sql support -> disabled for now
+#qaccessibility_mac
+qaction
+qactiongroup
+qapplication cetest-subdir: test
+qboxlayout
+qbrush
+qbuttongroup
+qcalendarwidget
+qcheckbox
+qclipboard cetest-subdir: test
+qcolor
+qcolordialog
+qcolumnview
+qcombobox
+qcommandlinkbutton
+qcompleter
+qcomplextext
+#qcopchannel QCOP NOT SUPPORTED
+qcssparser
+qdatawidgetmapper
+qdatetimeedit
+qdesktopservices
+qdesktopwidget
+qdial
+qdialog
+qdialogbuttonbox
+qdirectpainter cetest-subdir: test
+qdirmodel
+qdockwidget
+qdoublespinbox
+qdoublevalidator
+qdrag 
+qerrormessage
+qfiledialog
+qfileiconprovider
+qfilesystemmodel
+qfocusevent
+qfocusframe
+qfont
+qfontcombobox
+qfontdatabase
+qfontdialog
+qfontmetrics
+qformlayout
+qgraphicsgridlayout
+qgraphicsitem
+qgraphicsitemanimation
+qgraphicslayout
+qgraphicslayoutitem
+qgraphicslinearlayout
+qgraphicspixmapitem
+qgraphicspolygonitem
+qgraphicsproxywidget
+qgraphicsscene
+qgraphicsview
+qgraphicswidget
+qgridlayout
+qgroupbox
+qguivariant
+qheaderview
+qicoimageformat
+qicon
+qimage
+qimageiohandler
+qimagereader
+qimagewriter
+qinputdialog
+qintvalidator
+qitemdelegate
+qitemeditorfactory
+qitemmodel
+qitemselectionmodel
+qitemview
+qkeyevent
+qkeysequence
+qlabel
+qlayout
+qlcdnumber
+qlineedit
+qlistview
+qlistwidget
+#qmacstyle
+qmainwindow
+#qmdiarea Not relevant for S60, skip for now
+#qmdisubwindow not relevant for S60, skip for now
+qmenu
+qmenubar
+#qmessagebox that's a hanger
+qmouseevent
+qmouseevent_modal
+qmovie
+qmultiscreen
+qpaintengine
+qpainter
+qpainterpath
+qpainterpathstroker
+qpalette
+qpathclipper
+qpen
+qpicture
+qpixmap
+qpixmapcache
+qpixmapfilter
+qplaintextedit
+qpointarray
+#qprinter NO PRINTING SUPPORT ON SYMBIAN YET
+#qprinterinfo
+qprogressbar
+qprogressdialog
+qpushbutton
+qradiobutton
+qregexpvalidator
+qregion
+qscrollarea
+qscrollbar
+qshortcut
+qsidebar
+qsizegrip
+qslider
+qsortfilterproxymodel
+qsound
+qspinbox
+qsplitter
+qstackedlayout
+qstackedwidget
+qstandarditem
+qstandarditemmodel
+qstatusbar
+qstringlistmodel
+qstyle
+qstyleoption
+qstylesheetstyle
+qsyntaxhighlighter
+#qsystemtrayicon not relevant for s60, skip for now
+qtabbar
+qtableview
+qtablewidget
+qtabwidget
+qtessellator
+qtextblock
+qtextbrowser
+qtextcursor
+qtextdocument
+qtextdocumentfragment
+qtextdocumentlayout
+qtextedit
+qtextformat
+qtextlayout
+qtextlist
+qtextobject
+qtextodfwriter
+#This test can only be compiled on HW currently, because it does not use reduced exports
+#Because we are planning to use class level exports also in HW later on, there is no 
+#sense to enable this at all
+#qtextpiecetable
+qtextscriptengine
+qtexttable
+qtoolbar
+qtoolbox
+qtoolbutton
+qtooltip
+qtransform
+qtransformedscreen
+qtreeview
+qtreewidget
+qtreewidgetitemiterator
+qtwidgets
+qundogroup
+qundostack
+qwidget
+qwidgetaction
+qwidget_window
+qwindowsurface
+qwizard
+qwmatrix
+qworkspace
+qwsembedwidget
+qwsinputmethod
+qwswindowsystem
+qx11info
+qzip
diff --git a/tests/auto/_Categories/QtHelp.txt b/tests/auto/_Categories/QtHelp.txt
new file mode 100644
index 0000000000..89e01fc380
--- /dev/null
+++ b/tests/auto/_Categories/QtHelp.txt
@@ -0,0 +1,5 @@
+qhelpcontentmodel
+qhelpenginecore
+qhelpgenerator
+qhelpindexmodel
+qhelpprojectdata
diff --git a/tests/auto/_Categories/QtNetwork.txt b/tests/auto/_Categories/QtNetwork.txt
new file mode 100644
index 0000000000..f5d191d1bc
--- /dev/null
+++ b/tests/auto/_Categories/QtNetwork.txt
@@ -0,0 +1,31 @@
+_networkselftest
+#qsocketnotifier
+qabstractnetworkcache
+qabstractsocket
+qftp
+qhostaddress
+qhostinfo
+qhttp
+qhttpnetworkconnection
+qhttpnetworkreply
+qhttpsocketengine
+qlocalsocket cetest-subdir: test
+qnativesocketengine
+qnetworkaddressentry
+qnetworkcachemetadata
+qnetworkcookie
+qnetworkcookiejar
+qnetworkdiskcache
+qnetworkinterface
+qnetworkproxy
+qnetworkreply cetest-subdir: test
+qnetworkrequest
+qsocks5socketengine
+qsslcertificate
+qsslcipher
+qsslerror
+qsslkey
+qsslsocket
+qtcpserver cetest-subdir: test
+qtcpsocket cetest-subdir: test
+qudpsocket cetest-subdir: test
diff --git a/tests/auto/_Categories/QtOpenGl.txt b/tests/auto/_Categories/QtOpenGl.txt
new file mode 100644
index 0000000000..a4e12badbc
--- /dev/null
+++ b/tests/auto/_Categories/QtOpenGl.txt
@@ -0,0 +1 @@
+qgl
\ No newline at end of file
diff --git a/tests/auto/_Categories/QtScript.txt b/tests/auto/_Categories/QtScript.txt
new file mode 100644
index 0000000000..abd93a4bff
--- /dev/null
+++ b/tests/auto/_Categories/QtScript.txt
@@ -0,0 +1,13 @@
+qscriptable
+qscriptclass
+qscriptcontext
+qscriptcontextinfo
+qscriptengine
+qscriptengineagent
+#qscriptenginedebugger does not compile, requires QtScriptTools.lib
+qscriptjstestsuite
+qscriptqobject
+qscriptstring
+qscriptv8testsuite
+qscriptvalue
+qscriptvalueiterator
diff --git a/tests/auto/_Categories/QtSql.txt b/tests/auto/_Categories/QtSql.txt
new file mode 100644
index 0000000000..1232500962
--- /dev/null
+++ b/tests/auto/_Categories/QtSql.txt
@@ -0,0 +1,12 @@
+qsql
+qsqlbatch
+qsqldatabase
+qsqldriver
+qsqlerror
+qsqlfield
+qsqlquery
+qsqlquerymodel
+qsqlrecord
+qsqlrelationaltablemodel
+qsqltablemodel
+qsqlthread
diff --git a/tests/auto/_Categories/QtSvg.txt b/tests/auto/_Categories/QtSvg.txt
new file mode 100644
index 0000000000..8bd3cb2697
--- /dev/null
+++ b/tests/auto/_Categories/QtSvg.txt
@@ -0,0 +1,3 @@
+qsvgdevice
+qsvggenerator
+qsvgrenderer
diff --git a/tests/auto/_Categories/QtTest.txt b/tests/auto/_Categories/QtTest.txt
new file mode 100644
index 0000000000..082a028349
--- /dev/null
+++ b/tests/auto/_Categories/QtTest.txt
@@ -0,0 +1 @@
+selftests
diff --git a/tests/auto/_Categories/QtWebkit.txt b/tests/auto/_Categories/QtWebkit.txt
new file mode 100644
index 0000000000..5c29b205ae
--- /dev/null
+++ b/tests/auto/_Categories/QtWebkit.txt
@@ -0,0 +1,2 @@
+qwebframe
+qwebpage
diff --git a/tests/auto/_Categories/QtXml.txt b/tests/auto/_Categories/QtXml.txt
new file mode 100644
index 0000000000..ec5664610e
--- /dev/null
+++ b/tests/auto/_Categories/QtXml.txt
@@ -0,0 +1,5 @@
+qdom
+qxml
+qxmlinputsource
+qxmlsimplereader
+qxmlstream
diff --git a/tests/auto/_Categories/QtXmlPatterns.txt b/tests/auto/_Categories/QtXmlPatterns.txt
new file mode 100644
index 0000000000..17de3efd80
--- /dev/null
+++ b/tests/auto/_Categories/QtXmlPatterns.txt
@@ -0,0 +1,27 @@
+checkxmlfiles
+patternistexamplefiletree
+patternistexamples
+patternistheaders
+qabstractmessagehandler
+qabstracturiresolver
+qabstractxmlforwarditerator
+qabstractxmlnodemodel
+qabstractxmlreceiver
+qapplicationargumentparser
+qautoptr
+qsimplexmlnodemodel
+qsourcelocation
+qtokenautomaton
+qxmlformatter
+qxmlitem
+qxmlname
+qxmlnamepool
+qxmlnodemodelindex
+qxmlquery
+qxmlresultitems
+qxmlserializer
+xmlpatterns
+xmlpatternsdiagnosticsts
+xmlpatternsview
+xmlpatternsxqts
+xmlpatternsxslts
diff --git a/tests/auto/_Categories/all_categories.txt b/tests/auto/_Categories/all_categories.txt
new file mode 100644
index 0000000000..cc31f4b2cf
--- /dev/null
+++ b/tests/auto/_Categories/all_categories.txt
@@ -0,0 +1,16 @@
+#unsorted
+
+atwrapper
+bic
+compile
+compilerwarnings
+headers
+macgui
+macplist
+symbols
+uiloader
+moc
+rcc
+uic
+uic3
+qmake
\ No newline at end of file
diff --git a/tests/auto/_Categories/phonon.txt b/tests/auto/_Categories/phonon.txt
new file mode 100644
index 0000000000..67911b3f12
--- /dev/null
+++ b/tests/auto/_Categories/phonon.txt
@@ -0,0 +1,2 @@
+mediaobject
+mediaobject_wince_ds9
diff --git a/tests/auto/_Categories/qmake.txt b/tests/auto/_Categories/qmake.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/auto/_Categories/qmake.txt
diff --git a/tests/auto/_networkselftest/_networkselftest.pro b/tests/auto/_networkselftest/_networkselftest.pro
index 9e2ad0e91b..a2e1adf5b5 100644
--- a/tests/auto/_networkselftest/_networkselftest.pro
+++ b/tests/auto/_networkselftest/_networkselftest.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES += tst_networkselftest.cpp
 QT = core network
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
 
diff --git a/tests/auto/_networkselftest/tst_networkselftest.cpp b/tests/auto/_networkselftest/tst_networkselftest.cpp
index cb82733214..cfb5c3caa3 100644
--- a/tests/auto/_networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/_networkselftest/tst_networkselftest.cpp
@@ -43,9 +43,17 @@
 #include <QtNetwork/QtNetwork>
 #include "../network-settings.h"
 
+#if defined(Q_OS_SYMBIAN)
+#define SRCDIR ""
+#endif
+
 class tst_NetworkSelfTest: public QObject
 {
     Q_OBJECT
+public:
+    tst_NetworkSelfTest();
+    virtual ~tst_NetworkSelfTest();    
+    
 private slots:
     void hostTest();
     void dnsResolution_data();
@@ -60,7 +68,7 @@ private slots:
     void httpServer();
     void httpsServer();
     void httpProxy();
-    void httpProxyBasicAuth();
+    void httpProxyBasicAuth(); 
     void httpProxyNtlmAuth();
     void socks5Proxy();
     void socks5ProxyAuth();
@@ -303,6 +311,15 @@ static void netChat(int port, const QList<Chat> &chat)
     }
 }
 
+tst_NetworkSelfTest::tst_NetworkSelfTest()
+{
+    Q_SET_DEFAULT_IAP
+}
+
+tst_NetworkSelfTest::~tst_NetworkSelfTest()
+{
+}
+
 void tst_NetworkSelfTest::hostTest()
 {
     // this is a localhost self-test
@@ -354,13 +371,18 @@ void tst_NetworkSelfTest::remotePortsOpen_data()
     QTest::newRow("https") << 443;
     QTest::newRow("http-proxy") << 3128;
     QTest::newRow("http-proxy-auth-basic") << 3129;
-    QTest::newRow("http-proxy-auth-ntlm") << 3130;
+    QTest::newRow("http-proxy-auth-ntlm") << 3130;      
     QTest::newRow("socks5-proxy") << 1080;
     QTest::newRow("socks5-proxy-auth") << 1081;
 }
 
 void tst_NetworkSelfTest::remotePortsOpen()
 {
+#ifdef Q_OS_SYMBIAN
+    if (qstrcmp(QTest::currentDataTag(), "http-proxy-auth-ntlm") == 0)
+        QSKIP("NTML authentication not yet supported in Symbian", SkipSingle);
+#endif    
+    
     QFETCH(int, portNumber);
     QTcpSocket socket;
     socket.connectToHost(QtNetworkSettings::serverName(), portNumber);
@@ -514,6 +536,9 @@ void tst_NetworkSelfTest::httpProxyBasicAuth()
 
 void tst_NetworkSelfTest::httpProxyNtlmAuth()
 {
+#ifdef Q_OS_SYMBIAN
+    QSKIP("NTML authentication not yet supported in Symbian", SkipAll);
+#else    
     netChat(3130, QList<Chat>()
             // test auth required response
             << Chat::send("GET http://" + QtNetworkSettings::serverName().toLatin1() + "/ HTTP/1.0\r\n"
@@ -526,6 +551,7 @@ void tst_NetworkSelfTest::httpProxyNtlmAuth()
             << Chat::discardUntil("\r\nProxy-Authenticate: NTLM\r\n")
             << Chat::DiscardUntilDisconnect
             );
+#endif            
 }
 
 // SOCKSv5 is a binary protocol
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index b4a660003e..1e349d8272 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,3 +1,4 @@
+QT = core
 TEMPLATE = subdirs
 
 # Directories
@@ -245,6 +246,7 @@ SUBDIRS += _networkselftest \
            qprogressdialog \
            qpropertyanimation \
            qpushbutton \
+           qscopedpointer \
            qqueue \
            qradiobutton \
            qreadlocker \
diff --git a/tests/auto/autobuildruncategory.bat b/tests/auto/autobuildruncategory.bat
new file mode 100644
index 0000000000..3f434ee74c
--- /dev/null
+++ b/tests/auto/autobuildruncategory.bat
@@ -0,0 +1,11 @@
+@echo off
+REM Compile all test cases from given category file
+
+REM Create root directory for autotest results
+IF NOT EXIST %3 MKDIR %3
+
+REM Set Module variable
+FOR /F %%i IN ("%1") DO SET MODULE=%%~ni
+
+REM run single test
+FOR /F "eol=# tokens=1*" %%i in (%1) do CALL autobuildrunsingle.bat %2 %%i %3 %4 %%j %%k
diff --git a/tests/auto/autobuildrunsingle.bat b/tests/auto/autobuildrunsingle.bat
new file mode 100644
index 0000000000..adb9871924
--- /dev/null
+++ b/tests/auto/autobuildrunsingle.bat
@@ -0,0 +1,71 @@
+@echo off
+REM  runtest
+
+SET QTVERSION=%4
+
+IF %1 == winscw goto winscw:
+IF %1 == armv5 goto armv5:
+IF %1 == gcce goto gcce:
+goto end:
+
+:winscw
+IF EXIST \epoc32\release\winscw\udeb\tst_%2.exe (
+	call \epoc32\release\winscw\udeb\tst_%2.exe -lightxml
+	if ERRORLEVEL 1 (		
+		echo ^<TestFunction name="PANIC"^> >> \Epoc32\winscw\c\system\data\out.txt
+		echo ^<Incident type="fail" file="" line="0"^> >> \Epoc32\winscw\c\system\data\out.txt
+		echo ^<DataTag^>^<![CDATA[ message ]]^>^</DataTag^> >> \Epoc32\winscw\c\system\data\out.txt
+		echo ^<Description^>^<![CDATA['MESSAGE: TEST CASE PANICS]]^>^</Description^> >> \Epoc32\winscw\c\system\data\out.txt
+		echo ^</Incident^> >> \Epoc32\winscw\c\system\data\out.txt
+		echo ^</TestFunction^> >> \Epoc32\winscw\c\system\data\out.txt )
+	copy /Y \Epoc32\winscw\c\system\data\out.txt %3\%2.xml 
+	goto end:
+) ELSE (
+goto notExist:
+)
+
+:ARMV5
+IF EXIST \epoc32\release\armv5\urel\tst_%2.exe (
+    pushd .
+    cd %2
+    IF _%5 == _cetest-subdir: (
+        echo Running cetest from subdir: %6
+        cd %6
+    )
+    IF _%5 == _cetest-pro: (
+    	call cetest -release -f %6 -project-delete -lightxml -o %3\%2.xml
+    ) ELSE (
+    	call cetest -release -project-delete -lightxml -o %3\%2.xml
+    )
+    if EXIST %3\%2.xml if ERRORLEVEL 1 (
+		echo ^<TestFunction name="PANIC"^> >> %3\%2.xml
+		echo ^<Incident type="fail" file="" line="0"^> >> %3\%2.xml
+		echo ^<DataTag^>^<![CDATA[ message ]]^>^</DataTag^> >> %3\%2.xml
+		echo ^<Description^>^<![CDATA['MESSAGE: TEST CASE PANICS]]^>^</Description^> >> %3\%2.xml
+		echo ^</Incident^> >> %3\%2.xml
+		echo ^</TestFunction^> >> %3\%2.xml
+		)
+    popd
+	goto end:
+) ELSE (
+goto notExist:
+)
+
+:gcce
+goto end:
+
+:notExist
+echo AAA: %3\%2.xml
+echo ^<Environment^> >> %3\%2.xml
+echo ^<QtVersion^>%QTVERSION%^</QtVersion^> >> %3\%2.xml
+echo ^<QTestVersion^>%QTVERSION%^</QTestVersion^> >> %3\%2.xml
+echo ^</Environment^> >> %3\%2.xml
+echo ^<TestFunction name="initTestCase"^> >> %3\%2.xml
+echo ^<Incident type="fail" file="" line="0"^> >> %3\%2.xml
+echo ^<DataTag^>^<![CDATA[ message ]]^>^</DataTag^> >> %3\%2.xml
+echo ^<Description^>^<![CDATA['MESSAGE: COMPILE FAIL]]^>^</Description^> >> %3\%2.xml
+echo ^</Incident^> >> %3\%2.xml
+echo ^</TestFunction^> >> %3\%2.xml
+goto end:
+
+:end
diff --git a/tests/auto/autobuildtests.bat b/tests/auto/autobuildtests.bat
new file mode 100644
index 0000000000..55ffad7585
--- /dev/null
+++ b/tests/auto/autobuildtests.bat
@@ -0,0 +1,19 @@
+@echo off
+REM NOTE: If this script is modified, it is likely that next automatic test will fail horribly,
+REM       unless manual pull from repository is done before running it.
+
+
+REM Sync git
+cd ..\..\
+call git clean -dfx
+//call git reset --hard
+call git pull
+
+
+REM Auto tests builder
+REM 1. argument is enviroment: wincw, armv5 or gcce
+REM 2. argument is result's path: like \autotestResults
+REM 3. argument is path to pscp.exe: like c:\
+
+call tests\auto\autobuildtestsmain.bat %1 %2 %3
+
diff --git a/tests/auto/autobuildtestsmain.bat b/tests/auto/autobuildtestsmain.bat
new file mode 100644
index 0000000000..33ccd15512
--- /dev/null
+++ b/tests/auto/autobuildtestsmain.bat
@@ -0,0 +1,38 @@
+@echo off
+SET QTVERSION=4.4.2
+
+IF NOT EXIST %2\result\sent MKDIR %2\result\sent
+
+REM Delete old results
+del /Q %2\*.*
+
+REM Build enviroment
+set path=%cd%\bin;%path%
+make confclean
+configure -cetest -platform win32-mwc -xplatform symbian-abld -openssl-linked -qconfig symbian
+call bldmake bldfiles
+call abld clean 
+call abld reallyclean
+IF %1 == winscw call abld build winscw udeb
+IF %1 == armv5 call abld build armv5 urel
+IF %1 == gcce call abld build gcce urel
+
+REM Build auto tests
+cd \qts60\tests\auto
+for %%i in (QtCore QtGui QtNetwork QtXml QtSvg QtScript) do call compilecategory.bat _Categories\%%i.txt %1
+
+
+REM run auto tests
+cd \qts60\tests\auto
+for %%i in (QtCore QtGui QtNetwork QtXml QtSvg QtScript) do call autobuildruncategory.bat _Categories\%%i.txt %1 %2 %QTVERSION%
+
+REM Collect test results
+cd \qts60\tests\auto
+echo call python joinresults.py %1 %2 %QTVERSION%
+call python joinresults.py %1 %2 %QTVERSION%
+
+REM send the result file
+call %3pscp.exe -i "%USERPROFILE%\.ssh\puttyssh.ppk" %2\Result\*.xml qtestmaster@kramer-nokia.troll.no:/home/qtestmaster/results
+
+REM Copy the result file to different directory that it not sent again
+move %2\Result\*.xml %2\Result\sent
diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro
index 96985c9c5e..c368c02114 100644
--- a/tests/auto/checkxmlfiles/checkxmlfiles.pro
+++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro
@@ -6,7 +6,7 @@ QT -= gui
 
 include (../xmlpatterns.pri)
 
-wince*: {
+wince*|symbian*: {
 QT += network
 addFiles.sources = \
 	$$QT_SOURCE_TREE/examples/sql/masterdetail/albumdetails.xml \
diff --git a/tests/auto/collections/collections.pro b/tests/auto/collections/collections.pro
index f47c2eb2e5..876e9034c4 100644
--- a/tests/auto/collections/collections.pro
+++ b/tests/auto/collections/collections.pro
@@ -1,7 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_collections.cpp
-
-
 QT = core
-
-
diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp
index b457cc8efb..6102530135 100644
--- a/tests/auto/collections/tst_collections.cpp
+++ b/tests/auto/collections/tst_collections.cpp
@@ -1364,6 +1364,9 @@ void tst_Collections::byteArray()
         ba1 = "FooFoo";
         ba1.replace(char('F'), ba1);
         QCOMPARE(ba1, QByteArray("FooFooooFooFoooo"));
+        ba1 = "FooFoo";
+        ba1.replace(char('o'), ba1);
+        QCOMPARE(ba1, QByteArray("FFooFooFooFooFFooFooFooFoo"));
 
         ba1.replace(ba1, "xxx");
         QCOMPARE(ba1, QByteArray("xxx"));
@@ -2354,6 +2357,9 @@ void tst_Collections::qstring()
         str1 = "FooFoo";
         str1.replace(char('F'), str1);
         QCOMPARE(str1, QString("FooFooooFooFoooo"));
+        str1 = "FooFoo";
+        str1.replace(char('o'), str1);
+        QCOMPARE(str1, QString("FFooFooFooFooFFooFooFooFoo"));
 
         str1 = "Foo";
         str1.replace("Foo", str1);
diff --git a/tests/auto/compilecategory.bat b/tests/auto/compilecategory.bat
new file mode 100644
index 0000000000..59e31b56e8
--- /dev/null
+++ b/tests/auto/compilecategory.bat
@@ -0,0 +1,4 @@
+@echo off
+REM Compile all test cases from given gategory file
+
+FOR /F "eol=# tokens=1*" %%i in (%1) do CALL compilesingle.bat %%i %2
diff --git a/tests/auto/compilerwarnings/compilerwarnings.pro b/tests/auto/compilerwarnings/compilerwarnings.pro
index 9e16c5ee96..beb0279094 100644
--- a/tests/auto/compilerwarnings/compilerwarnings.pro
+++ b/tests/auto/compilerwarnings/compilerwarnings.pro
@@ -1,5 +1,4 @@
 load(qttest_p4)
 SOURCES += tst_compilerwarnings.cpp
 QT = core
-
 RESOURCES = compilerwarnings.qrc
diff --git a/tests/auto/compilesingle.bat b/tests/auto/compilesingle.bat
new file mode 100644
index 0000000000..a9bb5f469c
--- /dev/null
+++ b/tests/auto/compilesingle.bat
@@ -0,0 +1,28 @@
+@echo off
+REM Compile test case from folder as a parameter
+
+pushd .
+cd %1
+REM call abld reallyclean
+call qmake -r
+call bldmake bldfiles
+
+REM reallyclean is not always deleting executables for some reason, so do that explicitly before building
+
+IF %2 == winscw (
+call abld reallyclean winscw
+call del /q /f \epoc32\release\winscw\udeb\tst_%1.exe
+call abld build winscw udeb
+)
+IF %2 == armv5 (
+call abld reallyclean armv5
+call del /q /f \epoc32\release\armv5\urel\tst_%1.exe
+call abld build armv5 urel
+)
+IF %2 == gcce (
+call abld reallyclean gcce
+call del /q /f \epoc32\release\gcce\urel\tst_%1.exe
+call abld build gcce urel
+)
+
+popd
\ No newline at end of file
diff --git a/tests/auto/exceptionsafety/exceptionsafety.pro b/tests/auto/exceptionsafety/exceptionsafety.pro
index 23b8f73528..d162219f7c 100644
--- a/tests/auto/exceptionsafety/exceptionsafety.pro
+++ b/tests/auto/exceptionsafety/exceptionsafety.pro
@@ -1,3 +1,3 @@
 load(qttest_p4)
-QT -= gui
 SOURCES += tst_exceptionsafety.cpp
+QT = core
diff --git a/tests/auto/exceptionsafety/tst_exceptionsafety.cpp b/tests/auto/exceptionsafety/tst_exceptionsafety.cpp
index 11df291dde..e42eabb6f7 100644
--- a/tests/auto/exceptionsafety/tst_exceptionsafety.cpp
+++ b/tests/auto/exceptionsafety/tst_exceptionsafety.cpp
@@ -52,9 +52,16 @@ class tst_ExceptionSafety: public QObject
     Q_OBJECT
 private slots:
     void exceptionInSlot();
+    void exceptionVector();
+    void exceptionHash();
+    void exceptionMap();
+    void exceptionList();
+    void exceptionLinkedList();
+//    void exceptionEventLoop();
+//    void exceptionSignalSlot();
 };
 
-class Emitter: public QObject
+class Emitter : public QObject
 {
     Q_OBJECT
 public:
@@ -63,13 +70,111 @@ signals:
     void testSignal();
 };
 
-class ExceptionThrower: public QObject
+class ExceptionThrower : public QObject
 {
     Q_OBJECT
 public slots:
     void thrower() { throw 5; }
 };
 
+class Receiver : public QObject
+{
+    Q_OBJECT
+public:
+    Receiver()
+        : received(0) {}
+    int received;
+
+public slots:
+    void receiver() { ++received; }
+};
+
+enum ThrowType { ThrowNot = 0, ThrowAtCreate = 1, ThrowAtCopy = 2, ThrowLater = 3, ThrowAtComparison = 4 };
+
+ThrowType throwType = ThrowNot; // global flag to indicate when an exception should be throw. Will be reset when the exception has been generated.
+
+int objCounter = 0;
+
+/*! Class that does not throw any exceptions. Used as baseclass for all the other ones.
+ */
+template <int T>
+class FlexibleThrower
+{
+    public:
+        FlexibleThrower() : _value(-1) {
+            if( throwType == ThrowAtCreate ) {
+                throwType = ThrowNot;
+                throw ThrowAtCreate;
+            }
+            objCounter++;
+        }
+
+        FlexibleThrower( short value ) : _value(value) {
+            if( throwType == ThrowAtCreate ) {
+                throwType = ThrowNot;
+                throw ThrowAtCreate;
+            }
+            objCounter++;
+        }
+
+        FlexibleThrower(FlexibleThrower const& other ) {
+            // qDebug("cc");
+
+            if( throwType == ThrowAtCopy ) {
+                throwType = ThrowNot;
+                throw ThrowAtCopy;
+
+            } else if( throwType == ThrowLater ) {
+                throwType = ThrowAtCopy;
+            }
+
+            objCounter++;
+            _value = other.value();
+        }
+
+        ~FlexibleThrower() { objCounter--; }
+
+        bool operator==(const FlexibleThrower<T> &t) const
+        {
+            // qDebug("vv == %d %d", value(), t.value());
+            if( throwType == ThrowAtComparison ) {
+                throwType = ThrowNot;
+                throw ThrowAtComparison;
+            }
+            return value()==t.value();
+        }
+
+        bool operator<(const FlexibleThrower<T> &t) const
+        {
+            // qDebug("vv < %d %d", value(), t.value());
+            if( throwType == ThrowAtComparison ) {
+                throwType = ThrowNot;
+                throw ThrowAtComparison;
+            }
+            return value()<t.value();
+        }
+
+        int value() const
+        { return (int)_value; }
+
+        short _value;
+        char dummy[T];
+};
+
+uint qHash(const FlexibleThrower<2>& t)
+{
+    // qDebug("ha");
+    if( throwType == ThrowAtComparison ) {
+        throwType = ThrowNot;
+        throw ThrowAtComparison;
+    }
+    return (uint)t.value();
+}
+
+typedef FlexibleThrower<2> FlexibleThrowerSmall;
+typedef QMap<FlexibleThrowerSmall,FlexibleThrowerSmall> MyMap;
+typedef QHash<FlexibleThrowerSmall,FlexibleThrowerSmall> MyHash;
+
 // connect a signal to a slot that throws an exception
 // run this through valgrind to make sure it doesn't corrupt
 void tst_ExceptionSafety::exceptionInSlot()
@@ -86,6 +191,537 @@ void tst_ExceptionSafety::exceptionInSlot()
     }
 }
 
+void tst_ExceptionSafety::exceptionList() {
+
+    {
+        QList<FlexibleThrowerSmall> list;
+        QList<FlexibleThrowerSmall> list2;
+        QList<FlexibleThrowerSmall> list3;
+
+        for( int i = 0; i<10; i++ )
+            list.append( FlexibleThrowerSmall(i) );
+
+        try {
+            throwType = ThrowAtCopy;
+            list.append( FlexibleThrowerSmall(10));
+        } catch (...) {
+        }
+        QCOMPARE( list.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            list.prepend( FlexibleThrowerSmall(10));
+        } catch (...) {
+        }
+        QCOMPARE( list.at(0).value(), 0 );
+        QCOMPARE( list.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            list.insert( 8, FlexibleThrowerSmall(10));
+        } catch (...) {
+        }
+        QCOMPARE( list.at(7).value(), 7 );
+        QCOMPARE( list.at(8).value(), 8 );
+        QCOMPARE( list.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            FlexibleThrowerSmall t = list.takeAt( 6 );
+        } catch (...) {
+        }
+        QCOMPARE( list.at(6).value(), 6 );
+        QCOMPARE( list.at(7).value(), 7 );
+        QCOMPARE( list.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            list3 = list;
+        } catch (...) {
+        }
+        QCOMPARE( list.at(0).value(), 0 );
+        QCOMPARE( list.at(7).value(), 7 );
+        QCOMPARE( list.size(), 10 );
+        QCOMPARE( list3.at(0).value(), 0 );
+        QCOMPARE( list3.at(7).value(), 7 );
+        QCOMPARE( list3.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            list3.append( FlexibleThrowerSmall(11) );
+        } catch (...) {
+        }
+        QCOMPARE( list.at(0).value(), 0 );
+        QCOMPARE( list.at(7).value(), 7 );
+        QCOMPARE( list.size(), 10 );
+        QCOMPARE( list3.at(0).value(), 0 );
+        QCOMPARE( list3.at(7).value(), 7 );
+        QCOMPARE( list3.size(), 10 );
+
+        try {
+            list2.clear();
+            list2.append( FlexibleThrowerSmall(11));
+            throwType = ThrowAtCopy;
+            list3 = list+list2;
+        } catch (...) {
+        }
+        QCOMPARE( list.at(0).value(), 0 );
+        QCOMPARE( list.at(7).value(), 7 );
+        QCOMPARE( list.size(), 10 );
+
+        // check that copy on write works atomar
+        list2.clear();
+        list2.append( FlexibleThrowerSmall(11));
+        list3 = list+list2;
+        try {
+            throwType = ThrowAtCreate;
+            list3[7]=FlexibleThrowerSmall(12);
+        } catch (...) {
+        }
+        QCOMPARE( list.at(7).value(), 7 );
+        QCOMPARE( list.size(), 10 );
+        QCOMPARE( list3.at(7).value(), 7 );
+        QCOMPARE( list3.size(), 11 );
+
+    }
+    QCOMPARE(objCounter, 0 ); // check that every object has been freed
+}
+
+void tst_ExceptionSafety::exceptionLinkedList() {
+
+    {
+        QLinkedList<FlexibleThrowerSmall> list;
+        QLinkedList<FlexibleThrowerSmall> list2;
+        QLinkedList<FlexibleThrowerSmall> list3;
+
+        for( int i = 0; i<10; i++ )
+            list.append( FlexibleThrowerSmall(i) );
+
+        try {
+            throwType = ThrowAtCopy;
+            list.append( FlexibleThrowerSmall(10));
+        } catch (...) {
+        }
+        QCOMPARE( list.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            list.prepend( FlexibleThrowerSmall(10));
+        } catch (...) {
+        }
+        QCOMPARE( list.first().value(), 0 );
+        QCOMPARE( list.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            list3 = list;
+            list3.append( FlexibleThrowerSmall(11) );
+        } catch (...) {
+        }
+        QCOMPARE( list.first().value(), 0 );
+        QCOMPARE( list.size(), 10 );
+        QCOMPARE( list3.size(), 10 );
+    }
+    QCOMPARE(objCounter, 0 ); // check that every object has been freed
+}
+
+void tst_ExceptionSafety::exceptionVector() {
+
+    {
+        QVector<FlexibleThrowerSmall> vector;
+        QVector<FlexibleThrowerSmall> vector2;
+        QVector<FlexibleThrowerSmall> vector3;
+
+        for (int i = 0; i<10; i++)
+            vector.append( FlexibleThrowerSmall(i) );
+
+        try {
+            throwType = ThrowAtCopy;
+            vector.append( FlexibleThrowerSmall(10));
+        } catch (...) {
+        }
+        QCOMPARE( vector.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            vector.prepend( FlexibleThrowerSmall(10));
+        } catch (...) {
+        }
+        QCOMPARE( vector.at(0).value(), 0 );
+        QCOMPARE( vector.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            vector.insert( 8, FlexibleThrowerSmall(10));
+        } catch (...) {
+        }
+        QCOMPARE( vector.at(7).value(), 7 );
+        QCOMPARE( vector.at(8).value(), 8 );
+        QCOMPARE( vector.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            vector3 = vector;
+        } catch (...) {
+        }
+        QCOMPARE( vector.at(0).value(), 0 );
+        QCOMPARE( vector.at(7).value(), 7 );
+        QCOMPARE( vector.size(), 10 );
+        QCOMPARE( vector3.at(0).value(), 0 );
+        QCOMPARE( vector3.at(7).value(), 7 );
+        QCOMPARE( vector3.size(), 10 );
+
+        try {
+            throwType = ThrowAtCopy;
+            vector3.append( FlexibleThrowerSmall(11) );
+        } catch (...) {
+        }
+        QCOMPARE( vector.at(0).value(), 0 );
+        QCOMPARE( vector.at(7).value(), 7 );
+        QCOMPARE( vector.size(), 10 );
+        QCOMPARE( vector3.at(0).value(), 0 );
+        QCOMPARE( vector3.at(7).value(), 7 );
+
+        try {
+            vector2.clear();
+            vector2.append( FlexibleThrowerSmall(11));
+            throwType = ThrowAtCopy;
+            vector3 = vector+vector2;
+        } catch (...) {
+        }
+        QCOMPARE( vector.at(0).value(), 0 );
+        QCOMPARE( vector.at(7).value(), 7 );
+        QCOMPARE( vector.size(), 10 );
+
+        // check that copy on write works atomar
+        vector2.clear();
+        vector2.append( FlexibleThrowerSmall(11));
+        vector3 = vector+vector2;
+        try {
+            throwType = ThrowAtCreate;
+            vector3[7]=FlexibleThrowerSmall(12);
+        } catch (...) {
+        }
+        QCOMPARE( vector.at(7).value(), 7 );
+        QCOMPARE( vector.size(), 10 );
+        QCOMPARE( vector3.at(7).value(), 7 );
+        QCOMPARE( vector3.size(), 11 );
+
+        try {
+            throwType = ThrowAtCreate;
+            vector.resize(15);
+        } catch (...) {
+        }
+        QCOMPARE( vector.at(7).value(), 7 );
+        QCOMPARE( vector.size(), 10 );
+
+        try {
+            throwType = ThrowAtCreate;
+            vector.resize(15);
+        } catch (...) {
+        }
+        QCOMPARE( vector.at(7).value(), 7 );
+        QCOMPARE( vector.size(), 10 );
+
+        try {
+            throwType = ThrowLater;
+            vector.fill(FlexibleThrowerSmall(1), 15);
+        } catch (...) {
+        }
+        QCOMPARE( vector.at(0).value(), 0 );
+        QCOMPARE( vector.size(), 10 );
+
+
+    }
+    QCOMPARE(objCounter, 0 ); // check that every object has been freed
+}
+
+
+void tst_ExceptionSafety::exceptionMap() {
+
+    {
+        MyMap map;
+        MyMap map2;
+        MyMap map3;
+
+        throwType = ThrowNot;
+        for (int i = 0; i<10; i++)
+            map[ FlexibleThrowerSmall(i) ] = FlexibleThrowerSmall(i);
+
+        return; // further test are deactivated until Map is fixed.
+
+        for( int i = ThrowAtCopy; i<=ThrowAtComparison; i++ ) {
+            try {
+                throwType = (ThrowType)i;
+                map[ FlexibleThrowerSmall(10) ] = FlexibleThrowerSmall(10);
+            } catch(...) {
+            }
+            QCOMPARE( map.size(), 10 );
+            QCOMPARE( map[ FlexibleThrowerSmall(1) ], FlexibleThrowerSmall(1) );
+        }
+
+        map2 = map;
+        try {
+            throwType = ThrowLater;
+            map2[ FlexibleThrowerSmall(10) ] = FlexibleThrowerSmall(10);
+        } catch(...) {
+        }
+        /* qDebug("%d %d", map.size(), map2.size() );
+        for( int i=0; i<map.size(); i++ )
+            qDebug( "Value at %d: %d",i, map.value(FlexibleThrowerSmall(i), FlexibleThrowerSmall()).value() );
+        QCOMPARE( map.value(FlexibleThrowerSmall(1), FlexibleThrowerSmall()), FlexibleThrowerSmall(1) );
+        qDebug( "Value at %d: %d",1, map[FlexibleThrowerSmall(1)].value() );
+        qDebug("%d %d", map.size(), map2.size() );
+        */
+        QCOMPARE( map[ FlexibleThrowerSmall(1) ], FlexibleThrowerSmall(1) );
+        QCOMPARE( map.size(), 10 );
+        QCOMPARE( map2[ FlexibleThrowerSmall(1) ], FlexibleThrowerSmall(1) );
+        QCOMPARE( map2.size(), 10 );
+
+    }
+    QCOMPARE(objCounter, 0 ); // check that every object has been freed
+}
+
+void tst_ExceptionSafety::exceptionHash() {
+
+    {
+        MyHash hash;
+        MyHash hash2;
+        MyHash hash3;
+
+        for( int i = 0; i<10; i++ )
+            hash[ FlexibleThrowerSmall(i) ] = FlexibleThrowerSmall(i);
+
+        for( int i = ThrowAtCopy; i<=ThrowAtComparison; i++ ) {
+            try {
+                throwType = (ThrowType)i;
+                hash[ FlexibleThrowerSmall(10) ] = FlexibleThrowerSmall(10);
+            } catch(...) {
+            }
+            QCOMPARE( hash.size(), 10 );
+        }
+
+        hash2 = hash;
+        try {
+            throwType = ThrowLater;
+            hash2[ FlexibleThrowerSmall(10) ] = FlexibleThrowerSmall(10);
+        } catch(...) {
+        }
+        QCOMPARE( hash[ FlexibleThrowerSmall(1) ], FlexibleThrowerSmall(1) );
+        QCOMPARE( hash.size(), 10 );
+        QCOMPARE( hash2[ FlexibleThrowerSmall(1) ], FlexibleThrowerSmall(1) );
+        QCOMPARE( hash2.size(), 10 );
+
+        hash2.clear();
+        try {
+            throwType = ThrowLater;
+            hash2.reserve(30);
+        } catch(...) {
+        }
+        QCOMPARE( hash2.size(), 0 );
+
+        /*
+           try {
+           throwType = ThrowAtCopy;
+           hash.prepend( FlexibleThrowerSmall(10));
+           } catch (...) {
+           }
+           QCOMPARE( hash.at(0).value(), 0 );
+           QCOMPARE( hash.size(), 10 );
+
+           try {
+           throwType = ThrowAtCopy;
+           hash.insert( 8, FlexibleThrowerSmall(10));
+           } catch (...) {
+           }
+           QCOMPARE( hash.at(7).value(), 7 );
+           QCOMPARE( hash.at(8).value(), 8 );
+           QCOMPARE( hash.size(), 10 );
+
+           qDebug("val");
+           try {
+           throwType = ThrowAtCopy;
+           hash3 = hash;
+           } catch (...) {
+           }
+           QCOMPARE( hash.at(0).value(), 0 );
+           QCOMPARE( hash.at(7).value(), 7 );
+           QCOMPARE( hash.size(), 10 );
+           QCOMPARE( hash3.at(0).value(), 0 );
+           QCOMPARE( hash3.at(7).value(), 7 );
+           QCOMPARE( hash3.size(), 10 );
+
+           try {
+           throwType = ThrowAtCopy;
+           hash3.append( FlexibleThrowerSmall(11) );
+           } catch (...) {
+           }
+           QCOMPARE( hash.at(0).value(), 0 );
+           QCOMPARE( hash.at(7).value(), 7 );
+           QCOMPARE( hash.size(), 10 );
+           QCOMPARE( hash3.at(0).value(), 0 );
+           QCOMPARE( hash3.at(7).value(), 7 );
+           QCOMPARE( hash3.at(11).value(), 11 );
+
+           try {
+           hash2.clear();
+           hash2.append( FlexibleThrowerSmall(11));
+           throwType = ThrowAtCopy;
+           hash3 = hash+hash2;
+           } catch (...) {
+           }
+           QCOMPARE( hash.at(0).value(), 0 );
+           QCOMPARE( hash.at(7).value(), 7 );
+           QCOMPARE( hash.size(), 10 );
+
+        // check that copy on write works atomar
+        hash2.clear();
+        hash2.append( FlexibleThrowerSmall(11));
+        hash3 = hash+hash2;
+        try {
+        throwType = ThrowAtCopy;
+        hash3[7]=FlexibleThrowerSmall(12);
+        } catch (...) {
+        }
+        QCOMPARE( hash.at(7).value(), 7 );
+        QCOMPARE( hash.size(), 10 );
+        QCOMPARE( hash3.at(7).value(), 7 );
+        QCOMPARE( hash3.size(), 11 );
+        */
+
+
+    }
+    QCOMPARE(objCounter, 0 ); // check that every object has been freed
+}
+
+// Disable these tests until the level of exception safety in event loops is clear
+#if 0
+enum
+{
+    ThrowEventId = QEvent::User + 42,
+    NoThrowEventId = QEvent::User + 43
+};
+
+class ThrowEvent : public QEvent
+{
+public:
+    ThrowEvent()
+        : QEvent(static_cast<QEvent::Type>(ThrowEventId))
+    {
+    }
+};
+
+class NoThrowEvent : public QEvent
+{
+public:
+    NoThrowEvent()
+        : QEvent(static_cast<QEvent::Type>(NoThrowEventId))
+    {}
+};
+
+struct IntEx : public std::exception
+{
+    IntEx(int aEx) : ex(aEx) {}
+    int ex;
+};
+
+class TestObject : public QObject
+{
+public:
+    TestObject()
+        : throwEventCount(0), noThrowEventCount(0) {}
+
+    int throwEventCount;
+    int noThrowEventCount;
+
+protected:
+    bool event(QEvent *event)
+    {
+        if (int(event->type()) == ThrowEventId) {
+             throw IntEx(++throwEventCount);
+        } else if (int(event->type()) == NoThrowEventId) {
+            ++noThrowEventCount;
+        }
+        return QObject::event(event);
+    }
+};
+
+void tst_ExceptionSafety::exceptionEventLoop()
+{
+    // send an event that throws
+    TestObject obj;
+    ThrowEvent throwEvent;
+    try {
+        qApp->sendEvent(&obj, &throwEvent);
+    } catch (IntEx code) {
+        QCOMPARE(code.ex, 1);
+    }
+    QCOMPARE(obj.throwEventCount, 1);
+
+    // post an event that throws
+    qApp->postEvent(&obj, new ThrowEvent);
+
+    try {
+        qApp->processEvents();
+    } catch (IntEx code) {
+        QCOMPARE(code.ex, 2);
+    }
+    QCOMPARE(obj.throwEventCount, 2);
+
+    // post a normal event, then a throwing event, then a normal event
+    // run this in valgrind to ensure that it doesn't leak.
+
+    qApp->postEvent(&obj, new NoThrowEvent);
+    qApp->postEvent(&obj, new ThrowEvent);
+    qApp->postEvent(&obj, new NoThrowEvent);
+
+    try {
+        qApp->processEvents();
+    } catch (IntEx code) {
+        QCOMPARE(code.ex, 3);
+    }
+    // here, we should have received on non-throwing event and one throwing one
+    QCOMPARE(obj.throwEventCount, 3);
+#ifndef __SYMBIAN32__
+    // symbian event loops will have absorbed the exceptions
+    QCOMPARE(obj.noThrowEventCount, 1);
+#endif
+
+    // spin the event loop again
+    qApp->processEvents();
+
+    // now, we should have received the second non-throwing event
+    QCOMPARE(obj.noThrowEventCount, 2);
+}
+
+void tst_ExceptionSafety::exceptionSignalSlot()
+{
+    Emitter e;
+    ExceptionThrower thrower;
+    Receiver r1;
+    Receiver r2;
+
+    // connect a signal to a normal object, a thrower and a normal object again
+    connect(&e, SIGNAL(testSignal()), &r1, SLOT(receiver()));
+    connect(&e, SIGNAL(testSignal()), &thrower, SLOT(thrower()));
+    connect(&e, SIGNAL(testSignal()), &r2, SLOT(receiver()));
+
+    int code = 0;
+    try {
+        e.emitTestSignal();
+    } catch (int c) {
+        code = c;
+    }
+
+    // 5 is the magic number that's thrown by thrower
+    QCOMPARE(code, 5);
+
+    // assumption: slots are called in the connection order
+    QCOMPARE(r1.received, 1);
+    QCOMPARE(r2.received, 0);
+}
+#endif
+
 QTEST_MAIN(tst_ExceptionSafety)
 #include "tst_exceptionsafety.moc"
 #endif // QT_NO_EXCEPTIONS
diff --git a/tests/auto/exceptionsafety_objects/3rdparty/memcheck.h b/tests/auto/exceptionsafety_objects/3rdparty/memcheck.h
new file mode 100644
index 0000000000..72a02ca9ba
--- /dev/null
+++ b/tests/auto/exceptionsafety_objects/3rdparty/memcheck.h
@@ -0,0 +1,319 @@
+
+/*
+   ----------------------------------------------------------------
+
+   Notice that the following BSD-style license applies to this one
+   file (memcheck.h) only.  The rest of Valgrind is licensed under the
+   terms of the GNU General Public License, version 2, unless
+   otherwise indicated.  See the COPYING file in the source
+   distribution for details.
+
+   ----------------------------------------------------------------
+
+   This file is part of MemCheck, a heavyweight Valgrind tool for
+   detecting memory errors.
+
+   Copyright (C) 2000-2008 Julian Seward.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. The origin of this software must not be misrepresented; you must 
+      not claim that you wrote the original software.  If you use this 
+      software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   3. Altered source versions must be plainly marked as such, and must
+      not be misrepresented as being the original software.
+
+   4. The name of the author may not be used to endorse or promote 
+      products derived from this software without specific prior written 
+      permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   ----------------------------------------------------------------
+
+   Notice that the above BSD-style license applies to this one file
+   (memcheck.h) only.  The entire rest of Valgrind is licensed under
+   the terms of the GNU General Public License, version 2.  See the
+   COPYING file in the source distribution for details.
+
+   ---------------------------------------------------------------- 
+*/
+
+
+#ifndef __MEMCHECK_H
+#define __MEMCHECK_H
+
+
+/* This file is for inclusion into client (your!) code.
+
+   You can use these macros to manipulate and query memory permissions
+   inside your own programs.
+
+   See comment near the top of valgrind.h on how to use them.
+*/
+
+#include "valgrind.h"
+
+/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !! 
+   This enum comprises an ABI exported by Valgrind to programs
+   which use client requests.  DO NOT CHANGE THE ORDER OF THESE
+   ENTRIES, NOR DELETE ANY -- add new ones at the end. */
+typedef
+   enum { 
+      VG_USERREQ__MAKE_MEM_NOACCESS = VG_USERREQ_TOOL_BASE('M','C'),
+      VG_USERREQ__MAKE_MEM_UNDEFINED,
+      VG_USERREQ__MAKE_MEM_DEFINED,
+      VG_USERREQ__DISCARD,
+      VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE,
+      VG_USERREQ__CHECK_MEM_IS_DEFINED,
+      VG_USERREQ__DO_LEAK_CHECK,
+      VG_USERREQ__COUNT_LEAKS,
+
+      VG_USERREQ__GET_VBITS,
+      VG_USERREQ__SET_VBITS,
+
+      VG_USERREQ__CREATE_BLOCK,
+
+      VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE,
+
+      VG_USERREQ__ENABLE_OOM,
+      VG_USERREQ__GET_ALLOC_INDEX,
+
+      /* This is just for memcheck's internal use - don't use it */
+      _VG_USERREQ__MEMCHECK_RECORD_OVERLAP_ERROR 
+         = VG_USERREQ_TOOL_BASE('M','C') + 256,
+
+      /* This is just for memcheck's internal use - don't use it */
+      _VG_USERREQ__EXCEPTION
+         = VG_USERREQ_TOOL_BASE('M','C') + 512,
+   } Vg_MemCheckClientRequest;
+
+
+
+/* Client-code macros to manipulate the state of memory. */
+
+/* Mark memory at _qzz_addr as unaddressable for _qzz_len bytes. */
+#define VALGRIND_MAKE_MEM_NOACCESS(_qzz_addr,_qzz_len)           \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__MAKE_MEM_NOACCESS,       \
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+      
+/* Similarly, mark memory at _qzz_addr as addressable but undefined
+   for _qzz_len bytes. */
+#define VALGRIND_MAKE_MEM_UNDEFINED(_qzz_addr,_qzz_len)          \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__MAKE_MEM_UNDEFINED,      \
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Similarly, mark memory at _qzz_addr as addressable and defined
+   for _qzz_len bytes. */
+#define VALGRIND_MAKE_MEM_DEFINED(_qzz_addr,_qzz_len)            \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__MAKE_MEM_DEFINED,        \
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Similar to VALGRIND_MAKE_MEM_DEFINED except that addressability is
+   not altered: bytes which are addressable are marked as defined,
+   but those which are not addressable are left unchanged. */
+#define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(_qzz_addr,_qzz_len) \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE, \
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Create a block-description handle.  The description is an ascii
+   string which is included in any messages pertaining to addresses
+   within the specified memory range.  Has no other effect on the
+   properties of the memory range. */
+#define VALGRIND_CREATE_BLOCK(_qzz_addr,_qzz_len, _qzz_desc)	 \
+	(__extension__({unsigned long _qzz_res;			 \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__CREATE_BLOCK,            \
+                            _qzz_addr, _qzz_len, _qzz_desc,      \
+                            0, 0);                               \
+    _qzz_res;							 \
+   }))
+
+/* Discard a block-description-handle. Returns 1 for an
+   invalid handle, 0 for a valid handle. */
+#define VALGRIND_DISCARD(_qzz_blkindex)                          \
+   (__extension__ ({unsigned long _qzz_res;                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__DISCARD,                 \
+                            0, _qzz_blkindex, 0, 0, 0);          \
+    _qzz_res;                                                    \
+   }))
+
+
+/* Client-code macros to check the state of memory. */
+
+/* Check that memory at _qzz_addr is addressable for _qzz_len bytes.
+   If suitable addressibility is not established, Valgrind prints an
+   error message and returns the address of the first offending byte.
+   Otherwise it returns zero. */
+#define VALGRIND_CHECK_MEM_IS_ADDRESSABLE(_qzz_addr,_qzz_len)    \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE,\
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Check that memory at _qzz_addr is addressable and defined for
+   _qzz_len bytes.  If suitable addressibility and definedness are not
+   established, Valgrind prints an error message and returns the
+   address of the first offending byte.  Otherwise it returns zero. */
+#define VALGRIND_CHECK_MEM_IS_DEFINED(_qzz_addr,_qzz_len)        \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__CHECK_MEM_IS_DEFINED,    \
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Use this macro to force the definedness and addressibility of an
+   lvalue to be checked.  If suitable addressibility and definedness
+   are not established, Valgrind prints an error message and returns
+   the address of the first offending byte.  Otherwise it returns
+   zero. */
+#define VALGRIND_CHECK_VALUE_IS_DEFINED(__lvalue)                \
+   VALGRIND_CHECK_MEM_IS_DEFINED(                                \
+      (volatile unsigned char *)&(__lvalue),                     \
+                      (unsigned long)(sizeof (__lvalue)))
+
+
+/* Do a memory leak check mid-execution.  */
+#define VALGRIND_DO_LEAK_CHECK                                   \
+   {unsigned long _qzz_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__DO_LEAK_CHECK,           \
+                            0, 0, 0, 0, 0);                      \
+   }
+
+/* Just display summaries of leaked memory, rather than all the
+   details */
+#define VALGRIND_DO_QUICK_LEAK_CHECK				 \
+   {unsigned long _qzz_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__DO_LEAK_CHECK,           \
+                            1, 0, 0, 0, 0);                      \
+   }
+
+/* Return number of leaked, dubious, reachable and suppressed bytes found by
+   all previous leak checks.  They must be lvalues.  */
+#define VALGRIND_COUNT_LEAKS(leaked, dubious, reachable, suppressed)     \
+   /* For safety on 64-bit platforms we assign the results to private
+      unsigned long variables, then assign these to the lvalues the user
+      specified, which works no matter what type 'leaked', 'dubious', etc
+      are.  We also initialise '_qzz_leaked', etc because
+      VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as
+      initialised. */                                                    \
+   {unsigned long _qzz_res;                                              \
+    unsigned long _qzz_leaked    = 0, _qzz_dubious    = 0;               \
+    unsigned long _qzz_reachable = 0, _qzz_suppressed = 0;               \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                              \
+                               VG_USERREQ__COUNT_LEAKS,                  \
+                               &_qzz_leaked, &_qzz_dubious,              \
+                               &_qzz_reachable, &_qzz_suppressed, 0);    \
+    leaked     = _qzz_leaked;                                            \
+    dubious    = _qzz_dubious;                                           \
+    reachable  = _qzz_reachable;                                         \
+    suppressed = _qzz_suppressed;                                        \
+   }
+
+
+/* Get the validity data for addresses [zza..zza+zznbytes-1] and copy it
+   into the provided zzvbits array.  Return values:
+      0   if not running on valgrind
+      1   success
+      2   [previously indicated unaligned arrays;  these are now allowed]
+      3   if any parts of zzsrc/zzvbits are not addressable.
+   The metadata is not copied in cases 0, 2 or 3 so it should be
+   impossible to segfault your system by using this call.
+*/
+#define VALGRIND_GET_VBITS(zza,zzvbits,zznbytes)                 \
+   (__extension__({unsigned long _qzz_res;                       \
+    char* czza     = (char*)zza;                                 \
+    char* czzvbits = (char*)zzvbits;                             \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__GET_VBITS,               \
+                            czza, czzvbits, zznbytes, 0, 0 );    \
+    _qzz_res;                                                    \
+   }))
+
+/* Set the validity data for addresses [zza..zza+zznbytes-1], copying it
+   from the provided zzvbits array.  Return values:
+      0   if not running on valgrind
+      1   success
+      2   [previously indicated unaligned arrays;  these are now allowed]
+      3   if any parts of zza/zzvbits are not addressable.
+   The metadata is not copied in cases 0, 2 or 3 so it should be
+   impossible to segfault your system by using this call.
+*/
+#define VALGRIND_SET_VBITS(zza,zzvbits,zznbytes)                 \
+   (__extension__({unsigned int _qzz_res;                        \
+    char* czza     = (char*)zza;                                 \
+    char* czzvbits = (char*)zzvbits;                             \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__SET_VBITS,               \
+                            czza, czzvbits, zznbytes, 0, 0 );    \
+    _qzz_res;                                                    \
+   }))
+
+/* Enable or disable OOM simulation. */
+#define VALGRIND_ENABLE_OOM_AT_ALLOC_INDEX(index)                \
+   (__extension__ ({unsigned long _qzz_res;                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__ENABLE_OOM,              \
+                            1, index, 0, 0, 0);                  \
+    _qzz_res;                                                    \
+   }))
+
+#define VALGRIND_DISABLE_OOM_AT_ALLOC_INDEX(index)               \
+   (__extension__ ({unsigned long _qzz_res;                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__ENABLE_OOM,              \
+                            0, index, 0, 0, 0);                  \
+    _qzz_res;                                                    \
+   }))
+
+/* Get the current allocation index. */
+#define VALGRIND_GET_ALLOC_INDEX                                 \
+   (__extension__ ({unsigned long _qzz_res;                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, -1 /* default return */, \
+                            VG_USERREQ__GET_ALLOC_INDEX,         \
+                            0, 0, 0, 0, 0);                      \
+    _qzz_res;                                                    \
+   }))
+
+
+#endif
+
diff --git a/tests/auto/exceptionsafety_objects/3rdparty/valgrind.h b/tests/auto/exceptionsafety_objects/3rdparty/valgrind.h
new file mode 100644
index 0000000000..577c59ab0c
--- /dev/null
+++ b/tests/auto/exceptionsafety_objects/3rdparty/valgrind.h
@@ -0,0 +1,3924 @@
+/* -*- c -*-
+   ----------------------------------------------------------------
+
+   Notice that the following BSD-style license applies to this one
+   file (valgrind.h) only.  The rest of Valgrind is licensed under the
+   terms of the GNU General Public License, version 2, unless
+   otherwise indicated.  See the COPYING file in the source
+   distribution for details.
+
+   ----------------------------------------------------------------
+
+   This file is part of Valgrind, a dynamic binary instrumentation
+   framework.
+
+   Copyright (C) 2000-2008 Julian Seward.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. The origin of this software must not be misrepresented; you must 
+      not claim that you wrote the original software.  If you use this 
+      software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   3. Altered source versions must be plainly marked as such, and must
+      not be misrepresented as being the original software.
+
+   4. The name of the author may not be used to endorse or promote 
+      products derived from this software without specific prior written 
+      permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   ----------------------------------------------------------------
+
+   Notice that the above BSD-style license applies to this one file
+   (valgrind.h) only.  The entire rest of Valgrind is licensed under
+   the terms of the GNU General Public License, version 2.  See the
+   COPYING file in the source distribution for details.
+
+   ---------------------------------------------------------------- 
+*/
+
+
+/* This file is for inclusion into client (your!) code.
+
+   You can use these macros to manipulate and query Valgrind's 
+   execution inside your own programs.
+
+   The resulting executables will still run without Valgrind, just a
+   little bit more slowly than they otherwise would, but otherwise
+   unchanged.  When not running on valgrind, each client request
+   consumes very few (eg. 7) instructions, so the resulting performance
+   loss is negligible unless you plan to execute client requests
+   millions of times per second.  Nevertheless, if that is still a
+   problem, you can compile with the NVALGRIND symbol defined (gcc
+   -DNVALGRIND) so that client requests are not even compiled in.  */
+
+#ifndef __VALGRIND_H
+#define __VALGRIND_H
+
+#include <stdarg.h>
+
+/* Nb: this file might be included in a file compiled with -ansi.  So
+   we can't use C++ style "//" comments nor the "asm" keyword (instead
+   use "__asm__"). */
+
+/* Derive some tags indicating what the target platform is.  Note
+   that in this file we're using the compiler's CPP symbols for
+   identifying architectures, which are different to the ones we use
+   within the rest of Valgrind.  Note, __powerpc__ is active for both
+   32 and 64-bit PPC, whereas __powerpc64__ is only active for the
+   latter (on Linux, that is). */
+#undef PLAT_x86_linux
+#undef PLAT_amd64_linux
+#undef PLAT_ppc32_linux
+#undef PLAT_ppc64_linux
+#undef PLAT_ppc32_aix5
+#undef PLAT_ppc64_aix5
+
+#if !defined(_AIX) && defined(__i386__)
+#  define PLAT_x86_linux 1
+#elif !defined(_AIX) && defined(__x86_64__)
+#  define PLAT_amd64_linux 1
+#elif !defined(_AIX) && defined(__powerpc__) && !defined(__powerpc64__)
+#  define PLAT_ppc32_linux 1
+#elif !defined(_AIX) && defined(__powerpc__) && defined(__powerpc64__)
+#  define PLAT_ppc64_linux 1
+#elif defined(_AIX) && defined(__64BIT__)
+#  define PLAT_ppc64_aix5 1
+#elif defined(_AIX) && !defined(__64BIT__)
+#  define PLAT_ppc32_aix5 1
+#endif
+
+
+/* If we're not compiling for our target platform, don't generate
+   any inline asms.  */
+#if !defined(PLAT_x86_linux) && !defined(PLAT_amd64_linux) \
+    && !defined(PLAT_ppc32_linux) && !defined(PLAT_ppc64_linux) \
+    && !defined(PLAT_ppc32_aix5) && !defined(PLAT_ppc64_aix5)
+#  if !defined(NVALGRIND)
+#    define NVALGRIND 1
+#  endif
+#endif
+
+
+/* ------------------------------------------------------------------ */
+/* ARCHITECTURE SPECIFICS for SPECIAL INSTRUCTIONS.  There is nothing */
+/* in here of use to end-users -- skip to the next section.           */
+/* ------------------------------------------------------------------ */
+
+#if defined(NVALGRIND)
+
+/* Define NVALGRIND to completely remove the Valgrind magic sequence
+   from the compiled code (analogous to NDEBUG's effects on
+   assert()) */
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+   {                                                              \
+      (_zzq_rlval) = (_zzq_default);                              \
+   }
+
+#else  /* ! NVALGRIND */
+
+/* The following defines the magic code sequences which the JITter
+   spots and handles magically.  Don't look too closely at them as
+   they will rot your brain.
+
+   The assembly code sequences for all architectures is in this one
+   file.  This is because this file must be stand-alone, and we don't
+   want to have multiple files.
+
+   For VALGRIND_DO_CLIENT_REQUEST, we must ensure that the default
+   value gets put in the return slot, so that everything works when
+   this is executed not under Valgrind.  Args are passed in a memory
+   block, and so there's no intrinsic limit to the number that could
+   be passed, but it's currently five.
+   
+   The macro args are: 
+      _zzq_rlval    result lvalue
+      _zzq_default  default value (result returned when running on real CPU)
+      _zzq_request  request code
+      _zzq_arg1..5  request params
+
+   The other two macros are used to support function wrapping, and are
+   a lot simpler.  VALGRIND_GET_NR_CONTEXT returns the value of the
+   guest's NRADDR pseudo-register and whatever other information is
+   needed to safely run the call original from the wrapper: on
+   ppc64-linux, the R2 value at the divert point is also needed.  This
+   information is abstracted into a user-visible type, OrigFn.
+
+   VALGRIND_CALL_NOREDIR_* behaves the same as the following on the
+   guest, but guarantees that the branch instruction will not be
+   redirected: x86: call *%eax, amd64: call *%rax, ppc32/ppc64:
+   branch-and-link-to-r11.  VALGRIND_CALL_NOREDIR is just text, not a
+   complete inline asm, since it needs to be combined with more magic
+   inline asm stuff to be useful.
+*/
+
+/* ------------------------- x86-linux ------------------------- */
+
+#if defined(PLAT_x86_linux)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "roll $3,  %%edi ; roll $13, %%edi\n\t"      \
+                     "roll $29, %%edi ; roll $19, %%edi\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+  { volatile unsigned int _zzq_args[6];                           \
+    volatile unsigned int _zzq_result;                            \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %EDX = client_request ( %EAX ) */         \
+                     "xchgl %%ebx,%%ebx"                          \
+                     : "=d" (_zzq_result)                         \
+                     : "a" (&_zzq_args[0]), "0" (_zzq_default)    \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    volatile unsigned int __addr;                                 \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %EAX = guest_NRADDR */                    \
+                     "xchgl %%ecx,%%ecx"                          \
+                     : "=a" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_CALL_NOREDIR_EAX                                 \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* call-noredir *%EAX */                     \
+                     "xchgl %%edx,%%edx\n\t"
+#endif /* PLAT_x86_linux */
+
+/* ------------------------ amd64-linux ------------------------ */
+
+#if defined(PLAT_amd64_linux)
+
+typedef
+   struct { 
+      unsigned long long int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rolq $3,  %%rdi ; rolq $13, %%rdi\n\t"      \
+                     "rolq $61, %%rdi ; rolq $51, %%rdi\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+  { volatile unsigned long long int _zzq_args[6];                 \
+    volatile unsigned long long int _zzq_result;                  \
+    _zzq_args[0] = (unsigned long long int)(_zzq_request);        \
+    _zzq_args[1] = (unsigned long long int)(_zzq_arg1);           \
+    _zzq_args[2] = (unsigned long long int)(_zzq_arg2);           \
+    _zzq_args[3] = (unsigned long long int)(_zzq_arg3);           \
+    _zzq_args[4] = (unsigned long long int)(_zzq_arg4);           \
+    _zzq_args[5] = (unsigned long long int)(_zzq_arg5);           \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %RDX = client_request ( %RAX ) */         \
+                     "xchgq %%rbx,%%rbx"                          \
+                     : "=d" (_zzq_result)                         \
+                     : "a" (&_zzq_args[0]), "0" (_zzq_default)    \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    volatile unsigned long long int __addr;                       \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %RAX = guest_NRADDR */                    \
+                     "xchgq %%rcx,%%rcx"                          \
+                     : "=a" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_CALL_NOREDIR_RAX                                 \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* call-noredir *%RAX */                     \
+                     "xchgq %%rdx,%%rdx\n\t"
+#endif /* PLAT_amd64_linux */
+
+/* ------------------------ ppc32-linux ------------------------ */
+
+#if defined(PLAT_ppc32_linux)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rlwinm 0,0,3,0,0  ; rlwinm 0,0,13,0,0\n\t"  \
+                     "rlwinm 0,0,29,0,0 ; rlwinm 0,0,19,0,0\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned int  _zzq_args[6];                          \
+             unsigned int  _zzq_result;                           \
+             unsigned int* _zzq_ptr;                              \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 3,%1\n\t" /*default*/                    \
+                     "mr 4,%2\n\t" /*ptr*/                        \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"     /*result*/                     \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_default), "b" (_zzq_ptr)         \
+                     : "cc", "memory", "r3", "r4");               \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    unsigned int __addr;                                          \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory", "r3"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+#endif /* PLAT_ppc32_linux */
+
+/* ------------------------ ppc64-linux ------------------------ */
+
+#if defined(PLAT_ppc64_linux)
+
+typedef
+   struct { 
+      unsigned long long int nraddr; /* where's the code? */
+      unsigned long long int r2;  /* what tocptr do we need? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rotldi 0,0,3  ; rotldi 0,0,13\n\t"          \
+                     "rotldi 0,0,61 ; rotldi 0,0,51\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned long long int  _zzq_args[6];                \
+    register unsigned long long int  _zzq_result __asm__("r3");   \
+    register unsigned long long int* _zzq_ptr __asm__("r4");      \
+    _zzq_args[0] = (unsigned long long int)(_zzq_request);        \
+    _zzq_args[1] = (unsigned long long int)(_zzq_arg1);           \
+    _zzq_args[2] = (unsigned long long int)(_zzq_arg2);           \
+    _zzq_args[3] = (unsigned long long int)(_zzq_arg3);           \
+    _zzq_args[4] = (unsigned long long int)(_zzq_arg4);           \
+    _zzq_args[5] = (unsigned long long int)(_zzq_arg5);           \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1"                                   \
+                     : "=r" (_zzq_result)                         \
+                     : "0" (_zzq_default), "r" (_zzq_ptr)         \
+                     : "cc", "memory");                           \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    register unsigned long long int __addr __asm__("r3");         \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2"                                   \
+                     : "=r" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4"                                   \
+                     : "=r" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#endif /* PLAT_ppc64_linux */
+
+/* ------------------------ ppc32-aix5 ------------------------- */
+
+#if defined(PLAT_ppc32_aix5)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+      unsigned int r2;  /* what tocptr do we need? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rlwinm 0,0,3,0,0  ; rlwinm 0,0,13,0,0\n\t"  \
+                     "rlwinm 0,0,29,0,0 ; rlwinm 0,0,19,0,0\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned int  _zzq_args[7];                          \
+    register unsigned int  _zzq_result;                           \
+    register unsigned int* _zzq_ptr;                              \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    _zzq_args[6] = (unsigned int)(_zzq_default);                  \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 4,%1\n\t"                                \
+                     "lwz 3, 24(4)\n\t"                           \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_ptr)                             \
+                     : "r3", "r4", "cc", "memory");               \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    register unsigned int __addr;                                 \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#endif /* PLAT_ppc32_aix5 */
+
+/* ------------------------ ppc64-aix5 ------------------------- */
+
+#if defined(PLAT_ppc64_aix5)
+
+typedef
+   struct { 
+      unsigned long long int nraddr; /* where's the code? */
+      unsigned long long int r2;  /* what tocptr do we need? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rotldi 0,0,3  ; rotldi 0,0,13\n\t"          \
+                     "rotldi 0,0,61 ; rotldi 0,0,51\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned long long int  _zzq_args[7];                \
+    register unsigned long long int  _zzq_result;                 \
+    register unsigned long long int* _zzq_ptr;                    \
+    _zzq_args[0] = (unsigned int long long)(_zzq_request);        \
+    _zzq_args[1] = (unsigned int long long)(_zzq_arg1);           \
+    _zzq_args[2] = (unsigned int long long)(_zzq_arg2);           \
+    _zzq_args[3] = (unsigned int long long)(_zzq_arg3);           \
+    _zzq_args[4] = (unsigned int long long)(_zzq_arg4);           \
+    _zzq_args[5] = (unsigned int long long)(_zzq_arg5);           \
+    _zzq_args[6] = (unsigned int long long)(_zzq_default);        \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 4,%1\n\t"                                \
+                     "ld 3, 48(4)\n\t"                            \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_ptr)                             \
+                     : "r3", "r4", "cc", "memory");               \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    register unsigned long long int __addr;                       \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#endif /* PLAT_ppc64_aix5 */
+
+/* Insert assembly code for other platforms here... */
+
+#endif /* NVALGRIND */
+
+
+/* ------------------------------------------------------------------ */
+/* PLATFORM SPECIFICS for FUNCTION WRAPPING.  This is all very        */
+/* ugly.  It's the least-worst tradeoff I can think of.               */
+/* ------------------------------------------------------------------ */
+
+/* This section defines magic (a.k.a appalling-hack) macros for doing
+   guaranteed-no-redirection macros, so as to get from function
+   wrappers to the functions they are wrapping.  The whole point is to
+   construct standard call sequences, but to do the call itself with a
+   special no-redirect call pseudo-instruction that the JIT
+   understands and handles specially.  This section is long and
+   repetitious, and I can't see a way to make it shorter.
+
+   The naming scheme is as follows:
+
+      CALL_FN_{W,v}_{v,W,WW,WWW,WWWW,5W,6W,7W,etc}
+
+   'W' stands for "word" and 'v' for "void".  Hence there are
+   different macros for calling arity 0, 1, 2, 3, 4, etc, functions,
+   and for each, the possibility of returning a word-typed result, or
+   no result.
+*/
+
+/* Use these to write the name of your wrapper.  NOTE: duplicates
+   VG_WRAP_FUNCTION_Z{U,Z} in pub_tool_redir.h. */
+
+#define I_WRAP_SONAME_FNNAME_ZU(soname,fnname)                    \
+   _vgwZU_##soname##_##fnname
+
+#define I_WRAP_SONAME_FNNAME_ZZ(soname,fnname)                    \
+   _vgwZZ_##soname##_##fnname
+
+/* Use this macro from within a wrapper function to collect the
+   context (address and possibly other info) of the original function.
+   Once you have that you can then use it in one of the CALL_FN_
+   macros.  The type of the argument _lval is OrigFn. */
+#define VALGRIND_GET_ORIG_FN(_lval)  VALGRIND_GET_NR_CONTEXT(_lval)
+
+/* Derivatives of the main macros below, for calling functions
+   returning void. */
+
+#define CALL_FN_v_v(fnptr)                                        \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_v(_junk,fnptr); } while (0)
+
+#define CALL_FN_v_W(fnptr, arg1)                                  \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_W(_junk,fnptr,arg1); } while (0)
+
+#define CALL_FN_v_WW(fnptr, arg1,arg2)                            \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_WW(_junk,fnptr,arg1,arg2); } while (0)
+
+#define CALL_FN_v_WWW(fnptr, arg1,arg2,arg3)                      \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_WWW(_junk,fnptr,arg1,arg2,arg3); } while (0)
+
+/* ------------------------- x86-linux ------------------------- */
+
+#if defined(PLAT_x86_linux)
+
+/* These regs are trashed by the hidden call.  No need to mention eax
+   as gcc can already see that, plus causes gcc to bomb. */
+#define __CALLER_SAVED_REGS /*"eax"*/ "ecx", "edx"
+
+/* These CALL_FN_ macros assume that on x86-linux, sizeof(unsigned
+   long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $4, %%esp\n"                                       \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $8, %%esp\n"                                       \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $12, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $16, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $20, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $24, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $28, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $32, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $36, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $40, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11)                          \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         "pushl 44(%%eax)\n\t"                                    \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $44, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11,arg12)                    \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         "pushl 48(%%eax)\n\t"                                    \
+         "pushl 44(%%eax)\n\t"                                    \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $48, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_x86_linux */
+
+/* ------------------------ amd64-linux ------------------------ */
+
+#if defined(PLAT_amd64_linux)
+
+/* ARGREGS: rdi rsi rdx rcx r8 r9 (the rest on stack in R-to-L order) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS /*"rax",*/ "rcx", "rdx", "rsi",       \
+                            "rdi", "r8", "r9", "r10", "r11"
+
+/* These CALL_FN_ macros assume that on amd64-linux, sizeof(unsigned
+   long) == 8. */
+
+/* NB 9 Sept 07.  There is a nasty kludge here in all these CALL_FN_
+   macros.  In order not to trash the stack redzone, we need to drop
+   %rsp by 128 before the hidden call, and restore afterwards.  The
+   nastyness is that it is only by luck that the stack still appears
+   to be unwindable during the hidden call - since then the behaviour
+   of any routine using this macro does not match what the CFI data
+   says.  Sigh.
+
+   Why is this important?  Imagine that a wrapper has a stack
+   allocated local, and passes to the hidden call, a pointer to it.
+   Because gcc does not know about the hidden call, it may allocate
+   that local in the redzone.  Unfortunately the hidden call may then
+   trash it before it comes to use it.  So we must step clear of the
+   redzone, for the duration of the hidden call, to make it safe.
+
+   Probably the same problem afflicts the other redzone-style ABIs too
+   (ppc64-linux, ppc32-aix5, ppc64-aix5); but for those, the stack is
+   self describing (none of this CFI nonsense) so at least messing
+   with the stack pointer doesn't give a danger of non-unwindable
+   stack. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         "addq $128,%%rsp\n\t"                                    \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $8, %%rsp\n"                                       \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $16, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $24, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 80(%%rax)\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $32, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 88(%%rax)\n\t"                                    \
+         "pushq 80(%%rax)\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $40, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 96(%%rax)\n\t"                                    \
+         "pushq 88(%%rax)\n\t"                                    \
+         "pushq 80(%%rax)\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $48, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_amd64_linux */
+
+/* ------------------------ ppc32-linux ------------------------ */
+
+#if defined(PLAT_ppc32_linux)
+
+/* This is useful for finding out about the on-stack stuff:
+
+   extern int f9  ( int,int,int,int,int,int,int,int,int );
+   extern int f10 ( int,int,int,int,int,int,int,int,int,int );
+   extern int f11 ( int,int,int,int,int,int,int,int,int,int,int );
+   extern int f12 ( int,int,int,int,int,int,int,int,int,int,int,int );
+
+   int g9 ( void ) {
+      return f9(11,22,33,44,55,66,77,88,99);
+   }
+   int g10 ( void ) {
+      return f10(11,22,33,44,55,66,77,88,99,110);
+   }
+   int g11 ( void ) {
+      return f11(11,22,33,44,55,66,77,88,99,110,121);
+   }
+   int g12 ( void ) {
+      return f12(11,22,33,44,55,66,77,88,99,110,121,132);
+   }
+*/
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* These CALL_FN_ macros assume that on ppc32-linux, 
+   sizeof(unsigned long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-16\n\t"                                       \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,16\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-16\n\t"                                       \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,16\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      _argvec[11] = (unsigned long)arg11;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-32\n\t"                                       \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,16(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,32\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      _argvec[11] = (unsigned long)arg11;                         \
+      _argvec[12] = (unsigned long)arg12;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-32\n\t"                                       \
+         /* arg12 */                                              \
+         "lwz 3,48(11)\n\t"                                       \
+         "stw 3,20(1)\n\t"                                        \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,16(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,32\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc32_linux */
+
+/* ------------------------ ppc64-linux ------------------------ */
+
+#if defined(PLAT_ppc64_linux)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* These CALL_FN_ macros assume that on ppc64-linux, sizeof(unsigned
+   long) == 8. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-128\n\t"  /* expand stack frame */            \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,128"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-128\n\t"  /* expand stack frame */            \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,128"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-144\n\t"  /* expand stack frame */            \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,144"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-144\n\t"  /* expand stack frame */            \
+         /* arg12 */                                              \
+         "ld  3,96(11)\n\t"                                       \
+         "std 3,136(1)\n\t"                                       \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,144"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc64_linux */
+
+/* ------------------------ ppc32-aix5 ------------------------- */
+
+#if defined(PLAT_ppc32_aix5)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* Expand the stack frame, copying enough info that unwinding
+   still works.  Trashes r3. */
+
+#define VG_EXPAND_FRAME_BY_trashes_r3(_n_fr)                      \
+         "addi 1,1,-" #_n_fr "\n\t"                               \
+         "lwz  3," #_n_fr "(1)\n\t"                               \
+         "stw  3,0(1)\n\t"
+
+#define VG_CONTRACT_FRAME_BY(_n_fr)                               \
+         "addi 1,1," #_n_fr "\n\t"
+
+/* These CALL_FN_ macros assume that on ppc32-aix5, sizeof(unsigned
+   long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t" /* arg2->r4 */                       \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(64)                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(64)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(64)                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,60(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(64)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(72)                        \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,64(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,60(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(72)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(72)                        \
+         /* arg12 */                                              \
+         "lwz 3,48(11)\n\t"                                       \
+         "stw 3,68(1)\n\t"                                        \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,64(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,60(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(72)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc32_aix5 */
+
+/* ------------------------ ppc64-aix5 ------------------------- */
+
+#if defined(PLAT_ppc64_aix5)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* Expand the stack frame, copying enough info that unwinding
+   still works.  Trashes r3. */
+
+#define VG_EXPAND_FRAME_BY_trashes_r3(_n_fr)                      \
+         "addi 1,1,-" #_n_fr "\n\t"                               \
+         "ld   3," #_n_fr "(1)\n\t"                               \
+         "std  3,0(1)\n\t"
+
+#define VG_CONTRACT_FRAME_BY(_n_fr)                               \
+         "addi 1,1," #_n_fr "\n\t"
+
+/* These CALL_FN_ macros assume that on ppc64-aix5, sizeof(unsigned
+   long) == 8. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(128)                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(128)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(128)                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(128)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(144)                       \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(144)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(144)                       \
+         /* arg12 */                                              \
+         "ld  3,96(11)\n\t"                                       \
+         "std 3,136(1)\n\t"                                       \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(144)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc64_aix5 */
+
+
+/* ------------------------------------------------------------------ */
+/* ARCHITECTURE INDEPENDENT MACROS for CLIENT REQUESTS.               */
+/*                                                                    */
+/* ------------------------------------------------------------------ */
+
+/* Some request codes.  There are many more of these, but most are not
+   exposed to end-user view.  These are the public ones, all of the
+   form 0x1000 + small_number.
+
+   Core ones are in the range 0x00000000--0x0000ffff.  The non-public
+   ones start at 0x2000.
+*/
+
+/* These macros are used by tools -- they must be public, but don't
+   embed them into other programs. */
+#define VG_USERREQ_TOOL_BASE(a,b) \
+   ((unsigned int)(((a)&0xff) << 24 | ((b)&0xff) << 16))
+#define VG_IS_TOOL_USERREQ(a, b, v) \
+   (VG_USERREQ_TOOL_BASE(a,b) == ((v) & 0xffff0000))
+
+/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !! 
+   This enum comprises an ABI exported by Valgrind to programs
+   which use client requests.  DO NOT CHANGE THE ORDER OF THESE
+   ENTRIES, NOR DELETE ANY -- add new ones at the end. */
+typedef
+   enum { VG_USERREQ__RUNNING_ON_VALGRIND  = 0x1001,
+          VG_USERREQ__DISCARD_TRANSLATIONS = 0x1002,
+
+          /* These allow any function to be called from the simulated
+             CPU but run on the real CPU.  Nb: the first arg passed to
+             the function is always the ThreadId of the running
+             thread!  So CLIENT_CALL0 actually requires a 1 arg
+             function, etc. */
+          VG_USERREQ__CLIENT_CALL0 = 0x1101,
+          VG_USERREQ__CLIENT_CALL1 = 0x1102,
+          VG_USERREQ__CLIENT_CALL2 = 0x1103,
+          VG_USERREQ__CLIENT_CALL3 = 0x1104,
+
+          /* Can be useful in regression testing suites -- eg. can
+             send Valgrind's output to /dev/null and still count
+             errors. */
+          VG_USERREQ__COUNT_ERRORS = 0x1201,
+
+          /* These are useful and can be interpreted by any tool that
+             tracks malloc() et al, by using vg_replace_malloc.c. */
+          VG_USERREQ__MALLOCLIKE_BLOCK = 0x1301,
+          VG_USERREQ__FREELIKE_BLOCK   = 0x1302,
+          /* Memory pool support. */
+          VG_USERREQ__CREATE_MEMPOOL   = 0x1303,
+          VG_USERREQ__DESTROY_MEMPOOL  = 0x1304,
+          VG_USERREQ__MEMPOOL_ALLOC    = 0x1305,
+          VG_USERREQ__MEMPOOL_FREE     = 0x1306,
+          VG_USERREQ__MEMPOOL_TRIM     = 0x1307,
+          VG_USERREQ__MOVE_MEMPOOL     = 0x1308,
+          VG_USERREQ__MEMPOOL_CHANGE   = 0x1309,
+          VG_USERREQ__MEMPOOL_EXISTS   = 0x130a,
+
+          /* Allow printfs to valgrind log. */
+          VG_USERREQ__PRINTF           = 0x1401,
+          VG_USERREQ__PRINTF_BACKTRACE = 0x1402,
+
+          /* Stack support. */
+          VG_USERREQ__STACK_REGISTER   = 0x1501,
+          VG_USERREQ__STACK_DEREGISTER = 0x1502,
+          VG_USERREQ__STACK_CHANGE     = 0x1503
+   } Vg_ClientRequest;
+
+#if !defined(__GNUC__)
+#  define __extension__ /* */
+#endif
+
+/* Returns the number of Valgrinds this code is running under.  That
+   is, 0 if running natively, 1 if running under Valgrind, 2 if
+   running under Valgrind which is running under another Valgrind,
+   etc. */
+#define RUNNING_ON_VALGRIND  __extension__                        \
+   ({unsigned int _qzz_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* if not */,          \
+                               VG_USERREQ__RUNNING_ON_VALGRIND,   \
+                               0, 0, 0, 0, 0);                    \
+    _qzz_res;                                                     \
+   })
+
+
+/* Discard translation of code in the range [_qzz_addr .. _qzz_addr +
+   _qzz_len - 1].  Useful if you are debugging a JITter or some such,
+   since it provides a way to make sure valgrind will retranslate the
+   invalidated area.  Returns no value. */
+#define VALGRIND_DISCARD_TRANSLATIONS(_qzz_addr,_qzz_len)         \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__DISCARD_TRANSLATIONS,  \
+                               _qzz_addr, _qzz_len, 0, 0, 0);     \
+   }
+
+
+/* These requests are for getting Valgrind itself to print something.
+   Possibly with a backtrace.  This is a really ugly hack. */
+
+#if defined(NVALGRIND)
+
+#  define VALGRIND_PRINTF(...)
+#  define VALGRIND_PRINTF_BACKTRACE(...)
+
+#else /* NVALGRIND */
+
+/* Modern GCC will optimize the static routine out if unused,
+   and unused attribute will shut down warnings about it.  */
+static int VALGRIND_PRINTF(const char *format, ...)
+   __attribute__((format(__printf__, 1, 2), __unused__));
+static int
+VALGRIND_PRINTF(const char *format, ...)
+{
+   unsigned long _qzz_res;
+   va_list vargs;
+   va_start(vargs, format);
+   VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, VG_USERREQ__PRINTF,
+                              (unsigned long)format, (unsigned long)vargs, 
+                              0, 0, 0);
+   va_end(vargs);
+   return (int)_qzz_res;
+}
+
+static int VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
+   __attribute__((format(__printf__, 1, 2), __unused__));
+static int
+VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
+{
+   unsigned long _qzz_res;
+   va_list vargs;
+   va_start(vargs, format);
+   VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, VG_USERREQ__PRINTF_BACKTRACE,
+                              (unsigned long)format, (unsigned long)vargs, 
+                              0, 0, 0);
+   va_end(vargs);
+   return (int)_qzz_res;
+}
+
+#endif /* NVALGRIND */
+
+
+/* These requests allow control to move from the simulated CPU to the
+   real CPU, calling an arbitary function.
+   
+   Note that the current ThreadId is inserted as the first argument.
+   So this call:
+
+     VALGRIND_NON_SIMD_CALL2(f, arg1, arg2)
+
+   requires f to have this signature:
+
+     Word f(Word tid, Word arg1, Word arg2)
+
+   where "Word" is a word-sized type.
+
+   Note that these client requests are not entirely reliable.  For example,
+   if you call a function with them that subsequently calls printf(),
+   there's a high chance Valgrind will crash.  Generally, your prospects of
+   these working are made higher if the called function does not refer to
+   any global variables, and does not refer to any libc or other functions
+   (printf et al).  Any kind of entanglement with libc or dynamic linking is
+   likely to have a bad outcome, for tricky reasons which we've grappled
+   with a lot in the past.
+*/
+#define VALGRIND_NON_SIMD_CALL0(_qyy_fn)                          \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL0,          \
+                               _qyy_fn,                           \
+                               0, 0, 0, 0);                       \
+    _qyy_res;                                                     \
+   })
+
+#define VALGRIND_NON_SIMD_CALL1(_qyy_fn, _qyy_arg1)               \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL1,          \
+                               _qyy_fn,                           \
+                               _qyy_arg1, 0, 0, 0);               \
+    _qyy_res;                                                     \
+   })
+
+#define VALGRIND_NON_SIMD_CALL2(_qyy_fn, _qyy_arg1, _qyy_arg2)    \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL2,          \
+                               _qyy_fn,                           \
+                               _qyy_arg1, _qyy_arg2, 0, 0);       \
+    _qyy_res;                                                     \
+   })
+
+#define VALGRIND_NON_SIMD_CALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3) \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL3,          \
+                               _qyy_fn,                           \
+                               _qyy_arg1, _qyy_arg2,              \
+                               _qyy_arg3, 0);                     \
+    _qyy_res;                                                     \
+   })
+
+
+/* Counts the number of errors that have been recorded by a tool.  Nb:
+   the tool must record the errors with VG_(maybe_record_error)() or
+   VG_(unique_error)() for them to be counted. */
+#define VALGRIND_COUNT_ERRORS                                     \
+   __extension__                                                  \
+   ({unsigned int _qyy_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__COUNT_ERRORS,          \
+                               0, 0, 0, 0, 0);                    \
+    _qyy_res;                                                     \
+   })
+
+/* Mark a block of memory as having been allocated by a malloc()-like
+   function.  `addr' is the start of the usable block (ie. after any
+   redzone) `rzB' is redzone size if the allocator can apply redzones;
+   use '0' if not.  Adding redzones makes it more likely Valgrind will spot
+   block overruns.  `is_zeroed' indicates if the memory is zeroed, as it is
+   for calloc().  Put it immediately after the point where a block is
+   allocated. 
+   
+   If you're using Memcheck: If you're allocating memory via superblocks,
+   and then handing out small chunks of each superblock, if you don't have
+   redzones on your small blocks, it's worth marking the superblock with
+   VALGRIND_MAKE_MEM_NOACCESS when it's created, so that block overruns are
+   detected.  But if you can put redzones on, it's probably better to not do
+   this, so that messages for small overruns are described in terms of the
+   small block rather than the superblock (but if you have a big overrun
+   that skips over a redzone, you could miss an error this way).  See
+   memcheck/tests/custom_alloc.c for an example.
+
+   WARNING: if your allocator uses malloc() or 'new' to allocate
+   superblocks, rather than mmap() or brk(), this will not work properly --
+   you'll likely get assertion failures during leak detection.  This is
+   because Valgrind doesn't like seeing overlapping heap blocks.  Sorry.
+
+   Nb: block must be freed via a free()-like function specified
+   with VALGRIND_FREELIKE_BLOCK or mismatch errors will occur. */
+#define VALGRIND_MALLOCLIKE_BLOCK(addr, sizeB, rzB, is_zeroed)    \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MALLOCLIKE_BLOCK,      \
+                               addr, sizeB, rzB, is_zeroed, 0);   \
+   }
+
+/* Mark a block of memory as having been freed by a free()-like function.
+   `rzB' is redzone size;  it must match that given to
+   VALGRIND_MALLOCLIKE_BLOCK.  Memory not freed will be detected by the leak
+   checker.  Put it immediately after the point where the block is freed. */
+#define VALGRIND_FREELIKE_BLOCK(addr, rzB)                        \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__FREELIKE_BLOCK,        \
+                               addr, rzB, 0, 0, 0);               \
+   }
+
+/* Create a memory pool. */
+#define VALGRIND_CREATE_MEMPOOL(pool, rzB, is_zeroed)             \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__CREATE_MEMPOOL,        \
+                               pool, rzB, is_zeroed, 0, 0);       \
+   }
+
+/* Destroy a memory pool. */
+#define VALGRIND_DESTROY_MEMPOOL(pool)                            \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__DESTROY_MEMPOOL,       \
+                               pool, 0, 0, 0, 0);                 \
+   }
+
+/* Associate a piece of memory with a memory pool. */
+#define VALGRIND_MEMPOOL_ALLOC(pool, addr, size)                  \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_ALLOC,         \
+                               pool, addr, size, 0, 0);           \
+   }
+
+/* Disassociate a piece of memory from a memory pool. */
+#define VALGRIND_MEMPOOL_FREE(pool, addr)                         \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_FREE,          \
+                               pool, addr, 0, 0, 0);              \
+   }
+
+/* Disassociate any pieces outside a particular range. */
+#define VALGRIND_MEMPOOL_TRIM(pool, addr, size)                   \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_TRIM,          \
+                               pool, addr, size, 0, 0);           \
+   }
+
+/* Resize and/or move a piece associated with a memory pool. */
+#define VALGRIND_MOVE_MEMPOOL(poolA, poolB)                       \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MOVE_MEMPOOL,          \
+                               poolA, poolB, 0, 0, 0);            \
+   }
+
+/* Resize and/or move a piece associated with a memory pool. */
+#define VALGRIND_MEMPOOL_CHANGE(pool, addrA, addrB, size)         \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_CHANGE,        \
+                               pool, addrA, addrB, size, 0);      \
+   }
+
+/* Return 1 if a mempool exists, else 0. */
+#define VALGRIND_MEMPOOL_EXISTS(pool)                             \
+   ({unsigned int _qzz_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_EXISTS,        \
+                               pool, 0, 0, 0, 0);                 \
+    _qzz_res;                                                     \
+   })
+
+/* Mark a piece of memory as being a stack. Returns a stack id. */
+#define VALGRIND_STACK_REGISTER(start, end)                       \
+   ({unsigned int _qzz_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__STACK_REGISTER,        \
+                               start, end, 0, 0, 0);              \
+    _qzz_res;                                                     \
+   })
+
+/* Unmark the piece of memory associated with a stack id as being a
+   stack. */
+#define VALGRIND_STACK_DEREGISTER(id)                             \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__STACK_DEREGISTER,      \
+                               id, 0, 0, 0, 0);                   \
+   }
+
+/* Change the start and end address of the stack id. */
+#define VALGRIND_STACK_CHANGE(id, start, end)                     \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__STACK_CHANGE,          \
+                               id, start, end, 0, 0);             \
+   }
+
+
+#undef PLAT_x86_linux
+#undef PLAT_amd64_linux
+#undef PLAT_ppc32_linux
+#undef PLAT_ppc64_linux
+#undef PLAT_ppc32_aix5
+#undef PLAT_ppc64_aix5
+
+#endif   /* __VALGRIND_H */
diff --git a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro b/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro
new file mode 100644
index 0000000000..d0945a4eeb
--- /dev/null
+++ b/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro
@@ -0,0 +1,3 @@
+load(qttest_p4)
+HEADERS += oomsimulator.h 3rdparty/valgrind.h 3rdparty/memcheck.h
+SOURCES += tst_exceptionsafety_objects.cpp
diff --git a/tests/auto/exceptionsafety_objects/oomsimulator.h b/tests/auto/exceptionsafety_objects/oomsimulator.h
new file mode 100644
index 0000000000..3c8b389f3b
--- /dev/null
+++ b/tests/auto/exceptionsafety_objects/oomsimulator.h
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <malloc.h>
+#include <limits.h>
+#include "3rdparty/memcheck.h"
+
+/* Use glibc's memory allocation hooks */
+
+/* our hooks */
+static void *my_malloc_hook(size_t, const void *);
+static void *my_realloc_hook(void *, size_t, const void *);
+static void *my_memalign_hook(size_t, size_t, const void *);
+static void my_free_hook(void *, const void *);
+
+/* original hooks. */
+static void *(*old_malloc_hook)(size_t, const void *);
+static void *(*old_realloc_hook)(void *, size_t, const void *);
+static void *(*old_memalign_hook)(size_t, size_t, const void *);
+static void (*old_free_hook)(void *, const void *);
+
+/* initializer function */
+static void my_init_hook();
+
+/* Override initialising hook from the C library. */
+void (*__malloc_initialize_hook) (void) = my_init_hook;
+
+static void disableHooks()
+{
+    __malloc_hook = old_malloc_hook;
+    __realloc_hook = old_realloc_hook;
+    __memalign_hook = old_memalign_hook;
+    __free_hook = old_free_hook;
+}
+
+static void enableHooks()
+{
+    __malloc_hook = my_malloc_hook;
+    __realloc_hook = my_realloc_hook;
+    __memalign_hook = my_memalign_hook;
+    __free_hook = my_free_hook;
+}
+
+void my_init_hook()
+{
+    old_malloc_hook = __malloc_hook;
+    old_realloc_hook = __realloc_hook;
+    old_memalign_hook = __memalign_hook;
+    old_free_hook = __free_hook;
+    enableHooks();
+}
+
+static bool mallocFailActive = false;
+static int mallocFailIndex = 0;
+static int mallocCount = 0;
+
+struct AllocFailer
+{
+    inline AllocFailer() { mallocFailActive = true; setAllocFailIndex(0); }
+    inline ~AllocFailer() { deactivate(); }
+
+    inline void setAllocFailIndex(int index)
+    {
+        if (RUNNING_ON_VALGRIND) {
+            VALGRIND_ENABLE_OOM_AT_ALLOC_INDEX(VALGRIND_GET_ALLOC_INDEX + index + 1);
+        } else {
+            mallocFailIndex = index;
+        }
+    }
+
+    inline void deactivate()
+    {
+        mallocFailActive = false;
+        VALGRIND_ENABLE_OOM_AT_ALLOC_INDEX(INT_MAX);
+    }
+
+    inline int currentAllocIndex() const
+    {
+        if (RUNNING_ON_VALGRIND) {
+            return VALGRIND_GET_ALLOC_INDEX;
+        } else {
+            return mallocCount;
+        }
+    }
+};
+
+void *my_malloc_hook(size_t size, const void *)
+{
+    ++mallocCount;
+
+    if (mallocFailActive && --mallocFailIndex < 0)
+        return 0; // simulate OOM
+
+    __malloc_hook = old_malloc_hook;
+    void *result = ::malloc (size);
+    __malloc_hook = my_malloc_hook;
+
+    return result;
+}
+
+void *my_memalign_hook(size_t alignment, size_t size, const void *)
+{
+    ++mallocCount;
+
+    if (mallocFailActive && --mallocFailIndex < 0)
+        return 0; // simulate OOM
+
+    __memalign_hook = old_memalign_hook;
+    void *result = ::memalign(alignment, size);
+    __memalign_hook = my_memalign_hook;
+
+    return result;
+}
+
+void *my_realloc_hook(void *ptr, size_t size, const void *)
+{
+    ++mallocCount;
+
+    if (mallocFailActive && --mallocFailIndex < 0)
+        return 0; // simulate OOM
+
+    __realloc_hook = old_realloc_hook;
+    __malloc_hook = old_malloc_hook;
+    void *result = ::realloc(ptr, size);
+    __malloc_hook = my_malloc_hook;
+    __realloc_hook = my_realloc_hook;
+
+    return result;
+}
+
+void my_free_hook(void *ptr, const void *)
+{
+    __free_hook = old_free_hook;
+    ::free(ptr);
+    __free_hook = my_free_hook;
+}
+
+static void *new_helper(std::size_t size)
+{
+    void *ptr = malloc(size);
+    if (!ptr)
+        throw std::bad_alloc();
+    return ptr;
+}
+
+// overload operator new
+void* operator new(size_t size) throw (std::bad_alloc) { return new_helper(size); }
+void* operator new[](size_t size) throw (std::bad_alloc) { return new_helper(size); }
+void* operator new(size_t size, const std::nothrow_t&) throw() { return malloc(size); }
+void* operator new[](std::size_t size, const std::nothrow_t&) throw() { return malloc(size); }
+
+// overload operator delete
+void operator delete(void *ptr) throw() { if (ptr) free(ptr); }
+void operator delete[](void *ptr) throw() { if (ptr) free(ptr); }
+void operator delete(void *ptr, const std::nothrow_t&) throw() { if (ptr) free(ptr); }
+void operator delete[](void *ptr, const std::nothrow_t&) throw() { if (ptr) free (ptr); }
+
+// ignore placement new and placement delete - those don't allocate.
+
+
diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
new file mode 100644
index 0000000000..dd5f8da90d
--- /dev/null
+++ b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
@@ -0,0 +1,232 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QtGui>
+#include <QtTest/QtTest>
+
+QT_USE_NAMESPACE
+
+// this test only works with GLIBC (let moc run regardless, because it doesn't know about __GLIBC__)
+#if defined(QT_NO_EXCEPTIONS) || (!defined(__GLIBC__) && !defined(Q_MOC_RUN))
+    QTEST_NOOP_MAIN
+#else
+
+#include "oomsimulator.h"
+#include "3rdparty/memcheck.h"
+
+class tst_ExceptionSafetyObjects: public QObject
+{
+    Q_OBJECT
+
+public slots:
+    void initTestCase();
+
+private slots:
+    void objects_data();
+    void objects();
+
+    void widgets_data();
+    void widgets();
+};
+
+// helper structs to create an arbitrary widget
+struct AbstractObjectCreator
+{
+    virtual QObject *create(QObject *parent) = 0;
+};
+
+Q_DECLARE_METATYPE(AbstractObjectCreator *)
+
+template <typename T>
+struct ObjectCreator : public AbstractObjectCreator
+{
+    QObject *create(QObject *parent)
+    {
+        return parent ? new T(parent) : new T;
+    }
+};
+
+void tst_ExceptionSafetyObjects::objects_data()
+{
+    QTest::addColumn<AbstractObjectCreator *>("objectCreator");
+
+#define NEWROW(T) QTest::newRow(#T) << static_cast<AbstractObjectCreator *>(new ObjectCreator<T >)
+    NEWROW(QObject);
+}
+
+// create and destructs an object, and lets each and every allocation
+// during construction and destruction fail.
+static void doOOMTest(AbstractObjectCreator *creator, QObject *parent)
+{
+    AllocFailer allocFailer;
+    int currentOOMIndex = 0;
+    bool caught = false;
+
+    int allocStartIndex = 0;
+    int allocEndIndex = 0;
+    int lastAllocCount = 0;
+
+    do {
+        allocFailer.setAllocFailIndex(++currentOOMIndex);
+
+        caught = false;
+        lastAllocCount = allocEndIndex - allocStartIndex;
+        allocStartIndex = allocFailer.currentAllocIndex();
+
+        try {
+            QScopedPointer<QObject> ptr(creator->create(parent));
+        } catch (const std::bad_alloc &) {
+            caught = true;
+        }
+
+        allocEndIndex = allocFailer.currentAllocIndex();
+
+    } while (caught || allocEndIndex - allocStartIndex != lastAllocCount);
+
+    allocFailer.deactivate();
+}
+
+static bool alloc1Failed = false;
+static bool alloc2Failed = false;
+static bool alloc3Failed = false;
+static bool alloc4Failed = false;
+static bool malloc1Failed = false;
+static bool malloc2Failed = false;
+
+// Tests that new, new[] and malloc() fail at least once during OOM testing.
+class SelfTestObject : public QObject
+{
+public:
+    SelfTestObject(QObject *parent = 0)
+        : QObject(parent)
+    {
+        try { delete new int; } catch (const std::bad_alloc &) { alloc1Failed = true; }
+        try { delete [] new double[5]; } catch (const std::bad_alloc &) { alloc2Failed = true; }
+        void *buf = malloc(42);
+        if (buf)
+            free(buf);
+        else
+            malloc1Failed = true;
+    }
+
+    ~SelfTestObject()
+    {
+        try { delete new int; } catch (const std::bad_alloc &) { alloc3Failed = true; }
+        try { delete [] new double[5]; } catch (const std::bad_alloc &) { alloc4Failed = true; }
+        void *buf = malloc(42);
+        if (buf)
+            free(buf);
+        else
+            malloc2Failed = true;
+    }
+};
+
+void tst_ExceptionSafetyObjects::initTestCase()
+{
+    if (RUNNING_ON_VALGRIND) {
+        QVERIFY2(VALGRIND_GET_ALLOC_INDEX != -1u,
+                 "You must use a valgrind with oom simulation support");
+        // running in valgrind - don't use glibc hooks
+        disableHooks();
+    }
+
+    // sanity check whether OOM simulation works
+    AllocFailer allocFailer;
+
+    // malloc fail index is 0 -> this malloc should fail.
+    void *buf = malloc(42);
+    QVERIFY(!buf);
+
+    // malloc fail index is 1 - second malloc should fail.
+    allocFailer.setAllocFailIndex(1);
+    buf = malloc(42);
+    QVERIFY(buf);
+    free(buf);
+    buf = malloc(42);
+    QVERIFY(!buf);
+
+    allocFailer.deactivate();
+
+    doOOMTest(new ObjectCreator<SelfTestObject>, 0);
+}
+
+void tst_ExceptionSafetyObjects::objects()
+{
+    QFETCH(AbstractObjectCreator *, objectCreator);
+
+    doOOMTest(objectCreator, 0);
+}
+
+template <typename T>
+struct WidgetCreator : public AbstractObjectCreator
+{
+    QObject *create(QObject *parent)
+    {
+        return parent ? new T(static_cast<QWidget *>(parent)) : new T;
+    }
+};
+
+void tst_ExceptionSafetyObjects::widgets_data()
+{
+    QTest::addColumn<AbstractObjectCreator *>("widgetCreator");
+
+#undef NEWROW
+#define NEWROW(T) QTest::newRow(#T) << static_cast<AbstractObjectCreator *>(new WidgetCreator<T >)
+    NEWROW(QWidget);
+    NEWROW(QPushButton);
+    NEWROW(QLabel);
+    NEWROW(QFrame);
+    NEWROW(QStackedWidget);
+}
+
+void tst_ExceptionSafetyObjects::widgets()
+{
+    QFETCH(AbstractObjectCreator *, widgetCreator);
+
+    doOOMTest(widgetCreator, 0);
+
+    QWidget parent;
+    doOOMTest(widgetCreator, &parent);
+}
+
+QTEST_MAIN(tst_ExceptionSafetyObjects)
+#include "tst_exceptionsafety_objects.moc"
+#endif // QT_NO_EXCEPTIONS
diff --git a/tests/auto/headers/headers.pro b/tests/auto/headers/headers.pro
index 9da40ce00b..703da7c91b 100644
--- a/tests/auto/headers/headers.pro
+++ b/tests/auto/headers/headers.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_headers.cpp
 QT = core
-
-
diff --git a/tests/auto/languagechange/tst_languagechange.cpp b/tests/auto/languagechange/tst_languagechange.cpp
index b91dd83422..f856f67458 100644
--- a/tests/auto/languagechange/tst_languagechange.cpp
+++ b/tests/auto/languagechange/tst_languagechange.cpp
@@ -212,7 +212,12 @@ void tst_languageChange::retranslatability()
                        "languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to "
                        "get proper widget layout.");
     TransformTranslator translator;
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+    // Allow a little extra time or emulator startup delays cause failure 
+    QTimer::singleShot(5000, &translator, SLOT(install()));
+#else    
     QTimer::singleShot(500, &translator, SLOT(install()));
+#endif    
     switch (dialogType) {
     case InputDialog:
         (void)QInputDialog::getInteger(0, QLatin1String("title"), QLatin1String("label"));
@@ -235,7 +240,17 @@ void tst_languageChange::retranslatability()
         QString fooName = tmpParentDir + "/foo";
         QDir dir;
         QCOMPARE(dir.mkpath(tmpDir), true);
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+        // Just create a new file instead of copying exe, because exe is not there in emulator
+        {
+            QFile fooFile(fooName);
+            QVERIFY(fooFile.open(QIODevice::WriteOnly | QIODevice::Text));
+            for(int i=0; i<2048; i++) // File needs to be big enough for size to read in KB
+               fooFile.write("@");
+        }
+#else
         QCOMPARE(QFile::copy(QApplication::applicationFilePath(), fooName), true);
+#endif
 
         dlg.setDirectory(tmpParentDir);
 #ifdef Q_OS_WINCE
@@ -244,7 +259,12 @@ void tst_languageChange::retranslatability()
         dlg.setFileMode(QFileDialog::ExistingFiles);
         dlg.setViewMode(QFileDialog::Detail);
         dlg.exec();
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+        // increase the wait time because of increased delay caused by emulator startup
+        QTest::qWait(15000);
+#else
         QTest::qWait(3000);
+#endif
         QCOMPARE(QFile::remove(fooName), true);
         QCOMPARE(dir.rmdir(tmpDir), true);
         QCOMPARE(dir.rmdir(tmpParentDir), true);
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 9d658d77e6..9488fda62f 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -1,6 +1,4 @@
 /****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -39,21 +37,89 @@
 **
 ****************************************************************************/
 #include <QString>
+
+/*
+#ifdef QT_NETWORK_LIB
 #include <QtNetwork/QHostInfo>
+#endif
+*/
+
+#ifdef Q_OS_SYMBIAN
+#include <sys/socket.h>
+#include <net/if.h>
+#include <QSharedPointer>
+#include <QHash>
+#endif
+#if defined(Q_OS_SYMBIAN)
+#if defined(Q_CC_NOKIAX86)
+// In emulator we use WINSOCK connectivity by default. Unfortunately winsock
+// does not work very well with UDP sockets. This defines skips some test
+// cases which have known problems.
+
+// NOTE: Prefer to use WINPCAP based connectivity in S60 emulator when running
+// network tests. WINPCAP connectivity uses Symbian OS IP stack,
+// correspondingly as HW does. When using WINPCAP disable this define
+//#define SYMBIAN_WINSOCK_CONNECTIVITY
+#endif // Q_CC_NOKIAX86
+
+class QtNetworkSettingsRecord {
+public:
+    QtNetworkSettingsRecord() { }
+
+    QtNetworkSettingsRecord(const QString& recName, const QString& recVal)
+        : strRecordName(recName), strRecordValue(recVal) { }
+
+    QtNetworkSettingsRecord(const QtNetworkSettingsRecord & other)
+         : strRecordName(other.strRecordName), strRecordValue(other.strRecordValue) { }
+
+    ~QtNetworkSettingsRecord() { }
+
+    const QString& recordName() const { return strRecordName; }
+    const QString& recordValue() const { return strRecordValue; }
+
+private:
+    QString strRecordName;
+    QString strRecordValue;
+};
+
+#endif // Q_OS_SYMBIAN
 
 class QtNetworkSettings
 {
 public:
+
     static QString serverLocalName()
     {
-        return QString("qt-test-server");
+#ifdef Q_OS_SYMBIAN
+        loadTestSettings();
+
+        if(QtNetworkSettings::entries.contains("server.localname")) {
+            QtNetworkSettingsRecord* entry = entries["server.localname"];
+            return entry->recordValue();
+        }
+#endif
+        return QString("qttest");
+        //return QString("aspiriniks");
+        //return QString("qt-test-server");
     }
     static QString serverDomainName()
     {
-        return QString("qt-test-net");
+#ifdef Q_OS_SYMBIAN
+        loadTestSettings();
+
+        if(QtNetworkSettings::entries.contains("server.domainname")) {
+            QtNetworkSettingsRecord* entry = entries["server.domainname"];
+            return entry->recordValue();
+        }
+#endif
+        return QString("it.local");
+        //return QString("troll.no");
     }
     static QString serverName()
     {
+#ifdef Q_OS_SYMBIAN
+        loadTestSettings();
+#endif
         return serverLocalName() + "." + serverDomainName();
     }
     static QString winServerName()
@@ -62,14 +128,215 @@ public:
     }
     static QString wildcardServerName()
     {
-        return "qt-test-server.wildcard.dev." + serverDomainName();
+        //return "qt-test-server.wildcard.dev." + serverDomainName();
+        return "qttest.wildcard.dev." + serverDomainName();
+    }
+    static const char *serverIP()
+    {
+#ifdef Q_OS_SYMBIAN
+        loadTestSettings();
+
+        if(QtNetworkSettings::entries.contains("server.ip")) {
+            QtNetworkSettingsRecord* entry = entries["server.ip"];
+            if(serverIp.isNull()) {
+                serverIp = entry->recordValue().toAscii();
+            }
+            return serverIp.data();
+        }
+#endif
+        return "10.10.14.172";
+    }
+
+    static QByteArray expectedReplyIMAP()
+    {
+#ifdef Q_OS_SYMBIAN
+        loadTestSettings();
+
+        if(QtNetworkSettings::entries.contains("imap.expectedreply")) {
+            QtNetworkSettingsRecord* entry = entries["imap.expectedreply"];
+            if(imapExpectedReply.isNull()) {
+                imapExpectedReply = entry->recordValue().toAscii();
+                imapExpectedReply.append('\r').append('\n');
+            }
+            return imapExpectedReply.data();
+        }
+#endif
+        /*QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " );
+        expected = expected.append(QtNetworkSettings::serverLocalName().toAscii());
+        expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");*/
+
+        QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4REV1] " );
+        expected = expected.append(QtNetworkSettings::serverLocalName().toAscii());
+        expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+
+        return expected;
+    }
+
+    static QByteArray expectedReplySSL()
+    {
+#ifdef Q_OS_SYMBIAN
+        loadTestSettings();
+
+        if(QtNetworkSettings::entries.contains("imap.expectedreplyssl")) {
+            QtNetworkSettingsRecord* entry = entries["imap.expectedreplyssl"];
+            if(imapExpectedReplySsl.isNull()) {
+                imapExpectedReplySsl = entry->recordValue().toAscii();
+                imapExpectedReplySsl.append('\r').append('\n');
+            }
+            return imapExpectedReplySsl.data();
+        }
+#endif
+        QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID AUTH=PLAIN SASL-IR] " );
+        expected = expected.append(QtNetworkSettings::serverLocalName().toAscii());
+        expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+        return expected;
     }
 
+    static QByteArray expectedReplyFtp()
+    {
+        QByteArray expected( "220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n" );
+        return expected;
+    }
+
+#ifdef Q_OS_SYMBIAN
+    static void setDefaultIap()
+    {
+        loadDefaultIap();
+
+        struct ifreq ifReq;
+        if(entries.contains("iap.default")) {
+            QtNetworkSettingsRecord* entry = entries["iap.default"];
+            QByteArray tmp(entry->recordValue().toAscii());
+            strcpy( ifReq.ifr_name, tmp.data());
+        }
+        else // some default value
+            strcpy( ifReq.ifr_name, "Lab");
+
+        int err = setdefaultif( &ifReq );
+        if(err)
+            printf("Setting default IAP - '%s' failed: %d\n", ifReq.ifr_name, err);
+        else
+            printf("'%s' used as an default IAP\n", ifReq.ifr_name);
+    }
+#endif
+
+private:
+
+#ifdef Q_OS_SYMBIAN
+
+    static  QHash<QString, QtNetworkSettingsRecord* > entries;
+    static bool bDefaultIapLoaded;
+    static bool bTestSettingsLoaded;
+    static QString iapFileFullPath;
+    static QByteArray serverIp;
+    static QByteArray imapExpectedReply;
+    static QByteArray imapExpectedReplySsl;
+
+    static bool loadDefaultIap() {
+        if(bDefaultIapLoaded)
+            return true;
+
+        QFile iapCfgFile(iapFileFullPath);
+
+        bool bFoundDefaultIapTag = false;
+
+        if (iapCfgFile.open(QFile::ReadOnly)) {
+            QTextStream input(&iapCfgFile);
+            QString line;
+            do {
+                line = input.readLine().trimmed();
+                if(line.startsWith(QString("#")))
+                    continue; // comment found
+
+                if(line.contains(QString("[DEFAULT]"))) {
+                    bFoundDefaultIapTag = true;
+                } else if(line.contains(QString("[")) && bFoundDefaultIapTag) {
+                    break;
+                }
+
+                if(bFoundDefaultIapTag && line.contains("name")) {
+                    int position = line.indexOf(QString("="));
+                    position += QString("=").length();
+
+                    //create record
+                    QtNetworkSettingsRecord *entry =
+                        new QtNetworkSettingsRecord( QString("iap.default"), line.mid(position).trimmed() );
+                    entries.insert(entry->recordName(), entry);
+                    break;
+                }
+            } while (!line.isNull());
+        }
+
+        return bDefaultIapLoaded = bFoundDefaultIapTag;
+    }
+
+    static bool loadTestSettings() {
+        if(bTestSettingsLoaded)
+            return true;
+
+        QFile cfgFile(iapFileFullPath);
+        bool bFoundTestTag = false;
+
+        if (cfgFile.open(QFile::ReadOnly)) {
+            QTextStream input(&cfgFile);
+            QString line;
+            do {
+                line = input.readLine().trimmed();
+
+                if(line.startsWith(QString("#")) || line.length() == 0)
+                    continue; // comment or empty line found
+
+                if(line.contains(QString("[TEST]"))) {
+                    bFoundTestTag = true;
+                } else if(line.startsWith(QString("[")) && bFoundTestTag) {
+                    bFoundTestTag = false;
+                    break; // finished with test tag
+                }
+
+                if(bFoundTestTag) { // non-empty line
+                    int position = line.indexOf(QString("="));
+
+                    if(position <= 0) // not found
+                        continue;
+
+                    // found - extract
+
+                    QString recname = line.mid(0, position - QString("=").length()).trimmed();
+                    QString recval = line.mid(position + QString("=").length()).trimmed();
+
+                    //create record
+                    QtNetworkSettingsRecord *entry = new QtNetworkSettingsRecord(recname, recval);
+                    entries.insert(entry->recordName(), entry);
+                }
+            } while (!line.isNull());
+        }
+
+        return bTestSettingsLoaded = true;
+    }
+#endif
+
+/*
 #ifdef QT_NETWORK_LIB
     static QHostAddress serverIP()
     {
         return QHostInfo::fromName(serverName()).addresses().first();
     }
 #endif
+*/
 
 };
+#ifdef Q_OS_SYMBIAN
+QHash<QString, QtNetworkSettingsRecord* > QtNetworkSettings::entries = QHash<QString, QtNetworkSettingsRecord* > ();
+bool QtNetworkSettings::bDefaultIapLoaded = false;
+bool QtNetworkSettings::bTestSettingsLoaded = false;
+QString QtNetworkSettings::iapFileFullPath = QString("C:\\Data\\iap.txt");
+QByteArray QtNetworkSettings::serverIp;
+QByteArray QtNetworkSettings::imapExpectedReply;
+QByteArray QtNetworkSettings::imapExpectedReplySsl;
+#endif
+
+#ifdef Q_OS_SYMBIAN
+#define Q_SET_DEFAULT_IAP QtNetworkSettings::setDefaultIap();
+#else
+#define Q_SET_DEFAULT_IAP
+#endif
diff --git a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
index 9e962d0976..772c833a7e 100644
--- a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
+++ b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
 SOURCES += tst_patternistexamplefiletree.cpp
+QT = core
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/patternistexamples/patternistexamples.pro b/tests/auto/patternistexamples/patternistexamples.pro
index 90fc1664e0..4092fc8e23 100644
--- a/tests/auto/patternistexamples/patternistexamples.pro
+++ b/tests/auto/patternistexamples/patternistexamples.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES += tst_patternistexamples.cpp
 CONFIG += qtestlib
-wince*: {
+wince*|symbian*: {
 	snippets.sources = $$QT_SOURCE_TREE/doc/src/snippets/patternist/*
 	snippets.path = patternist
 	widgetRen.sources = $$QT_SOURCE_TREE/examples/xmlpatterns/xquery/widgetRenderer/*
diff --git a/tests/auto/patternistheaders/patternistheaders.pro b/tests/auto/patternistheaders/patternistheaders.pro
index be93266016..fe4d670565 100644
--- a/tests/auto/patternistheaders/patternistheaders.pro
+++ b/tests/auto/patternistheaders/patternistheaders.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
 SOURCES += tst_patternistheaders.cpp
+QT = core
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/q3urloperator/copy.res/.gitattributes b/tests/auto/q3urloperator/copy.res/.gitattributes
new file mode 100644
index 0000000000..e04709aa2e
--- /dev/null
+++ b/tests/auto/q3urloperator/copy.res/.gitattributes
@@ -0,0 +1 @@
+rfc3252.txt     -crlf
diff --git a/tests/auto/q_func_info/q_func_info.pro b/tests/auto/q_func_info/q_func_info.pro
index fa60affc43..b30e3fb857 100644
--- a/tests/auto/q_func_info/q_func_info.pro
+++ b/tests/auto/q_func_info/q_func_info.pro
@@ -1,3 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_q_func_info.cpp
-QT -= gui
+QT = core
diff --git a/tests/auto/q_func_info/tst_q_func_info.cpp b/tests/auto/q_func_info/tst_q_func_info.cpp
index b9a5883d6c..c5e9af371b 100644
--- a/tests/auto/q_func_info/tst_q_func_info.cpp
+++ b/tests/auto/q_func_info/tst_q_func_info.cpp
@@ -41,7 +41,7 @@
 
 
 #include <QString>
-#include <QTest>
+#include <QtTest/QtTest>
 #include <QtDebug>
 
 class tst_q_func_info : public QObject
diff --git a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
index 9bc660d41d..5ad1020478 100644
--- a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
+++ b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
 SOURCES         += tst_qabstractitemmodel.cpp
-
-#QT = core
-
-
+QT = core
diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
index e7b94d14e6..6a6b39510c 100644
--- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
@@ -148,8 +148,10 @@ public:
     inline QItemSelectionModel::SelectionFlags tst_selectionCommand(const QModelIndex &index,
                                                                     const QEvent *event = 0) const
         { return selectionCommand(index, event); }
+#ifndef QT_NO_DRAGANDDROP
     inline void tst_startDrag(Qt::DropActions supportedActions)
         { startDrag(supportedActions); }
+#endif
     inline QStyleOptionViewItem tst_viewOptions() const
         { return viewOptions(); }
     enum tst_State {
@@ -267,11 +269,12 @@ void tst_QAbstractItemView::getSetCheck()
 
     // bool QAbstractItemView::dragEnabled()
     // void QAbstractItemView::setDragEnabled(bool)
+#ifndef QT_NO_DRAGANDDROP
     obj1->setDragEnabled(false);
     QCOMPARE(false, obj1->dragEnabled());
     obj1->setDragEnabled(true);
     QCOMPARE(true, obj1->dragEnabled());
-
+#endif
     // bool QAbstractItemView::alternatingRowColors()
     // void QAbstractItemView::setAlternatingRowColors(bool)
     obj1->setAlternatingRowColors(false);
@@ -440,6 +443,7 @@ void tst_QAbstractItemView::basic_tests(TestView *view)
     view->setTabKeyNavigation(true);
     QCOMPARE(view->tabKeyNavigation(), true);
 
+#ifndef QT_NO_DRAGANDDROP
     // setDropIndicatorShown
     view->setDropIndicatorShown(false);
     QCOMPARE(view->showDropIndicator(), false);
@@ -451,7 +455,8 @@ void tst_QAbstractItemView::basic_tests(TestView *view)
     QCOMPARE(view->dragEnabled(), false);
     view->setDragEnabled(true);
     QCOMPARE(view->dragEnabled(), true);
-
+#endif
+    
     // setAlternatingRowColors
     view->setAlternatingRowColors(false);
     QCOMPARE(view->alternatingRowColors(), false);
@@ -545,6 +550,7 @@ void tst_QAbstractItemView::basic_tests(TestView *view)
 
     view->tst_selectionCommand(QModelIndex(), 0);
 
+#ifndef QT_NO_DRAGANDDROP
     if (!view->model())
         view->tst_startDrag(Qt::CopyAction);
 
@@ -562,7 +568,8 @@ void tst_QAbstractItemView::basic_tests(TestView *view)
     QVERIFY(view->tst_state()==TestView::ExpandingState);
     view->tst_setState(TestView::CollapsingState);
     QVERIFY(view->tst_state()==TestView::CollapsingState);
-
+#endif
+    
     view->tst_startAutoScroll();
     view->tst_stopAutoScroll();
     view->tst_doAutoScroll();
diff --git a/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro b/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro
index 4b2e7b4646..5c501030c0 100644
--- a/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro
+++ b/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
 SOURCES += tst_qabstractmessagehandler.cpp
+QT = core
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro
index cffadb05c9..11e340d4e5 100644
--- a/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro
+++ b/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 QT += network
 SOURCES  += tst_qabstractnetworkcache.cpp
 
-wince*: {
+wince*|symbian: {
    testFiles.sources = tests
    testFiles.path = .
    DEPLOYMENT += testFiles
diff --git a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
index 7768699c60..2a4a1a75fa 100644
--- a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
+++ b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
@@ -81,8 +81,12 @@ public:
         : QNetworkDiskCache(parent)
         , gotData(false)
     {
-        QString location = QDesktopServices::storageLocation(QDesktopServices::DataLocation)
-                                    + QLatin1String("/cache/");
+#ifdef Q_OS_SYMBIAN
+        QString location = QLatin1String("./cache/");
+#else
+        QString location = QDesktopServices::storageLocation(QDesktopServices::DataLocation) 
+                                + QLatin1String("/cache/");
+#endif
         setCacheDirectory(location);
         clear();
     }
@@ -99,13 +103,15 @@ public:
 
 tst_QAbstractNetworkCache::tst_QAbstractNetworkCache()
 {
+    Q_SET_DEFAULT_IAP
+
     QCoreApplication::setOrganizationName(QLatin1String("Trolltech"));
     QCoreApplication::setApplicationName(QLatin1String("autotest_qabstractnetworkcache"));
     QCoreApplication::setApplicationVersion(QLatin1String("1.0"));
 }
 
 tst_QAbstractNetworkCache::~tst_QAbstractNetworkCache()
-{
+{      
 }
 
 static bool AlwaysTrue = true;
diff --git a/tests/auto/qabstracturiresolver/qabstracturiresolver.pro b/tests/auto/qabstracturiresolver/qabstracturiresolver.pro
index de9a36896e..0d76208760 100644
--- a/tests/auto/qabstracturiresolver/qabstracturiresolver.pro
+++ b/tests/auto/qabstracturiresolver/qabstracturiresolver.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 SOURCES += tst_qabstracturiresolver.cpp
 HEADERS += TestURIResolver.h
+QT = core
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
index f6dca8b0f0..6bc0c59c50 100644
--- a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
+++ b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
 SOURCES += tst_qabstractxmlforwarditerator.cpp
+QT = core
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro b/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro
index ad3f2b2f0b..2bd2ba4589 100644
--- a/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro
+++ b/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
 SOURCES += tst_qabstractxmlreceiver.cpp
+QT = core
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/qaction/tst_qaction.cpp
index 3c71baf4b5..b6bc193de7 100644
--- a/tests/auto/qaction/tst_qaction.cpp
+++ b/tests/auto/qaction/tst_qaction.cpp
@@ -242,7 +242,7 @@ void tst_QAction::setStandardKeys()
     QList<QKeySequence> expected;
 #ifdef Q_WS_MAC
     expected  << QKeySequence("CTRL+C");
-#elif defined(Q_WS_WIN) || defined(Q_WS_QWS)
+#elif defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
     expected  << QKeySequence("CTRL+C") << QKeySequence("CTRL+INSERT");
 #else
     expected  << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT");
diff --git a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro
index 904a62ace2..93a03db7ae 100644
--- a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro
+++ b/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro
@@ -3,13 +3,18 @@
 ######################################################################
 
 TEMPLATE = app
+!symbian*: {
 DEPENDPATH += .
 INCLUDEPATH += .
-wince*:TARGET = ../desktopsettingsaware
+}
+wince*|symbian*:TARGET = ../desktopsettingsaware
+
 # Input
 SOURCES += main.cpp
 CONFIG += qt warn_on create_prl link_prl
 CONFIG -= app_bundle
+
+!symbian*: {
 OBJECTS_DIR=.obj/debug-shared
 MOC_DIR=.moc/debug-shared
-
+}
diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/qapplication/test/test.pro
index cda7940789..7c3de3cf7d 100644
--- a/tests/auto/qapplication/test/test.pro
+++ b/tests/auto/qapplication/test/test.pro
@@ -11,6 +11,14 @@ wince* {
   DEPLOYMENT = additional deploy someTest
 }
 
+symbian*: {
+  additional.sources = ../desktopsettingsaware/desktopsettingsaware.exe
+  additional.path = desktopsettingsaware
+  someTest.sources = test.pro
+  someTest.path = test
+  DEPLOYMENT = additional deploy someTest
+}
+
 win32 {
   CONFIG(debug, debug|release) {
     TARGET = ../../debug/tst_qapplication
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp
index 7cb6bfa877..f2da9d3806 100644
--- a/tests/auto/qapplication/tst_qapplication.cpp
+++ b/tests/auto/qapplication/tst_qapplication.cpp
@@ -57,6 +57,21 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#if defined(Q_OS_SYMBIAN)
+// In Symbian, the PluginsPath doesn't specify the only absolute path; just the dir that can be found on any drive
+static void addExpectedSymbianPluginsPath(QStringList& expected)
+{
+    QString installPathPlugins = QDir::fromNativeSeparators(QLibraryInfo::location(QLibraryInfo::PluginsPath));
+    QFileInfoList driveList = QDir::drives();
+    QListIterator<QFileInfo> iter(driveList);
+    while (iter.hasNext()) {
+        QFileInfo testFi(iter.next().canonicalPath().append(installPathPlugins));
+        if (testFi.exists())
+            expected << testFi.canonicalFilePath();
+    }
+}
+#endif
+
 class tst_QApplication : public QObject
 {
 Q_OBJECT
@@ -787,7 +802,13 @@ void tst_QApplication::libraryPaths()
         QStringList actual = QApplication::libraryPaths();
         actual.sort();
 
+#if defined(Q_OS_SYMBIAN)
+        QStringList expected;
+        addExpectedSymbianPluginsPath(expected);
+        expected << appDirPath;
+#else
         QStringList expected = QSet<QString>::fromList((QStringList() << installPathPlugins << appDirPath)).toList();
+#endif
         expected.sort();
 
         QVERIFY2(isPathListIncluded(actual, expected),
@@ -890,7 +911,11 @@ void tst_QApplication::libraryPaths_qt_plugin_path()
 
 void tst_QApplication::libraryPaths_qt_plugin_path_2()
 {
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_SYMBIAN
+    QByteArray validPath = "C:\\data";
+    QByteArray nonExistentPath = "Z:\\nonexistent";
+    QByteArray pluginPath = validPath + ";" + nonExistentPath;
+#elif defined(Q_OS_UNIX)
     QByteArray validPath = QDir("/tmp").canonicalPath().toLatin1();
     QByteArray nonExistentPath = "/nonexistent";
     QByteArray pluginPath = validPath + ":" + nonExistentPath;
@@ -915,19 +940,25 @@ void tst_QApplication::libraryPaths_qt_plugin_path_2()
         QApplication app(argc, &argv0, QApplication::GuiServer);
 
         // library path list should contain the default plus the one valid path
+#if defined(Q_OS_SYMBIAN)
+        // In Symbian, the PluginsPath doesn't specify the only absolute path; just the dir that can be found on any drive
+        QStringList expected;
+        addExpectedSymbianPluginsPath(expected);
+        expected << QDir(app.applicationDirPath()).canonicalPath()
+            << QDir(QDir::fromNativeSeparators(QString::fromLatin1(validPath))).canonicalPath();
+#else
         QStringList expected =
             QStringList()
             << QLibraryInfo::location(QLibraryInfo::PluginsPath)
             << QDir(app.applicationDirPath()).canonicalPath()
             << QDir(QDir::fromNativeSeparators(QString::fromLatin1(validPath))).canonicalPath();
-#ifdef Q_OS_WINCE
+# ifdef Q_OS_WINCE
         expected = QSet<QString>::fromList(expected).toList();
+# endif
 #endif
         QVERIFY2(isPathListIncluded(app.libraryPaths(), expected),
                  qPrintable("actual:\n - " + app.libraryPaths().join("\n - ") +
                             "\nexpected:\n - " + expected.join("\n - ")));
-
-        qputenv("QT_PLUGIN_PATH", QByteArray());
     }
 
     {
@@ -939,13 +970,19 @@ void tst_QApplication::libraryPaths_qt_plugin_path_2()
         // the environment variable here doesn't work
         qputenv("QT_PLUGIN_PATH", pluginPath);
 
-        // library path list should contain the default plus the one valid path
+        // library path list should contain the default
+#if defined(Q_OS_SYMBIAN)
+        QStringList expected;
+        addExpectedSymbianPluginsPath(expected);
+        expected << app.applicationDirPath();
+#else
         QStringList expected =
             QStringList()
             << QLibraryInfo::location(QLibraryInfo::PluginsPath)
             << app.applicationDirPath();
-#ifdef Q_OS_WINCE
+# ifdef Q_OS_WINCE
         expected = QSet<QString>::fromList(expected).toList();
+# endif
 #endif
         QVERIFY(isPathListIncluded(app.libraryPaths(), expected));
 
@@ -1393,6 +1430,13 @@ void tst_QApplication::desktopSettingsAware()
     testProcess.start("desktopsettingsaware/debug/desktopsettingsaware");
 #elif defined(Q_OS_WIN)
     testProcess.start("desktopsettingsaware/release/desktopsettingsaware");
+#elif defined(Q_OS_SYMBIAN)
+    testProcess.start("desktopsettingsaware");
+#if defined(Q_CC_NOKIAX86)
+    QEXPECT_FAIL("", "QProcess on Q_CC_NOKIAX86 cannot launch another Qt application, due to DLL conflicts.", Abort);
+    // TODO: Remove XFAIL, as soon as we can launch Qt applications from within Qt applications on Symbian
+    QVERIFY(testProcess.error() != QProcess::FailedToStart);
+#endif // defined(Q_CC_NOKIAX86)
 #else
     testProcess.start("desktopsettingsaware/desktopsettingsaware");
 #endif
diff --git a/tests/auto/qatomicint/qatomicint.pro b/tests/auto/qatomicint/qatomicint.pro
index 26b5b90428..4a09d5f176 100644
--- a/tests/auto/qatomicint/qatomicint.pro
+++ b/tests/auto/qatomicint/qatomicint.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
-
 SOURCES += tst_qatomicint.cpp
 QT = core
-
-
diff --git a/tests/auto/qatomicpointer/qatomicpointer.pro b/tests/auto/qatomicpointer/qatomicpointer.pro
index d4e88f607f..d192bad5dc 100644
--- a/tests/auto/qatomicpointer/qatomicpointer.pro
+++ b/tests/auto/qatomicpointer/qatomicpointer.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qatomicpointer.cpp
 QT = core
-
-
diff --git a/tests/auto/qautoptr/qautoptr.pro b/tests/auto/qautoptr/qautoptr.pro
index 505840907c..9eab0848d1 100644
--- a/tests/auto/qautoptr/qautoptr.pro
+++ b/tests/auto/qautoptr/qautoptr.pro
@@ -1,4 +1,4 @@
 load(qttest_p4)
 SOURCES += tst_qautoptr.cpp
-QT -= gui
+QT = core 
 include(../xmlpatterns.pri)
diff --git a/tests/auto/qbitarray/qbitarray.pro b/tests/auto/qbitarray/qbitarray.pro
index 182b06ab22..ec110c62cd 100644
--- a/tests/auto/qbitarray/qbitarray.pro
+++ b/tests/auto/qbitarray/qbitarray.pro
@@ -1,7 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qbitarray.cpp
-
-
 QT = core
-
-
diff --git a/tests/auto/qbitarray/tst_qbitarray.cpp b/tests/auto/qbitarray/tst_qbitarray.cpp
index 14a1665869..3c9ef53897 100644
--- a/tests/auto/qbitarray/tst_qbitarray.cpp
+++ b/tests/auto/qbitarray/tst_qbitarray.cpp
@@ -43,7 +43,6 @@
 #include <QtTest/QtTest>
 #include <QtCore/QBuffer>
 #include <QtCore/QDataStream>
-#include <iostream>
 
 #include "qbitarray.h"
 
@@ -109,6 +108,8 @@ private slots:
     void invertOnNull() const;
     void operator_noteq_data();
     void operator_noteq();
+
+    void resize();
 };
 
 Q_DECLARE_METATYPE(QBitArray)
@@ -629,5 +630,30 @@ void tst_QBitArray::operator_noteq()
     QCOMPARE(b, res);
 }
 
+void tst_QBitArray::resize()
+{
+    // -- check that a resize handles the bits correctly
+    QBitArray a = QStringToQBitArray(QString("11"));
+    a.resize(10);
+    QVERIFY(a.size() == 10);
+    QCOMPARE( a, QStringToQBitArray(QString("1100000000")) );
+
+    a.setBit(9);
+    a.resize(9);
+    // now the bit in a should have been gone:
+    QCOMPARE( a, QStringToQBitArray(QString("110000000")) );
+
+    // grow the array back and check the new bit
+    a.resize(10);
+    QCOMPARE( a, QStringToQBitArray(QString("1100000000")) );
+    
+    // other test with and
+    a.resize(9);
+    QBitArray b = QStringToQBitArray(QString("1111111111"));
+    b &= a;
+    QCOMPARE( b, QStringToQBitArray(QString("1100000000")) );
+
+}
+
 QTEST_APPLESS_MAIN(tst_QBitArray)
 #include "tst_qbitarray.moc"
diff --git a/tests/auto/qbuffer/qbuffer.pro b/tests/auto/qbuffer/qbuffer.pro
index fc5842dce7..ea8365766b 100644
--- a/tests/auto/qbuffer/qbuffer.pro
+++ b/tests/auto/qbuffer/qbuffer.pro
@@ -1,7 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qbuffer.cpp
-
-
 QT = core
-
-
diff --git a/tests/auto/qbytearray/.gitattributes b/tests/auto/qbytearray/.gitattributes
new file mode 100644
index 0000000000..e04709aa2e
--- /dev/null
+++ b/tests/auto/qbytearray/.gitattributes
@@ -0,0 +1 @@
+rfc3252.txt     -crlf
diff --git a/tests/auto/qbytearray/qbytearray.pro b/tests/auto/qbytearray/qbytearray.pro
index f41c7ae125..d14534ba98 100644
--- a/tests/auto/qbytearray/qbytearray.pro
+++ b/tests/auto/qbytearray/qbytearray.pro
@@ -4,11 +4,16 @@ SOURCES  += tst_qbytearray.cpp
 
 QT = core
 
-wince*: {
+wince*|symbian: {
    addFile.sources = rfc3252.txt
    addFile.path = .
    DEPLOYMENT += addFile
+}
+
+wince: {
    DEFINES += SRCDIR=\\\"\\\"
+} symbian: {
+  TARGET.EPOCHEAPSIZE="0x100 0x800000"
 } else {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp
index c004be1e67..e3380284bd 100644
--- a/tests/auto/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/qbytearray/tst_qbytearray.cpp
@@ -53,6 +53,10 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#if defined(Q_OS_SYMBIAN)
+#define SRCDIR ""
+#endif
+
 class tst_QByteArray : public QObject
 {
     Q_OBJECT
@@ -957,7 +961,7 @@ void tst_QByteArray::toInt()
     QCOMPARE( number, expectednumber );
 }
 
-Q_DECLARE_METATYPE(qulonglong);
+Q_DECLARE_METATYPE(qulonglong)
 void tst_QByteArray::toULong_data()
 {
     QTest::addColumn<QByteArray>("str");
@@ -967,8 +971,8 @@ void tst_QByteArray::toULong_data()
 
     ulong LongMaxPlusOne = (ulong)LONG_MAX + 1;
     QTest::newRow("LONG_MAX+1") << QString::number(LongMaxPlusOne).toLatin1() << 10 << LongMaxPlusOne << true;
-    QTest::newRow("default") << QByteArray() << 10 << 0UL << FALSE;
-    QTest::newRow("empty") << QByteArray("") << 10 << 0UL << FALSE;
+    QTest::newRow("default") << QByteArray() << 10 << 0UL << false;
+    QTest::newRow("empty") << QByteArray("") << 10 << 0UL << false;
     QTest::newRow("ulong1") << QByteArray("3234567890") << 10 << 3234567890UL << true;
     QTest::newRow("ulong2") << QByteArray("fFFfFfFf") << 16 << 0xFFFFFFFFUL << true;
 }
@@ -993,8 +997,8 @@ void tst_QByteArray::toULongLong_data()
     QTest::addColumn<qulonglong>("result");
     QTest::addColumn<bool>("ok");
 
-    QTest::newRow("default") << QByteArray() << 10 << (qulonglong)0 << FALSE;
-    QTest::newRow("out of base bound") << QByteArray("c") << 10 << (qulonglong)0 << FALSE;
+    QTest::newRow("default") << QByteArray() << 10 << (qulonglong)0 << false;
+    QTest::newRow("out of base bound") << QByteArray("c") << 10 << (qulonglong)0 << false;
 
 }
 
@@ -1136,12 +1140,12 @@ void tst_QByteArray::toFromHex()
 void tst_QByteArray::toFromPercentEncoding()
 {
     QByteArray arr("Qt is great!");
-
+/*
     QByteArray data = arr.toPercentEncoding();
     QCOMPARE(QString(data), QString("Qt%20is%20great%21"));
     QCOMPARE(QByteArray::fromPercentEncoding(data), arr);
-
-    data = arr.toPercentEncoding("! ", "Qt");
+*/
+    QByteArray data = arr.toPercentEncoding("! ", "Qt");
     QCOMPARE(QString(data), QString("%51%74 is grea%74!"));
     QCOMPARE(QByteArray::fromPercentEncoding(data), arr);
 
diff --git a/tests/auto/qcache/qcache.pro b/tests/auto/qcache/qcache.pro
index d09320bf73..728b0b646f 100644
--- a/tests/auto/qcache/qcache.pro
+++ b/tests/auto/qcache/qcache.pro
@@ -1,7 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qcache.cpp
-
-
 QT = core
-
-
diff --git a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
index 9c70e764c7..9c34fd3214 100644
--- a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
+++ b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
@@ -200,7 +200,7 @@ void tst_QCalendarWidget::buttonClickCheck()
     QTest::qWait(500);
     QWidget *widget = qFindChild<QWidget *>(&object, "qt_calendar_calendarview");
     QTest::mouseMove(widget);
-    QTest::mouseClick(widget, Qt::LeftButton, 0, QPoint(), 50);
+    QTest::mouseClick(widget, Qt::LeftButton);
     QCOMPARE(2006, object.yearShown());
     object.setSelectedDate(selectedDate);
     object.showSelectedDate();
diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/qchar/qchar.pro
index d8c53269d3..fca4ef687c 100644
--- a/tests/auto/qchar/qchar.pro
+++ b/tests/auto/qchar/qchar.pro
@@ -3,7 +3,7 @@ SOURCES  += tst_qchar.cpp
 
 QT = core
 
-wince*: {
+wince*|symbian*: {
 deploy.sources += NormalizationTest.txt
 DEPLOYMENT = deploy
 }
diff --git a/tests/auto/qclipboard/test/test.pro b/tests/auto/qclipboard/test/test.pro
index ba70cffb04..508eba1d9e 100644
--- a/tests/auto/qclipboard/test/test.pro
+++ b/tests/auto/qclipboard/test/test.pro
@@ -10,7 +10,7 @@ win32 {
   }
 }
 
-wince*: {
+wince*|symbian*: {
   copier.sources = ../copier/copier.exe
   copier.path = copier
   paster.sources = ../paster/paster.exe
diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp
index bcdf043724..c01f274a5e 100644
--- a/tests/auto/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/qclipboard/tst_qclipboard.cpp
@@ -108,7 +108,7 @@ void tst_QClipboard::modes()
     if (!nativeClipboardWorking())
         QSKIP("Native clipboard not working in this setup", SkipAll);
 
-    const QString defaultMode = "deafult mode text;";
+    const QString defaultMode = "default mode text;";
     clipboard->setText(defaultMode);
     QCOMPARE(clipboard->text(), defaultMode);
 
@@ -196,7 +196,9 @@ void tst_QClipboard::copy_exit_paste()
 #if defined Q_WS_X11 || defined Q_WS_QWS
     QSKIP("This test does not make sense on X11 and embedded, copied data disappears from the clipboard when the application exits ", SkipAll);
     // ### It's still possible to test copy/paste - just keep the apps running
-#endif
+#elif defined (Q_OS_SYMBIAN) && defined (Q_CC_NOKIAX86)
+    QSKIP("emulator cannot launch multiple processes",SkipAll);
+#endif    
     if (!nativeClipboardWorking())
         QSKIP("Native clipboard not working in this setup", SkipAll);
     const QStringList stringArgument = QStringList() << "Test string.";
diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp
index 0b3ba7a35d..f202d44076 100644
--- a/tests/auto/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp
@@ -45,7 +45,9 @@
 #include <qitemdelegate.h>
 #include <qcolumnview.h>
 #include "../../../src/gui/itemviews/qcolumnviewgrip_p.h"
+#ifndef Q_OS_SYMBIAN
 #include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
+#endif
 #include <qdirmodel.h>
 #include <qstringlistmodel.h>
 #include <qdebug.h>
diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/qcombobox/qcombobox.pro
index 60bf1c8ebd..f36a6fe622 100644
--- a/tests/auto/qcombobox/qcombobox.pro
+++ b/tests/auto/qcombobox/qcombobox.pro
@@ -2,5 +2,3 @@ load(qttest_p4)
 SOURCES  += tst_qcombobox.cpp
 contains(QT_CONFIG, qt3support): QT += qt3support
 
-
-
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index 67c9ac9e17..dbb90fdccb 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -1233,7 +1233,6 @@ void tst_QComboBox::insertItem()
     testWidget->setEditable(true);
     if (editable)
         testWidget->setEditText("FOO");
-
 #if defined (QT3_SUPPORT)
     if (testQt3Support)
         testWidget->insertItem(itemLabel, insertIndex);
@@ -1247,7 +1246,7 @@ void tst_QComboBox::insertItem()
 
     QCOMPARE(testWidget->count(), initialItems.count() + 1);
     QCOMPARE(testWidget->itemText(expectedIndex), itemLabel);
-
+    
     if (editable)
         QCOMPARE(testWidget->currentText(), QString("FOO"));
 }
@@ -1894,10 +1893,10 @@ void tst_QComboBox::itemListPosition()
     //tests that the list is not out of the screen boundaries
 
     //put the QApplication layout back
-    qApp->setLayoutDirection(Qt::LeftToRight);
+    QApplication::setLayoutDirection(Qt::LeftToRight);
 
     //we test QFontComboBox because it has the specific behaviour to set a fixed size
-    //the the list view
+    //to the list view
     QFontComboBox combo;
 
     //the code to get the avaialbe screen space is copied from QComboBox code
@@ -1914,13 +1913,17 @@ void tst_QComboBox::itemListPosition()
     screen = QApplication::desktop()->availableGeometry(scrNumber);
 #endif
 
-    combo.move(screen.width()-combo.sizeHint().width(), 0); //puts the combo the the top-right corner
+    combo.move(screen.width()-combo.sizeHint().width(), 0); //puts the combo to the top-right corner
 
     combo.show();
     QTest::qWait(100); //wait because the window manager can move the window if there is a right panel
     combo.showPopup();
     QTest::qWait(100);
 
+#if defined(Q_WS_S60)
+    // Assuming that QtS60 style is used, here. But other ones would certainly also fail
+    QEXPECT_FAIL("", "QtS60Style does not yet position the combobox popup correctly", Continue);
+#endif
     QVERIFY( combo.view()->window()->x() + combo.view()->window()->width() <= screen.x() + screen.width() );
 
 }
@@ -2222,7 +2225,7 @@ void tst_QComboBox::setItemDelegate()
     QComboBox comboBox;
     QStyledItemDelegate *itemDelegate = new QStyledItemDelegate;
     comboBox.setItemDelegate(itemDelegate);
-    QCOMPARE(comboBox.itemDelegate(), itemDelegate);
+    QCOMPARE(static_cast<QStyledItemDelegate*>(comboBox.itemDelegate()), itemDelegate);
 }
 
 void tst_QComboBox::task253944_itemDelegateIsReset()
@@ -2232,10 +2235,10 @@ void tst_QComboBox::task253944_itemDelegateIsReset()
     comboBox.setItemDelegate(itemDelegate);
 
     comboBox.setEditable(true);
-    QCOMPARE(comboBox.itemDelegate(), itemDelegate);
+    QCOMPARE(static_cast<QStyledItemDelegate*>(comboBox.itemDelegate()), itemDelegate);
 
     comboBox.setStyleSheet("QComboBox { border: 1px solid gray; }");
-    QCOMPARE(comboBox.itemDelegate(), itemDelegate);
+    QCOMPARE(static_cast<QStyledItemDelegate*>(comboBox.itemDelegate()), itemDelegate);
 }
 
 QTEST_MAIN(tst_QComboBox)
diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp
index a65490d452..8ce59a4374 100644
--- a/tests/auto/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/qcompleter/tst_qcompleter.cpp
@@ -575,6 +575,9 @@ void tst_QCompleter::directoryModel_data()
 #elif defined(Q_OS_WIN)
         QTest::newRow("()") << "C" << "" << "C:" << "C:";
         QTest::newRow("()") << "C:\\Program" << "" << "Program Files" << "C:\\Program Files";
+#elif defined(Q_OS_SYMBIAN)
+        QTest::newRow("()") << "C" << "" << "C:" << "C:";
+        QTest::newRow("()") << "C:\\re" << "" << "resource" << "C:\\resource";
 #elif defined (Q_OS_MAC)
         QTest::newRow("()") << "" << "" << "/" << "/";
         QTest::newRow("(/a)") << "/a" << "" << "Applications" << "/Applications";
diff --git a/tests/auto/qcoreapplication/qcoreapplication.pro b/tests/auto/qcoreapplication/qcoreapplication.pro
index 64a4ad4134..27f5e58d6d 100644
--- a/tests/auto/qcoreapplication/qcoreapplication.pro
+++ b/tests/auto/qcoreapplication/qcoreapplication.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qcoreapplication.cpp
-
 QT = core
-
-
diff --git a/tests/auto/qcryptographichash/qcryptographichash.pro b/tests/auto/qcryptographichash/qcryptographichash.pro
index 07d88574fa..aa9a7c49fd 100644
--- a/tests/auto/qcryptographichash/qcryptographichash.pro
+++ b/tests/auto/qcryptographichash/qcryptographichash.pro
@@ -1,6 +1,8 @@
 load(qttest_p4)
-
 SOURCES += tst_qcryptographichash.cpp
 QT = core
 
-
+symbian*: {
+TARGET.EPOCSTACKSIZE =0x5000
+TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
+}
diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro
index 723e4d3a13..2a61403411 100644
--- a/tests/auto/qcssparser/qcssparser.pro
+++ b/tests/auto/qcssparser/qcssparser.pro
@@ -1,12 +1,16 @@
 load(qttest_p4)
 SOURCES += tst_cssparser.cpp
-DEFINES += SRCDIR=\\\"$$PWD\\\"
 QT += xml
 
 requires(contains(QT_CONFIG,private_tests))
 
-wince*: {
+!symbian: {
+   DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
+
+wince*|symbian: {
    addFiles.sources = testdata
    addFiles.path = .
    DEPLOYMENT += addFiles
 }
+
diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_cssparser.cpp
index cd2c0f490b..ce923e1a75 100644
--- a/tests/auto/qcssparser/tst_cssparser.cpp
+++ b/tests/auto/qcssparser/tst_cssparser.cpp
@@ -98,7 +98,7 @@ void tst_CssParser::scanner_data()
     QTest::addColumn<QString>("input");
     QTest::addColumn<QString>("output");
 
-#if !defined(Q_OS_IRIX) && !defined(Q_OS_WINCE)
+#if !defined(Q_OS_IRIX) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QDir d(SRCDIR);
 #else
     QDir d(QDir::current());
@@ -884,7 +884,7 @@ private:
     QDomDocument doc;
 };
 
-Q_DECLARE_METATYPE(QDomDocument);
+Q_DECLARE_METATYPE(QDomDocument)
 
 void tst_CssParser::marginValue_data()
 {
diff --git a/tests/auto/qdatastream/qdatastream.pro b/tests/auto/qdatastream/qdatastream.pro
index 40231ea8bb..317c3bfc27 100644
--- a/tests/auto/qdatastream/qdatastream.pro
+++ b/tests/auto/qdatastream/qdatastream.pro
@@ -1,8 +1,10 @@
 load(qttest_p4)
 SOURCES += tst_qdatastream.cpp
 
+!symbian: {
 cross_compile: DEFINES += SVGFILE=\\\"tests2.svg\\\"
 else: DEFINES += SVGFILE=\\\"gearflowers.svg\\\"
+}
 
 # for qpaintdevicemetrics.h
 contains(QT_CONFIG, qt3support):QT += qt3support
@@ -14,7 +16,14 @@ wince*: {
    addFiles.path = .
    DEPLOYMENT += addFiles
    DEFINES += SRCDIR=\\\"\\\"
-} else {
+} else:symbian {
+   # SRCDIR and SVGFILE defined in code in symbian
+   addFiles.sources = datastream.q42 tests2.svg
+   addFiles.path = .
+   DEPLOYMENT += addFiles
+   TARGET.EPOCHEAPSIZE = 1000000 10000000
+   DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
+}else {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
 
diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp
index 3c70a2682a..0049480df3 100644
--- a/tests/auto/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/qdatastream/tst_qdatastream.cpp
@@ -47,6 +47,13 @@
 #endif
 #include <QtSvg/QtSvg>
 
+#if defined(Q_OS_SYMBIAN)
+# define STRINGIFY(x) #x
+# define TOSTRING(x) STRINGIFY(x)
+# define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/"
+#define SVGFILE "tests2.svg"
+#endif
+
 Q_DECLARE_METATYPE(QBitArray)
 Q_DECLARE_METATYPE(qint64)
 
@@ -2056,7 +2063,7 @@ static QRegion qRegionData(int index)
 	case 4: return QRegion(100, -100, 2048, 4096, QRegion::Rectangle);
 	case 5: return QRegion(-100, 100, 4096, 2048, QRegion::Rectangle);
         case 6: return QRegion(0, 0, 0, 0, QRegion::Ellipse);
-#if !defined(Q_OS_UNIX) && !defined(Q_OS_WINCE) // all our Unix platforms use X regions.
+#if defined(Q_OS_SYMBIAN) || (!defined(Q_OS_UNIX) && !defined(Q_OS_WINCE)) // all our Unix platforms use X regions.
         case 7: return QRegion(1, 2, 300, 400, QRegion::Ellipse);
 	case 8: return QRegion(100, 100, 1024, 768, QRegion::Ellipse);
 	case 9: return QRegion(-100, -100, 1024, 1024, QRegion::Ellipse);
@@ -2707,7 +2714,7 @@ void tst_QDataStream::status_charptr_QByteArray_data()
     QTest::addColumn<int>("expectedStatus");
     QTest::addColumn<QByteArray>("expectedString");
 
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
 #ifdef QT3_SUPPORT
     QByteArray oneMbMinus1(1024 * 1024 - 1);
 #else
@@ -2725,7 +2732,7 @@ void tst_QDataStream::status_charptr_QByteArray_data()
     QTest::newRow("size 3") << QByteArray("\x00\x00\x00\x03jkl", 7) << (int) QDataStream::Ok << QByteArray("jkl");
     QTest::newRow("size 4") << QByteArray("\x00\x00\x00\x04jklm", 8) << (int) QDataStream::Ok << QByteArray("jklm");
     QTest::newRow("size 4j") << QByteArray("\x00\x00\x00\x04jklmj", 8) << (int) QDataStream::Ok << QByteArray("jklm");
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QTest::newRow("size 1MB-1") << QByteArray("\x00\x0f\xff\xff", 4) + oneMbMinus1 + QByteArray("j") << (int) QDataStream::Ok << oneMbMinus1;
     QTest::newRow("size 1MB") << QByteArray("\x00\x10\x00\x00", 4) + oneMbMinus1 + QByteArray("jkl") << (int) QDataStream::Ok << oneMbMinus1 + "j";
     QTest::newRow("size 1MB+1") << QByteArray("\x00\x10\x00\x01", 4) + oneMbMinus1 + QByteArray("jkl") << (int) QDataStream::Ok << oneMbMinus1 + "jk";
@@ -2745,7 +2752,7 @@ void tst_QDataStream::status_charptr_QByteArray_data()
     QTest::newRow("badsize 2") << QByteArray("\x00\x00\x00\x02j", 5) << (int) QDataStream::ReadPastEnd << QByteArray();
     QTest::newRow("badsize 3") << QByteArray("\x00\x00\x00\x03jk", 6) << (int) QDataStream::ReadPastEnd << QByteArray();
     QTest::newRow("badsize 4") << QByteArray("\x00\x00\x00\x04jkl", 7) << (int) QDataStream::ReadPastEnd << QByteArray();
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QTest::newRow("badsize 1MB") << QByteArray("\x00\x10\x00\x00", 4) + oneMbMinus1 << (int) QDataStream::ReadPastEnd << QByteArray();
     QTest::newRow("badsize 1MB+1") << QByteArray("\x00\x10\x00\x01", 4) + oneMbMinus1 + QByteArray("j") << (int) QDataStream::ReadPastEnd << QByteArray();
     QTest::newRow("badsize 3MB") << QByteArray("\x00\x30\x00\x00", 4) + threeMbMinus1 << (int) QDataStream::ReadPastEnd << QByteArray();
@@ -2819,7 +2826,7 @@ void tst_QDataStream::status_QString_data()
     QTest::addColumn<int>("expectedStatus");
     QTest::addColumn<QString>("expectedString");
 
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QString oneMbMinus1;
     oneMbMinus1.resize(1024 * 1024 - 1);
     for (int i = 0; i < oneMbMinus1.size(); ++i)
@@ -2837,7 +2844,7 @@ void tst_QDataStream::status_QString_data()
     QTest::newRow("size 3") << QByteArray("\x00\x00\x00\x06\x00j\x00k\x00l", 10) << (int) QDataStream::Ok << QString("jkl");
     QTest::newRow("size 4") << QByteArray("\x00\x00\x00\x08\x00j\x00k\x00l\x00m", 12) << (int) QDataStream::Ok << QString("jklm");
     QTest::newRow("size 4j") << QByteArray("\x00\x00\x00\x08\x00j\x00k\x00l\x00mjj", 14) << (int) QDataStream::Ok << QString("jklm");
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QTest::newRow("size 1MB-1") << QByteArray("\x00\x1f\xff\xfe", 4) + oneMbMinus1Data + QByteArray("jj") << (int) QDataStream::Ok << oneMbMinus1;
     QTest::newRow("size 1MB") << QByteArray("\x00\x20\x00\x00", 4) + oneMbMinus1Data + QByteArray("\x00j\x00k\x00l", 6) << (int) QDataStream::Ok << oneMbMinus1 + "j";
     QTest::newRow("size 1MB+1") << QByteArray("\x00\x20\x00\x02", 4) + oneMbMinus1Data + QByteArray("\x00j\x00k\x00l", 6) << (int) QDataStream::Ok << oneMbMinus1 + "jk";
@@ -2857,7 +2864,7 @@ void tst_QDataStream::status_QString_data()
     QTest::newRow("badsize 2") << QByteArray("\x00\x00\x00\x04jj", 6) << (int) QDataStream::ReadPastEnd << QString();
     QTest::newRow("badsize 3") << QByteArray("\x00\x00\x00\x06jjkk", 8) << (int) QDataStream::ReadPastEnd << QString();
     QTest::newRow("badsize 4") << QByteArray("\x00\x00\x00\x08jjkkll", 10) << (int) QDataStream::ReadPastEnd << QString();
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QTest::newRow("badsize 1MB") << QByteArray("\x00\x20\x00\x00", 4) + oneMbMinus1Data << (int) QDataStream::ReadPastEnd << QString();
     QTest::newRow("badsize 1MB+1") << QByteArray("\x00\x20\x00\x02", 4) + oneMbMinus1Data + QByteArray("j") << (int) QDataStream::ReadPastEnd << QString();
     QTest::newRow("badsize 3MB") << QByteArray("\x00\x60\x00\x00", 4) + threeMbMinus1Data << (int) QDataStream::ReadPastEnd << QString();
@@ -3086,9 +3093,22 @@ void tst_QDataStream::streamToAndFromQByteArray()
 
 void tst_QDataStream::streamRealDataTypes()
 {
-#ifdef Q_OS_WINCE
+#if defined(Q_OS_WINCE)
+    // Note: Probably actually same 'qreal being typedeffed as float instead of double' issue as in Symbian
+    // instead of what CE skip message says.
     QSKIP("Skipped on CE as it demands too much memory and fragments", SkipAll);
+#elif defined(Q_OS_SYMBIAN)
+    // qreal is typedeffed float in symbian instead of double like in most platforms, so reference stream
+    // gets corrupted. Basically this test is flawed, as one shouldn't use naked typedeffed types in
+    // streams that are meant to work cross-platform.
+    // As this test also tests other floating point using classes, we do not simply skip it, but work around
+    // the qreal issue by redefining qreal as double for the duration of this function.
+    // Note that streaming classes works because they do explicitly use double instead of qreal when
+    // writing/reading to/from stream.
+#   define qreal double
+    qWarning("Note: streamRealDataTypes test redefines qreal as double in symbian!!!");
 #endif
+
     // Generate QPicture from SVG.
     QSvgRenderer renderer(svgFile);
     QVERIFY(renderer.isValid());
@@ -3206,6 +3226,9 @@ void tst_QDataStream::streamRealDataTypes()
         QCOMPARE(cGrad, conicalBrush);
         QCOMPARE(pen.widthF(), qreal(1.5));
     }
+#if defined(Q_OS_SYMBIAN)
+    #undef qreal
+#endif
 }
 
 #ifdef QT3_SUPPORT
diff --git a/tests/auto/qdate/qdate.pro b/tests/auto/qdate/qdate.pro
index ea61c59b8c..6e2781b3d8 100644
--- a/tests/auto/qdate/qdate.pro
+++ b/tests/auto/qdate/qdate.pro
@@ -1,7 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qdate.cpp
-
-
 QT = core
-
-
diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp
index 35c82b2372..9a4f60460d 100644
--- a/tests/auto/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/qdatetime/tst_qdatetime.cpp
@@ -877,13 +877,13 @@ void tst_QDateTime::toTime_t_data()
     QTest::addColumn<QString>("dateTimeStr");
     QTest::addColumn<bool>("res");
 
-    QTest::newRow( "data1" ) << str( 1800, 1, 1, 12, 0, 0 ) << FALSE;
-    QTest::newRow( "data2" ) << str( 1969, 1, 1, 12, 0, 0 ) << FALSE;
-    QTest::newRow( "data3" ) << str( 2002, 1, 1, 12, 0, 0 ) << TRUE;
-    QTest::newRow( "data4" ) << str( 2002, 6, 1, 12, 0, 0 ) << TRUE;
-    QTest::newRow( "data5" ) << QString("INVALID") << FALSE;
-    QTest::newRow( "data6" ) << str( 2038, 1, 1, 12, 0, 0 ) << TRUE;
-    QTest::newRow( "data7" ) << str( 2063, 4, 5, 12, 0, 0 ) << TRUE; // the day of First Contact
+    QTest::newRow( "data1" ) << str( 1800, 1, 1, 12, 0, 0 ) << false;
+    QTest::newRow( "data2" ) << str( 1969, 1, 1, 12, 0, 0 ) << false;
+    QTest::newRow( "data3" ) << str( 2002, 1, 1, 12, 0, 0 ) << true;
+    QTest::newRow( "data4" ) << str( 2002, 6, 1, 12, 0, 0 ) << true;
+    QTest::newRow( "data5" ) << QString("INVALID") << false;
+    QTest::newRow( "data6" ) << str( 2038, 1, 1, 12, 0, 0 ) << true;
+    QTest::newRow( "data7" ) << str( 2063, 4, 5, 12, 0, 0 ) << true; // the day of First Contact
     QTest::newRow( "data8" ) << str( 2107, 1, 1, 12, 0, 0 )
                           << bool( sizeof(uint) > 32 && sizeof(time_t) > 32 );
 }
diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
index ab98d1d86a..93bf4edc88 100644
--- a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -2213,21 +2213,16 @@ void tst_QDateTimeEdit::mousePress()
     testWidget->setDate(QDate(2004, 6, 23));
     testWidget->setCurrentSection(QDateTimeEdit::YearSection);
     QCOMPARE(testWidget->currentSection(), QDateTimeEdit::YearSection);
-    int offset = 10;
-#if defined(Q_OS_WINCE)
-    offset = 20;
-    if (qt_wince_is_pocket_pc()) {
-        // depending on wether the display is double-pixeld, we need
-        // to click at a different position
-        bool doubledSize = false;
-        int dpi = GetDeviceCaps(GetDC(0), LOGPIXELSX);
-        if ((dpi < 1000) && (dpi > 0))
-            doubledSize = true;
-        offset = doubledSize ? 50 : 25; // On CE buttons are aligned horizontal
-    }
-#endif
-    QTest::mouseClick(testWidget, Qt::LeftButton, 0, QPoint(testWidget->width() - offset, 5));
-    QCOMPARE(testWidget->date().year(), 2005);
+
+    // Ask the SC_SpinBoxUp button location from style
+    QStyleOptionSpinBox so;
+    so.rect = testWidget->rect();    
+    QRect rectUp = testWidget->style()->subControlRect(QStyle::CC_SpinBox, &so, QStyle::SC_SpinBoxUp, testWidget);
+    
+    // Send mouseClick to center of SC_SpinBoxUp
+    QTest::mouseClick(testWidget, Qt::LeftButton, 0, rectUp.center());
+    QCOMPARE(testWidget->date().year(), 2005);    
+
 }
 
 void tst_QDateTimeEdit::stepHourAMPM_data()
diff --git a/tests/auto/qdebug/qdebug.pro b/tests/auto/qdebug/qdebug.pro
index 57aac48e86..6e75a092e7 100644
--- a/tests/auto/qdebug/qdebug.pro
+++ b/tests/auto/qdebug/qdebug.pro
@@ -1,7 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qdebug.cpp
-
 QT = core
-
-
-
diff --git a/tests/auto/qdesktopservices/qdesktopservices.pro b/tests/auto/qdesktopservices/qdesktopservices.pro
index 537b105bfa..3c96e85a38 100644
--- a/tests/auto/qdesktopservices/qdesktopservices.pro
+++ b/tests/auto/qdesktopservices/qdesktopservices.pro
@@ -5,4 +5,29 @@ TARGET		= tst_qdesktopservices
 
 include(../src/qdesktopservices.pri)
 
+symbian: {
+   dummy.sources = text\testfile.txt
+   dummy.path = .
+
+   text.sources = text\*
+   text.path = \data\others\   
+
+   image.sources = image\*
+   image.path = \data\images\
+   
+   audio.sources = audio\*
+   audio.path = \data\sounds\
+   
+   video.sources = video\*
+   video.path = \data\videos\      
+   
+   install.sources = install\*
+   install.path = \data\installs\       
+   
+   DEPLOYMENT += image audio video install
+   
+   # These are only needed for manual tests
+   #DEPLOYMENT += dummy text
+   }
+
 
diff --git a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp
index 7c196cbd42..c69b11230a 100644
--- a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp
+++ b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp
@@ -45,6 +45,7 @@
 #include <qdebug.h>
 #include <qdesktopservices.h>
 
+//#define RUN_MANUAL_TESTS
 //TESTED_CLASS=
 //TESTED_FILES=
 
@@ -59,6 +60,17 @@ private slots:
     void init();
     void cleanup();
     void openUrl();
+#ifdef Q_OS_SYMBIAN
+    // These test are manual ones, you need to check from  device that 
+    // correct system application is started with correct content
+    // When you want to run these test, uncomment //#define RUN_MANUAL_TESTS 
+    void openHttpUrl_data();
+    void openHttpUrl();
+    void openMailtoUrl_data();
+    void openMailtoUrl();    
+    void openFileUrl_data();
+    void openFileUrl();
+#endif        
     void handlers();
     void storageLocation_data();
     void storageLocation();
@@ -97,6 +109,141 @@ void tst_qdesktopservices::openUrl()
 #endif
 }
 
+#ifdef Q_OS_SYMBIAN
+void tst_qdesktopservices::openHttpUrl_data()
+{
+    QTest::addColumn<QUrl>("url"); 
+    QTest::addColumn<bool>("result");        
+    QTest::newRow("BasicWithHttp") << QUrl("http://www.google.fi") << true;              
+    QTest::newRow("BasicWithoutHttp") << QUrl("www.nokia.fi") << true;        
+    QTest::newRow("BasicWithUserAndPw") << QUrl("http://s60prereleases:oslofjord@pepper.troll.no/s60prereleases/patches/") << true;
+    QTest::newRow("URL with space") << QUrl("http://www.manataka.org/Contents Page.html") << true;
+    
+}
+
+void tst_qdesktopservices::openHttpUrl()
+{
+#ifndef RUN_MANUAL_TESTS    
+    QSKIP("Test disabled -- only for manual purposes", SkipAll);       
+#endif    
+    
+    QFETCH(QUrl, url);     
+    QFETCH(bool, result);       
+    QCOMPARE(QDesktopServices::openUrl(url), result);  
+    QTest::qWait(30000);
+}
+
+void tst_qdesktopservices::openMailtoUrl_data()
+{
+    QTest::addColumn<QUrl>("url");
+    QTest::addColumn<bool>("result");      
+    
+    // http://en.wikipedia.org/wiki/E-mail_address
+    // RFC Valid e-mail addresses
+    QTest::newRow("Wiki valid email 1") << QUrl("mailto:abc@example.com") << true;
+    QTest::newRow("Wiki valid email 2") << QUrl("mailto:Abc@example.com") << true;
+    QTest::newRow("Wiki valid email 3") << QUrl("mailto:aBC@example.com") << true;
+    QTest::newRow("Wiki valid email 4") << QUrl("mailto:abc.123@example.com") << true;
+    QTest::newRow("Wiki valid email 5") << QUrl("mailto:1234567890@example.com") << true;
+    QTest::newRow("Wiki valid email 6") << QUrl("mailto:_______@example.com") << true;
+    QTest::newRow("Wiki valid email 7") << QUrl("mailto:abc+mailbox/department=shipping@example.com") << true;
+    // S60 email client considers the next URL invalid, even ity should be valid
+    QTest::newRow("Wiki valid email 8") << QUrl("mailto:!#$%&'*+-/=?^_`.{|}~@example.com") << true; // all of these characters are allowed
+    QTest::newRow("Wiki valid email 9") << QUrl("mailto:\"abc@def\"@example.com") << true; // anything goes inside quotation marks 
+    QTest::newRow("Wiki valid email 10") << QUrl("mailto:\"Fred \\\"quota\\\" Bloggs\"@example.com") << true; // however, quotes need escaping
+    
+    // RFC invalid e-mail addresses    
+    // These return true even though they are invalid, but check that user is notified about invalid URL in mail application 
+    QTest::newRow("Wiki invalid email 1") << QUrl("mailto:Abc.example.com") << true;		// character @ is missing
+    QTest::newRow("Wiki invalid email 2") << QUrl("mailto:Abc.@example.com") << true;		// character dot(.) is last in local part
+    QTest::newRow("Wiki invalid email 3") << QUrl("mailto:Abc..123@example.com") << true;	// character dot(.) is double
+    QTest::newRow("Wiki invalid email 4") << QUrl("mailto:A@b@c@example.com") << true;		// only one @ is allowed outside quotations marks
+    QTest::newRow("Wiki invalid email 5") << QUrl("mailto:()[]\\;:,<>@example.com") << true;	// none of the characters before the @ is allowed outside quotation marks
+    
+    QTest::newRow("Basic") << QUrl("mailto:test@nokia.com") << true;        
+    QTest::newRow("BasicSeveralAddr") << QUrl("mailto:test@nokia.com,test2@nokia.com,test3@nokia.com") << true;
+    QTest::newRow("BasicAndSubject") << QUrl("mailto:test@nokia.com?subject=hello nokia") << true;        
+    QTest::newRow("BasicAndTo") << QUrl("mailto:test@nokia.com?to=test2@nokia.com") << true;        
+    
+    QTest::newRow("BasicAndCc") << QUrl("mailto:test@nokia.com?cc=mycc@address.com") << true;
+    QTest::newRow("BasicAndBcc") << QUrl("mailto:test@nokia.com?bcc=mybcc@address.com") << true;        
+    QTest::newRow("BasicAndBody") << QUrl("mailto:test@nokia.com?body=Test email message body") << true;   
+        
+    // RFC examples, these are actually invalid because there is not host defined
+    // Check that user is notified about invalid URL in mail application
+    QTest::newRow("RFC2368 Example 1") << QUrl::fromEncoded("mailto:addr1%2C%20addr2") << true;
+    QTest::newRow("RFC2368 Example 2") << QUrl::fromEncoded("mailto:?to=addr1%2C%20addr2") << true;
+    QTest::newRow("RFC2368 Example 3") << QUrl("mailto:addr1?to=addr2") << true;
+    
+    QTest::newRow("RFC2368 Example 4") << QUrl("mailto:joe@example.com?cc=bob@example.com&body=hello") << true;   
+    QTest::newRow("RFC2368 Example 5") << QUrl("mailto:?to=joe@example.com&cc=bob@example.com&body=hello") << true;
+    QTest::newRow("RFC2368 Example 6") << QUrl("mailto:foobar@example.com?In-Reply-To=%3c3469A91.D10AF4C@example.com") << true; // OpaqueData
+    QTest::newRow("RFC2368 Example 7") << QUrl::fromEncoded("mailto:infobot@example.com?body=send%20current-issue%0D%0Asend%20index") << true;
+    QTest::newRow("RFC2368 Example 8") << QUrl::fromEncoded("mailto:infobot@example.com?body=send%20current-issue") << true;
+    QTest::newRow("RFC2368 Example 9") << QUrl("mailto:infobot@example.com?subject=current-issue") << true;
+    QTest::newRow("RFC2368 Example 10") << QUrl("mailto:chris@example.com") << true;
+            
+    //QTest::newRow("RFC2368 Example 11 - illegal chars") << QUrl("mailto:joe@example.com?cc=bob@example.com?body=hello") << false;
+    QTest::newRow("RFC2368 Example 12") << QUrl::fromEncoded("mailto:gorby%25kremvax@example.com") << true; // encoded reserved chars '%'
+    QTest::newRow("RFC2368 Example 13") << QUrl::fromEncoded("mailto:unlikely%3Faddress@example.com?blat=foop") << true;    // encoded reserved chars  `?'        
+}
+
+void tst_qdesktopservices::openMailtoUrl()
+{
+#ifndef RUN_MANUAL_TESTS    
+    QSKIP("Test disabled -- only for manual purposes", SkipAll);       
+#endif      
+    
+    QFETCH(QUrl, url);  
+    QFETCH(bool, result);     
+    QCOMPARE(QDesktopServices::openUrl(url), result);             
+}
+
+void tst_qdesktopservices::openFileUrl_data()
+{
+    QTest::addColumn<QUrl>("url");
+    QTest::addColumn<bool>("result");      
+    
+    // Text files
+    QTest::newRow("DOS text file") << QUrl("file:///c:/data/others/dosfile.txt") << true;           
+    QTest::newRow("No EOF text file") << QUrl("file:///c:/data/others/noendofline.txt") << true;     
+    QTest::newRow("text file") << QUrl("file:///c:/data/others/testfile.txt") << true;
+    QTest::newRow("text file with space") << QUrl("file:///c:/data/others/test file.txt") << true;       
+     
+    // Images
+    QTest::newRow("BMP image") << QUrl("file:///c:/data/images/image.bmp") << true;         
+    QTest::newRow("GIF image") << QUrl("file:///c:/data/images/image.gif") << true;           
+    QTest::newRow("JPG image") << QUrl("file:///c:/data/images/image.jpg") << true;     
+    QTest::newRow("PNG image") << QUrl("file:///c:/data/images/image.png") << true;     
+        
+    // Audio    
+    QTest::newRow("MP4 audio") << QUrl("file:///c:/data/sounds/aac-only.mp4") << true;     
+    QTest::newRow("3GP audio") << QUrl("file:///c:/data/sounds/audio_3gpp.3gp") << true;  
+        
+    // Video       
+    QTest::newRow("MP4 video") << QUrl("file:///c:/data/videos/vid-mpeg4-22k.mp4") << true;   
+        
+    // Installs  
+    QTest::newRow("SISX") << QUrl("file:///c:/data/installs/ErrRd.sisx") << true;    
+
+    // Errors  
+    QTest::newRow("File does not exist") << QUrl("file:///c:/thisfileneverexists.txt") << false;      
+}
+
+void tst_qdesktopservices::openFileUrl()
+{
+#ifndef RUN_MANUAL_TESTS    
+    QSKIP("Test disabled -- only for manual purposes", SkipAll);       
+#endif      
+    
+    QFETCH(QUrl, url);  
+    QFETCH(bool, result);     
+    QCOMPARE(QDesktopServices::openUrl(url), result);
+    QTest::qWait(15000);       
+}
+#endif
+
+
 class MyUrlHandler : public QObject
 {
     Q_OBJECT
@@ -146,8 +293,64 @@ void tst_qdesktopservices::storageLocation_data()
 void tst_qdesktopservices::storageLocation()
 {
     QFETCH(QDesktopServices::StandardLocation, location);
+#ifdef Q_OS_SYMBIAN
+    QString storageLocation = QDesktopServices::storageLocation(location);
+    QString displayName = QDesktopServices::displayName(location);
+    //qDebug( "displayName: %s",  displayName );
+    
+    storageLocation = storageLocation.toLower();
+    displayName = displayName.toLower();
+    
+    QString drive = QDir::currentPath().left(2).toLower();   
+    if( drive == "z:" )
+        drive = "c:";
+
+    switch(location) {
+    case QDesktopServices::DesktopLocation:
+        QCOMPARE( storageLocation, QString() );
+        break;
+    case QDesktopServices::DocumentsLocation:
+        QCOMPARE( storageLocation, drive + QString("/data") );
+        break;
+    case QDesktopServices::FontsLocation:
+        // Currently point always to ROM
+        QCOMPARE( storageLocation, QString("z:/resource/fonts") );
+        break;
+    case QDesktopServices::ApplicationsLocation:
+#ifdef Q_CC_NOKIAX86
+        QCOMPARE( storageLocation, QString("z:/sys/bin") );
+#else        
+        QCOMPARE( storageLocation, drive + QString("/sys/bin") );        
+#endif        
+        break;
+    case QDesktopServices::MusicLocation:
+        QCOMPARE( storageLocation, drive + QString("/data/sounds") );
+        break;
+    case QDesktopServices::MoviesLocation:
+        QCOMPARE( storageLocation, drive + QString("/data/videos") );
+        break;
+    case QDesktopServices::PicturesLocation:
+        QCOMPARE( storageLocation, drive + QString("/data/images") );
+        break;                                                                        
+    case QDesktopServices::TempLocation:
+        QCOMPARE( storageLocation, QDir::tempPath().toLower());
+        break;
+    case QDesktopServices::HomeLocation:
+        QCOMPARE( storageLocation, QDir::homePath().toLower());
+        break;
+    case QDesktopServices::DataLocation:
+    	// Just check the folder not the drive
+        QCOMPARE( storageLocation.mid(2), QDir::currentPath().mid(2).toLower());
+        break;   
+    default:
+        QCOMPARE( storageLocation, QString() );
+        break;               
+    }
+
+#else
     QDesktopServices::storageLocation(location);
     QDesktopServices::displayName(location);
+#endif        
 }
 
 
diff --git a/tests/auto/qdir/qdir.pro b/tests/auto/qdir/qdir.pro
index 404a1374fe..8fe5d839b0 100644
--- a/tests/auto/qdir/qdir.pro
+++ b/tests/auto/qdir/qdir.pro
@@ -8,6 +8,15 @@ wince*:{
 
   QT = core
   DEFINES += SRCDIR=\\\"\\\"
+} symbian:{
+  DirFiles.sources = testdir testdata searchdir resources entrylist types tst_qdir.cpp
+  DirFiles.path = .
+  DEPLOYMENT += DirFiles
+
+  QT = core
+  TARGET.CAPABILITY += AllFiles
+
+  DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 } else {
   QT = core
   contains(QT_CONFIG, qt3support):QT += qt3support
diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index e900ed065a..60bb1775b3 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -48,9 +48,14 @@
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qstringlist.h>
-
 #include "../network-settings.h"
 
+#if defined(Q_OS_SYMBIAN)
+# define STRINGIFY(x) #x
+# define TOSTRING(x) STRINGIFY(x)
+# define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/"
+#endif
+
 #if defined(Q_OS_VXWORKS)
 #define Q_NO_SYMLINKS
 #endif
@@ -198,7 +203,7 @@ void tst_QDir::setPath_data()
     QTest::addColumn<QString>("dir2");
 
     QTest::newRow("data0") << QString(".") << QString("..");
-#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_WS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     QTest::newRow("data1") << QString("c:/") << QDir::currentPath();
 #endif
 }
@@ -295,7 +300,7 @@ void tst_QDir::exists_data()
 
     QTest::newRow("simple dir") << SRCDIR "resources" << true;
     QTest::newRow("simple dir with slash") << SRCDIR "resources/" << true;
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE))
     QTest::newRow("unc 1") << "//" + QtNetworkSettings::winServerName() << true;
     QTest::newRow("unc 2") << "//"  + QtNetworkSettings::winServerName() + "/" << true;
     QTest::newRow("unc 3") << "//"  + QtNetworkSettings::winServerName() + "/testshare" << true;
@@ -305,7 +310,8 @@ void tst_QDir::exists_data()
     QTest::newRow("unc 7") << "//"  + QtNetworkSettings::winServerName() + "/testshare/adirthatshouldnotexist" << false;
     QTest::newRow("unc 8") << "//"  + QtNetworkSettings::winServerName() + "/asharethatshouldnotexist" << false;
     QTest::newRow("unc 9") << "//ahostthatshouldnotexist" << false;
-
+#endif
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     QTest::newRow("This drive should exist") <<  "C:/" << true;
     // find a non-existing drive and check if it does not exist
     QFileInfoList drives = QFSFileEngine::drives();
@@ -341,7 +347,7 @@ void tst_QDir::isRelativePath_data()
     QTest::addColumn<bool>("relative");
 
     QTest::newRow("data0") << "../somedir" << true;
-#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_WS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     QTest::newRow("data1") << "C:/sOmedir" << false;
 #endif
     QTest::newRow("data2") << "somedir" << true;
@@ -553,17 +559,61 @@ void tst_QDir::entryList()
     QFile::remove(SRCDIR "entrylist/brokenlink.lnk");
     QFile::remove(SRCDIR "entrylist/brokenlink");
 
-	// WinCE does not have . and .. in the directory listing
-#ifdef Q_OS_WINCE
+	// WinCE/Symbian does not have . and .. in the directory listing
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
 	expected.removeAll(".");
 	expected.removeAll("..");
 #endif
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
     // ### Sadly, this is a platform difference right now.
     QFile::link(SRCDIR "entryList/file", SRCDIR "entrylist/linktofile.lnk");
     QFile::link(SRCDIR "entryList/directory", SRCDIR "entrylist/linktodirectory.lnk");
     QFile::link(SRCDIR "entryList/nothing", SRCDIR "entrylist/brokenlink.lnk");
+#elif defined(Q_OS_SYMBIAN)
+    // Symbian doesn't support links to directories
+  	expected.removeAll("linktodirectory.lnk");
+
+    // Expecting failures from a couple of OpenC bugs. Do checks only once.
+    static int xFailChecked = false;
+    static int expectedFail1 = false;
+    static int expectedFail2 = false;
+
+    if (!expectedFail1) {
+        // Can't create link if file doesn't exist in symbian, so create file temporarily,
+        // But only if testing for
+        QFile tempFile(SRCDIR "entryList/nothing");
+        tempFile.open(QIODevice::WriteOnly);
+        tempFile.link(SRCDIR "entryList/brokenlink.lnk");
+        tempFile.remove();
+    }
+
+    if (!expectedFail2) {
+        QFile::link(SRCDIR "entryList/file", SRCDIR "entrylist/linktofile.lnk");
+    }
+
+    if (!xFailChecked) {
+        // ### Until OpenC supports stat correctly for symbolic links, expect them to fail.
+        expectedFail1 = QFileInfo(SRCDIR "entryList/brokenlink.lnk").exists();
+        expectedFail2 = !(QFileInfo(SRCDIR "entryList/linktofile.lnk").isFile());
+
+        QEXPECT_FAIL("", "OpenC bug, stat for broken links returns normally, when it should return error.", Continue);
+        QVERIFY(!expectedFail1);
+
+        QEXPECT_FAIL("", "OpenC bug, stat for file links doesn't indicate them as such.", Continue);
+        QVERIFY(!expectedFail2);
+        xFailChecked = true;
+    }
+
+    if (expectedFail1) {
+        expected.removeAll("brokenlink.lnk");
+        QFile::remove(SRCDIR "entrylist/brokenlink.lnk");
+    }
+
+    if (expectedFail2) {
+        expected.removeAll("linktofile.lnk");
+        QFile::remove(SRCDIR "entrylist/linktofile.lnk");
+    }
 #else
     QFile::link("file", SRCDIR "entrylist/linktofile.lnk");
     QFile::link("directory", SRCDIR "entrylist/linktodirectory.lnk");
@@ -587,7 +637,6 @@ void tst_QDir::entryList()
         // lock up. The actual result depends on the file system.
         return;
     }
-
     bool doContentCheck = true;
 #ifdef Q_OS_UNIX
     if (qstrcmp(QTest::currentDataTag(), "QDir::AllEntries | QDir::Writable") == 0) {
@@ -604,6 +653,11 @@ void tst_QDir::entryList()
         QCOMPARE(actual.count(), expected.count());
     }
 
+#if defined(Q_OS_SYMBIAN)
+    // Test cleanup on device requires setting the permissions back to normal
+    QFile(SRCDIR "entrylist/file").setPermissions(QFile::WriteUser | QFile::ReadUser);
+#endif
+
     QFile::remove(SRCDIR "entrylist/writable");
     QFile::remove(SRCDIR "entrylist/linktofile");
     QFile::remove(SRCDIR "entrylist/linktodirectory");
@@ -619,7 +673,7 @@ void tst_QDir::entryListSimple_data()
     QTest::addColumn<int>("countMin");
 
     QTest::newRow("data2") << "do_not_expect_this_path_to_exist/" << 0;
-#if defined(Q_OS_WINCE)
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QTest::newRow("simple dir") << SRCDIR "resources" << 0;
     QTest::newRow("simple dir with slash") << SRCDIR "resources/" << 0;
 #else
@@ -659,19 +713,28 @@ void tst_QDir::entryListWithSymLinks()
     QDir dir;
     dir.mkdir("myDir");
     QFile("testfile.cpp").open(QIODevice::WriteOnly);
+#if !defined(Q_OS_SYMBIAN)
     QVERIFY(QFile::link("myDir", "myLinkToDir.lnk"));
+#endif
     QVERIFY(QFile::link("testfile.cpp", "myLinkToFile.lnk"));
 
     {
         QStringList entryList = QDir().entryList();
         QVERIFY(entryList.contains("myDir"));
+#if !defined(Q_OS_SYMBIAN)
         QVERIFY(entryList.contains("myLinkToDir.lnk"));
+#endif
         QVERIFY(entryList.contains("myLinkToFile.lnk"));
     }
     {
         QStringList entryList = QDir().entryList(QDir::Dirs);
         QVERIFY(entryList.contains("myDir"));
+#if !defined(Q_OS_SYMBIAN)
         QVERIFY(entryList.contains("myLinkToDir.lnk"));
+#endif
+#if defined(Q_OS_SYMBIAN)
+    QEXPECT_FAIL("", "OpenC stat for symlinks is buggy.", Continue);
+#endif
         QVERIFY(!entryList.contains("myLinkToFile.lnk"));
     }
     {
@@ -734,7 +797,7 @@ void tst_QDir::canonicalPath()
     QFETCH(QString, canonicalPath);
 
     QDir dir(path);
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     QCOMPARE(dir.canonicalPath().toLower(), canonicalPath.toLower());
 #else
     QCOMPARE(dir.canonicalPath(), canonicalPath);
@@ -789,7 +852,7 @@ void tst_QDir::current()
     if (!currentDir.isEmpty()) {
         QDir newCurrent = QDir::current();
         QDir::setCurrent(oldDir);
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
 	QCOMPARE(newCurrent.absolutePath().toLower(), currentDir.toLower());
 #else
 	QCOMPARE(newCurrent.absolutePath(), currentDir);
@@ -810,7 +873,7 @@ void tst_QDir::cd_data()
 	int index = appPath.lastIndexOf("/");
 	QTest::newRow("cdUp") << QDir::currentPath() << ".." << true << appPath.left(index==0?1:index);
     QTest::newRow("noChange") << QDir::currentPath() << "." << true << appPath;
-#ifdef Q_OS_WIN // on windows QDir::root() is usually c:/ but cd "/" will not force it to be root
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) // on windows QDir::root() is usually c:/ but cd "/" will not force it to be root
     QTest::newRow("absolute") << QDir::currentPath() << "/" << true << "/";
 #else
     QTest::newRow("absolute") << QDir::currentPath() << "/" << true << QDir::root().absolutePath();
@@ -889,7 +952,7 @@ tst_QDir::cleanPath_data()
     QTest::newRow("data3") << QDir::cleanPath("../.") << "..";
     QTest::newRow("data4") << QDir::cleanPath("../..") << "../..";
 #if !defined(Q_OS_WINCE)
-#if defined Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     QTest::newRow("data5") << "d:\\a\\bc\\def\\.." << "d:/a/bc";
     QTest::newRow("data6") << "d:\\a\\bc\\def\\../../.." << "d:/";
 #else
@@ -942,10 +1005,12 @@ void tst_QDir::absolutePath_data()
     QTest::addColumn<QString>("expectedPath");
 
     QTest::newRow("0") << "/machine/share/dir1" << "/machine/share/dir1";
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     QTest::newRow("1") << "\\machine\\share\\dir1" << "/machine/share/dir1";
+# if !defined(Q_OS_SYMBIAN)
     QTest::newRow("2") << "//machine/share/dir1" << "//machine/share/dir1";
     QTest::newRow("3") << "\\\\machine\\share\\dir1" << "//machine/share/dir1";
+# endif
     QTest::newRow("4") << "c:/machine/share/dir1" << "c:/machine/share/dir1";
     QTest::newRow("5") << "c:\\machine\\share\\dir1" << "c:/machine/share/dir1";
 #endif
@@ -982,7 +1047,7 @@ void tst_QDir::relativeFilePath_data()
 
     QTest::newRow("11") << "" << "" << "";
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     QTest::newRow("12") << "C:/foo/bar" << "ding" << "ding";
     QTest::newRow("13") << "C:/foo/bar" << "C:/ding/dong" << "../../ding/dong";
     QTest::newRow("14") << "C:/foo/bar" << "/ding/dong" << "../../ding/dong";
@@ -1001,10 +1066,12 @@ void tst_QDir::relativeFilePath_data()
     QTest::newRow("22") << "C:" << "D:/" << "D:/";
     QTest::newRow("23") << "C:/" << "D:" << "D:";
     QTest::newRow("24") << "C:/" << "D:/" << "D:/";
+# if !defined(Q_OS_SYMBIAN)
     QTest::newRow("25") << "C:/foo/bar" << "//anotherHost/foo/bar" << "//anotherHost/foo/bar";
     QTest::newRow("26") << "//anotherHost/foo" << "//anotherHost/foo/bar" << "bar";
     QTest::newRow("27") << "//anotherHost/foo" << "bar" << "bar";
     QTest::newRow("28") << "//anotherHost/foo" << "C:/foo/bar" << "C:/foo/bar";
+# endif
 #endif
 }
 
@@ -1061,7 +1128,8 @@ void tst_QDir::rename()
     QVERIFY(dir.rename("rename-test-renamed", "rename-test"));
 #if defined(Q_OS_MAC)
     QVERIFY(!dir.rename("rename-test", "/etc/rename-test-renamed"));
-#elif !defined(Q_OS_WIN) // on windows this is possible maybe make the test a bit better
+#elif !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN)
+    // on windows/symbian this is possible - maybe make the test a bit better
     QVERIFY(!dir.rename("rename-test", "/rename-test-renamed"));
 #endif
     QVERIFY(dir.remove("rename-test"));
@@ -1110,7 +1178,7 @@ void tst_QDir::dirName_data()
     QTest::newRow("slash0") << "c:/winnt/system32" << "system32";
     QTest::newRow("slash1") << "/winnt/system32" << "system32";
     QTest::newRow("slash2") << "c:/winnt/system32/kernel32.dll" << "kernel32.dll";
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     QTest::newRow("bslash0") << "c:\\winnt\\system32" << "system32";
     QTest::newRow("bslash1") << "\\winnt\\system32" << "system32";
     QTest::newRow("bslash2") << "c:\\winnt\\system32\\kernel32.dll" << "kernel32.dll";
@@ -1135,8 +1203,8 @@ void tst_QDir::operator_eq()
 
 void tst_QDir::dotAndDotDot()
 {
-#ifdef Q_OS_WINCE
-	QSKIP("WinCE does not have . nor ..", SkipAll);
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+	QSKIP("WinCE and Symbian do not have . nor ..", SkipAll);
 #endif
     QDir dir(QString(SRCDIR "testdir/"));
     QStringList entryList = dir.entryList(QDir::Dirs);
@@ -1177,7 +1245,7 @@ void tst_QDir::homePath()
 #ifdef Q_OS_UNIX
     if (strHome.length() > 1)      // root dir = "/"
         QVERIFY(!strHome.endsWith('/'));
-#elif defined(Q_OS_WIN)
+#elif defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     if (strHome.length() > 3)      // root dir = "c:/"; "//" is not really valid...
         QVERIFY(!strHome.endsWith('/'));
 #endif
@@ -1201,7 +1269,7 @@ void tst_QDir::tempPath()
 #ifdef Q_OS_UNIX
     if (path.length() > 1)      // root dir = "/"
         QVERIFY(!path.endsWith('/'));
-#elif defined(Q_OS_WIN)
+#elif defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     if (path.length() > 3)      // root dir = "c:/"; "//" is not really valid...
         QVERIFY(!path.endsWith('/'));
 #endif
@@ -1216,14 +1284,14 @@ void tst_QDir::rootPath()
     QCOMPARE(path, dir.absolutePath());
     QVERIFY(QDir::isAbsolutePath(path));
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     QCOMPARE(path, QString("/"));
 #endif
 }
 
 void tst_QDir::nativeSeparators()
 {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     QCOMPARE(QDir::toNativeSeparators(QLatin1String("/")), QString("\\"));
     QCOMPARE(QDir::toNativeSeparators(QLatin1String("\\")), QString("\\"));
     QCOMPARE(QDir::fromNativeSeparators(QLatin1String("/")), QString("/"));
diff --git a/tests/auto/qdiriterator/qdiriterator.pro b/tests/auto/qdiriterator/qdiriterator.pro
index 2db6617585..ece886cbcb 100644
--- a/tests/auto/qdiriterator/qdiriterator.pro
+++ b/tests/auto/qdiriterator/qdiriterator.pro
@@ -3,7 +3,7 @@ SOURCES  += tst_qdiriterator.cpp
 RESOURCES      += qdiriterator.qrc
 QT = core
 
-wince*: {
+wince*|symbian*: {
    addFiles.sources = entrylist recursiveDirs foo
    addFiles.path = .
    DEPLOYMENT += addFiles
diff --git a/tests/auto/qdiriterator/tst_qdiriterator.cpp b/tests/auto/qdiriterator/tst_qdiriterator.cpp
index 79e44d18a9..5708b50a49 100644
--- a/tests/auto/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/qdiriterator/tst_qdiriterator.cpp
@@ -92,7 +92,7 @@ tst_QDirIterator::tst_QDirIterator()
     QFile::remove("entrylist/directory/entrylist4.lnk");
 
 #ifndef Q_NO_SYMLINKS
-#ifdef Q_OS_WIN
+#ifdef Q_OS_WIN || defined(Q_OS_SYMBIAN)
     // ### Sadly, this is a platform difference right now.
     QFile::link("entrylist/file", "entrylist/linktofile.lnk");
     QFile::link("entrylist/directory", "entrylist/linktodirectory.lnk");
@@ -200,6 +200,11 @@ void tst_QDirIterator::iterateRelativeDirectory()
     QFETCH(QStringList, nameFilters);
     QFETCH(QStringList, entries);
 
+#if defined(Q_OS_SYMBIAN)
+    QEXPECT_FAIL("no flags", "Symlink to directories is currently unsupported by Open C", Continue);
+    QEXPECT_FAIL("QDir::Subdirectories | QDir::FollowSymlinks", "Symlink to directories is currently unsupported by Open C", Continue);
+#endif // defined(Q_OS_SYMBIAN)
+
     QDirIterator it(dirName, nameFilters, filters, flags);
     QStringList list;
     while (it.hasNext()) {
diff --git a/tests/auto/qdirmodel/qdirmodel.pro b/tests/auto/qdirmodel/qdirmodel.pro
index 2bf07734e3..6b3a707d5c 100644
--- a/tests/auto/qdirmodel/qdirmodel.pro
+++ b/tests/auto/qdirmodel/qdirmodel.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES         += tst_qdirmodel.cpp
 
-wince*: {
+wince*|symbian: {
 	addit.sources = dirtest\test1\*
 	addit.path = dirtest\test1
 	tests.sources = test\*
@@ -9,8 +9,13 @@ wince*: {
         sourceFile.sources = tst_qdirmodel.cpp
         sourceFile.path = .
 	DEPLOYMENT += addit tests sourceFile
- DEFINES += SRCDIR=\\\"./\\\"
+}
+
+wince*: {
+    DEFINES += SRCDIR=\\\"./\\\"
+} symbian: {
+    DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 } else {
-  DEFINES += SRCDIR=\\\"$$PWD/\\\"
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
 
diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/qdirmodel/tst_qdirmodel.cpp
index bf1a8f4026..8684bbe2d0 100644
--- a/tests/auto/qdirmodel/tst_qdirmodel.cpp
+++ b/tests/auto/qdirmodel/tst_qdirmodel.cpp
@@ -50,6 +50,12 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#if defined(Q_OS_SYMBIAN)
+# define STRINGIFY(x) #x
+# define TOSTRING(x) STRINGIFY(x)
+# define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/"
+#endif
+
 class tst_QDirModel : public QObject
 {
     Q_OBJECT
@@ -89,7 +95,7 @@ private slots:
 
     void rmdir_data();
     void rmdir();
-    
+
     void filePath();
 
     void hidden();
@@ -292,7 +298,7 @@ void tst_QDirModel::mkdir_data()
     QTest::newRow("nameWithSpace") << QString("ab cd") << true << 2;
     QTest::newRow("emptyDirName") << QString("") << false << 1;
     QTest::newRow("nullDirName") << QString() << false << 1;
-    
+
 /*
     QTest::newRow("recursiveDirName") << QString("test2/test3") << false << false;
     QTest::newRow("singleDotDirName") << QString("./test3") << true << true;
@@ -449,7 +455,7 @@ bool tst_QDirModel::rowsAboutToBeRemoved_cleanup(const QString &test_path)
     QString path = QDir::currentPath() + "/" + test_path;
     QDir dir(path, "*", QDir::SortFlags(QDir::Name|QDir::IgnoreCase), QDir::Files);
     QStringList files = dir.entryList();
-    
+
     for (int i = 0; i < files.count(); ++i) {
         if (!dir.remove(files.at(i))) {
             qDebug() << "failed to remove file" << files.at(i);
@@ -481,14 +487,14 @@ void tst_QDirModel::rowsAboutToBeRemoved()
 
     qRegisterMetaType<QModelIndex>("QModelIndex");
 
-    // NOTE: QDirModel will call refres() when a file is removed. refresh() will reread the entire directory,
+    // NOTE: QDirModel will call refresh() when a file is removed. refresh() will reread the entire directory,
     // and emit layoutAboutToBeChanged and layoutChange. So, instead of checking for
     // rowsAboutToBeRemoved/rowsRemoved we check for layoutAboutToBeChanged/layoutChanged
     QSignalSpy spy(&model, SIGNAL(layoutAboutToBeChanged()));
 
     QModelIndex parent = model.index(test_path);
     QVERIFY(parent.isValid());
-        
+
     // remove the file
     {
         QModelIndex index = model.index(remove_row, 0, parent);
@@ -580,6 +586,13 @@ void tst_QDirModel::filePath()
     model.setResolveSymlinks(false);
     QModelIndex index = model.index(SRCDIR "test.lnk");
     QVERIFY(index.isValid());
+#if defined(Q_OS_SYMBIAN)
+    // Since model will force lowercase path in Symbian, make case insensitive compare
+    // Note: Windows should fail this, too, if test path has any uppercase letters.
+    QCOMPARE(model.filePath(index).toLower(), QString(SRCDIR).toLower() + "test.lnk");
+    model.setResolveSymlinks(true);
+    QCOMPARE(model.filePath(index).toLower(), QString(SRCDIR).toLower() + "tst_qdirmodel.cpp");
+#else
 #ifndef Q_OS_WINCE
     QString path = SRCDIR;
 #else
@@ -588,6 +601,7 @@ void tst_QDirModel::filePath()
     QCOMPARE(model.filePath(index), path + QString( "test.lnk"));
     model.setResolveSymlinks(true);
     QCOMPARE(model.filePath(index), path + QString( "tst_qdirmodel.cpp"));
+#endif
     QFile::remove(SRCDIR "test.lnk");
 }
 
@@ -596,14 +610,14 @@ void tst_QDirModel::task196768_sorting()
     //this task showed that the persistent model indexes got corrupted when sorting
     QString path = SRCDIR;
 
-    QDirModel model; 
+    QDirModel model;
     QTreeView view;
     QPersistentModelIndex index = model.index(path);
 
     view.setModel(&model);
     QModelIndex index2 = model.index(path);
     QCOMPARE(index.data(), index2.data());
-    view.setRootIndex(index); 
+    view.setRootIndex(index);
     index2 = model.index(path);
     QCOMPARE(index.data(), index2.data());
     view.setCurrentIndex(index);
diff --git a/tests/auto/qdom/qdom.pro b/tests/auto/qdom/qdom.pro
index 7738fb75f8..84b721e454 100644
--- a/tests/auto/qdom/qdom.pro
+++ b/tests/auto/qdom/qdom.pro
@@ -4,7 +4,7 @@ SOURCES  += tst_qdom.cpp
 QT = core xml
 QT -= gui
 
-wince*: {
+wince*|symbian*: {
    addFiles.sources = testdata doubleNamespaces.xml umlaut.xml
    addFiles.path = .
    DEPLOYMENT += addFiles
@@ -15,3 +15,5 @@ wince*: {
 else {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
+
+symbian: TARGET.EPOCHEAPSIZE="0x100000 0x1000000"
diff --git a/tests/auto/qevent/qevent.pro b/tests/auto/qevent/qevent.pro
index 219f97e1a7..5c142996f1 100644
--- a/tests/auto/qevent/qevent.pro
+++ b/tests/auto/qevent/qevent.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qevent.cpp
 QT = core
-
-
-
diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/qeventloop/tst_qeventloop.cpp
index 042494fecf..6b113e0ef2 100644
--- a/tests/auto/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/qeventloop/tst_qeventloop.cpp
@@ -54,6 +54,11 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 
+#ifdef Q_OS_SYMBIAN
+#include <e32base.h>
+#include <unistd.h>
+#endif
+
 //TESTED_CLASS=
 //TESTED_FILES=
 
@@ -186,6 +191,10 @@ public slots:
     void init();
     void cleanup();
 private slots:
+    // This test *must* run first. See the definition for why.
+    void onlySymbianActiveScheduler();
+    void symbianNestedActiveSchedulerLoop_data();
+    void symbianNestedActiveSchedulerLoop();
     void processEvents();
     void exec();
     void exit();
@@ -213,6 +222,101 @@ void tst_QEventLoop::init()
 void tst_QEventLoop::cleanup()
 { }
 
+class OnlySymbianActiveScheduler_helper : public QObject
+{
+    Q_OBJECT
+
+public:
+    OnlySymbianActiveScheduler_helper(int fd, QTimer *zeroTimer)
+        : fd(fd),
+          timerCount(0),
+          zeroTimer(zeroTimer),
+          zeroTimerCount(0),
+          notifierCount(0)
+    {
+    }
+    ~OnlySymbianActiveScheduler_helper() {}
+
+public slots:
+    void timerSlot()
+    {
+        // Let all the events occur twice so we know they reactivated after
+        // each occurrence.
+        if (++timerCount >= 2) {
+#ifdef Q_OS_SYMBIAN
+            // This will hopefully run last, so stop the active scheduler.
+            CActiveScheduler::Stop();
+#endif
+        }
+    }
+    void zeroTimerSlot()
+    {
+        if (++zeroTimerCount >= 2) {
+            zeroTimer->stop();
+        }
+    }
+    void notifierSlot()
+    {
+        if (++notifierCount >= 2) {
+            char dummy;
+            ::read(fd, &dummy, 1);
+        }
+    }
+
+private:
+    int fd;
+    int timerCount;
+    QTimer *zeroTimer;
+    int zeroTimerCount;
+    int notifierCount;
+};
+
+void tst_QEventLoop::onlySymbianActiveScheduler() {
+#ifndef Q_OS_SYMBIAN
+    QSKIP("This is a Symbian-only test.", SkipAll);
+#else
+    // In here we try to use timers and sockets exclusively using the Symbian
+    // active scheduler and no processEvents().
+    // This test should therefore be run first, so that we can verify that
+    // the first occurrence of processEvents does not do any initalization that
+    // we depend on.
+
+    // Open up a pipe so we can test socket notifiers.
+    int pipeEnds[2];
+    if (::pipe(pipeEnds) != 0) {
+        QFAIL("Could not open pipe");
+    }
+    QSocketNotifier notifier(pipeEnds[0], QSocketNotifier::Read);
+    QSignalSpy notifierSpy(&notifier, SIGNAL(activated(int)));
+    char dummy = 1;
+    ::write(pipeEnds[1], &dummy, 1);
+
+    QTimer zeroTimer;
+    QSignalSpy zeroTimerSpy(&zeroTimer, SIGNAL(timeout()));
+    zeroTimer.setInterval(0);
+    zeroTimer.start();
+
+    QTimer timer;
+    QSignalSpy timerSpy(&timer, SIGNAL(timeout()));
+    timer.setInterval(2000); // Generous timeout or this test will fail if there is high load
+    timer.start();
+
+    OnlySymbianActiveScheduler_helper helper(pipeEnds[0], &zeroTimer);
+    connect(&notifier, SIGNAL(activated(int)), &helper, SLOT(notifierSlot()));
+    connect(&zeroTimer, SIGNAL(timeout()), &helper, SLOT(zeroTimerSlot()));
+    connect(&timer, SIGNAL(timeout()), &helper, SLOT(timerSlot()));
+
+    CActiveScheduler::Start();
+
+    ::close(pipeEnds[1]);
+    ::close(pipeEnds[0]);
+
+    QCOMPARE(notifierSpy.count(), 2);
+    QCOMPARE(zeroTimerSpy.count(), 2);
+    QCOMPARE(timerSpy.count(), 2);
+#endif
+}
+
 void tst_QEventLoop::processEvents()
 {
     QSignalSpy spy1(QAbstractEventDispatcher::instance(), SIGNAL(aboutToBlock()));
@@ -265,6 +369,14 @@ void tst_QEventLoop::processEvents()
     killTimer(timerId);
 }
 
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+// Symbian needs bit longer timeout for emulator, as emulator startup causes additional delay
+#  define EXEC_TIMEOUT 1000
+#else
+#  define EXEC_TIMEOUT 100
+#endif
+
+
 void tst_QEventLoop::exec()
 {
     {
@@ -272,15 +384,15 @@ void tst_QEventLoop::exec()
         EventLoopExiter exiter(&eventLoop);
         int returnCode;
 
-        QTimer::singleShot(100, &exiter, SLOT(exit()));
+        QTimer::singleShot(EXEC_TIMEOUT, &exiter, SLOT(exit()));
         returnCode = eventLoop.exec();
         QCOMPARE(returnCode, 0);
 
-        QTimer::singleShot(100, &exiter, SLOT(exit1()));
+        QTimer::singleShot(EXEC_TIMEOUT, &exiter, SLOT(exit1()));
         returnCode = eventLoop.exec();
         QCOMPARE(returnCode, 1);
 
-        QTimer::singleShot(100, &exiter, SLOT(exit2()));
+        QTimer::singleShot(EXEC_TIMEOUT, &exiter, SLOT(exit2()));
         returnCode = eventLoop.exec();
         QCOMPARE(returnCode, 2);
     }
@@ -313,16 +425,19 @@ void tst_QEventLoop::exec()
         QEventLoop eventLoop;
         EventLoopExecutor executor(&eventLoop);
 
-        QTimer::singleShot(100, &executor, SLOT(exec()));
+        QTimer::singleShot(EXEC_TIMEOUT, &executor, SLOT(exec()));
         int returnCode = eventLoop.exec();
         QCOMPARE(returnCode, 0);
         QCOMPARE(executor.returnCode, -1);
     }
 
-#if !defined(QT_NO_EXCEPTIONS) && !defined(Q_OS_WINCE_WM)
+#if !defined(QT_NO_EXCEPTIONS) && !defined(Q_OS_WINCE_WM) && !defined(Q_OS_SYMBIAN)
     // Windows Mobile cannot handle cross library exceptions
     // qobject.cpp will try to rethrow the exception after handling
     // which causes gwes.exe to crash
+
+    // Symbian doesn't propagate exceptions from eventloop, but converts them to
+    // CActiveScheduler errors instead -> this test will hang.
     {
         // QEventLoop::exec() is exception safe
         QEventLoop eventLoop;
@@ -330,14 +445,14 @@ void tst_QEventLoop::exec()
 
         try {
             ExceptionThrower exceptionThrower;
-            QTimer::singleShot(100, &exceptionThrower, SLOT(throwException()));
+            QTimer::singleShot(EXEC_TIMEOUT, &exceptionThrower, SLOT(throwException()));
             (void) eventLoop.exec();
         } catch (...) {
             ++caughtExceptions;
         }
         try {
             ExceptionThrower exceptionThrower;
-            QTimer::singleShot(100, &exceptionThrower, SLOT(throwException()));
+            QTimer::singleShot(EXEC_TIMEOUT, &exceptionThrower, SLOT(throwException()));
             (void) eventLoop.exec();
         } catch (...) {
             ++caughtExceptions;
@@ -512,7 +627,7 @@ void tst_QEventLoop::processEventsExcludeTimers()
 
     // normal process events will send timers
     eventLoop.processEvents(QEventLoop::X11ExcludeTimers);
-#ifndef Q_OS_UNIX
+#if !defined(Q_OS_UNIX) || defined(Q_OS_SYMBIAN)
     QEXPECT_FAIL("", "X11ExcludeTimers only works on UN*X", Continue);
 #endif
     QCOMPARE(timerReceiver.gotTimerEvent, -1);
@@ -524,210 +639,163 @@ void tst_QEventLoop::processEventsExcludeTimers()
     timerReceiver.gotTimerEvent = -1;
 }
 
-QTEST_MAIN(tst_QEventLoop)
-#include "tst_qeventloop.moc"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#ifdef Q_OS_SYMBIAN
+class DummyActiveObject : public CActive
+{
+public:
+    DummyActiveObject(int levels);
+    ~DummyActiveObject();
 
+    void Start();
 
+protected:
+    void DoCancel();
+    void RunL();
 
+public:
+    bool succeeded;
 
+private:
+    RTimer m_rTimer;
+    int remainingLevels;
+};
 
+class ActiveSchedulerLoop : public QObject
+{
+public:
+    ActiveSchedulerLoop(int levels) : succeeded(false), timerId(-1), remainingLevels(levels) {}
+    ~ActiveSchedulerLoop() {}
 
+    void timerEvent(QTimerEvent *e);
 
+public:
+    bool succeeded;
+    int timerId;
+    int remainingLevels;
+};
 
+DummyActiveObject::DummyActiveObject(int levels)
+    : CActive(CActive::EPriorityStandard),
+      succeeded(false),
+      remainingLevels(levels)
+{
+    m_rTimer.CreateLocal();
+}
 
+DummyActiveObject::~DummyActiveObject()
+{
+    Cancel();
+    m_rTimer.Close();
+}
 
+void DummyActiveObject::DoCancel()
+{
+    m_rTimer.Cancel();
+}
 
+void DummyActiveObject::RunL()
+{
+    if (remainingLevels - 1 <= 0) {
+        ActiveSchedulerLoop loop(remainingLevels - 1);
+        loop.timerId = loop.startTimer(0);
+        QCoreApplication::processEvents();
 
+        succeeded = loop.succeeded;
+    } else {
+        succeeded = true;
+    }
+    CActiveScheduler::Stop();
+}
 
-// previous test
+void DummyActiveObject::Start()
+{
+    m_rTimer.After(iStatus, 100000); // 100 ms
+    SetActive();
+}
 
-#if 0
+void ActiveSchedulerLoop::timerEvent(QTimerEvent *e)
+{
+    Q_UNUSED(e);
+    DummyActiveObject *dummy = new(ELeave) DummyActiveObject(remainingLevels);
+    CActiveScheduler::Add(dummy);
 
-#include <qwidget.h>
+    dummy->Start();
 
-#ifdef Q_WS_WIN
-#include <windows.h>
-#endif
+    CActiveScheduler::Start();
 
+    succeeded = dummy->succeeded;
 
+    delete dummy;
 
-//TESTED_CLASS=
-//TESTED_FILES=
+    killTimer(timerId);
+}
 
-class EventHandlerWidget : public QWidget
+// We cannot trap panics when the test case fails, so run it in a different thread instead.
+class ActiveSchedulerThread : public QThread
 {
 public:
-    EventHandlerWidget( QWidget* parent = 0, const char* name = 0 ) : QWidget( parent, name )
-    {
-        installEventFilter( this );
-        recievedPaintEvent = FALSE;
-        recievedMouseEvent = FALSE;
-    }
-    ~EventHandlerWidget() {}
-
-    bool recievedPaintEvent;
-    bool recievedMouseEvent;
+    ActiveSchedulerThread(QEventLoop::ProcessEventsFlag flags);
+    ~ActiveSchedulerThread();
 
 protected:
-    bool eventFilter( QObject* o, QEvent* e )
-    {
-        if ( e->type() == QEvent::Paint )
-            recievedPaintEvent = TRUE;
-        else if ( e->type() == QEvent::MouseButtonPress )
-            recievedMouseEvent = TRUE;
-        return QWidget::eventFilter( o, e );
-    }
-};
+    void run();
 
-class InBetweenObject : public QObject
-{
-    Q_OBJECT
 public:
-    InBetweenObject(QObject *parent, QObject *child)
-    : QObject(parent), childObject(child)
-    {
-        childObject->setParent(this);
-        ++instanceCounter;
-    }
-
-    ~InBetweenObject()
-    {
-        --instanceCounter;
-    }
-
-    static int instanceCounter;
-
-protected:
-    void childEvent(QChildEvent *e)
-    {
-        if (e->removed() && e->child() == childObject) {
-            deleteLater();
-        }
-    }
+    volatile bool succeeded;
 
 private:
-    QObject *childObject;
+    QEventLoop::ProcessEventsFlag m_flags;
 };
 
-class ObjectContainer : public QObject
-{
-public:
-    ObjectContainer(QObject *parent = 0)
-    : QObject(parent)
-    {
-    }
-
-protected:
-    void childEvent(QChildEvent *e)
-    {
-        if (e->inserted() && !::qobject_cast<InBetweenObject*>(e->child())) {
-            InBetweenObject *inBetween = new InBetweenObject(this, e->child());
-        }
-    }
-};
-
-class tst_QEventLoop : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QEventLoop();
-    ~tst_QEventLoop();
-public slots:
-    void init();
-    void cleanup();
-private slots:
-    void processEvents();
-    void eventHandlerPostsEvent();
-};
-
-tst_QEventLoop::tst_QEventLoop()
+ActiveSchedulerThread::ActiveSchedulerThread(QEventLoop::ProcessEventsFlag flags)
+    : succeeded(false),
+      m_flags(flags)
 {
 }
 
-tst_QEventLoop::~tst_QEventLoop()
+ActiveSchedulerThread::~ActiveSchedulerThread()
 {
 }
 
-void tst_QEventLoop::init()
+void ActiveSchedulerThread::run()
 {
-}
+    ActiveSchedulerLoop loop(2);
+    loop.timerId = loop.startTimer(0);
+    // It may panic in here if the active scheduler and the Qt loop don't go together.
+    QCoreApplication::processEvents(m_flags);
 
-void tst_QEventLoop::cleanup()
-{
+    succeeded = loop.succeeded;
 }
+#endif // ifdef Q_OS_SYMBIAN
 
-
-void tst_QEventLoop::processEvents()
+void tst_QEventLoop::symbianNestedActiveSchedulerLoop_data()
 {
-    EventHandlerWidget *mainWidget = new EventHandlerWidget( 0 );
-    mainWidget->show();
-    qApp->setMainWidget( mainWidget );
-
-#ifdef Q_WS_WIN
-    QEventLoop* eventLoop = qApp->eventLoop();
-    eventLoop->processEvents( QEventLoop::AllEvents );
-    QVERIFY( !eventLoop->hasPendingEvents() );
+    QTest::addColumn<int>("processEventFlags");
 
-    // Make sure the flag is cleared first
-    mainWidget->recievedPaintEvent = FALSE;
-#ifdef Q_WS_WIN
-    InvalidateRect( mainWidget->winId(), 0, TRUE );
-#endif
-    QVERIFY( !mainWidget->recievedPaintEvent );
-    eventLoop->processEvents( QEventLoop::AllEvents );
-    QVERIFY( mainWidget->recievedPaintEvent );
-
-#ifdef Q_WS_WIN
-    // TODO: Hardcoded for now...
-    LPARAM lParam = MAKELPARAM( 10, 10 );
-    PostMessage( mainWidget->winId(), WM_LBUTTONDOWN, 0, lParam );
-#endif
-
-    mainWidget->recievedMouseEvent = FALSE;
-    eventLoop->processEvents( QEventLoop::ExcludeUserInput );
-    QVERIFY( !mainWidget->recievedMouseEvent );
-#else
-    QSKIP( "QEventLoop test is not implememented on X11 yet", SkipAll);
-#endif
+    QTest::newRow("AllEvents") << (int)QEventLoop::AllEvents;
+    QTest::newRow("WaitForMoreEvents") << (int)QEventLoop::WaitForMoreEvents;
 }
 
-int InBetweenObject::instanceCounter = 0;
-
-void tst_QEventLoop::eventHandlerPostsEvent()
+/*
+  Before you start fiddling with this test, you should have a good understanding of how
+  Symbian active objects work. What the test does is to try to screw up the semaphore count
+  in the active scheduler to cause stray signals, by running the Qt event loop and the
+  active scheduler inside each other. Naturally, its attempts to do this should be futile!
+*/
+void tst_QEventLoop::symbianNestedActiveSchedulerLoop()
 {
-    ObjectContainer container;
-
-    QObject *object = new QObject(&container);
-    qApp->processEvents();
-    qApp->processEvents();
-
-    QCOMPARE(InBetweenObject::instanceCounter, 1);
+#ifndef Q_OS_SYMBIAN
+    QSKIP("This is a Symbian only test.", SkipAll);
+#else
+    QFETCH(int, processEventFlags);
 
-    object->deleteLater();
+    ActiveSchedulerThread thread((QEventLoop::ProcessEventsFlag)processEventFlags);
+    thread.start();
+    thread.wait(2000);
 
-    qApp->processEvents();
-    QCOMPARE(InBetweenObject::instanceCounter, 0);
-};
+    QVERIFY(thread.succeeded);
+#endif
+}
 
 QTEST_MAIN(tst_QEventLoop)
 #include "tst_qeventloop.moc"
-
-#endif
diff --git a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro b/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
index 3a221997aa..8a45aa27b2 100644
--- a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
+++ b/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
@@ -1,3 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qexplicitlyshareddatapointer.cpp
-QT-=gui
+QT = core
diff --git a/tests/auto/qfile/test/test.pro b/tests/auto/qfile/test/test.pro
index 8d26f5e847..80102f0ee3 100644
--- a/tests/auto/qfile/test/test.pro
+++ b/tests/auto/qfile/test/test.pro
@@ -1,20 +1,26 @@
 load(qttest_p4)
 SOURCES  += ../tst_qfile.cpp
 
+wince*|symbian:{
+    QT = core gui
+    files.sources += ..\dosfile.txt ..\noendofline.txt ..\testfile.txt \
+                     ..\testlog.txt ..\two.dots.file ..\tst_qfile.cpp \
+                     ..\Makefile ..\forCopying.txt ..\forRenaming.txt
+    files.path = .
+    resour.sources += ..\resources\file1.ext1
+    resour.path = resources
+
+    DEPLOYMENT = files resour
+}
+
 wince*:{
-QT = core gui
-files.sources += ..\dosfile.txt ..\noendofline.txt ..\testfile.txt \
-		  ..\testlog.txt ..\two.dots.file ..\tst_qfile.cpp \
-		  ..\Makefile ..\forCopying.txt ..\forRenaming.txt
-files.path = .
-resour.sources += ..\resources
-resour.path = .
-
-DEPLOYMENT = files resour
-DEFINES += SRCDIR=\\\"\\\"
+    DEFINES += SRCDIR=\\\"\\\"
+} symbian: {
+    # don't define SRCDIR at all
+    TARGET.EPOCHEAPSIZE = 0x100000 0x3000000
 } else {
-QT = core network
-DEFINES += SRCDIR=\\\"$$PWD/../\\\"
+    QT = core network
+    DEFINES += SRCDIR=\\\"$$PWD/../\\\"
 }
 
 RESOURCES      += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc
@@ -22,12 +28,12 @@ RESOURCES      += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc
 TARGET = ../tst_qfile
 
 win32 {
-  CONFIG(debug, debug|release) {
-    TARGET = ../../debug/tst_qfile
-} else {
-    TARGET = ../../release/tst_qfile
-  }
-  LIBS+=-lole32 -luuid
+    CONFIG(debug, debug|release) {
+        TARGET = ../../debug/tst_qfile
+    } else {
+        TARGET = ../../release/tst_qfile
+    }
+    LIBS+=-lole32 -luuid
 }
 
 
diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp
index 66f29dd542..fd8fa981c9 100644
--- a/tests/auto/qfile/tst_qfile.cpp
+++ b/tests/auto/qfile/tst_qfile.cpp
@@ -50,7 +50,7 @@
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
 #include <QHostInfo>
 #endif
 #include <QProcess>
@@ -73,9 +73,12 @@
 #endif
 
 #include <stdio.h>
-
 #include "../network-settings.h"
 
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#endif
+
 Q_DECLARE_METATYPE(QFile::FileError)
 
 //TESTED_CLASS=
@@ -382,7 +385,10 @@ void tst_QFile::open()
 
     QFETCH( bool, ok );
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_SYMBIAN)
+    if (qstrcmp(QTest::currentDataTag(), "noreadfile") == 0)
+        QSKIP("Symbian does not support non-readable files", SkipSingle);
+#elif defined(Q_OS_UNIX)
     if (::getuid() == 0)
         // root and Chuck Norris don't care for file permissions. Skip.
         QSKIP("Running this test as root doesn't make sense", SkipAll);
@@ -599,8 +605,8 @@ void tst_QFile::readLineNullInLine()
 
 void tst_QFile::readAllStdin()
 {
-#if defined(Q_OS_WINCE)
-    QSKIP("Currently no stdin/out supported for Windows CE", SkipAll);
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+    QSKIP("Currently no stdin/out supported for Windows CE or Symbian", SkipAll);
 #endif
 #if defined(QT_NO_PROCESS)
     QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll);
@@ -625,8 +631,8 @@ void tst_QFile::readAllStdin()
 
 void tst_QFile::readLineStdin()
 {
-#if defined(Q_OS_WINCE)
-    QSKIP("Currently no stdin/out supported for Windows CE", SkipAll);
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+    QSKIP("Currently no stdin/out supported for Windows CE or Symbian", SkipAll);
 #endif
 #if defined(QT_NO_PROCESS)
     QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll);
@@ -668,7 +674,7 @@ void tst_QFile::readLineStdin()
 
 void tst_QFile::readLineStdin_lineByLine()
 {
-#if defined(Q_OS_WINCE)
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QSKIP("Currently no stdin/out supported for Windows CE", SkipAll);
 #endif
 #if defined(QT_NO_PROCESS)
@@ -796,7 +802,7 @@ void tst_QFile::ungetChar()
 void tst_QFile::invalidFile_data()
 {
     QTest::addColumn<QString>("fileName");
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !defined(Q_OS_SYMBIAN)
     QTest::newRow( "x11" ) << QString( "qwe//" );
 #else
     QTest::newRow( "colon1" ) << QString( "fail:invalid" );
@@ -866,6 +872,10 @@ void tst_QFile::permissions_data()
 
 void tst_QFile::permissions()
 {
+#if defined(Q_OS_SYMBIAN)
+    if (qstrcmp(QTest::currentDataTag(), "data0") == 0)
+        QSKIP("Symbian does not have execution permissions", SkipSingle);
+#endif
     QFETCH(QString, file);
     QFETCH(uint, perms);
     QFETCH(bool, expected);
@@ -956,7 +966,11 @@ void tst_QFile::copyShouldntOverwrite()
     QFile::remove("tst_qfile.cpy");
     QFile file(SRCDIR "tst_qfile.cpp");
     QVERIFY(file.copy("tst_qfile.cpy"));
+#if defined(Q_OS_SYMBIAN)
+	bool ok = QFile::setPermissions("tst_qfile.cpy", QFile::WriteUser);
+#else
 	bool ok = QFile::setPermissions("tst_qfile.cpy", QFile::WriteOther);
+#endif
     QVERIFY(ok);
     QVERIFY(!file.copy("tst_qfile.cpy"));
     QFile::remove("tst_qfile.cpy");
@@ -1041,11 +1055,7 @@ void tst_QFile::link()
     QVERIFY(QFile::link("tst_qfile.cpp", "myLink.lnk"));
     QFileInfo info2("myLink.lnk");
     QVERIFY(info2.isSymLink());
-#ifdef Q_OS_WIN // on windows links are always absolute
     QCOMPARE(info2.symLinkTarget(), info1.absoluteFilePath());
-#else
-    QCOMPARE(info2.symLinkTarget(), info1.absoluteFilePath());
-#endif
 
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     QString wd = getWorkingDirectoryForLink(info2.absoluteFilePath());
@@ -1056,6 +1066,9 @@ void tst_QFile::link()
 
 void tst_QFile::linkToDir()
 {
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Symbian does not support linking to directories", SkipAll);
+#endif
     QFile::remove("myLinkToDir.lnk");
     QDir dir;
     dir.mkdir("myDir");
@@ -1068,11 +1081,7 @@ void tst_QFile::linkToDir()
     // later fail...
     QVERIFY(info2.isSymLink());
 #endif
-#ifdef Q_OS_WIN // on windows links are alway absolute
     QCOMPARE(info2.symLinkTarget(), info1.absoluteFilePath());
-#else
-    QCOMPARE(info2.symLinkTarget(), info1.absoluteFilePath());
-#endif
     QVERIFY(QFile::remove(info2.absoluteFilePath()));
     QFile::remove("myLinkToDir.lnk");
     dir.rmdir("myDir");
@@ -1091,8 +1100,7 @@ void tst_QFile::absolutePathLinkToRelativePath()
 #else
     QVERIFY(QFile::link("myDir/test.txt", "myDir/myLink.lnk"));
 #endif
-
-    QEXPECT_FAIL("", "Symlinking using relative paths is currently different on Windows and Unix", Continue);
+    QEXPECT_FAIL("", "Symlinking using relative paths is currently different on Windows and Unix/Symbian", Continue);
     QCOMPARE(QFileInfo(QFile(QFileInfo("myDir/myLink.lnk").absoluteFilePath()).symLinkTarget()).absoluteFilePath(),
              QFileInfo("myDir/test.txt").absoluteFilePath());
 
@@ -1105,18 +1113,24 @@ void tst_QFile::readBrokenLink()
 {
     QFile::remove("myLink2.lnk");
     QFileInfo info1("file12");
+#if defined(Q_OS_SYMBIAN)
+    // In Symbian can't link to nonexisting file directly, so create the file temporarily
+    QFile tempFile("file12");
+    tempFile.open(QIODevice::WriteOnly);
+    tempFile.link("myLink2.lnk");
+    tempFile.remove();
+#else
     QVERIFY(QFile::link("file12", "myLink2.lnk"));
+#endif
     QFileInfo info2("myLink2.lnk");
     QVERIFY(info2.isSymLink());
-#ifdef Q_OS_WIN // on windows links are alway absolute
-    QCOMPARE(info2.symLinkTarget(), info1.absoluteFilePath());
-#else
     QCOMPARE(info2.symLinkTarget(), info1.absoluteFilePath());
-#endif
     QVERIFY(QFile::remove(info2.absoluteFilePath()));
 
+#if !defined(Q_OS_SYMBIAN)
     QVERIFY(QFile::link("ole/..", "myLink2.lnk"));
     QCOMPARE(QFileInfo("myLink2.lnk").symLinkTarget(), QDir::currentPath());
+#endif
 }
 
 void tst_QFile::readTextFile_data()
@@ -1329,7 +1343,7 @@ void tst_QFile::bufferedRead()
 
 void tst_QFile::isSequential()
 {
-#if defined (Q_OS_WIN)
+#if defined (Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     QSKIP("Unix only test.", SkipAll);
 #endif
 
@@ -1638,7 +1652,7 @@ void tst_QFile::longFileName()
     }
     {
         QFile file(fileName);
-#if defined(Q_OS_WINCE)
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
         QEXPECT_FAIL("244 chars", "Full pathname must be less than 260 chars", Abort);
         QEXPECT_FAIL("244 chars to absolutepath", "Full pathname must be less than 260 chars", Abort);
 #endif
@@ -1911,8 +1925,8 @@ void tst_QFile::writeLargeDataBlock()
 
     // Generate a 64MB array with well defined contents.
     QByteArray array;
-#if defined(Q_OS_WINCE)
-	int resizeSize = 1024 * 1024; // WinCE does not have much space
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+	int resizeSize = 1024 * 1024; // WinCE and Symbian do not have much space
 #else
 	int resizeSize = 64 * 1024 * 1024;
 #endif
@@ -2049,7 +2063,7 @@ void tst_QFile::rename_data()
     QTest::newRow("a -> .") << QString("a") << QString(".") << false;
     QTest::newRow("renamefile -> renamefile") << QString("renamefile") << QString("renamefile") << false;
     QTest::newRow("renamefile -> Makefile") << QString("renamefile") << QString("Makefile") << false;
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     QTest::newRow("renamefile -> /etc/renamefile") << QString("renamefile") << QString("/etc/renamefile") << false;
 #endif
     QTest::newRow("renamefile -> renamedfile") << QString("renamefile") << QString("renamedfile") << true;
@@ -2277,7 +2291,7 @@ void tst_QFile::readEof_data()
     QTest::newRow("buffered") << SRCDIR "testfile.txt" << 0;
     QTest::newRow("unbuffered") << SRCDIR "testfile.txt" << int(QIODevice::Unbuffered);
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     QTest::newRow("sequential,buffered") << "/dev/null" << 0;
     QTest::newRow("sequential,unbuffered") << "/dev/null" << int(QIODevice::Unbuffered);
 #endif
@@ -2460,9 +2474,11 @@ void tst_QFile::map()
     QVERIFY(file.open(QFile::ReadWrite));
     memory = file.map(offset, size);
     if (error != QFile::NoError) {
+
 	QVERIFY(file.error() != QFile::NoError);
         return;
     }
+
     QCOMPARE(file.error(), error);
     QVERIFY(memory);
     memory[0] = 'Q';
@@ -2499,7 +2515,9 @@ void tst_QFile::map()
 
     file.close();
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_SYMBIAN)
+	 if (false) // No permissions for user makes no sense in Symbian
+#elif defined(Q_OS_UNIX)
     if (::getuid() != 0)
         // root always has permissions
 #endif
diff --git a/tests/auto/qfiledialog/qfiledialog.pro b/tests/auto/qfiledialog/qfiledialog.pro
index 28a11baf5c..3c238eca53 100644
--- a/tests/auto/qfiledialog/qfiledialog.pro
+++ b/tests/auto/qfiledialog/qfiledialog.pro
@@ -6,10 +6,15 @@ load(qttest_p4)
 
 SOURCES += tst_qfiledialog.cpp
 
-wince*: {
+wince*|symbian: {
     addFiles.sources = *.cpp
     addFiles.path = .
     filesInDir.sources = *.pro
     filesInDir.path = someDir
     DEPLOYMENT += addFiles filesInDir
 }
+
+symbian:TARGET.EPOCHEAPSIZE="0x100 0x1000000"
+
+symbian:HEADERS += ../../../include/qtgui/private/qfileinfogatherer_p.h
+
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp
index c31ecf240c..86bf237fa6 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp
@@ -304,6 +304,7 @@ void tst_QFiledialog::filesSelectedSignal()
     fd.show();
     QListView *listView = qFindChild<QListView*>(&fd, "listView");
     QVERIFY(listView);
+
     QModelIndex root = listView->rootIndex();
     QTRY_COMPARE(listView->model()->rowCount(root) > 0, true);
     QModelIndex file;
@@ -471,10 +472,11 @@ void tst_QFiledialog::completer()
     if (!tmp.exists(tempPath))
         QVERIFY(tmp.mkdir("QFileDialogTestDir"));
     QList<QTemporaryFile*> files;
+    QT_TRY {
     for (int i = 0; i < 10; ++i) {
-        QTemporaryFile *file = new QTemporaryFile(tempPath + "/rXXXXXX");
+        QScopedPointer<QTemporaryFile> file(new QTemporaryFile(tempPath + "/rXXXXXX"));
         file->open();
-        files.append(file);
+        files.append(file.take());
     }
 
     // ### flesh this out more
@@ -539,14 +541,14 @@ void tst_QFiledialog::completer()
         if (input.startsWith(".."))
             input.clear();
         for (int ii = 0; ii < expectedFiles.count(); ++ii) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
             if (expectedFiles.at(ii).startsWith(input,Qt::CaseInsensitive))
 #else
             if (expectedFiles.at(ii).startsWith(input))
 #endif
                 ++expected;
         }
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN)
         if (inputStartsWithRootPath)
             expected++;
 #endif
@@ -561,7 +563,14 @@ void tst_QFiledialog::completer()
         //qDebug() << expectedFiles;
     }
 
+
+    // ### FIXME: This will fail on Symbian on some tests and some environments until the file engine and QFileSystemModel
+    // are fixed to properly capitalize paths, so that some folders are not duplicated in QFileSystemModel.
     QTRY_COMPARE(cModel->rowCount(), expected);
+    } QT_CATCH(...) {
+        qDeleteAll(files);
+        QT_RETHROW;
+    }
     qDeleteAll(files);
 }
 
@@ -924,8 +933,8 @@ void tst_QFiledialog::selectFiles()
     QVERIFY(listView);
     for (int i = 0; i < list.count(); ++i) {
         fd.selectFile(fd.directory().path() + "/" + list.at(i));
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
-    QEXPECT_FAIL("", "This test does not work on Mac or Windows", Abort);
+#if defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
+    QEXPECT_FAIL("", "This test does not work on Mac, Windows, or Symbian", Abort);
 #endif
         QTRY_VERIFY(!listView->selectionModel()->selectedRows().isEmpty());
         toSelect.append(listView->selectionModel()->selectedRows().last());
@@ -1230,6 +1239,9 @@ void tst_QFiledialog::clearLineEdit()
     fd.setDirectory(QDir::home());
 
     QTest::qWait(1000);
+#ifdef QT_KEYPAD_NAVIGATION
+    list->setEditFocus(true);
+#endif
     QTest::keyClick(list, Qt::Key_Down);
 #ifndef Q_WS_MAC
     QTest::keyClick(list, Qt::Key_Return);
@@ -1703,6 +1715,9 @@ void tst_QFiledialog::task233037_selectingDirectory()
     fd.show();
     QListView *list = qFindChild<QListView*>(&fd, "listView");
     QTest::qWait(3000); // Wait for sort to settle (I need a signal).
+#ifdef QT_KEYPAD_NAVIGATION
+    list->setEditFocus(true);
+#endif
     QTest::keyClick(list, Qt::Key_Down);
     QTest::qWait(100);
     QDialogButtonBox *buttonBox = qFindChild<QDialogButtonBox*>(&fd, "buttonBox");
diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro
index 91b630d5dd..d46a83ba62 100644
--- a/tests/auto/qfileinfo/qfileinfo.pro
+++ b/tests/auto/qfileinfo/qfileinfo.pro
@@ -6,10 +6,11 @@ QT = core
 
 RESOURCES      += qfileinfo.qrc
 
-wince*: {
+wince*:|symbian*: {
     deploy.sources += qfileinfo.qrc tst_qfileinfo.cpp
     res.sources = resources\file1 resources\file1.ext1 resources\file1.ext1.ext2
     res.path = resources
     DEPLOYMENT = deploy res
 }
 
+symbian:TARGET.CAPABILITY=AllFiles
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 512f2b640c..2a19a04b22 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -168,6 +168,7 @@ tst_QFileInfo::~tst_QFileInfo()
     QFile::remove("brokenlink.lnk");
     QFile::remove("link.lnk");
     QFile::remove("file1");
+    QFile::remove("dummyfile");
 }
 
 // Testing get/set functions
@@ -236,6 +237,7 @@ void tst_QFileInfo::copy()
 
 tst_QFileInfo::tst_QFileInfo()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 void tst_QFileInfo::isFile_data()
@@ -264,6 +266,7 @@ void tst_QFileInfo::isDir_data()
 {
     // create a broken symlink
     QFile::remove("brokenlink.lnk");
+    QFile::remove("dummyfile");
     QFile file3("dummyfile");
     file3.open(QIODevice::WriteOnly);
     if (file3.link("brokenlink.lnk")) {
@@ -286,10 +289,12 @@ void tst_QFileInfo::isDir_data()
 
     QTest::newRow("broken link") << "brokenlink.lnk" << false;
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     QTest::newRow("drive 1") << "c:" << true;
     QTest::newRow("drive 2") << "c:/" << true;
     //QTest::newRow("drive 2") << "t:s" << false;
+#endif
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     QTest::newRow("unc 1") << "//"  + QtNetworkSettings::winServerName() << true;
     QTest::newRow("unc 2") << "//"  + QtNetworkSettings::winServerName() + "/" << true;
     QTest::newRow("unc 3") << "//"  + QtNetworkSettings::winServerName() + "/testshare" << true;
@@ -313,7 +318,6 @@ void tst_QFileInfo::isRoot_data()
 {
     QTest::addColumn<QString>("path");
     QTest::addColumn<bool>("expected");
-
     QTest::newRow("data0") << QDir::currentPath() << false;
     QTest::newRow("data1") << "/" << true;
     QTest::newRow("data2") << "*" << false;
@@ -323,8 +327,7 @@ void tst_QFileInfo::isRoot_data()
 
     QTest::newRow("simple dir") << "resources" << false;
     QTest::newRow("simple dir with slash") << "resources/" << false;
-
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     QTest::newRow("drive 1") << "c:" << false;
     QTest::newRow("drive 2") << "c:/" << true;
     QTest::newRow("drive 3") << "p:/" << false;
@@ -395,7 +398,7 @@ void tst_QFileInfo::absolutePath_data()
     QTest::addColumn<QString>("filename");
 
     QString drivePrefix;
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     drivePrefix = QDir::currentPath().left(2);
 #endif
     QTest::newRow("0") << "/machine/share/dir1/" << drivePrefix + "/machine/share/dir1" << "";
@@ -430,7 +433,7 @@ void tst_QFileInfo::absFilePath_data()
 
     QTest::newRow("relativeFile") << "tmp.txt" << QDir::currentPath() + "/tmp.txt";
     QTest::newRow("relativeFileInSubDir") << "temp/tmp.txt" << QDir::currentPath() + "/" + "temp/tmp.txt";
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     QString curr = QDir::currentPath();
     curr.remove(0, 2);   // Make it a absolute path with no drive specifier: \depot\qt-4.2\tests\auto\qfileinfo
     QTest::newRow(".")            << curr << QDir::currentPath();
@@ -489,6 +492,9 @@ void tst_QFileInfo::canonicalFilePath()
         if (file.link(link)) {
             QFileInfo info1("tst_qfileinfo.cpp");
             QFileInfo info2(link + QDir::separator() + "tst_qfileinfo.cpp");
+
+            QVERIFY2(info1.exists(), "If this fails, one reason might be the test system has failed to copy the files.");
+            QVERIFY2(info2.exists(), "If this fails, one reason might be the test system has failed to copy the files.");
             QCOMPARE(info1.canonicalFilePath(), info2.canonicalFilePath());
 
             QFileInfo info3(link + QDir::separator() + "link.lnk");
@@ -521,7 +527,7 @@ void tst_QFileInfo::fileName_data()
 
     QTest::newRow("relativeFile") << "tmp.txt" << "tmp.txt";
     QTest::newRow("relativeFileInSubDir") << "temp/tmp.txt" << "tmp.txt";
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     QTest::newRow("absFilePath") << "c:\\home\\andy\\tmp.txt" << "tmp.txt";
 #else
     QTest::newRow("absFilePath") << "/home/andy/tmp.txt" << "tmp.txt";
@@ -719,8 +725,9 @@ void tst_QFileInfo::permission()
     QFETCH(QString, file);
     QFETCH(int, perms);
     QFETCH(bool, expected);
+    QEXPECT_FAIL("data0", "No user based rights in Symbian OS - SOS needs platform security tests instead", Abort);
     QFileInfo fi(file);
-    QCOMPARE(fi.permission((QFile::Permissions)perms), expected);
+    QCOMPARE(fi.permission(QFile::Permissions(perms)), expected);
 }
 
 void tst_QFileInfo::size_data()
@@ -770,7 +777,7 @@ void tst_QFileInfo::compare_data()
                         << QDir::currentPath() + QString::fromLatin1("/tst_qfileinfo.cpp") << true;
     QTest::newRow("casesense1") << QString::fromLatin1("tst_qfileInfo.cpp")
                         << QDir::currentPath() + QString::fromLatin1("/tst_qfileinfo.cpp")
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
                         << true;
 #else
                         << false;
@@ -791,7 +798,7 @@ void tst_QFileInfo::consistent_data()
     QTest::addColumn<QString>("file");
     QTest::addColumn<QString>("expected");
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     QTest::newRow("slashes") << QString::fromLatin1("\\a\\a\\a\\a") << QString::fromLatin1("/a/a/a/a");
 #endif
     QTest::newRow("ending slash") << QString::fromLatin1("/a/somedir/") << QString::fromLatin1("/a/somedir/");
@@ -842,6 +849,9 @@ void tst_QFileInfo::fileTimes()
 #if defined(Q_OS_WINCE)
         QEXPECT_FAIL("longfile", "No long filenames on WinCE", Abort);
         QEXPECT_FAIL("longfile absolutepath", "No long filenames on WinCE", Abort);
+#elif defined(Q_OS_SYMBIAN)
+        QEXPECT_FAIL("longfile", "Maximum total filepath cannot exceed 256 characters in Symbian", Abort);
+        QEXPECT_FAIL("longfile absolutepath", "Maximum total filepath cannot exceed 256 characters in Symbian", Abort);
 #endif
         QVERIFY(file.open(QFile::WriteOnly | QFile::Text));
         QTextStream ts(&file);
@@ -885,6 +895,9 @@ void tst_QFileInfo::fileTimes()
 #ifdef Q_OS_WINCE
     QEXPECT_FAIL("simple", "WinCE only stores date of access data, not the time", Continue);
 #endif
+#ifdef Q_OS_SYMBIAN
+        QEXPECT_FAIL("simple", "Symbian implementation of stat doesn't return read time right", Abort);
+#endif
     QVERIFY(fileInfo.lastRead() > beforeRead);
     QVERIFY(fileInfo.lastModified() > beforeWrite);
     QVERIFY(fileInfo.lastModified() < beforeRead);
@@ -947,6 +960,7 @@ void tst_QFileInfo::isSymLink()
 {
     QFile::remove("link.lnk");
     QFile::remove("brokenlink.lnk");
+    QFile::remove("dummyfile");
 
     QFileInfo info1("tst_qfileinfo.cpp");
     QVERIFY( !info1.isSymLink() );
@@ -960,11 +974,13 @@ void tst_QFileInfo::isSymLink()
     QFile file3("dummyfile");
     file3.open(QIODevice::WriteOnly);
     if (file3.link("brokenlink.lnk")) {
+        // In Symbian ARMV5 builds, this will panic with KERN-EXEC 3 inside OpenC fclose() call
+        // in QFSFileEnginePrivate::closeFdFh(), if "dummyfile" exists prior calling to isSymLink
+        // and is not deleted at the beginning of isSymLink.
         file3.remove();
         QFileInfo info3("brokenlink.lnk");
         QVERIFY( info3.isSymLink() );
     }
-
 }
 
 void tst_QFileInfo::isHidden_data()
@@ -1075,6 +1091,10 @@ void tst_QFileInfo::brokenShortcut()
 
 void tst_QFileInfo::isWritable()
 {
+#ifdef Q_OS_SYMBIAN
+    QSKIP("Currently skipped on Symbian OS, but surely there is a writeable file somewhere???", SkipAll);
+#endif
+
     QVERIFY(QFileInfo("tst_qfileinfo.cpp").isWritable());
 #ifdef Q_OS_WIN
     QVERIFY(!QFileInfo("c:\\pagefile.sys").isWritable());
@@ -1089,10 +1109,17 @@ void tst_QFileInfo::isWritable()
 
 void tst_QFileInfo::isExecutable()
 {
+#ifdef Q_OS_SYMBIAN
+# if defined(Q_CC_NOKIAX86)
+    QSKIP("Impossible to implement reading/touching of application binaries in Symbian emulator", SkipAll);
+# endif    
+    QString appPath = "c:/sys/bin/tst_qfileinfo.exe";
+#else
     QString appPath = QCoreApplication::applicationDirPath();
     appPath += "/tst_qfileinfo";
-#if defined(Q_OS_WIN)
+# if defined(Q_OS_WIN)
     appPath += ".exe";
+# endif
 #endif
     QFileInfo fi(appPath);
     QCOMPARE(fi.isExecutable(), true);
diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
index 55f3b5c5a4..8701318528 100644
--- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
+++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
@@ -8,4 +8,11 @@ QT = core gui
 SOURCES		+= tst_qfilesystemmodel.cpp 
 TARGET		= tst_qfilesystemmodel
 
-
+symbian: {
+    HEADERS += ../../../include/qtgui/private/qfileinfogatherer_p.h
+    
+    # need to deploy something to create the private directory
+    dummyDeploy.sources = tst_qfilesystemmodel.cpp
+    dummyDeploy.path = .
+    DEPLOYMENT += dummyDeploy
+}
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index d49083f3e5..72841bb871 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -48,7 +48,9 @@
 #include <QTime>
 #include <QStyle>
 #include <QtGlobal>
-
+#if defined(Q_OS_SYMBIAN)
+# include <f32file.h>
+#endif
 //TESTED_CLASS=
 //TESTED_FILES=
 
@@ -64,6 +66,23 @@
         } \
     } while(0)
 
+#if defined(Q_OS_SYMBIAN)
+static HBufC* qt_QString2HBufCNewL(const QString& aString)
+{
+    HBufC *buffer;
+#ifdef QT_NO_UNICODE
+    TPtrC8 ptr(reinterpret_cast<const TUint8*>(aString.toLocal8Bit().constData()));
+    buffer = HBufC8::NewL(ptr.Length());
+    buffer->Des().Copy(ptr);
+#else
+    TPtrC16 ptr(reinterpret_cast<const TUint16*>(aString.utf16()));
+    buffer = HBufC16::NewL(ptr.Length());
+    buffer->Des().Copy(ptr);
+#endif
+    return buffer;
+}
+#endif
+
 class tst_QFileSystemModel : public QObject {
   Q_OBJECT
 
@@ -123,6 +142,9 @@ protected:
 private:
     QFileSystemModel *model;
     QString flatDirTestPath;
+#if defined(Q_OS_SYMBIAN)
+    RFs rfs;
+#endif
 };
 
 tst_QFileSystemModel::tst_QFileSystemModel() : model(0)
@@ -133,10 +155,16 @@ tst_QFileSystemModel::tst_QFileSystemModel() : model(0)
     qsrand(midnight.secsTo(QTime::currentTime()));
     // generating unique temporary directory name
     flatDirTestPath = QDir::temp().path() + '/' + QString("flatdirtest.") + QString::number(qrand());
+#if defined(Q_OS_SYMBIAN)
+    rfs.Connect();
+#endif
 }
 
 tst_QFileSystemModel::~tst_QFileSystemModel()
 {
+#if defined(Q_OS_SYMBIAN)
+    rfs.Close();
+#endif
     QString tmp = flatDirTestPath;
     QDir dir(tmp);
     if (dir.exists() && !dir.rmdir(tmp))
@@ -176,7 +204,7 @@ void tst_QFileSystemModel::cleanup()
 
 void tst_QFileSystemModel::indexPath()
 {
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN)
     int depth = QDir::currentPath().count('/');
     model->setRootPath(QDir::currentPath());
     QTest::qWait(WAITTIME);
@@ -380,6 +408,12 @@ bool tst_QFileSystemModel::createFiles(const QString &test_path, const QStringLi
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
         if (initial_files.at(i)[0] == '.')
             QProcess::execute(QString("attrib +h %1").arg(file.fileName()));
+#elif defined(Q_OS_SYMBIAN)
+        if (initial_files.at(i)[0] == '.') {
+            HBufC* buffer = qt_QString2HBufCNewL(QDir::toNativeSeparators(file.fileName()));
+            rfs.SetAtt(*buffer, KEntryAttHidden, 0);
+            delete buffer;
+            }
 #endif
         //qDebug() << test_path + '/' + initial_files.at(i) << (QFile::exists(test_path + '/' + initial_files.at(i)));
     }
@@ -568,7 +602,7 @@ void tst_QFileSystemModel::filters_data()
     QTest::addColumn<int>("dirFilters");
     QTest::addColumn<QStringList>("nameFilters");
     QTest::addColumn<int>("rowCount");
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QTest::newRow("no dirs") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs) << QStringList() << 2;
     QTest::newRow("one dir - dotdot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 1;
     QTest::newRow("one dir") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs) << QStringList() << 3;
@@ -593,7 +627,12 @@ void tst_QFileSystemModel::filters_data()
     QTest::newRow("no dir + hidden") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::Hidden) << QStringList() << 0;
     QTest::newRow("dir+hid+files") << (QStringList() << "a" << "b" << "c") << QStringList() <<
                          (int)(QDir::Dirs | QDir::Files | QDir::Hidden) << QStringList() << 3;
+#if defined(Q_OS_SYMBIAN)
+    // Some symbian envs have a bug that causes "A" and ".A" to be considered same name in file system.
+    QTest::newRow("dir+file+hid-dot .D") << (QStringList() << "a" << "b" << "c") << (QStringList() << ".D") <<
+#else
     QTest::newRow("dir+file+hid-dot .A") << (QStringList() << "a" << "b" << "c") << (QStringList() << ".A") <<
+#endif
                          (int)(QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot) << QStringList() << 4;
     QTest::newRow("dir+files+hid+dot A") << (QStringList() << "a" << "b" << "c") << (QStringList() << "AFolder") <<
                          (int)(QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot) << (QStringList() << "A*") << 2;
@@ -910,7 +949,7 @@ void tst_QFileSystemModel::dirsBeforeFiles()
 #endif
     }
 }
- 
+
 QTEST_MAIN(tst_QFileSystemModel)
 #include "tst_qfilesystemmodel.moc"
 
diff --git a/tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro b/tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro
index c4d1d6f680..8b8616acb8 100644
--- a/tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro
+++ b/tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qfilesystemwatcher.cpp
 QT = core
-
-
diff --git a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index c883c63313..a93a645e29 100644
--- a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -96,7 +96,7 @@ tst_QFileSystemWatcher::tst_QFileSystemWatcher()
     if (inotify_init() != -1)
         do_force_engines << "inotify";
 #endif
-#elif defined(Q_OS_WIN) || defined(Q_OS_DARWIN) || defined(Q_OS_FREEBSD)
+#elif defined(Q_OS_WIN) || defined(Q_OS_DARWIN) || defined(Q_OS_FREEBSD) || defined(Q_OS_SYMBIAN)
     // we have native engines for win32, macosx and freebsd
     do_force_engines << "native";
 #endif
@@ -314,6 +314,9 @@ void tst_QFileSystemWatcher::watchDirectory()
 
 #ifdef Q_OS_WINCE
     QEXPECT_FAIL("poller", "Directory does not get updated on file removal(See #137910)", Abort);
+#elif defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT)
+    // Since native watcher is always used in real devices, this poller issue is irrelevant
+    QEXPECT_FAIL("poller", "Poller doesn't detect directory removal in RVCT builds", Abort);
 #endif
     QCOMPARE(changedSpy.count(), 2);
     QCOMPARE(changedSpy.at(0).count(), 1);
diff --git a/tests/auto/qflags/qflags.pro b/tests/auto/qflags/qflags.pro
index 1e62db1f55..cd7f759b8b 100644
--- a/tests/auto/qflags/qflags.pro
+++ b/tests/auto/qflags/qflags.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qflags.cpp
-
 QT = core
-
-
diff --git a/tests/auto/qfontdatabase/qfontdatabase.pro b/tests/auto/qfontdatabase/qfontdatabase.pro
index cee683990d..35811f1a97 100644
--- a/tests/auto/qfontdatabase/qfontdatabase.pro
+++ b/tests/auto/qfontdatabase/qfontdatabase.pro
@@ -1,8 +1,8 @@
 load(qttest_p4)
 SOURCES  += tst_qfontdatabase.cpp
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-wince* {
+wince*|symbian {
     additionalFiles.sources = FreeMono.ttf
     additionalFiles.path = .
     DEPLOYMENT += additionalFiles
diff --git a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp
index 72c95f26a3..7dd2fd0c34 100644
--- a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp
@@ -45,9 +45,9 @@
 
 #include <qfontdatabase.h>
 
-
-
-
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR "."
+#endif
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -191,6 +191,9 @@ void tst_QFontDatabase::addAppFont_data()
 
 void tst_QFontDatabase::addAppFont()
 {
+#ifdef Q_OS_SYMBIAN
+    QSKIP( "Symbian: Application fonts are not yet supported", SkipAll );
+#else 
     QFETCH(bool, useMemoryFont);
     QSignalSpy fontDbChangedSpy(QApplication::instance(), SIGNAL(fontDatabaseChanged()));
 
@@ -240,6 +243,7 @@ void tst_QFontDatabase::addAppFont()
     QCOMPARE(fontDbChangedSpy.count(), 2);
 
     QVERIFY(db.families() == oldFamilies);
+#endif       
 }
 
 QTEST_MAIN(tst_QFontDatabase)
diff --git a/tests/auto/qftp/.gitattributes b/tests/auto/qftp/.gitattributes
index d220f58303..e04709aa2e 100644
--- a/tests/auto/qftp/.gitattributes
+++ b/tests/auto/qftp/.gitattributes
@@ -1 +1 @@
-rfc3252.txt -cflf Unset
+rfc3252.txt     -crlf
diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/qftp/qftp.pro
index 84d8c19a08..c060296e7f 100644
--- a/tests/auto/qftp/qftp.pro
+++ b/tests/auto/qftp/qftp.pro
@@ -9,6 +9,11 @@ wince*: {
    addFiles.path = .
    DEPLOYMENT += addFiles
    DEFINES += SRCDIR=\\\"\\\"
+} else:symbian* {
+   addFiles.sources = rfc3252.txt
+   addFiles.path = .
+   DEPLOYMENT += addFiles
+   TARGET.EPOCHEAPSIZE="0x100 0x1000000"
 } else {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp
index 28f3f4908c..7942d4b895 100644
--- a/tests/auto/qftp/tst_qftp.cpp
+++ b/tests/auto/qftp/tst_qftp.cpp
@@ -51,11 +51,22 @@
 #include <stdlib.h>
 #include <QNetworkProxy>
 
+#ifndef TEST_QNETWORK_PROXY
+#define TEST_QNETWORK_PROXY
+#endif
 #include "../network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Application private dir is default serach path for files, so SRCDIR can be set to empty
+#define SRCDIR ""
+#endif
+
+
+
 class tst_QFtp : public QObject
 {
     Q_OBJECT
@@ -178,11 +189,11 @@ const int bytesDone_init = -10;
 
 tst_QFtp::tst_QFtp()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QFtp::~tst_QFtp()
-{
-
+{  
 }
 
 void tst_QFtp::initTestCase_data()
@@ -190,10 +201,12 @@ void tst_QFtp::initTestCase_data()
     QTest::addColumn<bool>("setProxy");
     QTest::addColumn<int>("proxyType");
 
-    QTest::newRow("WithoutProxy") << false << 0;
+    QTest::newRow("WithoutProxy") << false << 0;        
+#ifdef TEST_QNETWORK_PROXY          
     QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy);
     //### doesn't work well yet.
     //QTest::newRow("WithHttpProxy") << true << int(QNetworkProxy::HttpProxy);
+#endif    
 }
 
 void tst_QFtp::initTestCase()
@@ -1144,7 +1157,7 @@ QDataStream &operator>>( QDataStream &s, FtpCommand &command )
 }
 Q_DECLARE_METATYPE(QList<FtpCommand>)
 
-        void tst_QFtp::commandSequence_data()
+void tst_QFtp::commandSequence_data()
 {
     // some "constants"
     QStringList argConnectToHost01;
@@ -1279,8 +1292,8 @@ void tst_QFtp::abort_data()
     QTest::newRow( "get_fluke01" ) << QtNetworkSettings::serverName() << (uint)21 << QString("qtest/bigfile") << QByteArray();
     QTest::newRow( "get_fluke02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("qtest/rfc3252") << QByteArray();
 
-    // Qt/CE test environment has to less memory for this test
-#if !defined(Q_OS_WINCE)
+    // Qt/CE and Symbian test environment has to less memory for this test
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) 
     QByteArray bigData( 10*1024*1024, 0 );
     bigData.fill( 'B' );
 
@@ -1501,7 +1514,6 @@ void tst_QFtp::proxy()
 
 void tst_QFtp::binaryAscii()
 {
-
     QString file = "asciifile%1.txt";
 
     if(file.contains('%'))
@@ -1544,11 +1556,16 @@ void tst_QFtp::binaryAscii()
     ResMapIt it2 = resultMap.find(QFtp::Get);
     QVERIFY(it2 != resultMap.end());
     QVERIFY(it2.value().success);
+/*
+#ifdef Q_OS_SYMBIAN
+    QVERIFY(getData.size() == putData.size());
+#else
+*/
     // most modern ftp servers leave the file as it is by default
     // (and do not remove the windows line ending), the -1 below could be
     // deleted in the future
     QVERIFY(getData.size() == putData.size()-1);
-
+//#endi
     //////////////////////////////////////////////////////////////////
     // cleanup (i.e. remove the file) -- this also tests the remove command
     init();
@@ -2042,4 +2059,5 @@ void tst_QFtp::cdUpSlot(bool error)
 }
 
 QTEST_MAIN(tst_QFtp)
+
 #include "tst_qftp.moc"
diff --git a/tests/auto/qgetputenv/qgetputenv.pro b/tests/auto/qgetputenv/qgetputenv.pro
index ed3eac937e..cbde2727a5 100644
--- a/tests/auto/qgetputenv/qgetputenv.pro
+++ b/tests/auto/qgetputenv/qgetputenv.pro
@@ -1,7 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qgetputenv.cpp
-
 QT = core
-
-
-
diff --git a/tests/auto/qglobal/qglobal.pro b/tests/auto/qglobal/qglobal.pro
index 373061b25a..8f1e00a2cb 100644
--- a/tests/auto/qglobal/qglobal.pro
+++ b/tests/auto/qglobal/qglobal.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
-
 SOURCES += tst_qglobal.cpp
 QT = core
-
-
diff --git a/tests/auto/qglobal/tst_qglobal.cpp b/tests/auto/qglobal/tst_qglobal.cpp
index 62bfd81891..49e5d7de80 100644
--- a/tests/auto/qglobal/tst_qglobal.cpp
+++ b/tests/auto/qglobal/tst_qglobal.cpp
@@ -50,6 +50,7 @@ private slots:
     void qInternalCallbacks();
     void for_each();
     void qassert();
+    void qtry();
 };
 
 void tst_QGlobal::qIsNull()
@@ -190,5 +191,66 @@ void tst_QGlobal::qassert()
     QVERIFY(passed);
 }
 
+void tst_QGlobal::qtry()
+{
+    int i = 0;
+    QT_TRY {
+        i = 1;
+        QT_THROW(42);
+        i = 2;
+    } QT_CATCH(int) {
+        QCOMPARE(i, 1);
+        i = 7;
+    }
+#ifdef QT_NO_EXCEPTIONS
+    QCOMPARE(i, 2);
+#else
+    QCOMPARE(i, 7);
+#endif
+
+    // check propper if/else scoping
+    i = 0;
+    if (true)
+        QT_TRY {
+            i = 2;
+            QT_THROW(42);
+            i = 4;
+        } QT_CATCH(int) {
+            QCOMPARE(i, 2);
+            i = 4;
+        }
+    else
+        QCOMPARE(i, 0);
+    QCOMPARE(i, 4);
+
+    i = 0;
+    if (false)
+        QT_TRY {
+            i = 2;
+            QT_THROW(42);
+            i = 4;
+        } QT_CATCH(int) {
+            QCOMPARE(i, 2);
+            i = 2;
+        }
+    else
+        i = 8;
+    QCOMPARE(i, 8);
+
+    i = 0;
+    if (false)
+        i = 42;
+    else
+        QT_TRY {
+            i = 2;
+            QT_THROW(42);
+            i = 4;
+        } QT_CATCH(int) {
+            QCOMPARE(i, 2);
+            i = 4;
+        }
+    QCOMPARE(i, 4);
+}
+
 QTEST_MAIN(tst_QGlobal)
 #include "tst_qglobal.moc"
diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro
index b8a5c8fbaa..6b8bc7095e 100644
--- a/tests/auto/qgraphicsscene/qgraphicsscene.pro
+++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro
@@ -3,15 +3,18 @@ SOURCES  += tst_qgraphicsscene.cpp
 RESOURCES += images.qrc
 win32:!wince*: LIBS += -lUser32
 
-!wince*:DEFINES += SRCDIR=\\\"$$PWD\\\"
+!wince*:!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_NO_CAST_TO_ASCII
 
-wince*: {
-   DEFINES += SRCDIR=\\\".\\\"
+wince*!symbian*: {
    rootFiles.sources = Ash_European.jpg graphicsScene_selection.data
    rootFiles.path = .
    renderFiles.sources = testData\render\*
    renderFiles.path = testData\render
    DEPLOYMENT += rootFiles renderFiles
 }
+wince*:{
+   DEFINES += SRCDIR=\\\".\\\"
+}
 
+symbian:TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index 4ef1cdd80f..d3b8883e58 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -58,6 +58,12 @@
 #define Q_CHECK_PAINTEVENTS
 #endif
 
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Current path (C:\private\<UID>) contains only ascii chars
+#define SRCDIR QDir::currentPath().append("\\").toAscii()
+#endif
+
 //TESTED_CLASS=
 //TESTED_FILES=
 
@@ -228,9 +234,11 @@ private slots:
     void mouseEventPropagation_focus();
     void mouseEventPropagation_doubleclick();
     void mouseEventPropagation_mouseMove();
+#ifndef QT_NO_DRAGANDDROP
     void dragAndDrop_simple();
     void dragAndDrop_disabledOrInvisible();
     void dragAndDrop_propagate();
+#endif
     void render_data();
     void render();
     void contextMenuEvent();
@@ -2232,6 +2240,7 @@ private:
     }
 };
 
+#ifndef QT_NO_DRAGANDDROP
 void tst_QGraphicsScene::dragAndDrop_simple()
 {
     DndTester *item = new DndTester(QRectF(-10, -10, 20, 20));
@@ -2521,6 +2530,7 @@ void tst_QGraphicsScene::dragAndDrop_propagate()
     QDropEvent dropEvent(QPoint(0, 0), Qt::CopyAction, &mimeData, Qt::LeftButton, 0);
     QApplication::sendEvent(view.viewport(), &dropEvent);
 }
+#endif
 
 void tst_QGraphicsScene::render_data()
 {
diff --git a/tests/auto/qgraphicsview/qgraphicsview.pro b/tests/auto/qgraphicsview/qgraphicsview.pro
index 5562f192cc..5e7e53da6e 100644
--- a/tests/auto/qgraphicsview/qgraphicsview.pro
+++ b/tests/auto/qgraphicsview/qgraphicsview.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 SOURCES  += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp
 DEFINES += QT_NO_CAST_TO_ASCII
 
-
+symbian:TARGET.EPOCHEAPSIZE = 1000000 10000000
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index 8056d745b0..b9f0260dea 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -2287,6 +2287,9 @@ void tst_QGraphicsView::viewportUpdateMode2()
 
 void tst_QGraphicsView::acceptDrops()
 {
+#ifdef QT_NO_DRAGANDDROP
+    QSKIP("Drag'n drop disabled in this build", SkipAll);
+#else
     QGraphicsView view;
 
     // Excepted default behavior.
@@ -2320,6 +2323,7 @@ void tst_QGraphicsView::acceptDrops()
     // Switching the view to not accept drops.
     view.setAcceptDrops(false);
     QVERIFY(!view.viewport()->acceptDrops());
+#endif
 }
 
 void tst_QGraphicsView::optimizationFlags()
diff --git a/tests/auto/qgroupbox/tst_qgroupbox.cpp b/tests/auto/qgroupbox/tst_qgroupbox.cpp
index 3b9485157d..4933debf37 100644
--- a/tests/auto/qgroupbox/tst_qgroupbox.cpp
+++ b/tests/auto/qgroupbox/tst_qgroupbox.cpp
@@ -119,8 +119,8 @@ void tst_QGroupBox::setCheckable_data()
 {
     QTest::addColumn<bool>("checkable");
     QTest::addColumn<bool>("expectedCheckable");
-    QTest::newRow( "checkable_true" ) << TRUE << TRUE;
-    QTest::newRow( "checkable_false" ) << FALSE << FALSE;
+    QTest::newRow( "checkable_true" ) << true << true;
+    QTest::newRow( "checkable_false" ) << false << false;
 }
 
 void tst_QGroupBox::setChecked_data()
@@ -128,9 +128,9 @@ void tst_QGroupBox::setChecked_data()
     QTest::addColumn<bool>("checkable");
     QTest::addColumn<bool>("checked");
     QTest::addColumn<bool>("expectedChecked");
-    QTest::newRow( "checkable_false_checked_true" ) << FALSE << TRUE << FALSE;
-    QTest::newRow( "checkable_true_checked_true" ) << TRUE << TRUE << TRUE;
-    QTest::newRow( "checkable_true_checked_false" ) << TRUE << FALSE << FALSE;
+    QTest::newRow( "checkable_false_checked_true" ) << false << true << false;
+    QTest::newRow( "checkable_true_checked_true" ) << true << true << true;
+    QTest::newRow( "checkable_true_checked_false" ) << true << false << false;
 }
 
 void tst_QGroupBox::setTitle()
@@ -173,116 +173,116 @@ void tst_QGroupBox::setChecked()
 void tst_QGroupBox::enabledPropagation()
 {
     QGroupBox *testWidget = new QGroupBox(0);
-    testWidget->setCheckable(TRUE);
-    testWidget->setChecked(TRUE);
+    testWidget->setCheckable(true);
+    testWidget->setChecked(true);
     QWidget* childWidget = new QWidget( testWidget );
     childWidget->show();
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( childWidget->isEnabled() );
 
-    testWidget->setEnabled( FALSE );
+    testWidget->setEnabled( false );
     QVERIFY( !testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
 
-    testWidget->setDisabled( FALSE );
+    testWidget->setDisabled( false );
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( childWidget->isEnabled() );
 
     QWidget* grandChildWidget = new QWidget( childWidget );
     QVERIFY( grandChildWidget->isEnabled() );
 
-    testWidget->setDisabled( TRUE );
+    testWidget->setDisabled( true );
     QVERIFY( !testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
     QVERIFY( !grandChildWidget->isEnabled() );
 
-    grandChildWidget->setEnabled( FALSE );
-    testWidget->setEnabled( TRUE );
+    grandChildWidget->setEnabled( false );
+    testWidget->setEnabled( true );
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( childWidget->isEnabled() );
     QVERIFY( !grandChildWidget->isEnabled() );
 
-    grandChildWidget->setEnabled( TRUE );
-    testWidget->setEnabled( FALSE );
-    childWidget->setDisabled( TRUE );
-    testWidget->setEnabled( TRUE );
+    grandChildWidget->setEnabled( true );
+    testWidget->setEnabled( false );
+    childWidget->setDisabled( true );
+    testWidget->setEnabled( true );
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
     QVERIFY( !grandChildWidget->isEnabled() );
 
     // Reset state
-    testWidget->setEnabled( TRUE );
-    childWidget->setEnabled( TRUE );
-    grandChildWidget->setEnabled( TRUE );
+    testWidget->setEnabled( true );
+    childWidget->setEnabled( true );
+    grandChildWidget->setEnabled( true );
 
     // Now check when it's disabled
-    testWidget->setChecked(FALSE);
+    testWidget->setChecked(false);
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
 
-    testWidget->setEnabled( FALSE );
+    testWidget->setEnabled( false );
     QVERIFY( !testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
 
-    testWidget->setDisabled( FALSE );
+    testWidget->setDisabled( false );
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
 
     QVERIFY( !grandChildWidget->isEnabled() );
 
-    testWidget->setDisabled( TRUE );
+    testWidget->setDisabled( true );
     QVERIFY( !testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
     QVERIFY( !grandChildWidget->isEnabled() );
 
-    grandChildWidget->setEnabled( FALSE );
-    testWidget->setEnabled( TRUE );
+    grandChildWidget->setEnabled( false );
+    testWidget->setEnabled( true );
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
     QVERIFY( !grandChildWidget->isEnabled() );
 
-    grandChildWidget->setEnabled( TRUE );
-    testWidget->setEnabled( FALSE );
-    childWidget->setDisabled( TRUE );
-    testWidget->setEnabled( TRUE );
+    grandChildWidget->setEnabled( true );
+    testWidget->setEnabled( false );
+    childWidget->setDisabled( true );
+    testWidget->setEnabled( true );
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
     QVERIFY( !grandChildWidget->isEnabled() );
 
     // Reset state
-    testWidget->setEnabled( TRUE );
-    childWidget->setEnabled( TRUE );
-    grandChildWidget->setEnabled( TRUE );
+    testWidget->setEnabled( true );
+    childWidget->setEnabled( true );
+    grandChildWidget->setEnabled( true );
 
     // Finally enable it again
-    testWidget->setChecked(TRUE);
+    testWidget->setChecked(true);
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( childWidget->isEnabled() );
 
-    testWidget->setEnabled( FALSE );
+    testWidget->setEnabled( false );
     QVERIFY( !testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
 
-    testWidget->setDisabled( FALSE );
+    testWidget->setDisabled( false );
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( childWidget->isEnabled() );
     QVERIFY( grandChildWidget->isEnabled() );
 
-    testWidget->setDisabled( TRUE );
+    testWidget->setDisabled( true );
     QVERIFY( !testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
     QVERIFY( !grandChildWidget->isEnabled() );
 
-    grandChildWidget->setEnabled( FALSE );
-    testWidget->setEnabled( TRUE );
+    grandChildWidget->setEnabled( false );
+    testWidget->setEnabled( true );
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( childWidget->isEnabled() );
     QVERIFY( !grandChildWidget->isEnabled() );
 
-    grandChildWidget->setEnabled( TRUE );
-    testWidget->setEnabled( FALSE );
-    childWidget->setDisabled( TRUE );
-    testWidget->setEnabled( TRUE );
+    grandChildWidget->setEnabled( true );
+    testWidget->setEnabled( false );
+    childWidget->setDisabled( true );
+    testWidget->setEnabled( true );
     QVERIFY( testWidget->isEnabled() );
     QVERIFY( !childWidget->isEnabled() );
     QVERIFY( !grandChildWidget->isEnabled() );
diff --git a/tests/auto/qhash/qhash.pro b/tests/auto/qhash/qhash.pro
index 1c60fc20d8..6fedb824f7 100644
--- a/tests/auto/qhash/qhash.pro
+++ b/tests/auto/qhash/qhash.pro
@@ -1,7 +1,8 @@
 load(qttest_p4)
 SOURCES  += tst_qhash.cpp
-
-
 QT = core
 
-
+symbian*: {
+TARGET.EPOCSTACKSIZE =0x5000
+TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
+}
diff --git a/tests/auto/qhash/tst_qhash.cpp b/tests/auto/qhash/tst_qhash.cpp
index 90d05a0b90..2090fbe388 100644
--- a/tests/auto/qhash/tst_qhash.cpp
+++ b/tests/auto/qhash/tst_qhash.cpp
@@ -692,7 +692,7 @@ void tst_QHash::operator_eq()
 
         QVERIFY(a == b);
         QVERIFY(!(a != b));
-        
+
         a.insert(1,1);
         b.insert(1,1);
         QVERIFY(a == b);
@@ -714,7 +714,7 @@ void tst_QHash::operator_eq()
 
         b.insert(-1, -1);
         QVERIFY(a != b);
-        QVERIFY(!(a == b));                
+        QVERIFY(!(a == b));
     }
 
     {
@@ -760,7 +760,7 @@ void tst_QHash::operator_eq()
         b.insert("willy", 1);
         QVERIFY(a != b);
         QVERIFY(!(a == b));
-    }   
+    }
 }
 
 void tst_QHash::compare()
@@ -974,7 +974,7 @@ void tst_QHash::rehash_isnt_quadratic()
     // this test should be incredibly slow if rehash() is quadratic
     for (int j = 0; j < 5; ++j) {
         QHash<int, int> testHash;
-#if defined(Q_OS_WINCE)
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) // mobiles do not have infinite mem...
         for (int i = 0; i < 50000; ++i)
 #else
         for (int i = 0; i < 500000; ++i)
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp
index c3d7c2d35e..50d2325f37 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp
@@ -87,10 +87,11 @@
 # endif
 #endif
 
+#include "../network-settings.h"
+
 //TESTED_CLASS=
 //TESTED_FILES=
 
-const char * const lupinellaIp = "10.3.4.6";
 
 class tst_QHostInfo : public QObject
 {
@@ -160,10 +161,11 @@ void tst_QHostInfo::staticInformation()
 
 tst_QHostInfo::tst_QHostInfo()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QHostInfo::~tst_QHostInfo()
-{
+{ 
 }
 
 void tst_QHostInfo::initTestCase()
@@ -212,14 +214,21 @@ void tst_QHostInfo::lookupIPv4_data()
     QTest::addColumn<QString>("addresses");
     QTest::addColumn<int>("err");
 
+#ifdef Q_OS_SYMBIAN
+    // Test server lookup
+    QTest::newRow("lookup_01") << QtNetworkSettings::serverName() << QtNetworkSettings::serverIP() << int(QHostInfo::NoError);
+    QTest::newRow("literal_ip4") << QtNetworkSettings::serverIP() << QtNetworkSettings::serverIP() << int(QHostInfo::NoError);
+    QTest::newRow("multiple_ip4") << "multi.dev.troll.no" << "1.2.3.4 1.2.3.5 10.3.3.31" << int(QHostInfo::NoError);
+#else
     QTest::newRow("empty") << "" << "" << int(QHostInfo::HostNotFound);
 
     QTest::newRow("lupinella_00") << "l" << lupinellaIp << int(QHostInfo::NoError);
-    QTest::newRow("lupinella_01") << "lupinella" << lupinellaIp << int(QHostInfo::NoError);
+    QTest::newRow("lupinella_01") << "lupinella" << lupinellaIp << int(QHostInfo::NoError);       
     QTest::newRow("lupinella_02") << "lupinella.troll.no" << lupinellaIp << int(QHostInfo::NoError);
     QTest::newRow("lupinella_03") << "lupinella.trolltech.com" << lupinellaIp << int(QHostInfo::NoError);
     QTest::newRow("multiple_ip4") << "multi.dev.troll.no" << "1.2.3.4 1.2.3.5 10.3.3.31" << int(QHostInfo::NoError);
     QTest::newRow("literal_ip4") << lupinellaIp << lupinellaIp << int(QHostInfo::NoError);
+#endif
     QTest::newRow("notfound") << "this-name-does-not-exist-hopefully." << "" << int(QHostInfo::HostNotFound);
 
     QTest::newRow("idn-ace") << "xn--alqualond-34a.troll.no" << "10.3.3.55" << int(QHostInfo::NoError);
@@ -383,10 +392,10 @@ protected:
 void tst_QHostInfo::threadSafety()
 {
     const int nattempts = 5;
-#if !defined(Q_OS_WINCE)
-    const int runs = 100;
-#else
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) 
     const int runs = 10;
+#else
+    const int runs = 100;
 #endif
     LookupThread thr[nattempts];
     for (int j = 0; j < runs; ++j) {
diff --git a/tests/auto/qhttp/qhttp.pro b/tests/auto/qhttp/qhttp.pro
index 9c2f5cb1b7..8678a19652 100644
--- a/tests/auto/qhttp/qhttp.pro
+++ b/tests/auto/qhttp/qhttp.pro
@@ -13,6 +13,14 @@ wince*: {
     addFiles.path = .
     DEPLOYMENT = addFiles webFiles cgi
     DEFINES += SRCDIR=\\\"\\\"
+} else:symbian* {
+    webFiles.sources = webserver/*
+    webFiles.path = webserver
+    cgi.sources = webserver/cgi-bin/*
+    cgi.path = webserver/cgi-bin
+    addFiles.sources = rfc3252.txt trolltech
+    addFiles.path = .
+    DEPLOYMENT = addFiles webFiles cgi
 } else:vxworks*: {
     DEFINES += SRCDIR=\\\"\\\"
 } else {
diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp
index 9e9db286d3..a6bec39ed4 100644
--- a/tests/auto/qhttp/tst_qhttp.cpp
+++ b/tests/auto/qhttp/tst_qhttp.cpp
@@ -57,11 +57,20 @@
 # include <qsslsocket.h>
 #endif
 
+#ifndef TEST_QNETWORK_PROXY
+#define TEST_QNETWORK_PROXY
+#endif
 #include "../network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// And underlying Open C have application private dir in default search path
+#define SRCDIR ""
+#endif
+
 Q_DECLARE_METATYPE(QHttpResponseHeader)
 
 class tst_QHttp : public QObject
@@ -140,9 +149,9 @@ private:
 
     struct RequestResult
     {
-	QHttpRequestHeader req;
-	QHttpResponseHeader resp;
-	int success;
+    QHttpRequestHeader req;
+    QHttpResponseHeader resp;
+    int success;
     };
     QMap< int, RequestResult > resultMap;
     typedef QMap<int,RequestResult>::Iterator ResMapIt;
@@ -176,6 +185,7 @@ const int bytesDone_init = -10;
 
 tst_QHttp::tst_QHttp()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QHttp::~tst_QHttp()
@@ -188,7 +198,9 @@ void tst_QHttp::initTestCase_data()
     QTest::addColumn<int>("proxyType");
 
     QTest::newRow("WithoutProxy") << false << 0;
+#ifdef TEST_QNETWORK_PROXY        
     QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy);
+#endif        
 }
 
 void tst_QHttp::initTestCase()
@@ -317,7 +329,7 @@ void tst_QHttp::get_data()
 	QTest::newRow( QString("failprot_02_%1").arg(i).toLatin1() ) << QtNetworkSettings::serverName() << 80u
 	    << QString("qtest/rfc3252.txt") << 1 << 400 << QByteArray() << (bool)(i==1);
 
-  // doc.trolltech.com uses transfer-encoding=chunked
+   //doc.trolltech.com uses transfer-encoding=chunked
     /* doc.trolltech.com no longer seams to be using chuncked encodig.
     QTest::newRow( QString("chunked_01_%1").arg(i).toLatin1() ) << QString("test.troll.no") << 80u
 	    << QString("/") << 1 << 200 << trolltech << (bool)(i==1);
@@ -344,47 +356,47 @@ void tst_QHttp::get()
 
     addRequest( QHttpRequestHeader(), http->setHost( host, port ) );
     if ( useIODevice ) {
-	buf.open( QIODevice::WriteOnly );
-	getId = http->get( path, &buf );
+    buf.open( QIODevice::WriteOnly );
+    getId = http->get( path, &buf );
     } else {
-	getId = http->get( path );
+    getId = http->get( path );
     }
     addRequest( QHttpRequestHeader(), getId );
 
     QTestEventLoop::instance().enterLoop( 30 );
 
     if ( QTestEventLoop::instance().timeout() )
-	QFAIL( "Network operation timed out" );
+    QFAIL( "Network operation timed out" );
 
     ResMapIt res = resultMap.find( getId );
     QVERIFY( res != resultMap.end() );
     if ( res.value().success!=1 && host=="www.ietf.org" ) {
-	// The nightly tests fail from time to time. In order to make them more
-	// stable, add some debug output that might help locate the problem (I
-	// can't reproduce the problem in the non-nightly builds).
-	qDebug( "Error %d: %s", http->error(), http->errorString().toLatin1().constData() );
+    // The nightly tests fail from time to time. In order to make them more
+    // stable, add some debug output that might help locate the problem (I
+    // can't reproduce the problem in the non-nightly builds).
+    qDebug( "Error %d: %s", http->error(), http->errorString().toLatin1().constData() );
     }
     QTEST( res.value().success, "success" );
     if ( res.value().success ) {
-	QTEST( res.value().resp.statusCode(), "statusCode" );
-
-	QFETCH( QByteArray, res );
-	if ( res.count() > 0 ) {
-	    if ( useIODevice ) {
-		QCOMPARE(buf_ba, res);
-		if ( bytesDoneRead != bytesDone_init )
-		    QVERIFY( (int)buf_ba.size() == bytesDoneRead );
-	    } else {
-		QCOMPARE(readyRead_ba, res);
-		if ( bytesDoneRead != bytesDone_init )
-		    QVERIFY( (int)readyRead_ba.size() == bytesDoneRead );
-	    }
-	}
-	QVERIFY( bytesTotalRead != bytesTotal_init );
-	if ( bytesTotalRead > 0 )
-	    QVERIFY( bytesDoneRead == bytesTotalRead );
+    QTEST( res.value().resp.statusCode(), "statusCode" );
+
+    QFETCH( QByteArray, res );
+    if ( res.count() > 0 ) {
+        if ( useIODevice ) {
+        QCOMPARE(buf_ba, res);
+        if ( bytesDoneRead != bytesDone_init )
+            QVERIFY( (int)buf_ba.size() == bytesDoneRead );
+        } else {
+        QCOMPARE(readyRead_ba, res);
+        if ( bytesDoneRead != bytesDone_init )
+            QVERIFY( (int)readyRead_ba.size() == bytesDoneRead );
+        }
+    }
+    QVERIFY( bytesTotalRead != bytesTotal_init );
+    if ( bytesTotalRead > 0 )
+        QVERIFY( bytesDoneRead == bytesTotalRead );
     } else {
-	QVERIFY( !res.value().resp.isValid() );
+    QVERIFY( !res.value().resp.isValid() );
     }
 }
 
@@ -399,19 +411,22 @@ void tst_QHttp::head_data()
 
     QTest::newRow( "path_01" ) << QtNetworkSettings::serverName() << 80u
 	<< QString("/qtest/rfc3252.txt") << 1 << 200 << 25962u;
+
     QTest::newRow( "path_02" ) << QString("www.ietf.org") << 80u
 	<< QString("/rfc/rfc3252.txt") << 1 << 200 << 25962u;
 
     QTest::newRow( "uri_01" ) << QtNetworkSettings::serverName() << 80u
 	<< QString("http://" + QtNetworkSettings::serverName() + "/qtest/rfc3252.txt") << 1 << 200 << 25962u;
+
     QTest::newRow( "uri_02" ) << QString("www.ietf.org") << 80u
-	<< QString("http://www.ietf.org/rfc/rfc3252.txt") << 1 << 200 << 25962u;
+    << QString("http://www.ietf.org/rfc/rfc3252.txt") << 1 << 200 << 25962u;
 
     QTest::newRow( "fail_01" ) << QString("this-host-will-not-exist.") << 80u
-	<< QString("/qtest/rfc3252.txt") << 0 << 0 << 0u;
+    << QString("/qtest/rfc3252.txt") << 0 << 0 << 0u;
 
     QTest::newRow( "failprot_01" ) << QtNetworkSettings::serverName() << 80u
 	<< QString("/t") << 1 << 404 << 0u;
+	
     QTest::newRow( "failprot_02" ) << QtNetworkSettings::serverName() << 80u
 	<< QString("qtest/rfc3252.txt") << 1 << 400 << 0u;
 
@@ -464,7 +479,7 @@ void tst_QHttp::head()
 
 void tst_QHttp::post_data()
 {
-    QTest::addColumn<QString>("source");
+	QTest::addColumn<QString>("source");
     QTest::addColumn<bool>("useIODevice");
     QTest::addColumn<bool>("useProxy");
     QTest::addColumn<QString>("host");
@@ -505,7 +520,7 @@ void tst_QHttp::post_data()
 
 void tst_QHttp::post()
 {
-    QFETCH(QString, source);
+	QFETCH(QString, source);
     QFETCH(bool, useIODevice);
     QFETCH(bool, useProxy);
     QFETCH(QString, host);
@@ -543,7 +558,7 @@ void tst_QHttp::post()
     QTestEventLoop::instance().enterLoop( 30 );
 
     if ( QTestEventLoop::instance().timeout() )
-	QFAIL( "Network operation timed out" );
+    QFAIL( "Network operation timed out" );
 
     ResMapIt res = resultMap.find(postId);
     QVERIFY(res != resultMap.end());
@@ -602,7 +617,6 @@ void tst_QHttp::request_data()
     QTest::newRow("proxy-post-data") << "rfc3252.txt" << false << true
                                      << QtNetworkSettings::serverName() << 80 << "POST" << "/qtest/cgi-bin/md5sum.cgi"
                                      << md5sum;
-
     // the following test won't work. See task 185996
 /*
     QTest::newRow("proxy-post-device") << "rfc3252.txt" << true << true
@@ -667,7 +681,7 @@ void tst_QHttp::request()
     QTestEventLoop::instance().enterLoop( 30 );
 
     if ( QTestEventLoop::instance().timeout() )
-	QFAIL( "Network operation timed out" );
+    QFAIL( "Network operation timed out" );
 
     ResMapIt res = resultMap.find(*theId);
     QVERIFY(res != resultMap.end());
@@ -777,7 +791,7 @@ void tst_QHttp::proxy()
 
     QTestEventLoop::instance().enterLoop(30);
     if (QTestEventLoop::instance().timeout())
-	QFAIL("Network operation timed out");
+    QFAIL("Network operation timed out");
 
     ResMapIt res = resultMap.find(getId);
     QVERIFY(res != resultMap.end());
@@ -847,17 +861,17 @@ void tst_QHttp::proxy3()
 // test QHttp::currentId() and QHttp::currentRequest()
 #define CURRENTREQUEST_TEST \
     { \
-	ResMapIt res = resultMap.find( http->currentId() ); \
-	QVERIFY( res != resultMap.end() ); \
-	if ( http->currentId() == getId ) { \
-	    QCOMPARE( http->currentRequest().method(), QString("GET") ); \
-	} else if ( http->currentId() == headId ) { \
-	    QCOMPARE( http->currentRequest().method(), QString("HEAD") ); \
+    ResMapIt res = resultMap.find( http->currentId() ); \
+    QVERIFY( res != resultMap.end() ); \
+    if ( http->currentId() == getId ) { \
+        QCOMPARE( http->currentRequest().method(), QString("GET") ); \
+    } else if ( http->currentId() == headId ) { \
+        QCOMPARE( http->currentRequest().method(), QString("HEAD") ); \
         } else if ( http->currentId() == postId ) { \
             QCOMPARE( http->currentRequest().method(), QString("POST") ); \
-	} else { \
-	    QVERIFY( headerAreEqual( http->currentRequest(), res.value().req ) ); \
-	} \
+    } else { \
+        QVERIFY( headerAreEqual( http->currentRequest(), res.value().req ) ); \
+    } \
     }
 
 void tst_QHttp::requestStarted( int id )
@@ -872,9 +886,9 @@ void tst_QHttp::requestStarted( int id )
     QVERIFY( !ids.isEmpty() );
     QVERIFY( ids.first() == id );
     if ( ids.count() > 1 ) {
-	QVERIFY( http->hasPendingRequests() );
+    QVERIFY( http->hasPendingRequests() );
     } else {
-	QVERIFY( !http->hasPendingRequests() );
+    QVERIFY( !http->hasPendingRequests() );
     }
 
     QVERIFY( http->currentId() == id );
@@ -892,7 +906,7 @@ void tst_QHttp::requestFinished( int id, bool error )
 {
 #if defined( DUMP_SIGNALS )
     qDebug( "%d:requestFinished( %d, %d ) -- errorString: '%s'",
-	    http->currentId(), id, (int)error, http->errorString().latin1() );
+        http->currentId(), id, (int)error, http->errorString().toAscii().data() );
 #endif
     // make sure that the requestStarted and requestFinished are nested correctly
     QVERIFY( current_id == id );
@@ -901,17 +915,17 @@ void tst_QHttp::requestFinished( int id, bool error )
     QVERIFY( !ids.isEmpty() );
     QVERIFY( ids.first() == id );
     if ( ids.count() > 1 ) {
-	QVERIFY( http->hasPendingRequests() );
+    QVERIFY( http->hasPendingRequests() );
     } else {
-	QVERIFY( !http->hasPendingRequests() );
+    QVERIFY( !http->hasPendingRequests() );
     }
 
     if ( error ) {
-	QVERIFY( http->error() != QHttp::NoError );
-	ids.clear();
+    QVERIFY( http->error() != QHttp::NoError );
+    ids.clear();
     } else {
-	QVERIFY( http->error() == QHttp::NoError );
-	ids.pop_front();
+    QVERIFY( http->error() == QHttp::NoError );
+    ids.pop_front();
     }
 
     QVERIFY( http->currentId() == id );
@@ -922,9 +936,9 @@ void tst_QHttp::requestFinished( int id, bool error )
     QVERIFY( res != resultMap.end() );
     QVERIFY( res.value().success == -1 );
     if ( error )
-	res.value().success = 0;
+    res.value().success = 0;
     else
-	res.value().success = 1;
+    res.value().success = 1;
 }
 
 void tst_QHttp::done( bool error )
@@ -940,11 +954,11 @@ void tst_QHttp::done( bool error )
 
     QVERIFY( done_success == -1 );
     if ( error ) {
-	QVERIFY( http->error() != QHttp::NoError );
-	done_success = 0;
+    QVERIFY( http->error() != QHttp::NoError );
+    done_success = 0;
     } else {
-	QVERIFY( http->error() == QHttp::NoError );
-	done_success = 1;
+    QVERIFY( http->error() == QHttp::NoError );
+    done_success = 1;
     }
     QTestEventLoop::instance().exitLoop();
 }
@@ -956,14 +970,14 @@ void tst_QHttp::stateChanged( int state )
 #endif
     QCOMPARE( http->currentId(), current_id );
     if ( ids.count() > 0 )
-	CURRENTREQUEST_TEST;
+    CURRENTREQUEST_TEST;
 
     QVERIFY( state != cur_state );
     QVERIFY( state == http->state() );
     if ( state != QHttp::Unconnected && !connectionWithAuth ) {
-	// make sure that the states are always emitted in the right order (for
-	// this, we assume an ordering on the enum values, which they have at
-	// the moment)
+    // make sure that the states are always emitted in the right order (for
+    // this, we assume an ordering on the enum values, which they have at
+    // the moment)
         // connections with authentication will possibly reconnect, so ignore them
         QVERIFY( cur_state < state );
     }
@@ -980,13 +994,13 @@ void tst_QHttp::stateChanged( int state )
 void tst_QHttp::responseHeaderReceived( const QHttpResponseHeader &header )
 {
 #if defined( DUMP_SIGNALS )
-    qDebug( "%d:  responseHeaderReceived(\n---{\n%s}---)", http->currentId(), header.toString().latin1() );
+    qDebug( "%d:  responseHeaderReceived(\n---{\n%s}---)", http->currentId(), header.toString().toAscii().data() );
 #endif
     QCOMPARE( http->currentId(), current_id );
     if ( ids.count() > 1 ) {
-	QVERIFY( http->hasPendingRequests() );
+    QVERIFY( http->hasPendingRequests() );
     } else {
-	QVERIFY( !http->hasPendingRequests() );
+    QVERIFY( !http->hasPendingRequests() );
     }
     CURRENTREQUEST_TEST;
 
@@ -1000,25 +1014,25 @@ void tst_QHttp::readyRead( const QHttpResponseHeader & )
 #endif
     QCOMPARE( http->currentId(), current_id );
     if ( ids.count() > 1 ) {
-	QVERIFY( http->hasPendingRequests() );
+    QVERIFY( http->hasPendingRequests() );
     } else {
-	QVERIFY( !http->hasPendingRequests() );
+    QVERIFY( !http->hasPendingRequests() );
     }
     QVERIFY( cur_state == http->state() );
     CURRENTREQUEST_TEST;
 
     if ( QTest::currentTestFunction() != QLatin1String("bytesAvailable") ) {
-	int oldSize = readyRead_ba.size();
-	quint64 bytesAvail = http->bytesAvailable();
-	QByteArray ba = http->readAll();
-	QVERIFY( (quint64) ba.size() == bytesAvail );
-	readyRead_ba.resize( oldSize + ba.size() );
-	memcpy( readyRead_ba.data()+oldSize, ba.data(), ba.size() );
-
-	if ( bytesTotalRead > 0 ) {
-	    QVERIFY( (int)readyRead_ba.size() <= bytesTotalRead );
-	}
-	QVERIFY( (int)readyRead_ba.size() == bytesDoneRead );
+    int oldSize = readyRead_ba.size();
+    quint64 bytesAvail = http->bytesAvailable();
+    QByteArray ba = http->readAll();
+    QVERIFY( (quint64) ba.size() == bytesAvail );
+    readyRead_ba.resize( oldSize + ba.size() );
+    memcpy( readyRead_ba.data()+oldSize, ba.data(), ba.size() );
+
+    if ( bytesTotalRead > 0 ) {
+        QVERIFY( (int)readyRead_ba.size() <= bytesTotalRead );
+    }
+    QVERIFY( (int)readyRead_ba.size() == bytesDoneRead );
     }
 }
 
@@ -1029,38 +1043,38 @@ void tst_QHttp::dataSendProgress( int done, int total )
 #endif
     QCOMPARE( http->currentId(), current_id );
     if ( ids.count() > 1 ) {
-	QVERIFY( http->hasPendingRequests() );
+    QVERIFY( http->hasPendingRequests() );
     } else {
-	QVERIFY( !http->hasPendingRequests() );
+    QVERIFY( !http->hasPendingRequests() );
     }
     QVERIFY( cur_state == http->state() );
     CURRENTREQUEST_TEST;
 
     if ( bytesTotalSend == bytesTotal_init ) {
-	bytesTotalSend = total;
+    bytesTotalSend = total;
     } else {
-	QCOMPARE( bytesTotalSend, total );
+    QCOMPARE( bytesTotalSend, total );
     }
 
     QVERIFY( bytesTotalSend != bytesTotal_init );
     QVERIFY( bytesDoneSend <= done );
     bytesDoneSend = done;
     if ( bytesTotalSend > 0 ) {
-	QVERIFY( bytesDoneSend <= bytesTotalSend );
+    QVERIFY( bytesDoneSend <= bytesTotalSend );
     }
 
     if ( QTest::currentTestFunction() == QLatin1String("abort") ) {
-	// ### it would be nice if we could specify in our testdata when to do
-	// the abort
-	if ( done >= total/100000 ) {
-	    if ( ids.count() != 1 ) {
-		// do abort only once
-		int tmpId = ids.first();
-		ids.clear();
-		ids << tmpId;
-		http->abort();
-	    }
-	}
+    // ### it would be nice if we could specify in our testdata when to do
+    // the abort
+    if ( done >= total/100000 ) {
+        if ( ids.count() != 1 ) {
+        // do abort only once
+        int tmpId = ids.first();
+        ids.clear();
+        ids << tmpId;
+        http->abort();
+        }
+    }
     }
 }
 
@@ -1071,38 +1085,38 @@ void tst_QHttp::dataReadProgress( int done, int total )
 #endif
     QCOMPARE( http->currentId(), current_id );
     if ( ids.count() > 1 ) {
-	QVERIFY( http->hasPendingRequests() );
+    QVERIFY( http->hasPendingRequests() );
     } else {
-	QVERIFY( !http->hasPendingRequests() );
+    QVERIFY( !http->hasPendingRequests() );
     }
     QVERIFY( cur_state == http->state() );
     CURRENTREQUEST_TEST;
 
     if ( bytesTotalRead == bytesTotal_init )
-	bytesTotalRead = total;
+    bytesTotalRead = total;
     else {
-	QVERIFY( bytesTotalRead == total );
+    QVERIFY( bytesTotalRead == total );
     }
 
     QVERIFY( bytesTotalRead != bytesTotal_init );
     QVERIFY( bytesDoneRead <= done );
     bytesDoneRead = done;
     if ( bytesTotalRead > 0 ) {
-	QVERIFY( bytesDoneRead <= bytesTotalRead );
+    QVERIFY( bytesDoneRead <= bytesTotalRead );
     }
 
     if ( QTest::currentTestFunction() == QLatin1String("abort") ) {
-	// ### it would be nice if we could specify in our testdata when to do
-	// the abort
-	if ( done >= total/100000 ) {
-	    if ( ids.count() != 1 ) {
-		// do abort only once
-		int tmpId = ids.first();
-		ids.clear();
-		ids << tmpId;
-		http->abort();
-	    }
-	}
+    // ### it would be nice if we could specify in our testdata when to do
+    // the abort
+    if ( done >= total/100000 ) {
+        if ( ids.count() != 1 ) {
+        // do abort only once
+        int tmpId = ids.first();
+        ids.clear();
+        ids << tmpId;
+        http->abort();
+        }
+    }
     }
 }
 
@@ -1111,21 +1125,21 @@ QHttp *tst_QHttp::newHttp(bool withAuth)
 {
     QHttp *nHttp = new QHttp( 0 );
     connect( nHttp, SIGNAL(requestStarted(int)),
-	    SLOT(requestStarted(int)) );
+        SLOT(requestStarted(int)) );
     connect( nHttp, SIGNAL(requestFinished(int,bool)),
-	    SLOT(requestFinished(int,bool)) );
+        SLOT(requestFinished(int,bool)) );
     connect( nHttp, SIGNAL(done(bool)),
-	    SLOT(done(bool)) );
+        SLOT(done(bool)) );
     connect( nHttp, SIGNAL(stateChanged(int)),
-	    SLOT(stateChanged(int)) );
+        SLOT(stateChanged(int)) );
     connect( nHttp, SIGNAL(responseHeaderReceived(const QHttpResponseHeader&)),
-	    SLOT(responseHeaderReceived(const QHttpResponseHeader&)) );
+        SLOT(responseHeaderReceived(const QHttpResponseHeader&)) );
     connect( nHttp, SIGNAL(readyRead(const QHttpResponseHeader&)),
-	    SLOT(readyRead(const QHttpResponseHeader&)) );
+        SLOT(readyRead(const QHttpResponseHeader&)) );
     connect( nHttp, SIGNAL(dataSendProgress(int,int)),
-	    SLOT(dataSendProgress(int,int)) );
+        SLOT(dataSendProgress(int,int)) );
     connect( nHttp, SIGNAL(dataReadProgress(int,int)),
-	    SLOT(dataReadProgress(int,int)) );
+        SLOT(dataReadProgress(int,int)) );
 
     connectionWithAuth = withAuth;
     return nHttp;
@@ -1143,9 +1157,9 @@ void tst_QHttp::addRequest( QHttpRequestHeader header, int id )
 bool tst_QHttp::headerAreEqual( const QHttpHeader &h1, const QHttpHeader &h2 )
 {
     if ( !h1.isValid() )
-	return !h2.isValid();
+    return !h2.isValid();
     if ( !h2.isValid() )
-	return !h1.isValid();
+    return !h1.isValid();
 
     return h1.toString() == h2.toString();
 }
@@ -1165,13 +1179,13 @@ void tst_QHttp::reconnect()
 
     QTestEventLoop::instance().enterLoop(60);
     if (QTestEventLoop::instance().timeout())
-	QFAIL("Network operation timed out");
+    QFAIL("Network operation timed out");
 
     QCOMPARE(reconnect_state_connect_count, 1);
 
     QTestEventLoop::instance().enterLoop(60);
     if (QTestEventLoop::instance().timeout())
-	QFAIL("Network operation timed out");
+    QFAIL("Network operation timed out");
 
     QCOMPARE(reconnect_state_connect_count, 2);
 }
@@ -1212,12 +1226,12 @@ private slots:
         socket->write("HTTP/1.1 404 Not found\r\n"
                       "content-length: 4\r\n\r\nabcd");
         socket->disconnectFromHost();
-    }
+    };
 };
 
 void tst_QHttp::unexpectedRemoteClose()
 {
-    QFETCH_GLOBAL(int, proxyType);
+	QFETCH_GLOBAL(int, proxyType);
     if (proxyType == QNetworkProxy::Socks5Proxy) {
         // This test doesn't make sense for SOCKS5
         return;
@@ -1228,7 +1242,11 @@ void tst_QHttp::unexpectedRemoteClose()
     QCoreApplication::instance()->processEvents();
 
     QEventLoop loop;
+#ifndef Q_OS_SYMBIAN    
     QTimer::singleShot(3000, &loop, SLOT(quit()));
+#else   
+    QTimer::singleShot(30000, &loop, SLOT(quit()));
+#endif   
 
     QHttp http;
     QObject::connect(&http, SIGNAL(done(bool)), &loop, SLOT(quit()));
@@ -1380,7 +1398,7 @@ void tst_QHttp::cachingProxyAndSsl()
 void tst_QHttp::emptyBodyInReply()
 {
     // Note: if this test starts failing, please verify the date on the file
-    // returned by Apache on http://fluke.troll.no/
+    // returned by Apache on http://netiks.troll.no/
     // It is right now hard-coded to the date below
     QHttp http;
     http.setHost(QtNetworkSettings::serverName());
@@ -1458,8 +1476,9 @@ void tst_QHttp::connectionClose()
     // Note: the servers might change too...
     //
     // This was added in response to bug 176822
+#ifndef Q_OS_SYMBIAN
     QSKIP("This test is manual - read comments in the source code", SkipAll);
-
+#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index aa0705de56..cea6229875 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -50,6 +50,10 @@
 class tst_QHttpNetworkConnection: public QObject
 {
     Q_OBJECT
+
+public:
+    tst_QHttpNetworkConnection();
+
 public Q_SLOTS:
     void finishedReply();
     void finishedWithError(QNetworkReply::NetworkError errorCode, const QString &detail);
@@ -101,6 +105,10 @@ private Q_SLOTS:
 
 };
 
+tst_QHttpNetworkConnection::tst_QHttpNetworkConnection()
+{
+    Q_SET_DEFAULT_IAP
+}
 
 void tst_QHttpNetworkConnection::initTestCase()
 {
@@ -200,8 +208,8 @@ void tst_QHttpNetworkConnection::get_data()
     QTest::newRow("success-internal") << "http://" << QtNetworkSettings::serverName() << "/qtest/rfc3252.txt" << ushort(80) << false << 200 << "OK" << 25962 << 25962;
     QTest::newRow("success-external") << "http://" << "www.ietf.org" << "/rfc/rfc3252.txt" << ushort(80) << false << 200 << "OK" << 25962 << 25962;
 
-    QTest::newRow("failure-path") << "http://" << QtNetworkSettings::serverName() << "/t" << ushort(80) << false << 404 << "Not Found" << -1 << 1023;
-    QTest::newRow("failure-protocol") << "" << QtNetworkSettings::serverName() << "/qtest/rfc3252.txt" << ushort(80) << false << 400 << "Bad Request" << -1 << 956;
+    QTest::newRow("failure-path") << "http://" << QtNetworkSettings::serverName() << "/t" << ushort(80) << false << 404 << "Not Found" << -1 << 997 + QtNetworkSettings::serverName().size();
+    QTest::newRow("failure-protocol") << "" << QtNetworkSettings::serverName() << "/qtest/rfc3252.txt" << ushort(80) << false << 400 << "Bad Request" << -1 << 930 + QtNetworkSettings::serverName().size();
 }
 
 void tst_QHttpNetworkConnection::get()
@@ -369,7 +377,7 @@ void tst_QHttpNetworkConnection::post_data()
     QTest::addColumn<int>("downloadSize");
 
     QTest::newRow("success-internal") << "http://" << QtNetworkSettings::serverName() << "/cgi-bin/echo.cgi" << ushort(80) << false << "7 bytes" << 200 << "OK" << 7 << 7;
-    QTest::newRow("failure-internal") << "http://" << QtNetworkSettings::serverName() << "/t" << ushort(80) << false << "Hello World" << 404 << "Not Found" << -1 << 1023;
+    QTest::newRow("failure-internal") << "http://" << QtNetworkSettings::serverName() << "/t" << ushort(80) << false << "Hello World" << 404 << "Not Found" << -1 << 997 + QtNetworkSettings::serverName().size();
 }
 
 void tst_QHttpNetworkConnection::post()
@@ -412,8 +420,17 @@ void tst_QHttpNetworkConnection::post()
 
     QCOMPARE(reply->statusCode(), statusCode);
     QCOMPARE(reply->reasonPhrase(), statusString);
-    QCOMPARE(reply->contentLength(), qint64(contentLength));
-
+    
+    qint64 cLen = reply->contentLength();
+    if (cLen==-1) {
+        // HTTP 1.1 server may respond with chunked encoding and in that 
+        // case contentLength is not present in reply -> verify that it is the case
+        QByteArray transferEnc = reply->headerField("Transfer-Encoding");
+        QCOMPARE(transferEnc, QByteArray("chunked"));
+    } else { 
+        QCOMPARE(cLen, qint64(contentLength));
+    }        
+    
     stopWatch.start();
     QByteArray ba;
     do {
@@ -426,6 +443,7 @@ void tst_QHttpNetworkConnection::post()
 
     QVERIFY(reply->isFinished());
     QCOMPARE(ba.size(), downloadSize);
+      
     delete reply;
 }
 
diff --git a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
index 687ec2efab..ce96a2c7ab 100644
--- a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
+++ b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
@@ -139,13 +139,14 @@ public slots:
 
 tst_QHttpSocketEngine::tst_QHttpSocketEngine()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QHttpSocketEngine::~tst_QHttpSocketEngine()
 {
-
 }
 
+
 void tst_QHttpSocketEngine::init()
 {
     tmpSocket = 0;
@@ -305,11 +306,11 @@ void tst_QHttpSocketEngine::simpleConnectToIMAP()
 
     socketDevice.setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, QtNetworkSettings::serverName(), 3128));
 
-    QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143));
+    QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143));
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
     QVERIFY(socketDevice.waitForWrite());
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
+    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
     QVERIFY(!socketDevice.localAddress().isNull());
     QVERIFY(socketDevice.localPort() > 0);
 
@@ -323,9 +324,9 @@ void tst_QHttpSocketEngine::simpleConnectToIMAP()
     array.resize(available);
     QVERIFY(socketDevice.read(array.data(), array.size()) == available);
 
-    // Check that the greeting is what we expect it to be
-    QCOMPARE(array.constData(),
-            "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+    // Check that the greeting is what we expect it to be  
+    QCOMPARE(array.constData(), QtNetworkSettings::expectedReplyIMAP().constData());            
+            
 
     // Write a logout message
     QByteArray array2 = "XXXX LOGOUT\r\n";
@@ -454,7 +455,7 @@ void tst_QHttpSocketEngine::tcpSocketBlockingTest()
     // Read greeting
     QVERIFY(socket.waitForReadyRead(5000));
     QString s = socket.readLine();
-    QCOMPARE(s.toLatin1().constData(), "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+    QCOMPARE(s.toLatin1().constData(), QtNetworkSettings::expectedReplyIMAP().constData());         
 
     // Write NOOP
     QCOMPARE((int) socket.write("1 NOOP\r\n", 8), 8);
@@ -527,9 +528,11 @@ void tst_QHttpSocketEngine::tcpSocketNonBlockingTest()
     }
 
     // Read greeting
-    QVERIFY(!tcpSocketNonBlocking_data.isEmpty());
-    QCOMPARE(tcpSocketNonBlocking_data.at(0).toLatin1().constData(),
-            "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+    QVERIFY(!tcpSocketNonBlocking_data.isEmpty()); 
+    QCOMPARE(tcpSocketNonBlocking_data.at(0).toLatin1().constData(), 
+            QtNetworkSettings::expectedReplyIMAP().constData());     
+                        
+            
     tcpSocketNonBlocking_data.clear();
 
     tcpSocketNonBlocking_totalWritten = 0;
@@ -648,7 +651,7 @@ void tst_QHttpSocketEngine::downloadBigFile()
     QTime stopWatch;
     stopWatch.start();
 
-#if defined(Q_OS_WINCE)
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QTestEventLoop::instance().enterLoop(240);
 #else
     QTestEventLoop::instance().enterLoop(60);
@@ -692,11 +695,11 @@ void tst_QHttpSocketEngine::passwordAuth()
 
     socketDevice.setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, QtNetworkSettings::serverName(), 3128, "qsockstest", "password"));
 
-    QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143));
+    QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143));
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
     QVERIFY(socketDevice.waitForWrite());
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
+    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
 
     // Wait for the greeting
     QVERIFY(socketDevice.waitForRead());
@@ -707,10 +710,10 @@ void tst_QHttpSocketEngine::passwordAuth()
     QByteArray array;
     array.resize(available);
     QVERIFY(socketDevice.read(array.data(), array.size()) == available);
-
+           
     // Check that the greeting is what we expect it to be
-    QCOMPARE(array.constData(),
-            "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+    QCOMPARE(array.constData(), QtNetworkSettings::expectedReplyIMAP().constData());     
+            
 
     // Write a logout message
     QByteArray array2 = "XXXX LOGOUT\r\n";
diff --git a/tests/auto/qicoimageformat/qicoimageformat.pro b/tests/auto/qicoimageformat/qicoimageformat.pro
index 19c13b70ca..df121b61d3 100644
--- a/tests/auto/qicoimageformat/qicoimageformat.pro
+++ b/tests/auto/qicoimageformat/qicoimageformat.pro
@@ -12,6 +12,13 @@ wince*: {
    }
    addPlugins.path = imageformats
    DEPLOYMENT += addFiles addPlugins
+} else:symbian* {
+   addFiles.sources = icons
+   addFiles.path = .
+   addPlugins.sources = qico.dll
+   addPlugins.path = imageformats
+   DEPLOYMENT += addFiles addPlugins
+   DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
diff --git a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp b/tests/auto/qicoimageformat/tst_qticoimageformat.cpp
index fbd3821373..62cb4feaad 100644
--- a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp
+++ b/tests/auto/qicoimageformat/tst_qticoimageformat.cpp
@@ -42,6 +42,12 @@
 #include <QtGui>
 #include <QtCore>
 
+#if defined(Q_OS_SYMBIAN)
+# define STRINGIFY(x) #x
+# define TOSTRING(x) STRINGIFY(x)
+# define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/"
+#endif
+
 class tst_QtIcoImageFormat : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qicon/qicon.pro b/tests/auto/qicon/qicon.pro
index c8d77e8571..982bc5a2d8 100644
--- a/tests/auto/qicon/qicon.pro
+++ b/tests/auto/qicon/qicon.pro
@@ -11,6 +11,13 @@ wince*:{
    DEPLOYMENT += addFiles
    DEPLOYMENT_PLUGIN += qsvg
    DEFINES += SRCDIR=\\\".\\\"
+} else:symbian* {
+   QT += xml svg
+   addFiles.sources =  *.png *.tga *.svg *.svgz
+   addFiles.path = .
+   plugins.sources = qsvgicon.dll
+   plugins.path = iconengines
+   DEPLOYMENT += addFiles plugins
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/qicon/tst_qicon.cpp
index a266c16462..5ca15013be 100644
--- a/tests/auto/qicon/tst_qicon.cpp
+++ b/tests/auto/qicon/tst_qicon.cpp
@@ -43,6 +43,10 @@
 #include <QtTest/QtTest>
 
 #include <qicon.h>
+
+#if defined(Q_OS_SYMBIAN)
+#define SRCDIR "."
+#endif
 #include <qiconengine.h>
 
 Q_DECLARE_METATYPE(QSize)
@@ -124,7 +128,6 @@ void tst_QIcon::actualSize_data()
     QTest::newRow("resource10") << ":/rect.png" << QSize( 25,  50) << QSize( 20,  40);
 
     const QString prefix = QLatin1String(SRCDIR) + QLatin1String("/");
-
     QTest::newRow("external0") << prefix + "image.png" << QSize(128, 128) << QSize(128, 128);
     QTest::newRow("external1") << prefix + "image.png" << QSize( 64,  64) << QSize( 64,  64);
     QTest::newRow("external2") << prefix + "image.png" << QSize( 32,  64) << QSize( 32,  32);
@@ -179,7 +182,6 @@ void tst_QIcon::actualSize2_data()
 void tst_QIcon::actualSize2()
 {
     QIcon icon;
-
     const QString prefix = QLatin1String(SRCDIR) + QLatin1String("/");
 
     icon.addPixmap(QPixmap(prefix + "image.png"));
@@ -238,7 +240,6 @@ void tst_QIcon::isNull() {
     QVERIFY(!iconNoFileSuffix.actualSize(QSize(32, 32)).isValid());
 
     const QString prefix = QLatin1String(SRCDIR) + QLatin1String("/");
-
     // test string constructor with existing file but unsupported format
     QIcon iconUnsupportedFormat = QIcon(prefix + "image.tga");
     QVERIFY(!iconUnsupportedFormat.isNull());
diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/qimage/qimage.pro
index f10a488590..69d6f0f414 100644
--- a/tests/auto/qimage/qimage.pro
+++ b/tests/auto/qimage/qimage.pro
@@ -6,6 +6,13 @@ wince*: {
    addImages.path = images
    DEPLOYMENT += addImages
    DEFINES += SRCDIR=\\\".\\\"
+} else:symbian* {
+   TARGET.EPOCHEAPSIZE = 0x200000 0x800000
+   addImages.sources = images/*
+   addImages.path = images
+   imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll qtiff.dll qico.dll
+   imagePlugins.path = imageformats
+   DEPLOYMENT += addImages imagePlugins
 } else {
    contains(QT_CONFIG, qt3support): QT += qt3support
    DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp
index 06c9a56463..af02bbf146 100644
--- a/tests/auto/qimage/tst_qimage.cpp
+++ b/tests/auto/qimage/tst_qimage.cpp
@@ -51,8 +51,12 @@
 #include <qpainter.h>
 #include <private/qdrawhelper_p.h>
 
+
 //TESTED_CLASS=
 //TESTED_FILES=
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#endif
 
 Q_DECLARE_METATYPE(QImage::Format)
 
@@ -262,8 +266,11 @@ void tst_QImage::formatHandlersInput_data()
 {
     QTest::addColumn<QString>("testFormat");
     QTest::addColumn<QString>("testFile");
-
+    #ifdef Q_OS_SYMBIAN
+    const QString prefix = QLatin1String(SRCDIR) + "images/";
+    #else
     const QString prefix = QLatin1String(SRCDIR) + "/images/";
+    #endif    
 
     // add a new line here when a file is added
     QTest::newRow("ICO") << "ICO" << prefix + "image.ico";
@@ -285,7 +292,6 @@ void tst_QImage::formatHandlersInput()
 {
     QFETCH(QString, testFormat);
     QFETCH(QString, testFile);
-
     QList<QByteArray> formats = QImageReader::supportedImageFormats();
    // qDebug("Image input formats : %s", formats.join(" | ").latin1());
 
@@ -297,7 +303,7 @@ void tst_QImage::formatHandlersInput()
 	}
     }
     if (formatSupported) {
-//	qDebug(QImage::imageFormat(testFile));
+//     qDebug(QImage::imageFormat(testFile));
 	QCOMPARE(testFormat.toLatin1().toLower(), QImageReader::imageFormat(testFile));
     } else {
 	QString msg = "Format not supported : ";
@@ -1469,10 +1475,12 @@ void tst_QImage::smoothScale3()
 
 void tst_QImage::smoothScaleBig()
 {
-#ifndef Q_OS_WINCE
-    int bigValue = 200000;
+#if defined(Q_OS_WINCE)
+    int bigValue = 2000;    
+#elif defined(Q_OS_SYMBIAN)
+    int bigValue = 2000;    
 #else
-    int bigValue = 2000;
+    int bigValue = 200000;
 #endif
     QImage tall(4, bigValue, QImage::Format_ARGB32);
     tall.fill(0x0);
diff --git a/tests/auto/qimagereader/qimagereader.pro b/tests/auto/qimagereader/qimagereader.pro
index 2c9510e637..44a0ddcb2e 100644
--- a/tests/auto/qimagereader/qimagereader.pro
+++ b/tests/auto/qimagereader/qimagereader.pro
@@ -26,3 +26,13 @@ wince*: {
     DEFINES += SRCDIR=\\\".\\\"
 }
 
+symbian*: {
+    images.sources = images
+    images.path = .
+
+    imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll
+    imagePlugins.path = imageformats
+
+    DEPLOYMENT += images imagePlugins
+}
+
diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp
index dee4a171ec..ea30b3c920 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/qimagereader/tst_qimagereader.cpp
@@ -790,7 +790,9 @@ void tst_QImageReader::readFromDevice()
 {
     QFETCH(QString, fileName);
     QFETCH(QByteArray, format);
-
+    #ifdef Q_OS_SYMBIAN
+    QSKIP("Symbian local sockets are not working", SkipAll);
+    #endif
     QImage expectedImage(prefix + fileName, format);
 
     QFile file(prefix + fileName);
diff --git a/tests/auto/qimagewriter/qimagewriter.pro b/tests/auto/qimagewriter/qimagewriter.pro
index e62c1a5917..5a2c9088bd 100644
--- a/tests/auto/qimagewriter/qimagewriter.pro
+++ b/tests/auto/qimagewriter/qimagewriter.pro
@@ -10,6 +10,12 @@ wince*: {
    addFiles.path = images
    DEPLOYMENT += addFiles
    DEFINES += SRCDIR=\\\".\\\"
+} else:symbian* {
+   addFiles.sources = images\*.*
+   addFiles.path = images
+   imagePlugins.sources = qjpeg.dll qtiff.dll
+   imagePlugins.path = imageformats
+   DEPLOYMENT += addFiles imagePlugins
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
\ No newline at end of file
+}
diff --git a/tests/auto/qimagewriter/tst_qimagewriter.cpp b/tests/auto/qimagewriter/tst_qimagewriter.cpp
index 0ebf06b459..f5b4e9154e 100644
--- a/tests/auto/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/qimagewriter/tst_qimagewriter.cpp
@@ -52,6 +52,9 @@
 #include <QPainter>
 #include <QSet>
 
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#endif
 typedef QMap<QString, QString> QStringMap;
 typedef QList<int> QIntList;
 Q_DECLARE_METATYPE(QImage)
@@ -106,9 +109,11 @@ private slots:
 
     void saveToTemporaryFile();
 };
-
+#ifdef Q_OS_SYMBIAN
+static const QLatin1String prefix(SRCDIR "images/");
+#else
 static const QLatin1String prefix(SRCDIR "/images/");
-
+#endif
 static void initializePadding(QImage *image)
 {
     int effectiveBytesPerLine = (image->width() * image->depth() + 7) / 8;
@@ -276,7 +281,7 @@ void tst_QImageWriter::writeImage2_data()
 #if defined QTEST_HAVE_TIFF
 void tst_QImageWriter::largeTiff()
 {
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QImage img(4096, 2048, QImage::Format_ARGB32);
 
     QPainter p(&img);
@@ -302,6 +307,8 @@ void tst_QImageWriter::largeTiff()
     QVERIFY(!img2.isNull());
 
     QCOMPARE(img, img2);
+#else
+    QWARN("not tested on Symbian/WinCE");
 #endif
 }
 #endif
diff --git a/tests/auto/qinputcontext/qinputcontext.pro b/tests/auto/qinputcontext/qinputcontext.pro
new file mode 100644
index 0000000000..b3ea8c276e
--- /dev/null
+++ b/tests/auto/qinputcontext/qinputcontext.pro
@@ -0,0 +1,2 @@
+load(qttest_p4)
+SOURCES  += tst_qinputcontext.cpp
diff --git a/tests/auto/qinputcontext/tst_qinputcontext.cpp b/tests/auto/qinputcontext/tst_qinputcontext.cpp
new file mode 100644
index 0000000000..67a6819408
--- /dev/null
+++ b/tests/auto/qinputcontext/tst_qinputcontext.cpp
@@ -0,0 +1,216 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include "../../shared/util.h"
+
+#include <qinputcontext.h>
+#include <qlineedit.h>
+#include <qplaintextedit.h>
+#include <qlayout.h>
+#include <qradiobutton.h>
+
+class tst_QInputContext : public QObject
+{
+Q_OBJECT
+
+public:
+    tst_QInputContext() {}
+    virtual ~tst_QInputContext() {}
+
+public slots:
+    void initTestCase() {}
+    void cleanupTestCase() {}
+    void init() {}
+    void cleanup() {}
+private slots:
+    void maximumTextLength();
+    void filterMouseEvents();
+    void requestSoftwareInputPanel();
+    void closeSoftwareInputPanel();
+    void selections();
+};
+
+void tst_QInputContext::maximumTextLength()
+{
+    QLineEdit le;
+
+    le.setMaxLength(15);
+    QVariant variant = le.inputMethodQuery(Qt::ImMaximumTextLength);
+    QVERIFY(variant.isValid());
+    QCOMPARE(variant.toInt(), 15);
+
+    QPlainTextEdit pte;
+    // For BC/historical reasons, QPlainTextEdit::inputMethodQuery is protected.
+    variant = static_cast<QWidget *>(&pte)->inputMethodQuery(Qt::ImMaximumTextLength);
+    QVERIFY(!variant.isValid());
+}
+
+class QFilterInputContext : public QInputContext
+{
+public:
+    QFilterInputContext() {}
+    ~QFilterInputContext() {}
+
+    QString identifierName() { return QString(); }
+    QString language() { return QString(); }
+
+    void reset() {}
+
+    bool isComposing() const { return false; }
+
+    bool filterEvent( const QEvent *event )
+    {
+        lastTypes.append(event->type());
+        return false;
+    }
+
+public:
+    QList<QEvent::Type> lastTypes;
+};
+
+void tst_QInputContext::filterMouseEvents()
+{
+    QLineEdit le;
+    le.show();
+    QApplication::setActiveWindow(&le);
+
+    QFilterInputContext *ic = new QFilterInputContext;
+    le.setInputContext(ic);
+    QTest::mouseClick(&le, Qt::LeftButton);
+
+    QVERIFY(ic->lastTypes.indexOf(QEvent::MouseButtonRelease) >= 0);
+
+    le.setInputContext(0);
+}
+
+void tst_QInputContext::requestSoftwareInputPanel()
+{
+    QWidget w;
+    QLayout *layout = new QVBoxLayout;
+    QLineEdit *le1, *le2;
+    le1 = new QLineEdit;
+    le2 = new QLineEdit;
+    layout->addWidget(le1);
+    layout->addWidget(le2);
+    w.setLayout(layout);
+
+    QFilterInputContext *ic1, *ic2;
+    ic1 = new QFilterInputContext;
+    ic2 = new QFilterInputContext;
+    le1->setInputContext(ic1);
+    le2->setInputContext(ic2);
+
+    w.show();
+    QApplication::setActiveWindow(&w);
+
+    // Testing single click panel activation.
+    qApp->setAutoSipOnMouseFocus(true);
+    QTest::mouseClick(le2, Qt::LeftButton, Qt::NoModifier, QPoint(5, 5));
+    QVERIFY(ic2->lastTypes.indexOf(QEvent::RequestSoftwareInputPanel) >= 0);
+    ic2->lastTypes.clear();
+
+    // Testing double click panel activation.
+    qApp->setAutoSipOnMouseFocus(false);
+    QTest::mouseClick(le1, Qt::LeftButton, Qt::NoModifier, QPoint(5, 5));
+    QVERIFY(ic1->lastTypes.indexOf(QEvent::RequestSoftwareInputPanel) < 0);
+    QTest::mouseClick(le1, Qt::LeftButton, Qt::NoModifier, QPoint(5, 5));
+    QVERIFY(ic1->lastTypes.indexOf(QEvent::RequestSoftwareInputPanel) >= 0);
+    ic1->lastTypes.clear();
+
+    // Testing right mouse button
+    QTest::mouseClick(le1, Qt::RightButton, Qt::NoModifier, QPoint(5, 5));
+    QVERIFY(ic1->lastTypes.indexOf(QEvent::RequestSoftwareInputPanel) < 0);
+}
+
+void tst_QInputContext::closeSoftwareInputPanel()
+{
+    QWidget w;
+    QLayout *layout = new QVBoxLayout;
+    QLineEdit *le1, *le2;
+    QRadioButton *rb;
+    le1 = new QLineEdit;
+    le2 = new QLineEdit;
+    rb = new QRadioButton;
+    layout->addWidget(le1);
+    layout->addWidget(le2);
+    layout->addWidget(rb);
+    w.setLayout(layout);
+
+    QFilterInputContext *ic1, *ic2;
+    ic1 = new QFilterInputContext;
+    ic2 = new QFilterInputContext;
+    le1->setInputContext(ic1);
+    le2->setInputContext(ic2);
+
+    w.show();
+    QApplication::setActiveWindow(&w);
+
+    // Testing that panel doesn't close between two input methods aware widgets.
+    QTest::mouseClick(le1, Qt::LeftButton, Qt::NoModifier, QPoint(5, 5));
+    QTest::mouseClick(le2, Qt::LeftButton, Qt::NoModifier, QPoint(5, 5));
+    QVERIFY(ic2->lastTypes.indexOf(QEvent::CloseSoftwareInputPanel) < 0);
+
+    // Testing that panel closes when focusing non-aware widget.
+    QTest::mouseClick(rb, Qt::LeftButton, Qt::NoModifier, QPoint(5, 5));
+    QVERIFY(ic2->lastTypes.indexOf(QEvent::CloseSoftwareInputPanel) >= 0);
+}
+
+void tst_QInputContext::selections()
+{
+    QLineEdit le;
+    le.setText("Test text");
+    le.setSelection(2, 2);
+    QCOMPARE(le.inputMethodQuery(Qt::ImCursorPosition).toInt(), 4);
+    QCOMPARE(le.inputMethodQuery(Qt::ImAnchorPosition).toInt(), 2);
+
+    QList<QInputMethodEvent::Attribute> attributes;
+    attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 5, 3, QVariant()));
+    QInputMethodEvent event("", attributes);
+    QApplication::sendEvent(&le, &event);
+    QCOMPARE(le.cursorPosition(), 8);
+    QCOMPARE(le.selectionStart(), 5);
+    QCOMPARE(le.inputMethodQuery(Qt::ImCursorPosition).toInt(), 8);
+    QCOMPARE(le.inputMethodQuery(Qt::ImAnchorPosition).toInt(), 5);
+}
+
+QTEST_MAIN(tst_QInputContext)
+#include "tst_qinputcontext.moc"
diff --git a/tests/auto/qiodevice/qiodevice.pro b/tests/auto/qiodevice/qiodevice.pro
index e2864e86bc..e695bf6843 100644
--- a/tests/auto/qiodevice/qiodevice.pro
+++ b/tests/auto/qiodevice/qiodevice.pro
@@ -9,6 +9,11 @@ wince*: {
    DEPLOYMENT += addFiles
    DEFINES += SRCDIR=\\\"\\\"
    !wince50standard-x86-msvc2005: DEFINES += WINCE_EMULATOR_TEST=1
+} else:symbian {
+   # SRCDIR defined in code in symbian
+   addFiles.sources = tst_qiodevice.cpp
+   addFiles.path = .
+   DEPLOYMENT += addFiles
 } else {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
    contains(QT_CONFIG, qt3support):QT += qt3support
diff --git a/tests/auto/qiodevice/tst_qiodevice.cpp b/tests/auto/qiodevice/tst_qiodevice.cpp
index f52fdaf4d4..8a76626f63 100644
--- a/tests/auto/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/qiodevice/tst_qiodevice.cpp
@@ -49,6 +49,10 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR ""
+#endif
+
 class tst_QIODevice : public QObject
 {
     Q_OBJECT
@@ -94,11 +98,11 @@ void tst_QIODevice::getSetCheck()
 
 tst_QIODevice::tst_QIODevice()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QIODevice::~tst_QIODevice()
 {
-
 }
 
 void tst_QIODevice::init()
@@ -120,7 +124,7 @@ void tst_QIODevice::constructing_QTcpSocket()
 
     QVERIFY(!device->isOpen());
 
-    socket.connectToHost(QtNetworkSettings::serverName(), 143);
+    socket.connectToHost(QtNetworkSettings::serverName(), 21);
     QVERIFY(socket.waitForConnected(5000));
     QVERIFY(device->isOpen());
 
@@ -136,6 +140,7 @@ void tst_QIODevice::constructing_QTcpSocket()
     socket.close();
     socket.connectToHost(QtNetworkSettings::serverName(), 143);
     QVERIFY(socket.waitForConnected(5000));
+    QVERIFY(device->isOpen());
 
     while (!device->canReadLine())
         QVERIFY(device->waitForReadyRead(5000));
diff --git a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
index 65dd86f591..f1adc510d2 100644
--- a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
@@ -1120,8 +1120,11 @@ void tst_QItemDelegate::enterKey()
 
     QTest::keyClick(editor, Qt::Key(key));
     QApplication::processEvents();
-
-    QCOMPARE(editor && editor->hasFocus(), expectedFocus);
+    
+    if (widget == 2 || widget == 3) {
+        QVERIFY(!editor.isNull());
+        QCOMPARE(editor && editor->hasFocus(), expectedFocus);
+    }
 }
 
 
diff --git a/tests/auto/qitemmodel/qitemmodel.pro b/tests/auto/qitemmodel/qitemmodel.pro
index 38c615b693..381a00831e 100644
--- a/tests/auto/qitemmodel/qitemmodel.pro
+++ b/tests/auto/qitemmodel/qitemmodel.pro
@@ -3,6 +3,8 @@ SOURCES         += tst_qitemmodel.cpp
 
 QT += sql
 
+symbian:TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
+
 # NOTE: The deployment of the sqldrivers is disabled on purpose.
 #       If we deploy the plugins, they are loaded twice when running
 #       the tests on the autotest system. In that case we run out of
diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/qitemview/tst_qitemview.cpp
index 73c08d1b6f..c9e6f4810f 100644
--- a/tests/auto/qitemview/tst_qitemview.cpp
+++ b/tests/auto/qitemview/tst_qitemview.cpp
@@ -256,7 +256,7 @@ void tst_QItemView::populate()
 {
     treeModel = new CheckerModel;
     QModelIndex parent;
-#ifdef QT_ARCH_ARM
+#if defined(QT_ARCH_ARM) || defined(Q_OS_SYMBIAN) 
     const int baseInsert = 4;
 #else
     const int baseInsert = 26;
@@ -354,18 +354,19 @@ void tst_QItemView::nonDestructiveBasicTest()
     QCOMPARE(view->tabKeyNavigation(), false);
     view->setTabKeyNavigation(true);
     QCOMPARE(view->tabKeyNavigation(), true);
-
+#ifndef QT_NO_DRAGANDDROP
     // setDropIndicatorShown
     view->setDropIndicatorShown(false);
     QCOMPARE(view->showDropIndicator(), false);
     view->setDropIndicatorShown(true);
     QCOMPARE(view->showDropIndicator(), true);
-
+    
     // setDragEnabled
     view->setDragEnabled(false);
     QCOMPARE(view->dragEnabled(), false);
     view->setDragEnabled(true);
     QCOMPARE(view->dragEnabled(), true);
+#endif
 
     // setAlternatingRowColors
     view->setAlternatingRowColors(false);
@@ -459,7 +460,7 @@ void tst_QItemView::spider()
     view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll);
     view->setModel(treeModel);
     view->show();
-#if defined(Q_OS_WINCE)
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     srandom(0);
 #else
     srandom(time(0));
diff --git a/tests/auto/qkeyevent/tst_qkeyevent.cpp b/tests/auto/qkeyevent/tst_qkeyevent.cpp
index 27b849e4b8..1e19a4943e 100644
--- a/tests/auto/qkeyevent/tst_qkeyevent.cpp
+++ b/tests/auto/qkeyevent/tst_qkeyevent.cpp
@@ -86,7 +86,7 @@ private:
 
 
 KeyEventWidget::KeyEventWidget( QWidget* parent, const char* name )
-    : QWidget( parent ), recievedKeyPress( FALSE ), recievedKeyRelease( FALSE ),
+    : QWidget( parent ), recievedKeyPress( false ), recievedKeyRelease( false ),
     lastKeyPress( 0 ), lastKeyRelease( 0 )
 {
     setObjectName(name);
@@ -94,6 +94,8 @@ KeyEventWidget::KeyEventWidget( QWidget* parent, const char* name )
 
 KeyEventWidget::~KeyEventWidget()
 {
+    delete lastKeyPress;
+    delete lastKeyRelease;
 }
 
 QKeyEvent* KeyEventWidget::getLastKeyPress()
@@ -108,14 +110,18 @@ QKeyEvent* KeyEventWidget::getLastKeyRelease()
 
 void KeyEventWidget::keyPressEvent( QKeyEvent* e )
 {
-    lastKeyPress = e;
-    recievedKeyPress = TRUE;
+    if (lastKeyPress)
+        delete lastKeyPress;
+    lastKeyPress = new QKeyEvent(*e);
+    recievedKeyPress = true;
 }
 
 void KeyEventWidget::keyReleaseEvent( QKeyEvent* e )
 {
-    lastKeyRelease = e;
-    recievedKeyRelease = TRUE;
+    if (lastKeyRelease)
+        delete lastKeyRelease;
+    lastKeyRelease = new QKeyEvent(*e);
+    recievedKeyRelease = true;
 }
 
 tst_QKeyEvent::tst_QKeyEvent()
@@ -151,13 +157,13 @@ void tst_QKeyEvent::sendRecieveKeyEvents_data()
 	    continue;
 	}
 	if ( a == Qt::Key_Backtab ) // Actually SHIFT+Tab
-	    QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << int(Qt::Key_Tab) << FALSE << "";
+	    QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << int(Qt::Key_Tab) << false << "";
 	else
-	    QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << a << FALSE << "";
+	    QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << a << false << "";
     }
 
     for ( a = Qt::Key_Space; a < Qt::Key_ydiaeresis; a++ ) {
-	QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << a << TRUE << QString( QChar(a) );
+	QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << a << true << QString( QChar(a) );
     }
 }
 
@@ -168,13 +174,12 @@ void tst_QKeyEvent::standardKey()
 
 void tst_QKeyEvent::sendRecieveKeyEvents()
 {
-    QSKIP( "Skipped while it is being worked on", SkipAll);
     QFETCH( int, key );
     QFETCH( bool, textExpected );
     QFETCH( QString, text );
-    testWidget->recievedKeyPress = FALSE;
+    testWidget->recievedKeyPress = false;
 
-#ifdef Q_WS_WIN
+#ifdef Q_WS_WIN 
     // Will be eaten by Windows system
     if ( key == Qt::Key_Print )
 	return;
@@ -203,7 +208,37 @@ void tst_QKeyEvent::sendRecieveKeyEvents()
     if ( key >= Qt::Key_BracketRight && key <= Qt::Key_ydiaeresis )
 	return;
 #endif // Q_WS_WIN
+    
+#ifdef Q_OS_SYMBIAN
+    // Not supported on symbian
+    if ( key == Qt::Key_Print )
+    return;
+
+    // Not supported on symbian
+    if ( key == Qt::Key_SysReq )
+    return;
+
+    // Not supported on symbian
+    if ( key >= Qt::Key_F25 && key <= Qt::Key_Super_R )
+    return;
+    if ( key >= Qt::Key_Hyper_L && key <= Qt::Key_Hyper_R )
+    return;
+    if ( key == Qt::Key_Help )
+    return;
 
+    // Not sure on how to add support for these yet
+    if ( key >= Qt::Key_Direction_L && key <= Qt::Key_Direction_R )
+    return;
+
+    // Not supported on symbian
+    if ( key >= Qt::Key_Exclam && key <= Qt::Key_Slash )
+    return;
+    if ( key >= Qt::Key_Colon && key <= Qt::Key_At )
+    return;
+    if ( key >= Qt::Key_BracketRight && key <= Qt::Key_ydiaeresis )
+    return;
+#endif // Q_WS_WIN
+    
     if ( key == Qt::Key_F1 )
 	return; // Ignore for the moment
 
@@ -214,7 +249,7 @@ void tst_QKeyEvent::sendRecieveKeyEvents()
     QCOMPARE( ke->key(), key );
     if ( textExpected )
         QCOMPARE( ke->text(), text );
-    testWidget->recievedKeyRelease = FALSE;
+    testWidget->recievedKeyRelease = false;
     QTest::keyRelease( testWidget, (Qt::Key)key );
     while ( !testWidget->recievedKeyRelease )
         qApp->processEvents();
diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/qkeysequence/tst_qkeysequence.cpp
index 2e4b85063e..d0dc5e259d 100644
--- a/tests/auto/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp
@@ -504,7 +504,7 @@ void tst_QKeySequence::translated()
     QFETCH(QString, compKey);
 #ifdef Q_WS_MAC
     QSKIP("No need to translate modifiers on Mac OS X", SkipAll);
-#elif defined(Q_OS_WINCE)
+#elif defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QSKIP("No need to translate modifiers on WinCE", SkipAll);
 #endif
 
diff --git a/tests/auto/qlabel/qlabel.pro b/tests/auto/qlabel/qlabel.pro
index 141559efd7..c274b4a44e 100644
--- a/tests/auto/qlabel/qlabel.pro
+++ b/tests/auto/qlabel/qlabel.pro
@@ -3,11 +3,14 @@ SOURCES  += tst_qlabel.cpp
 
 wince*:{
     DEFINES += SRCDIR=\\\"\\\"
+} !symbian {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
+}
+
+wince*|symbian {
     addFiles.sources = *.png testdata
     addFiles.path = .
     DEPLOYMENT += addFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
 
 
diff --git a/tests/auto/qlabel/tst_qlabel.cpp b/tests/auto/qlabel/tst_qlabel.cpp
index 3567a158c8..fb655c1aec 100644
--- a/tests/auto/qlabel/tst_qlabel.cpp
+++ b/tests/auto/qlabel/tst_qlabel.cpp
@@ -53,6 +53,9 @@
 
 //TESTED_CLASS=
 //TESTED_FILES=
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR "."
+#endif
 
 class Widget : public QWidget
 {
diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro
index 0c69b11f9b..0dfe1e947f 100644
--- a/tests/auto/qlayout/qlayout.pro
+++ b/tests/auto/qlayout/qlayout.pro
@@ -6,7 +6,7 @@ load(qttest_p4)
 
 SOURCES += tst_qlayout.cpp
 contains(QT_CONFIG, qt3support): QT += qt3support
-wince*: {
+wince*|symbian*: {
    addFiles.sources = baseline
    addFiles.path = .
    DEPLOYMENT += addFiles
diff --git a/tests/auto/qlibrary/lib/lib.pro b/tests/auto/qlibrary/lib/lib.pro
index 14b87837b0..25a50b5697 100644
--- a/tests/auto/qlibrary/lib/lib.pro
+++ b/tests/auto/qlibrary/lib/lib.pro
@@ -19,7 +19,7 @@ win32: {
     copy /Y $(DESTDIR_TARGET) ..\system.trolltech.test.mylib.dll && \
     copy /Y $(DESTDIR_TARGET) ..\mylib_noextension
 }
-unix: {
+unix:!symbian: {
     QMAKE_POST_LINK = cp -f $(DESTDIR)$(TARGET) ../libmylib.so2 && \
     cp -f $(DESTDIR)$(TARGET) ../system.trolltech.test.mylib.so
 }
@@ -27,4 +27,5 @@ unix: {
 #no special install rule for the library used by test
 INSTALLS =
 
+symbian: TARGET.CAPABILITY=ALL -TCB
 
diff --git a/tests/auto/qlibrary/lib/mylib.c b/tests/auto/qlibrary/lib/mylib.c
index 1366b7c6ba..5e98362ed5 100644
--- a/tests/auto/qlibrary/lib/mylib.c
+++ b/tests/auto/qlibrary/lib/mylib.c
@@ -1,6 +1,6 @@
 #include <qglobal.h>
 
-#if defined(Q_CC_MSVC) || defined(Q_CC_MSVC_NET) || defined(Q_CC_BOR)
+#if defined(Q_CC_MSVC) || defined(Q_CC_MSVC_NET) || defined(Q_CC_BOR) || defined(Q_OS_SYMBIAN)
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
@@ -12,7 +12,7 @@
 # define BORLAND_STDCALL
 #endif
 
-LIB_EXPORT int BORLAND_STDCALL version()
+LIB_EXPORT int BORLAND_STDCALL mylibversion()
 {
     return 1;
 }
diff --git a/tests/auto/qlibrary/lib2/lib2.pro b/tests/auto/qlibrary/lib2/lib2.pro
index 718c5c6dac..436d7baa12 100644
--- a/tests/auto/qlibrary/lib2/lib2.pro
+++ b/tests/auto/qlibrary/lib2/lib2.pro
@@ -19,11 +19,29 @@ win32: {
     QMAKE_POST_LINK = copy /Y ..\mylib2.dll ..\mylib.dl2 && \
     copy /Y ..\mylib2.dll ..\system.trolltech.test.mylib.dll
 }
-unix: {
+
+unix:!symbian: {
     QMAKE_POST_LINK = cp -f $(DESTDIR)$(TARGET) ../libmylib.so2 && \
     cp -f $(DESTDIR)$(TARGET) ../system.trolltech.test.mylib.so
 }
 
+symbian-abld: {
+    TARGET.CAPABILITY=ALL -TCB
+    FIXEDROOT = $$replace(EPOCROOT,/,\\)
+	QMAKE_POST_LINK = \
+    copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dl2 && \
+    copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\system.trolltech.test.mylib.dll && \
+    IF NOT "$(PLATFORM)==WINSCW" copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  ..\tst\mylib.dl2
+}
+
+symbian-sbsv2: {
+    TARGET.CAPABILITY=ALL -TCB
+    QMAKE_POST_LINK = \
+    $(GNUCP) $${EPOCROOT}epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/mylib.dll  $${EPOCROOT}epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/mylib.dl2 && \
+    $(GNUCP) $${EPOCROOT}epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/mylib.dll  $${EPOCROOT}epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/system.trolltech.test.mylib.dll && \
+    if test $(PLATFORM) != WINSCW;then $(GNUCP) $${EPOCROOT}epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/mylib.dll $${PWD}/../tst/mylib.dl2; fi
+}
+
 #no special install rule for the library used by test
 INSTALLS =
 
diff --git a/tests/auto/qlibrary/lib2/mylib.c b/tests/auto/qlibrary/lib2/mylib.c
index dd90f0460c..4046f1f76a 100644
--- a/tests/auto/qlibrary/lib2/mylib.c
+++ b/tests/auto/qlibrary/lib2/mylib.c
@@ -1,6 +1,6 @@
 #include <qglobal.h>
 
-#if defined(Q_CC_MSVC) || defined(Q_CC_MSVC_NET) || defined(Q_CC_BOR)
+#if defined(Q_CC_MSVC) || defined(Q_CC_MSVC_NET) || defined(Q_CC_BOR)|| defined(Q_OS_SYMBIAN)
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
@@ -12,7 +12,7 @@
 # define BORLAND_STDCALL
 #endif
 
-LIB_EXPORT int BORLAND_STDCALL version()
+LIB_EXPORT int BORLAND_STDCALL mylibversion()
 {
     return 2;
 }
diff --git a/tests/auto/qlibrary/qlibrary.pro b/tests/auto/qlibrary/qlibrary.pro
index f3e646ad0a..fd5790b209 100644
--- a/tests/auto/qlibrary/qlibrary.pro
+++ b/tests/auto/qlibrary/qlibrary.pro
@@ -1,8 +1,16 @@
+QT -= gui
 TEMPLATE    =	subdirs
 CONFIG  += ordered
-SUBDIRS	=	lib \
-                lib2 \
-		tst
+
+symbian: {
+# Can't build two versions of lib with same name in symbian, so just build one
+SUBDIRS =   lib2 \
+            tst
+} else {
+SUBDIRS =   lib \
+            lib2 \
+            tst
+}
 TARGET = tst_qlibrary
 
 # no special install rule for subdir
diff --git a/tests/auto/qlibrary/tst/tst.pro b/tests/auto/qlibrary/tst/tst.pro
index 67437a699d..06c2cd89ae 100644
--- a/tests/auto/qlibrary/tst/tst.pro
+++ b/tests/auto/qlibrary/tst/tst.pro
@@ -16,8 +16,18 @@ wince*: {
    addFiles.path = .
    DEPLOYMENT += addFiles
    DEFINES += SRCDIR=\\\"\\\"
+}else:symbian* {
+   binDep.sources = \
+        mylib.dll \
+        system.trolltech.test.mylib.dll
+   binDep.path = /sys/bin
+#mylib.dl2 nonstandard binary deployment will cause warning in emulator,
+#but it can be safely ignored.        
+   custBinDep.sources = mylib.dl2
+   custBinDep.path = /sys/bin
+
+   DEPLOYMENT += binDep custBinDep
 } else {
    DEFINES += SRCDIR=\\\"$$PWD/../\\\"
 }
 
-
diff --git a/tests/auto/qlibrary/tst_qlibrary.cpp b/tests/auto/qlibrary/tst_qlibrary.cpp
index 5c9798b7d3..bad2942f23 100644
--- a/tests/auto/qlibrary/tst_qlibrary.cpp
+++ b/tests/auto/qlibrary/tst_qlibrary.cpp
@@ -85,7 +85,7 @@
 # define SUFFIX         ".a"
 # define PREFIX         "lib"
 
-#elif defined(Q_OS_WIN)
+#elif defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
 # undef dll_VALID
 # define dll_VALID      true
 # define SUFFIX         ".dll"
@@ -100,8 +100,12 @@
 
 static QString sys_qualifiedLibraryName(const QString &fileName)
 {
+#if defined(Q_OS_SYMBIAN)
+    return PREFIX + fileName + SUFFIX;
+#else
     QString currDir = QDir::currentPath();
     return currDir + "/" + PREFIX + fileName + SUFFIX;
+#endif
 }
 
 //TESTED_CLASS=
@@ -187,13 +191,13 @@ void tst_QLibrary::version()
     QFETCH( int, loadversion );
     QFETCH( int, resultversion );
 
-#if !defined(Q_OS_AIX) && !defined(Q_OS_WIN)
+#if !defined(Q_OS_AIX) && !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN)
     QString currDir = QDir::currentPath();
     QLibrary library( currDir + QLatin1Char('/') + lib, loadversion );
     bool ok = library.load();
     QVERIFY(ok);
 
-    VersionFunction fnVersion = (VersionFunction)library.resolve("version");
+    VersionFunction fnVersion = (VersionFunction)library.resolve("mylibversion");
     QVERIFY(fnVersion);
     QCOMPARE(fnVersion(), resultversion);
 #else
@@ -209,7 +213,11 @@ void tst_QLibrary::load_data()
     QTest::addColumn<QString>("lib");
     QTest::addColumn<bool>("result");
 
+#if defined(Q_OS_SYMBIAN)
+    QString currDir;
+#else
     QString currDir = QDir::currentPath();
+#endif
     QTest::newRow( "ok00" ) << currDir + "/mylib" << (bool)true;
     QTest::newRow( "notexist" ) << currDir + "/nolib" << (bool)false;
     QTest::newRow( "badlibrary" ) << currDir + "/qlibrary.pro" << (bool)false;
@@ -218,7 +226,7 @@ void tst_QLibrary::load_data()
     QTest::newRow("ok (libmylib ver. 1)") << currDir + "/libmylib" <<(bool)true;
 #endif
 
-# if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+# if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QTest::newRow( "ok01 (with suffix)" ) << currDir + "/mylib.dll" << (bool)true;
     QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/mylib.dl2" << (bool)true;
     QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.trolltech.test.mylib.dll" << (bool)true;
@@ -248,7 +256,12 @@ void tst_QLibrary::unload_data()
     QTest::addColumn<QString>("lib");
     QTest::addColumn<bool>("result");
 
+#if defined(Q_OS_SYMBIAN)
+    QString currDir;
+#else
     QString currDir = QDir::currentPath();
+#endif
+
     QTest::newRow( "mylib" ) << currDir + "/mylib" << (bool)TRUE;
 #ifdef Q_WS_MAC
     if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_3)
@@ -274,8 +287,12 @@ void tst_QLibrary::unload()
 
 void tst_QLibrary::unload_after_implicit_load()
 {
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("SYMBIAN does not support symbols on non-STDDLL libraries.", SkipAll);
+#endif
+
     QLibrary library( "./mylib" );
-    void *p = library.resolve("version");
+    void *p = library.resolve("mylibversion");
     QVERIFY(p); // Check if it was loaded
     QVERIFY(library.isLoaded());
     QVERIFY(library.unload());
@@ -289,14 +306,23 @@ void tst_QLibrary::resolve_data()
     QTest::addColumn<QString>("symbol");
     QTest::addColumn<bool>("goodPointer");
 
+#if defined(Q_OS_SYMBIAN)
+    QString currDir;
+#else
     QString currDir = QDir::currentPath();
-    QTest::newRow( "ok00" ) << currDir + "/mylib" << QString("version") << (bool)TRUE;
+#endif
+
+    QTest::newRow( "ok00" ) << currDir + "/mylib" << QString("mylibversion") << (bool)TRUE;
     QTest::newRow( "bad00" ) << currDir + "/mylib" << QString("nosym") << (bool)FALSE;
     QTest::newRow( "bad01" ) << currDir + "/nolib" << QString("nosym") << (bool)FALSE;
 }
 
 void tst_QLibrary::resolve()
 {
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("SYMBIAN does not support symbols on non-STDDLL libraries.", SkipAll);
+#endif
+
     typedef int (*testFunc)();
     QFETCH( QString, lib );
     QFETCH( QString, symbol );
@@ -347,7 +373,7 @@ void tst_QLibrary::isLibrary_data()
     QTest::newRow("good (libmylib.so.1.0.0)") << QString("libmylib.so.1.0.0") << true;
 
     QTest::newRow("bad (libmylib.1.0.0.foo)") << QString("libmylib.1.0.0.foo") << false;
-#elif defined(Q_OS_WIN)
+#elif defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     QTest::newRow("good (with many dots)" ) << "/system.trolltech.test.mylib.dll" << true;
 #endif
 }
@@ -367,10 +393,15 @@ void tst_QLibrary::errorString_data()
     QTest::addColumn<bool>("success");
     QTest::addColumn<QString>("errorString");
 
+#if defined(Q_OS_SYMBIAN)
+    QString currDir;
+#else
     QString currDir = QDir::currentPath();
+
     QString srcDir = SRCDIR;
     if (srcDir.isEmpty())
         srcDir = currDir;
+#endif
 
     QTest::newRow("bad load()") << (int)Load << QString("nosuchlib") << false << QString("Cannot load library nosuchlib: .*");
     QTest::newRow("call errorString() on QLibrary with no d-pointer (crashtest)") << (int)(Load | DontSetFileName) << QString() << false << QString("Unknown error");
@@ -385,6 +416,8 @@ void tst_QLibrary::errorString_data()
     QTest::newRow("bad load() with .dll suffix") << (int)Load << QString("nosuchlib.dll") << false << QString("Cannot load library nosuchlib.dll: The specified module could not be found.");
 //    QTest::newRow("bad unload") << (int)Unload << QString("nosuchlib.dll") << false << QString("QLibrary::unload_sys: Cannot unload nosuchlib.dll (The specified module could not be found.)");
 #elif defined Q_OS_MAC
+#elif defined Q_OS_SYMBIAN
+    QTest::newRow("load invalid file") << (int)Load << "tst_qlibrary.exe" << false << QString("Cannot load library.*");
 #else
     QTest::newRow("load invalid file") << (int)Load << srcDir + "/library_path/invalid.so" << false << QString("Cannot load library.*");
 #endif
@@ -397,6 +430,13 @@ void tst_QLibrary::errorString()
     QFETCH(bool, success);
     QFETCH(QString, errorString);
 
+#if defined(Q_OS_SYMBIAN)
+    if ( success )
+        {
+        QSKIP("SYMBIAN does not support symbols on non-STDDLL libraries.", SkipSingle );
+        }
+#endif
+
     QLibrary lib;
     if (!(operation & DontSetFileName)) {
         lib.setFileName(fileName);
@@ -415,7 +455,7 @@ void tst_QLibrary::errorString()
             ok = lib.load();
             QCOMPARE(ok, true);
             if (success) {
-                ok = lib.resolve("version");
+                ok = lib.resolve("mylibversion");
             } else {
                 ok = lib.resolve("nosuchsymbol");
             }
@@ -446,9 +486,14 @@ void tst_QLibrary::loadHints_data()
     }
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+    QString currDir;
+#else
     QString currDir = QDir::currentPath();
+#endif
+
     lh |= QLibrary::ResolveAllSymbolsHint;
-# if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+# if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QTest::newRow( "ok01 (with suffix)" ) << currDir + "/mylib.dll" << int(lh) << (bool)TRUE;
     QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/mylib.dl2" << int(lh) << (bool)TRUE;
     QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.trolltech.test.mylib.dll" << int(lh) << (bool)TRUE;
@@ -486,7 +531,6 @@ void tst_QLibrary::fileName_data()
     QTest::addColumn<QString>("libName");
     QTest::addColumn<QString>("expectedFilename");
 
-    QString currDir = QDir::currentPath();
     QTest::newRow( "ok02" ) << sys_qualifiedLibraryName(QLatin1String("mylib"))
                             << sys_qualifiedLibraryName(QLatin1String("mylib"));
 #ifdef Q_WS_WIN
@@ -518,7 +562,12 @@ void tst_QLibrary::fileName()
 
 void tst_QLibrary::multipleInstancesForOneLibrary()
 {
+#if defined(Q_OS_SYMBIAN)
+    QString lib = "/mylib";
+#else
     QString lib = QDir::currentPath() + "/mylib";
+#endif
+
     QLibrary lib1(lib);
     QLibrary lib2(lib);
     QCOMPARE(lib1.isLoaded(), false);
diff --git a/tests/auto/qline/qline.pro b/tests/auto/qline/qline.pro
index 56718d038c..715774ae6b 100644
--- a/tests/auto/qline/qline.pro
+++ b/tests/auto/qline/qline.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
+SOURCES += tst_qline.cpp
 QT -= gui
 SOURCES += tst_qline.cpp
-unix:!mac:!vxworks:LIBS+=-lm
+unix:!mac:!symbian*:!vxworks:LIBS+=-lm
 
 
diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp
index 3519afa2ba..ea0afa0b10 100644
--- a/tests/auto/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/qlineedit/tst_qlineedit.cpp
@@ -220,10 +220,11 @@ private slots:
     void setSelection_data();
     void setSelection();
 
+#ifndef QT_NO_CLIPBOARD
     void cut();
     void copy();
     void paste();
-
+#endif
     void maxLengthAndInputMask();
     void returnPressedKeyEvent();
 
@@ -2750,6 +2751,7 @@ void tst_QLineEdit::setSelection()
         QCOMPARE(testWidget->cursorPosition(), expectedCursor);
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QLineEdit::cut()
 {
 #ifdef Q_WS_MAC
@@ -2830,7 +2832,7 @@ void tst_QLineEdit::paste()
 {
     DEPENDS_ON("cut");
 }
-
+#endif
 class InputMaskValidator : public QValidator
 {
 public:
diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp
index cc80931a6d..13b68c8d43 100644
--- a/tests/auto/qlistview/tst_qlistview.cpp
+++ b/tests/auto/qlistview/tst_qlistview.cpp
@@ -48,7 +48,9 @@
 #include <qitemdelegate.h>
 #include <qstandarditemmodel.h>
 #include <qstringlistmodel.h>
+#ifndef Q_OS_SYMBIAN
 #include <cmath>
+#endif
 #include <math.h>
 #include <QtGui/QScrollBar>
 #include <QtGui/QDialog>
diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index e581bd3acc..6f49a37749 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -1435,6 +1435,10 @@ public:
 
 void tst_QListWidget::fastScroll()
 {
+    if (qstrcmp(QApplication::style()->metaObject()->className(), "QS60Style") == 0) {
+        QSKIP("S60 style doesn't support fast scrolling", SkipAll);
+    }
+
     MyListWidget widget;
     for (int i = 0; i < 50; ++i)
         widget.addItem(QString("Item %1").arg(i));
diff --git a/tests/auto/qlocale/test/test.pro b/tests/auto/qlocale/test/test.pro
index b840e2dce9..7bc9f59521 100644
--- a/tests/auto/qlocale/test/test.pro
+++ b/tests/auto/qlocale/test/test.pro
@@ -29,3 +29,11 @@ wince*: {
    DEPLOYMENT += addFiles
 }
 
+symbian:contains(S60_VERSION,3.2) {
+    # This test case compilation crashes on 3.2 for gcce if paging is on
+    MMP_RULES -= PAGED
+    custom_paged_rule = "$${LITERAL_HASH}ifndef GCCE"\
+        "PAGED" \
+        "$${LITERAL_HASH}endif"
+    MMP_RULES += custom_paged_rule
+}
\ No newline at end of file
diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp
index 9a5c54984e..6301d40120 100644
--- a/tests/auto/qlocale/tst_qlocale.cpp
+++ b/tests/auto/qlocale/tst_qlocale.cpp
@@ -68,6 +68,11 @@ extern "C" DWORD GetThreadLocale(void) {
 #    include <stdlib.h>
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+#    include <e32std.h>
+#    include <private/qcore_symbian_p.h>
+#endif
+
 Q_DECLARE_METATYPE(qlonglong)
 Q_DECLARE_METATYPE(QDate)
 Q_DECLARE_METATYPE(QLocale::FormatType)
@@ -130,6 +135,9 @@ private slots:
     void queryDateTime();
     void queryMeasureSystem_data();
     void queryMeasureSystem();
+#if defined(Q_OS_SYMBIAN)
+    void symbianSystemLocale();
+#endif
 
     void ampm();
 
@@ -317,8 +325,8 @@ void tst_QLocale::ctor()
 
 void tst_QLocale::emptyCtor()
 {
-#ifdef Q_OS_WINCE
-    QSKIP("Uses unsupported Windows CE QProcess functionality", SkipAll);
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+    QSKIP("Uses unsupported Windows CE / Symbian QProcess functionality (std streams, env)", SkipAll);
 #endif
 #if defined(QT_NO_PROCESS)
     QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll);
@@ -667,7 +675,7 @@ void tst_QLocale::testInfAndNan()
     double nan = sqrt(-1.0);
 
 #ifdef Q_OS_WIN
-    // these causes INVALID floating point exception so we want to clare the status.
+    // these cause INVALID floating point exception so we want to clear the status.
     _clear87();
 #endif
 
@@ -1060,11 +1068,11 @@ void tst_QLocale::macDefaultLocale()
     QTime utcTime = QDateTime::currentDateTime().toUTC().time();
 
     int diff = currentTime.hour() - utcTime.hour();
-    
+
      // Check if local time and utc time are on opposite sides of the 24-hour wrap-around.
-	if (diff < -12) 
+	if (diff < -12)
 	   diff += 24;
-	if (diff > 12) 
+	if (diff > 12)
 	   diff -= 24;
 
 	const QString timeString = locale.toString(QTime(1,2,3), QLocale::LongFormat);
@@ -1720,7 +1728,7 @@ void tst_QLocale::systemMeasurementSystems()
     // Theoretically, we could include HPUX in this test, but its setenv implementation
     // stinks. It's called putenv, and it requires you to keep the variable you pass
     // to it around forever.
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN)
     QFETCH(QString, lcAllLocale);
     QFETCH(QString, lcMeasurementLocale);
     QFETCH(QString, langLocale);
@@ -1744,7 +1752,7 @@ void tst_QLocale::systemMeasurementSystems()
     qputenv("LC_MEASUREMENT", oldLcMeasurement.toLocal8Bit());
     qputenv("LANG", oldLang.toLocal8Bit());
 #else
-    QSKIP("Test doesn't work on Mac or Windows", SkipAll);
+    QSKIP("Test doesn't work on Mac, Windows or Symbian", SkipAll);
 #endif
 }
 
@@ -1842,7 +1850,7 @@ void tst_QLocale::queryMeasureSystem()
     // Theoretically, we could include HPUX in this test, but its setenv implementation
     // stinks. It's called putenv, and it requires you to keep the variable you pass
     // to it around forever.
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN)
     QFETCH(QString, lcAllLocale);
     QFETCH(QString, lcMeasurementLocale);
     QFETCH(QString, langLocale);
@@ -1866,7 +1874,7 @@ void tst_QLocale::queryMeasureSystem()
     qputenv("LC_MEASUREMENT", oldLcMeasurement.toLocal8Bit());
     qputenv("LANG", oldLang.toLocal8Bit());
 #else
-    QSKIP("Test doesn't work on Mac or Windows", SkipAll);
+    QSKIP("Test doesn't work on Mac, Windows or Symbian", SkipAll);
 #endif
 }
 #endif // QT_NO_SYSTEMLOCALE
@@ -1983,5 +1991,64 @@ void tst_QLocale::standaloneMonthName()
     QCOMPARE(ru.standaloneMonthName(1, QLocale::NarrowFormat), QString::fromUtf8("\320\257"));
 }
 
+#if defined(Q_OS_SYMBIAN)
+void tst_QLocale::symbianSystemLocale()
+{
+# if defined(__SERIES60_31__)
+    QSKIP("S60 3.1 doesn't support system format properly", SkipAll);
+# else
+    // Simple test to verify that Symbian system locale works at all
+    const QSystemLocale locale;
+    TExtendedLocale s60Locale;
+    s60Locale.LoadSystemSettings();
+
+    TTime s60Date(_L("20090117:")); // Symbian offsets day and month from zero
+    QDate date(2009,2,18);
+
+    TPtrC s60DateFormat = s60Locale.GetShortDateFormatSpec();
+    QString dateFormat = locale.query(QSystemLocale::DateFormatShort, QVariant()).toString();
+
+#if 0
+    QTime nowTime = QTime::currentTime();
+    QDateTime nowDateTime = QDateTime::currentDateTime();
+    qDebug() << "locale.query(QSystemLocale::LanguageId)" << locale.query(QSystemLocale::LanguageId, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::CountryId)" << locale.query(QSystemLocale::CountryId, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::DecimalPoint)" << locale.query(QSystemLocale::DecimalPoint, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::GroupSeparator)" << locale.query(QSystemLocale::GroupSeparator, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::ZeroDigit)" << locale.query(QSystemLocale::ZeroDigit, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::NegativeSign)" << locale.query(QSystemLocale::NegativeSign, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::PositiveSign)" << locale.query(QSystemLocale::PositiveSign, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::DateFormatLong)" << locale.query(QSystemLocale::DateFormatLong, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::DateFormatShort)" << locale.query(QSystemLocale::DateFormatShort, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::TimeFormatLong)" << locale.query(QSystemLocale::TimeFormatLong, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::TimeFormatShort)" << locale.query(QSystemLocale::TimeFormatShort, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::DayNameLong)" << locale.query(QSystemLocale::DayNameLong, QVariant(1)).toString();
+    qDebug() << "locale.query(QSystemLocale::DayNameShort)" << locale.query(QSystemLocale::DayNameShort, QVariant(1)).toString();
+    qDebug() << "locale.query(QSystemLocale::MonthNameLong)" << locale.query(QSystemLocale::MonthNameLong, QVariant(2)).toString();
+    qDebug() << "locale.query(QSystemLocale::MonthNameShort)" << locale.query(QSystemLocale::MonthNameShort, QVariant(2)).toString();
+    qDebug() << "locale.query(QSystemLocale::DateToStringLong)" << locale.query(QSystemLocale::DateToStringLong, QVariant(date)).toString();
+    qDebug() << "locale.query(QSystemLocale::DateToStringShort)" << locale.query(QSystemLocale::DateToStringShort, QVariant(date)).toString();
+    qDebug() << "locale.query(QSystemLocale::TimeToStringLong)" << locale.query(QSystemLocale::TimeToStringLong, QVariant(nowTime)).toString();
+    qDebug() << "locale.query(QSystemLocale::TimeToStringShort)" << locale.query(QSystemLocale::TimeToStringShort, QVariant(nowTime)).toString();
+    qDebug() << "locale.query(QSystemLocale::DateTimeFormatLong)" << locale.query(QSystemLocale::DateTimeFormatLong, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::DateTimeFormatShort)" << locale.query(QSystemLocale::DateTimeFormatShort, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::DateTimeToStringLong)" << locale.query(QSystemLocale::DateTimeToStringLong, QVariant(nowDateTime)).toString();
+    qDebug() << "locale.query(QSystemLocale::DateTimeToStringShort)" << locale.query(QSystemLocale::DateTimeToStringShort, QVariant(nowDateTime)).toString();
+    qDebug() << "locale.query(QSystemLocale::MeasurementSystem)" << locale.query(QSystemLocale::MeasurementSystem, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::AMText)" << locale.query(QSystemLocale::AMText, QVariant()).toString();
+    qDebug() << "locale.query(QSystemLocale::PMText)" << locale.query(QSystemLocale::PMText, QVariant()).toString();
+#endif
+
+    TBuf<50> s60FormattedDate;
+    TRAPD(err, s60Date.FormatL(s60FormattedDate, s60DateFormat));
+    QVERIFY(err == KErrNone);
+    QString s60FinalResult = qt_TDes2QStringL(s60FormattedDate);
+    QString finalResult = date.toString(dateFormat);
+
+    QCOMPARE(finalResult, s60FinalResult);
+# endif
+}
+#endif
+
 QTEST_APPLESS_MAIN(tst_QLocale)
 #include "tst_qlocale.moc"
diff --git a/tests/auto/qlocalsocket/lackey/lackey.pro b/tests/auto/qlocalsocket/lackey/lackey.pro
index 7460d8c1be..f073e7a7a9 100644
--- a/tests/auto/qlocalsocket/lackey/lackey.pro
+++ b/tests/auto/qlocalsocket/lackey/lackey.pro
@@ -15,4 +15,4 @@ DEFINES += QLOCALSOCKET_DEBUG
 SOURCES		+= main.cpp 
 TARGET		= lackey
 
-
+symbian:TARGET.CAPABILITY = ALL -TCB 
\ No newline at end of file
diff --git a/tests/auto/qlocalsocket/lackey/main.cpp b/tests/auto/qlocalsocket/lackey/main.cpp
index 405fd3f35f..fbec9890e8 100644
--- a/tests/auto/qlocalsocket/lackey/main.cpp
+++ b/tests/auto/qlocalsocket/lackey/main.cpp
@@ -41,7 +41,7 @@
 
 
 #include <qscriptengine.h>
-#include <QtGui/QtGui>
+ #include <QFile>
 #include <QTest>
 
 #include <qlocalsocket.h>
diff --git a/tests/auto/qlocalsocket/qlocalsocket.pro b/tests/auto/qlocalsocket/qlocalsocket.pro
index 4df17deaad..0849453aac 100644
--- a/tests/auto/qlocalsocket/qlocalsocket.pro
+++ b/tests/auto/qlocalsocket/qlocalsocket.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = lackey test
-!wince*: SUBDIRS += example
+!wince*:!symbian*: SUBDIRS += example
diff --git a/tests/auto/qlocalsocket/test/test.pro b/tests/auto/qlocalsocket/test/test.pro
index 7befdf91c1..e399a2951b 100644
--- a/tests/auto/qlocalsocket/test/test.pro
+++ b/tests/auto/qlocalsocket/test/test.pro
@@ -2,11 +2,14 @@ load(qttest_p4)
 
 DEFINES += QLOCALSERVER_DEBUG
 DEFINES += QLOCALSOCKET_DEBUG
-!wince*: {
-    DEFINES += SRCDIR=\\\"$$PWD/../\\\"
-} else {
+
+symbian {
+    # nothing
+} else:wince* {
     DEFINES += QT_LOCALSOCKET_TCP
     DEFINES += SRCDIR=\\\"../\\\"
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD/../\\\"
 }
 
 QT = core network
@@ -27,9 +30,18 @@ CONFIG(debug_and_release) {
 wince* {
     additionalFiles.sources = ../lackey/lackey.exe
     additionalFiles.path = lackey
+}
+
+symbian {
+    additionalFiles.sources = lackey.exe
+    additionalFiles.path = \sys\bin
+    DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
+}
+
+wince*|symbian {
     scriptFiles.sources = ../lackey/scripts/*.js
     scriptFiles.path = lackey/scripts
     DEPLOYMENT = additionalFiles scriptFiles
     QT += script    # for easy deployment of QtScript
-}
+} 
 
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
index a41eecdd72..0fe05a8573 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
@@ -47,9 +47,16 @@
 #include <QtNetwork/qlocalserver.h>
 #include "../../shared/util.h"
 
+#ifdef Q_OS_SYMBIAN
+    #include <unistd.h>
+#endif
 //TESTED_CLASS=QLocalServer, QLocalSocket
 //TESTED_FILES=network/socket/qlocalserver.cpp network/socket/qlocalsocket.cpp
-
+#ifdef Q_OS_SYMBIAN
+    #define STRINGIFY(x) #x
+    #define TOSTRING(x) STRINGIFY(x)
+    #define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/"   
+#endif
 Q_DECLARE_METATYPE(QLocalSocket::LocalSocketError)
 Q_DECLARE_METATYPE(QLocalSocket::LocalSocketState)
 
@@ -108,6 +115,10 @@ private slots:
 
     void debug();
 
+#ifdef Q_OS_SYMBIAN
+private:
+    void unlink(QString serverName);
+#endif
 };
 
 tst_QLocalSocket::tst_QLocalSocket()
@@ -294,6 +305,9 @@ void tst_QLocalSocket::listen()
     QSignalSpy spyNewConnection(&server, SIGNAL(newConnection()));
 
     QFETCH(QString, name);
+#ifdef Q_OS_SYMBIAN
+    unlink(name);
+#endif
     QFETCH(bool, canListen);
     QFETCH(bool, close);
     QVERIFY2((server.listen(name) == canListen), server.errorString().toLatin1().constData());
@@ -344,7 +358,9 @@ void tst_QLocalSocket::listenAndConnect()
 
     QFETCH(QString, name);
     QFETCH(bool, canListen);
-
+#ifdef Q_OS_SYMBIAN
+    unlink(name);
+#endif
     QCOMPARE(server.listen(name), canListen);
     QTest::qWait(1000);
     //QVERIFY(!server.errorString().isEmpty());
@@ -364,7 +380,7 @@ void tst_QLocalSocket::listenAndConnect()
         QSignalSpy spyReadyRead(socket, SIGNAL(readyRead()));
 
         socket->connectToServer(name);
-#ifdef QT_LOCALSOCKET_TCP
+#if defined(QT_LOCALSOCKET_TCP) || defined (Q_OS_SYMBIAN) 
         QTest::qWait(250);
 #endif
 
@@ -467,6 +483,9 @@ void tst_QLocalSocket::sendData_data()
 void tst_QLocalSocket::sendData()
 {
     QFETCH(QString, name);
+#ifdef Q_OS_SYMBIAN
+    unlink(name);
+#endif
     QFETCH(bool, canListen);
 
     LocalServer server;
@@ -484,8 +503,10 @@ void tst_QLocalSocket::sendData()
     // test creating a connection
     socket.connectToServer(name);
     bool timedOut = true;
+
     QCOMPARE(server.waitForNewConnection(3000, &timedOut), canListen);
-#ifdef QT_LOCALSOCKET_TCP
+
+#if defined(QT_LOCALSOCKET_TCP) || defined(Q_OS_SYMBIAN)
     QTest::qWait(250);
 #endif
     QVERIFY(!timedOut);
@@ -495,7 +516,11 @@ void tst_QLocalSocket::sendData()
     // test sending/receiving data
     if (server.hasPendingConnections()) {
         QString testLine = "test";
+#ifdef Q_OS_SYMBIAN
+    for (int i = 0; i < 25 * 1024; ++i)
+#else
 	for (int i = 0; i < 50000; ++i)
+#endif
 		testLine += "a";
         QLocalSocket *serverSocket = server.nextPendingConnection();
         QVERIFY(serverSocket);
@@ -516,7 +541,9 @@ void tst_QLocalSocket::sendData()
         QCOMPARE(spyReadyRead.count(), 1);
 
         QVERIFY(testLine.startsWith(in.readLine()));
+
         QVERIFY(wrote || serverSocket->waitForBytesWritten(1000));
+
         QCOMPARE(serverSocket->errorString(), QString("Unknown error"));
         QCOMPARE(socket.errorString(), QString("Unknown error"));
     }
@@ -570,7 +597,9 @@ void tst_QLocalSocket::fullPath()
 {
     LocalServer server;
     QString name = "qlocalsocket_pathtest";
-#if defined(QT_LOCALSOCKET_TCP)
+#if defined(Q_OS_SYMBIAN)
+    QString path = "";
+#elif defined(QT_LOCALSOCKET_TCP)
     QString path = "QLocalServer";
 #elif defined(Q_OS_WIN)
     QString path = "\\\\.\\pipe\\";
@@ -584,6 +613,10 @@ void tst_QLocalSocket::fullPath()
 
     LocalSocket socket;
     socket.connectToServer(serverName);
+#if defined (Q_OS_SYMBIAN) 
+    QTest::qWait(250);
+#endif    
+    
     QCOMPARE(socket.serverName(), serverName);
     QCOMPARE(socket.fullServerName(), serverName);
     socket.disconnectFromServer();
@@ -607,6 +640,9 @@ void tst_QLocalSocket::hitMaximumConnections()
     QFETCH(int, max);
     LocalServer server;
     QString name = "tst_localsocket";
+#ifdef Q_OS_SYMBIAN
+    unlink(name);
+#endif
     server.setMaxPendingConnections(max);
     QVERIFY2(server.listen(name), server.errorString().toLatin1().constData());
     int connections = server.maxPendingConnections() + 1;
@@ -655,7 +691,7 @@ public:
                   || socket.error() == QLocalSocket::ConnectionRefusedError)
 		 && tries < 1000);
         if (tries == 0 && socket.state() != QLocalSocket::ConnectedState) {
-            QVERIFY(socket.waitForConnected(3000));
+            QVERIFY(socket.waitForConnected(30000));
             QVERIFY(socket.state() == QLocalSocket::ConnectedState);
         }
 
@@ -685,7 +721,7 @@ public:
         int done = clients;
         while (done > 0) {
             bool timedOut = true;
-            QVERIFY(server.waitForNewConnection(3000, &timedOut));
+            QVERIFY(server.waitForNewConnection(30000, &timedOut));
             QVERIFY(!timedOut);
             QLocalSocket *serverSocket = server.nextPendingConnection();
             QVERIFY(serverSocket);
@@ -720,20 +756,30 @@ void tst_QLocalSocket::threadedConnection_data()
 
 void tst_QLocalSocket::threadedConnection()
 {
+#ifdef Q_OS_SYMBIAN
+    unlink("qlocalsocket_threadtest");
+#endif
+
     QFETCH(int, threads);
     Server server;
+#if defined(Q_OS_SYMBIAN)
+    server.setStackSize(0x14000);
+#endif    
     server.clients = threads;
     server.start();
 
     QList<Client*> clients;
     for (int i = 0; i < threads; ++i) {
         clients.append(new Client());
+#if defined(Q_OS_SYMBIAN)        
+        clients.last()->setStackSize(0x14000);
+#endif        
         clients.last()->start();
     }
 
     server.wait();
     while (!clients.isEmpty()) {
-        QVERIFY(clients.first()->wait(30000));
+        QVERIFY(clients.first()->wait(300000));
         Client *client =clients.takeFirst();
 	client->terminate();
 	delete client;
@@ -756,7 +802,7 @@ void tst_QLocalSocket::processConnection_data()
  */
 void tst_QLocalSocket::processConnection()
 {
-#if defined(QT_NO_PROCESS)
+#if defined(QT_NO_PROCESS) || defined(Q_CC_NOKIAX86)
     QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll);
 #else
     QFETCH(int, processes);
@@ -811,6 +857,9 @@ void tst_QLocalSocket::longPath()
 void tst_QLocalSocket::waitForDisconnect()
 {
     QString name = "tst_localsocket";
+#ifdef Q_OS_SYMBIAN
+    unlink(name);
+#endif
     LocalServer server;
     QVERIFY(server.listen(name));
     LocalSocket socket;
@@ -862,6 +911,10 @@ void tst_QLocalSocket::removeServer()
 
 void tst_QLocalSocket::recycleServer()
 {
+#ifdef Q_OS_SYMBIAN
+    unlink("recycletest1");
+#endif
+
     LocalServer server;
     QLocalSocket client;
 
@@ -929,6 +982,29 @@ void tst_QLocalSocket::debug()
     qDebug() << QLocalSocket::ConnectionRefusedError << QLocalSocket::UnconnectedState;
 }
 
+#ifdef Q_OS_SYMBIAN
+void tst_QLocalSocket::unlink(QString name)
+{
+    if(name.length() == 0)
+        return;
+
+    QString fullName;
+    // determine the full server path
+    if (name.startsWith(QLatin1Char('/'))) {
+        fullName = name;
+    } else {
+        fullName = QDir::cleanPath(QDir::tempPath());
+        fullName += QLatin1Char('/') + name;
+        fullName = QDir::toNativeSeparators(fullName);
+    }
+
+    int result = ::unlink(fullName.toUtf8().data());
+
+    if(result != 0) {
+        qWarning() << "Unlinking " << fullName << " failed with " << strerror(errno); 
+    }
+}
+#endif
 QTEST_MAIN(tst_QLocalSocket)
 #include "tst_qlocalsocket.moc"
 
diff --git a/tests/auto/qmainwindow/qmainwindow.pro b/tests/auto/qmainwindow/qmainwindow.pro
index b1cbd160bd..43d73ae252 100644
--- a/tests/auto/qmainwindow/qmainwindow.pro
+++ b/tests/auto/qmainwindow/qmainwindow.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 SOURCES += tst_qmainwindow.cpp
 
-
+# Symbian toolchain does not support correct include semantics
+symbian:INCPATH+=..\..\..\include\QtGui\private
 
diff --git a/tests/auto/qmap/qmap.pro b/tests/auto/qmap/qmap.pro
index 5b61272953..00b84d133d 100644
--- a/tests/auto/qmap/qmap.pro
+++ b/tests/auto/qmap/qmap.pro
@@ -3,6 +3,4 @@ load(qttest_p4)
 QT = core
 
 SOURCES  += tst_qmap.cpp
-
-
-
+QT = core
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index ec9c7b47ce..3ce7f7f0b6 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -423,8 +423,11 @@ void tst_QMenu::overrideMenuAction()
     QSKIP("On Mac, we need to create native key events to test menu action activation", SkipAll);
 #elif defined(Q_OS_WINCE)
     QSKIP("On Windows CE, we need to create native key events to test menu action activation", SkipAll);
+#elif defined(Q_OS_SYMBIAN)
+    QSKIP("On Symbian OS, we need to create native key events to test menu action activation", SkipAll);
 #endif
-	QAction *aQuit = new QAction("Quit", &w);
+
+    QAction *aQuit = new QAction("Quit", &w);
 	aQuit->setShortcut(QKeySequence("Ctrl+X"));
 	m->addAction(aQuit);
 
@@ -638,7 +641,11 @@ void tst_QMenu::activeSubMenuPosition()
 
     main->setActiveAction(menuAction);
     sub->setActiveAction(subAction);
+#ifdef Q_OS_SYMBIAN    
+    main->popup(QPoint(50,200));
+#else
     main->popup(QPoint(200,200));
+#endif
 
     QVERIFY(main->isVisible());
     QCOMPARE(main->activeAction(), menuAction);
diff --git a/tests/auto/qmenubar/qmenubar.pro b/tests/auto/qmenubar/qmenubar.pro
index 51cf21d14d..a0a6420221 100644
--- a/tests/auto/qmenubar/qmenubar.pro
+++ b/tests/auto/qmenubar/qmenubar.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 HEADERS += 
 SOURCES += tst_qmenubar.cpp
 
-contains(QT_CONFIG, qt3support):QT += qt3support
+contains(QT_CONFIG, qt3support):!symbian*:QT += qt3support
 
diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp
index 1245de194c..6e98c2a7ab 100644
--- a/tests/auto/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/qmenubar/tst_qmenubar.cpp
@@ -464,6 +464,10 @@ void tst_QMenuBar::accel_noQt3()
 #if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM)
     QSKIP("On Mac/WinCE, native key events are needed to test menu action activation", SkipAll);
 #endif
+#ifdef Q_OS_SYMBIAN
+    QSKIP("On Symbian OS, native key events are needed to test menu action activation", SkipAll);
+#endif
+
     // create a popup menu with menu items set the accelerators later...
     initSimpleMenubar_noQt3();
 //    QTest::keyClick( 0, Qt::Key_A, AltKey );
diff --git a/tests/auto/qmetatype/qmetatype.pro b/tests/auto/qmetatype/qmetatype.pro
index 20ec3b8bf6..a84d238aa4 100644
--- a/tests/auto/qmetatype/qmetatype.pro
+++ b/tests/auto/qmetatype/qmetatype.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qmetatype.cpp
-
 QT = core
-
-
diff --git a/tests/auto/qmouseevent/tst_qmouseevent.cpp b/tests/auto/qmouseevent/tst_qmouseevent.cpp
index 63b5b5a142..177d387160 100644
--- a/tests/auto/qmouseevent/tst_qmouseevent.cpp
+++ b/tests/auto/qmouseevent/tst_qmouseevent.cpp
@@ -205,7 +205,7 @@ void tst_QMouseEvent::checkMousePressEvent()
     int buttons = button;
     int modifiers = keyPressed;
 
-    QTest::mousePress(testMouseWidget, (Qt::MouseButton)buttonPressed, (Qt::KeyboardModifiers)keyPressed);
+    QTest::mousePress(testMouseWidget, Qt::MouseButton(buttonPressed), Qt::KeyboardModifiers(keyPressed));
     QVERIFY(testMouseWidget->mousePressEventRecieved);
     QCOMPARE(testMouseWidget->mousePressButton, button);
     QCOMPARE(testMouseWidget->mousePressButtons, buttons);
@@ -218,7 +218,7 @@ void tst_QMouseEvent::checkMousePressEvent()
     QCOMPARE(testMouseWidget->mousePressStateAfter, stateAfter);
 #endif
 
-    QTest::mouseRelease(testMouseWidget, (Qt::MouseButton)buttonPressed, (Qt::KeyboardModifiers)keyPressed);
+    QTest::mouseRelease(testMouseWidget, Qt::MouseButton(buttonPressed), Qt::KeyboardModifiers(keyPressed));
 }
 
 void tst_QMouseEvent::checkMouseReleaseEvent_data()
@@ -251,7 +251,7 @@ void tst_QMouseEvent::checkMouseReleaseEvent()
     int buttons = 0;
     int modifiers = keyPressed;
 
-    QTest::mouseClick(testMouseWidget, (Qt::MouseButton)buttonReleased, (Qt::KeyboardModifiers)keyPressed);
+    QTest::mouseClick(testMouseWidget, Qt::MouseButton(buttonReleased), Qt::KeyboardModifiers(keyPressed));
     QVERIFY(testMouseWidget->mouseReleaseEventRecieved);
     QCOMPARE(testMouseWidget->mouseReleaseButton, button);
     QCOMPARE(testMouseWidget->mouseReleaseButtons, buttons);
diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/qmovie/qmovie.pro
index 765966eee8..15f0c833bd 100644
--- a/tests/auto/qmovie/qmovie.pro
+++ b/tests/auto/qmovie/qmovie.pro
@@ -12,3 +12,13 @@ wince*: {
    DEPLOYMENT += addFiles
 }
 
+
+symbian*: {
+   addFiles.sources = animations\*
+   addFiles.path = animations
+   DEPLOYMENT += addFiles
+
+   imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll
+   imagePlugins.path = imageformats
+   DEPLOYMENT += imagePlugins
+}
\ No newline at end of file
diff --git a/tests/auto/qmultiscreen/qmultiscreen.pro b/tests/auto/qmultiscreen/qmultiscreen.pro
index 810c05f7fc..fd42870968 100644
--- a/tests/auto/qmultiscreen/qmultiscreen.pro
+++ b/tests/auto/qmultiscreen/qmultiscreen.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qmultiscreen.cpp
-
-
-
+QT = core
diff --git a/tests/auto/qmutex/qmutex.pro b/tests/auto/qmutex/qmutex.pro
index e52f947f98..bd24dcb35f 100644
--- a/tests/auto/qmutex/qmutex.pro
+++ b/tests/auto/qmutex/qmutex.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qmutex.cpp
 QT = core
-
-
diff --git a/tests/auto/qmutexlocker/qmutexlocker.pro b/tests/auto/qmutexlocker/qmutexlocker.pro
index f9213082df..ff8a3da7eb 100644
--- a/tests/auto/qmutexlocker/qmutexlocker.pro
+++ b/tests/auto/qmutexlocker/qmutexlocker.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qmutexlocker.cpp
 QT = core
-
-
diff --git a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
index b7bd61e610..dd584a0900 100644
--- a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
+++ b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
@@ -102,11 +102,11 @@ private slots:
 
 tst_QNativeSocketEngine::tst_QNativeSocketEngine()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QNativeSocketEngine::~tst_QNativeSocketEngine()
 {
-
 }
 
 void tst_QNativeSocketEngine::init()
@@ -153,14 +153,14 @@ void tst_QNativeSocketEngine::simpleConnectToIMAP()
     QVERIFY(socketDevice.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
     QVERIFY(socketDevice.state() == QAbstractSocket::UnconnectedState);
 
-    const bool isConnected = socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143);
+    const bool isConnected = socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143);
     if (!isConnected) {
         QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
         QVERIFY(socketDevice.waitForWrite());
         QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
     }
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
+    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
 
     // Wait for the greeting
     QVERIFY(socketDevice.waitForRead());
@@ -173,7 +173,7 @@ void tst_QNativeSocketEngine::simpleConnectToIMAP()
     QVERIFY(socketDevice.read(array.data(), array.size()) == available);
 
     // Check that the greeting is what we expect it to be
-    QCOMPARE(array.constData(), "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+    QCOMPARE(array.constData(), QtNetworkSettings::expectedReplyIMAP().constData());
 
     // Write a logout message
     QByteArray array2 = "ZZZ LOGOUT\r\n";
@@ -204,6 +204,9 @@ void tst_QNativeSocketEngine::simpleConnectToIMAP()
 //---------------------------------------------------------------------------
 void tst_QNativeSocketEngine::udpLoopbackTest()
 {
+#ifdef SYMBIAN_WINSOCK_CONNECTIVITY     
+    QSKIP("Not working on Emulator without WinPCAP", SkipAll);
+#endif   
     QNativeSocketEngine udpSocket;
 
     // Initialize device #1
@@ -252,6 +255,9 @@ void tst_QNativeSocketEngine::udpLoopbackTest()
 //---------------------------------------------------------------------------
 void tst_QNativeSocketEngine::udpIPv6LoopbackTest()
 {
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Symbian: IPv6 is not yet supported", SkipAll);
+#endif    
     QNativeSocketEngine udpSocket;
 
     // Initialize device #1
@@ -303,7 +309,7 @@ void tst_QNativeSocketEngine::broadcastTest()
 {
 #ifdef Q_OS_AIX
     QSKIP("Broadcast does not work on darko", SkipAll);
-#endif
+#endif  
     QNativeSocketEngine broadcastSocket;
 
     // Initialize a regular Udp socket
@@ -395,7 +401,10 @@ void tst_QNativeSocketEngine::serverTest()
 
 //---------------------------------------------------------------------------
 void tst_QNativeSocketEngine::udpLoopbackPerformance()
-{
+{   
+#ifdef SYMBIAN_WINSOCK_CONNECTIVITY    
+    QSKIP("Not working on Emulator without WinPCAP", SkipAll);
+#endif    
     QNativeSocketEngine udpSocket;
 
     // Initialize device #1
@@ -553,7 +562,7 @@ void tst_QNativeSocketEngine::tooManySockets()
 //---------------------------------------------------------------------------
 void tst_QNativeSocketEngine::bind()
 {
-#ifndef Q_OS_WIN
+#if !defined Q_OS_WIN && !defined Q_OS_SYMBIAN
     QNativeSocketEngine binder;
     QVERIFY(binder.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
     QVERIFY(!binder.bind(QHostAddress::Any, 82));
@@ -567,7 +576,13 @@ void tst_QNativeSocketEngine::bind()
     QNativeSocketEngine binder3;
     QVERIFY(binder3.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
     QVERIFY(!binder3.bind(QHostAddress::Any, 31180));
+    
+#ifdef SYMBIAN_WINSOCK_CONNECTIVITY    
+    qDebug("On Symbian Emulator (WinSock) we get EADDRNOTAVAIL instead of EADDRINUSE");
+    QVERIFY(binder3.error() == QAbstractSocket::SocketAddressNotAvailableError); 
+#else
     QVERIFY(binder3.error() == QAbstractSocket::AddressInUseError);
+#endif 
 }
 
 //---------------------------------------------------------------------------
diff --git a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp
index 88062b07e0..cf3d856b79 100644
--- a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp
+++ b/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp
@@ -68,12 +68,14 @@ private slots:
 
 tst_QNetworkInterface::tst_QNetworkInterface()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QNetworkInterface::~tst_QNetworkInterface()
 {
 }
 
+
 void tst_QNetworkInterface::dump()
 {
     // This is for manual testing:
@@ -125,6 +127,10 @@ void tst_QNetworkInterface::loopbackIPv4()
 
 void tst_QNetworkInterface::loopbackIPv6()
 {
+#ifdef Q_OS_SYMBIAN
+    QSKIP( "Symbian: IPv6 is not yet supported", SkipAll );
+#else    
+    
     QList<QHostAddress> all = QNetworkInterface::allAddresses();
 
     bool loopbackfound = false;
@@ -138,6 +144,7 @@ void tst_QNetworkInterface::loopbackIPv6()
             anyIPv6 = true;
             
     QVERIFY(!anyIPv6 || loopbackfound);
+#endif    
 }
 
 void tst_QNetworkInterface::localAddress()
diff --git a/tests/auto/qnetworkreply/.gitattributes b/tests/auto/qnetworkreply/.gitattributes
index f0cae990fc..80252cfd34 100644
--- a/tests/auto/qnetworkreply/.gitattributes
+++ b/tests/auto/qnetworkreply/.gitattributes
@@ -1,2 +1,3 @@
-rfc3252.txt	-crlf
-bigfile	-crlf
+rfc3252.txt     -crlf
+bigfile     	-crlf
+resource	-crlf
diff --git a/tests/auto/qnetworkreply/echo/echo.pro b/tests/auto/qnetworkreply/echo/echo.pro
index bf791ffc61..74b0bfcab3 100644
--- a/tests/auto/qnetworkreply/echo/echo.pro
+++ b/tests/auto/qnetworkreply/echo/echo.pro
@@ -3,4 +3,4 @@ QT = core
 CONFIG -= app_bundle debug_and_release_target
 CONFIG += console
 
-
+symbian:TARGET.CAPABILITY="ALL -TCB"
diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro
index 71f76a2987..593de8b6c0 100644
--- a/tests/auto/qnetworkreply/test/test.pro
+++ b/tests/auto/qnetworkreply/test/test.pro
@@ -10,7 +10,7 @@ win32 {
   }
 }
 
-DEFINES += SRCDIR=\\\"$$PWD/..\\\"
+!symbian:DEFINES += SRCDIR=\\\"$$PWD/..\\\"
 
 QT = core network
 RESOURCES += ../qnetworkreply.qrc
@@ -20,3 +20,17 @@ wince*: {
     addFiles.path = .
     DEPLOYMENT += addFiles
 }
+
+symbian:{
+    addFiles.sources = ../empty ../rfc3252.txt ../resource ../bigfile
+    addFiles.path = .
+    DEPLOYMENT += addFiles
+    
+    # Symbian toolchain does not support correct include semantics
+    INCPATH+=..\..\..\..\include\QtNetwork\private
+    # bigfile test case requires more heap
+    TARGET.EPOCHEAPSIZE="0x100 0x1000000"
+    TARGET.CAPABILITY="ALL -TCB"
+}
+
+
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index cfd3dd09bd..a4c3b80ac8 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -68,8 +68,16 @@
 
 #include "private/qnetworkaccessmanager_p.h"
 
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Current path (C:\private\<UID>) contains only ascii chars
+//#define SRCDIR QDir::currentPath()
+#define SRCDIR "."
+#endif
+
 #include "../network-settings.h"
 
+
 Q_DECLARE_METATYPE(QNetworkReply*)
 Q_DECLARE_METATYPE(QAuthenticator*)
 Q_DECLARE_METATYPE(QNetworkProxy)
@@ -119,6 +127,7 @@ class tst_QNetworkReply: public QObject
 
 public:
     tst_QNetworkReply();
+    ~tst_QNetworkReply();
     QString runSimpleRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request,
                              QNetworkReplyPtr &reply, const QByteArray &data = QByteArray());
 
@@ -513,11 +522,19 @@ public:
 
         QTcpSocket *active = new QTcpSocket(this);
         active->connectToHost("127.0.0.1", server.serverPort());
+#ifndef Q_OS_SYMBIAN
         if (!active->waitForConnected(100))
             return false;
 
         if (!server.waitForNewConnection(100))
             return false;
+#else
+        if (!active->waitForConnected(5000))
+            return false;
+
+        if (!server.waitForNewConnection(5000))
+            return false;
+#endif
         QTcpSocket *passive = server.nextPendingConnection();
         passive->setParent(this);
 
@@ -926,6 +943,8 @@ public slots:
 
 tst_QNetworkReply::tst_QNetworkReply()
 {
+    Q_SET_DEFAULT_IAP
+
     testFileName = QDir::currentPath() + "/testfile";
 #ifndef Q_OS_WINCE
     uniqueExtension = QString("%1%2%3").arg((qulonglong)this).arg(rand()).arg((qulonglong)time(0));
@@ -954,6 +973,9 @@ tst_QNetworkReply::tst_QNetworkReply()
     }
 }
 
+tst_QNetworkReply::~tst_QNetworkReply()
+{ 
+}
 
 
 void tst_QNetworkReply::authenticationRequired(QNetworkReply*, QAuthenticator* auth)
@@ -1121,7 +1143,7 @@ void tst_QNetworkReply::invalidProtocol()
 
 void tst_QNetworkReply::getFromData_data()
 {
-    QTest::addColumn<QString>("request");
+	QTest::addColumn<QString>("request");
     QTest::addColumn<QByteArray>("expected");
     QTest::addColumn<QString>("mimeType");
 
@@ -1217,7 +1239,7 @@ void tst_QNetworkReply::getFromData()
 
 void tst_QNetworkReply::getFromFile()
 {
-    // create the file:
+	// create the file:
     QTemporaryFile file(QDir::currentPath() + "/temp-XXXXXX");
     file.setAutoRemove(true);
     QVERIFY(file.open());
@@ -1269,7 +1291,7 @@ void tst_QNetworkReply::getFromFileSpecial_data()
 
 void tst_QNetworkReply::getFromFileSpecial()
 {
-    QFETCH(QString, fileName);
+	QFETCH(QString, fileName);
     QFETCH(QString, url);
 
     // open the resource so we can find out its size
@@ -1299,7 +1321,7 @@ void tst_QNetworkReply::getFromFtp_data()
 
 void tst_QNetworkReply::getFromFtp()
 {
-    QFETCH(QString, referenceName);
+	QFETCH(QString, referenceName);
     QFETCH(QString, url);
 
     QFile reference(referenceName);
@@ -1328,7 +1350,7 @@ void tst_QNetworkReply::getFromHttp_data()
 
 void tst_QNetworkReply::getFromHttp()
 {
-    QFETCH(QString, referenceName);
+	QFETCH(QString, referenceName);
     QFETCH(QString, url);
 
     QFile reference(referenceName);
@@ -1366,7 +1388,7 @@ void tst_QNetworkReply::getErrors_data()
                                  << int(QNetworkReply::ContentOperationNotPermittedError) << 0 << true;
     QTest::newRow("file-exist") << QUrl::fromLocalFile(QDir::currentPath() + "/this-file-doesnt-exist.txt").toString()
                                 << int(QNetworkReply::ContentNotFoundError) << 0 << true;
-#if !defined Q_OS_WIN
+#if !defined Q_OS_WIN && !defined(Q_OS_SYMBIAN)
     QTest::newRow("file-is-wronly") << QUrl::fromLocalFile(wronlyFileName).toString()
                                     << int(QNetworkReply::ContentAccessDenied) << 0 << true;
 #endif
@@ -1801,7 +1823,11 @@ void tst_QNetworkReply::ioGetFromFtp()
     DataReader reader(reply);
 
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QTestEventLoop::instance().enterLoop(10);
+#ifdef Q_OS_SYMBIAN        
+    QTestEventLoop::instance().enterLoop(20);
+#else
+    QTestEventLoop::instance().enterLoop(10);        
+#endif        
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     QCOMPARE(reply->url(), request.url());
@@ -1831,11 +1857,19 @@ void tst_QNetworkReply::ioGetFromFtpWithReuse()
     QSignalSpy spy(reply1, SIGNAL(finished()));
 
     connect(reply2, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QTestEventLoop::instance().enterLoop(10);
+#ifdef Q_OS_SYMBIAN        
+    QTestEventLoop::instance().enterLoop(20);
+#else
+    QTestEventLoop::instance().enterLoop(10);        
+#endif 
     QVERIFY(!QTestEventLoop::instance().timeout());
     if (spy.count() == 0) {
         connect(reply1, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-        QTestEventLoop::instance().enterLoop(10);
+#ifdef Q_OS_SYMBIAN        
+        QTestEventLoop::instance().enterLoop(20);
+#else
+        QTestEventLoop::instance().enterLoop(10);        
+#endif 
         QVERIFY(!QTestEventLoop::instance().timeout());
     }
 
@@ -2524,7 +2558,11 @@ void tst_QNetworkReply::ioGetWithManyProxies()
             SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
 #endif
 
+#ifndef Q_OS_SYMBIAN    
     QTestEventLoop::instance().enterLoop(10);
+#else   
+    QTestEventLoop::instance().enterLoop(60);
+#endif     
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     manager.disconnect(SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
@@ -2653,8 +2691,13 @@ void tst_QNetworkReply::ioPutToFileFromLocalSocket()
     }
     QLocalSocket active;
     active.connectToServer(socketname);
+#ifndef Q_OS_SYMBIAN
     QVERIFY2(server.waitForNewConnection(10), server.errorString().toLatin1().constData());
     QVERIFY2(active.waitForConnected(10), active.errorString().toLatin1().constData());
+#else
+    QVERIFY2(server.waitForNewConnection(5000), server.errorString().toLatin1().constData());
+    QVERIFY2(active.waitForConnected(5000), active.errorString().toLatin1().constData());
+#endif
     QVERIFY2(server.hasPendingConnections(), server.errorString().toLatin1().constData());
     QLocalSocket *passive = server.nextPendingConnection();
 
@@ -2669,7 +2712,11 @@ void tst_QNetworkReply::ioPutToFileFromLocalSocket()
     passive->setParent(reply);
 
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+#ifndef Q_OS_SYMBIAN
     QTestEventLoop::instance().enterLoop(10);
+#else
+    QTestEventLoop::instance().enterLoop(30);
+#endif
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     QCOMPARE(reply->url(), url);
@@ -2690,18 +2737,19 @@ void tst_QNetworkReply::ioPutToFileFromProcess_data()
 
 void tst_QNetworkReply::ioPutToFileFromProcess()
 {
-#if defined(Q_OS_WINCE)
-    QSKIP("Currently no stdin/out supported for Windows CE", SkipAll);
+#if defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN)
+    QSKIP("Currently no stdin/out supported for Windows CE / Symbian OS", SkipAll);
 #endif
+
 #ifdef Q_OS_WIN
     if (qstrcmp(QTest::currentDataTag(), "small") == 0)
         QSKIP("When passing a CR-LF-LF sequence through Windows stdio, it gets converted, "
               "so this test fails. Disabled on Windows", SkipSingle);
 #endif
+
 #if defined(QT_NO_PROCESS)
     QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll);
 #else
-
     QFile file(testFileName);
 
     QUrl url = QUrl::fromLocalFile(file.fileName());
@@ -3231,7 +3279,6 @@ void tst_QNetworkReply::downloadPerformance()
 {
     // unlike the above function, this one tries to send as fast as possible
     // and measures how fast it was.
-
     TimedSender sender(5000);
     QNetworkRequest request("debugpipe://127.0.0.1:" + QString::number(sender.serverPort()) + "/?bare=1");
     QNetworkReplyPtr reply = manager.get(request);
@@ -3358,7 +3405,11 @@ void tst_QNetworkReply::downloadProgress_data()
 
     QTest::newRow("empty") << 0;
     QTest::newRow("small") << 4;
+#ifndef Q_OS_SYMBIAN
     QTest::newRow("big") << 4096;
+#else
+    QTest::newRow("big") << 1024;
+#endif
 }
 
 void tst_QNetworkReply::downloadProgress()
@@ -3387,11 +3438,20 @@ void tst_QNetworkReply::downloadProgress()
 
     QFETCH(int, loopCount);
     for (int i = 1; i <= loopCount; ++i) {
+#ifdef Q_OS_SYMBIAN
+        if(i % 500 == 0) {
+            qWarning("iteration %d", i);
+        }
+#endif
         sender->write(data);
         QVERIFY2(sender->waitForBytesWritten(2000), "Network timeout");
 
         spy.clear();
+#ifdef Q_OS_SYMBIAN        
+        QTestEventLoop::instance().enterLoop(5);
+#else
         QTestEventLoop::instance().enterLoop(2);
+#endif            
         QVERIFY(!QTestEventLoop::instance().timeout());
         QVERIFY(spy.count() > 0);
         QVERIFY(!reply->isFinished());
@@ -3406,7 +3466,11 @@ void tst_QNetworkReply::downloadProgress()
     delete sender;
 
     spy.clear();
+#ifdef Q_OS_SYMBIAN        
+    QTestEventLoop::instance().enterLoop(5);
+#else
     QTestEventLoop::instance().enterLoop(2);
+#endif    
     QVERIFY(!QTestEventLoop::instance().timeout());
     QVERIFY(spy.count() > 0);
     QVERIFY(!reply->isRunning());
@@ -3423,7 +3487,7 @@ void tst_QNetworkReply::uploadProgress_data()
 }
 
 void tst_QNetworkReply::uploadProgress()
-{
+{  
     QFETCH(QByteArray, data);
     QTcpServer server;
     QVERIFY(server.listen());
@@ -3541,7 +3605,7 @@ void tst_QNetworkReply::receiveCookiesFromHttp_data()
 
 void tst_QNetworkReply::receiveCookiesFromHttp()
 {
-    QFETCH(QString, cookieString);
+	QFETCH(QString, cookieString);
 
     QByteArray data = cookieString.toLatin1() + '\n';
     QUrl url("http://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/set-cookie.cgi");
@@ -3694,7 +3758,13 @@ void tst_QNetworkReply::httpProxyCommands()
 
     // wait for the finished signal
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QTestEventLoop::instance().enterLoop(1);
+
+#ifdef Q_OS_SYMBIAN        
+    QTestEventLoop::instance().enterLoop(5);
+#else
+    QTestEventLoop::instance().enterLoop(1);        
+#endif        
+
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     //qDebug() << reply->error() << reply->errorString();
diff --git a/tests/auto/qnumeric/qnumeric.pro b/tests/auto/qnumeric/qnumeric.pro
index 317628477e..162f980f9c 100644
--- a/tests/auto/qnumeric/qnumeric.pro
+++ b/tests/auto/qnumeric/qnumeric.pro
@@ -3,5 +3,4 @@ load(qttest_p4)
 QT = core
 
 SOURCES += tst_qnumeric.cpp
-
-
+QT = core
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index 3df83d79f6..2627b8dca6 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -1169,7 +1169,7 @@ Q_DECLARE_METATYPE(PropertyObject::Priority)
 
 void tst_QObject::threadSignalEmissionCrash()
 {
-#ifdef Q_OS_WINCE
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     int loopCount = 100;
 #else
     int loopCount = 1000;
@@ -1419,8 +1419,18 @@ void tst_QObject::moveToThread()
         MoveToThreadObject *child = new MoveToThreadObject(object);
 
         connect(object, SIGNAL(theSignal()), &thread, SLOT(quit()), Qt::DirectConnection);
+
+#if defined(Q_OS_SYMBIAN)
+        // Child timer will be registered after parent timer in the new
+        // thread, and 10ms is less than symbian timer resolution, so
+        // child->timerEventThread compare after thread.wait() will 
+        // usually fail unless timers are farther apart.
+        child->startTimer(100);
+        object->startTimer(150);
+#else
         child->startTimer(90);
         object->startTimer(100);
+#endif
 
         QCOMPARE(object->thread(), currentThread);
         QCOMPARE(child->thread(), currentThread);
@@ -2427,7 +2437,9 @@ void tst_QObject::dynamicProperties()
 
 void tst_QObject::recursiveSignalEmission()
 {
-#ifdef QT_NO_PROCESS
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+    QSKIP("Emulator builds in Symbian do not support launching processes linking to Qt", SkipAll);
+#elif defined(QT_NO_PROCESS)
     QSKIP("Test requires QProcess", SkipAll);
 #else
     QProcess proc;
diff --git a/tests/auto/qobject/tst_qobject.pro b/tests/auto/qobject/tst_qobject.pro
index 9b2fec1243..b3bda37e12 100644
--- a/tests/auto/qobject/tst_qobject.pro
+++ b/tests/auto/qobject/tst_qobject.pro
@@ -10,3 +10,9 @@ wince*: {
    DEPLOYMENT += addFiles
 }
 
+symbian: {
+    addFiles.sources = signalbug.exe
+    addFiles.path = \sys\bin
+    DEPLOYMENT += addFiles
+}
+
diff --git a/tests/auto/qobjectrace/qobjectrace.pro b/tests/auto/qobjectrace/qobjectrace.pro
index 581c63f309..322adff6a0 100644
--- a/tests/auto/qobjectrace/qobjectrace.pro
+++ b/tests/auto/qobjectrace/qobjectrace.pro
@@ -1,6 +1,5 @@
 load(qttest_p4)
 SOURCES += tst_qobjectrace.cpp
-
 QT = core
 
-
+TARGET.EPOCHEAPSIZE = 20000000 40000000
diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/qobjectrace/tst_qobjectrace.cpp
index 66841253d8..1bd09cdfb2 100644
--- a/tests/auto/qobjectrace/tst_qobjectrace.cpp
+++ b/tests/auto/qobjectrace/tst_qobjectrace.cpp
@@ -44,7 +44,10 @@
 #include <QtTest/QtTest>
 
 
-enum { OneMinute = 60 * 1000, TwoMinutes = OneMinute * 2 };
+enum { OneMinute = 60 * 1000, 
+       TwoMinutes = OneMinute * 2, 
+       TenMinutes = OneMinute * 10,
+       TwentyFiveMinutes = OneMinute * 25 };
 
 class tst_QObjectRace: public QObject
 {
@@ -136,6 +139,11 @@ private slots:
 
 void tst_QObjectRace::moveToThreadRace()
 {
+#if defined(Q_OS_SYMBIAN)
+    // ### FIXME: task 257411 - remove xfail once this is fixed
+    QEXPECT_FAIL("", "Symbian event dispatcher can't handle this kind of race, see task: 257411", Abort);
+    QVERIFY(false);
+#endif    
     RaceObject *object = new RaceObject;
 
     enum { ThreadCount = 6 };
@@ -210,8 +218,24 @@ public:
     }
 };
 
+#if defined(Q_OS_SYMBIAN)
+// Symbian needs "a bit" more time
+# define EXTRA_THREAD_WAIT TenMinutes
+# define MAIN_THREAD_WAIT TwentyFiveMinutes
+#else    
+# define EXTRA_THREAD_WAIT 3000
+# define MAIN_THREAD_WAIT TwoMinutes
+#endif
+
 void tst_QObjectRace::destroyRace()
 {
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+    // ### FIXME: task 257411 - remove xfail once this is fixed. 
+	// Oddly enough, this seems to work properly in HW, if given enough time and memory.
+    QEXPECT_FAIL("", "Symbian event dispatcher can't handle this kind of race on emulator, see task: 257411", Abort);
+    QVERIFY(false);
+#endif    
+
     enum { ThreadCount = 10, ObjectCountPerThread = 733, 
            ObjectCount = ThreadCount * ObjectCountPerThread };
 
@@ -244,10 +268,10 @@ void tst_QObjectRace::destroyRace()
     for (int i = 0; i < ThreadCount; ++i)
         threads[i]->start();
 
-    QVERIFY(threads[0]->wait(TwoMinutes));
+    QVERIFY(threads[0]->wait(MAIN_THREAD_WAIT));
     // the other threads should finish pretty quickly now
     for (int i = 1; i < ThreadCount; ++i)
-        QVERIFY(threads[i]->wait(3000));
+        QVERIFY(threads[i]->wait(EXTRA_THREAD_WAIT));
 
     for (int i = 0; i < ThreadCount; ++i)
         delete threads[i];
diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro
index 277039f0c4..1b3659d87e 100644
--- a/tests/auto/qpainter/qpainter.pro
+++ b/tests/auto/qpainter/qpainter.pro
@@ -1,12 +1,15 @@
 load(qttest_p4)
 contains(QT_CONFIG, qt3support): QT += qt3support
 SOURCES  += tst_qpainter.cpp
-wince*: {
-    DEFINES += SRCDIR=\\\".\\\"
+wince*|symbian*: {
     addFiles.sources = drawEllipse drawLine_rop_bitmap drawPixmap_rop drawPixmap_rop_bitmap task217400.png
     addFiles.path = .
     DEPLOYMENT += addFiles
-} else {
+}
+
+wince* {
+    DEFINES += SRCDIR=\\\".\\\"
+} !symbian {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
 
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index 5e5bd399b5..bbfa3e6a63 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -50,7 +50,7 @@
 #include <qbitmap.h>
 #include <qimage.h>
 #include <limits.h>
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
 #include <qprinter.h>
 #include <math.h>
 #ifdef QT3_SUPPORT
@@ -67,6 +67,10 @@
 
 #include <qqueue.h>
 
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR "."
+#endif
+
 Q_DECLARE_METATYPE(QLine)
 Q_DECLARE_METATYPE(QRect)
 Q_DECLARE_METATYPE(QSize)
@@ -528,8 +532,7 @@ void tst_QPainter::qt_format_text_boundingRect()
 			QCOMPARE(pbr, br);
 		    }
 #endif
-
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
 		    {
 			QPrinter printer(QPrinter::HighResolution);
 			if (printer.printerName().isEmpty()) {
@@ -1425,7 +1428,7 @@ void tst_QPainter::drawPath2()
 
 void tst_QPainter::drawPath3()
 {
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QImage imgA(400, 400, QImage::Format_RGB32);
 #else
     QImage imgA(100, 100, QImage::Format_RGB32);
@@ -2962,7 +2965,7 @@ void tst_QPainter::monoImages()
     }
 }
 
-#if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS)
+#if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(Q_OS_SYMBIAN)
 #include <fenv.h>
 
 static const QString fpeExceptionString(int exception)
diff --git a/tests/auto/qpathclipper/qpathclipper.pro b/tests/auto/qpathclipper/qpathclipper.pro
index dc9d60f7c0..930a6f28ce 100644
--- a/tests/auto/qpathclipper/qpathclipper.pro
+++ b/tests/auto/qpathclipper/qpathclipper.pro
@@ -5,6 +5,6 @@ SOURCES  += tst_qpathclipper.cpp paths.cpp
 
 requires(contains(QT_CONFIG,private_tests))
 
-unix:!mac:LIBS+=-lm
+unix:!mac:!symbian*:LIBS+=-lm
 
 
diff --git a/tests/auto/qpen/tst_qpen.cpp b/tests/auto/qpen/tst_qpen.cpp
index f51e657dc3..f379e41a23 100644
--- a/tests/auto/qpen/tst_qpen.cpp
+++ b/tests/auto/qpen/tst_qpen.cpp
@@ -111,22 +111,22 @@ void tst_QPen::operator_eq_eq_data()
 
     QTest::newRow("differentColor") << QPen(Qt::red)
 				 << QPen(Qt::blue)
-				 << FALSE;
+				 << bool(FALSE);
     QTest::newRow("differentWidth") << QPen(Qt::red, 2)
 				 << QPen(Qt::red, 3)
-				 << FALSE;
+				 << bool(FALSE);
     QTest::newRow("differentPenStyle") << QPen(Qt::red, 2, Qt::DashLine)
 				    << QPen(Qt::red, 2, Qt::DotLine)
-				    << FALSE;
+				    << bool(FALSE);
     QTest::newRow("differentCapStyle") << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::BevelJoin)
 				    << QPen(Qt::red, 2, Qt::DashLine, Qt::SquareCap, Qt::BevelJoin)
-				    << FALSE;
+				    << bool(FALSE);
     QTest::newRow("differentJoinStyle") << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::BevelJoin)
 				     << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::MiterJoin)
-				     << FALSE;
+				     << bool(FALSE);
     QTest::newRow("same") << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::BevelJoin)
 		       << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::BevelJoin)
-		       << TRUE;
+		       << bool(TRUE);
 
 }
 
diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/qpixmap/qpixmap.pro
index 70be4be6fb..02ed3f2f03 100644
--- a/tests/auto/qpixmap/qpixmap.pro
+++ b/tests/auto/qpixmap/qpixmap.pro
@@ -1,13 +1,19 @@
 load(qttest_p4)
 SOURCES  += tst_qpixmap.cpp
 contains(QT_CONFIG, qt3support): QT += qt3support
-wince*: {
+wince*|symbian*: {
    task31722_0.sources = convertFromImage/task31722_0/*
    task31722_0.path    = convertFromImage/task31722_0
    task31722_1.sources = convertFromImage/task31722_1/*
    task31722_1.path    = convertFromImage/task31722_1
    DEPLOYMENT += task31722_0 task31722_1
+}
+
+wince*: {
    DEFINES += SRCDIR=\\\".\\\"
+} symbian*: {
+   DEPLOYMENT_PLUGIN += qmng
+   LIBS += -lfbscli.dll -lbitgdi.dll -lgdi.dll
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
    win32:LIBS += -lgdi32 -luser32
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index b3736ab9e6..52bad411f6 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -60,9 +60,19 @@
 #include <qscreen_qws.h>
 #endif
 
+#ifdef Q_OS_SYMBIAN
+#include <e32std.h>
+#include <fbs.h>
+#include <gdi.h>
+#include <bitdev.h>
+#endif
+
+
 //TESTED_CLASS=
 //TESTED_FILES=
-
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#endif
 Q_DECLARE_METATYPE(QImage::Format)
 
 class tst_QPixmap : public QObject
@@ -123,6 +133,11 @@ private slots:
     void fromWinHBITMAP();
 #endif
 
+#if defined(Q_WS_S60)
+    void fromSymbianCFbsBitmap_data();
+    void fromSymbianCFbsBitmap();
+#endif
+
     void onlyNullPixmapsOutsideGuiThread();
     void refUnref();
 
@@ -307,8 +322,11 @@ void tst_QPixmap::convertFromImage_data()
 {
     QTest::addColumn<QImage>("img1");
     QTest::addColumn<QImage>("img2");
-
+#ifdef Q_OS_SYMBIAN
+    const QString prefix = QLatin1String(SRCDIR) + "convertFromImage";
+#else
     const QString prefix = QLatin1String(SRCDIR) + "/convertFromImage";
+#endif
     {
         QImage img1;
         QImage img2;
@@ -921,6 +939,94 @@ void tst_QPixmap::fromWinHBITMAP()
 
 #endif
 
+#if defined(Q_WS_S60)
+Q_DECLARE_METATYPE(TDisplayMode)
+
+void tst_QPixmap::fromSymbianCFbsBitmap_data()
+{
+    QTest::addColumn<TDisplayMode>("format");
+    QTest::addColumn<int>("width");
+    QTest::addColumn<int>("height");
+    QTest::addColumn<QColor>("color");
+
+    const int smallWidth = 20;
+    const int smallHeight = 20;
+    const int largeWidth = 240;
+    const int largeHeight = 320;
+
+    // Indexed Color Formats - Disabled since images seem to be blank -> no palette?
+//    QTest::newRow("EGray2 small") << EGray2 << smallWidth << smallHeight << QColor(Qt::black);
+//    QTest::newRow("EGray2 big") << EGray2 << largeWidth << largeHeight << QColor(Qt::black);
+//    QTest::newRow("EGray256 small") << EGray256 << smallWidth << smallHeight << QColor(Qt::blue);
+//    QTest::newRow("EGray256 big") << EGray256 << largeWidth << largeHeight << QColor(Qt::blue);
+//    QTest::newRow("EColor256 small") << EColor256 << smallWidth << smallHeight << QColor(Qt::red);
+//    QTest::newRow("EColor256 big") << EColor256 << largeWidth << largeHeight << QColor(Qt::red);
+
+    // Direct Color Formats
+    QTest::newRow("EColor4K small") << EColor4K << smallWidth << smallHeight << QColor(Qt::red);
+    QTest::newRow("EColor4K big") << EColor4K << largeWidth << largeHeight << QColor(Qt::red);
+    QTest::newRow("EColor64K small") << EColor64K << smallWidth << smallHeight << QColor(Qt::green);
+    QTest::newRow("EColor64K big") << EColor64K << largeWidth << largeHeight << QColor(Qt::green);
+    QTest::newRow("EColor16MU small") << EColor16MU << smallWidth << smallHeight << QColor(Qt::red);
+    QTest::newRow("EColor16MU big") << EColor16MU << largeWidth << largeHeight << QColor(Qt::red);
+    QTest::newRow("EColor16MA small opaque") << EColor16MA << smallWidth << smallHeight << QColor(255, 255, 0);
+    QTest::newRow("EColor16MA big opaque") << EColor16MA << largeWidth << largeHeight << QColor(255, 255, 0);
+
+    // Semi-transparent Colors - Disabled for now, since the QCOMPARE fails, but visually confirmed to work
+//    QTest::newRow("EColor16MA small semi") << EColor16MA << smallWidth << smallHeight << QColor(255, 255, 0, 127);
+//    QTest::newRow("EColor16MA big semi") << EColor16MA << largeWidth << largeHeight << QColor(255, 255, 0, 127);
+//    QTest::newRow("EColor16MA small trans") << EColor16MA << smallWidth << smallHeight << QColor(255, 255, 0, 0);
+//    QTest::newRow("EColor16MA big trans") << EColor16MA << largeWidth << largeHeight << QColor(255, 255, 0, 0);
+
+#if !defined(__SERIES60_31__) && !defined(__S60_32__)
+    QTest::newRow("EColor16MAP small") << EColor16MAP << smallWidth << smallHeight << QColor(Qt::red);
+    QTest::newRow("EColor16MAP big") << EColor16MAP << largeWidth << largeHeight << QColor(Qt::red);
+#endif
+}
+
+void tst_QPixmap::fromSymbianCFbsBitmap()
+{
+    QFETCH(TDisplayMode, format);
+    QFETCH(int, width);
+    QFETCH(int, height);
+    QFETCH(QColor, color);
+    int expectedDepth = TDisplayModeUtils::NumDisplayModeBitsPerPixel(format);
+
+    CFbsBitmap *nativeBitmap = 0;
+    CFbsBitmapDevice *bitmapDevice = 0;
+    CBitmapContext *bitmapContext = 0;
+
+    nativeBitmap = new (ELeave) CFbsBitmap();
+    TInt err = nativeBitmap->Create(TSize(width, height), format);
+    CleanupStack::PushL(nativeBitmap);
+    QVERIFY(err == KErrNone);
+    bitmapDevice = CFbsBitmapDevice::NewL(nativeBitmap);
+    CleanupStack::PushL(bitmapDevice);
+
+    err = bitmapDevice->CreateBitmapContext(bitmapContext);
+    CleanupStack::PushL(bitmapContext);
+    QVERIFY(err == KErrNone);
+    TRgb symbianColor = TRgb(color.red(), color.green(), color.blue(), color.alpha());
+    bitmapContext->SetBrushColor(symbianColor);
+    bitmapContext->Clear();
+
+    __UHEAP_MARK;
+    { // Test the normal case
+        QPixmap pixmap = QPixmap::fromSymbianCFbsBitmap(nativeBitmap);
+//        QCOMPARE(pixmap.depth(), expectedDepth); // Depth is not preserved now
+        QCOMPARE(pixmap.width(), width);
+        QCOMPARE(pixmap.height(), height);
+        QImage image = pixmap.toImage();
+
+        QColor actualColor(image.pixel(1, 1));
+        QCOMPARE(actualColor, color);
+    }
+    __UHEAP_MARKEND;
+
+    CleanupStack::PopAndDestroy(3);
+}
+#endif
+
 void tst_QPixmap::onlyNullPixmapsOutsideGuiThread()
 {
 #if !defined(Q_WS_WIN)
@@ -946,9 +1052,17 @@ void tst_QPixmap::onlyNullPixmapsOutsideGuiThread()
         }
     };
     Thread thread;
+#if defined(Q_OS_SYMBIAN)
+    thread.setStackSize(0x10000);
+#endif
     thread.start();
+#if defined(Q_OS_SYMBIAN)
+    QVERIFY(thread.wait(10000));
+#else
     thread.wait();
 #endif
+
+#endif // !defined(Q_WS_WIN)
 }
 
 void tst_QPixmap::refUnref()
diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
index 40ad539ee2..299a01e646 100644
--- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
@@ -87,24 +87,32 @@ public slots:
     void cleanup();
 private slots:
     void getSetCheck();
+#ifndef QT_NO_CLIPBOARD
     void clearMustNotChangeClipboard();
+#endif
     void clearMustNotResetRootFrameMarginToDefault();
     void paragSeparatorOnPlaintextAppend();
+#ifndef QT_NO_CLIPBOARD
     void selectAllSetsNotSelection();
+#endif
     void asciiTab();
     void setDocument();
     void emptyAppend();
     void appendOnEmptyDocumentShouldReuseInitialParagraph();
     void cursorPositionChanged();
     void setTextCursor();
+#ifndef QT_NO_CLIPBOARD
     void undoAvailableAfterPaste();
+#endif
     void undoRedoAvailableRepetition();
     void appendShouldNotTouchTheSelection();
     void backspace();
     void shiftBackspace();
     void undoRedo();
     void preserveCharFormatInAppend();
+#ifndef QT_NO_CLIPBOARD
     void copyAndSelectAllInReadonly();
+#endif
     void ctrlAltInput();
     void noPropertiesOnDefaultTextEditCharFormat();
     void setPlainTextShouldEmitTextChangedOnce();
@@ -118,13 +126,17 @@ private slots:
     void undoRedoAfterSetContent();
     void numPadKeyNavigation();
     void moveCursor();
+#ifndef QT_NO_CLIPBOARD
     void mimeDataReimplementations();
+#endif
     void shiftEnterShouldInsertLineSeparator();
     void selectWordsFromStringsContainingSeparators_data();
     void selectWordsFromStringsContainingSeparators();
+#ifndef QT_NO_CLIPBOARD
     void canPaste();
     void copyAvailable_data();
     void copyAvailable();
+#endif
     void ensureCursorVisibleOnInitialShow();
     void setTextInsideResizeEvent();
     void colorfulAppend();
@@ -209,7 +221,7 @@ void tst_QPlainTextEdit::getSetCheck()
     QCOMPARE(0, obj1.tabStopWidth());
     obj1.setTabStopWidth(INT_MIN);
     QCOMPARE(0, obj1.tabStopWidth()); // Makes no sense to set a negative tabstop value
-#if defined(QT_ARCH_WINDOWSCE)
+#if defined(QT_ARCH_WINDOWSCE) || defined (QT_ARCH_SYMBIAN)
     // due to rounding error in qRound when qreal==float
     // we cannot use INT_MAX for this check
     obj1.setTabStopWidth(SHRT_MAX*2);
@@ -290,7 +302,7 @@ void tst_QPlainTextEdit::createSelection()
 #endif
     QCOMPARE(ed->textCursor().position(), 11);
 }
-
+#ifndef QT_NO_CLIPBOARD
 void tst_QPlainTextEdit::clearMustNotChangeClipboard()
 {
     if (!nativeClipboardWorking())
@@ -301,6 +313,7 @@ void tst_QPlainTextEdit::clearMustNotChangeClipboard()
     ed->clear();
     QCOMPARE(QApplication::clipboard()->text(), txt);
 }
+#endif
 
 void tst_QPlainTextEdit::clearMustNotResetRootFrameMarginToDefault()
 {
@@ -322,6 +335,7 @@ void tst_QPlainTextEdit::paragSeparatorOnPlaintextAppend()
     QCOMPARE(cnt, 2);
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QPlainTextEdit::selectAllSetsNotSelection()
 {
     if (!QApplication::clipboard()->supportsSelection()) {
@@ -337,6 +351,7 @@ void tst_QPlainTextEdit::selectAllSetsNotSelection()
 
     QCOMPARE(QApplication::clipboard()->text(QClipboard::Selection), QString::fromAscii("foobar"));
 }
+#endif
 
 void tst_QPlainTextEdit::asciiTab()
 {
@@ -466,6 +481,7 @@ void tst_QPlainTextEdit::setTextCursor()
     QCOMPARE(spy.count(), 1);
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QPlainTextEdit::undoAvailableAfterPaste()
 {
     if (!nativeClipboardWorking())
@@ -479,6 +495,7 @@ void tst_QPlainTextEdit::undoAvailableAfterPaste()
     QVERIFY(spy.count() >= 1);
     QCOMPARE(ed->toPlainText(), txt);
 }
+#endif
 
 class UndoRedoRecorder : public QObject
 {
@@ -657,6 +674,7 @@ void tst_QPlainTextEdit::preserveCharFormatInAppend()
     QCOMPARE(cursor.block().text(), QString("third para"));
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QPlainTextEdit::copyAndSelectAllInReadonly()
 {
     if (!nativeClipboardWorking())
@@ -687,6 +705,7 @@ void tst_QPlainTextEdit::copyAndSelectAllInReadonly()
     QTest::keyClick(ed, Qt::Key_C, Qt::ControlModifier);
     QCOMPARE(QApplication::clipboard()->text(), QString("Hello World"));
 }
+#endif
 
 void tst_QPlainTextEdit::ctrlAltInput()
 {
@@ -903,6 +922,7 @@ void tst_QPlainTextEdit::implicitClear()
     QVERIFY(ed->toPlainText().isEmpty());
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QPlainTextEdit::copyAvailable_data()
 {
     QTest::addColumn<pairListType>("keystrokes");
@@ -1020,6 +1040,7 @@ void tst_QPlainTextEdit::copyAvailable()
         QVERIFY2(variantSpyCopyAvailable.toBool() == copyAvailable.at(i), QString("Spied singnal: %1").arg(i).toLatin1());
     }
 }
+#endif
 
 void tst_QPlainTextEdit::undoRedoAfterSetContent()
 {
@@ -1085,6 +1106,7 @@ public:
 
 };
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QPlainTextEdit::mimeDataReimplementations()
 {
     MyTextEdit ed;
@@ -1123,6 +1145,7 @@ void tst_QPlainTextEdit::mimeDataReimplementations()
     QCOMPARE(ed.insertCallCount, 1);
 #endif
 }
+#endif
 
 void tst_QPlainTextEdit::shiftEnterShouldInsertLineSeparator()
 {
@@ -1162,6 +1185,7 @@ void tst_QPlainTextEdit::selectWordsFromStringsContainingSeparators()
     cursor.clearSelection();
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QPlainTextEdit::canPaste()
 {
     if (!nativeClipboardWorking())
@@ -1174,6 +1198,7 @@ void tst_QPlainTextEdit::canPaste()
     ed->setTextInteractionFlags(Qt::NoTextInteraction);
     QVERIFY(!ed->canPaste());
 }
+#endif
 
 void tst_QPlainTextEdit::ensureCursorVisibleOnInitialShow()
 {
diff --git a/tests/auto/qplugin/debugplugin/debugplugin.pro b/tests/auto/qplugin/debugplugin/debugplugin.pro
index cb2ac34713..d0762fc101 100644
--- a/tests/auto/qplugin/debugplugin/debugplugin.pro
+++ b/tests/auto/qplugin/debugplugin/debugplugin.pro
@@ -5,3 +5,7 @@ SOURCES = main.cpp
 QT = core
 DESTDIR = ../plugins
 
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+    TARGET.CAPABILITY=ALL -TCB
+}
diff --git a/tests/auto/qplugin/qplugin.pro b/tests/auto/qplugin/qplugin.pro
index 818bb0d2f8..aafcb36209 100644
--- a/tests/auto/qplugin/qplugin.pro
+++ b/tests/auto/qplugin/qplugin.pro
@@ -1,3 +1,4 @@
+QT = core
 TEMPLATE = subdirs
 win32 {
     exists($$[QT_INSTALL_LIBS]/QtCore4.dll) {
diff --git a/tests/auto/qplugin/releaseplugin/releaseplugin.pro b/tests/auto/qplugin/releaseplugin/releaseplugin.pro
index 21177b80d1..ce66aaf7cb 100644
--- a/tests/auto/qplugin/releaseplugin/releaseplugin.pro
+++ b/tests/auto/qplugin/releaseplugin/releaseplugin.pro
@@ -5,3 +5,7 @@ SOURCES = main.cpp
 QT = core
 DESTDIR = ../plugins
 
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+    TARGET.CAPABILITY=ALL -TCB
+}
diff --git a/tests/auto/qplugin/tst_qplugin.pro b/tests/auto/qplugin/tst_qplugin.pro
index aa5842a35e..0d9d809132 100644
--- a/tests/auto/qplugin/tst_qplugin.pro
+++ b/tests/auto/qplugin/tst_qplugin.pro
@@ -1,6 +1,7 @@
+load(qttest_p4)
+
 SOURCES = tst_qplugin.cpp
 QT = core
-CONFIG += qtestlib
 
 wince*: {
    plugins.sources = plugins/*
@@ -8,3 +9,8 @@ wince*: {
    DEPLOYMENT += plugins
 }
 
+symbian: {
+    rpDep.sources = releaseplugin.dll debugplugin.dll
+    rpDep.path = plugins
+    DEPLOYMENT += rpDep dpDep
+}
diff --git a/tests/auto/qpluginloader/lib/lib.pro b/tests/auto/qpluginloader/lib/lib.pro
index 7e842f2ef2..96a97325bb 100644
--- a/tests/auto/qpluginloader/lib/lib.pro
+++ b/tests/auto/qpluginloader/lib/lib.pro
@@ -12,4 +12,7 @@ win32-borland: DEFINES += WIN32_BORLAND
 #no special install rule for the library used by test
 INSTALLS =
 
+symbian: {
+    TARGET.CAPABILITY=ALL -TCB
+}
 
diff --git a/tests/auto/qpluginloader/qpluginloader.pro b/tests/auto/qpluginloader/qpluginloader.pro
index 50c17ed36d..382d6e4e91 100644
--- a/tests/auto/qpluginloader/qpluginloader.pro
+++ b/tests/auto/qpluginloader/qpluginloader.pro
@@ -1,9 +1,10 @@
+QT = core
 TEMPLATE    =	subdirs
 CONFIG  += ordered
 SUBDIRS	=	lib \
                 theplugin \
 		tst
-!win32: !macx-*: SUBDIRS += almostplugin
+!win32: !macx-*: !symbian: SUBDIRS += almostplugin
 TARGET = tst_qpluginloader
 
 # no special install rule for subdir
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.pro b/tests/auto/qpluginloader/theplugin/theplugin.pro
index d8d87b08c1..44b46b439f 100644
--- a/tests/auto/qpluginloader/theplugin/theplugin.pro
+++ b/tests/auto/qpluginloader/theplugin/theplugin.pro
@@ -5,3 +5,7 @@ SOURCES       = theplugin.cpp
 TARGET        = $$qtLibraryTarget(theplugin)
 DESTDIR       = ../bin
 
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+    TARGET.CAPABILITY=ALL -TCB
+}
diff --git a/tests/auto/qpluginloader/tst/tst.pro b/tests/auto/qpluginloader/tst/tst.pro
index 5331f09d0c..f848bb1029 100644
--- a/tests/auto/qpluginloader/tst/tst.pro
+++ b/tests/auto/qpluginloader/tst/tst.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES         += ../tst_qpluginloader.cpp
 TARGET  = ../tst_qpluginloader
 QT = core
+HEADERS += ../theplugin/plugininterface.h
 
 win32 {
   CONFIG(debug, debug|release) {
@@ -18,3 +19,12 @@ wince*: {
    DEPLOYMENT += addFiles
 }
 
+symbian: {
+   libDep.sources = mylib.dll
+   libDep.path = /sys/bin
+   pluginDep.sources = theplugin.dll
+   pluginDep.path = bin
+   
+   DEPLOYMENT += libDep pluginDep
+}
+
diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp
index 8221325882..5f07c784b6 100644
--- a/tests/auto/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp
@@ -87,6 +87,12 @@
 # endif
 # define PREFIX         ""
 
+#elif defined(Q_OS_SYMBIAN)
+# undef dll_VALID
+# define dll_VALID      true
+# define SUFFIX         ".dll"
+# define PREFIX         ""
+
 #else  // all other Unix
 # undef so_VALID
 # define so_VALID       true
@@ -116,7 +122,7 @@ private slots:
     void errorString();
     void loadHints();
     void deleteinstanceOnUnload();
-
+    void checkingStubsFromDifferentDrives();
 };
 
 tst_QPluginLoader::tst_QPluginLoader()
@@ -210,7 +216,7 @@ void tst_QPluginLoader::errorString()
     QVERIFY(loader.errorString() != unknown);
     }
 
-#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_HPUX
+#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_HPUX && !defined Q_OS_SYMBIAN
     {
     QPluginLoader loader( sys_qualifiedLibraryName("almostplugin"));     //a plugin with unresolved symbols
     loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
@@ -242,6 +248,11 @@ void tst_QPluginLoader::errorString()
     QVERIFY(loader.instance() !=  static_cast<QObject*>(0));
     QCOMPARE(loader.errorString(), unknown);
 
+    // Make sure that plugin really works
+    PluginInterface* theplugin = qobject_cast<PluginInterface*>(loader.instance());
+    QString pluginName = theplugin->pluginName();
+    QCOMPARE(pluginName, QLatin1String("Plugin ok"));
+
     QCOMPARE(loader.unload(), true);
     QCOMPARE(loader.errorString(), unknown);
     }
@@ -286,6 +297,56 @@ void tst_QPluginLoader::deleteinstanceOnUnload()
     }
 }
 
+void tst_QPluginLoader::checkingStubsFromDifferentDrives()
+{
+#if defined(Q_OS_SYMBIAN)
+
+    // This test needs C-drive + some additional drive (driveForStubs)
+
+    const QString driveForStubs("E:/");// != "C:/" 
+    const QString stubDir("system/temp/stubtest/");
+    const QString stubName("dummyStub.qtplugin");
+    const QString fullStubFileName(stubDir + stubName);
+    QDir dir(driveForStubs);
+    bool test1(false); bool test2(false);
+    
+    // initial clean up
+    QFile::remove(driveForStubs + fullStubFileName);
+    dir.rmdir(driveForStubs + stubDir);
+
+    // create a stub dir and do stub drive check
+    if (!dir.mkpath(stubDir))
+        QSKIP("Required drive not available for this test", SkipSingle);
+    
+    {// test without stub, should not be found
+    QPluginLoader loader("C:/" + fullStubFileName);
+    test1 = !loader.fileName().length();
+    }    
+    
+    // create a stub to defined drive
+    QFile tempFile(driveForStubs + fullStubFileName);
+    tempFile.open(QIODevice::ReadWrite);
+    QFileInfo fileInfo(tempFile);
+    
+    {// now should be found even tried to find from C:   
+    QPluginLoader loader("C:/" + fullStubFileName);
+    test2 = (loader.fileName() == fileInfo.absoluteFilePath());
+    }
+    
+    // clean up
+    tempFile.close();
+    if (!QFile::remove(driveForStubs + fullStubFileName))
+        QWARN("Could not remove stub file");
+    if (!dir.rmdir(driveForStubs + stubDir))
+        QWARN("Could not remove stub directory");
+
+    // test after cleanup
+    QVERIFY(test1);
+    QVERIFY(test2);
+    
+#endif//Q_OS_SYMBIAN
+}
+
 QTEST_APPLESS_MAIN(tst_QPluginLoader)
 #include "tst_qpluginloader.moc"
 
diff --git a/tests/auto/qpoint/qpoint.pro b/tests/auto/qpoint/qpoint.pro
index 734fd3cdd4..8b006c2412 100644
--- a/tests/auto/qpoint/qpoint.pro
+++ b/tests/auto/qpoint/qpoint.pro
@@ -3,8 +3,5 @@
 ############################################################
 
 load(qttest_p4)
-QT = core
-
 SOURCES += tst_qpoint.cpp
-
-
+QT = core
diff --git a/tests/auto/qpointarray/qpointarray.pro b/tests/auto/qpointarray/qpointarray.pro
index d864337546..9ddbf75995 100644
--- a/tests/auto/qpointarray/qpointarray.pro
+++ b/tests/auto/qpointarray/qpointarray.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 SOURCES  += tst_qpointarray.cpp
 
-unix:!mac:LIBS+=-lm
+unix:!mac:!symbian:LIBS+=-lm
 
 
diff --git a/tests/auto/qprocess/qprocess.pro b/tests/auto/qprocess/qprocess.pro
index ed59f106bd..047828a0c6 100644
--- a/tests/auto/qprocess/qprocess.pro
+++ b/tests/auto/qprocess/qprocess.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+
 SUBDIRS = testProcessCrash \
           testProcessEcho \
           testProcessEcho2 \
@@ -9,10 +10,7 @@ SUBDIRS = testProcessCrash \
           testProcessOutput \
           testProcessDeadWhileReading \
           testProcessEOF \
-          testSoftExit \
           testProcessSpacesArgs/nospace.pro \
-          testProcessSpacesArgs/onespace.pro \
-          testProcessSpacesArgs/twospaces.pro \
           testExitCodes \
           testSpaceInName \
           testGuiProcess \
@@ -20,6 +18,11 @@ SUBDIRS = testProcessCrash \
           fileWriterProcess \
           testSetWorkingDirectory
 
+!symbian: {
+SUBDIRS +=testProcessSpacesArgs/onespace.pro \
+          testProcessSpacesArgs/twospaces.pro \
+          testSoftExit
+}
 
 win32:!wince*:SUBDIRS+=testProcessEchoGui
 
diff --git a/tests/auto/qprocess/test/test.pro b/tests/auto/qprocess/test/test.pro
index 3741e3c25b..82f91f89d5 100644
--- a/tests/auto/qprocess/test/test.pro
+++ b/tests/auto/qprocess/test/test.pro
@@ -18,7 +18,11 @@ win32: {
 
 
 QT = core
-QT += network
+
+!symbian: {
+    QT += network
+}
+
 embedded: QT += gui
 
 wince*: {
@@ -47,3 +51,18 @@ wince*: {
    DEPLOYMENT += addFiles
 }
 
+symbian: {
+   binDep.sources = \
+        fileWriterProcess.exe \
+        testDetached.exe \
+        testExitCodes.exe \
+        testProcessCrash.exe \
+        testProcessEcho.exe \
+        testProcessNormal.exe \
+        testProcessOutput.exe \
+        nospace.exe \
+        testSpaceInName.exe
+   binDep.path = \sys\bin
+
+   DEPLOYMENT += binDep
+}
diff --git a/tests/auto/qprocess/testDetached/testDetached.pro b/tests/auto/qprocess/testDetached/testDetached.pro
index 6792ef4adf..319cfa6ff3 100644
--- a/tests/auto/qprocess/testDetached/testDetached.pro
+++ b/tests/auto/qprocess/testDetached/testDetached.pro
@@ -5,3 +5,6 @@ CONFIG -= app_bundle
 INSTALLS =
 DESTDIR = ./
 
+symbian*: {
+TARGET.EPOCSTACKSIZE =0x14000
+}
diff --git a/tests/auto/qprocess/testProcessOutput/main.cpp b/tests/auto/qprocess/testProcessOutput/main.cpp
index 960f97020c..f8fa6e4353 100644
--- a/tests/auto/qprocess/testProcessOutput/main.cpp
+++ b/tests/auto/qprocess/testProcessOutput/main.cpp
@@ -44,13 +44,23 @@
 
 int main()
 {
-#ifndef _WIN32_WCE
-    for (int i=0; i<10240; i++) {
-#else //fprintf Output is very slow on Windows CE
+#if defined(__SYMBIAN32__)
+    // Printing to stdout messes up the out.txt, so open a file and print there.
+    FILE* file = fopen("c:\\logs\\qprocess_output_test.txt","w+");
+    for (int i=0; i<200; i++) {
+        fprintf(file, "%d -this is a number\n", i);
+        fflush(file);
+    }
+    fclose(file);
+#else
+# if defined(_WIN32_WCE)
     for (int i=0; i<240; i++) {
-#endif
+# else //fprintf Output is very slow on Windows CE/Symbian
+    for (int i=0; i<10240; i++) {
+# endif
         fprintf(stdout, "%d -this is a number\n", i);
         fflush(stderr);
     }
+#endif
     return 0;
 }
diff --git a/tests/auto/qprocess/testProcessSpacesArgs/main.cpp b/tests/auto/qprocess/testProcessSpacesArgs/main.cpp
index 724015b98f..73fe3dacf9 100644
--- a/tests/auto/qprocess/testProcessSpacesArgs/main.cpp
+++ b/tests/auto/qprocess/testProcessSpacesArgs/main.cpp
@@ -44,11 +44,21 @@
 
 int main(int argc, char ** argv)
 {
+#if defined(__SYMBIAN32__)
+    // Printing to stdout messes up the out.txt, so open a file and print there.
+    FILE* file = fopen("c:\\logs\\qprocess_args_test.txt","w+");
+    for (int i = 0; i < argc; ++i) {
+        if (i)
+            fprintf(file, "|");
+        fprintf(file, argv[i]);
+    }
+    fclose(file);
+#else
     for (int i = 0; i < argc; ++i) {
         if (i)
             printf("|");
         printf(argv[i]);
     }
-
+#endif
     return 0;
 }
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index d235dff957..df36590f25 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -47,7 +47,11 @@
 #include <QtCore/QThread>
 #include <QtCore/QRegExp>
 #include <QtCore/QDebug>
+#include <QtCore/QMetaType>
+#if !defined(Q_OS_SYMBIAN)
+// Network test unnecessary?
 #include <QtNetwork/QHostInfo>
+#endif
 #include <stdlib.h>
 
 #ifdef QT_NO_PROCESS
@@ -197,6 +201,12 @@ tst_QProcess::~tst_QProcess()
 
 void tst_QProcess::init()
 {
+#ifdef Q_OS_SYMBIAN
+    QString dirStr = QString::fromLatin1("c:\\logs");
+    QDir dir;
+    if (!dir.exists(dirStr))
+        dir.mkpath(dirStr);
+#endif
 }
 
 void tst_QProcess::cleanup()
@@ -252,8 +262,11 @@ void tst_QProcess::simpleStart()
     QVERIFY(process->waitForStarted(5000));
     QCOMPARE(process->state(), QProcess::Running);
 #if defined(Q_OS_WINCE)
+    // Note: This actually seems incorrect, it will only exit the while loop when finishing fails
     while (process->waitForFinished(5000))
     { }
+#elif defined(Q_OS_SYMBIAN)
+    QVERIFY(process->waitForFinished(5000));
 #else
     while (process->waitForReadyRead(5000))
     { }
@@ -379,6 +392,9 @@ void tst_QProcess::echoTest()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QFETCH(QByteArray, input);
 
@@ -437,6 +453,9 @@ void tst_QProcess::echoTest2()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     process = new QProcess;
     connect(process, SIGNAL(readyRead()), this, SLOT(exitLoopSlot()));
@@ -488,6 +507,9 @@ void tst_QProcess::echoTest_performance()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess process;
 #ifdef Q_OS_MAC
@@ -542,6 +564,9 @@ void tst_QProcess::echoTestGui()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess process;
 
@@ -572,11 +597,14 @@ void tst_QProcess::batFiles()
 #if defined(Q_OS_WINCE)
     QSKIP("Batch files are not supported on Windows CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Batch files are not supported on Symbian", SkipAll);
+#endif
     QFETCH(QString, batFile);
     QFETCH(QByteArray, output);
 
     QProcess proc;
-    
+
     proc.start(batFile, QStringList());
 
     QVERIFY(proc.waitForFinished(5000));
@@ -642,6 +670,9 @@ void tst_QProcess::loopBackTest()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     process = new QProcess;
 #ifdef Q_OS_MAC
@@ -672,6 +703,9 @@ void tst_QProcess::readTimeoutAndThenCrash()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     process = new QProcess;
 #ifdef Q_OS_MAC
@@ -713,18 +747,30 @@ void tst_QProcess::waitForFinished()
     process.start("testProcessOutput/testProcessOutput");
 #endif
 
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QVERIFY(process.waitForFinished(5000));
 #else
-    QVERIFY(process.waitForFinished(15000));
+    QVERIFY(process.waitForFinished(30000));
 #endif
     QCOMPARE(process.exitStatus(), QProcess::NormalExit);
 
-#if defined (Q_OS_WINCE)
+#if defined(Q_OS_SYMBIAN)
+    // Symbian test outputs to a file, so check that
+    FILE* file = fopen("c:\\logs\\qprocess_output_test.txt","r");
+    int retval = 0;
+    int count = 0;
+    while((int)(retval = fgetc(file) )!= EOF)
+        if (retval == '\n')
+            count++;
+    fclose(file);
+    QCOMPARE(count, 200);
+#else
+#  if defined (Q_OS_WINCE)
     QEXPECT_FAIL("", "Reading and writing to a process is not supported on Qt/CE", Continue);
-#endif
+#  endif
     QString output = process.readAll();
     QCOMPARE(output.count("\n"), 10*1024);
+#endif
 
     process.start("blurdybloop");
     QVERIFY(!process.waitForFinished());
@@ -737,6 +783,9 @@ void tst_QProcess::deadWhileReading()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess process;
 
@@ -762,6 +811,10 @@ void tst_QProcess::restartProcessDeadlock()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
+
     // The purpose of this test is to detect whether restarting a
     // process in the finished() connected slot causes a deadlock
     // because of the way QProcessManager uses its locks.
@@ -799,6 +852,9 @@ void tst_QProcess::closeWriteChannel()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess more;
     more.start("testProcessEOF/testProcessEOF");
@@ -828,6 +884,9 @@ void tst_QProcess::closeReadChannel()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     for (int i = 0; i < 10; ++i) {
         QProcess::ProcessChannel channel1 = QProcess::StandardOutput;
@@ -865,6 +924,9 @@ void tst_QProcess::openModes()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess proc;
     QVERIFY(!proc.isOpen());
@@ -915,6 +977,9 @@ void tst_QProcess::emitReadyReadOnlyWhenNewDataArrives()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess proc;
     connect(&proc, SIGNAL(readyRead()), this, SLOT(exitLoopSlot()));
@@ -951,6 +1016,9 @@ void tst_QProcess::emitReadyReadOnlyWhenNewDataArrives()
 //-----------------------------------------------------------------------------
 void tst_QProcess::hardExit()
 {
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Killing started processes is not supported on Qt/Symbian due platform security", SkipAll);
+#endif
     QProcess proc;
 
 #if defined(Q_OS_MAC)
@@ -977,6 +1045,9 @@ void tst_QProcess::hardExit()
 //-----------------------------------------------------------------------------
 void tst_QProcess::softExit()
 {
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Terminating started processes is not supported on Qt/Symbian due platform security", SkipAll);
+#endif
     QProcess proc;
 
     proc.start("testSoftExit/testSoftExit");
@@ -998,7 +1069,7 @@ class SoftExitProcess : public QProcess
     Q_OBJECT
 public:
     bool waitedForFinished;
-    
+
     SoftExitProcess(int n) : waitedForFinished(false), n(n), killing(false)
     {
         connect(this, SIGNAL(finished(int, QProcess::ExitStatus)),
@@ -1081,6 +1152,9 @@ void tst_QProcess::softExitInSlots()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QFETCH(QString, appName);
 
@@ -1100,6 +1174,9 @@ void tst_QProcess::mergedChannels()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess process;
     process.setReadChannelMode(QProcess::MergedChannels);
@@ -1130,11 +1207,14 @@ void tst_QProcess::forwardedChannels()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess process;
     process.setReadChannelMode(QProcess::ForwardedChannels);
     QCOMPARE(process.readChannelMode(), QProcess::ForwardedChannels);
-    
+
 #ifdef Q_OS_MAC
     process.start("testProcessEcho2/testProcessEcho2.app");
 #else
@@ -1157,6 +1237,9 @@ void tst_QProcess::atEnd()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess process;
 
@@ -1189,6 +1272,10 @@ public:
         return exitCode;
     }
 
+#if defined(Q_OS_SYMBIAN)
+    int serial;
+#endif
+
 protected:
     inline void run()
     {
@@ -1200,11 +1287,21 @@ protected:
 
 #ifdef Q_OS_MAC
         process.start("testProcessEcho/testProcessEcho.app");
+#elif defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+    // WINSCW builds in Symbian do not allow multiple processes to load Qt libraries,
+    // so use just a simple process instead of testDetached.
+    process.start("testProcessNormal");
+#elif defined(Q_OS_SYMBIAN)
+        // testDetached used because it does something, but doesn't take too long.
+        QFile infoFile(QString("c:\\logs\\detinfo%1").arg(serial));
+        QStringList args;
+        args << infoFile.fileName();
+        process.start("testDetached", args);
 #else
         process.start("testProcessEcho/testProcessEcho");
 #endif
 
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
         QCOMPARE(process.write("abc\0", 4), qint64(4));
 #endif
         exitCode = exec();
@@ -1226,6 +1323,9 @@ void tst_QProcess::processInAThread()
 {
     for (int i = 0; i < 3; ++i) {
         TestThread thread;
+#if defined(Q_OS_SYMBIAN)
+        thread.setStackSize(0x14000);
+#endif
         thread.start();
         QVERIFY(thread.wait(10000));
         QCOMPARE(thread.code(), 0);
@@ -1235,11 +1335,24 @@ void tst_QProcess::processInAThread()
 //-----------------------------------------------------------------------------
 void tst_QProcess::processesInMultipleThreads()
 {
+#if defined(Q_OS_SYMBIAN)
+    int serialCounter = 0;
+#endif
+
     for (int i = 0; i < 10; ++i) {
         TestThread thread1;
         TestThread thread2;
         TestThread thread3;
 
+#if defined(Q_OS_SYMBIAN)
+        thread1.serial = serialCounter++;
+        thread2.serial = serialCounter++;
+        thread3.serial = serialCounter++;
+
+        thread1.setStackSize(0x14000);
+        thread2.setStackSize(0x14000);
+        thread3.setStackSize(0x14000);
+#endif
         thread1.start();
         thread2.start();
         thread3.start();
@@ -1265,14 +1378,26 @@ void tst_QProcess::waitForFinishedWithTimeout()
 
 #ifdef Q_OS_MAC
     process->start("testProcessEcho/testProcessEcho.app");
+#elif defined(Q_OS_SYMBIAN)
+    process->start("testProcessOutput");
 #else
     process->start("testProcessEcho/testProcessEcho");
 #endif
+
+#if defined(Q_OS_SYMBIAN)
+    QVERIFY(process->waitForStarted(50));
+    QVERIFY(!process->waitForFinished(1));
+#else
     QVERIFY(process->waitForStarted(5000));
     QVERIFY(!process->waitForFinished(1));
 
     process->write("", 1);
+#endif
+
     QVERIFY(process->waitForFinished());
+
+    delete process;
+    process = 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -1281,6 +1406,9 @@ void tst_QProcess::waitForReadyReadInAReadyReadSlot()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     process = new QProcess(this);
     connect(process, SIGNAL(readyRead()), this, SLOT(waitForReadyReadInAReadyReadSlotSlot()));
@@ -1300,7 +1428,7 @@ void tst_QProcess::waitForReadyReadInAReadyReadSlot()
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     QCOMPARE(spy.count(), 1);
-    
+
     process->disconnect();
     QVERIFY(process->waitForFinished(5000));
     QVERIFY(process->bytesAvailable() > bytesAvailable);
@@ -1314,6 +1442,9 @@ void tst_QProcess::waitForReadyReadInAReadyReadSlotSlot()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     bytesAvailable = process->bytesAvailable();
     process->write("bar", 4);
@@ -1327,6 +1458,9 @@ void tst_QProcess::waitForBytesWrittenInABytesWrittenSlot()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     process = new QProcess(this);
     connect(process, SIGNAL(bytesWritten(qint64)), this, SLOT(waitForBytesWrittenInABytesWrittenSlotSlot()));
@@ -1359,6 +1493,9 @@ void tst_QProcess::waitForBytesWrittenInABytesWrittenSlotSlot()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     process->write("b");
     QVERIFY(process->waitForBytesWritten(5000));
@@ -1417,18 +1554,20 @@ void tst_QProcess::spaceArgsTest()
 
     QStringList programs;
     programs << QString::fromLatin1("testProcessSpacesArgs/nospace")
+#if defined(Q_OS_SYMBIAN)
+    ; // Symbian toolchain doesn't like exes with spaces in the name
+#else
              << QString::fromLatin1("testProcessSpacesArgs/one space")
              << QString::fromLatin1("testProcessSpacesArgs/two space s");
+#endif
 
     process = new QProcess(this);
 
     for (int i = 0; i < programs.size(); ++i) {
-
         QString program = programs.at(i);
-
         process->start(program, args);
 
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
         QVERIFY(process->waitForStarted(5000));
         QVERIFY(process->waitForFinished(5000));
 #else
@@ -1436,10 +1575,19 @@ void tst_QProcess::spaceArgsTest()
         QVERIFY(process->waitForFinished(10000));
 #endif
 
-#if !defined(Q_OS_WINCE)
+#if defined(Q_OS_SYMBIAN)
+        // Symbian test outputs to a file, so check that
+        FILE* file = fopen("c:\\logs\\qprocess_args_test.txt","r");
+        char buf[256];
+        fgets(buf, 256, file);
+        fclose(file);
+        QStringList actual = QString::fromLatin1(buf).split("|");
+#elif !defined(Q_OS_WINCE)
         QStringList actual = QString::fromLatin1(process->readAll()).split("|");
+#endif
+#if !defined(Q_OS_WINCE)
         QVERIFY(!actual.isEmpty());
-        // not onterested in the program name, it might be different.
+        // not interested in the program name, it might be different.
         actual.removeFirst();
 
         QCOMPARE(actual, args);
@@ -1456,10 +1604,18 @@ void tst_QProcess::spaceArgsTest()
         QVERIFY(process->waitForStarted(5000));
         QVERIFY(process->waitForFinished(5000));
 
-#if !defined(Q_OS_WINCE)
+#if defined(Q_OS_SYMBIAN)
+        // Symbian test outputs to a file, so check that
+        file = fopen("c:\\logs\\qprocess_args_test.txt","r");
+        fgets(buf, 256, file);
+        fclose(file);
+        actual = QString::fromLatin1(buf).split("|");
+#elif !defined(Q_OS_WINCE)
         actual = QString::fromLatin1(process->readAll()).split("|");
+#endif
+#if !defined(Q_OS_WINCE)
         QVERIFY(!actual.isEmpty());
-        // not onterested in the program name, it might be different.
+        // not interested in the program name, it might be different.
         actual.removeFirst();
 
         QCOMPARE(actual, args);
@@ -1473,7 +1629,13 @@ void tst_QProcess::spaceArgsTest()
 //-----------------------------------------------------------------------------
 void tst_QProcess::exitCodeTest()
 {
+#if defined(Q_OS_SYMBIAN)
+    // Kernel will run out of process handles on some hw, as there is some
+    // delay before they are recycled, so limit the amount of processes.
+    for (int i = 0; i < 50; ++i) {
+#else
     for (int i = 0; i < 255; ++i) {
+#endif
         QProcess process;
         process.start("testExitCodes/testExitCodes " + QString::number(i));
         QVERIFY(process.waitForFinished(5000));
@@ -1495,10 +1657,10 @@ void tst_QProcess::failToStart()
     QSignalSpy finishedSpy(&process, SIGNAL(finished(int)));
     QSignalSpy finishedSpy2(&process, SIGNAL(finished(int, QProcess::ExitStatus)));
 
-// Mac OS X and HP-UX have a really low defualt process limit (~100), so spawning 
+// Mac OS X and HP-UX have a really low defualt process limit (~100), so spawning
 // to many processes here will cause test failures later on.
 #if defined Q_OS_HPUX
-   const int attempts = 15; 
+   const int attempts = 15;
 #elif defined Q_OS_MAC
    const int attempts = 15;
 #else
@@ -1536,7 +1698,7 @@ void tst_QProcess::failToStart()
             QCOMPARE(finishedSpy2.count(), 0);
 
             int it = j * attempts + i + 1;
-            
+
             QCOMPARE(stateSpy.count(), it * 2);
             QCOMPARE(qVariantValue<QProcess::ProcessState>(stateSpy.at(it * 2 - 2).at(0)), QProcess::Starting);
             QCOMPARE(qVariantValue<QProcess::ProcessState>(stateSpy.at(it * 2 - 1).at(0)), QProcess::NotRunning);
@@ -1601,6 +1763,9 @@ void tst_QProcess::removeFileWhileProcessIsRunning()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QFile file("removeFile.txt");
     QVERIFY(file.open(QFile::WriteOnly));
@@ -1722,7 +1887,7 @@ void tst_QProcess::setEnvironment()
 //-----------------------------------------------------------------------------
 void tst_QProcess::systemEnvironment()
 {
-#if defined (Q_OS_WINCE)
+#if defined (Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     // there is no concept of system variables on Windows CE as there is no console
     QVERIFY(QProcess::systemEnvironment().isEmpty());
     QVERIFY(QProcess::systemEnvironmentHash().isEmpty());
@@ -1741,6 +1906,9 @@ void tst_QProcess::spaceInName()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
     QProcess process;
     process.start("test Space In Name/testSpaceInName", QStringList());
     QVERIFY(process.waitForStarted());
@@ -1751,7 +1919,10 @@ void tst_QProcess::spaceInName()
 //-----------------------------------------------------------------------------
 void tst_QProcess::lockupsInStartDetached()
 {
+#if !defined(Q_OS_SYMBIAN)
+    // What exactly is this call supposed to achieve anyway?
     QHostInfo::lookupHost(QString("something.invalid"), 0, 0);
+#endif
     QProcess::execute("yjhbrty");
     QProcess::startDetached("yjhbrty");
 }
@@ -1762,6 +1933,9 @@ void tst_QProcess::atEnd2()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess process;
 
@@ -1787,7 +1961,7 @@ void tst_QProcess::waitForReadyReadForNonexistantProcess()
     // Start a program that doesn't exist, process events and then try to waitForReadyRead
     qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
     qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
-    
+
     QProcess process;
     QSignalSpy errorSpy(&process, SIGNAL(error(QProcess::ProcessError)));
     QSignalSpy finishedSpy1(&process, SIGNAL(finished(int)));
@@ -1807,11 +1981,14 @@ void tst_QProcess::setStandardInputFile()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     static const char data[] = "A bunch\1of\2data\3\4\5\6\7...";
     QProcess process;
     QFile file("data");
-    
+
     QVERIFY(file.open(QIODevice::WriteOnly));
     file.write(data, sizeof data);
     file.close();
@@ -1823,7 +2000,7 @@ void tst_QProcess::setStandardInputFile()
     process.start("testProcessEcho/testProcessEcho");
 #endif
 
-    QPROCESS_VERIFY(process, waitForFinished()); 
+    QPROCESS_VERIFY(process, waitForFinished());
 	QByteArray all = process.readAll();
     QCOMPARE(all.size(), int(sizeof data) - 1); // testProcessEcho drops the ending \0
     QVERIFY(all == data);
@@ -1863,6 +2040,9 @@ void tst_QProcess::setStandardOutputFile()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     static const char data[] = "Original data. ";
     static const char testdata[] = "Test data.";
@@ -1894,7 +2074,7 @@ void tst_QProcess::setStandardOutputFile()
     process.start("testProcessEcho2/testProcessEcho2");
 #endif
     process.write(testdata, sizeof testdata);
-    QPROCESS_VERIFY(process,waitForFinished()); 
+    QPROCESS_VERIFY(process,waitForFinished());
 
     // open the file again and verify the data
     QVERIFY(file.open(QIODevice::ReadOnly));
@@ -1928,10 +2108,13 @@ void tst_QProcess::setStandardOutputProcess()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QProcess source;
     QProcess sink;
-    
+
     QFETCH(bool, merged);
     source.setReadChannelMode(merged ? QProcess::MergedChannels : QProcess::SeparateChannels);
     source.setStandardOutputProcess(&sink);
@@ -1963,6 +2146,9 @@ void tst_QProcess::fileWriterProcess()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
 
     QString stdinStr;
     for (int i = 0; i < 5000; ++i)
@@ -1989,17 +2175,30 @@ void tst_QProcess::fileWriterProcess()
 //-----------------------------------------------------------------------------
 void tst_QProcess::detachedWorkingDirectoryAndPid()
 {
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+    // WINSCW builds in Symbian do not allow multiple processes to load Qt libraries,
+    // so this test must be skipped.
+    QSKIP("Multiple processes loading Qt are not allowed in Qt/Symbian emulator.", SkipAll);
+#endif
     qint64 pid;
 
 #ifdef Q_OS_WINCE
     QTest::qSleep(1000);
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+    // Symbian has no working directory support, so use logs dir as a shared directory
+    QFile infoFile(QLatin1String("c:\\logs\\detachedinfo.txt"));
+#else
     QFile infoFile(QDir::currentPath() + QLatin1String("/detachedinfo.txt"));
+#endif
     infoFile.remove();
 
     QString workingDir = QDir::currentPath() + "/testDetached";
+
+#ifndef Q_OS_SYMBIAN
     QVERIFY(QFile::exists(workingDir));
+#endif
 
     QStringList args;
     args << infoFile.fileName();
@@ -2023,6 +2222,9 @@ void tst_QProcess::detachedWorkingDirectoryAndPid()
     qint64 actualPid = processIdString.toLongLong(&ok);
     QVERIFY(ok);
 
+#if defined(Q_OS_SYMBIAN)
+    QEXPECT_FAIL("", "Working directory is not supported on Qt/symbian", Continue);
+#endif
     QCOMPARE(actualWorkingDir, workingDir);
     QCOMPARE(actualPid, pid);
 }
@@ -2033,8 +2235,11 @@ void tst_QProcess::switchReadChannels()
 #ifdef Q_OS_WINCE
     QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Reading and writing to a process is not supported on Qt/Symbian", SkipAll);
+#endif
     const char data[] = "ABCD";
-    
+
     QProcess process;
 
 #ifdef Q_OS_MAC
@@ -2052,7 +2257,7 @@ void tst_QProcess::switchReadChannels()
         process.setReadChannel(QProcess::StandardError);
         QCOMPARE(process.read(1), QByteArray(&data[i], 1));
     }
-    
+
     process.ungetChar('D');
     process.setReadChannel(QProcess::StandardOutput);
     process.ungetChar('D');
@@ -2068,6 +2273,9 @@ void tst_QProcess::setWorkingDirectory()
 #ifdef Q_OS_WINCE
     QSKIP("Windows CE does not support working directory logic", SkipAll);
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Symbian does not support working directory logic", SkipAll);
+#endif
     process = new QProcess;
     process->setWorkingDirectory("test");
 #ifdef Q_OS_MAC
@@ -2100,13 +2308,22 @@ void tst_QProcess::startFinishStartFinish()
 #else
         process.start("testProcessOutput/testProcessOutput");
 #endif
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
         QVERIFY(process.waitForReadyRead(10000));
         QCOMPARE(QString::fromLatin1(process.readLine().trimmed()),
                  QString("0 -this is a number"));
 #endif
         if (process.state() != QProcess::NotRunning)
             QVERIFY(process.waitForFinished(10000));
+#if defined(Q_OS_SYMBIAN)
+        // Symbian test outputs to a file, so check that
+        FILE* file = fopen("c:\\logs\\qprocess_output_test.txt","r");
+        char buf[30];
+        fgets(buf, 30, file);
+        QCOMPARE(QString::fromLatin1(buf),
+                 QString("0 -this is a number\n"));
+        fclose(file);
+#endif
     }
 }
 
diff --git a/tests/auto/qqueue/qqueue.pro b/tests/auto/qqueue/qqueue.pro
index f6561d3a09..ed489f9f81 100644
--- a/tests/auto/qqueue/qqueue.pro
+++ b/tests/auto/qqueue/qqueue.pro
@@ -3,5 +3,4 @@ load(qttest_p4)
 QT = core
 
 SOURCES += tst_qqueue.cpp
-
-
+QT = core
diff --git a/tests/auto/qrand/qrand.pro b/tests/auto/qrand/qrand.pro
index 8f90fbc4a2..c868ed40fa 100644
--- a/tests/auto/qrand/qrand.pro
+++ b/tests/auto/qrand/qrand.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qrand.cpp
 QT = core
-
-
diff --git a/tests/auto/qreadlocker/qreadlocker.pro b/tests/auto/qreadlocker/qreadlocker.pro
index 33b0987a28..5919102170 100644
--- a/tests/auto/qreadlocker/qreadlocker.pro
+++ b/tests/auto/qreadlocker/qreadlocker.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qreadlocker.cpp
 QT = core
-
-
diff --git a/tests/auto/qreadwritelock/qreadwritelock.pro b/tests/auto/qreadwritelock/qreadwritelock.pro
index 2f75c641e4..4318b18178 100644
--- a/tests/auto/qreadwritelock/qreadwritelock.pro
+++ b/tests/auto/qreadwritelock/qreadwritelock.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qreadwritelock.cpp
 QT = core
-
-
diff --git a/tests/auto/qrect/qrect.pro b/tests/auto/qrect/qrect.pro
index 16dd55086a..75940b3be7 100644
--- a/tests/auto/qrect/qrect.pro
+++ b/tests/auto/qrect/qrect.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qrect.cpp
 QT = core
-
-
diff --git a/tests/auto/qrect/tst_qrect.cpp b/tests/auto/qrect/tst_qrect.cpp
index 5a916363f5..9c99a49ba4 100644
--- a/tests/auto/qrect/tst_qrect.cpp
+++ b/tests/auto/qrect/tst_qrect.cpp
@@ -321,17 +321,17 @@ void tst_QRect::isNull_data()
     QTest::addColumn<QRect>("r");
     QTest::addColumn<bool>("isNull");
 
-    QTest::newRow( "InvalidQRect" ) << getQRectCase( InvalidQRect ) << TRUE;
-    QTest::newRow( "SmallestQRect" ) << getQRectCase( SmallestQRect ) << FALSE;
-    QTest::newRow( "MiddleQRect" ) << getQRectCase( MiddleQRect ) << FALSE;
-    QTest::newRow( "LargestQRect" ) << getQRectCase( LargestQRect ) << FALSE;
-    QTest::newRow( "SmallestCoordQRect" ) << getQRectCase( SmallestCoordQRect ) << FALSE;
-    QTest::newRow( "LargestCoordQRect" ) << getQRectCase( LargestCoordQRect ) << TRUE; // Due to overflow
-    QTest::newRow( "RandomQRect" ) << getQRectCase( RandomQRect ) << FALSE;
-    QTest::newRow( "NegativeSizeQRect" ) << getQRectCase( NegativeSizeQRect ) << FALSE;
-    QTest::newRow( "NegativePointQRect" ) << getQRectCase( NegativePointQRect ) << FALSE;
-    QTest::newRow( "NullQRect" ) << getQRectCase( NullQRect ) << TRUE;
-    QTest::newRow( "EmptyQRect" ) << getQRectCase( EmptyQRect ) << TRUE;
+    QTest::newRow( "InvalidQRect" ) << getQRectCase( InvalidQRect ) << true;
+    QTest::newRow( "SmallestQRect" ) << getQRectCase( SmallestQRect ) << false;
+    QTest::newRow( "MiddleQRect" ) << getQRectCase( MiddleQRect ) << false;
+    QTest::newRow( "LargestQRect" ) << getQRectCase( LargestQRect ) << false;
+    QTest::newRow( "SmallestCoordQRect" ) << getQRectCase( SmallestCoordQRect ) << false;
+    QTest::newRow( "LargestCoordQRect" ) << getQRectCase( LargestCoordQRect ) << true; // Due to overflow
+    QTest::newRow( "RandomQRect" ) << getQRectCase( RandomQRect ) << false;
+    QTest::newRow( "NegativeSizeQRect" ) << getQRectCase( NegativeSizeQRect ) << false;
+    QTest::newRow( "NegativePointQRect" ) << getQRectCase( NegativePointQRect ) << false;
+    QTest::newRow( "NullQRect" ) << getQRectCase( NullQRect ) << true;
+    QTest::newRow( "EmptyQRect" ) << getQRectCase( EmptyQRect ) << true;
 }
 
 void tst_QRect::isNull()
@@ -350,17 +350,17 @@ void tst_QRect::newIsEmpty_data()
     QTest::addColumn<QRect>("r");
     QTest::addColumn<bool>("isEmpty");
 
-    QTest::newRow( "InvalidQRect" ) << getQRectCase( InvalidQRect ) << TRUE;
-    QTest::newRow( "SmallestQRect" ) << getQRectCase( SmallestQRect ) << FALSE;
-    QTest::newRow( "MiddleQRect" ) << getQRectCase( MiddleQRect ) << FALSE;
-    QTest::newRow( "LargestQRect" ) << getQRectCase( LargestQRect ) << FALSE;
-    QTest::newRow( "SmallestCoordQRect" ) << getQRectCase( SmallestCoordQRect ) << FALSE;
-    QTest::newRow( "LargestCoordQRect" ) << getQRectCase( LargestCoordQRect ) << FALSE;
-    QTest::newRow( "RandomQRect" ) << getQRectCase( RandomQRect ) << FALSE;
-    QTest::newRow( "NegativeSizeQRect" ) << getQRectCase( NegativeSizeQRect ) << TRUE;
-    QTest::newRow( "NegativePointQRect" ) << getQRectCase( NegativePointQRect ) << FALSE;
-    QTest::newRow( "NullQRect" ) << getQRectCase( NullQRect ) << TRUE;
-    QTest::newRow( "EmptyQRect" ) << getQRectCase( EmptyQRect ) << TRUE;
+    QTest::newRow( "InvalidQRect" ) << getQRectCase( InvalidQRect ) << true;
+    QTest::newRow( "SmallestQRect" ) << getQRectCase( SmallestQRect ) << false;
+    QTest::newRow( "MiddleQRect" ) << getQRectCase( MiddleQRect ) << false;
+    QTest::newRow( "LargestQRect" ) << getQRectCase( LargestQRect ) << false;
+    QTest::newRow( "SmallestCoordQRect" ) << getQRectCase( SmallestCoordQRect ) << false;
+    QTest::newRow( "LargestCoordQRect" ) << getQRectCase( LargestCoordQRect ) << false;
+    QTest::newRow( "RandomQRect" ) << getQRectCase( RandomQRect ) << false;
+    QTest::newRow( "NegativeSizeQRect" ) << getQRectCase( NegativeSizeQRect ) << true;
+    QTest::newRow( "NegativePointQRect" ) << getQRectCase( NegativePointQRect ) << false;
+    QTest::newRow( "NullQRect" ) << getQRectCase( NullQRect ) << true;
+    QTest::newRow( "EmptyQRect" ) << getQRectCase( EmptyQRect ) << true;
 }
 
 void tst_QRect::newIsEmpty()
@@ -383,17 +383,17 @@ void tst_QRect::newIsValid_data()
     QTest::addColumn<QRect>("r");
     QTest::addColumn<bool>("isValid");
 
-    QTest::newRow( "InvalidQRect" ) << getQRectCase( InvalidQRect ) << FALSE;
-    QTest::newRow( "SmallestQRect" ) << getQRectCase( SmallestQRect ) << TRUE;
-    QTest::newRow( "MiddleQRect" ) << getQRectCase( MiddleQRect ) << TRUE;
-    QTest::newRow( "LargestQRect" ) << getQRectCase( LargestQRect ) << TRUE;
-    QTest::newRow( "SmallestCoordQRect" ) << getQRectCase( SmallestCoordQRect ) << TRUE;
-    QTest::newRow( "LargestCoordQRect" ) << getQRectCase( LargestCoordQRect ) << TRUE;
-    QTest::newRow( "RandomQRect" ) << getQRectCase( RandomQRect ) << TRUE;
-    QTest::newRow( "NegativeSizeQRect" ) << getQRectCase( NegativeSizeQRect ) << FALSE;
-    QTest::newRow( "NegativePointQRect" ) << getQRectCase( NegativePointQRect ) << TRUE;
-    QTest::newRow( "NullQRect" ) << getQRectCase( NullQRect ) << FALSE;
-    QTest::newRow( "EmptyQRect" ) << getQRectCase( EmptyQRect ) << FALSE;
+    QTest::newRow( "InvalidQRect" ) << getQRectCase( InvalidQRect ) << false;
+    QTest::newRow( "SmallestQRect" ) << getQRectCase( SmallestQRect ) << true;
+    QTest::newRow( "MiddleQRect" ) << getQRectCase( MiddleQRect ) << true;
+    QTest::newRow( "LargestQRect" ) << getQRectCase( LargestQRect ) << true;
+    QTest::newRow( "SmallestCoordQRect" ) << getQRectCase( SmallestCoordQRect ) << true;
+    QTest::newRow( "LargestCoordQRect" ) << getQRectCase( LargestCoordQRect ) << true;
+    QTest::newRow( "RandomQRect" ) << getQRectCase( RandomQRect ) << true;
+    QTest::newRow( "NegativeSizeQRect" ) << getQRectCase( NegativeSizeQRect ) << false;
+    QTest::newRow( "NegativePointQRect" ) << getQRectCase( NegativePointQRect ) << true;
+    QTest::newRow( "NullQRect" ) << getQRectCase( NullQRect ) << false;
+    QTest::newRow( "EmptyQRect" ) << getQRectCase( EmptyQRect ) << false;
 }
 
 void tst_QRect::newIsValid()
@@ -4179,28 +4179,28 @@ void tst_QRect::intersectsRect_data()
     QTest::addColumn<QRect>("rect2");
     QTest::addColumn<bool>("intersects");
 
-    QTest::newRow("test 01") << QRect(0, 0, 10, 10) << QRect( 2,  2,  6,  6) << TRUE;
-    QTest::newRow("test 02") << QRect(0, 0, 10, 10) << QRect( 0,  0, 10, 10) << TRUE;
-    QTest::newRow("test 03") << QRect(0, 0, 10, 10) << QRect( 2,  2, 10, 10) << TRUE;
-    QTest::newRow("test 04") << QRect(0, 0, 10, 10) << QRect(20, 20, 10, 10) << FALSE;
+    QTest::newRow("test 01") << QRect(0, 0, 10, 10) << QRect( 2,  2,  6,  6) << true;
+    QTest::newRow("test 02") << QRect(0, 0, 10, 10) << QRect( 0,  0, 10, 10) << true;
+    QTest::newRow("test 03") << QRect(0, 0, 10, 10) << QRect( 2,  2, 10, 10) << true;
+    QTest::newRow("test 04") << QRect(0, 0, 10, 10) << QRect(20, 20, 10, 10) << false;
 
-    QTest::newRow("test 05") << QRect(9, 9, -8, -8) << QRect( 2,  2,  6,  6) << TRUE;
-    QTest::newRow("test 06") << QRect(9, 9, -8, -8) << QRect( 0,  0, 10, 10) << TRUE;
-    QTest::newRow("test 07") << QRect(9, 9, -8, -8) << QRect( 2,  2, 10, 10) << TRUE;
-    QTest::newRow("test 08") << QRect(9, 9, -8, -8) << QRect(20, 20, 10, 10) << FALSE;
+    QTest::newRow("test 05") << QRect(9, 9, -8, -8) << QRect( 2,  2,  6,  6) << true;
+    QTest::newRow("test 06") << QRect(9, 9, -8, -8) << QRect( 0,  0, 10, 10) << true;
+    QTest::newRow("test 07") << QRect(9, 9, -8, -8) << QRect( 2,  2, 10, 10) << true;
+    QTest::newRow("test 08") << QRect(9, 9, -8, -8) << QRect(20, 20, 10, 10) << false;
 
-    QTest::newRow("test 09") << QRect(0, 0, 10, 10) << QRect( 7,  7,  -4,  -4) << TRUE;
-    QTest::newRow("test 10") << QRect(0, 0, 10, 10) << QRect( 9,  9, -8, -8) << TRUE;
-    QTest::newRow("test 11") << QRect(0, 0, 10, 10) << QRect(11, 11, -8, -8) << TRUE;
-    QTest::newRow("test 12") << QRect(0, 0, 10, 10) << QRect(29, 29, -8, -8) << FALSE;
+    QTest::newRow("test 09") << QRect(0, 0, 10, 10) << QRect( 7,  7,  -4,  -4) << true;
+    QTest::newRow("test 10") << QRect(0, 0, 10, 10) << QRect( 9,  9, -8, -8) << true;
+    QTest::newRow("test 11") << QRect(0, 0, 10, 10) << QRect(11, 11, -8, -8) << true;
+    QTest::newRow("test 12") << QRect(0, 0, 10, 10) << QRect(29, 29, -8, -8) << false;
 
-    QTest::newRow("test 13") << QRect() << QRect(10, 10, 10, 10) << FALSE;
-    QTest::newRow("test 14") << QRect(10, 10, 10, 10) << QRect() << FALSE;
-    QTest::newRow("test 15") << QRect() << QRect() << FALSE;
-    QTest::newRow("test 16") << QRect(10, 10, 10, 10) << QRect(19, 15, 1, 5) << TRUE;
+    QTest::newRow("test 13") << QRect() << QRect(10, 10, 10, 10) << false;
+    QTest::newRow("test 14") << QRect(10, 10, 10, 10) << QRect() << false;
+    QTest::newRow("test 15") << QRect() << QRect() << false;
+    QTest::newRow("test 16") << QRect(10, 10, 10, 10) << QRect(19, 15, 1, 5) << true;
 
-    QTest::newRow("test 17") << QRect(10, 10, 10, 10) << QRect(15, 19, 5, 1) << TRUE;
-    QTest::newRow("test 18") << QRect(2, 0, 1, 652) << QRect(2, 0, 1, 652) << TRUE;
+    QTest::newRow("test 17") << QRect(10, 10, 10, 10) << QRect(15, 19, 5, 1) << true;
+    QTest::newRow("test 18") << QRect(2, 0, 1, 652) << QRect(2, 0, 1, 652) << true;
 }
 
 void tst_QRect::intersectsRect()
@@ -4218,28 +4218,28 @@ void tst_QRect::intersectsRectF_data()
     QTest::addColumn<QRectF>("rect2");
     QTest::addColumn<bool>("intersects");
 
-    QTest::newRow("test 01") << QRectF(0, 0, 10, 10) << QRectF( 2,  2,  6,  6) << TRUE;
-    QTest::newRow("test 02") << QRectF(0, 0, 10, 10) << QRectF( 0,  0, 10, 10) << TRUE;
-    QTest::newRow("test 03") << QRectF(0, 0, 10, 10) << QRectF( 2,  2, 10, 10) << TRUE;
-    QTest::newRow("test 04") << QRectF(0, 0, 10, 10) << QRectF(20, 20, 10, 10) << FALSE;
+    QTest::newRow("test 01") << QRectF(0, 0, 10, 10) << QRectF( 2,  2,  6,  6) << true;
+    QTest::newRow("test 02") << QRectF(0, 0, 10, 10) << QRectF( 0,  0, 10, 10) << true;
+    QTest::newRow("test 03") << QRectF(0, 0, 10, 10) << QRectF( 2,  2, 10, 10) << true;
+    QTest::newRow("test 04") << QRectF(0, 0, 10, 10) << QRectF(20, 20, 10, 10) << false;
 
-    QTest::newRow("test 05") << QRectF(10, 10, -10, -10) << QRectF( 2,  2,  6,  6) << TRUE;
-    QTest::newRow("test 06") << QRectF(10, 10, -10, -10) << QRectF( 0,  0, 10, 10) << TRUE;
-    QTest::newRow("test 07") << QRectF(10, 10, -10, -10) << QRectF( 2,  2, 10, 10) << TRUE;
-    QTest::newRow("test 08") << QRectF(10, 10, -10, -10) << QRectF(20, 20, 10, 10) << FALSE;
+    QTest::newRow("test 05") << QRectF(10, 10, -10, -10) << QRectF( 2,  2,  6,  6) << true;
+    QTest::newRow("test 06") << QRectF(10, 10, -10, -10) << QRectF( 0,  0, 10, 10) << true;
+    QTest::newRow("test 07") << QRectF(10, 10, -10, -10) << QRectF( 2,  2, 10, 10) << true;
+    QTest::newRow("test 08") << QRectF(10, 10, -10, -10) << QRectF(20, 20, 10, 10) << false;
 
-    QTest::newRow("test 09") << QRectF(0, 0, 10, 10) << QRectF( 8,  8,  -6,  -6) << TRUE;
-    QTest::newRow("test 10") << QRectF(0, 0, 10, 10) << QRectF(10, 10, -10, -10) << TRUE;
-    QTest::newRow("test 11") << QRectF(0, 0, 10, 10) << QRectF(12, 12, -10, -10) << TRUE;
-    QTest::newRow("test 12") << QRectF(0, 0, 10, 10) << QRectF(30, 30, -10, -10) << FALSE;
+    QTest::newRow("test 09") << QRectF(0, 0, 10, 10) << QRectF( 8,  8,  -6,  -6) << true;
+    QTest::newRow("test 10") << QRectF(0, 0, 10, 10) << QRectF(10, 10, -10, -10) << true;
+    QTest::newRow("test 11") << QRectF(0, 0, 10, 10) << QRectF(12, 12, -10, -10) << true;
+    QTest::newRow("test 12") << QRectF(0, 0, 10, 10) << QRectF(30, 30, -10, -10) << false;
 
-    QTest::newRow("test 13") << QRectF() << QRectF(10, 10, 10, 10) << FALSE;
-    QTest::newRow("test 14") << QRectF(10, 10, 10, 10) << QRectF() << FALSE;
-    QTest::newRow("test 15") << QRectF() << QRectF() << FALSE;
+    QTest::newRow("test 13") << QRectF() << QRectF(10, 10, 10, 10) << false;
+    QTest::newRow("test 14") << QRectF(10, 10, 10, 10) << QRectF() << false;
+    QTest::newRow("test 15") << QRectF() << QRectF() << false;
 
-    QTest::newRow("test 16") << QRectF(0, 0, 10, 10) << QRectF(10, 10, 10, 10) << FALSE;
-    QTest::newRow("test 17") << QRectF(0, 0, 10, 10) << QRectF(0, 10, 10, 10) << FALSE;
-    QTest::newRow("test 18") << QRectF(0, 0, 10, 10) << QRectF(10, 0, 10, 10) << FALSE;
+    QTest::newRow("test 16") << QRectF(0, 0, 10, 10) << QRectF(10, 10, 10, 10) << false;
+    QTest::newRow("test 17") << QRectF(0, 0, 10, 10) << QRectF(0, 10, 10, 10) << false;
+    QTest::newRow("test 18") << QRectF(0, 0, 10, 10) << QRectF(10, 0, 10, 10) << false;
 }
 
 void tst_QRect::intersectsRectF()
@@ -4257,24 +4257,24 @@ void tst_QRect::containsRect_data()
     QTest::addColumn<QRect>("rect2");
     QTest::addColumn<bool>("contains");
 
-    QTest::newRow("test 01") << QRect(0, 0, 10, 10) << QRect( 2,  2,  6,  6) << TRUE;
-    QTest::newRow("test 02") << QRect(0, 0, 10, 10) << QRect( 0,  0, 10, 10) << TRUE;
-    QTest::newRow("test 03") << QRect(0, 0, 10, 10) << QRect( 2,  2, 10, 10) << FALSE;
-    QTest::newRow("test 04") << QRect(0, 0, 10, 10) << QRect(20, 20, 10, 10) << FALSE;
+    QTest::newRow("test 01") << QRect(0, 0, 10, 10) << QRect( 2,  2,  6,  6) << true;
+    QTest::newRow("test 02") << QRect(0, 0, 10, 10) << QRect( 0,  0, 10, 10) << true;
+    QTest::newRow("test 03") << QRect(0, 0, 10, 10) << QRect( 2,  2, 10, 10) << false;
+    QTest::newRow("test 04") << QRect(0, 0, 10, 10) << QRect(20, 20, 10, 10) << false;
 
-    QTest::newRow("test 05") << QRect(9, 9, -8, -8) << QRect( 2,  2,  6,  6) << TRUE;
-    QTest::newRow("test 06") << QRect(9, 9, -8, -8) << QRect( 0,  0, 10, 10) << TRUE;
-    QTest::newRow("test 07") << QRect(9, 9, -8, -8) << QRect( 2,  2, 10, 10) << FALSE;
-    QTest::newRow("test 08") << QRect(9, 9, -8, -8) << QRect(20, 20, 10, 10) << FALSE;
+    QTest::newRow("test 05") << QRect(9, 9, -8, -8) << QRect( 2,  2,  6,  6) << true;
+    QTest::newRow("test 06") << QRect(9, 9, -8, -8) << QRect( 0,  0, 10, 10) << true;
+    QTest::newRow("test 07") << QRect(9, 9, -8, -8) << QRect( 2,  2, 10, 10) << false;
+    QTest::newRow("test 08") << QRect(9, 9, -8, -8) << QRect(20, 20, 10, 10) << false;
 
-    QTest::newRow("test 09") << QRect(0, 0, 10, 10) << QRect( 7,  7,  -4,  -4) << TRUE;
-    QTest::newRow("test 10") << QRect(0, 0, 10, 10) << QRect( 9,  9, -8, -8) << TRUE;
-    QTest::newRow("test 11") << QRect(0, 0, 10, 10) << QRect(11, 11, -8, -8) << FALSE;
-    QTest::newRow("test 12") << QRect(0, 0, 10, 10) << QRect(29, 29, -8, -8) << FALSE;
+    QTest::newRow("test 09") << QRect(0, 0, 10, 10) << QRect( 7,  7,  -4,  -4) << true;
+    QTest::newRow("test 10") << QRect(0, 0, 10, 10) << QRect( 9,  9, -8, -8) << true;
+    QTest::newRow("test 11") << QRect(0, 0, 10, 10) << QRect(11, 11, -8, -8) << false;
+    QTest::newRow("test 12") << QRect(0, 0, 10, 10) << QRect(29, 29, -8, -8) << false;
 
-    QTest::newRow("test 13") << QRect(-1, 1, 10, 10) << QRect() << FALSE;
-    QTest::newRow("test 14") << QRect() << QRect(0, 0, 10, 10) << FALSE;
-    QTest::newRow("test 15") << QRect() << QRect() << FALSE;
+    QTest::newRow("test 13") << QRect(-1, 1, 10, 10) << QRect() << false;
+    QTest::newRow("test 14") << QRect() << QRect(0, 0, 10, 10) << false;
+    QTest::newRow("test 15") << QRect() << QRect() << false;
 }
 
 void tst_QRect::containsRect()
@@ -4292,24 +4292,24 @@ void tst_QRect::containsRectF_data()
     QTest::addColumn<QRectF>("rect2");
     QTest::addColumn<bool>("contains");
 
-    QTest::newRow("test 01") << QRectF(0, 0, 10, 10) << QRectF( 2,  2,  6,  6) << TRUE;
-    QTest::newRow("test 02") << QRectF(0, 0, 10, 10) << QRectF( 0,  0, 10, 10) << TRUE;
-    QTest::newRow("test 03") << QRectF(0, 0, 10, 10) << QRectF( 2,  2, 10, 10) << FALSE;
-    QTest::newRow("test 04") << QRectF(0, 0, 10, 10) << QRectF(20, 20, 10, 10) << FALSE;
+    QTest::newRow("test 01") << QRectF(0, 0, 10, 10) << QRectF( 2,  2,  6,  6) << true;
+    QTest::newRow("test 02") << QRectF(0, 0, 10, 10) << QRectF( 0,  0, 10, 10) << true;
+    QTest::newRow("test 03") << QRectF(0, 0, 10, 10) << QRectF( 2,  2, 10, 10) << false;
+    QTest::newRow("test 04") << QRectF(0, 0, 10, 10) << QRectF(20, 20, 10, 10) << false;
 
-    QTest::newRow("test 05") << QRectF(10, 10, -10, -10) << QRectF( 2,  2,  6,  6) << TRUE;
-    QTest::newRow("test 06") << QRectF(10, 10, -10, -10) << QRectF( 0,  0, 10, 10) << TRUE;
-    QTest::newRow("test 07") << QRectF(10, 10, -10, -10) << QRectF( 2,  2, 10, 10) << FALSE;
-    QTest::newRow("test 08") << QRectF(10, 10, -10, -10) << QRectF(20, 20, 10, 10) << FALSE;
+    QTest::newRow("test 05") << QRectF(10, 10, -10, -10) << QRectF( 2,  2,  6,  6) << true;
+    QTest::newRow("test 06") << QRectF(10, 10, -10, -10) << QRectF( 0,  0, 10, 10) << true;
+    QTest::newRow("test 07") << QRectF(10, 10, -10, -10) << QRectF( 2,  2, 10, 10) << false;
+    QTest::newRow("test 08") << QRectF(10, 10, -10, -10) << QRectF(20, 20, 10, 10) << false;
 
-    QTest::newRow("test 09") << QRectF(0, 0, 10, 10) << QRectF( 8,  8,  -6,  -6) << TRUE;
-    QTest::newRow("test 10") << QRectF(0, 0, 10, 10) << QRectF(10, 10, -10, -10) << TRUE;
-    QTest::newRow("test 11") << QRectF(0, 0, 10, 10) << QRectF(12, 12, -10, -10) << FALSE;
-    QTest::newRow("test 12") << QRectF(0, 0, 10, 10) << QRectF(30, 30, -10, -10) << FALSE;
+    QTest::newRow("test 09") << QRectF(0, 0, 10, 10) << QRectF( 8,  8,  -6,  -6) << true;
+    QTest::newRow("test 10") << QRectF(0, 0, 10, 10) << QRectF(10, 10, -10, -10) << true;
+    QTest::newRow("test 11") << QRectF(0, 0, 10, 10) << QRectF(12, 12, -10, -10) << false;
+    QTest::newRow("test 12") << QRectF(0, 0, 10, 10) << QRectF(30, 30, -10, -10) << false;
 
-    QTest::newRow("test 13") << QRectF(-1, 1, 10, 10) << QRectF() << FALSE;
-    QTest::newRow("test 14") << QRectF() << QRectF(0, 0, 10, 10) << FALSE;
-    QTest::newRow("test 15") << QRectF() << QRectF() << FALSE;
+    QTest::newRow("test 13") << QRectF(-1, 1, 10, 10) << QRectF() << false;
+    QTest::newRow("test 14") << QRectF() << QRectF(0, 0, 10, 10) << false;
+    QTest::newRow("test 15") << QRectF() << QRectF() << false;
 }
 
 void tst_QRect::containsRectF()
@@ -4328,35 +4328,35 @@ void tst_QRect::containsPoint_data()
     QTest::addColumn<bool>("contains");
     QTest::addColumn<bool>("containsProper");
 
-    QTest::newRow("test 01") << QRect(0, 0, 10, 10) << QPoint( 0,  0) << TRUE  << FALSE;
-    QTest::newRow("test 02") << QRect(0, 0, 10, 10) << QPoint( 0, 10) << FALSE << FALSE;
-    QTest::newRow("test 03") << QRect(0, 0, 10, 10) << QPoint(10,  0) << FALSE << FALSE;
-    QTest::newRow("test 04") << QRect(0, 0, 10, 10) << QPoint(10, 10) << FALSE << FALSE;
-    QTest::newRow("test 05") << QRect(0, 0, 10, 10) << QPoint( 0,  9) << TRUE  << FALSE;
-    QTest::newRow("test 06") << QRect(0, 0, 10, 10) << QPoint( 9,  0) << TRUE  << FALSE;
-    QTest::newRow("test 07") << QRect(0, 0, 10, 10) << QPoint( 9,  9) << TRUE  << FALSE;
-    QTest::newRow("test 08") << QRect(0, 0, 10, 10) << QPoint( 1,  0) << TRUE  << FALSE;
-    QTest::newRow("test 09") << QRect(0, 0, 10, 10) << QPoint( 9,  1) << TRUE  << FALSE;
-    QTest::newRow("test 10") << QRect(0, 0, 10, 10) << QPoint( 1,  1) << TRUE  << TRUE;
-    QTest::newRow("test 11") << QRect(0, 0, 10, 10) << QPoint( 1,  8) << TRUE  << TRUE;
-    QTest::newRow("test 12") << QRect(0, 0, 10, 10) << QPoint( 8,  8) << TRUE  << TRUE;
-
-    QTest::newRow("test 13") << QRect(9, 9, -8, -8) << QPoint( 0,  0) << TRUE  << FALSE;
-    QTest::newRow("test 14") << QRect(9, 9, -8, -8) << QPoint( 0, 10) << FALSE << FALSE;
-    QTest::newRow("test 15") << QRect(9, 9, -8, -8) << QPoint(10,  0) << FALSE << FALSE;
-    QTest::newRow("test 16") << QRect(9, 9, -8, -8) << QPoint(10, 10) << FALSE << FALSE;
-    QTest::newRow("test 17") << QRect(9, 9, -8, -8) << QPoint( 0,  9) << TRUE  << FALSE;
-    QTest::newRow("test 18") << QRect(9, 9, -8, -8) << QPoint( 9,  0) << TRUE  << FALSE;
-    QTest::newRow("test 19") << QRect(9, 9, -8, -8) << QPoint( 9,  9) << TRUE  << FALSE;
-    QTest::newRow("test 20") << QRect(9, 9, -8, -8) << QPoint( 1,  0) << TRUE  << FALSE;
-    QTest::newRow("test 21") << QRect(9, 9, -8, -8) << QPoint( 9,  1) << TRUE  << FALSE;
-    QTest::newRow("test 22") << QRect(9, 9, -8, -8) << QPoint( 1,  1) << TRUE  << TRUE;
-    QTest::newRow("test 23") << QRect(9, 9, -8, -8) << QPoint( 1,  8) << TRUE  << TRUE;
-    QTest::newRow("test 24") << QRect(9, 9, -8, -8) << QPoint( 8,  8) << TRUE  << TRUE;
-
-    QTest::newRow("test 25") << QRect(-1, 1, 10, 10) << QPoint() << FALSE << FALSE;
-    QTest::newRow("test 26") << QRect() << QPoint(1, 1) << FALSE << FALSE;
-    QTest::newRow("test 27") << QRect() << QPoint() << FALSE << FALSE;
+    QTest::newRow("test 01") << QRect(0, 0, 10, 10) << QPoint( 0,  0) << true  << false;
+    QTest::newRow("test 02") << QRect(0, 0, 10, 10) << QPoint( 0, 10) << false << false;
+    QTest::newRow("test 03") << QRect(0, 0, 10, 10) << QPoint(10,  0) << false << false;
+    QTest::newRow("test 04") << QRect(0, 0, 10, 10) << QPoint(10, 10) << false << false;
+    QTest::newRow("test 05") << QRect(0, 0, 10, 10) << QPoint( 0,  9) << true  << false;
+    QTest::newRow("test 06") << QRect(0, 0, 10, 10) << QPoint( 9,  0) << true  << false;
+    QTest::newRow("test 07") << QRect(0, 0, 10, 10) << QPoint( 9,  9) << true  << false;
+    QTest::newRow("test 08") << QRect(0, 0, 10, 10) << QPoint( 1,  0) << true  << false;
+    QTest::newRow("test 09") << QRect(0, 0, 10, 10) << QPoint( 9,  1) << true  << false;
+    QTest::newRow("test 10") << QRect(0, 0, 10, 10) << QPoint( 1,  1) << true  << true;
+    QTest::newRow("test 11") << QRect(0, 0, 10, 10) << QPoint( 1,  8) << true  << true;
+    QTest::newRow("test 12") << QRect(0, 0, 10, 10) << QPoint( 8,  8) << true  << true;
+
+    QTest::newRow("test 13") << QRect(9, 9, -8, -8) << QPoint( 0,  0) << true  << false;
+    QTest::newRow("test 14") << QRect(9, 9, -8, -8) << QPoint( 0, 10) << false << false;
+    QTest::newRow("test 15") << QRect(9, 9, -8, -8) << QPoint(10,  0) << false << false;
+    QTest::newRow("test 16") << QRect(9, 9, -8, -8) << QPoint(10, 10) << false << false;
+    QTest::newRow("test 17") << QRect(9, 9, -8, -8) << QPoint( 0,  9) << true  << false;
+    QTest::newRow("test 18") << QRect(9, 9, -8, -8) << QPoint( 9,  0) << true  << false;
+    QTest::newRow("test 19") << QRect(9, 9, -8, -8) << QPoint( 9,  9) << true  << false;
+    QTest::newRow("test 20") << QRect(9, 9, -8, -8) << QPoint( 1,  0) << true  << false;
+    QTest::newRow("test 21") << QRect(9, 9, -8, -8) << QPoint( 9,  1) << true  << false;
+    QTest::newRow("test 22") << QRect(9, 9, -8, -8) << QPoint( 1,  1) << true  << true;
+    QTest::newRow("test 23") << QRect(9, 9, -8, -8) << QPoint( 1,  8) << true  << true;
+    QTest::newRow("test 24") << QRect(9, 9, -8, -8) << QPoint( 8,  8) << true  << true;
+
+    QTest::newRow("test 25") << QRect(-1, 1, 10, 10) << QPoint() << false << false;
+    QTest::newRow("test 26") << QRect() << QPoint(1, 1) << false << false;
+    QTest::newRow("test 27") << QRect() << QPoint() << false << false;
 }
 
 void tst_QRect::containsPoint()
@@ -4367,7 +4367,7 @@ void tst_QRect::containsPoint()
     QFETCH(bool, containsProper);
 
     QVERIFY(rect.contains(point) == contains);
-    QVERIFY(rect.contains(point, TRUE) == containsProper);
+    QVERIFY(rect.contains(point, true) == containsProper);
 }
 
 void tst_QRect::containsPointF_data()
@@ -4376,37 +4376,37 @@ void tst_QRect::containsPointF_data()
     QTest::addColumn<QPointF>("point");
     QTest::addColumn<bool>("contains");
 
-    QTest::newRow("test 27") << QRectF() << QPointF() << FALSE;
-
-    QTest::newRow("test 01") << QRectF(0, 0, 10, 10) << QPointF( 0,  0) << TRUE;
-    QTest::newRow("test 02") << QRectF(0, 0, 10, 10) << QPointF( 0, 10) << TRUE;
-    QTest::newRow("test 03") << QRectF(0, 0, 10, 10) << QPointF(10,  0) << TRUE;
-    QTest::newRow("test 04") << QRectF(0, 0, 10, 10) << QPointF(10, 10) << TRUE;
-    QTest::newRow("test 05") << QRectF(0, 0, 10, 10) << QPointF( 0,  9) << TRUE;
-    QTest::newRow("test 06") << QRectF(0, 0, 10, 10) << QPointF( 9,  0) << TRUE;
-    QTest::newRow("test 07") << QRectF(0, 0, 10, 10) << QPointF( 9,  9) << TRUE;
-    QTest::newRow("test 08") << QRectF(0, 0, 10, 10) << QPointF( 1,  0) << TRUE;
-    QTest::newRow("test 09") << QRectF(0, 0, 10, 10) << QPointF( 9,  1) << TRUE;
-    QTest::newRow("test 10") << QRectF(0, 0, 10, 10) << QPointF( 1,  1) << TRUE;
-    QTest::newRow("test 11") << QRectF(0, 0, 10, 10) << QPointF( 1,  8) << TRUE;
-    QTest::newRow("test 12") << QRectF(0, 0, 10, 10) << QPointF( 8,  8) << TRUE;
-
-    QTest::newRow("test 13") << QRectF(10, 10, -10, -10) << QPointF( 0,  0) << TRUE;
-    QTest::newRow("test 14") << QRectF(10, 10, -10, -10) << QPointF( 0, 10) << TRUE;
-    QTest::newRow("test 15") << QRectF(10, 10, -10, -10) << QPointF(10,  0) << TRUE;
-    QTest::newRow("test 16") << QRectF(10, 10, -10, -10) << QPointF(10, 10) << TRUE;
-    QTest::newRow("test 17") << QRectF(10, 10, -10, -10) << QPointF( 0,  9) << TRUE;
-    QTest::newRow("test 18") << QRectF(10, 10, -10, -10) << QPointF( 9,  0) << TRUE;
-    QTest::newRow("test 19") << QRectF(10, 10, -10, -10) << QPointF( 9,  9) << TRUE;
-    QTest::newRow("test 20") << QRectF(10, 10, -10, -10) << QPointF( 1,  0) << TRUE;
-    QTest::newRow("test 21") << QRectF(10, 10, -10, -10) << QPointF( 9,  1) << TRUE;
-    QTest::newRow("test 22") << QRectF(10, 10, -10, -10) << QPointF( 1,  1) << TRUE;
-    QTest::newRow("test 23") << QRectF(10, 10, -10, -10) << QPointF( 1,  8) << TRUE;
-    QTest::newRow("test 24") << QRectF(10, 10, -10, -10) << QPointF( 8,  8) << TRUE;
-
-    QTest::newRow("test 25") << QRectF(-1, 1, 10, 10) << QPointF() << FALSE;
-    QTest::newRow("test 26") << QRectF() << QPointF(1, 1) << FALSE;
-    QTest::newRow("test 27") << QRectF() << QPointF() << FALSE;
+    QTest::newRow("test 27") << QRectF() << QPointF() << false;
+
+    QTest::newRow("test 01") << QRectF(0, 0, 10, 10) << QPointF( 0,  0) << true;
+    QTest::newRow("test 02") << QRectF(0, 0, 10, 10) << QPointF( 0, 10) << true;
+    QTest::newRow("test 03") << QRectF(0, 0, 10, 10) << QPointF(10,  0) << true;
+    QTest::newRow("test 04") << QRectF(0, 0, 10, 10) << QPointF(10, 10) << true;
+    QTest::newRow("test 05") << QRectF(0, 0, 10, 10) << QPointF( 0,  9) << true;
+    QTest::newRow("test 06") << QRectF(0, 0, 10, 10) << QPointF( 9,  0) << true;
+    QTest::newRow("test 07") << QRectF(0, 0, 10, 10) << QPointF( 9,  9) << true;
+    QTest::newRow("test 08") << QRectF(0, 0, 10, 10) << QPointF( 1,  0) << true;
+    QTest::newRow("test 09") << QRectF(0, 0, 10, 10) << QPointF( 9,  1) << true;
+    QTest::newRow("test 10") << QRectF(0, 0, 10, 10) << QPointF( 1,  1) << true;
+    QTest::newRow("test 11") << QRectF(0, 0, 10, 10) << QPointF( 1,  8) << true;
+    QTest::newRow("test 12") << QRectF(0, 0, 10, 10) << QPointF( 8,  8) << true;
+
+    QTest::newRow("test 13") << QRectF(10, 10, -10, -10) << QPointF( 0,  0) << true;
+    QTest::newRow("test 14") << QRectF(10, 10, -10, -10) << QPointF( 0, 10) << true;
+    QTest::newRow("test 15") << QRectF(10, 10, -10, -10) << QPointF(10,  0) << true;
+    QTest::newRow("test 16") << QRectF(10, 10, -10, -10) << QPointF(10, 10) << true;
+    QTest::newRow("test 17") << QRectF(10, 10, -10, -10) << QPointF( 0,  9) << true;
+    QTest::newRow("test 18") << QRectF(10, 10, -10, -10) << QPointF( 9,  0) << true;
+    QTest::newRow("test 19") << QRectF(10, 10, -10, -10) << QPointF( 9,  9) << true;
+    QTest::newRow("test 20") << QRectF(10, 10, -10, -10) << QPointF( 1,  0) << true;
+    QTest::newRow("test 21") << QRectF(10, 10, -10, -10) << QPointF( 9,  1) << true;
+    QTest::newRow("test 22") << QRectF(10, 10, -10, -10) << QPointF( 1,  1) << true;
+    QTest::newRow("test 23") << QRectF(10, 10, -10, -10) << QPointF( 1,  8) << true;
+    QTest::newRow("test 24") << QRectF(10, 10, -10, -10) << QPointF( 8,  8) << true;
+
+    QTest::newRow("test 25") << QRectF(-1, 1, 10, 10) << QPointF() << false;
+    QTest::newRow("test 26") << QRectF() << QPointF(1, 1) << false;
+    QTest::newRow("test 27") << QRectF() << QPointF() << false;
 }
 
 void tst_QRect::containsPointF()
diff --git a/tests/auto/qregexp/qregexp.pro b/tests/auto/qregexp/qregexp.pro
index d467cda0e1..80b6827101 100644
--- a/tests/auto/qregexp/qregexp.pro
+++ b/tests/auto/qregexp/qregexp.pro
@@ -6,6 +6,3 @@ QT = core
 QT = core
 
 SOURCES  += tst_qregexp.cpp
-QT -= gui
-
-
diff --git a/tests/auto/qregexp/tst_qregexp.cpp b/tests/auto/qregexp/tst_qregexp.cpp
index 0169904d7b..16ff32f727 100644
--- a/tests/auto/qregexp/tst_qregexp.cpp
+++ b/tests/auto/qregexp/tst_qregexp.cpp
@@ -969,7 +969,7 @@ void tst_QRegExp::rainersSlowRegExpCopyBug()
 {
     // this test should take an extreme amount of time if QRegExp is broken
     QRegExp original(email);
-#if defined(Q_OS_WINCE)
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
 	for (int i = 0; i < 100; ++i) {
 #else
     for (int i = 0; i < 100000; ++i) {
@@ -1022,7 +1022,7 @@ void Thread::run()
     str += "abbbdekcz";
     int x;
 
-#if defined(Q_OS_WINCE)
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
 	for (int j = 0; j < 100; ++j) {
 #else
     for (int j = 0; j < 10000; ++j) {
diff --git a/tests/auto/qregion/tst_qregion.cpp b/tests/auto/qregion/tst_qregion.cpp
index 2ad202d407..71ddcc8fa2 100644
--- a/tests/auto/qregion/tst_qregion.cpp
+++ b/tests/auto/qregion/tst_qregion.cpp
@@ -279,7 +279,7 @@ void tst_QRegion::emptyPolygonRegion_data()
     QPolygon pa;
 
 
-    QTest::newRow("no points") << pa << TRUE << 0 << QVector<QRect>();
+    QTest::newRow("no points") << pa << true << 0 << QVector<QRect>();
     pa = QPolygon() << QPoint(10,10);
     QTest::newRow("one point") << pa << true << 0 << QVector<QRect>();
     pa = QPolygon() << QPoint(10,10) << QPoint(10,20);
@@ -381,7 +381,7 @@ void tst_QRegion::intersected_data()
     QPolygon ps2(8);
     ps1.putPoints(0,8, 20,20, 50,20, 50,100, 70,100, 70,20, 120,20, 120,200, 20, 200);
     ps2.putPoints(0,8, 100,150, 140,150, 140,160, 160,160, 160,150, 200,150, 200,180, 100,180);
-    QTest::newRow("task30716") << QRegion(ps1) << QRegion(ps2) << TRUE;
+    QTest::newRow("task30716") << QRegion(ps1) << QRegion(ps2) << true;
 }
 
 void tst_QRegion::intersected()
diff --git a/tests/auto/qresourceengine/qresourceengine.pro b/tests/auto/qresourceengine/qresourceengine.pro
index 8f3ca5ce32..c06a5eb87f 100644
--- a/tests/auto/qresourceengine/qresourceengine.pro
+++ b/tests/auto/qresourceengine/qresourceengine.pro
@@ -9,14 +9,18 @@ load(resources)
 SOURCES += tst_resourceengine.cpp
 RESOURCES += testqrc/test.qrc 
 
-runtime_resource.target = runtime_resource.rcc 
+symbian-sbsv2 {
+    runtime_resource.target = $$PWD/runtime_resource.rcc 
+} else {
+    runtime_resource.target = runtime_resource.rcc 
+}
 runtime_resource.depends = $$PWD/testqrc/test.qrc
 runtime_resource.commands = $$QMAKE_RCC -root /runtime_resource/ -binary $${runtime_resource.depends} -o $${runtime_resource.target}
 QMAKE_EXTRA_TARGETS = runtime_resource
-ALL_DEPS += $${runtime_resource.target}
+PRE_TARGETDEPS += $${runtime_resource.target}
 
 QT = core
-wince*:{
+wince*|symbian*:{
     deploy.sources += runtime_resource.rcc parentdir.txt
     test.sources = testqrc/* 
     test.path = testqrc
@@ -35,7 +39,7 @@ wince*:{
     testsub2.sources = testqrc/test/test/*
     testsub2.path = testqrc/test/test
     DEPLOYMENT = deploy test alias other search1 search2 sub testsub testsub2
-    DEFINES += SRCDIR=\\\"\\\"
+    !symbian:DEFINES += SRCDIR=\\\"\\\"
 } else {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qresourceengine/tst_resourceengine.cpp b/tests/auto/qresourceengine/tst_resourceengine.cpp
index e133a72e61..dfdc4549a1 100644
--- a/tests/auto/qresourceengine/tst_resourceengine.cpp
+++ b/tests/auto/qresourceengine/tst_resourceengine.cpp
@@ -43,6 +43,10 @@
 #include <QtTest/QtTest>
 #include <QtCore>
 
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR "."
+#endif
+
 class tst_ResourceEngine: public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qscopedpointer/.gitignore b/tests/auto/qscopedpointer/.gitignore
new file mode 100644
index 0000000000..9f2324cb11
--- /dev/null
+++ b/tests/auto/qscopedpointer/.gitignore
@@ -0,0 +1 @@
+tst_qscopedpointer
diff --git a/tests/auto/qscopedpointer/qscopedpointer.pro b/tests/auto/qscopedpointer/qscopedpointer.pro
new file mode 100644
index 0000000000..13d8425070
--- /dev/null
+++ b/tests/auto/qscopedpointer/qscopedpointer.pro
@@ -0,0 +1,3 @@
+load(qttest_p4)
+SOURCES += tst_qscopedpointer.cpp
+QT -= gui
diff --git a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
new file mode 100644
index 0000000000..0e005c35b0
--- /dev/null
+++ b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
@@ -0,0 +1,282 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtCore/QScopedPointer>
+
+/*!
+ \class tst_QScopedPointer
+ \internal
+ \since 4.6
+ \brief Tests class QScopedPointer.
+
+ */
+class tst_QScopedPointer : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void defaultConstructor() const;
+    void dataOnDefaultConstructed() const;
+    void useSubClassInConstructor() const;
+    void dataOnValue() const;
+    void dataSignature() const;
+    void reset() const;
+    void dereferenceOperator() const;
+    void dereferenceOperatorSignature() const;
+    void pointerOperator() const;
+    void pointerOperatorSignature() const;
+    void negationOperator() const;
+    void negationOperatorSignature() const;
+    void operatorBool() const;
+    void operatorBoolSignature() const;
+    void isNull() const;
+    void isNullSignature() const;
+    void objectSize() const;
+    // TODO instansiate on const object
+};
+
+void tst_QScopedPointer::defaultConstructor() const
+{
+    /* Check that the members, one, is correctly initialized. */
+    QScopedPointer<int> p;
+    QCOMPARE(p.data(), static_cast<int *>(0));
+}
+
+void tst_QScopedPointer::dataOnDefaultConstructed() const
+{
+    QScopedPointer<int> p;
+
+    QCOMPARE(p.data(), static_cast<int *>(0));
+}
+
+class MyClass
+{
+};
+
+class MySubClass : public MyClass
+{
+};
+
+void tst_QScopedPointer::useSubClassInConstructor() const
+{
+    /* Use a syntax which users typically would do. */
+    QScopedPointer<MyClass> p(new MyClass());
+}
+
+void tst_QScopedPointer::dataOnValue() const
+{
+    int *const rawPointer = new int(5);
+    QScopedPointer<int> p(rawPointer);
+
+    QCOMPARE(p.data(), rawPointer);
+}
+
+void tst_QScopedPointer::dataSignature() const
+{
+    const QScopedPointer<int> p;
+    /* data() should be const. */
+    p.data();
+}
+
+void tst_QScopedPointer::reset() const
+{
+    /* Call reset() on a default constructed value. */
+    {
+        QScopedPointer<int> p;
+        p.reset();
+        QCOMPARE(p.data(), static_cast<int *>(0));
+    }
+
+    /* Call reset() on an active value. */
+    {
+        QScopedPointer<int> p(new int(3));
+        p.reset();
+        QCOMPARE(p.data(), static_cast<int *>(0));
+    }
+
+    /* Call reset() with a value, on an active value. */
+    {
+        QScopedPointer<int> p(new int(3));
+
+        int *const value = new int(9);
+        p.reset(value);
+        QCOMPARE(*p.data(), 9);
+    }
+
+    /* Call reset() with a value, on default constructed value. */
+    {
+        QScopedPointer<int> p;
+
+        int *const value = new int(9);
+        p.reset(value);
+        QCOMPARE(*p.data(), 9);
+    }
+}
+
+class AbstractClass
+{
+public:
+    virtual ~AbstractClass()
+    {
+    }
+
+    virtual int member() const = 0;
+};
+
+class SubClass : public AbstractClass
+{
+public:
+    virtual int member() const
+    {
+        return 5;
+    }
+};
+
+void tst_QScopedPointer::dereferenceOperator() const
+{
+    /* Dereference a basic value. */
+    {
+        QScopedPointer<int> p(new int(5));
+
+        const int value2 = *p;
+        QCOMPARE(value2, 5);
+    }
+
+    /* Dereference a pointer to an abstract class. This verifies
+     * that the operator returns a reference, when compiling
+     * with MSVC 2005. */
+    {
+        QScopedPointer<AbstractClass> p(new SubClass());
+
+        QCOMPARE((*p).member(), 5);
+    }
+}
+
+void tst_QScopedPointer::dereferenceOperatorSignature() const
+{
+    /* The operator should be const. */
+    {
+        const QScopedPointer<int> p(new int(5));
+        *p;
+    }
+
+    /* A reference should be returned, not a value. */
+    {
+        const QScopedPointer<int> p(new int(5));
+        Q_UNUSED(static_cast<int &>(*p));
+    }
+
+    /* Instantiated on a const object, the returned object is a const reference. */
+    {
+        const QScopedPointer<const int> p(new int(5));
+        Q_UNUSED(static_cast<const int &>(*p));
+    }
+}
+
+class AnyForm
+{
+public:
+    int value;
+};
+
+void tst_QScopedPointer::pointerOperator() const
+{
+    QScopedPointer<AnyForm> p(new AnyForm());
+    p->value = 5;
+
+    QCOMPARE(p->value, 5);
+}
+
+void tst_QScopedPointer::pointerOperatorSignature() const
+{
+    /* The operator should be const. */
+    const QScopedPointer<AnyForm> p(new AnyForm);
+    p->value = 5;
+
+    QVERIFY(p->value);
+}
+
+void tst_QScopedPointer::negationOperator() const
+{
+    /* Invoke on default constructed value. */
+    {
+        QScopedPointer<int> p;
+        QVERIFY(!p);
+    }
+
+    /* Invoke on a value. */
+    {
+        QScopedPointer<int> p(new int(2));
+        QCOMPARE(!p, false);
+    }
+}
+
+void tst_QScopedPointer::negationOperatorSignature() const
+{
+    /* The signature should be const. */
+    const QScopedPointer<int> p;
+    !p;
+
+    /* The return value should be bool. */
+    static_cast<bool>(!p);
+}
+
+void tst_QScopedPointer::operatorBool() const
+{
+    /* Invoke on default constructed value. */
+    {
+        QScopedPointer<int> p;
+        QCOMPARE(bool(p), false);
+    }
+
+    /* Invoke on active value. */
+    {
+        QScopedPointer<int> p(new int(3));
+        QVERIFY(p);
+    }
+}
+
+void tst_QScopedPointer::operatorBoolSignature() const
+{
+    /* The signature should be const and return bool. */
+    const QScopedPointer<int> p;
+
+    static_cast<bool>(p);
+}
+
+void tst_QScopedPointer::isNull() const
+{
+    /* Invoke on default constructed value. */
+    {
+        QScopedPointer<int> p;
+        QVERIFY(p.isNull());
+    }
+
+    /* Invoke on a set value. */
+    {
+        QScopedPointer<int> p(new int(69));
+        QVERIFY(!p.isNull());
+    }
+}
+
+void tst_QScopedPointer::isNullSignature() const
+{
+    const QScopedPointer<int> p(new int(69));
+
+    /* The signature should be const and return bool. */
+    static_cast<bool>(p.isNull());
+}
+
+void tst_QScopedPointer::objectSize() const
+{
+    /* The size of QScopedPointer should be the same as one pointer. */
+    QCOMPARE(sizeof(QScopedPointer<int>), sizeof(void *));
+}
+
+QTEST_MAIN(tst_QScopedPointer)
+#include "tst_qscopedpointer.moc"
diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro
index 7c74b32a04..39484bd5cd 100644
--- a/tests/auto/qscriptengine/qscriptengine.pro
+++ b/tests/auto/qscriptengine/qscriptengine.pro
@@ -3,9 +3,12 @@ QT = core gui script
 SOURCES += tst_qscriptengine.cpp 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-wince*: {
+wince*|symbian*: {
    addFiles.sources = script
    addFiles.path = .
    DEPLOYMENT += addFiles
 }
 
+symbian: {
+   TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
+}
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 830cfc7aed..ab4364ec24 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -249,7 +249,7 @@ void tst_QScriptEngine::newFunction()
         QCOMPARE(fun.prototype().isValid(), true);
         QCOMPARE(fun.prototype().isFunction(), true);
         QCOMPARE(fun.prototype().strictlyEquals(eng.evaluate("Function.prototype")), true);
-        
+
         QCOMPARE(fun.call().isNull(), true);
         QCOMPARE(fun.construct().isObject(), true);
     }
@@ -2615,7 +2615,7 @@ void tst_QScriptEngine::numberClass()
         QCOMPARE(ctor.propertyFlags("MIN_VALUE"), flags);
         QVERIFY(ctor.property("NaN").isNumber());
         QCOMPARE(ctor.propertyFlags("NaN"), flags);
-        QVERIFY(ctor.property("NEGATIVE_INFINITY").isNumber()); 
+        QVERIFY(ctor.property("NEGATIVE_INFINITY").isNumber());
         QCOMPARE(ctor.propertyFlags("NEGATIVE_INFINITY"), flags);
         QVERIFY(ctor.property("POSITIVE_INFINITY").isNumber());
         QCOMPARE(ctor.propertyFlags("POSITIVE_INFINITY"), flags);
@@ -2838,7 +2838,7 @@ void tst_QScriptEngine::functionExpression()
                  "  else\n"
                  "    function baz() { return 'baz'; }\n"
                  "  return (arg == 'bar') ? bar : baz;\n"
-                 "}"); 
+                 "}");
     QVERIFY(!eng.globalObject().property("bar").isValid());
     QVERIFY(!eng.globalObject().property("baz").isValid());
     QVERIFY(eng.evaluate("foo").isFunction());
diff --git a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
index f6a6aeb8ab..06b861efe6 100644
--- a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
+++ b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
@@ -1,9 +1,12 @@
 load(qttest_p4)
 QT = core script
 SOURCES  += tst_qscriptjstestsuite.cpp
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-wince*: {
+symbian {
+	TARGET.EPOCHEAPSIZE = 0x020000 0xA00000
+} else {
+	DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
+wince*|symbian*: {
 testFiles.sources = tests
 testFiles.path = .
 DEPLOYMENT += testFiles
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index 0194730679..c1100769de 100644
--- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
+++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
@@ -901,7 +901,7 @@ bool tst_Suite::isExcludedFile(const QString &fileName, QString *message) const
             if (message)
                 *message = fileExclusions.at(i).second;
             return true;
-        }
+    }
     }
     return false;
 }
diff --git a/tests/auto/qscriptqobject/qscriptqobject.pro b/tests/auto/qscriptqobject/qscriptqobject.pro
index be3a98042e..d28fbef055 100644
--- a/tests/auto/qscriptqobject/qscriptqobject.pro
+++ b/tests/auto/qscriptqobject/qscriptqobject.pro
@@ -2,4 +2,6 @@ load(qttest_p4)
 QT = core gui script
 SOURCES  += tst_qscriptqobject.cpp
 
-
+symbian: {
+   TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
+}
diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
index ee914abdce..56216961c2 100644
--- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
+++ b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
@@ -54,6 +54,10 @@
 
 struct CustomType
 {
+#if defined (Q_CC_NOKIAX86)
+    // Compiler crash workaround
+    CustomType() {}
+#endif
     QString string;
 };
 Q_DECLARE_METATYPE(CustomType)
@@ -2261,7 +2265,7 @@ void tst_QScriptExtQObject::findChild()
         QCOMPARE(result.isNull(), true);
     }
 
-    {    
+    {
         QScriptValue result = m_engine->evaluate("myObject.findChild('myChildObject')");
         QCOMPARE(result.isQObject(), true);
         QCOMPARE(result.toQObject(), child);
diff --git a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
index c07ab531f7..58c53e42ba 100644
--- a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
+++ b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
@@ -3,10 +3,10 @@ QT = core script
 SOURCES  += tst_qscriptv8testsuite.cpp
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-wince*: {
+wince*|symbian: {
 testFiles.sources = tests
 testFiles.path = .
 DEPLOYMENT += testFiles
 }
 
-
+symbian:TARGET.EPOCHEAPSIZE = 0x00020000 0x02000000
diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
index 50eb19f23c..7215852347 100644
--- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
+++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
@@ -254,6 +254,11 @@ tst_Suite::tst_Suite()
     addTestExclusion("mul-exhaustive", "Demands too much memory on WinCE");
 #endif
 
+#ifdef Q_OS_SYMBIAN
+    addTestExclusion("nested-repetition-count-overflow", "Demands too much memory on Symbian");
+    addTestExclusion("unicode-test", "Demands too much memory on Symbian");    
+#endif    
+
     QVector<uint> *data = qt_meta_data_tst_Suite();
     // content:
     *data << 1 // revision
diff --git a/tests/auto/qset/qset.pro b/tests/auto/qset/qset.pro
index 2656dafc89..05ad07d5e7 100644
--- a/tests/auto/qset/qset.pro
+++ b/tests/auto/qset/qset.pro
@@ -1,7 +1,8 @@
 load(qttest_p4)
 SOURCES  += tst_qset.cpp
-
-
 QT = core
 
-
+symbian*: {
+TARGET.EPOCSTACKSIZE =0x5000
+TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
+}
diff --git a/tests/auto/qsettings/.gitattributes b/tests/auto/qsettings/.gitattributes
new file mode 100644
index 0000000000..a4ad8d7644
--- /dev/null
+++ b/tests/auto/qsettings/.gitattributes
@@ -0,0 +1,5 @@
+resourcefile.ini  -crlf
+resourcefile2.ini -crlf
+resourcefile3.ini -crlf
+resourcefile4.ini -crlf
+resourcefile5.ini -crlf
diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp
index d0f11aaf40..ddf9724396 100644
--- a/tests/auto/qsettings/tst_qsettings.cpp
+++ b/tests/auto/qsettings/tst_qsettings.cpp
@@ -52,7 +52,9 @@
 #include <QtCore/QtDebug>
 #include <QtCore/QString>
 
-#include <cctype>
+#if !defined(Q_OS_SYMBIAN)
+# include <cctype>
+#endif
 #if defined(Q_OS_WIN) && defined(Q_CC_GNU)
 // need for unlink on mingw
 #include <io.h>
@@ -122,7 +124,7 @@ private slots:
     void setPath();
     void setDefaultFormat();
     void dontCreateNeedlessPaths();
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN) 
     void dontReorderIniKeysNeedlessly();
 #endif
 
@@ -209,7 +211,7 @@ void tst_QSettings::getSetCheck()
 
 Q_DECLARE_METATYPE(QSettings::Format)
 
-#ifdef Q_OS_WINCE
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
 static void removePath(const QString& _path)
 {
     QString path = _path;
@@ -356,9 +358,11 @@ void tst_QSettings::init()
     QSettings(QSettings::SystemScope, "software.org").clear();
     QSettings(QSettings::UserScope, "other.software.org").clear();
     QSettings(QSettings::SystemScope, "other.software.org").clear();
+#elif defined(Q_OS_SYMBIAN)
+    removePath(settingsPath());
 #endif
 
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN)
     system(QString("chmod -R u+rw %1 2> /dev/null").arg(settingsPath()).toLatin1());
     system(QString("rm -fr %1 2> /dev/null").arg(settingsPath()).toLatin1());
 #endif
@@ -540,13 +544,13 @@ void tst_QSettings::ctor()
         */
         QSettings settings5(format, QSettings::UserScope, "SoftWare.ORG", "killerApp");
         if (format == QSettings::NativeFormat) {
-#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN)
+#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) || defined(Q_OS_SYMBIAN)
             QCOMPARE(settings5.value("key 1").toString(), QString("gurgle"));
 #else
             QVERIFY(!settings5.contains("key 1"));
 #endif
         } else {
-#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN)
+#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) || defined(Q_OS_SYMBIAN)
             QCOMPARE(settings5.value("key 1").toString(), QString("gurgle"));
 #else
             QVERIFY(!settings5.contains("key 1"));
@@ -716,6 +720,8 @@ void tst_QSettings::testErrorHandling()
 #ifdef QT_BUILD_INTERNAL
 #ifdef Q_OS_WIN
     QSKIP("Windows doesn't support most file modes, including read-only directories, so this test is moot.", SkipAll);
+#elif defined(Q_OS_SYMBIAN)
+    QSKIP("Symbian/Open C doesn't support execute or write only file modes, or directory permissions, so this test is mostly moot.", SkipAll);
 #elif defined(Q_OS_UNIX)
     if (::getuid() == 0)
         QSKIP("Running this test as root doesn't work, since file perms do not bother him", SkipAll);
@@ -1499,7 +1505,7 @@ void tst_QSettings::sync()
 
     // Now "some other app" will change other.software.org.ini
     QString userConfDir = settingsPath("__user__") + QDir::separator();
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     unlink((userConfDir + "other.software.org.ini").toLatin1());
     rename((userConfDir + "software.org.ini").toLatin1(),
            (userConfDir + "other.software.org.ini").toLatin1());
@@ -3679,7 +3685,7 @@ void tst_QSettings::dontCreateNeedlessPaths()
     QVERIFY(!fileInfo.dir().exists());
 }
 
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN) 
 void tst_QSettings::dontReorderIniKeysNeedlessly()
 {
 #ifdef  QT_QSETTINGS_ALWAYS_CASE_SENSITIVE_AND_FORGET_ORIGINAL_KEY_ORDER
diff --git a/tests/auto/qsharedmemory/lackey/scripts/producer.js b/tests/auto/qsharedmemory/lackey/scripts/producer.js
index 88b2b80905..e02cd8b7bb 100644
--- a/tests/auto/qsharedmemory/lackey/scripts/producer.js
+++ b/tests/auto/qsharedmemory/lackey/scripts/producer.js
@@ -15,6 +15,10 @@ if (!producer.create(size)) {
 }
 //print ("producer created and attached");
 
+QVERIFY(producer.lock());
+producer.set(0, 'Q');
+QVERIFY(producer.unlock());
+
 var i = 0;
 while(i < 5) {
     QVERIFY(producer.lock(), "lock");
@@ -34,3 +38,7 @@ producer.set(0, 'E');
 QVERIFY(producer.unlock());
 
 //print ("producer done");
+
+// Sleep for a bit to let all consumers start, otherwise they will get stuck in the attach loop,
+// because at least in Symbian the shared memory will be destroyed if there are no active handles to it.
+producer.sleep(3000);
\ No newline at end of file
diff --git a/tests/auto/qsharedmemory/src/qsystemlock_p.h b/tests/auto/qsharedmemory/src/qsystemlock_p.h
index 0259d0a9f6..b40a06d478 100644
--- a/tests/auto/qsharedmemory/src/qsystemlock_p.h
+++ b/tests/auto/qsharedmemory/src/qsystemlock_p.h
@@ -47,6 +47,7 @@
 
 #include "qsystemlock.h"
 #include "private/qsharedmemory_p.h"
+#include <sys/types.h>
 
 #define MAX_LOCKS 64
 
diff --git a/tests/auto/qsharedmemory/src/qsystemlock_unix.cpp b/tests/auto/qsharedmemory/src/qsystemlock_unix.cpp
index e17d03cffd..a752ba0260 100644
--- a/tests/auto/qsharedmemory/src/qsystemlock_unix.cpp
+++ b/tests/auto/qsharedmemory/src/qsystemlock_unix.cpp
@@ -51,6 +51,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/shm.h>
+#include <unistd.h>
 
 #include <sys/sem.h>
 // We have to define this as on some sem.h will have it
@@ -62,6 +63,25 @@ union qt_semun {
 
 #define tr(x) QT_TRANSLATE_NOOP(QLatin1String("QSystemLock"), (x))
 
+#if defined(Q_OS_SYMBIAN)
+int createUnixKeyFile(const QString &fileName)
+{
+    if (QFile::exists(fileName))
+        return 0;
+
+    int fd = open(QFile::encodeName(fileName).constData(),
+            O_EXCL | O_CREAT | O_RDWR, 0640);
+    if (-1 == fd) {
+        if (errno == EEXIST)
+            return 0;
+        return -1;
+    } else {
+        close(fd);
+    }
+    return 1;
+}
+#endif
+
 QSystemLockPrivate::QSystemLockPrivate() :
         semaphore(-1), lockCount(0),
         error(QSystemLock::NoError), unix_key(-1), createdFile(false), createdSemaphore(false)
@@ -105,7 +125,11 @@ key_t QSystemLockPrivate::handle()
     }
 
     // Create the file needed for ftok
+#if defined(Q_OS_SYMBIAN)
+    int built = createUnixKeyFile(fileName);
+#else
     int built = QSharedMemoryPrivate::createUnixKeyFile(fileName);
+#endif
     if (-1 == built)
         return -1;
     createdFile = (1 == built);
diff --git a/tests/auto/qsharedmemory/test/test.pro b/tests/auto/qsharedmemory/test/test.pro
index e294a756bf..779a942437 100644
--- a/tests/auto/qsharedmemory/test/test.pro
+++ b/tests/auto/qsharedmemory/test/test.pro
@@ -17,13 +17,19 @@ TARGET = ../tst_qsharedmemory
   }
 }
 
-wince*: {
+wince*:{
 QT += gui script
 addFiles.sources = ../lackey/lackey.exe ../lackey/scripts
 addFiles.path = lackey
 DEPLOYMENT += addFiles
 DEFINES += SRCDIR=\\\"\\\"
+}else:symbian*{
+QT += gui script
+addFiles.sources = ../lackey/scripts
+addFiles.path = /data/qsharedmemorytemp/lackey
+addBin.sources = lackey.exe
+addBin.path = /sys/bin
+DEPLOYMENT += addFiles addBin
 } else {
 DEFINES += SRCDIR=\\\"$$PWD/../\\\"
 }
-
diff --git a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp
index bcf7fc9aef..d256e01c7f 100644
--- a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp
@@ -49,8 +49,11 @@
 #define EXISTING_SHARE "existing"
 #define EXISTING_SIZE 1024
 
-Q_DECLARE_METATYPE(QSharedMemory::SharedMemoryError);
-Q_DECLARE_METATYPE(QSharedMemory::AccessMode);
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR "c:/data/qsharedmemorytemp/"
+#endif
+Q_DECLARE_METATYPE(QSharedMemory::SharedMemoryError)
+Q_DECLARE_METATYPE(QSharedMemory::AccessMode)
 
 class tst_QSharedMemory : public QObject
 {
@@ -405,6 +408,9 @@ void tst_QSharedMemory::readOnly()
 #ifdef Q_OS_WIN
     QSKIP("This test opens a crash dialog on Windows", SkipSingle);
 #endif
+#if defined (Q_OS_SYMBIAN)
+    QSKIP("Readonly shared memory is not supported in symbian", SkipAll);
+#endif
     QString program = "./lackey/lackey";
     QStringList arguments;
     rememberKey("readonly_segfault");
@@ -527,7 +533,9 @@ void tst_QSharedMemory::simpleProducerConsumer()
     char *get = (char*)consumer.data();
     // On Windows CE you always have ReadWrite access. Thus
     // ViewMapOfFile returns the same pointer
-#ifndef Q_OS_WINCE
+    // On Symbian, the address will always be same, as
+    // write protection of chunks is not currently supported by Symbian
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QVERIFY(put != get);
 #endif
     for (int i = 0; i < size; ++i) {
@@ -629,6 +637,11 @@ public:
         QVERIFY(producer.lock());
         memory[0] = 'E';
         QVERIFY(producer.unlock());
+
+#if defined(Q_OS_SYMBIAN)
+        // Sleep a while to ensure that consumers start properly
+        QTest::qSleep(1000);
+#endif
     }
 private:
 
@@ -660,12 +673,18 @@ void tst_QSharedMemory::simpleThreadedProducerConsumer()
 #endif
 
     Producer p;
+#if defined(Q_OS_SYMBIAN)
+    p.setStackSize(0x14000);
+#endif
     if (producerIsThread)
         p.start();
 
     QList<Consumer*> consumers;
     for (int i = 0; i < threads; ++i) {
         consumers.append(new Consumer());
+#if defined(Q_OS_SYMBIAN)
+        consumers.last()->setStackSize(0x14000);
+#endif
         consumers.last()->start();
     }
 
@@ -697,6 +716,9 @@ void tst_QSharedMemory::simpleProcessProducerConsumer_data()
  */
 void tst_QSharedMemory::simpleProcessProducerConsumer()
 {
+#if defined (Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+    QSKIP("Cannot launch multiple Qt processes in Symbian emulator", SkipAll);
+#endif
     QFETCH(int, processes);
 
     rememberKey("market");
@@ -710,6 +732,7 @@ void tst_QSharedMemory::simpleProcessProducerConsumer()
     producer.setProcessChannelMode(QProcess::ForwardedChannels);
     producer.start("./lackey/lackey", arguments);
     producer.waitForStarted();
+    QVERIFY(producer.error() != QProcess::FailedToStart);
 
     QList<QProcess*> consumers;
     for (int i = 0; i < processes; ++i) {
@@ -730,7 +753,8 @@ void tst_QSharedMemory::simpleProcessProducerConsumer()
 
     while (!consumers.isEmpty()) {
         consumers.first()->waitForFinished(1000);
-        if (consumers.first()->exitStatus() != QProcess::NormalExit ||
+        if (consumers.first()->state() == QProcess::Running ||
+            consumers.first()->exitStatus() != QProcess::NormalExit ||
             consumers.first()->exitCode() != 0) {
                 consumerFailed = true;
             }
diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp
index aaef779d62..6153c76143 100644
--- a/tests/auto/qsharedpointer/externaltests.cpp
+++ b/tests/auto/qsharedpointer/externaltests.cpp
@@ -51,6 +51,10 @@
 #include <QtCore/QDirIterator>
 #include <QtCore/QDateTime>
 
+#ifdef Q_OS_SYMBIAN
+#define DEFAULT_MAKESPEC "X:/STLsupport/mkspecs/symbian-abld/"
+#endif
+
 #ifndef DEFAULT_MAKESPEC
 # error DEFAULT_MAKESPEC not defined
 #endif
diff --git a/tests/auto/qsharedpointer/externaltests.pri b/tests/auto/qsharedpointer/externaltests.pri
index 1fdcf65147..627af87af0 100644
--- a/tests/auto/qsharedpointer/externaltests.pri
+++ b/tests/auto/qsharedpointer/externaltests.pri
@@ -1,7 +1,8 @@
 SOURCES += $$PWD/externaltests.cpp
 HEADERS += $$PWD/externaltests.h
 cleanedQMAKESPEC = $$replace(QMAKESPEC, \\\\, /)
-DEFINES += DEFAULT_MAKESPEC=\\\"$$cleanedQMAKESPEC\\\"
+!symbian:DEFINES += DEFAULT_MAKESPEC=\\\"$$cleanedQMAKESPEC\\\"
 
 embedded:DEFINES += QTEST_NO_RTTI QTEST_CROSS_COMPILED
 wince*:DEFINES += QTEST_CROSS_COMPILED
+symbian: DEFINES += QTEST_CROSS_COMPILED
diff --git a/tests/auto/qsharedpointer/qsharedpointer.pro b/tests/auto/qsharedpointer/qsharedpointer.pro
index 1759323fd4..bbd31d7c7a 100644
--- a/tests/auto/qsharedpointer/qsharedpointer.pro
+++ b/tests/auto/qsharedpointer/qsharedpointer.pro
@@ -9,6 +9,6 @@ HEADERS += forwarddeclared.h \
     wrapper.h
 
 QT = core
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
+!symbian:DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
 include(externaltests.pri)
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index 210f3fae10..98fbeb53e4 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -55,6 +55,10 @@ namespace QtSharedPointer {
     Q_CORE_EXPORT void internalSafetyCheckCleanCheck();
 }
 
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR "."
+#endif
+
 class tst_QSharedPointer: public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qsidebar/qsidebar.pro b/tests/auto/qsidebar/qsidebar.pro
index bfcaab7eea..b1fba732c8 100644
--- a/tests/auto/qsidebar/qsidebar.pro
+++ b/tests/auto/qsidebar/qsidebar.pro
@@ -5,4 +5,4 @@ include(../../src/qfiledialog.pri)
 SOURCES		+= tst_qsidebar.cpp 
 TARGET		= tst_qsidebar
 
-
+symbian:HEADERS += ../../../include/qtgui/private/qfileinfogatherer_p.h
diff --git a/tests/auto/qsignalspy/qsignalspy.pro b/tests/auto/qsignalspy/qsignalspy.pro
index 172bdadbb6..4bc4a7b751 100644
--- a/tests/auto/qsignalspy/qsignalspy.pro
+++ b/tests/auto/qsignalspy/qsignalspy.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qsignalspy.cpp
-
 QT = core
-
-
diff --git a/tests/auto/qsize/qsize.pro b/tests/auto/qsize/qsize.pro
index dddfa56974..14786b8b35 100644
--- a/tests/auto/qsize/qsize.pro
+++ b/tests/auto/qsize/qsize.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qsize.cpp
-
-
-
+QT = core
diff --git a/tests/auto/qsizef/qsizef.pro b/tests/auto/qsizef/qsizef.pro
index c1288f6c98..703d721545 100644
--- a/tests/auto/qsizef/qsizef.pro
+++ b/tests/auto/qsizef/qsizef.pro
@@ -1,4 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qsizef.cpp
-
-
+QT = core
diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
index 7f6d9328f0..d4ae159637 100644
--- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -57,6 +57,7 @@ public:
 
 private slots:
     void unexpectedDisconnection();
+    void mixingWithTimers();
 };
 
 tst_QSocketNotifier::tst_QSocketNotifier()
@@ -69,9 +70,10 @@ tst_QSocketNotifier::~tst_QSocketNotifier()
 class UnexpectedDisconnectTester : public QObject
 {
     Q_OBJECT
+    int sequence;
+
 public:
     QNativeSocketEngine *readEnd1, *readEnd2;
-    int sequence;
 
     UnexpectedDisconnectTester(QNativeSocketEngine *s1, QNativeSocketEngine *s2)
         : readEnd1(s1), readEnd2(s2), sequence(0)
@@ -84,18 +86,25 @@ public:
         connect(notifier2, SIGNAL(activated(int)), SLOT(handleActivated()));
     }
 
+    const int getSequence() {
+        return sequence;
+    }
+
+    void incSequence() {
+        ++sequence;
+    }
+
 public slots:
     void handleActivated()
     {
         char data1[1], data2[1];
-        ++sequence;
-        if (sequence == 1) {
+        incSequence();
+        if (getSequence() == 1) {
             // read from both ends
             (void) readEnd1->read(data1, sizeof(data1));
             (void) readEnd2->read(data2, sizeof(data2));
             emit finished();
-        } else if (sequence == 2) {
-            // we should never get here
+        } else if (getSequence() == 2) {
             QCOMPARE(readEnd2->read(data2, sizeof(data2)), qint64(-2));
             QVERIFY(readEnd2->isValid());
         }
@@ -155,9 +164,12 @@ void tst_QSocketNotifier::unexpectedDisconnection()
     writeEnd2->flush();
 
     UnexpectedDisconnectTester tester(&readEnd1, &readEnd2);
-    QEventLoop eventLoop;
-    connect(&tester, SIGNAL(finished()), &eventLoop, SLOT(quit()));
-    eventLoop.exec();
+
+    do {
+        // we have to wait until sequence value changes
+        // as any event can make us jump out processing 
+        QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
+    }  while(tester.getSequence() <= 0);
 
     QVERIFY(readEnd1.state() == QAbstractSocket::ConnectedState);
     QVERIFY(readEnd2.state() == QAbstractSocket::ConnectedState);
@@ -165,7 +177,7 @@ void tst_QSocketNotifier::unexpectedDisconnection()
     qWarning("### Windows returns 1 activation, Unix returns 2.");
     QCOMPARE(tester.sequence, 1);
 #else
-    QCOMPARE(tester.sequence, 2);
+    QCOMPARE(tester.getSequence(), 2);
 #endif
 
     readEnd1.close();
@@ -175,5 +187,67 @@ void tst_QSocketNotifier::unexpectedDisconnection()
     server.close();
 }
 
+class MixingWithTimersHelper : public QObject
+{
+    Q_OBJECT
+
+public:
+    MixingWithTimersHelper(QTimer *timer, QTcpServer *server);
+
+    bool timerActivated;
+    bool socketActivated;
+
+private slots:
+    void timerFired();
+    void socketFired();
+};
+
+MixingWithTimersHelper::MixingWithTimersHelper(QTimer *timer, QTcpServer *server)
+{
+    timerActivated = false;
+    socketActivated = false;
+
+    connect(timer, SIGNAL(timeout()), SLOT(timerFired()));
+    connect(server, SIGNAL(newConnection()), SLOT(socketFired()));
+}
+
+void MixingWithTimersHelper::timerFired()
+{
+    timerActivated = true;
+}
+
+void MixingWithTimersHelper::socketFired()
+{
+    socketActivated = true;
+}
+
+void tst_QSocketNotifier::mixingWithTimers()
+{
+    QTimer timer;
+    timer.setInterval(0);
+    timer.start();
+
+    QTcpServer server;
+    QVERIFY(server.listen(QHostAddress::LocalHost, 0));
+
+    MixingWithTimersHelper helper(&timer, &server);
+
+    QCoreApplication::processEvents();
+
+    QCOMPARE(helper.timerActivated, true);
+    QCOMPARE(helper.socketActivated, false);
+
+    helper.timerActivated = false;
+    helper.socketActivated = false;
+
+    QTcpSocket socket;
+    socket.connectToHost(server.serverAddress(), server.serverPort());
+
+    QCoreApplication::processEvents();
+
+    QCOMPARE(helper.timerActivated, true);
+    QCOMPARE(helper.socketActivated, true);
+}
+
 QTEST_MAIN(tst_QSocketNotifier)
 #include <tst_qsocketnotifier.moc>
diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
index d19b732fb9..4a32852092 100644
--- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
+++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
@@ -9,6 +9,8 @@ MOC_DIR=tmp
 
 QT = core network
 
+# Symbian toolchain does not support correct include semantics
+symbian:INCPATH+=..\..\..\include\QtNetwork\private
 
 
 requires(contains(QT_CONFIG,private_tests))
diff --git a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
index 5a8bb38922..2fc80da6d6 100644
--- a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -147,11 +147,11 @@ private slots:
 
 tst_QSocks5SocketEngine::tst_QSocks5SocketEngine()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QSocks5SocketEngine::~tst_QSocks5SocketEngine()
 {
-
 }
 
 void tst_QSocks5SocketEngine::init()
@@ -302,7 +302,7 @@ void tst_QSocks5SocketEngine::errorTest()
 
     connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)),
             &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QTestEventLoop::instance().enterLoop(5);
+    QTestEventLoop::instance().enterLoop(10);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     QCOMPARE(int(socket.error()), expectedError);
@@ -319,11 +319,11 @@ void tst_QSocks5SocketEngine::simpleConnectToIMAP()
 
     socketDevice.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::serverName(), 1080));
 
-    QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143));
+    QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143));
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
     QVERIFY(socketDevice.waitForWrite());
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
+    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
 
     // Wait for the greeting
     QVERIFY(socketDevice.waitForRead());
@@ -336,8 +336,7 @@ void tst_QSocks5SocketEngine::simpleConnectToIMAP()
     QVERIFY(socketDevice.read(array.data(), array.size()) == available);
 
     // Check that the greeting is what we expect it to be
-    QCOMPARE(array.constData(),
-            "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+    QCOMPARE(array.constData(), QtNetworkSettings::expectedReplyIMAP().constData());            
 
     // Write a logout message
     QByteArray array2 = "XXXX LOGOUT\r\n";
@@ -529,6 +528,10 @@ void tst_QSocks5SocketEngine::serverTest()
 //---------------------------------------------------------------------------
 void tst_QSocks5SocketEngine::udpTest()
 {
+#ifdef SYMBIAN_WINSOCK_CONNECTIVITY    
+    QSKIP("UDP works bads on non WinPCAP emulator setting", SkipAll);
+#endif    
+    
     QSocks5SocketEngine udpSocket;
 
     // Initialize device #1
@@ -593,7 +596,7 @@ void tst_QSocks5SocketEngine::tcpSocketBlockingTest()
     // Read greeting
     QVERIFY(socket.waitForReadyRead(5000));
     QString s = socket.readLine();
-    QCOMPARE(s.toLatin1().constData(), "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+    QCOMPARE(s.toLatin1().constData(), QtNetworkSettings::expectedReplyIMAP().constData());
 
     // Write NOOP
     QCOMPARE((int) socket.write("1 NOOP\r\n", 8), 8);
@@ -666,9 +669,10 @@ void tst_QSocks5SocketEngine::tcpSocketNonBlockingTest()
     }
 
     // Read greeting
-    QVERIFY(!tcpSocketNonBlocking_data.isEmpty());
-    QCOMPARE(tcpSocketNonBlocking_data.at(0).toLatin1().constData(),
-            "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+    QVERIFY(!tcpSocketNonBlocking_data.isEmpty());        
+    QCOMPARE(tcpSocketNonBlocking_data.at(0).toLatin1().constData(), 
+            QtNetworkSettings::expectedReplyIMAP().constData()); 
+            
     tcpSocketNonBlocking_data.clear();
 
     tcpSocketNonBlocking_totalWritten = 0;
@@ -690,7 +694,6 @@ void tst_QSocks5SocketEngine::tcpSocketNonBlockingTest()
         QFAIL("Timed out");
     }
 
-
     // Read response
     QVERIFY(!tcpSocketNonBlocking_data.isEmpty());
     QCOMPARE(tcpSocketNonBlocking_data.at(0).toLatin1().constData(), "1 OK Completed\r\n");
@@ -787,7 +790,7 @@ void tst_QSocks5SocketEngine::downloadBigFile()
     QTime stopWatch;
     stopWatch.start();
 
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QTestEventLoop::instance().enterLoop(60);
 #else
     QTestEventLoop::instance().enterLoop(180);
@@ -834,14 +837,15 @@ void tst_QSocks5SocketEngine::passwordAuth()
 
     socketDevice.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::serverName(), 1080, "qsockstest", "password"));
 
-    QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143));
+    // Connect to imap.trolltech.com's IP
+    QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143));
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
     QVERIFY(socketDevice.waitForWrite());
-    if (!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143)) {
+    if (!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143)) {
         qDebug("%d, %s", socketDevice.error(), socketDevice.errorString().toLatin1().constData());
     }
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
+    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
 
     // Wait for the greeting
     QVERIFY(socketDevice.waitForRead());
@@ -853,10 +857,9 @@ void tst_QSocks5SocketEngine::passwordAuth()
     array.resize(available);
     QVERIFY(socketDevice.read(array.data(), array.size()) == available);
 
-    // Check that the greeting is what we expect it to be
-    QCOMPARE(array.constData(),
-            "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
-
+    // Check that the greeting is what we expect it to be 
+    QCOMPARE(array.constData(), QtNetworkSettings::expectedReplyIMAP().constData()); 
+        
     // Write a logout message
     QByteArray array2 = "XXXX LOGOUT\r\n";
     QVERIFY(socketDevice.write(array2.data(),
@@ -901,16 +904,16 @@ void tst_QSocks5SocketEngine::passwordAuth2()
     socketDevice.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::serverName(), 1081));
     socketDevice.setReceiver(this);
 
-    QVERIFY(!socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143));
+    QVERIFY(!socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143));
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
     while (socketDevice.state() == QAbstractSocket::ConnectingState) {
         QVERIFY(socketDevice.waitForWrite());
-        socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143);
+        socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143);
     }
     if (socketDevice.state() != QAbstractSocket::ConnectedState)
         qDebug("%d, %s", socketDevice.error(), socketDevice.errorString().toLatin1().constData());
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
+    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
 
     // Wait for the greeting
     QVERIFY(socketDevice.waitForRead());
@@ -922,10 +925,9 @@ void tst_QSocks5SocketEngine::passwordAuth2()
     array.resize(available);
     QVERIFY(socketDevice.read(array.data(), array.size()) == available);
 
-    // Check that the greeting is what we expect it to be
-    QCOMPARE(array.constData(),
-            "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
-
+    // Check that the greeting is what we expect it to be 
+    QCOMPARE(array.constData(), QtNetworkSettings::expectedReplyIMAP().constData()); 
+        
     // Write a logout message
     QByteArray array2 = "XXXX LOGOUT\r\n";
     QVERIFY(socketDevice.write(array2.data(),
diff --git a/tests/auto/qsound/qsound.pro b/tests/auto/qsound/qsound.pro
index 20c60980de..75da2e64bb 100644
--- a/tests/auto/qsound/qsound.pro
+++ b/tests/auto/qsound/qsound.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES += tst_qsound.cpp
 
-wince*: {
+wince*|symbian*: {
    deploy.sources += 4.wav
    DEPLOYMENT = deploy
 }
\ No newline at end of file
diff --git a/tests/auto/qsplitter/qsplitter.pro b/tests/auto/qsplitter/qsplitter.pro
index a7ff0a6ad3..8c3e40b3a4 100644
--- a/tests/auto/qsplitter/qsplitter.pro
+++ b/tests/auto/qsplitter/qsplitter.pro
@@ -4,7 +4,7 @@ SOURCES  += tst_qsplitter.cpp
 
 contains(QT_CONFIG, qt3support): QT += qt3support
 
-wince*: {
+wince*|symbian*: {
    addFiles.sources = extradata.txt setSizes3.dat
    addFiles.path = .
    DEPLOYMENT += addFiles
diff --git a/tests/auto/qsql/qsql.pro b/tests/auto/qsql/qsql.pro
index 2c0e337eed..6660f42f1d 100644
--- a/tests/auto/qsql/qsql.pro
+++ b/tests/auto/qsql/qsql.pro
@@ -8,3 +8,11 @@ contains(QT_CONFIG, qt3support): QT += qt3support
 wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
 }
+
+symbian {
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        sqlite.path = /sys/bin
+        sqlite.sources = sqlite3.dll 
+        DEPLOYMENT += sqlite
+    }
+}
diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/qsqldatabase/qsqldatabase.pro
index 3bca79a1a8..623523dc7d 100644
--- a/tests/auto/qsqldatabase/qsqldatabase.pro
+++ b/tests/auto/qsqldatabase/qsqldatabase.pro
@@ -19,5 +19,14 @@ wince*: {
    DEPLOYMENT += testData
 }
 
-
+symbian {
+	TARGET.EPOCHEAPSIZE=5000 5000000
+	TARGET.EPOCSTACKSIZE=50000
+	
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        sqlite.path = /sys/bin
+        sqlite.sources = sqlite3.dll 
+        DEPLOYMENT += sqlite
+    }
+}
 
diff --git a/tests/auto/qsqlerror/qsqlerror.pro b/tests/auto/qsqlerror/qsqlerror.pro
index 570c88e145..855e72028a 100644
--- a/tests/auto/qsqlerror/qsqlerror.pro
+++ b/tests/auto/qsqlerror/qsqlerror.pro
@@ -7,4 +7,10 @@ QT = core sql
 
 SOURCES += tst_qsqlerror.cpp
 
-
+symbian {
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        sqlite.path = /sys/bin
+        sqlite.sources = sqlite3.dll 
+        DEPLOYMENT += sqlite
+    }
+}
diff --git a/tests/auto/qsqlfield/qsqlfield.pro b/tests/auto/qsqlfield/qsqlfield.pro
index 04875fdd71..022d73f211 100644
--- a/tests/auto/qsqlfield/qsqlfield.pro
+++ b/tests/auto/qsqlfield/qsqlfield.pro
@@ -3,5 +3,11 @@ SOURCES  += tst_qsqlfield.cpp
 
 QT += sql
 
-
+symbian {
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        sqlite.path = /sys/bin
+        sqlite.sources = sqlite3.dll 
+        DEPLOYMENT += sqlite
+    }
+}
 
diff --git a/tests/auto/qsqlquery/qsqlquery.pro b/tests/auto/qsqlquery/qsqlquery.pro
index 79966374d9..d512f50776 100644
--- a/tests/auto/qsqlquery/qsqlquery.pro
+++ b/tests/auto/qsqlquery/qsqlquery.pro
@@ -13,3 +13,11 @@ wince*: {
    DEPLOYMENT += plugFiles
    LIBS += -lws2
 }
+
+symbian {
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        sqlite.path = /sys/bin
+        sqlite.sources = sqlite3.dll 
+        DEPLOYMENT += sqlite
+    }
+}
diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
index 6004ab02eb..ede90b0da6 100644
--- a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
+++ b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
@@ -5,7 +5,13 @@ QT += sql
 
 wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
-   LIBS += -lws2
+	LIBS += -lws2
+}else:symbian {
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        sqlite.path = /sys/bin
+        sqlite.sources = sqlite3.dll 
+        DEPLOYMENT += sqlite
+    }
 } else {
    win32:LIBS += -lws2_32
 }
diff --git a/tests/auto/qsqlrecord/qsqlrecord.pro b/tests/auto/qsqlrecord/qsqlrecord.pro
index 819ae59f79..db92c09399 100644
--- a/tests/auto/qsqlrecord/qsqlrecord.pro
+++ b/tests/auto/qsqlrecord/qsqlrecord.pro
@@ -1,6 +1,16 @@
 load(qttest_p4)
 SOURCES  += tst_qsqlrecord.cpp
 
+symbian {
+contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+    sqlite.path = /sys/bin
+    sqlite.sources = sqlite3.dll 
+    DEPLOYMENT += sqlite
+}
+
+TARGET.EPOCSTACKSIZE=50000
+TARGET.EPOCHEAPSIZE=50000 5000000
+}
 QT += sql
 
 
diff --git a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
index a25cb93a88..fe7185a622 100644
--- a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
+++ b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
@@ -8,6 +8,12 @@ wince*: {
    plugFiles.path    = .
    DEPLOYMENT += plugFiles 
    LIBS += -lws2
+}else:symbian {
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        sqlite.path = /sys/bin
+        sqlite.sources = sqlite3.dll 
+        DEPLOYMENT += sqlite
+    }
 } else {
    win32-g++ {
         LIBS += -lws2_32
diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/qsqltablemodel/qsqltablemodel.pro
index 170862e195..a1a0d359c6 100644
--- a/tests/auto/qsqltablemodel/qsqltablemodel.pro
+++ b/tests/auto/qsqltablemodel/qsqltablemodel.pro
@@ -8,7 +8,13 @@ wince*: {
    plugFiles.path    = .
    DEPLOYMENT += plugFiles
    LIBS += -lws2
-} else {
+}else:symbian {
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        sqlite.path = /sys/bin
+        sqlite.sources = sqlite3.dll 
+        DEPLOYMENT += sqlite
+    }
+}else {
    win32:LIBS += -lws2_32
 }
 
diff --git a/tests/auto/qsqlthread/qsqlthread.pro b/tests/auto/qsqlthread/qsqlthread.pro
index 9049f4c656..8650e6ce92 100644
--- a/tests/auto/qsqlthread/qsqlthread.pro
+++ b/tests/auto/qsqlthread/qsqlthread.pro
@@ -9,7 +9,13 @@ wince*: {
    plugFiles.path    = .
    DEPLOYMENT += plugFiles
    LIBS += -lws2
-} else {
+}else:symbian {
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        sqlite.path = /sys/bin
+        sqlite.sources = sqlite3.dll 
+        DEPLOYMENT += sqlite
+    }
+}else {
    win32:LIBS += -lws2_32
 }
 
diff --git a/tests/auto/qsslcertificate/qsslcertificate.pro b/tests/auto/qsslcertificate/qsslcertificate.pro
index f3f7adbc3e..b237f2e5e9 100644
--- a/tests/auto/qsslcertificate/qsslcertificate.pro
+++ b/tests/auto/qsslcertificate/qsslcertificate.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 
 SOURCES += tst_qsslcertificate.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += network
+QT = core network
 
 TARGET = tst_qsslcertificate
 
@@ -14,13 +14,14 @@ win32 {
   }
 }
 
-wince*: {
+wince*|symbian: {
   certFiles.sources = certificates more-certificates
   certFiles.path    = .
   DEPLOYMENT += certFiles
+}
+
+wince*: {
   DEFINES += SRCDIR=\\\".\\\"
-} else {
+} else:!symbian {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
-
-
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
index 7fd92d6358..2366414149 100644
--- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
@@ -45,6 +45,12 @@
 #include <qsslkey.h>
 #include <qsslsocket.h>
 
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Current path (C:\private\<UID>) contains only ascii chars
+#define SRCDIR QDir::currentPath().toAscii()
+#endif
+
 class tst_QSslCertificate : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qsslcipher/qsslcipher.pro b/tests/auto/qsslcipher/qsslcipher.pro
index 8a99274592..6eae588155 100644
--- a/tests/auto/qsslcipher/qsslcipher.pro
+++ b/tests/auto/qsslcipher/qsslcipher.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 
 SOURCES += tst_qsslcipher.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += network
+QT = core network
 
 TARGET = tst_qsslcipher
 
diff --git a/tests/auto/qsslerror/qsslerror.pro b/tests/auto/qsslerror/qsslerror.pro
index 1385d2e4fa..ee5872b98c 100644
--- a/tests/auto/qsslerror/qsslerror.pro
+++ b/tests/auto/qsslerror/qsslerror.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 
 SOURCES += tst_qsslerror.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += network
+QT = core network
 
 TARGET = tst_qsslerror
 
diff --git a/tests/auto/qsslkey/qsslkey.pro b/tests/auto/qsslkey/qsslkey.pro
index 5cab3d584c..32138f84f9 100644
--- a/tests/auto/qsslkey/qsslkey.pro
+++ b/tests/auto/qsslkey/qsslkey.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 
 SOURCES += tst_qsslkey.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += network
+QT = core network
 
 TARGET = tst_qsslkey
 
@@ -14,11 +14,14 @@ win32 {
   }
 }
 
-wince*: {
+wince*|symbian: {
    keyFiles.sources = keys
    keyFiles.path    = .
    DEPLOYMENT += keyFiles
+}
+
+wince*: {
    DEFINES += SRCDIR=\\\".\\\"
-} else {
+} else:!symbian {
    DEFINES+= SRCDIR=\\\"$$PWD\\\"
 }
diff --git a/tests/auto/qsslkey/tst_qsslkey.cpp b/tests/auto/qsslkey/tst_qsslkey.cpp
index fc0e18e1fc..7a41e5bcee 100644
--- a/tests/auto/qsslkey/tst_qsslkey.cpp
+++ b/tests/auto/qsslkey/tst_qsslkey.cpp
@@ -47,6 +47,12 @@
 #include <QtNetwork/qhostaddress.h>
 #include <QtNetwork/qnetworkproxy.h>
 
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Current path (C:\private\<UID>) contains only ascii chars
+#define SRCDIR QDir::currentPath().toAscii()
+#endif
+
 class tst_QSslKey : public QObject
 {
     Q_OBJECT
@@ -101,7 +107,7 @@ tst_QSslKey::tst_QSslKey()
 #ifdef Q_WS_MAC
     // applicationDirPath() points to a path inside the app bundle on Mac.
     QDir dir(qApp->applicationDirPath() + QLatin1String("/../../../keys"));
-#elif defined(Q_OS_WIN)
+#elif defined(Q_OS_WIN) || defined (Q_OS_SYMBIAN)
     QDir dir(SRCDIR + QLatin1String("/keys"));  // prefer this way to avoid ifdeffery and support shadow builds?
 #else
     QDir dir(qApp->applicationDirPath() + QLatin1String("/keys"));
diff --git a/tests/auto/qsslsocket/certs/aspiriniks.ca.crt b/tests/auto/qsslsocket/certs/aspiriniks.ca.crt
new file mode 100644
index 0000000000..36436b6248
--- /dev/null
+++ b/tests/auto/qsslsocket/certs/aspiriniks.ca.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDnDCCAoQCCQDV3otC4hs2KTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+Tk8xDTALBgNVBAgTBE9zbG8xDTALBgNVBAcTBE9zbG8xDzANBgNVBAoTBlRUIEFT
+QTEOMAwGA1UECxMFUVQgU1cxHDAaBgNVBAMTE2FzcGlyaW5pa3MudHJvbGwubm8x
+IzAhBgkqhkiG9w0BCQEWFGFiYWJpY0B0cm9sbHRlY2guY29tMB4XDTA4MTEwMTA4
+NTcyOFoXDTA5MTEwMTA4NTcyOFowgY8xCzAJBgNVBAYTAk5PMQ0wCwYDVQQIEwRP
+c2xvMQ0wCwYDVQQHEwRPc2xvMQ8wDQYDVQQKEwZUVCBBU0ExDjAMBgNVBAsTBVFU
+IFNXMRwwGgYDVQQDExNhc3BpcmluaWtzLnRyb2xsLm5vMSMwIQYJKoZIhvcNAQkB
+FhRhYmFiaWNAdHJvbGx0ZWNoLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMV2bMD1DN3DMgbxU3DXw2i7EWGDXcWjTDtdHvqgIb+9nHqo3MJSrzJy
+qgEPoOsXqswMla9wDPZAsWv5gVAmVSqpy2lfEgfY7LaSHiGD75seF7zIy+CxREHW
+DofHXpJGGJpBCZEKQt2HfHu3+yAYNPucN78tWNZAcPbUg5tfxMZeepRimAZNIxBI
+93SDrl/f9Ka7hvPSzUQsnp8hfdpHlFPFznKfD6yPrjxgz2mT9efavJ4DhtyIa4m+
+paiX515CidDz4A8CFxKZbYvuqq1ilibF/si2so9VhALC77ZcAJP1IMuT8T+WUCxq
+skJqiSCncl0Hgr+ba8MDGF9UQYowgjMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+KcJuNUHvjB8ok3cnTmQEeF0LPPkgj28Tqb5TFB8xpVfRI+wvTYsHsmGdOKCgYJ3a
+7VflIsr63ojG8/rXK8H/cx2o2f2Hr3liJdi1UnoLDDRjBqGGz7JNuMreYokPvIbm
+eP01mVyK4PO2iYRwHUIAw5eeB1vMWKX2z95MupD+HRLtmGyaLALg8aQxj5N84Ewl
+eU2PQfhv8A1wj7aL17kfEUxDerQ1kUzlThJMV1J8Dl0l4C9N8evQkelROJU00i46
+oJikA8BW6EpgbnGyNyyj5Loy4wLPKew9nTS8MCJ5xPMQc0urbY/VzuOeUK7WQof7
+xOFSsRAVyQv+yqgmcZMCtg==
+-----END CERTIFICATE-----
diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/qsslsocket/qsslsocket.pro
index c29fc68ed2..8f61318e10 100644
--- a/tests/auto/qsslsocket/qsslsocket.pro
+++ b/tests/auto/qsslsocket/qsslsocket.pro
@@ -7,12 +7,6 @@ QT -= gui
 
 TARGET = tst_qsslsocket
 
-!wince* {
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
-} else {
-DEFINES += SRCDIR=\\\"./\\\"
-}
-
 win32 {
   CONFIG(debug, debug|release) {
     DESTDIR = debug
@@ -21,8 +15,20 @@ win32 {
   }
 }
 
-wince*: {
-   certFiles.sources = certs ssl.tar.gz
-   certFiles.path    = .
-   DEPLOYMENT += certFiles
+wince* {
+    DEFINES += SRCDIR=\\\"./\\\"
+    
+    certFiles.sources = certs ssl.tar.gz
+    certFiles.path    = .
+    DEPLOYMENT += certFiles
+} else:symbian {
+    DEFINES += QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
+    TARGET.EPOCHEAPSIZE="0x100 0x1000000"
+    TARGET.CAPABILITY="ALL -TCB"
+    
+    certFiles.sources = certs ssl.tar.gz
+    certFiles.path    = .
+    DEPLOYMENT += certFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 23eee29259..225f4d179c 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -76,6 +76,10 @@ Q_DECLARE_METATYPE(QSslError)
 #define QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
 #endif
 
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR ""
+#endif
+
 #ifndef QT_NO_OPENSSL
 class QSslSocketPtr: public QSharedPointer<QSslSocket>
 {
@@ -195,7 +199,9 @@ protected slots:
     }
     void untrustedWorkaroundSlot(const QList<QSslError> &errors)
     {
-        if (errors.size() == 1 && errors.first().error() == QSslError::CertificateUntrusted)
+    	if (errors.size() == 1 && 
+    			(errors.first().error() == QSslError::CertificateUntrusted || 
+    					errors.first().error() == QSslError::SelfSignedCertificate))
             socket->ignoreSslErrors();
     }
     void ignoreErrorListSlot(const QList<QSslError> &errors);
@@ -219,11 +225,11 @@ tst_QSslSocket::tst_QSslSocket()
     qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
     qRegisterMetaType<QAbstractSocket::SocketState>("QSslSocket::SslMode");
 #endif
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QSslSocket::~tst_QSslSocket()
-{
-
+{  
 }
 
 enum ProxyTests {
@@ -243,13 +249,13 @@ void tst_QSslSocket::initTestCase_data()
     QTest::addColumn<bool>("setProxy");
     QTest::addColumn<int>("proxyType");
 
-    QTest::newRow("WithoutProxy") << false << 0;
+    //QTest::newRow("WithoutProxy") << false << 0;
 #ifdef TEST_QNETWORK_PROXY
     QTest::newRow("WithSocks5Proxy") << true << int(Socks5Proxy);
-    QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic);
+    //QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic);
 
-    QTest::newRow("WithHttpProxy") << true << int(HttpProxy);
-    QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic);
+    //QTest::newRow("WithHttpProxy") << true << int(HttpProxy);
+    //QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic);
     // uncomment the line below when NTLM works
 //    QTest::newRow("WithHttpProxyNtlmAuth") << true << int(HttpProxy | AuthNtlm);
 #endif
@@ -427,8 +433,10 @@ void tst_QSslSocket::simpleConnect()
     enterLoop(10);
 
     // Entered connecting state
+#ifndef Q_OS_SYMBIAN
     QCOMPARE(socket.state(), QAbstractSocket::ConnectingState);
     QCOMPARE(connectedSpy.count(), 0);
+#endif
     QCOMPARE(hostFoundSpy.count(), 1);
     QCOMPARE(disconnectedSpy.count(), 0);
     enterLoop(10);
@@ -496,8 +504,7 @@ void tst_QSslSocket::simpleConnectWithIgnore()
     if (!socket.canReadLine())
         enterLoop(10);
 
-    QCOMPARE(socket.readAll(), QByteArray("* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID AUTH=PLAIN SASL-IR] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"));
-
+    QCOMPARE(socket.readAll(), QtNetworkSettings::expectedReplySSL()); 
     socket.disconnectFromHost();
 }
 
@@ -530,8 +537,10 @@ void tst_QSslSocket::sslErrors()
     socket->waitForEncrypted(5000);
 
     SslErrorList output;
-    foreach (QSslError error, socket->sslErrors())
+    foreach (QSslError error, socket->sslErrors()) {
+        //printf("error = %s\n", error.errorString().toAscii().data());
         output << error.error();
+    }
 
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
     if (output.last() == QSslError::CertificateUntrusted)
@@ -583,16 +592,16 @@ void tst_QSslSocket::connectToHostEncrypted()
 
     QSslSocketPtr socket = newSocket();
     this->socket = socket;
-
-    QVERIFY(socket->addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem")));
+    QVERIFY(socket->addCaCertificates(QLatin1String("certs/qt-test-server-cacert.pem")));
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
-    connect(&socket, SIGNAL(sslErrors(QList<QSslError>)),
+    connect(socket, SIGNAL(sslErrors(QList<QSslError>)),
             this, SLOT(untrustedWorkaroundSlot(QList<QSslError>)));
 #endif
 
     socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
 
     // This should pass unconditionally when using fluke's CA certificate.
+    // or use untrusted certificate workaround
     QVERIFY2(socket->waitForEncrypted(10000), qPrintable(socket->errorString()));
 
     socket->disconnectFromHost();
@@ -683,10 +692,9 @@ void tst_QSslSocket::peerCertificateChain()
 
     QList<QSslCertificate> caCertificates = QSslCertificate::fromPath(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
     QVERIFY(caCertificates.count() == 1);
-
     socket->addCaCertificates(caCertificates);
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
-    connect(&socket, SIGNAL(sslErrors(QList<QSslError>)),
+    connect(socket, SIGNAL(sslErrors(QList<QSslError>)),
             this, SLOT(untrustedWorkaroundSlot(QList<QSslError>)));
 #endif
 
@@ -747,7 +755,7 @@ void tst_QSslSocket::protocol()
 //    qDebug() << "certs:" << certs.at(0).issuerInfo(QSslCertificate::CommonName);
     socket->setCaCertificates(certs);
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
-    connect(&socket, SIGNAL(sslErrors(QList<QSslError>)),
+    connect(socket, SIGNAL(sslErrors(QList<QSslError>)),
             this, SLOT(untrustedWorkaroundSlot(QList<QSslError>)));
 #endif
 
@@ -940,11 +948,24 @@ void tst_QSslSocket::waitForConnectedEncryptedReadyRead()
     connect(socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(ignoreErrorSlot()));
     socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 993);
 
+#ifdef Q_OS_SYMBIAN
+    QVERIFY(socket->waitForConnected(10000));
+    QVERIFY(socket->waitForEncrypted(10000));
+
+    // dont forget to login 
+    QCOMPARE((int) socket->write("USER ftptest\r\n"), 14);
+    QCOMPARE((int) socket->write("PASS ftP2Ptf\r\n"), 14);
+
+    QVERIFY(socket->waitForReadyRead(10000));
+    QVERIFY(!socket->peerCertificate().isNull());
+    QVERIFY(!socket->peerCertificateChain().isEmpty());
+#else
     QVERIFY(socket->waitForConnected(10000));
     QVERIFY(socket->waitForEncrypted(10000));
     QVERIFY(socket->waitForReadyRead(10000));
     QVERIFY(!socket->peerCertificate().isNull());
     QVERIFY(!socket->peerCertificateChain().isEmpty());
+#endif
 }
 
 void tst_QSslSocket::startClientEncryption()
@@ -1047,7 +1068,7 @@ void tst_QSslSocket::wildcard()
     // responds with the wildcard, and QSslSocket should accept that as a
     // valid connection.  This was broken in 4.3.0.
     QSslSocketPtr socket = newSocket();
-    socket->addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"));
+    socket->addCaCertificates(QLatin1String("certs/aspiriniks.ca.crt"));
     this->socket = socket;
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
     connect(socket, SIGNAL(sslErrors(QList<QSslError>)),
@@ -1290,7 +1311,11 @@ protected:
 
         // delayed acceptance:
         QTest::qSleep(100);
-        server.waitForNewConnection(2000);
+#ifndef Q_OS_SYMBIAN        
+        bool ret = server.waitForNewConnection(2000);
+#else
+        bool ret = server.waitForNewConnection(20000);        
+#endif        
 
         // delayed start of encryption
         QTest::qSleep(100);
@@ -1490,6 +1515,10 @@ void tst_QSslSocket::disconnectFromHostWhenConnecting()
     // we did not call close, so the socket must be still open
     QVERIFY(socket->isOpen());
     QCOMPARE(socket->bytesToWrite(), qint64(0));
+
+    // dont forget to login
+    QCOMPARE((int) socket->write("USER ftptest\r\n"), 14);
+
 }
 
 void tst_QSslSocket::disconnectFromHostWhenConnected()
@@ -1497,12 +1526,27 @@ void tst_QSslSocket::disconnectFromHostWhenConnected()
     QSslSocketPtr socket = newSocket();
     socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 993);
     socket->ignoreSslErrors();
+#ifndef Q_OS_SYMBIAN     
     QVERIFY(socket->waitForEncrypted(5000));
+#else    
+    QVERIFY(socket->waitForEncrypted(10000));    
+#endif    
     socket->write("XXXX LOGOUT\r\n");
     QCOMPARE(socket->state(), QAbstractSocket::ConnectedState);
     socket->disconnectFromHost();
     QCOMPARE(socket->state(), QAbstractSocket::ClosingState);
-    QVERIFY(socket->waitForDisconnected(5000));
+#ifdef Q_OS_SYMBIAN   
+    // I don't understand how socket->waitForDisconnected can work on other platforms
+    // since socket->write will end to:
+    //   QMetaObject::invokeMethod(this, "_q_flushWriteBuffer", Qt::QueuedConnection);
+    // In order that _q_flushWriteBuffer will be called the eventloop need to run
+    // If we just call waitForDisconnected, which blocks the whole thread how that can happen?
+    connect(socket, SIGNAL(disconnected()), this, SLOT(exitLoop()));
+    enterLoop(5);
+    QVERIFY(!timeout());
+#else   
+    QVERIFY(socket->waitForDisconnected(5000));    
+#endif 
     QCOMPARE(socket->bytesToWrite(), qint64(0));
 }
 
@@ -1529,6 +1573,12 @@ void tst_QSslSocket::resetProxy()
     socket.connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
     QVERIFY(! socket.waitForConnected(10000));
 
+    // dont forget to login
+    QCOMPARE((int) socket.write("USER ftptest\r\n"), 14);
+    QCOMPARE((int) socket.write("PASS password\r\n"), 15);
+
+    enterLoop(10);
+
     // now the other way round:
     // set the nonsense proxy and make sure the connection does not work,
     // and then set the right proxy and make sure it works
diff --git a/tests/auto/qstandarditem/tst_qstandarditem.cpp b/tests/auto/qstandarditem/tst_qstandarditem.cpp
index 93f64c5d4b..0e26665604 100644
--- a/tests/auto/qstandarditem/tst_qstandarditem.cpp
+++ b/tests/auto/qstandarditem/tst_qstandarditem.cpp
@@ -291,12 +291,14 @@ void tst_QStandardItem::getSetFlags()
     item.setTristate(true);
     QVERIFY(item.isTristate());
     QVERIFY(item.flags() & Qt::ItemIsTristate);
+#ifndef QT_NO_DRAGANDDROP
     item.setDragEnabled(true);
     QVERIFY(item.isDragEnabled());
     QVERIFY(item.flags() & Qt::ItemIsDragEnabled);
     item.setDropEnabled(true);
     QVERIFY(item.isDropEnabled());
     QVERIFY(item.flags() & Qt::ItemIsDropEnabled);
+#endif
     
     QVERIFY(item.isEnabled());
     item.setEnabled(false);
@@ -318,6 +320,7 @@ void tst_QStandardItem::getSetFlags()
     item.setTristate(false);
     QVERIFY(!item.isTristate());
     QVERIFY(!(item.flags() & Qt::ItemIsTristate));
+#ifndef QT_NO_DRAGANDDROP
     QVERIFY(item.isDragEnabled());
     item.setDragEnabled(false);
     QVERIFY(!item.isDragEnabled());
@@ -326,6 +329,7 @@ void tst_QStandardItem::getSetFlags()
     item.setDropEnabled(false);
     QVERIFY(!item.isDropEnabled());
     QVERIFY(!(item.flags() & Qt::ItemIsDropEnabled));
+#endif
 
     item.setCheckable(false);
     item.setCheckState(Qt::Checked);
diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
index fba7b1bd57..794c5e636a 100644
--- a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -1388,7 +1388,9 @@ void tst_QStandardItemModel::rootItemFlags()
     QCOMPARE(model.invisibleRootItem()->flags() , f);
     QCOMPARE(model.invisibleRootItem()->flags() , model.flags(QModelIndex()));
 
+#ifndef QT_NO_DRAGANDDROP
     model.invisibleRootItem()->setDropEnabled(false);
+#endif
     QCOMPARE(model.invisibleRootItem()->flags() , Qt::ItemIsEnabled);
     QCOMPARE(model.invisibleRootItem()->flags() , model.flags(QModelIndex()));
 }
@@ -1527,7 +1529,9 @@ void tst_QStandardItemModel::treeDragAndDrop()
     view.setModel(&model);
     view.expandAll();
     view.show();
+#ifndef QT_NO_DRAGANDDROP
     view.setDragDropMode(QAbstractItemView::InternalMove);
+#endif
     view.setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     QItemSelectionModel *selection = view.selectionModel();
diff --git a/tests/auto/qstl/qstl.pro b/tests/auto/qstl/qstl.pro
index 07cc314eed..5c9987496c 100644
--- a/tests/auto/qstl/qstl.pro
+++ b/tests/auto/qstl/qstl.pro
@@ -1,7 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qstl.cpp
-
-
 QT = core
-
-
diff --git a/tests/auto/qstring/qstring.pro b/tests/auto/qstring/qstring.pro
index eb52d907a1..ed758c634b 100644
--- a/tests/auto/qstring/qstring.pro
+++ b/tests/auto/qstring/qstring.pro
@@ -1,9 +1,8 @@
 load(qttest_p4)
 SOURCES  += tst_qstring.cpp
 
+symbian:LIBS += -llibm
+
 QT = core
 
 DEFINES += QT_NO_CAST_TO_ASCII
-
-
-
diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp
index 85dbda0e70..c77875a91c 100644
--- a/tests/auto/qstring/tst_qstring.cpp
+++ b/tests/auto/qstring/tst_qstring.cpp
@@ -446,48 +446,48 @@ void tst_QString::replace_string_data()
     QTest::addColumn<QString>("result" );
     QTest::addColumn<bool>("bcs" );
 
-    QTest::newRow( "rem00" ) << QString("") << QString("") << QString("") << QString("") << TRUE;
-    QTest::newRow( "rem01" ) << QString("A") << QString("") << QString("") << QString("A") << TRUE;
-    QTest::newRow( "rem02" ) << QString("A") << QString("A") << QString("") << QString("") << TRUE;
-    QTest::newRow( "rem03" ) << QString("A") << QString("B") << QString("") << QString("A") << TRUE;
-    QTest::newRow( "rem04" ) << QString("AA") << QString("A") << QString("") << QString("") << TRUE;
-    QTest::newRow( "rem05" ) << QString("AB") << QString("A") << QString("") << QString("B") << TRUE;
-    QTest::newRow( "rem06" ) << QString("AB") << QString("B") << QString("") << QString("A") << TRUE;
-    QTest::newRow( "rem07" ) << QString("AB") << QString("C") << QString("") << QString("AB") << TRUE;
-    QTest::newRow( "rem08" ) << QString("ABA") << QString("A") << QString("") << QString("B") << TRUE;
-    QTest::newRow( "rem09" ) << QString("ABA") << QString("B") << QString("") << QString("AA") << TRUE;
-    QTest::newRow( "rem10" ) << QString("ABA") << QString("C") << QString("") << QString("ABA") << TRUE;
-    QTest::newRow( "rem11" ) << QString("banana") << QString("an") << QString("") << QString("ba") << TRUE;
-    QTest::newRow( "rem12" ) << QString("") << QString("A") << QString("") << QString("") << TRUE;
-    QTest::newRow( "rem13" ) << QString("") << QString("A") << QString() << QString("") << TRUE;
-    QTest::newRow( "rem14" ) << QString() << QString("A") << QString("") << QString() << TRUE;
-    QTest::newRow( "rem15" ) << QString() << QString("A") << QString() << QString() << TRUE;
-    QTest::newRow( "rem16" ) << QString() << QString("") << QString("") << QString("") << TRUE;
-    QTest::newRow( "rem17" ) << QString("") << QString() << QString("") << QString("") << TRUE;
-    QTest::newRow( "rem18" ) << QString("a") << QString("a") << QString("") << QString("") << FALSE;
-    QTest::newRow( "rem19" ) << QString("A") << QString("A") << QString("") << QString("") << FALSE;
-    QTest::newRow( "rem20" ) << QString("a") << QString("A") << QString("") << QString("") << FALSE;
-    QTest::newRow( "rem21" ) << QString("A") << QString("a") << QString("") << QString("") << FALSE;
-    QTest::newRow( "rem22" ) << QString("Alpha beta") << QString("a") << QString("") << QString("lph bet") << FALSE;
-
-    QTest::newRow( "rep00" ) << QString("ABC") << QString("B") << QString("-") << QString("A-C") << TRUE;
-    QTest::newRow( "rep01" ) << QString("$()*+.?[\\]^{|}") << QString("$()*+.?[\\]^{|}") << QString("X") << QString("X") << TRUE;
-    QTest::newRow( "rep02" ) << QString("ABCDEF") << QString("") << QString("X") << QString("XAXBXCXDXEXFX") << TRUE;
-    QTest::newRow( "rep03" ) << QString("") << QString("") << QString("X") << QString("X") << TRUE;
-    QTest::newRow( "rep04" ) << QString("a") << QString("a") << QString("b") << QString("b") << FALSE;
-    QTest::newRow( "rep05" ) << QString("A") << QString("A") << QString("b") << QString("b") << FALSE;
-    QTest::newRow( "rep06" ) << QString("a") << QString("A") << QString("b") << QString("b") << FALSE;
-    QTest::newRow( "rep07" ) << QString("A") << QString("a") << QString("b") << QString("b") << FALSE;
-    QTest::newRow( "rep08" ) << QString("a") << QString("a") << QString("a") << QString("a") << FALSE;
-    QTest::newRow( "rep09" ) << QString("A") << QString("A") << QString("a") << QString("a") << FALSE;
-    QTest::newRow( "rep10" ) << QString("a") << QString("A") << QString("a") << QString("a") << FALSE;
-    QTest::newRow( "rep11" ) << QString("A") << QString("a") << QString("a") << QString("a") << FALSE;
-    QTest::newRow( "rep12" ) << QString("Alpha beta") << QString("a") << QString("o") << QString("olpho beto") << FALSE;
-    QTest::newRow( "rep13" ) << QString() << QString("") << QString("A") << QString("A") << TRUE;
-    QTest::newRow( "rep14" ) << QString("") << QString() << QString("A") << QString("A") << TRUE;
-    QTest::newRow( "rep15" ) << QString("fooxbarxbazxblub") << QString("x") << QString("yz") << QString("fooyzbaryzbazyzblub") << TRUE;
-    QTest::newRow( "rep16" ) << QString("fooxbarxbazxblub") << QString("x") << QString("z") << QString("foozbarzbazzblub") << TRUE;
-    QTest::newRow( "rep17" ) << QString("fooxybarxybazxyblub") << QString("xy") << QString("z") << QString("foozbarzbazzblub") << TRUE;
+    QTest::newRow( "rem00" ) << QString("") << QString("") << QString("") << QString("") << true;
+    QTest::newRow( "rem01" ) << QString("A") << QString("") << QString("") << QString("A") << true;
+    QTest::newRow( "rem02" ) << QString("A") << QString("A") << QString("") << QString("") << true;
+    QTest::newRow( "rem03" ) << QString("A") << QString("B") << QString("") << QString("A") << true;
+    QTest::newRow( "rem04" ) << QString("AA") << QString("A") << QString("") << QString("") << true;
+    QTest::newRow( "rem05" ) << QString("AB") << QString("A") << QString("") << QString("B") << true;
+    QTest::newRow( "rem06" ) << QString("AB") << QString("B") << QString("") << QString("A") << true;
+    QTest::newRow( "rem07" ) << QString("AB") << QString("C") << QString("") << QString("AB") << true;
+    QTest::newRow( "rem08" ) << QString("ABA") << QString("A") << QString("") << QString("B") << true;
+    QTest::newRow( "rem09" ) << QString("ABA") << QString("B") << QString("") << QString("AA") << true;
+    QTest::newRow( "rem10" ) << QString("ABA") << QString("C") << QString("") << QString("ABA") << true;
+    QTest::newRow( "rem11" ) << QString("banana") << QString("an") << QString("") << QString("ba") << true;
+    QTest::newRow( "rem12" ) << QString("") << QString("A") << QString("") << QString("") << true;
+    QTest::newRow( "rem13" ) << QString("") << QString("A") << QString() << QString("") << true;
+    QTest::newRow( "rem14" ) << QString() << QString("A") << QString("") << QString() << true;
+    QTest::newRow( "rem15" ) << QString() << QString("A") << QString() << QString() << true;
+    QTest::newRow( "rem16" ) << QString() << QString("") << QString("") << QString("") << true;
+    QTest::newRow( "rem17" ) << QString("") << QString() << QString("") << QString("") << true;
+    QTest::newRow( "rem18" ) << QString("a") << QString("a") << QString("") << QString("") << false;
+    QTest::newRow( "rem19" ) << QString("A") << QString("A") << QString("") << QString("") << false;
+    QTest::newRow( "rem20" ) << QString("a") << QString("A") << QString("") << QString("") << false;
+    QTest::newRow( "rem21" ) << QString("A") << QString("a") << QString("") << QString("") << false;
+    QTest::newRow( "rem22" ) << QString("Alpha beta") << QString("a") << QString("") << QString("lph bet") << false;
+
+    QTest::newRow( "rep00" ) << QString("ABC") << QString("B") << QString("-") << QString("A-C") << true;
+    QTest::newRow( "rep01" ) << QString("$()*+.?[\\]^{|}") << QString("$()*+.?[\\]^{|}") << QString("X") << QString("X") << true;
+    QTest::newRow( "rep02" ) << QString("ABCDEF") << QString("") << QString("X") << QString("XAXBXCXDXEXFX") << true;
+    QTest::newRow( "rep03" ) << QString("") << QString("") << QString("X") << QString("X") << true;
+    QTest::newRow( "rep04" ) << QString("a") << QString("a") << QString("b") << QString("b") << false;
+    QTest::newRow( "rep05" ) << QString("A") << QString("A") << QString("b") << QString("b") << false;
+    QTest::newRow( "rep06" ) << QString("a") << QString("A") << QString("b") << QString("b") << false;
+    QTest::newRow( "rep07" ) << QString("A") << QString("a") << QString("b") << QString("b") << false;
+    QTest::newRow( "rep08" ) << QString("a") << QString("a") << QString("a") << QString("a") << false;
+    QTest::newRow( "rep09" ) << QString("A") << QString("A") << QString("a") << QString("a") << false;
+    QTest::newRow( "rep10" ) << QString("a") << QString("A") << QString("a") << QString("a") << false;
+    QTest::newRow( "rep11" ) << QString("A") << QString("a") << QString("a") << QString("a") << false;
+    QTest::newRow( "rep12" ) << QString("Alpha beta") << QString("a") << QString("o") << QString("olpho beto") << false;
+    QTest::newRow( "rep13" ) << QString() << QString("") << QString("A") << QString("A") << true;
+    QTest::newRow( "rep14" ) << QString("") << QString() << QString("A") << QString("A") << true;
+    QTest::newRow( "rep15" ) << QString("fooxbarxbazxblub") << QString("x") << QString("yz") << QString("fooyzbaryzbazyzblub") << true;
+    QTest::newRow( "rep16" ) << QString("fooxbarxbazxblub") << QString("x") << QString("z") << QString("foozbarzbazzblub") << true;
+    QTest::newRow( "rep17" ) << QString("fooxybarxybazxyblub") << QString("xy") << QString("z") << QString("foozbarzbazzblub") << true;
 }
 
 void tst_QString::replace_regexp_data()
@@ -958,68 +958,68 @@ void tst_QString::indexOf_data()
     QTest::addColumn<bool>("bcs" );
     QTest::addColumn<int>("resultpos" );
 
-    QTest::newRow( "data0" ) << QString("abc") << QString("a") << 0 << TRUE << 0;
-    QTest::newRow( "data1" ) << QString("abc") << QString("a") << 0 << FALSE << 0;
-    QTest::newRow( "data2" ) << QString("abc") << QString("A") << 0 << TRUE << -1;
-    QTest::newRow( "data3" ) << QString("abc") << QString("A") << 0 << FALSE << 0;
-    QTest::newRow( "data4" ) << QString("abc") << QString("a") << 1 << TRUE << -1;
-    QTest::newRow( "data5" ) << QString("abc") << QString("a") << 1 << FALSE << -1;
-    QTest::newRow( "data6" ) << QString("abc") << QString("A") << 1 << TRUE << -1;
-    QTest::newRow( "data7" ) << QString("abc") << QString("A") << 1 << FALSE << -1;
-    QTest::newRow( "data8" ) << QString("abc") << QString("b") << 0 << TRUE << 1;
-    QTest::newRow( "data9" ) << QString("abc") << QString("b") << 0 << FALSE << 1;
-    QTest::newRow( "data10" ) << QString("abc") << QString("B") << 0 << TRUE << -1;
-    QTest::newRow( "data11" ) << QString("abc") << QString("B") << 0 << FALSE << 1;
-    QTest::newRow( "data12" ) << QString("abc") << QString("b") << 1 << TRUE << 1;
-    QTest::newRow( "data13" ) << QString("abc") << QString("b") << 1 << FALSE << 1;
-    QTest::newRow( "data14" ) << QString("abc") << QString("B") << 1 << TRUE << -1;
-    QTest::newRow( "data15" ) << QString("abc") << QString("B") << 1 << FALSE << 1;
-    QTest::newRow( "data16" ) << QString("abc") << QString("b") << 2 << TRUE << -1;
-    QTest::newRow( "data17" ) << QString("abc") << QString("b") << 2 << FALSE << -1;
-
-    QTest::newRow( "data20" ) << QString("ABC") << QString("A") << 0 << TRUE << 0;
-    QTest::newRow( "data21" ) << QString("ABC") << QString("A") << 0 << FALSE << 0;
-    QTest::newRow( "data22" ) << QString("ABC") << QString("a") << 0 << TRUE << -1;
-    QTest::newRow( "data23" ) << QString("ABC") << QString("a") << 0 << FALSE << 0;
-    QTest::newRow( "data24" ) << QString("ABC") << QString("A") << 1 << TRUE << -1;
-    QTest::newRow( "data25" ) << QString("ABC") << QString("A") << 1 << FALSE << -1;
-    QTest::newRow( "data26" ) << QString("ABC") << QString("a") << 1 << TRUE << -1;
-    QTest::newRow( "data27" ) << QString("ABC") << QString("a") << 1 << FALSE << -1;
-    QTest::newRow( "data28" ) << QString("ABC") << QString("B") << 0 << TRUE << 1;
-    QTest::newRow( "data29" ) << QString("ABC") << QString("B") << 0 << FALSE << 1;
-    QTest::newRow( "data30" ) << QString("ABC") << QString("b") << 0 << TRUE << -1;
-    QTest::newRow( "data31" ) << QString("ABC") << QString("b") << 0 << FALSE << 1;
-    QTest::newRow( "data32" ) << QString("ABC") << QString("B") << 1 << TRUE << 1;
-    QTest::newRow( "data33" ) << QString("ABC") << QString("B") << 1 << FALSE << 1;
-    QTest::newRow( "data34" ) << QString("ABC") << QString("b") << 1 << TRUE << -1;
-    QTest::newRow( "data35" ) << QString("ABC") << QString("b") << 1 << FALSE << 1;
-    QTest::newRow( "data36" ) << QString("ABC") << QString("B") << 2 << TRUE << -1;
-    QTest::newRow( "data37" ) << QString("ABC") << QString("B") << 2 << FALSE << -1;
-
-    QTest::newRow( "data40" ) << QString("aBc") << QString("bc") << 0 << TRUE << -1;
-    QTest::newRow( "data41" ) << QString("aBc") << QString("Bc") << 0 << TRUE << 1;
-    QTest::newRow( "data42" ) << QString("aBc") << QString("bC") << 0 << TRUE << -1;
-    QTest::newRow( "data43" ) << QString("aBc") << QString("BC") << 0 << TRUE << -1;
-    QTest::newRow( "data44" ) << QString("aBc") << QString("bc") << 0 << FALSE << 1;
-    QTest::newRow( "data45" ) << QString("aBc") << QString("Bc") << 0 << FALSE << 1;
-    QTest::newRow( "data46" ) << QString("aBc") << QString("bC") << 0 << FALSE << 1;
-    QTest::newRow( "data47" ) << QString("aBc") << QString("BC") << 0 << FALSE << 1;
-    QTest::newRow( "data48" ) << QString("AbC") << QString("bc") << 0 << TRUE << -1;
-    QTest::newRow( "data49" ) << QString("AbC") << QString("Bc") << 0 << TRUE << -1;
-    QTest::newRow( "data50" ) << QString("AbC") << QString("bC") << 0 << TRUE << 1;
-    QTest::newRow( "data51" ) << QString("AbC") << QString("BC") << 0 << TRUE << -1;
-    QTest::newRow( "data52" ) << QString("AbC") << QString("bc") << 0 << FALSE << 1;
-    QTest::newRow( "data53" ) << QString("AbC") << QString("Bc") << 0 << FALSE << 1;
-
-    QTest::newRow( "data54" ) << QString("AbC") << QString("bC") << 0 << FALSE << 1;
-    QTest::newRow( "data55" ) << QString("AbC") << QString("BC") << 0 << FALSE << 1;
-    QTest::newRow( "data56" ) << QString("AbC") << QString("BC") << 1 << FALSE << 1;
-    QTest::newRow( "data57" ) << QString("AbC") << QString("BC") << 2 << FALSE << -1;
+    QTest::newRow( "data0" ) << QString("abc") << QString("a") << 0 << true << 0;
+    QTest::newRow( "data1" ) << QString("abc") << QString("a") << 0 << false << 0;
+    QTest::newRow( "data2" ) << QString("abc") << QString("A") << 0 << true << -1;
+    QTest::newRow( "data3" ) << QString("abc") << QString("A") << 0 << false << 0;
+    QTest::newRow( "data4" ) << QString("abc") << QString("a") << 1 << true << -1;
+    QTest::newRow( "data5" ) << QString("abc") << QString("a") << 1 << false << -1;
+    QTest::newRow( "data6" ) << QString("abc") << QString("A") << 1 << true << -1;
+    QTest::newRow( "data7" ) << QString("abc") << QString("A") << 1 << false << -1;
+    QTest::newRow( "data8" ) << QString("abc") << QString("b") << 0 << true << 1;
+    QTest::newRow( "data9" ) << QString("abc") << QString("b") << 0 << false << 1;
+    QTest::newRow( "data10" ) << QString("abc") << QString("B") << 0 << true << -1;
+    QTest::newRow( "data11" ) << QString("abc") << QString("B") << 0 << false << 1;
+    QTest::newRow( "data12" ) << QString("abc") << QString("b") << 1 << true << 1;
+    QTest::newRow( "data13" ) << QString("abc") << QString("b") << 1 << false << 1;
+    QTest::newRow( "data14" ) << QString("abc") << QString("B") << 1 << true << -1;
+    QTest::newRow( "data15" ) << QString("abc") << QString("B") << 1 << false << 1;
+    QTest::newRow( "data16" ) << QString("abc") << QString("b") << 2 << true << -1;
+    QTest::newRow( "data17" ) << QString("abc") << QString("b") << 2 << false << -1;
+
+    QTest::newRow( "data20" ) << QString("ABC") << QString("A") << 0 << true << 0;
+    QTest::newRow( "data21" ) << QString("ABC") << QString("A") << 0 << false << 0;
+    QTest::newRow( "data22" ) << QString("ABC") << QString("a") << 0 << true << -1;
+    QTest::newRow( "data23" ) << QString("ABC") << QString("a") << 0 << false << 0;
+    QTest::newRow( "data24" ) << QString("ABC") << QString("A") << 1 << true << -1;
+    QTest::newRow( "data25" ) << QString("ABC") << QString("A") << 1 << false << -1;
+    QTest::newRow( "data26" ) << QString("ABC") << QString("a") << 1 << true << -1;
+    QTest::newRow( "data27" ) << QString("ABC") << QString("a") << 1 << false << -1;
+    QTest::newRow( "data28" ) << QString("ABC") << QString("B") << 0 << true << 1;
+    QTest::newRow( "data29" ) << QString("ABC") << QString("B") << 0 << false << 1;
+    QTest::newRow( "data30" ) << QString("ABC") << QString("b") << 0 << true << -1;
+    QTest::newRow( "data31" ) << QString("ABC") << QString("b") << 0 << false << 1;
+    QTest::newRow( "data32" ) << QString("ABC") << QString("B") << 1 << true << 1;
+    QTest::newRow( "data33" ) << QString("ABC") << QString("B") << 1 << false << 1;
+    QTest::newRow( "data34" ) << QString("ABC") << QString("b") << 1 << true << -1;
+    QTest::newRow( "data35" ) << QString("ABC") << QString("b") << 1 << false << 1;
+    QTest::newRow( "data36" ) << QString("ABC") << QString("B") << 2 << true << -1;
+    QTest::newRow( "data37" ) << QString("ABC") << QString("B") << 2 << false << -1;
+
+    QTest::newRow( "data40" ) << QString("aBc") << QString("bc") << 0 << true << -1;
+    QTest::newRow( "data41" ) << QString("aBc") << QString("Bc") << 0 << true << 1;
+    QTest::newRow( "data42" ) << QString("aBc") << QString("bC") << 0 << true << -1;
+    QTest::newRow( "data43" ) << QString("aBc") << QString("BC") << 0 << true << -1;
+    QTest::newRow( "data44" ) << QString("aBc") << QString("bc") << 0 << false << 1;
+    QTest::newRow( "data45" ) << QString("aBc") << QString("Bc") << 0 << false << 1;
+    QTest::newRow( "data46" ) << QString("aBc") << QString("bC") << 0 << false << 1;
+    QTest::newRow( "data47" ) << QString("aBc") << QString("BC") << 0 << false << 1;
+    QTest::newRow( "data48" ) << QString("AbC") << QString("bc") << 0 << true << -1;
+    QTest::newRow( "data49" ) << QString("AbC") << QString("Bc") << 0 << true << -1;
+    QTest::newRow( "data50" ) << QString("AbC") << QString("bC") << 0 << true << 1;
+    QTest::newRow( "data51" ) << QString("AbC") << QString("BC") << 0 << true << -1;
+    QTest::newRow( "data52" ) << QString("AbC") << QString("bc") << 0 << false << 1;
+    QTest::newRow( "data53" ) << QString("AbC") << QString("Bc") << 0 << false << 1;
+
+    QTest::newRow( "data54" ) << QString("AbC") << QString("bC") << 0 << false << 1;
+    QTest::newRow( "data55" ) << QString("AbC") << QString("BC") << 0 << false << 1;
+    QTest::newRow( "data56" ) << QString("AbC") << QString("BC") << 1 << false << 1;
+    QTest::newRow( "data57" ) << QString("AbC") << QString("BC") << 2 << false << -1;
 #if 0
-    QTest::newRow( "null-in-null") << QString() << QString() << 0 << FALSE << 0;
-    QTest::newRow( "empty-in-null") << QString() << QString("") << 0 << FALSE << 0;
-    QTest::newRow( "null-in-empty") << QString("") << QString() << 0 << FALSE << 0;
-    QTest::newRow( "empty-in-empty") << QString("") << QString("") << 0 << FALSE << 0;
+    QTest::newRow( "null-in-null") << QString() << QString() << 0 << false << 0;
+    QTest::newRow( "empty-in-null") << QString() << QString("") << 0 << false << 0;
+    QTest::newRow( "null-in-empty") << QString("") << QString() << 0 << false << 0;
+    QTest::newRow( "empty-in-empty") << QString("") << QString("") << 0 << false << 0;
 #endif
 
 
@@ -1027,21 +1027,21 @@ void tst_QString::indexOf_data()
     s1 += QChar(0xb5);
     QString s2;
     s2 += QChar(0x3bc);
-    QTest::newRow( "data58" ) << s1 << s2 << 0 << FALSE << 3;
+    QTest::newRow( "data58" ) << s1 << s2 << 0 << false << 3;
     s2.prepend("C");
-    QTest::newRow( "data59" ) << s1 << s2 << 0 << FALSE << 2;
+    QTest::newRow( "data59" ) << s1 << s2 << 0 << false << 2;
 
     QString veryBigHaystack(500, 'a');
     veryBigHaystack += 'B';
-    QTest::newRow("BoyerMooreStressTest") << veryBigHaystack << veryBigHaystack << 0 << TRUE << 0;
-    QTest::newRow("BoyerMooreStressTest2") << veryBigHaystack + 'c' << veryBigHaystack << 0 << TRUE << 0;
-    QTest::newRow("BoyerMooreStressTest3") << 'c' + veryBigHaystack << veryBigHaystack << 0 << TRUE << 1;
-    QTest::newRow("BoyerMooreStressTest4") << veryBigHaystack << veryBigHaystack + 'c' << 0 << TRUE << -1;
-    QTest::newRow("BoyerMooreStressTest5") << veryBigHaystack << 'c' + veryBigHaystack << 0 << TRUE << -1;
-    QTest::newRow("BoyerMooreStressTest6") << 'd' + veryBigHaystack << 'c' + veryBigHaystack << 0 << TRUE << -1;
-    QTest::newRow("BoyerMooreStressTest6") << veryBigHaystack + 'c' << 'c' + veryBigHaystack << 0 << TRUE << -1;
+    QTest::newRow("BoyerMooreStressTest") << veryBigHaystack << veryBigHaystack << 0 << true << 0;
+    QTest::newRow("BoyerMooreStressTest2") << veryBigHaystack + 'c' << veryBigHaystack << 0 << true << 0;
+    QTest::newRow("BoyerMooreStressTest3") << 'c' + veryBigHaystack << veryBigHaystack << 0 << true << 1;
+    QTest::newRow("BoyerMooreStressTest4") << veryBigHaystack << veryBigHaystack + 'c' << 0 << true << -1;
+    QTest::newRow("BoyerMooreStressTest5") << veryBigHaystack << 'c' + veryBigHaystack << 0 << true << -1;
+    QTest::newRow("BoyerMooreStressTest6") << 'd' + veryBigHaystack << 'c' + veryBigHaystack << 0 << true << -1;
+    QTest::newRow("BoyerMooreStressTest6") << veryBigHaystack + 'c' << 'c' + veryBigHaystack << 0 << true << -1;
 
-    QTest::newRow("BoyerMooreInsensitiveStressTest") << veryBigHaystack << veryBigHaystack << 0 << FALSE << 0;
+    QTest::newRow("BoyerMooreInsensitiveStressTest") << veryBigHaystack << veryBigHaystack << 0 << false << 0;
 
 }
 
@@ -1470,11 +1470,11 @@ void tst_QString::leftJustified()
 
     QString n;
     QVERIFY(!n.leftJustified(3).isNull());
-    QCOMPARE(a.leftJustified(4,' ',TRUE),(QString)"ABC ");
-    QCOMPARE(a.leftJustified(3,' ',TRUE),(QString)"ABC");
-    QCOMPARE(a.leftJustified(2,' ',TRUE),(QString)"AB");
-    QCOMPARE(a.leftJustified(1,' ',TRUE),(QString)"A");
-    QCOMPARE(a.leftJustified(0,' ',TRUE),(QString)"");
+    QCOMPARE(a.leftJustified(4,' ',true),(QString)"ABC ");
+    QCOMPARE(a.leftJustified(3,' ',true),(QString)"ABC");
+    QCOMPARE(a.leftJustified(2,' ',true),(QString)"AB");
+    QCOMPARE(a.leftJustified(1,' ',true),(QString)"A");
+    QCOMPARE(a.leftJustified(0,' ',true),(QString)"");
 }
 
 void tst_QString::rightJustified()
@@ -1491,12 +1491,12 @@ void tst_QString::rightJustified()
 
     QString n;
     QVERIFY(!n.rightJustified(3).isNull());
-    QCOMPARE(a.rightJustified(4,'-',TRUE),(QString)"-ABC");
-    QCOMPARE(a.rightJustified(4,' ',TRUE),(QString)" ABC");
-    QCOMPARE(a.rightJustified(3,' ',TRUE),(QString)"ABC");
-    QCOMPARE(a.rightJustified(2,' ',TRUE),(QString)"AB");
-    QCOMPARE(a.rightJustified(1,' ',TRUE),(QString)"A");
-    QCOMPARE(a.rightJustified(0,' ',TRUE),(QString)"");
+    QCOMPARE(a.rightJustified(4,'-',true),(QString)"-ABC");
+    QCOMPARE(a.rightJustified(4,' ',true),(QString)" ABC");
+    QCOMPARE(a.rightJustified(3,' ',true),(QString)"ABC");
+    QCOMPARE(a.rightJustified(2,' ',true),(QString)"AB");
+    QCOMPARE(a.rightJustified(1,' ',true),(QString)"A");
+    QCOMPARE(a.rightJustified(0,' ',true),(QString)"");
     QCOMPARE(a,(QString)"ABC");
 }
 
@@ -2498,10 +2498,10 @@ void tst_QString::toULong_data()
     QTest::addColumn<ulong>("result" );
     QTest::addColumn<bool>("ok" );
 
-    QTest::newRow( "default" ) << QString() << 10 << 0UL << FALSE;
-    QTest::newRow( "empty" ) << QString("") << 10 << 0UL << FALSE;
-    QTest::newRow( "ulong1" ) << QString("3234567890") << 10 << 3234567890UL << TRUE;
-    QTest::newRow( "ulong2" ) << QString("fFFfFfFf") << 16 << 0xFFFFFFFFUL << TRUE;
+    QTest::newRow( "default" ) << QString() << 10 << 0UL << false;
+    QTest::newRow( "empty" ) << QString("") << 10 << 0UL << false;
+    QTest::newRow( "ulong1" ) << QString("3234567890") << 10 << 3234567890UL << true;
+    QTest::newRow( "ulong2" ) << QString("fFFfFfFf") << 16 << 0xFFFFFFFFUL << true;
 }
 
 void tst_QString::toULong()
@@ -2524,16 +2524,16 @@ void tst_QString::toLong_data()
     QTest::addColumn<long>("result" );
     QTest::addColumn<bool>("ok" );
 
-    QTest::newRow( "default" ) << QString() << 10 << 0L << FALSE;
-    QTest::newRow( "empty" ) << QString("") << 10 << 0L << FALSE;
-    QTest::newRow( "normal" ) << QString("7fFFfFFf") << 16 << 0x7fFFfFFfL << TRUE;
-    QTest::newRow( "long_max" ) << QString("2147483647") << 10 << 2147483647L << TRUE;
+    QTest::newRow( "default" ) << QString() << 10 << 0L << false;
+    QTest::newRow( "empty" ) << QString("") << 10 << 0L << false;
+    QTest::newRow( "normal" ) << QString("7fFFfFFf") << 16 << 0x7fFFfFFfL << true;
+    QTest::newRow( "long_max" ) << QString("2147483647") << 10 << 2147483647L << true;
     if (sizeof(long) == 4) {
-        QTest::newRow( "long_max+1" ) << QString("2147483648") << 10 << 0L << FALSE;
-        QTest::newRow( "long_min-1" ) << QString("-80000001") << 16 << 0L << FALSE;
+        QTest::newRow( "long_max+1" ) << QString("2147483648") << 10 << 0L << false;
+        QTest::newRow( "long_min-1" ) << QString("-80000001") << 16 << 0L << false;
     }
-    QTest::newRow( "negative" ) << QString("-7fffffff") << 16 << -0x7fffffffL << TRUE;
-//    QTest::newRow( "long_min" ) << QString("-80000000") << 16 << 0x80000000uL << TRUE;
+    QTest::newRow( "negative" ) << QString("-7fffffff") << 16 << -0x7fffffffL << true;
+//    QTest::newRow( "long_min" ) << QString("-80000000") << 16 << 0x80000000uL << true;
 }
 
 void tst_QString::toLong()
@@ -2637,33 +2637,33 @@ void tst_QString::toDouble_data()
     QTest::addColumn<double>("result" );
     QTest::addColumn<bool>("result_ok" );
 
-    QTest::newRow( "ok00" ) << QString("0.000000000931322574615478515625") << 0.000000000931322574615478515625 << (bool)TRUE;
-    QTest::newRow( "ok01" ) << QString(" 123.45") << 123.45 << (bool)TRUE;
+    QTest::newRow( "ok00" ) << QString("0.000000000931322574615478515625") << 0.000000000931322574615478515625 << true;
+    QTest::newRow( "ok01" ) << QString(" 123.45") << 123.45 << true;
 
-    QTest::newRow( "ok02" ) << QString("0.1e10") << 0.1e10 << (bool)TRUE;
-    QTest::newRow( "ok03" ) << QString("0.1e-10") << 0.1e-10 << (bool)TRUE;
+    QTest::newRow( "ok02" ) << QString("0.1e10") << 0.1e10 << true;
+    QTest::newRow( "ok03" ) << QString("0.1e-10") << 0.1e-10 << true;
 
-    QTest::newRow( "ok04" ) << QString("1e10") << 1.0e10 << (bool)TRUE;
-    QTest::newRow( "ok05" ) << QString("1e+10") << 1.0e10 << (bool)TRUE;
-    QTest::newRow( "ok06" ) << QString("1e-10") << 1.0e-10 << (bool)TRUE;
+    QTest::newRow( "ok04" ) << QString("1e10") << 1.0e10 << true;
+    QTest::newRow( "ok05" ) << QString("1e+10") << 1.0e10 << true;
+    QTest::newRow( "ok06" ) << QString("1e-10") << 1.0e-10 << true;
 
-    QTest::newRow( "ok07" ) << QString(" 1e10") << 1.0e10 << (bool)TRUE;
-    QTest::newRow( "ok08" ) << QString("  1e+10") << 1.0e10 << (bool)TRUE;
-    QTest::newRow( "ok09" ) << QString("   1e-10") << 1.0e-10 << (bool)TRUE;
+    QTest::newRow( "ok07" ) << QString(" 1e10") << 1.0e10 << true;
+    QTest::newRow( "ok08" ) << QString("  1e+10") << 1.0e10 << true;
+    QTest::newRow( "ok09" ) << QString("   1e-10") << 1.0e-10 << true;
 
-    QTest::newRow( "ok10" ) << QString("1.") << 1.0 << (bool)TRUE;
-    QTest::newRow( "ok11" ) << QString(".1") << 0.1 << (bool)TRUE;
+    QTest::newRow( "ok10" ) << QString("1.") << 1.0 << true;
+    QTest::newRow( "ok11" ) << QString(".1") << 0.1 << true;
 
-    QTest::newRow( "wrong00" ) << QString("123.45 ") << 123.45 << (bool)TRUE;
-    QTest::newRow( "wrong01" ) << QString(" 123.45 ") << 123.45 << (bool)TRUE;
+    QTest::newRow( "wrong00" ) << QString("123.45 ") << 123.45 << true;
+    QTest::newRow( "wrong01" ) << QString(" 123.45 ") << 123.45 << true;
 
-    QTest::newRow( "wrong02" ) << QString("aa123.45aa") << 0.0 << (bool)FALSE;
-    QTest::newRow( "wrong03" ) << QString("123.45aa") << 0.0 << (bool)FALSE;
-    QTest::newRow( "wrong04" ) << QString("123erf") << 0.0 << (bool)FALSE;
+    QTest::newRow( "wrong02" ) << QString("aa123.45aa") << 0.0 << false;
+    QTest::newRow( "wrong03" ) << QString("123.45aa") << 0.0 << false;
+    QTest::newRow( "wrong04" ) << QString("123erf") << 0.0 << false;
 
-    QTest::newRow( "wrong05" ) << QString("abc") << 0.0 << (bool)FALSE;
-    QTest::newRow( "wrong06" ) << QString() << 0.0 << (bool)FALSE;
-    QTest::newRow( "wrong07" ) << QString("") << 0.0 << (bool)FALSE;
+    QTest::newRow( "wrong05" ) << QString("abc") << 0.0 << false;
+    QTest::newRow( "wrong06" ) << QString() << 0.0 << false;
+    QTest::newRow( "wrong07" ) << QString("") << 0.0 << false;
 }
 
 void tst_QString::toDouble()
diff --git a/tests/auto/qstringlist/qstringlist.pro b/tests/auto/qstringlist/qstringlist.pro
index b2ad23db4a..aee074bad3 100644
--- a/tests/auto/qstringlist/qstringlist.pro
+++ b/tests/auto/qstringlist/qstringlist.pro
@@ -1,7 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qstringlist.cpp
-
-
 QT = core
-
-
diff --git a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp
index 0a4081fa7e..eab0bbb193 100644
--- a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp
+++ b/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp
@@ -46,7 +46,6 @@
 #include <qmap.h>
 #include <qstringlistmodel.h>
 #include <qstringlist.h>
-#include <iostream>
 #include <qlistview.h>
 #include "qmodellistener.h"
 #include <qstringlistmodel.h>
diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/qstyle/qstyle.pro
index ba0908afa9..8163f26847 100644
--- a/tests/auto/qstyle/qstyle.pro
+++ b/tests/auto/qstyle/qstyle.pro
@@ -1,7 +1,8 @@
 load(qttest_p4)
+TARGET.EPOCHEAPSIZE = 0x200000 0x800000
 SOURCES  += tst_qstyle.cpp
 
-wince*: {
+wince*|symbian*: {
    DEFINES += SRCDIR=\\\".\\\"
    addPixmap.sources = task_25863.png
    addPixmap.path = .
@@ -9,5 +10,3 @@ wince*: {
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
-
-
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp
index 2cb508080c..5076af6cfe 100644
--- a/tests/auto/qstyle/tst_qstyle.cpp
+++ b/tests/auto/qstyle/tst_qstyle.cpp
@@ -71,6 +71,10 @@
 #include <qlineedit.h>
 #include <qmdiarea.h>
 
+#if defined(Q_OS_SYMBIAN)
+#define SRCDIR "."
+#endif
+
 #include <QCleanlooksStyle>
 
 #ifdef Q_WS_MAC
@@ -100,10 +104,14 @@ static bool qt_wince_is_smartphone() {
 }
 #endif
 
+#ifdef Q_WS_S60
+#include <qs60style.h>
+#endif
+
 #include <qwidget.h>
 
 //TESTED_CLASS=
-//TESTED_FILES=gui/styles/qstyle.h gui/styles/qstyle.cpp gui/styles/qplastiquestyle.cpp gui/styles/qwindowsstyle.cpp gui/styles/qwindowsxpstyle.cpp gui/styles/qwindowsvistastyle.cpp gui/styles/qmotifstyle.cpp
+//TESTED_FILES=gui/styles/qstyle.h gui/styles/qstyle.cpp gui/styles/qplastiquestyle.cpp gui/styles/qwindowsstyle.cpp gui/styles/qwindowsxpstyle.cpp gui/styles/qwindowsvistastyle.cpp gui/styles/qmotifstyle.cpp gui/styles/qs60style.cpp
 
 class tst_QStyle : public QObject
 {
@@ -131,13 +139,14 @@ private slots:
     void testMacStyle();
     void testWindowsCEStyle();
     void testWindowsMobileStyle();
+    void testS60Style();
     void testStyleFactory();
     void testProxyStyle();
     void pixelMetric();
     void progressBarChangeStyle();
     void defaultFont();
 private:
-	void lineUpLayoutTest(QStyle *);
+    void lineUpLayoutTest(QStyle *);
     QWidget *testWidget;
 };
 
@@ -200,10 +209,10 @@ void tst_QStyle::testStyleFactory()
     QVERIFY(keys.contains("Motif"));
 #endif
 #ifdef Q_WS_WIN
-    if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP && 
+    if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP &&
         QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
         QVERIFY(keys.contains("WindowsXP"));
-    if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && 
+    if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA &&
         QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
         QVERIFY(keys.contains("WindowsVista"));
 #endif
@@ -270,17 +279,17 @@ void tst_QStyle::testAllFunctions(QStyle *style)
     opt.init(testWidget);
 
     testWidget->setStyle(style);
-    
+
     //Tests styleHint with default arguments for potential crashes
     for ( int hint = 0 ; hint < int(QStyle::SH_Menu_Mask); ++hint) {
         style->styleHint(QStyle::StyleHint(hint));
         style->styleHint(QStyle::StyleHint(hint), &opt, testWidget);
     }
-    
+
     //Tests pixelMetric with default arguments for potential crashes
     for ( int pm = 0 ; pm < int(QStyle::PM_LayoutVerticalSpacing); ++pm) {
         style->pixelMetric(QStyle::PixelMetric(pm));
-        style->pixelMetric(QStyle::PixelMetric(pm), &opt, testWidget);        
+        style->pixelMetric(QStyle::PixelMetric(pm), &opt, testWidget);
     }
 
     //Tests drawControl with default arguments for potential crashes
@@ -296,7 +305,7 @@ void tst_QStyle::testAllFunctions(QStyle *style)
         QPainter painter(&surface);
         QStyleOptionComboBox copt1;
         copt1.init(testWidget);
-        
+
         QStyleOptionGroupBox copt2;
         copt2.init(testWidget);
         QStyleOptionSizeGrip copt3;
@@ -347,7 +356,7 @@ void tst_QStyle::testAllFunctions(QStyle *style)
 
     style->itemPixmapRect(QRect(0, 0, 100, 100), Qt::AlignHCenter, QPixmap(200, 200));
     style->itemTextRect(QFontMetrics(qApp->font()), QRect(0, 0, 100, 100), Qt::AlignHCenter, true, QString("Test"));
-    
+
     testScrollBarSubControls(style);
 }
 
@@ -362,6 +371,12 @@ void tst_QStyle::testScrollBarSubControls(QStyle *)
     scrollBar.show();
     const QStyleOptionSlider opt = qt_qscrollbarStyleOption(&scrollBar);
     foreach (int subControl, QList<int>() << 1 << 2 << 4 << 8) {
+
+#ifdef Q_WS_S60
+// in s60style add line and sub line have been removed.
+        if (subControl == QStyle::SC_ScrollBarAddLine || subControl == QStyle::SC_ScrollBarSubLine )
+            continue;
+#endif
         QRect sr = testWidget->style()->subControlRect(QStyle::CC_ScrollBar, &opt,
                                     QStyle::SubControl(subControl), &scrollBar);
         QVERIFY(sr.isNull() == false);
@@ -446,7 +461,7 @@ void comparePixmap(const QString &filename, const QPixmap &pixmap)
 void tst_QStyle::testPainting(QStyle *style, const QString &platform)
 {
     //Test Menu
-    QString fileName = "images/" + platform + "/menu.png"; 
+    QString fileName = "images/" + platform + "/menu.png";
     QMenu menu;
     menu.setStyle(style);
     menu.show();
@@ -455,7 +470,7 @@ void tst_QStyle::testPainting(QStyle *style, const QString &platform)
     QPixmap pixmap = QPixmap::grabWidget(&menu);
     comparePixmap(fileName, pixmap);
 
-    //Push button    
+    //Push button
     fileName = "images/" + platform + "/button.png";
     QPushButton button("OK");
     button.setStyle(style);
@@ -464,7 +479,7 @@ void tst_QStyle::testPainting(QStyle *style, const QString &platform)
     button.hide();
     comparePixmap(fileName, pixmap);
 
-    //Push button    
+    //Push button
     fileName = "images/" + platform + "/radiobutton.png";
     QRadioButton radiobutton("Check");
     radiobutton.setStyle(style);
@@ -494,7 +509,7 @@ void tst_QStyle::testPainting(QStyle *style, const QString &platform)
     spinbox.hide();
     comparePixmap(fileName, pixmap);
     QLocale::setDefault(QLocale::system());
-    
+
     //Slider
     fileName = "images/" + platform + "/slider.png";
     QSlider slider;
@@ -573,6 +588,16 @@ void tst_QStyle::testWindowsMobileStyle()
 #endif
 }
 
+void tst_QStyle::testS60Style()
+    {
+#if defined(Q_WS_S60)
+    QS60Style cstyle;
+    testAllFunctions(&cstyle);
+#else
+    QSKIP("No S60Style style", SkipAll);
+#endif
+    }
+
 // Helper class...
 
 MyWidget::MyWidget( QWidget* parent, const char* name )
@@ -657,9 +682,9 @@ void tst_QStyle::pixelMetric()
 void tst_QStyle::progressBarChangeStyle()
 {
 #if !defined(QT_NO_STYLE_PLASTIQUE) && !defined(QT_NO_STYLE_WINDOWS)
-    //test a crashing situation (task 143530) 
+    //test a crashing situation (task 143530)
     //where changing the styles and deleting a progressbar would crash
-    
+
     QWindowsStyle style1;
     QPlastiqueStyle style2;
 
@@ -676,35 +701,55 @@ void tst_QStyle::progressBarChangeStyle()
     QTest::qWait(100);
 
     //before the correction, there would be a crash here
+#elif !defined(QT_NO_STYLE_S60) && !defined(QT_NO_STYLE_WINDOWS)
+    //test a crashing situation (task 143530)
+    //where changing the styles and deleting a progressbar would crash
+
+    QWindowsStyle style1;
+    QS60Style style2;
+
+    QProgressBar *progress=new QProgressBar;
+    progress->setStyle(&style1);
+
+    progress->show();
+
+    progress->setStyle(&style2);
+
+    QTest::qWait(100);
+    delete progress;
+
+    QTest::qWait(100);
+
+    //before the correction, there would be a crash here
 #else
-    QSKIP("Either style Plastique or Windows missing", SkipAll);
+    QSKIP("Either style Plastique or Windows or S60 missing", SkipAll);
 #endif
 }
 
 void tst_QStyle::lineUpLayoutTest(QStyle *style)
 {
-	QWidget widget;
-	QHBoxLayout layout;
-	QFont font;
-	font.setPointSize(9); //Plastique is lined up for odd numbers...
-	widget.setFont(font);
-	QSpinBox spinbox(&widget);
-	QLineEdit lineedit(&widget);
-	QComboBox combo(&widget);
-	combo.setEditable(true);
-	layout.addWidget(&spinbox);
-	layout.addWidget(&lineedit);
-	layout.addWidget(&combo);
-	widget.setLayout(&layout);
+    QWidget widget;
+    QHBoxLayout layout;
+    QFont font;
+    font.setPointSize(9); //Plastique is lined up for odd numbers...
+    widget.setFont(font);
+    QSpinBox spinbox(&widget);
+    QLineEdit lineedit(&widget);
+    QComboBox combo(&widget);
+    combo.setEditable(true);
+    layout.addWidget(&spinbox);
+    layout.addWidget(&lineedit);
+    layout.addWidget(&combo);
+    widget.setLayout(&layout);
         widget.setStyle(style);
         // propagate the style.
         foreach (QWidget *w, qFindChildren<QWidget *>(&widget))
             w->setStyle(style);
-	widget.show();
+    widget.show();
         QTest::qWait( 500 );
 
-	QVERIFY(qAbs(spinbox.height() - lineedit.height()) <= 1);
-	QVERIFY(qAbs(spinbox.height() - combo.height()) <= 1);
+    QVERIFY(qAbs(spinbox.height() - lineedit.height()) <= 1);
+    QVERIFY(qAbs(spinbox.height() - combo.height()) <= 1);
 }
 
 void tst_QStyle::defaultFont()
diff --git a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
index f6101f4f04..eada969d96 100644
--- a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
+++ b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
@@ -1,14 +1,4 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Apr 26 13:53:24 2006
-######################################################################
-
-TEMPLATE = app
-TARGET = tst_qstylesheetstyle
-DEPENDPATH += .
-INCLUDEPATH += . ..
-
-CONFIG += console qtestlib
-contains(QT_CONFIG, qt3support): QT += qt3support
+load(qttest_p4)
 
 # Input
 SOURCES += tst_qstylesheetstyle.cpp
diff --git a/tests/auto/qsvggenerator/qsvggenerator.pro b/tests/auto/qsvggenerator/qsvggenerator.pro
index 1eb72b3302..450bcd3714 100644
--- a/tests/auto/qsvggenerator/qsvggenerator.pro
+++ b/tests/auto/qsvggenerator/qsvggenerator.pro
@@ -7,11 +7,14 @@ QT += svg xml
 
 SOURCES += tst_qsvggenerator.cpp
 
-wince*: {
+wince*|symbian {
     addFiles.sources = referenceSvgs
     addFiles.path = .
     DEPLOYMENT += addFiles
+}
+
+wince* {
     DEFINES += SRCDIR=\\\"\\\"
-} else {
+} !symbian {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
index 1b4115a53e..614d3f8ad6 100644
--- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
+++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
@@ -55,6 +55,10 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR ""
+#endif
+
 class tst_QSvgGenerator : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro
index 120d9f0ed0..8cfbcceed3 100644
--- a/tests/auto/qsvgrenderer/qsvgrenderer.pro
+++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro
@@ -8,7 +8,7 @@ QT += svg
 SOURCES += tst_qsvgrenderer.cpp
 RESOURCES += resources.qrc
 
-wince*: {
+wince*|symbian {
    addFiles.sources = *.svg *.svgz
    addFiles.path = .
 
diff --git a/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
index 1699e72c61..3c2f6831da 100644
--- a/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
+++ b/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
@@ -147,7 +147,7 @@ public:
 };
 
 QT_BEGIN_NAMESPACE
-static bool operator==(const QTextLayout::FormatRange &lhs, const QTextLayout::FormatRange &rhs)
+bool operator==(const QTextLayout::FormatRange &lhs, const QTextLayout::FormatRange &rhs)
 {
     return lhs.start == rhs.start
         && lhs.length == rhs.length
diff --git a/tests/auto/qsysinfo/qsysinfo.pro b/tests/auto/qsysinfo/qsysinfo.pro
index 917c281f29..e822fec7e8 100644
--- a/tests/auto/qsysinfo/qsysinfo.pro
+++ b/tests/auto/qsysinfo/qsysinfo.pro
@@ -1,5 +1,4 @@
 load(qttest_p4)
-
 SOURCES += tst_qsysinfo.cpp
 QT = core
 
diff --git a/tests/auto/qsystemsemaphore/test/test.pro b/tests/auto/qsystemsemaphore/test/test.pro
index 62ea054adc..b8d3a4ac8f 100644
--- a/tests/auto/qsystemsemaphore/test/test.pro
+++ b/tests/auto/qsystemsemaphore/test/test.pro
@@ -18,7 +18,7 @@ win32 {
 RESOURCES += ../files.qrc
 
 wince*: {
-# this test calls lackkey, which then again depends on QtScript.
+# this test calls lackey, which then again depends on QtScript.
 # let's add it here so that it gets deployed easily
 QT += script
 lackey.sources = ../../qsharedmemory/lackey/lackey.exe
@@ -27,3 +27,12 @@ lackey.path = ../qsharedmemory/lackey
 DEPLOYMENT += lackey
 }
 
+symbian: {
+# this test calls lackey, which then again depends on QtScript.
+# let's add it here so that it gets deployed easily
+QT += script
+
+lackey.sources = ../../qsharedmemory/lackey/lackey.exe
+lackey.path = /sys/bin
+DEPLOYMENT += lackey
+}
diff --git a/tests/auto/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/qsystemsemaphore/tst_qsystemsemaphore.cpp
index 2fd786fe19..f2f131f527 100644
--- a/tests/auto/qsystemsemaphore/tst_qsystemsemaphore.cpp
+++ b/tests/auto/qsystemsemaphore/tst_qsystemsemaphore.cpp
@@ -185,6 +185,9 @@ void tst_QSystemSemaphore::complexacquire()
 
 void tst_QSystemSemaphore::basicProcesses()
 {
+#if defined (Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+    QSKIP("Cannot launch multiple Qt processes in Symbian emulator", SkipAll);
+#endif
     QSystemSemaphore sem("store", 0, QSystemSemaphore::Create);
 
     QStringList acquireArguments = QStringList() << acquire_js();
@@ -201,6 +204,7 @@ void tst_QSystemSemaphore::basicProcesses()
     acquire.kill();
     release.start(LACKYLOC "/lackey", releaseArguments);
     acquire.waitForFinished(5000);
+    release.waitForFinished(5000);
     QVERIFY(acquire.state() == QProcess::NotRunning);
 }
 
@@ -216,6 +220,9 @@ void tst_QSystemSemaphore::processes_data()
 
 void tst_QSystemSemaphore::processes()
 {
+#if defined (Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+    QSKIP("Cannot launch multiple Qt processes in Symbian emulator", SkipAll);
+#endif
     QSystemSemaphore sem("store", 1, QSystemSemaphore::Create);
 
     QFETCH(int, processes);
@@ -242,7 +249,7 @@ void tst_QSystemSemaphore::processes()
 
 void tst_QSystemSemaphore::undo()
 {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     QSKIP("This test only checks a unix behavior", SkipSingle);
 #endif
 
@@ -264,9 +271,11 @@ void tst_QSystemSemaphore::undo()
 
 void tst_QSystemSemaphore::initialValue()
 {
+#if defined (Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+    QSKIP("Cannot launch multiple Qt processes in Symbian emulator", SkipAll);
+#endif
     QSystemSemaphore sem("store", 1, QSystemSemaphore::Create);
 
-
     QStringList acquireArguments = QStringList() << acquire_js();
     QStringList releaseArguments = QStringList() << release_js();
     QProcess acquire;
@@ -286,6 +295,7 @@ void tst_QSystemSemaphore::initialValue()
 
     release.start(LACKYLOC "/lackey", releaseArguments);
     acquire.waitForFinished(10000);
+    release.waitForFinished(10000);
     QVERIFY(acquire.state()== QProcess::NotRunning);
 }
 QTEST_MAIN(tst_QSystemSemaphore)
diff --git a/tests/auto/qtableview/qtableview.pro b/tests/auto/qtableview/qtableview.pro
index 2368a568fb..72099d45c2 100644
--- a/tests/auto/qtableview/qtableview.pro
+++ b/tests/auto/qtableview/qtableview.pro
@@ -1,4 +1,4 @@
 load(qttest_p4)
+TARGET.EPOCHEAPSIZE = 0x200000 0x800000
 SOURCES  += tst_qtableview.cpp
 
-
diff --git a/tests/auto/qtablewidget/qtablewidget.pro b/tests/auto/qtablewidget/qtablewidget.pro
index 2b2a01613f..d66d0ac67f 100644
--- a/tests/auto/qtablewidget/qtablewidget.pro
+++ b/tests/auto/qtablewidget/qtablewidget.pro
@@ -1,4 +1,16 @@
 load(qttest_p4)
 SOURCES  += tst_qtablewidget.cpp
 
+# This prevents the GCCE compile failure: "elf2e32: Error 1063: Fatal Error in
+# PostLinker." The paged statement is documented in the S60 docs.
+symbian {
+    MMP_RULES -= PAGED
+
+    custom_paged_rule = "$${LITERAL_HASH}ifndef GCCE"\
+                        "PAGED" \
+                        "$${LITERAL_HASH}endif"
+    MMP_RULES += custom_paged_rule
+}
+
+symbian:MMP_RULES += "OPTION   GCCE -mlong-calls"
 
diff --git a/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
index f9f8823d94..b0f44cd4fc 100644
--- a/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
+++ b/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
@@ -42,7 +42,7 @@
 #include <QCoreApplication>
 #include <QList>
 #include <QLinkedList>
-#include <QTest>
+#include <QtTest/QtTest>
 
 #include "../qtconcurrentmap/functions.h"
 #include "../qfuture/versioncheck.h"
diff --git a/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
index 293c9fd5bd..464cb7553f 100644
--- a/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
+++ b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@@ -65,7 +65,7 @@ struct TestIterator
     int i;
 };
 
-#include <iterator>
+#include <qiterator.h>
 namespace std {
 template <>
 struct iterator_traits<TestIterator>
diff --git a/tests/auto/qtcpserver/crashingServer/main.cpp b/tests/auto/qtcpserver/crashingServer/main.cpp
index 6df3f83294..f135d266b7 100644
--- a/tests/auto/qtcpserver/crashingServer/main.cpp
+++ b/tests/auto/qtcpserver/crashingServer/main.cpp
@@ -53,15 +53,15 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-#if !defined(Q_OS_WINCE)
-    printf("Listening\n");
-    fflush(stdout);
-#else
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QFile file(QLatin1String("/test_signal.txt"));
     file.open(QIODevice::WriteOnly);
     file.write("Listening\n");
     file.flush();
     file.close();
+#else
+    printf("Listening\n");
+    fflush(stdout);    
 #endif
 
     server.waitForNewConnection(5000);
diff --git a/tests/auto/qtcpserver/test/test.pro b/tests/auto/qtcpserver/test/test.pro
index 3ca854f641..bdeaa92d8a 100644
--- a/tests/auto/qtcpserver/test/test.pro
+++ b/tests/auto/qtcpserver/test/test.pro
@@ -12,6 +12,12 @@ wince*: {
 }
 }
 
+symbian {
+	crashApp.sources = $$QT_BUILD_TREE/examples/widgets/wiggly/$${BUILD_DIR}/crashingServer.exe
+	crashApp.path = .
+	DEPLOYMENT += crashApp
+}
+
 TARGET = ../tst_qtcpserver
 
 win32 {
diff --git a/tests/auto/qtcpserver/tst_qtcpserver.cpp b/tests/auto/qtcpserver/tst_qtcpserver.cpp
index 5c82cbb926..e630f73da8 100644
--- a/tests/auto/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/qtcpserver/tst_qtcpserver.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
-
-#ifdef _WIN32
+// Just to get Q_OS_SYMBIAN
+#include <qglobal.h>
+#if defined(_WIN32) && !defined(Q_OS_SYMBIAN)
 #include <winsock2.h>
 #else
 #include <sys/types.h>
@@ -129,11 +130,11 @@ void tst_QTcpServer::getSetCheck()
 
 tst_QTcpServer::tst_QTcpServer()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QTcpServer::~tst_QTcpServer()
-{
-
+{  
 }
 
 void tst_QTcpServer::initTestCase_data()
@@ -232,6 +233,9 @@ void tst_QTcpServer::clientServerLoop()
 //----------------------------------------------------------------------------------
 void tst_QTcpServer::ipv6Server()
 {
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Symbian: IPv6 is not yet supported", SkipAll);
+#endif
     //### need to enter the event loop for the server to get the connection ?? ( windows)
     QTcpServer server;
     if (!server.listen(QHostAddress::LocalHostIPv6, 8944)) {
@@ -309,6 +313,9 @@ void tst_QTcpServer::ipv4LoopbackPerformanceTest()
 //----------------------------------------------------------------------------------
 void tst_QTcpServer::ipv6LoopbackPerformanceTest()
 {
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Symbian: IPv6 is not yet supported", SkipAll);
+#endif
     QTcpServer server;
     if (!server.listen(QHostAddress::LocalHostIPv6, 0)) {
         QVERIFY(server.serverError() == QAbstractSocket::UnsupportedSocketOperationError);
@@ -503,6 +510,7 @@ private:
 //----------------------------------------------------------------------------------
 void tst_QTcpServer::waitForConnectionTest()
 {
+    
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy) {
 #ifdef TEST_QNETWORK_PROXY
@@ -514,7 +522,7 @@ void tst_QTcpServer::waitForConnectionTest()
     }
 
     QTcpSocket findLocalIpSocket;
-    findLocalIpSocket.connectToHost(QtNetworkSettings::serverName(), 21);
+    findLocalIpSocket.connectToHost(QtNetworkSettings::serverName(), 143);
     QVERIFY(findLocalIpSocket.waitForConnected(2000));
 
     QTcpServer server;
@@ -527,10 +535,10 @@ void tst_QTcpServer::waitForConnectionTest()
     ThreadConnector connector(findLocalIpSocket.localAddress(), server.serverPort());
     connector.start();
 
-#if !defined(Q_OS_WINCE)
-    QVERIFY(server.waitForNewConnection(3000, &timeout));
-#else
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QVERIFY(server.waitForNewConnection(9000, &timeout));
+#else
+    QVERIFY(server.waitForNewConnection(3000, &timeout));
 #endif
     QVERIFY(!timeout);
 }
@@ -590,7 +598,11 @@ protected:
     {
         // how a user woulddo it (qabstractsocketengine is not public)
         unsigned long arg = 0;
-#ifdef Q_OS_WIN
+#if defined(Q_OS_SYMBIAN)
+        arg = fcntl(socketDescriptor, F_GETFL, NULL);
+        arg &= (~O_NONBLOCK);
+        ok = ::fcntl(socketDescriptor, F_SETFL, arg) != -1;
+#elif defined(Q_OS_WIN)
         ok = ::ioctlsocket(socketDescriptor, FIONBIO, &arg) == 0;
         ::closesocket(socketDescriptor);
 #else
@@ -602,6 +614,10 @@ protected:
 
 void tst_QTcpServer::addressReusable()
 {
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)    
+    QSKIP("Symbian: Emulator does not support process launching", SkipAll );
+#endif
+    
 #if defined(QT_NO_PROCESS)
     QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll);
 #else
@@ -615,7 +631,7 @@ void tst_QTcpServer::addressReusable()
         }
 #endif
     }
-#if defined(Q_OS_WINCE)
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QString signalName = QString::fromLatin1("/test_signal.txt");
     QFile::remove(signalName);
     // The crashingServer process will crash once it gets a connection.
@@ -663,9 +679,7 @@ void tst_QTcpServer::setNewSocketDescriptorBlocking()
 
     QTcpSocket socket;
     socket.connectToHost(QHostAddress::LocalHost, server.serverPort());
-
     QVERIFY(server.waitForNewConnection(5000));
-
     QVERIFY(server.ok);
 }
 
@@ -678,7 +692,7 @@ void tst_QTcpServer::invalidProxy_data()
     QTest::addColumn<int>("expectedError");
 
     QString fluke = QHostInfo::fromName(QtNetworkSettings::serverName()).addresses().first().toString();
-    QTest::newRow("ftp-proxy") << int(QNetworkProxy::FtpCachingProxy) << fluke << 21
+    QTest::newRow("ftp-proxy") << int(QNetworkProxy::FtpCachingProxy) << fluke << 143
                                << int(QAbstractSocket::UnsupportedSocketOperationError);
     QTest::newRow("http-proxy") << int(QNetworkProxy::HttpProxy) << fluke << 3128
                                 << int(QAbstractSocket::UnsupportedSocketOperationError);
diff --git a/tests/auto/qtcpsocket/qtcpsocket.pro b/tests/auto/qtcpsocket/qtcpsocket.pro
index 6a96889e5a..4bbec23dc2 100644
--- a/tests/auto/qtcpsocket/qtcpsocket.pro
+++ b/tests/auto/qtcpsocket/qtcpsocket.pro
@@ -2,5 +2,4 @@ TEMPLATE = subdirs
 
 
 !wince*: SUBDIRS = test stressTest
-wince*: SUBDIRS = test
-vxworks*: SUBDIRS = test
+wince*|symbian*|vxworks* : SUBDIRS = test
diff --git a/tests/auto/qtcpsocket/test/test.pro b/tests/auto/qtcpsocket/test/test.pro
index 696375d9d9..0f93deffe0 100644
--- a/tests/auto/qtcpsocket/test/test.pro
+++ b/tests/auto/qtcpsocket/test/test.pro
@@ -11,7 +11,9 @@ wince*: {
 QT += network
 vxworks:QT -= gui
 
-DEFINES += TEST_QNETWORK_PROXY
+symbian: TARGET.EPOCHEAPSIZE="0x100 0x1000000"
+
+#DEFINES += TEST_QNETWORK_PROXY
 
 TARGET = tst_qtcpsocket
 
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index 6b0a5be08c..44e655053c 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -40,7 +40,10 @@
 ****************************************************************************/
 
 
-#ifdef _WIN32
+// Just to get Q_OS_SYMBIAN
+#include <qglobal.h>
+
+#if defined(_WIN32) && !defined(Q_OS_SYMBIAN)
 #include <winsock2.h>
 #else
 #include <sys/types.h>
@@ -78,11 +81,10 @@
 #include <QTimer>
 #include <QDebug>
 #ifndef TEST_QNETWORK_PROXY
-#define TEST_QNETWORK_PROXY
+//#define TEST_QNETWORK_PROXY
 #endif
-#ifdef TEST_QNETWORK_PROXY
+// RVCT compiles also unused inline methods
 # include <QNetworkProxy>
-#endif
 
 #ifdef Q_OS_LINUX
 #include <stdio.h>
@@ -247,6 +249,7 @@ int tst_QTcpSocket::loopLevel = 0;
 
 tst_QTcpSocket::tst_QTcpSocket()
 {
+    Q_SET_DEFAULT_IAP
     tmpSocket = 0;
 }
 
@@ -899,8 +902,12 @@ void tst_QTcpSocket::disconnectWhileConnecting()
         socket->disconnectFromHost();
     }
 
-    connect(socket, SIGNAL(disconnected()), SLOT(exitLoopSlot()));
+    connect(socket, SIGNAL(disconnected()), SLOT(exitLoopSlot()));    
+#ifndef Q_OS_SYMBIAN    
     enterLoop(10);
+#else    
+    enterLoop(30);
+#endif    
     QVERIFY2(!timeout(), "Network timeout");
     QVERIFY(socket->state() == QAbstractSocket::UnconnectedState);
     if (!closeDirectly) {
@@ -935,7 +942,7 @@ public:
         : server(0), ok(false), quit(false)
     { }
 
-    ~ReceiverThread() { wait(); delete server; }
+    ~ReceiverThread() { /*delete server;*/ terminate(); wait();  }
 
     bool listen()
     {
@@ -952,7 +959,11 @@ protected:
     {
         bool timedOut = false;
         while (!quit) {
+#ifndef Q_OS_SYMBIAN
             if (server->waitForNewConnection(500, &timedOut))
+#else
+            if (server->waitForNewConnection(5000, &timedOut))
+#endif
                 break;
             if (!timedOut)
                 return;
@@ -960,7 +971,11 @@ protected:
 
         QTcpSocket *socket = server->nextPendingConnection();
         while (!quit) {
+#ifndef Q_OS_SYMBIAN    
             if (socket->waitForDisconnected(500))
+#else    
+            if (socket->waitForDisconnected(5000))
+#endif     
                 break;
             if (socket->error() != QAbstractSocket::SocketTimeoutError)
                 return;
@@ -1008,7 +1023,11 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop()
         socket->disconnectFromHost();
     }
 
+#ifndef Q_OS_SYMBIAN    
     QVERIFY2(socket->waitForDisconnected(10000), "Network timeout");
+#else    
+    QVERIFY2(socket->waitForDisconnected(30000), "Network timeout");
+#endif     
     QVERIFY(socket->state() == QAbstractSocket::UnconnectedState);
     if (!closeDirectly) {
         QCOMPARE(int(socket->openMode()), int(QIODevice::ReadWrite));
@@ -1018,7 +1037,7 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop()
     delete socket;
 
     // check if the other side received everything ok
-    QVERIFY(thread.wait(10000));
+    QVERIFY(thread.wait(30000));
     QVERIFY(thread.ok);
     QCOMPARE(thread.receivedData, data);
 }
@@ -1054,7 +1073,11 @@ void tst_QTcpSocket::disconnectWhileLookingUp()
 
     // let anything queued happen
     QEventLoop loop;
+#ifndef Q_OS_SYMBIAN    
     QTimer::singleShot(50, &loop, SLOT(quit()));
+#else    
+    QTimer::singleShot(5000, &loop, SLOT(quit()));
+#endif     
     loop.exec();
 
     // recheck
@@ -1159,13 +1182,13 @@ void tst_QTcpSocket::readLine()
         QVERIFY(socket->waitForReadyRead(10000));
 
     char buffer[1024];
-    QCOMPARE(socket->readLine(buffer, sizeof(buffer)), qint64(161));
+    int expectedReplySize = QtNetworkSettings::expectedReplyIMAP().size();
+    Q_ASSERT(expectedReplySize >= 3);
+    QCOMPARE(socket->readLine(buffer, sizeof(buffer)), qint64(expectedReplySize));
 
-    // * OK fluke Cyrus IMAP4 v2.2.12 server ready__
-//    // 01234567890123456789012345678901234567890123456789
-    QCOMPARE((int) buffer[159], (int) '\r');
-    QCOMPARE((int) buffer[160], (int) '\n');
-    QCOMPARE((int) buffer[161], (int) '\0');
+    QCOMPARE((int) buffer[expectedReplySize-2], (int) '\r');
+    QCOMPARE((int) buffer[expectedReplySize-1], (int) '\n');
+    QCOMPARE((int) buffer[expectedReplySize], (int) '\0');
 
     QCOMPARE(socket->write("1 NOOP\r\n"), qint64(8));
 
@@ -1203,7 +1226,7 @@ void tst_QTcpSocket::readLineString()
     QVERIFY(socket->waitForReadyRead(10000));
 
     QByteArray arr = socket->readLine();
-    QCOMPARE(arr, expected);
+    QCOMPARE(arr, QtNetworkSettings::expectedReplyIMAP());
 
     delete socket;
 }
@@ -1300,11 +1323,19 @@ void tst_QTcpSocket::dontCloseOnTimeout()
 
     QTcpSocket *socket = newSocket();
     socket->connectToHost(serverAddress, server.serverPort());
+#ifndef Q_OS_SYMBIAN
     QVERIFY(!socket->waitForReadyRead(100));
+#else
+    QVERIFY(!socket->waitForReadyRead(5000));
+#endif
     QCOMPARE(socket->error(), QTcpSocket::SocketTimeoutError);
     QVERIFY(socket->isOpen());
 
+#ifndef Q_OS_SYMBIAN
     QVERIFY(!socket->waitForDisconnected(100));
+#else
+    QVERIFY(!socket->waitForDisconnected(5000));
+#endif
     QCOMPARE(socket->error(), QTcpSocket::SocketTimeoutError);
     QVERIFY(socket->isOpen());
 
@@ -1431,9 +1462,7 @@ void tst_QTcpSocket::socketInAThread()
         TestThread thread;
         thread.start();
         QVERIFY(thread.wait(15000));
-        QCOMPARE(thread.data(),
-//                 QByteArray("220 (vsFTPd 2.0.4)\r\n221 Goodbye.\r\n"));
-				 QByteArray("220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n"));
+        QCOMPARE(thread.data(), QtNetworkSettings::expectedReplyFtp());
     }
 }
 
@@ -1453,12 +1482,9 @@ void tst_QTcpSocket::socketsInThreads()
         QVERIFY(thread3.wait(15000));
         QVERIFY(thread1.wait(15000));
 
-        QCOMPARE(thread1.data(),
-				 QByteArray("220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n"));
-        QCOMPARE(thread2.data(),
-                 QByteArray("220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n"));
-        QCOMPARE(thread3.data(),
-                 QByteArray("220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n"));
+        QCOMPARE(thread1.data(),QtNetworkSettings::expectedReplyFtp());
+        QCOMPARE(thread2.data(),QtNetworkSettings::expectedReplyFtp());
+        QCOMPARE(thread3.data(),QtNetworkSettings::expectedReplyFtp());
     }
 }
 
@@ -1757,7 +1783,16 @@ void tst_QTcpSocket::readyReadSignalsAfterWaitForReadyRead()
     QCOMPARE(readyReadSpy.count(), 1);
 
     QString s = socket->readLine();
-    QCOMPARE(s.toLatin1().constData(), "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] qt-test-server.qt-test-net Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+#ifdef TEST_QNETWORK_PROXY    
+    QNetworkProxy::ProxyType proxyType = QNetworkProxy::applicationProxy().type();
+    if(proxyType == QNetworkProxy::NoProxy) {
+        QCOMPARE(s.toLatin1().constData(), "* OK [CAPABILITY IMAP4REV1] aspiriniks Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+    } else {
+        QCOMPARE(s.toLatin1().constData(), "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] aspiriniks Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+    }
+#else
+    QCOMPARE(s.toLatin1().constData(), QtNetworkSettings::expectedReplyIMAP().constData()); 
+#endif    
     QCOMPARE(socket->bytesAvailable(), qint64(0));
 
     QCoreApplication::instance()->processEvents();
@@ -1975,6 +2010,8 @@ void tst_QTcpSocket::suddenRemoteDisconnect()
 {
 #if defined(Q_OS_WINCE) || defined(Q_OS_VXWORKS)
     QSKIP("stressTest subprocess needs Qt3Support", SkipAll);
+#elif defined( Q_OS_SYMBIAN )
+    QSKIP("Symbian: QProcess IO is not yet supported, fix when supported", SkipAll);    
 #else
     QFETCH(QString, client);
     QFETCH(QString, server);
@@ -2193,11 +2230,13 @@ void tst_QTcpSocket::invalidProxy_data()
     QTest::newRow("no-such-host-http") << int(QNetworkProxy::HttpProxy)
                                        << "this-host-will-never-exist.troll.no" << 3128 << false
                                        << int(QAbstractSocket::ProxyNotFoundError);
-
+#if !defined(Q_OS_SYMBIAN)
+    //QSKIP("On Symbian Emulator not clear what to expect + server settings", SkipAll);
     QTest::newRow("http-on-socks5") << int(QNetworkProxy::HttpProxy) << fluke << 1080 << false
                                     << int(QAbstractSocket::ProxyConnectionClosedError);
     QTest::newRow("socks5-on-http") << int(QNetworkProxy::Socks5Proxy) << fluke << 3128 << false
                                     << int(QAbstractSocket::SocketTimeoutError);
+#endif
 }
 
 void tst_QTcpSocket::invalidProxy()
@@ -2353,5 +2392,6 @@ void tst_QTcpSocket::proxyFactory()
 }
 #endif
 
+
 QTEST_MAIN(tst_QTcpSocket)
 #include "tst_qtcpsocket.moc"
diff --git a/tests/auto/qtemporaryfile/qtemporaryfile.pro b/tests/auto/qtemporaryfile/qtemporaryfile.pro
index bde990ab74..0f2a6ea732 100644
--- a/tests/auto/qtemporaryfile/qtemporaryfile.pro
+++ b/tests/auto/qtemporaryfile/qtemporaryfile.pro
@@ -2,4 +2,11 @@ load(qttest_p4)
 SOURCES       += tst_qtemporaryfile.cpp
 QT = core
 
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+symbian {
+    testData.sources = tst_qtemporaryfile.cpp
+    testData.path = .
+    DEPLOYMENT += testData    
+}else {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
+}
diff --git a/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp
index 66896a834c..16779728e9 100644
--- a/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp
+++ b/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp
@@ -59,6 +59,10 @@
 # include <unistd.h>            // close(2)
 #endif
 
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR ""
+#endif
+
 //TESTED_CLASS=
 //TESTED_FILES=
 
@@ -186,7 +190,7 @@ void tst_QTemporaryFile::fileName()
     QVERIFY(QFile::exists(fileName));
     // Get path to the temp file, whithout the file name.
     QString absoluteFilePath = QFileInfo(fileName).absolutePath();
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     absoluteFilePath = absoluteFilePath.toLower();
     absoluteTempPath = absoluteTempPath.toLower();
 #endif
@@ -341,7 +345,7 @@ void tst_QTemporaryFile::openOnRootDrives()
 
 void tst_QTemporaryFile::stressTest()
 {
-#ifdef Q_OS_WINCE
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     // 200 is still ok, first colision happens after ~30
     const int iterations = 200;
 #else
diff --git a/tests/auto/qtextblock/tst_qtextblock.cpp b/tests/auto/qtextblock/tst_qtextblock.cpp
index 59ab957ce3..d03993e569 100644
--- a/tests/auto/qtextblock/tst_qtextblock.cpp
+++ b/tests/auto/qtextblock/tst_qtextblock.cpp
@@ -115,7 +115,7 @@ void tst_QTextBlock::fragmentOverBlockBoundaries()
     QVERIFY(doc);
     // Block separators are always a fragment of their self. Thus:
     // |Hello|\b|World|\b|
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !defined(Q_WS_S60)
     QVERIFY(doc->d_func()->fragmentMap().numNodes() == 4);
 #endif
 
diff --git a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro
index 4d2ff010df..cba5a74c84 100644
--- a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro
+++ b/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro
@@ -1,9 +1,10 @@
 load(qttest_p4)
+QT = core
 HEADERS += 
 SOURCES += tst_qtextboundaryfinder.cpp 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+!symbian:*:DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-wince*:{
+wince*|symbian*:{
    addFiles.sources = data
    addFiles.path = .
    DEPLOYMENT += addFiles
diff --git a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index eecc5276f9..253e8645bd 100644
--- a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -48,6 +48,9 @@
 
 //TESTED_CLASS=
 //TESTED_FILES=gui/text/qtextlayout.h corelib/tools/qtextboundaryfinder.cpp
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR "$$PWD"
+#endif
 
 class tst_QTextBoundaryFinder : public QObject
 {
diff --git a/tests/auto/qtextbrowser/qtextbrowser.pro b/tests/auto/qtextbrowser/qtextbrowser.pro
index 6da3bfb78e..e159a3cb47 100644
--- a/tests/auto/qtextbrowser/qtextbrowser.pro
+++ b/tests/auto/qtextbrowser/qtextbrowser.pro
@@ -1,11 +1,11 @@
 load(qttest_p4)
 SOURCES += tst_qtextbrowser.cpp
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+!symbian*:DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 contains(QT_CONFIG, qt3support): QT += qt3support
 
 
-wince*: {
+wince*|symbian*: {
    addFiles.sources = *.html
    addFiles.path = .
    addDir.sources = subdir/*
diff --git a/tests/auto/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/qtextbrowser/tst_qtextbrowser.cpp
index 08173d14c9..c60b031307 100644
--- a/tests/auto/qtextbrowser/tst_qtextbrowser.cpp
+++ b/tests/auto/qtextbrowser/tst_qtextbrowser.cpp
@@ -52,6 +52,10 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#endif
+
 class TestBrowser : public QTextBrowser
 {
 public:
@@ -545,6 +549,9 @@ void tst_QTextBrowser::focusIndicator()
     QVERIFY(browser->textCursor().hasSelection());
     QCOMPARE(browser->textCursor().selectedText(), QString("Link to second page"));
 
+#ifdef QT_KEYPAD_NAVIGATION
+    browser->setEditFocus(true);
+#endif
     QTest::keyClick(browser, Qt::Key_Enter);
     QVERIFY(!browser->textCursor().hasSelection());
 
@@ -594,6 +601,9 @@ void tst_QTextBrowser::focusHistory()
     QVERIFY(browser->textCursor().hasSelection());
     QCOMPARE(browser->textCursor().selectedText(), QString("Link to second page"));
 
+#ifdef QT_KEYPAD_NAVIGATION
+    browser->setEditFocus(true);
+#endif
     QTest::keyClick(browser, Qt::Key_Enter);
     QVERIFY(!browser->textCursor().hasSelection());
 
@@ -650,6 +660,9 @@ void tst_QTextBrowser::urlEncoding()
 
     QSignalSpy spy(browser, SIGNAL(anchorClicked(const QUrl &)));
 
+#ifdef QT_KEYPAD_NAVIGATION
+    browser->setEditFocus(true);
+#endif
     QTest::keyClick(browser, Qt::Key_Enter);
     QCOMPARE(spy.count(), 1);
 
diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/qtextcodec/test/test.pro
index 9c07e76763..7d4fdb3c47 100644
--- a/tests/auto/qtextcodec/test/test.pro
+++ b/tests/auto/qtextcodec/test/test.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 TARGET = ../tst_qtextcodec
 SOURCES  += ../tst_qtextcodec.cpp
-wince*: {
+wince*|symbian {
    addFiles.sources = ../*.txt
    addFiles.path = .
    DEPLOYMENT += addFiles
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index 9f51805134..403a75111f 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -45,6 +45,7 @@
 #include <qtextcodec.h>
 #include <qfile.h>
 #include <qtextdocument.h>
+#include <time.h>
 #include <qprocess.h>
 
 class tst_QTextCodec : public QObject
@@ -278,7 +279,7 @@ void tst_QTextCodec::codecForLocale()
     QTextCodec *codec = QTextCodec::codecForLocale();
     QVERIFY(codec != 0);
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX)
     // get a time string that is locale-encoded
     QByteArray originalLocaleEncodedTimeString;
     originalLocaleEncodedTimeString.resize(1024);
@@ -310,7 +311,6 @@ void tst_QTextCodec::codecForLocale()
     }
     if (!codec2) {
         QSKIP("Could not find a codec that is not already the codecForLocale()", SkipAll);
-        return;
     }
 
     // set it, codecForLocale() should return it now
@@ -1685,6 +1685,7 @@ void tst_QTextCodec::utfHeaders_data()
         << (QString(QChar(0xfeff)) + QString::fromLatin1("hel"))
         << true;
 
+
     QTest::newRow("utf32 bom be")
         << QByteArray("UTF-32")
         << 0
diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/qtextedit/qtextedit.pro
index 142dd47222..02f5dcb9b6 100644
--- a/tests/auto/qtextedit/qtextedit.pro
+++ b/tests/auto/qtextedit/qtextedit.pro
@@ -5,12 +5,15 @@ INCLUDEPATH += ../
 HEADERS +=  
 SOURCES += tst_qtextedit.cpp 
 
-wince* {
-    DEFINES += SRCDIR=\\\"./\\\"
+wince*|symbian*: {
     addImages.sources = fullWidthSelection/*
     addImages.path = fullWidthSelection
     DEPLOYMENT += addImages
-} else {
+}
+
+wince* {
+    DEFINES += SRCDIR=\\\"./\\\"
+} !symbian {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
 
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index d54645c9cf..776c3482a3 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -73,6 +73,11 @@ Q_DECLARE_METATYPE(QList<bool>);
 #include <Carbon/Carbon.h>
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#undef QT3_SUPPORT
+#endif
+
 
 bool nativeClipboardWorking()
 {
@@ -110,13 +115,17 @@ private slots:
     void autoBulletList1();
     void autoBulletList2();
     void preserveCharFormatAfterNewline();
+#ifndef QT_NO_CLIPBOARD
     void clearMustNotChangeClipboard();
+#endif
     void clearMustNotResetRootFrameMarginToDefault();
     void clearShouldPreserveTheCurrentCharFormat();
     void clearShouldClearExtraSelections();
     void paragSeparatorOnPlaintextAppend();
     void layoutingLoop();
+#ifndef QT_NO_CLIPBOARD
     void selectAllSetsNotSelection();
+#endif
     void asciiTab();
     void setDocument();
     void setDocument_shared();
@@ -129,7 +138,9 @@ private slots:
 #endif
     void cursorPositionChanged();
     void setTextCursor();
+#ifndef QT_NO_CLIPBOARD
     void undoAvailableAfterPaste();
+#endif
     void undoRedoAvailableRepetition();
     void appendShouldUseCurrentFormat();
     void appendShouldNotTouchTheSelection();
@@ -137,7 +148,9 @@ private slots:
     void shiftBackspace();
     void undoRedo();
     void preserveCharFormatInAppend();
+#ifndef QT_NO_CLIPBOARD
     void copyAndSelectAllInReadonly();
+#endif    
     void ctrlAltInput();
     void noPropertiesOnDefaultTextEditCharFormat();
     void setPlainTextShouldUseCurrentCharFormat();
@@ -152,14 +165,18 @@ private slots:
     void undoRedoAfterSetContent();
     void numPadKeyNavigation();
     void moveCursor();
+#ifndef QT_NO_CLIPBOARD
     void mimeDataReimplementations();
+#endif
     void ctrlEnterShouldInsertLineSeparator_NOT();
     void shiftEnterShouldInsertLineSeparator();
     void selectWordsFromStringsContainingSeparators_data();
     void selectWordsFromStringsContainingSeparators();
+#ifndef QT_NO_CLIPBOARD
     void canPaste();
     void copyAvailable_data();
     void copyAvailable();
+#endif
     void ensureCursorVisibleOnInitialShow();
     void setHtmlInsideResizeEvent();
     void colorfulAppend();
@@ -471,6 +488,7 @@ void tst_QTextEdit::createSelection()
     QCOMPARE(ed->textCursor().position(), 11);
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QTextEdit::clearMustNotChangeClipboard()
 {
     if (!nativeClipboardWorking())
@@ -481,6 +499,7 @@ void tst_QTextEdit::clearMustNotChangeClipboard()
     ed->clear();
     QCOMPARE(QApplication::clipboard()->text(), txt);
 }
+#endif
 
 void tst_QTextEdit::clearMustNotResetRootFrameMarginToDefault()
 {
@@ -544,6 +563,7 @@ void tst_QTextEdit::layoutingLoop()
     QVERIFY(callsToSetPageSize < 10);
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QTextEdit::selectAllSetsNotSelection()
 {
     if (!QApplication::clipboard()->supportsSelection()) {
@@ -559,7 +579,7 @@ void tst_QTextEdit::selectAllSetsNotSelection()
 
     QCOMPARE(QApplication::clipboard()->text(QClipboard::Selection), QString::fromAscii("foobar"));
 }
-
+#endif
 void tst_QTextEdit::asciiTab()
 {
     QTextEdit edit;
@@ -569,6 +589,7 @@ void tst_QTextEdit::asciiTab()
     QCOMPARE(edit.toPlainText().at(0), QChar('\t'));
 }
 
+
 void tst_QTextEdit::setDocument()
 {
     QTextDocument *document = new QTextDocument(ed);
@@ -769,6 +790,7 @@ void tst_QTextEdit::setTextCursor()
     QCOMPARE(spy.count(), 1);
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QTextEdit::undoAvailableAfterPaste()
 {
     if (!nativeClipboardWorking())
@@ -782,6 +804,7 @@ void tst_QTextEdit::undoAvailableAfterPaste()
     QVERIFY(spy.count() >= 1);
     QCOMPARE(ed->toPlainText(), txt);
 }
+#endif
 
 class UndoRedoRecorder : public QObject
 {
@@ -988,6 +1011,7 @@ void tst_QTextEdit::preserveCharFormatInAppend()
     QCOMPARE(cursor.block().text(), QString("third para"));
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QTextEdit::copyAndSelectAllInReadonly()
 {
     if (!nativeClipboardWorking())
@@ -1018,6 +1042,7 @@ void tst_QTextEdit::copyAndSelectAllInReadonly()
     QTest::keyClick(ed, Qt::Key_C, Qt::ControlModifier);
     QCOMPARE(QApplication::clipboard()->text(), QString("Hello World"));
 }
+#endif
 
 void tst_QTextEdit::ctrlAltInput()
 {
@@ -1257,6 +1282,7 @@ void tst_QTextEdit::implicitClear()
     QVERIFY(ed->toPlainText().isEmpty());
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QTextEdit::copyAvailable_data()
 {
     QTest::addColumn<pairListType>("keystrokes");
@@ -1374,6 +1400,7 @@ void tst_QTextEdit::copyAvailable()
         QVERIFY2(variantSpyCopyAvailable.toBool() == copyAvailable.at(i), QString("Spied singnal: %1").arg(i).toLatin1());
     }
 }
+#endif
 
 void tst_QTextEdit::undoRedoAfterSetContent()
 {
@@ -1439,6 +1466,7 @@ public:
 
 };
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QTextEdit::mimeDataReimplementations()
 {
     MyTextEdit ed;
@@ -1477,6 +1505,7 @@ void tst_QTextEdit::mimeDataReimplementations()
     QCOMPARE(ed.insertCallCount, 1);
 #endif
 }
+#endif
 
 void tst_QTextEdit::ctrlEnterShouldInsertLineSeparator_NOT()
 {
@@ -1528,6 +1557,7 @@ void tst_QTextEdit::selectWordsFromStringsContainingSeparators()
     cursor.clearSelection();
 }
 
+#ifndef QT_NO_CLIPBOARD
 void tst_QTextEdit::canPaste()
 {
     if (!nativeClipboardWorking())
@@ -1540,6 +1570,7 @@ void tst_QTextEdit::canPaste()
     ed->setTextInteractionFlags(Qt::NoTextInteraction);
     QVERIFY(!ed->canPaste());
 }
+#endif
 
 void tst_QTextEdit::ensureCursorVisibleOnInitialShow()
 {
diff --git a/tests/auto/qtextlayout/qtextlayout.pro b/tests/auto/qtextlayout/qtextlayout.pro
index 2da4d8a784..381f09e5e9 100644
--- a/tests/auto/qtextlayout/qtextlayout.pro
+++ b/tests/auto/qtextlayout/qtextlayout.pro
@@ -3,4 +3,7 @@ HEADERS +=
 SOURCES += tst_qtextlayout.cpp 
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
 
+symbian {
+	TARGET.EPOCHEAPSIZE = 100000 20000000
+}
 
diff --git a/tests/auto/qtextodfwriter/qtextodfwriter.pro b/tests/auto/qtextodfwriter/qtextodfwriter.pro
index 3c40d67c9c..2689894dad 100644
--- a/tests/auto/qtextodfwriter/qtextodfwriter.pro
+++ b/tests/auto/qtextodfwriter/qtextodfwriter.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
 SOURCES += tst_qtextodfwriter.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
+!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian:INCLUDEPATH+=$$[QT_INSTALL_PREFIX]/include/QtGui/private 
diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
index 1971493fb4..d784c99896 100644
--- a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
+++ b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
@@ -47,6 +47,10 @@
 #include <QBuffer>
 #include <QDebug>
 
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR "."
+#endif
+
 #include <private/qtextodfwriter_p.h>
 
 class tst_QTextOdfWriter : public QObject
diff --git a/tests/auto/qtextstream/test/test.pro b/tests/auto/qtextstream/test/test.pro
index bae7717aa1..b24708c86f 100644
--- a/tests/auto/qtextstream/test/test.pro
+++ b/tests/auto/qtextstream/test/test.pro
@@ -17,15 +17,20 @@ contains(QT_CONFIG, qt3support):QT += qt3support
 QT = core network
 
 
-wince*: {
+wince*|symbian: {
    addFiles.sources = ../rfc3261.txt ../shift-jis.txt ../task113817.txt ../qtextstream.qrc ../tst_qtextstream.cpp
    addFiles.path = .
    res.sources = ../resources
    res.path = .
    DEPLOYMENT += addFiles
+}
+
+wince*: {
    DEFINES += SRCDIR=\\\"\\\"
-} else {
-  DEFINES += SRCDIR=\\\"$$PWD/../\\\"
+}else:symbian {
+    # Symbian can't define SRCDIR meaningfully here   
+}else {
+   DEFINES += SRCDIR=\\\"$$PWD/../\\\"
 }
 
 
diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp
index d05dcf8af3..484d7c9395 100644
--- a/tests/auto/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/qtextstream/tst_qtextstream.cpp
@@ -41,7 +41,7 @@
 
 
 /*-*-encoding:latin1-*-*/
-#include <iostream>
+//#include <iostream>
 //using namespace std;
 
 #include <QtTest/QtTest>
@@ -76,6 +76,10 @@ QT_END_NAMESPACE
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR ""
+#endif
+
 class tst_QTextStream : public QObject
 {
     Q_OBJECT
@@ -472,7 +476,7 @@ tst_QTextStream::tst_QTextStream()
 }
 
 tst_QTextStream::~tst_QTextStream()
-{
+{  
 }
 
 void tst_QTextStream::init()
@@ -1247,7 +1251,11 @@ void tst_QTextStream::stillOpenWhenAtEnd()
 #endif
     QTcpSocket socket;
     socket.connectToHost(QtNetworkSettings::serverName(), 143);
+#if defined(Q_OS_SYMBIAN)    
+    QVERIFY(socket.waitForReadyRead(30000));
+#else
     QVERIFY(socket.waitForReadyRead(5000));
+#endif
 
     QTextStream stream2(&socket);
     while (!stream2.readLine().isNull()) {}
@@ -1490,8 +1498,8 @@ void tst_QTextStream::pos2()
 // ------------------------------------------------------------------------------
 void tst_QTextStream::readStdin()
 {
-#ifdef Q_OS_WINCE
-    QSKIP("Qt/CE has no stdin/out", SkipAll);
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+    QSKIP("Qt/CE and Symbian have no stdin/out support for processes", SkipAll);
 #endif
     QProcess stdinProcess;
     stdinProcess.start("stdinProcess/stdinProcess");
@@ -1516,8 +1524,8 @@ void tst_QTextStream::readStdin()
 // ------------------------------------------------------------------------------
 void tst_QTextStream::readAllFromStdin()
 {
-#ifdef Q_OS_WINCE
-    QSKIP("Qt/CE has no stdin/out", SkipAll);
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+    QSKIP("Qt/CE and Symbian have no stdin/out support for processes", SkipAll);
 #endif
     QProcess stdinProcess;
     stdinProcess.start("readAllStdinProcess/readAllStdinProcess", QIODevice::ReadWrite | QIODevice::Text);
@@ -1537,8 +1545,8 @@ void tst_QTextStream::readAllFromStdin()
 // ------------------------------------------------------------------------------
 void tst_QTextStream::readLineFromStdin()
 {
-#ifdef Q_OS_WINCE
-    QSKIP("Qt/CE has no stdin/out", SkipAll);
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+    QSKIP("Qt/CE and Symbian have no stdin/out support for processes", SkipAll);
 #endif
     QProcess stdinProcess;
     stdinProcess.start("readLineStdinProcess/readLineStdinProcess", QIODevice::ReadWrite | QIODevice::Text);
@@ -4298,7 +4306,7 @@ void tst_QTextStream::int_write_with_locale()
 // like QTEST_APPLESS_MAIN, but initialising the locale on Unix
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_UNIX
+#if defined (Q_OS_UNIX) && !defined (Q_OS_SYMBIAN)
     extern bool qt_locale_initialized;
     ::setlocale(LC_ALL, "");
     qt_locale_initialized = true;
diff --git a/tests/auto/qthread/qthread.pro b/tests/auto/qthread/qthread.pro
index c4d4f2a55e..4ea8fe543f 100644
--- a/tests/auto/qthread/qthread.pro
+++ b/tests/auto/qthread/qthread.pro
@@ -1,5 +1,4 @@
 load(qttest_p4)
 SOURCES += tst_qthread.cpp
 QT = core
-
-
+symbian*:LIBS += -llibpthread
diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/qthread/tst_qthread.cpp
index 3a7d83f5ab..0e0eb6fd42 100644
--- a/tests/auto/qthread/tst_qthread.cpp
+++ b/tests/auto/qthread/tst_qthread.cpp
@@ -892,7 +892,7 @@ void tst_QThread::stressTest()
     while (t.elapsed() < one_minute) {
         Current_Thread t;
         t.start();
-        t.wait();
+        t.wait(one_minute);
     }
 }
 
diff --git a/tests/auto/qthreadstorage/qthreadstorage.pro b/tests/auto/qthreadstorage/qthreadstorage.pro
index f4f57009ab..376ba654d6 100644
--- a/tests/auto/qthreadstorage/qthreadstorage.pro
+++ b/tests/auto/qthreadstorage/qthreadstorage.pro
@@ -1,5 +1,4 @@
 load(qttest_p4)
 SOURCES += tst_qthreadstorage.cpp
 QT = core
-
-
+symbian*:LIBS += -llibpthread
diff --git a/tests/auto/qtime/qtime.pro b/tests/auto/qtime/qtime.pro
index 93fc74cf97..88277a001f 100644
--- a/tests/auto/qtime/qtime.pro
+++ b/tests/auto/qtime/qtime.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
-
 SOURCES += tst_qtime.cpp
 QT = core
-
-
diff --git a/tests/auto/qtimeline/qtimeline.pro b/tests/auto/qtimeline/qtimeline.pro
index 57d67a8373..78204552e5 100644
--- a/tests/auto/qtimeline/qtimeline.pro
+++ b/tests/auto/qtimeline/qtimeline.pro
@@ -1,5 +1,4 @@
 load(qttest_p4)
 QT = core
 SOURCES  += tst_qtimeline.cpp
-
-
+QT = core
diff --git a/tests/auto/qtimer/qtimer.pro b/tests/auto/qtimer/qtimer.pro
index a16035fd19..79ae7dbd0b 100644
--- a/tests/auto/qtimer/qtimer.pro
+++ b/tests/auto/qtimer/qtimer.pro
@@ -1,5 +1,4 @@
 load(qttest_p4)
 QT = core
 SOURCES  += tst_qtimer.cpp
-
-
+QT = core
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp
index 43b755347c..5d18cf0b84 100644
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/qtimer/tst_qtimer.cpp
@@ -84,6 +84,8 @@ private slots:
     void deleteLaterOnQTimer(); // long name, don't want to shadow QObject::deleteLater()
     void moveToThread();
     void restartedTimerFiresTooSoon();
+    void timerFiresOnlyOncePerProcessEvents_data();
+    void timerFiresOnlyOncePerProcessEvents();
 };
 
 class TimerHelper : public QObject
@@ -144,6 +146,13 @@ void tst_QTimer::singleShotTimeout()
     QCOMPARE(helper.count, 1);
 }
 
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+// Increase wait as emulator startup can cause unexpected delays
+#define TIMEOUT_TIMEOUT 2000
+#else
+#define TIMEOUT_TIMEOUT 200
+#endif
+
 void tst_QTimer::timeout()
 {
     TimerHelper helper;
@@ -154,11 +163,11 @@ void tst_QTimer::timeout()
 
     QCOMPARE(helper.count, 0);
 
-    QTest::qWait(200);
+    QTest::qWait(TIMEOUT_TIMEOUT);
     QVERIFY(helper.count > 0);
     int oldCount = helper.count;
 
-    QTest::qWait(200);
+    QTest::qWait(TIMEOUT_TIMEOUT);
     QVERIFY(helper.count > oldCount);
 }
 
@@ -248,7 +257,7 @@ void tst_QTimer::livelock()
 #if defined(Q_OS_MAC)
     QEXPECT_FAIL("zero timer", "Posted events source are handled AFTER timers", Continue);
     QEXPECT_FAIL("non-zero timer", "Posted events source are handled AFTER timers", Continue);
-#elif defined(Q_OS_UNIX)
+#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     QEXPECT_FAIL("zero timer", "", Continue);
     QEXPECT_FAIL("non-zero timer", "", Continue);
 #elif defined(Q_OS_WIN)
@@ -389,29 +398,38 @@ void tst_QTimer::deleteLaterOnQTimer()
     QVERIFY(pointer.isNull());
 }
 
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+// Increase wait as emulator startup can cause unexpected delays
+#define MOVETOTHREAD_TIMEOUT 200
+#define MOVETOTHREAD_WAIT 5000
+#else
+#define MOVETOTHREAD_TIMEOUT 200
+#define MOVETOTHREAD_WAIT 300
+#endif
+
 void tst_QTimer::moveToThread()
 {
     QTimer ti1;
     QTimer ti2;
-    ti1.start(200);
-    ti2.start(200);
+    ti1.start(MOVETOTHREAD_TIMEOUT);
+    ti2.start(MOVETOTHREAD_TIMEOUT);
     QVERIFY((ti1.timerId() & 0xffffff) != (ti2.timerId() & 0xffffff));
     QThread tr;
     ti1.moveToThread(&tr);
     connect(&ti1,SIGNAL(timeout()), &tr, SLOT(quit()));
     tr.start();
     QTimer ti3;
-    ti3.start(200);
+    ti3.start(MOVETOTHREAD_TIMEOUT);
     QVERIFY((ti3.timerId() & 0xffffff) != (ti2.timerId() & 0xffffff));
     QVERIFY((ti3.timerId() & 0xffffff) != (ti1.timerId() & 0xffffff));
-    QTest::qWait(300);
+    QTest::qWait(MOVETOTHREAD_WAIT);
     QVERIFY(tr.wait());
     ti2.stop();
     QTimer ti4;
-    ti4.start(200);
+    ti4.start(MOVETOTHREAD_TIMEOUT);
     ti3.stop();
-    ti2.start(200);
-    ti3.start(200);
+    ti2.start(MOVETOTHREAD_TIMEOUT);
+    ti3.start(MOVETOTHREAD_TIMEOUT);
     QVERIFY((ti4.timerId() & 0xffffff) != (ti2.timerId() & 0xffffff));
     QVERIFY((ti3.timerId() & 0xffffff) != (ti2.timerId() & 0xffffff));
     QVERIFY((ti3.timerId() & 0xffffff) != (ti1.timerId() & 0xffffff));
@@ -480,6 +498,55 @@ void tst_QTimer::restartedTimerFiresTooSoon()
     QVERIFY(object.eventLoop.exec() == 0);
 }
 
+class LongLastingSlotClass : public QObject
+{
+    Q_OBJECT
+
+public:
+    LongLastingSlotClass(QTimer *timer) : count(0), timer(timer) {}
+
+public slots:
+    void longLastingSlot()
+    {
+        // Don't use timers for this, because we are testing them.
+        QTime time;
+        time.start();
+        while (time.elapsed() < 200) {
+            for (int c = 0; c < 100000; c++) {} // Mindless looping.
+        }
+        if (++count >= 2) {
+            timer->stop();
+        }
+    }
+
+public:
+    int count;
+    QTimer *timer;
+};
+
+void tst_QTimer::timerFiresOnlyOncePerProcessEvents_data()
+{
+    QTest::addColumn<int>("interval");
+    QTest::newRow("zero timer") << 0;
+    QTest::newRow("non-zero timer") << 10;
+}
+
+void tst_QTimer::timerFiresOnlyOncePerProcessEvents()
+{
+    QFETCH(int, interval);
+
+    QTimer t;
+    LongLastingSlotClass longSlot(&t);
+    t.start(interval);
+    connect(&t, SIGNAL(timeout()), &longSlot, SLOT(longLastingSlot()));
+    // Loop because there may be other events pending.
+    while (longSlot.count == 0) {
+        QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
+    }
+
+    QCOMPARE(longSlot.count, 1);
+}
+
 QTEST_MAIN(tst_QTimer)
 #include "tst_qtimer.moc"
-\
+
diff --git a/tests/auto/qtransform/qtransform.pro b/tests/auto/qtransform/qtransform.pro
index 7cba3dbb52..298feb2034 100644
--- a/tests/auto/qtransform/qtransform.pro
+++ b/tests/auto/qtransform/qtransform.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 HEADERS += 
 SOURCES  += tst_qtransform.cpp
 
-unix:!mac:LIBS+=-lm
+unix:!mac:!symbian*:LIBS+=-lm
 
 
diff --git a/tests/auto/qtransformedscreen/qtransformedscreen.pro b/tests/auto/qtransformedscreen/qtransformedscreen.pro
index 6914054de3..39e3700591 100644
--- a/tests/auto/qtransformedscreen/qtransformedscreen.pro
+++ b/tests/auto/qtransformedscreen/qtransformedscreen.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 SOURCES += tst_qtransformedscreen.cpp
+QT = core
 
 embedded:!contains(gfx-drivers, transformed) {
 LIBS += ../../../plugins/gfxdrivers/libqgfxtransformed.so
diff --git a/tests/auto/qtranslator/qtranslator.pro b/tests/auto/qtranslator/qtranslator.pro
index 0d67f707ab..30ffc1c25d 100644
--- a/tests/auto/qtranslator/qtranslator.pro
+++ b/tests/auto/qtranslator/qtranslator.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_qtranslator.cpp
 
 
-wince*: {
+wince*|symbian*: {
    addFiles.sources = hellotr_la.qm msgfmt_from_po.qm
    addFiles.path = .
    DEPLOYMENT += addFiles
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index b21a97355b..65cb27a3c0 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -51,7 +51,9 @@
 //TESTED_FILES=
 
 Q_DECLARE_METATYPE(QModelIndex)
+#ifndef QT_NO_DRAGANDDROP
 Q_DECLARE_METATYPE(QAbstractItemView::DragDropMode)
+#endif
 Q_DECLARE_METATYPE(QAbstractItemView::EditTriggers)
 Q_DECLARE_METATYPE(QAbstractItemView::EditTrigger)
 
@@ -137,11 +139,13 @@ private slots:
     void alternatingRowColors();
     void currentIndex_data();
     void currentIndex();
+#ifndef QT_NO_DRAGANDDROP
     void dragDropMode_data();
     void dragDropMode();
     void dragDropModeFromDragEnabledAndAcceptDrops_data();
     void dragDropModeFromDragEnabledAndAcceptDrops();
     void dragDropOverwriteMode();
+#endif
     void editTriggers_data();
     void editTriggers();
     void hasAutoScroll();
@@ -468,9 +472,11 @@ void tst_QTreeView::construction()
     // QAbstractItemView properties
     QVERIFY(!view.alternatingRowColors());
     QCOMPARE(view.currentIndex(), QModelIndex());
+#ifndef QT_NO_DRAGANDDROP
     QCOMPARE(view.dragDropMode(), QAbstractItemView::NoDragDrop);
     QVERIFY(!view.dragDropOverwriteMode());
     QVERIFY(!view.dragEnabled());
+#endif
     QCOMPARE(view.editTriggers(), QAbstractItemView::EditKeyPressed | QAbstractItemView::DoubleClicked);
     QVERIFY(view.hasAutoScroll());
     QCOMPARE(view.horizontalScrollMode(), QAbstractItemView::ScrollPerPixel);
@@ -489,7 +495,9 @@ void tst_QTreeView::construction()
     QCOMPARE(view.selectionBehavior(), QAbstractItemView::SelectRows);
     QCOMPARE(view.selectionMode(), QAbstractItemView::SingleSelection);
     QVERIFY(!view.selectionModel());
+#ifndef QT_NO_DRAGANDDROP
     QVERIFY(view.showDropIndicator());
+#endif
     QCOMPARE(view.QAbstractItemView::sizeHintForColumn(-1), -1); // <- protected in QTreeView
     QCOMPARE(view.QAbstractItemView::sizeHintForColumn(0), -1); // <- protected in QTreeView
     QCOMPARE(view.QAbstractItemView::sizeHintForColumn(1), -1); // <- protected in QTreeView
@@ -596,12 +604,13 @@ void tst_QTreeView::currentIndex()
     // ### Test child and grandChild indexes.
 }
 
+#ifndef QT_NO_DRAGANDDROP
+
 void tst_QTreeView::dragDropMode_data()
 {
     QTest::addColumn<QAbstractItemView::DragDropMode>("dragDropMode");
     QTest::addColumn<bool>("acceptDrops");
     QTest::addColumn<bool>("dragEnabled");
-
     QTest::newRow("NoDragDrop") << QAbstractItemView::NoDragDrop << false << false;
     QTest::newRow("DragOnly") << QAbstractItemView::DragOnly << false << true;
     QTest::newRow("DropOnly") << QAbstractItemView::DropOnly << true << false;
@@ -696,6 +705,7 @@ void tst_QTreeView::dragDropOverwriteMode()
     // QTableWidget, from their reimplementations of dropMimeData(). Hard to
     // test.
 }
+#endif
 
 void tst_QTreeView::editTriggers_data()
 {
diff --git a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
index 77c345981f..1e74f494f1 100644
--- a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
+++ b/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
@@ -925,7 +925,7 @@ void tst_QTreeWidgetItemIterator::iteratorflags()
     QFETCH(int, iteratorflags);
     QFETCH(QStringList, matches);
 
-    QTreeWidgetItemIterator it(testWidget, (QTreeWidgetItemIterator::IteratorFlags)iteratorflags);
+    QTreeWidgetItemIterator it(testWidget, QTreeWidgetItemIterator::IteratorFlags(iteratorflags));
     it+=start;
     int iMatch = 0;
     while (*it && iMatch < matches.count()) {
@@ -1000,7 +1000,7 @@ void tst_QTreeWidgetItemIterator::plus_eq()
     QFETCH(int, iteratorflags);
     QFETCH(QString, expecteditem);
 
-    QTreeWidgetItemIterator it(testWidget, (QTreeWidgetItemIterator::IteratorFlags)iteratorflags);
+    QTreeWidgetItemIterator it(testWidget, QTreeWidgetItemIterator::IteratorFlags(iteratorflags));
     it+=start;
     it+=addition;
     QTreeWidgetItem *item = *it;
@@ -1033,7 +1033,7 @@ void tst_QTreeWidgetItemIterator::minus_eq()
     QFETCH(int, iteratorflags);
     QFETCH(QString, expecteditem);
 
-    QTreeWidgetItemIterator it(testWidget, (QTreeWidgetItemIterator::IteratorFlags)iteratorflags);
+    QTreeWidgetItemIterator it(testWidget, QTreeWidgetItemIterator::IteratorFlags(iteratorflags));
     it+=start;
     it-=subtraction;
     QTreeWidgetItem *item = *it;
@@ -1112,10 +1112,10 @@ void tst_QTreeWidgetItemIterator::updateIfModifiedFromWidget()
         }
     }
 
-    QTreeWidgetItemIterator it(&tw, (QTreeWidgetItemIterator::IteratorFlags)iteratorflags);
+    QTreeWidgetItemIterator it(&tw, QTreeWidgetItemIterator::IteratorFlags(iteratorflags));
     it+=expecteditemindex;
     QTreeWidgetItem *item = 0;
-    QTreeWidgetItemIterator itRemove(&tw, (QTreeWidgetItemIterator::IteratorFlags)iteratorflags);
+    QTreeWidgetItemIterator itRemove(&tw, QTreeWidgetItemIterator::IteratorFlags(iteratorflags));
     itRemove+=removeindex;
     item = *itRemove;
     QVERIFY(item);
diff --git a/tests/auto/qtwidgets/qtwidgets.pro b/tests/auto/qtwidgets/qtwidgets.pro
index ad5e7acc18..b762acb434 100644
--- a/tests/auto/qtwidgets/qtwidgets.pro
+++ b/tests/auto/qtwidgets/qtwidgets.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+symbian*:TARGET.EPOCHEAPSIZE=0x200000 0xa00000
 
 SOURCES += tst_qtwidgets.cpp mainwindow.cpp
 HEADERS += mainwindow.h
diff --git a/tests/auto/qtwidgets/tst_qtwidgets.cpp b/tests/auto/qtwidgets/tst_qtwidgets.cpp
index b1809d6a2a..06a2e3551b 100644
--- a/tests/auto/qtwidgets/tst_qtwidgets.cpp
+++ b/tests/auto/qtwidgets/tst_qtwidgets.cpp
@@ -47,15 +47,28 @@
 
 
 #include "mainwindow.h"
+#include "../network-settings.h"
 
 class tst_QtWidgets: public QObject
 {
     Q_OBJECT
 
+public:
+    tst_QtWidgets();
+    virtual ~tst_QtWidgets();
+
 private slots:
     void snapshot();
 };
 
+tst_QtWidgets::tst_QtWidgets()
+{
+    Q_SET_DEFAULT_IAP
+}
+
+tst_QtWidgets::~tst_QtWidgets()
+{
+}
 
 void tst_QtWidgets::snapshot()
 {
diff --git a/tests/auto/qudpsocket/test/test.pro b/tests/auto/qudpsocket/test/test.pro
index 2444dac816..2e0a020543 100644
--- a/tests/auto/qudpsocket/test/test.pro
+++ b/tests/auto/qudpsocket/test/test.pro
@@ -15,7 +15,7 @@ win32 {
     DESTDIR = ../
 }
 
-wince*: {
+wince*|symbian*: {
     addApp.sources = ../clientserver/clientserver.exe
     addApp.path = clientserver
     DEPLOYMENT += addApp
diff --git a/tests/auto/qudpsocket/tst_qudpsocket.cpp b/tests/auto/qudpsocket/tst_qudpsocket.cpp
index 68a53a0505..db18eb5b10 100644
--- a/tests/auto/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/qudpsocket/tst_qudpsocket.cpp
@@ -105,11 +105,11 @@ protected slots:
 
 tst_QUdpSocket::tst_QUdpSocket()
 {
+    Q_SET_DEFAULT_IAP
 }
 
 tst_QUdpSocket::~tst_QUdpSocket()
 {
-
 }
 
 void tst_QUdpSocket::initTestCase_data()
@@ -207,7 +207,7 @@ void tst_QUdpSocket::broadcasting()
 #ifdef TEST_QNETWORK_PROXY
         QFETCH_GLOBAL(int, proxyType);
         if (proxyType == QNetworkProxy::Socks5Proxy) {
-            QSKIP("With socks5 Broadcast is not supported.", SkipAll);
+            QSKIP("With socks5 Broadcast is not supported.", SkipSingle);
         }
 #endif
     }
@@ -228,7 +228,7 @@ void tst_QUdpSocket::broadcasting()
 
         for (int j = 0; j < 100; ++j) {
             broadcastSocket.writeDatagram(message[i], strlen(message[i]),
-                QHostAddress::Broadcast, 5000);
+                QHostAddress::Broadcast, 5000);          
             QTestEventLoop::instance().enterLoop(15);
             if (QTestEventLoop::instance().timeout()) {
 #if defined(Q_OS_FREEBSD)
@@ -320,6 +320,9 @@ void tst_QUdpSocket::ipv6Loop_data()
 
 void tst_QUdpSocket::ipv6Loop()
 {
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Symbian IPv6 is not yet supported", SkipAll);
+#endif
     QFETCH(QByteArray, peterMessage);
     QFETCH(QByteArray, paulMessage);
     QFETCH(bool, success);
@@ -479,6 +482,22 @@ void tst_QUdpSocket::writeDatagram()
 
 void tst_QUdpSocket::performance()
 {
+#if defined(Q_OS_SYMBIAN)
+	// Large packets seems not to go through on Symbian
+	// Reason might be also fragmentation due to VPN connection etc
+    
+    QFETCH_GLOBAL(bool, setProxy);
+    QFETCH_GLOBAL(int, proxyType); 
+    
+    int arrSize = 8192;
+    if (setProxy && proxyType == QNetworkProxy::Socks5Proxy)    
+    	arrSize = 1024;
+    	
+    QByteArray arr(arrSize, '@'); 
+#else
+    QByteArray arr(8192, '@');      
+#endif // Q_OS_SYMBIAN
+    
     QUdpSocket server;
     QVERIFY2(server.bind(), server.errorString().toLatin1().constData());
 
@@ -488,15 +507,13 @@ void tst_QUdpSocket::performance()
 
     QUdpSocket client;
     client.connectToHost(serverAddress, server.localPort());
-
-    QByteArray arr(8192, '@');
-
+    
     QTime stopWatch;
     stopWatch.start();
 
     qint64 nbytes = 0;
     while (stopWatch.elapsed() < 5000) {
-        for (int i = 0; i < 100; ++i) {
+        for (int i = 0; i < 100; ++i) {    
             if (client.write(arr.data(), arr.size()) > 0) {
                 do {
                     nbytes += server.readDatagram(arr.data(), arr.size());
@@ -508,6 +525,14 @@ void tst_QUdpSocket::performance()
     float secs = stopWatch.elapsed() / 1000.0;
     qDebug("\t%.2fMB/%.2fs: %.2fMB/s", float(nbytes / (1024.0*1024.0)),
            secs, float(nbytes / (1024.0*1024.0)) / secs);
+    
+#if defined(Q_OS_SYMBIAN)        
+    if(nbytes == 0) {
+    	qDebug("No bytes passed through local UDP socket, since UDP socket write returns EWOULDBLOCK");
+    	qDebug("Should try with blocking sockets, but it is not currently possible due to Open C defect");
+    }
+#endif    	
+    
 }
 
 void tst_QUdpSocket::bindMode()
@@ -526,8 +551,49 @@ void tst_QUdpSocket::bindMode()
     QVERIFY2(socket.bind(), socket.errorString().toLatin1().constData());
     QUdpSocket socket2;
     QVERIFY(!socket2.bind(socket.localPort()));
-
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_SYMBIAN)
+    
+    //RPRocess me;
+    if(RProcess().HasCapability(ECapabilityNetworkControl)) {
+		qDebug("Test executed *with* NetworkControl capability");
+		// In Symbian OS ReuseAddressHint together with NetworkControl capability 
+		// gives application *always* right to bind to port. I.e. it does not matter
+		// if first socket was bound with any bind flag. Since autotests in Symbian 
+		// are currently executed with ALL -TCB rights, this path is the one executed.
+		QVERIFY(socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint));
+		socket.close();    
+		socket2.close();         
+			
+		QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData());
+		QVERIFY(!socket2.bind(socket.localPort()));
+		QVERIFY2(socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint), socket2.errorString().toLatin1().constData());
+		socket.close();        
+		socket2.close();   
+			
+		QVERIFY2(socket.bind(0, QUdpSocket::DontShareAddress), socket.errorString().toLatin1().constData());
+		QVERIFY(!socket2.bind(socket.localPort()));
+		QVERIFY(socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint));
+		socket.close();        
+		socket2.close(); 		
+	} else {
+		qDebug("Test executed *without* NetworkControl capability");
+		// If we don't have NetworkControl capability, attempt to bind already bound
+		// address will *always* fail. I.e. it does not matter if first socket was 
+		// bound with any bind flag.  
+		QVERIFY(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint));
+		socket.close();         
+			
+		QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData());
+		QVERIFY(!socket2.bind(socket.localPort()));
+		QVERIFY2(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint), socket2.errorString().toLatin1().constData());
+		socket.close();          
+			
+		QVERIFY2(socket.bind(0, QUdpSocket::DontShareAddress), socket.errorString().toLatin1().constData());
+		QVERIFY(!socket2.bind(socket.localPort()));
+		QVERIFY(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint));     
+		socket.close();        	
+	}
+#elif defined(Q_OS_UNIX) 
     QVERIFY(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint));
     socket.close();
     QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData());
@@ -535,6 +601,7 @@ void tst_QUdpSocket::bindMode()
     socket2.close();
     QVERIFY2(socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint), socket2.errorString().toLatin1().constData());
 #else
+
     // Depending on the user's privileges, this or will succeed or
     // fail. Admins are allowed to reuse the address, but nobody else.
     if (!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint), socket2.errorString().toLatin1().constData())
@@ -554,13 +621,16 @@ void tst_QUdpSocket::writeDatagramToNonExistingPeer_data()
     QTest::addColumn<bool>("bind");
     QTest::addColumn<QHostAddress>("peerAddress");
     QHostAddress localhost(QHostAddress::LocalHost);
+#if !defined(Q_OS_SYMBIAN)
     QHostAddress remote = QHostInfo::fromName(QtNetworkSettings::serverName()).addresses().first();
+#endif
 
     QTest::newRow("localhost-unbound") << false << localhost;
     QTest::newRow("localhost-bound") << true << localhost;
-
+#if !defined(Q_OS_SYMBIAN)
     QTest::newRow("remote-unbound") << false << remote;
     QTest::newRow("remote-bound") << true << remote;
+#endif
 }
 
 void tst_QUdpSocket::writeDatagramToNonExistingPeer()
@@ -583,11 +653,14 @@ void tst_QUdpSocket::writeToNonExistingPeer_data()
 {
     QTest::addColumn<QHostAddress>("peerAddress");
     QHostAddress localhost(QHostAddress::LocalHost);
+#if !defined(Q_OS_SYMBIAN)
     QHostAddress remote = QHostInfo::fromName(QtNetworkSettings::serverName()).addresses().first();
-
+#endif
     // write (required to be connected)
     QTest::newRow("localhost") << localhost;
+#if !defined(Q_OS_SYMBIAN)
     QTest::newRow("remote") << remote;
+#endif
 }
 
 void tst_QUdpSocket::writeToNonExistingPeer()
@@ -638,8 +711,8 @@ void tst_QUdpSocket::writeToNonExistingPeer()
 
 void tst_QUdpSocket::outOfProcessConnectedClientServerTest()
 {
-#if defined(Q_OS_WINCE)
-    QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE.", SkipAll);
+#if defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN)
+    QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE and Symbian).", SkipAll);
 #endif
 #if defined(QT_NO_PROCESS)
     QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll);
@@ -698,8 +771,8 @@ void tst_QUdpSocket::outOfProcessConnectedClientServerTest()
 
 void tst_QUdpSocket::outOfProcessUnconnectedClientServerTest()
 {
-#if defined(Q_OS_WINCE)
-    QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE.", SkipAll);
+#if defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN)
+    QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE and Symbian).", SkipAll);
 #endif
 #if defined(QT_NO_PROCESS)
     QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll);
diff --git a/tests/auto/qudpsocket/udpServer/udpServer.pro b/tests/auto/qudpsocket/udpServer/udpServer.pro
index f04833c9a1..7438d40fb0 100644
--- a/tests/auto/qudpsocket/udpServer/udpServer.pro
+++ b/tests/auto/qudpsocket/udpServer/udpServer.pro
@@ -3,4 +3,5 @@ QT = core network
 CONFIG -= app_bundle
 CONFIG += console
 
+symbian:TARGET.CAPABILITY="ALL -TCB"
 
diff --git a/tests/auto/qurl/qurl.pro b/tests/auto/qurl/qurl.pro
index c3b1543a92..72c93bc696 100644
--- a/tests/auto/qurl/qurl.pro
+++ b/tests/auto/qurl/qurl.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qurl.cpp
-
-QT -= gui
-
-
+QT = core
diff --git a/tests/auto/quuid/quuid.pro b/tests/auto/quuid/quuid.pro
index 6f3f9f21a5..f7608fa377 100644
--- a/tests/auto/quuid/quuid.pro
+++ b/tests/auto/quuid/quuid.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
 QT = core
 SOURCES += tst_quuid.cpp
-
-
-
diff --git a/tests/auto/qvariant/qvariant.pro b/tests/auto/qvariant/qvariant.pro
index 747b6c3d93..2c9c8d76b1 100644
--- a/tests/auto/qvariant/qvariant.pro
+++ b/tests/auto/qvariant/qvariant.pro
@@ -1,6 +1,5 @@
 load(qttest_p4)
 SOURCES  += tst_qvariant.cpp
-
 QT += network
 
 contains(QT_CONFIG, qt3support): QT += qt3support
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index a9b9afd87a..a846d8fd3d 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -266,6 +266,7 @@ private slots:
     void convertByteArrayToBool() const;
     void convertByteArrayToBool_data() const;
     void toIntFromQString() const;
+    void toIntFromDouble() const;
     void task256984_setValue();
 };
 
@@ -3050,6 +3051,31 @@ void tst_QVariant::toIntFromQString() const
     QVERIFY(ok);
 }
 
+/*!
+  We verify that:
+    1. Conversion from (64 bit) double to int works (no overflow).
+    2. Same conversion works for QVariant::convert.
+
+  Rationale: if 2147483630 is set in float and then converted to int,
+  there will be overflow and the result will be -2147483648.
+
+  See task 250267.
+ */
+void tst_QVariant::toIntFromDouble() const
+{
+    double d = 2147483630;  // max int 2147483647	
+    QVERIFY((int)d == 2147483630);
+    
+    QVariant var(d);
+    QVERIFY( var.canConvert( QVariant::Int ) );
+
+    bool ok;
+    int result = var.toInt(&ok);
+
+    QVERIFY( ok == true );
+    QCOMPARE(result, 2147483630);
+}
+
 void tst_QVariant::task256984_setValue()
 {
     QTransform t; //we just take a value so that we're sure that it will be shared
diff --git a/tests/auto/qvarlengtharray/qvarlengtharray.pro b/tests/auto/qvarlengtharray/qvarlengtharray.pro
index 20bf7b7b6b..7a02790578 100644
--- a/tests/auto/qvarlengtharray/qvarlengtharray.pro
+++ b/tests/auto/qvarlengtharray/qvarlengtharray.pro
@@ -1,5 +1,4 @@
 load(qttest_p4)
 QT = core
 SOURCES  += tst_qvarlengtharray.cpp
-
-
+QT = core
diff --git a/tests/auto/qvector/qvector.pro b/tests/auto/qvector/qvector.pro
index df3ee2d3f4..80311b46c6 100644
--- a/tests/auto/qvector/qvector.pro
+++ b/tests/auto/qvector/qvector.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qvector.cpp
-
-
-
+QT = core
diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
index 7178866837..a6d272c421 100644
--- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
@@ -47,6 +47,12 @@
 #include <qthread.h>
 #include <qwaitcondition.h>
 
+#if defined(Q_OS_SYMBIAN)
+// Symbian Open C has a bug that causes very short waits to fail sometimes
+#define COND_WAIT_TIME 50
+#else
+#define COND_WAIT_TIME 1
+#endif
 
 
 //TESTED_CLASS=
@@ -283,8 +289,8 @@ void tst_QWaitCondition::wait_QReadWriteLock()
     int x;
     for (int i = 0; i < iterations; ++i) {
 	{
-            QReadWriteLock readWriteLock;
-            QWaitCondition waitCondition;
+        QReadWriteLock readWriteLock;
+        QWaitCondition waitCondition;
 
 	    readWriteLock.lockForRead();
 
@@ -297,8 +303,8 @@ void tst_QWaitCondition::wait_QReadWriteLock()
 	    readWriteLock.unlock();
 	}
 
-        {
-            QReadWriteLock readWriteLock;
+    {
+        QReadWriteLock readWriteLock;
 	    QWaitCondition waitCondition;
 
 	    readWriteLock.lockForWrite();
@@ -320,7 +326,12 @@ void tst_QWaitCondition::wait_QReadWriteLock()
 		thread[x].readWriteLock.lockForRead();
 		thread[x].start();
 		// wait for thread to start
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_WINSCW)
+        // Symbian emulator startup simultaneously with this thread causes additional delay
+		QVERIFY(thread[x].cond.wait(&thread[x].readWriteLock, 10000));
+#else
 		QVERIFY(thread[x].cond.wait(&thread[x].readWriteLock, 1000));
+#endif
 		thread[x].readWriteLock.unlock();
 	    }
 
@@ -448,7 +459,7 @@ void tst_QWaitCondition::wakeOne()
 	QMutex mutex;
 	QWaitCondition cond;
 
-        // QMutex
+    // QMutex
 	wake_Thread thread[ThreadCount];
 	bool thread_exited[ThreadCount];
 
@@ -460,9 +471,9 @@ void tst_QWaitCondition::wakeOne()
 	    thread[x].start();
 	    // wait for thread to start
 	    QVERIFY(thread[x].started.wait(&mutex, 1000));
-            // make sure wakeups are not queued... if nothing is
-            // waiting at the time of the wakeup, nothing happens
-            QVERIFY(!thread[x].dummy.wait(&mutex, 1));
+        // make sure wakeups are not queued... if nothing is
+        // waiting at the time of the wakeup, nothing happens
+        QVERIFY(!thread[x].dummy.wait(&mutex, 1));
 	}
 	mutex.unlock();
 
@@ -472,18 +483,18 @@ void tst_QWaitCondition::wakeOne()
 	for (x = 0; x < ThreadCount; ++x) {
 	    mutex.lock();
 	    cond.wakeOne();
-	    QVERIFY(!cond.wait(&mutex, 1));
-            QVERIFY(!thread[x].dummy.wait(&mutex, 1));
+	    QVERIFY(!cond.wait(&mutex, COND_WAIT_TIME));
+        QVERIFY(!thread[x].dummy.wait(&mutex, 1));
 	    mutex.unlock();
 
 	    int exited = 0;
 	    for (int y = 0; y < ThreadCount; ++y) {
-		if (thread_exited[y])
-                    continue;
-		if (thread[y].wait(exited > 0 ? 1 : 1000)) {
-		    thread_exited[y] = TRUE;
-		    ++exited;
-		}
+    		if (thread_exited[y])
+                        continue;
+    		if (thread[y].wait(exited > 0 ? 1 : 1000)) {
+    		    thread_exited[y] = TRUE;
+    		    ++exited;
+    		}
 	    }
 
 	    QCOMPARE(exited, 1);
@@ -492,11 +503,11 @@ void tst_QWaitCondition::wakeOne()
 
 	QCOMPARE(wake_Thread::count, 0);
 
-        // QReadWriteLock
-        QReadWriteLock readWriteLock;
-        wake_Thread_2 rwthread[ThreadCount];
+    // QReadWriteLock
+    QReadWriteLock readWriteLock;
+    wake_Thread_2 rwthread[ThreadCount];
 
-        readWriteLock.lockForWrite();
+    readWriteLock.lockForWrite();
 	for (x = 0; x < ThreadCount; ++x) {
 	    rwthread[x].readWriteLock = &readWriteLock;
 	    rwthread[x].cond = &cond;
@@ -504,9 +515,9 @@ void tst_QWaitCondition::wakeOne()
 	    rwthread[x].start();
 	    // wait for thread to start
 	    QVERIFY(rwthread[x].started.wait(&readWriteLock, 1000));
-            // make sure wakeups are not queued... if nothing is
-            // waiting at the time of the wakeup, nothing happens
-            QVERIFY(!rwthread[x].dummy.wait(&readWriteLock, 1));
+        // make sure wakeups are not queued... if nothing is
+        // waiting at the time of the wakeup, nothing happens
+        QVERIFY(!rwthread[x].dummy.wait(&readWriteLock, 1));
 	}
 	readWriteLock.unlock();
 
@@ -516,18 +527,18 @@ void tst_QWaitCondition::wakeOne()
 	for (x = 0; x < ThreadCount; ++x) {
 	    readWriteLock.lockForWrite();
 	    cond.wakeOne();
-	    QVERIFY(!cond.wait(&readWriteLock, 1));
-            QVERIFY(!rwthread[x].dummy.wait(&readWriteLock, 1));
+	    QVERIFY(!cond.wait(&readWriteLock, COND_WAIT_TIME));
+        QVERIFY(!rwthread[x].dummy.wait(&readWriteLock, 1));
 	    readWriteLock.unlock();
 
 	    int exited = 0;
 	    for (int y = 0; y < ThreadCount; ++y) {
-		if (thread_exited[y])
-                    continue;
-		if (rwthread[y].wait(exited > 0 ? 1 : 1000)) {
-		    thread_exited[y] = TRUE;
-		    ++exited;
-		}
+    		if (thread_exited[y])
+                        continue;
+    		if (rwthread[y].wait(exited > 0 ? 1 : 1000)) {
+    		    thread_exited[y] = TRUE;
+    		    ++exited;
+    		}
 	    }
 
 	    QCOMPARE(exited, 1);
@@ -554,9 +565,9 @@ void tst_QWaitCondition::wakeOne()
 	    thread[x].start();
 	    // wait for thread to start
 	    QVERIFY(thread[x].started.wait(&mutex, 1000));
-            // make sure wakeups are not queued... if nothing is
-            // waiting at the time of the wakeup, nothing happens
-            QVERIFY(!thread[x].dummy.wait(&mutex, 1));
+        // make sure wakeups are not queued... if nothing is
+        // waiting at the time of the wakeup, nothing happens
+        QVERIFY(!thread[x].dummy.wait(&mutex, 1));
 	}
 	mutex.unlock();
 
@@ -567,19 +578,19 @@ void tst_QWaitCondition::wakeOne()
 	    mutex.lock();
 	    cond.wakeOne();
 	    cond.wakeOne();
-	    QVERIFY(!cond.wait(&mutex, 1));
-            QVERIFY(!thread[x].dummy.wait(&mutex, 1));
-            QVERIFY(!thread[x + 1].dummy.wait(&mutex, 1));
+	    QVERIFY(!cond.wait(&mutex, COND_WAIT_TIME));
+        QVERIFY(!thread[x].dummy.wait(&mutex, 1));
+        QVERIFY(!thread[x + 1].dummy.wait(&mutex, 1));
 	    mutex.unlock();
 
 	    int exited = 0;
 	    for (int y = 0; y < ThreadCount; ++y) {
-		if (thread_exited[y])
-                    continue;
-		if (thread[y].wait(exited > 0 ? 1 : 1000)) {
-		    thread_exited[y] = TRUE;
-		    ++exited;
-		}
+    		if (thread_exited[y])
+                        continue;
+    		if (thread[y].wait(exited > 0 ? 1 : 1000)) {
+    		    thread_exited[y] = TRUE;
+    		    ++exited;
+    		}
 	    }
 
 	    QCOMPARE(exited, 2);
@@ -600,9 +611,9 @@ void tst_QWaitCondition::wakeOne()
 	    rwthread[x].start();
 	    // wait for thread to start
 	    QVERIFY(rwthread[x].started.wait(&readWriteLock, 1000));
-            // make sure wakeups are not queued... if nothing is
-            // waiting at the time of the wakeup, nothing happens
-            QVERIFY(!rwthread[x].dummy.wait(&readWriteLock, 1));
+        // make sure wakeups are not queued... if nothing is
+        // waiting at the time of the wakeup, nothing happens
+        QVERIFY(!rwthread[x].dummy.wait(&readWriteLock, 1));
 	}
 	readWriteLock.unlock();
 
@@ -613,19 +624,19 @@ void tst_QWaitCondition::wakeOne()
 	    readWriteLock.lockForWrite();
 	    cond.wakeOne();
 	    cond.wakeOne();
-	    QVERIFY(!cond.wait(&readWriteLock, 1));
-            QVERIFY(!rwthread[x].dummy.wait(&readWriteLock, 1));
-            QVERIFY(!rwthread[x + 1].dummy.wait(&readWriteLock, 1));
+	    QVERIFY(!cond.wait(&readWriteLock, COND_WAIT_TIME));
+        QVERIFY(!rwthread[x].dummy.wait(&readWriteLock, 1));
+        QVERIFY(!rwthread[x + 1].dummy.wait(&readWriteLock, 1));
 	    readWriteLock.unlock();
 
 	    int exited = 0;
 	    for (int y = 0; y < ThreadCount; ++y) {
-		if (thread_exited[y])
-                    continue;
-		if (rwthread[y].wait(exited > 0 ? 1 : 1000)) {
-		    thread_exited[y] = TRUE;
-		    ++exited;
-		}
+    		if (thread_exited[y])
+                        continue;
+    		if (rwthread[y].wait(exited > 0 ? 1 : 1000)) {
+    		    thread_exited[y] = TRUE;
+    		    ++exited;
+    		}
 	    }
 
 	    QCOMPARE(exited, 2);
@@ -643,7 +654,7 @@ void tst_QWaitCondition::wakeAll()
 	QMutex mutex;
 	QWaitCondition cond;
 
-        // QMutex
+    // QMutex
 	wake_Thread thread[ThreadCount];
 
 	mutex.lock();
@@ -661,7 +672,7 @@ void tst_QWaitCondition::wakeAll()
 	// wake up all threads at once
 	mutex.lock();
 	cond.wakeAll();
-	QVERIFY(!cond.wait(&mutex, 1));
+	QVERIFY(!cond.wait(&mutex, COND_WAIT_TIME));
 	mutex.unlock();
 
 	int exited = 0;
@@ -673,8 +684,8 @@ void tst_QWaitCondition::wakeAll()
 	QCOMPARE(exited, ThreadCount);
 	QCOMPARE(wake_Thread::count, 0);
 
-        // QReadWriteLock
-        QReadWriteLock readWriteLock;
+    // QReadWriteLock
+    QReadWriteLock readWriteLock;
 	wake_Thread_2 rwthread[ThreadCount];
 
 	readWriteLock.lockForWrite();
@@ -692,10 +703,10 @@ void tst_QWaitCondition::wakeAll()
 	// wake up all threads at once
 	readWriteLock.lockForWrite();
 	cond.wakeAll();
-	QVERIFY(!cond.wait(&readWriteLock, 1));
+	QVERIFY(!cond.wait(&readWriteLock, COND_WAIT_TIME));
 	readWriteLock.unlock();
 
-        exited = 0;
+    exited = 0;
 	for (x = 0; x < ThreadCount; ++x) {
 	    if (rwthread[x].wait(1000))
 		++exited;
diff --git a/tests/auto/qwidget/qwidget.pro b/tests/auto/qwidget/qwidget.pro
index d394400e4a..59c1753751 100644
--- a/tests/auto/qwidget/qwidget.pro
+++ b/tests/auto/qwidget/qwidget.pro
@@ -14,4 +14,8 @@ LIBS += -framework Security -framework AppKit
 OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm
 }
 
-!wince*:win32: LIBS += -luser32 -lgdi32
+symbian  {
+    INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+}
+
+!wince*:!symbian:win32: LIBS += -luser32 -lgdi32
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 0f0a1af91c..0b2da109f5 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -67,6 +67,14 @@
 #include <qcalendarwidget.h>
 #include <qmainwindow.h>
 #include <QtGui/qpaintengine.h>
+#include <private/qbackingstore_p.h>
+
+#ifdef Q_WS_S60
+#include <avkon.hrh>                // EEikStatusPaneUidTitle
+#include <akntitle.h>               // CAknTitlePane
+#include <akncontext.h>             // CAknContextPane
+#include <eikspane.h>               // CEikStatusPane
+#endif
 
 #ifdef Q_WS_QWS
 # include <qscreen_qws.h>
@@ -356,6 +364,8 @@ private slots:
     void focusWidget_task254563();
     void rectOutsideCoordinatesLimit_task144779();
 
+    void destroyBackingStore();
+
 private:
     bool ensureScreenSize(int width, int height);
     QWidget *testWidget;
@@ -1079,6 +1089,9 @@ void tst_QWidget::enabledPropagation()
 
 void tst_QWidget::acceptDropsPropagation()
 {
+#ifdef QT_NO_DRAGANDDROP
+    QSKIP("Drag'n drop disabled in this build", SkipAll);
+#else
     QWidget *childWidget = new QWidget(testWidget);
     childWidget->show();
     QVERIFY(!testWidget->acceptDrops());
@@ -1122,6 +1135,7 @@ void tst_QWidget::acceptDropsPropagation()
     QVERIFY(childWidget->acceptDrops());
     QVERIFY(!grandChildWidget->acceptDrops());
     QVERIFY(grandChildWidget->testAttribute(Qt::WA_DropSiteRegistered));
+#endif
 }
 
 void tst_QWidget::isEnabledTo()
@@ -1409,7 +1423,7 @@ void tst_QWidget::mapFromAndTo()
     subWindow2->setGeometry(75, 75, 100, 100);
     subSubWindow->setGeometry(10, 10, 10, 10);
 
-#ifndef Q_OS_WINCE //still no proper minimizing
+#if !defined (Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) //still no proper minimizing
     //update visibility
     if (windowMinimized) {
         if (!windowHidden) {
@@ -1814,6 +1828,9 @@ void tst_QWidget::windowState()
         pos = QPoint(10,10);
         size = QSize(100,100);
     }
+#elif defined(Q_WS_S60)
+    QPoint pos = QPoint(10,10);
+    QSize size = QSize(100,100);
 #else
     const QPoint pos(500, 500);
     const QSize size(200, 200);
@@ -1928,7 +1945,7 @@ void tst_QWidget::showMaximized()
     layouted.showNormal();
     QVERIFY(!(layouted.windowState() & Qt::WindowMaximized));
 
-#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE)
+#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_S60)
 //embedded may choose a different size to fit on the screen.
     QCOMPARE(layouted.size(), layouted.sizeHint());
 #endif
@@ -1969,6 +1986,13 @@ void tst_QWidget::showMaximized()
         QVERIFY(widget.isMaximized());
     }
 
+    {
+        QWidget widget;
+        widget.setGeometry(0, 0, 10, 10);
+        widget.showMaximized();
+        QVERIFY(widget.size().width() > 20 && widget.size().height() > 20);
+    }
+
 #ifdef QT3_SUPPORT
 #if !defined(Q_WS_QWS)
 //embedded respects max/min sizes by design -- maybe wrong design, but that's the way it is now.
@@ -2020,7 +2044,7 @@ void tst_QWidget::showFullScreen()
     layouted.showNormal();
     QVERIFY(!(layouted.windowState() & Qt::WindowFullScreen));
 
-#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE)
+#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined (Q_WS_S60)
 //embedded may choose a different size to fit on the screen.
     QCOMPARE(layouted.size(), layouted.sizeHint());
 #endif
@@ -2451,6 +2475,9 @@ void tst_QWidget::hideWhenFocusWidgetIsChild()
     actualFocusWidget.sprintf("%p %s %s", qApp->focusWidget(), qApp->focusWidget()->objectName().toLatin1().constData(), qApp->focusWidget()->metaObject()->className());
     expectedFocusWidget.sprintf("%p %s %s", edit2, edit2->objectName().toLatin1().constData(), edit2->metaObject()->className());
     QCOMPARE(actualFocusWidget, expectedFocusWidget);
+
+    delete edit2;
+    delete parentWidget;
 }
 
 void tst_QWidget::normalGeometry()
@@ -3354,6 +3381,9 @@ void tst_QWidget::widgetAt()
 #if defined(Q_OS_WINCE)
     QEXPECT_FAIL("", "Windows CE does only support rectangular regions", Continue); //See also task 147191
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QEXPECT_FAIL("", "Symbian/S60 does only support rectangular regions", Continue); //See also task 147191
+#endif
     QCOMPARE(QApplication::widgetAt(100,100)->objectName(), w1->objectName());
     QCOMPARE(QApplication::widgetAt(101,101)->objectName(), w2->objectName());
 
@@ -3369,6 +3399,9 @@ void tst_QWidget::widgetAt()
 #if defined(Q_OS_WINCE)
     QEXPECT_FAIL("", "Windows CE does only support rectangular regions", Continue); //See also task 147191
 #endif
+#if defined(Q_OS_SYMBIAN)
+    QEXPECT_FAIL("", "Symbian/S60 does only support rectangular regions", Continue); //See also task 147191
+#endif
     QVERIFY(QApplication::widgetAt(100,100) == w1);
     QVERIFY(QApplication::widgetAt(101,101) == w2);
 
@@ -3428,6 +3461,34 @@ QString textPropertyToString(Display *display, XTextProperty& text_prop)
 
 #endif
 
+#if defined(Q_WS_S60)
+// Returns the application's status pane control, if not present returns NULL.
+static CCoeControl* GetStatusPaneControl( TInt aPaneId )
+{
+    const TUid paneUid = { aPaneId };
+    
+    CEikStatusPane* statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane();
+    if (statusPane && statusPane->PaneCapabilities(paneUid).IsPresent()){
+		CCoeControl* control = NULL;
+        // ControlL shouldn't leave because the pane is present
+		TRAPD(err, control = statusPane->ControlL(paneUid));
+		return err != KErrNone ? NULL : control;
+    }
+    return NULL;
+}
+// Returns the application's title pane, if not present returns NULL. 
+static CAknTitlePane* TitlePane()
+{
+    return static_cast<CAknTitlePane*>(GetStatusPaneControl(EEikStatusPaneUidTitle));
+}
+    
+// Returns the application's title pane, if not present returns NULL. 
+static CAknContextPane* ContextPane()
+{
+    return static_cast<CAknContextPane*>(GetStatusPaneControl(EEikStatusPaneUidContext));
+}    
+#endif
+
 static QString visibleWindowTitle(QWidget *window, Qt::WindowState state = Qt::WindowNoState)
 {
     QString vTitle;
@@ -3490,6 +3551,13 @@ static QString visibleWindowTitle(QWidget *window, Qt::WindowState state = Qt::W
     if (win)
         vTitle = win->caption();
     }
+#elif defined (Q_WS_S60)    
+    CAknTitlePane* titlePane = TitlePane();
+    if(titlePane)
+        {
+        const TDesC* nTitle = titlePane->Text();
+        vTitle = QString::fromUtf16(nTitle->Ptr(), nTitle->Length());
+        }
 #endif
 
     return vTitle;
@@ -3520,6 +3588,9 @@ void tst_QWidget::windowTitle()
 
 void tst_QWidget::windowIconText()
 {
+#ifdef Q_OS_SYMBIAN
+    QSKIP("Symbian/S60 windows don't have window icon text", SkipAll);
+#endif
     QWidget widget(0);
 
     widget.setWindowTitle("Application Name");
@@ -5312,7 +5383,7 @@ void tst_QWidget::moveChild()
     QCOMPARE(pos, child.pos());
 
     QCOMPARE(parent.r, QRegion(oldGeometry) - child.geometry());
-#ifndef Q_WS_MAC
+#if !defined(Q_WS_MAC)
     // should be scrolled in backingstore
     QCOMPARE(child.r, QRegion());
 #endif
@@ -6106,7 +6177,10 @@ void tst_QWidget::compatibilityChildInsertedEvents()
             EventRecorder::EventList()
             << qMakePair(&widget, QEvent::PolishRequest)
             << qMakePair(&widget, QEvent::Type(QEvent::User + 1))
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS)
+#ifdef Q_OS_SYMBIAN
+            << qMakePair(&widget, QEvent::SymbianDeferredFocusChanged)
+#endif
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_S60)
             << qMakePair(&widget, QEvent::UpdateRequest)
 #endif
             ;
@@ -6201,7 +6275,10 @@ void tst_QWidget::compatibilityChildInsertedEvents()
             << qMakePair(&widget, QEvent::PolishRequest)
             << qMakePair(&widget, QEvent::Type(QEvent::User + 1))
             << qMakePair(&widget, QEvent::Type(QEvent::User + 2))
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS)
+#ifdef Q_OS_SYMBIAN
+            << qMakePair(&widget, QEvent::SymbianDeferredFocusChanged)
+#endif
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_S60)
             << qMakePair(&widget, QEvent::UpdateRequest)
 #endif
             ;
@@ -6296,7 +6373,10 @@ void tst_QWidget::compatibilityChildInsertedEvents()
             << qMakePair(&widget, QEvent::PolishRequest)
             << qMakePair(&widget, QEvent::Type(QEvent::User + 1))
             << qMakePair(&widget, QEvent::Type(QEvent::User + 2))
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS)
+#ifdef Q_OS_SYMBIAN
+            << qMakePair(&widget, QEvent::SymbianDeferredFocusChanged)
+#endif
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_S60)
             << qMakePair(&widget, QEvent::UpdateRequest)
 #endif
             ;
@@ -7350,7 +7430,7 @@ void tst_QWidget::repaintWhenChildDeleted()
     }
 #endif
     ColorWidget w(0, Qt::red);
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_WS_S60)
     QPoint startPoint = QApplication::desktop()->availableGeometry(&w).topLeft();
     startPoint.rx() += 50;
     startPoint.ry() += 50;
@@ -7384,7 +7464,7 @@ void tst_QWidget::repaintWhenChildDeleted()
 void tst_QWidget::hideOpaqueChildWhileHidden()
 {
     ColorWidget w(0, Qt::red);
-#ifndef Q_OS_WINCE
+#if !defined(Q_OS_WINCE) && !defined(Q_WS_S60)
     QPoint startPoint = QApplication::desktop()->availableGeometry(&w).topLeft();
     startPoint.rx() += 50;
     startPoint.ry() += 50;
@@ -8259,7 +8339,12 @@ void tst_QWidget::customDpi()
     custom->logicalDpiX();
     QCOMPARE(custom->metricCallCount, 1);
     child->logicalDpiX();
+#ifdef Q_WS_S60
+    // QWidget::metric is not recursive on Symbian
+    QCOMPARE(custom->metricCallCount, 1);
+#else
     QCOMPARE(custom->metricCallCount, 2);
+#endif
 
     delete topLevel;
 }
@@ -9100,8 +9185,8 @@ void tst_QWidget::toplevelLineEditFocus()
 #endif
     QTest::qWait(200);
 
-    QCOMPARE(QApplication::activeWindow(), &w);
-    QCOMPARE(QApplication::focusWidget(), &w);
+    QCOMPARE(QApplication::activeWindow(), (QWidget*)&w);
+    QCOMPARE(QApplication::focusWidget(), (QWidget*)&w);
 }
 
 void tst_QWidget::focusWidget_task254563()
@@ -9119,6 +9204,32 @@ void tst_QWidget::focusWidget_task254563()
     QVERIFY(top.focusWidget() != widget); //dangling pointer
 }
 
+void tst_QWidget::destroyBackingStore()
+{
+    UpdateWidget w;
+    w.show();
+
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&w);
+#endif
+    QApplication::processEvents();
+
+    w.reset();
+    w.update();
+    delete qt_widget_private(&w)->topData()->backingStore;
+    qt_widget_private(&w)->topData()->backingStore = 0;
+    qt_widget_private(&w)->topData()->backingStore = new QWidgetBackingStore(&w);
+
+    w.update();
+    QApplication::processEvents();
+    QCOMPARE(w.numPaintEvents, 1);
+
+    // Check one more time, because the second time around does more caching.
+    w.update();
+    QApplication::processEvents();
+    QCOMPARE(w.numPaintEvents, 2);
+}
+
 void tst_QWidget::rectOutsideCoordinatesLimit_task144779()
 {
     QWidget main;
diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
index ddd193008b..fcec097a6d 100644
--- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
+++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
@@ -152,6 +152,8 @@ void tst_QWindowSurface::flushOutsidePaintEvent()
     qt_x11_wait_for_window_manager(&w);
 #elif defined(Q_WS_QWS)
     QApplication::sendPostedEvents(); //for the glib event loop
+#elif defined(Q_WS_S60)
+    QTest::qWait(5000);
 #endif
     VERIFY_COLOR(w.geometry(), w.color);
     w.reset();
diff --git a/tests/auto/qwineventnotifier/qwineventnotifier.pro b/tests/auto/qwineventnotifier/qwineventnotifier.pro
index d985df6ff1..0c8bd2bd94 100644
--- a/tests/auto/qwineventnotifier/qwineventnotifier.pro
+++ b/tests/auto/qwineventnotifier/qwineventnotifier.pro
@@ -1,6 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qwineventnotifier.cpp
-
 QT = core
-
-
diff --git a/tests/auto/qwizard/qwizard.pro b/tests/auto/qwizard/qwizard.pro
index 867ab9c4be..a22e45cf19 100644
--- a/tests/auto/qwizard/qwizard.pro
+++ b/tests/auto/qwizard/qwizard.pro
@@ -5,5 +5,6 @@ SOURCES  += tst_qwizard.cpp
 #SOURCES  += /home/jasplin/dev/research/qwizard/src/qwizard.cpp
 #HEADERS  += /home/jasplin/dev/research/qwizard/src/qwizard.h
 RESOURCES = qwizard.qrc
+TARGET.EPOCHEAPSIZE = 0x200000 0xF00000
 
 
diff --git a/tests/auto/qwmatrix/qwmatrix.pro b/tests/auto/qwmatrix/qwmatrix.pro
index d2ecd496c3..58ea706158 100644
--- a/tests/auto/qwmatrix/qwmatrix.pro
+++ b/tests/auto/qwmatrix/qwmatrix.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 SOURCES  += tst_qwmatrix.cpp
 
-unix:!mac:LIBS+=-lm
+unix:!mac:!symbian*:LIBS+=-lm
 
 
diff --git a/tests/auto/qwritelocker/qwritelocker.pro b/tests/auto/qwritelocker/qwritelocker.pro
index 42cdd4593f..acae4efb28 100644
--- a/tests/auto/qwritelocker/qwritelocker.pro
+++ b/tests/auto/qwritelocker/qwritelocker.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qwritelocker.cpp
 QT = core
-
-
diff --git a/tests/auto/qwsembedwidget/qwsembedwidget.pro b/tests/auto/qwsembedwidget/qwsembedwidget.pro
index 3ee12a3dc5..bd3c32c981 100644
--- a/tests/auto/qwsembedwidget/qwsembedwidget.pro
+++ b/tests/auto/qwsembedwidget/qwsembedwidget.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qwsembedwidget.cpp
-
-
-
+QT = core
diff --git a/tests/auto/qwsinputmethod/qwsinputmethod.pro b/tests/auto/qwsinputmethod/qwsinputmethod.pro
index 9721acce57..69cce78704 100644
--- a/tests/auto/qwsinputmethod/qwsinputmethod.pro
+++ b/tests/auto/qwsinputmethod/qwsinputmethod.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qwsinputmethod.cpp
-
-
-
+QT = core
diff --git a/tests/auto/qwswindowsystem/qwswindowsystem.pro b/tests/auto/qwswindowsystem/qwswindowsystem.pro
index 827608186b..49466eecbb 100644
--- a/tests/auto/qwswindowsystem/qwswindowsystem.pro
+++ b/tests/auto/qwswindowsystem/qwswindowsystem.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
 SOURCES += tst_qwswindowsystem.cpp
-
-
-
+QT = core
diff --git a/tests/auto/qxml/qxml.pro b/tests/auto/qxml/qxml.pro
index 6c767cb81b..304fc54c92 100644
--- a/tests/auto/qxml/qxml.pro
+++ b/tests/auto/qxml/qxml.pro
@@ -3,7 +3,7 @@ load(qttest_p4)
 SOURCES += tst_qxml.cpp
 QT = core xml
 
-wince*: {
+wince*|symbian*: {
    addFiles.sources = 0x010D.xml
    addFiles.path = .
    DEPLOYMENT += addFiles
diff --git a/tests/auto/qxmlformatter/qxmlformatter.pro b/tests/auto/qxmlformatter/qxmlformatter.pro
index e3d16f6589..4c00d73871 100644
--- a/tests/auto/qxmlformatter/qxmlformatter.pro
+++ b/tests/auto/qxmlformatter/qxmlformatter.pro
@@ -3,7 +3,7 @@ SOURCES += tst_qxmlformatter.cpp
 
 include (../xmlpatterns.pri)
 
-wince*:{
+wince*|symbian*:{
    addFiles.sources = baselines input
    addFiles.path = .
    DEPLOYMENT += addFiles
diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro
index e8ab641ab2..386df05e28 100644
--- a/tests/auto/qxmlquery/qxmlquery.pro
+++ b/tests/auto/qxmlquery/qxmlquery.pro
@@ -12,7 +12,7 @@ QT += network
 
 include (../xmlpatterns.pri)
 
-wince*: {
+wince*|symbian*: {
    addFiles.sources = pushBaselines input.xml
    addFiles.path    = .
 
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index 5c14329358..ebf992db22 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -88,6 +88,7 @@ public:
                            , m_pushTestsCount(0)
                            , m_testNetwork(true)
     {
+        Q_SET_DEFAULT_IAP
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/qxmlsimplereader/qxmlsimplereader.pro
index e7e80072d4..bfdec58bc5 100644
--- a/tests/auto/qxmlsimplereader/qxmlsimplereader.pro
+++ b/tests/auto/qxmlsimplereader/qxmlsimplereader.pro
@@ -12,8 +12,8 @@ QT += network xml
 QT -= gui
 
 
-wince*: {
+wince*|symbian*: {
    addFiles.sources = encodings parser xmldocs
    addFiles.path = .
    DEPLOYMENT += addFiles
-}
\ No newline at end of file
+}
diff --git a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp
index bf88092d84..e0c183c74e 100644
--- a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp
+++ b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp
@@ -117,7 +117,7 @@ void XmlServer::run()
                 i += cnt;
                 sock->flush();
                 QTest::qSleep(1);
-                
+
                 if (quit_soon) {
                     sock->abort();
                     break;
@@ -575,12 +575,16 @@ void tst_QXmlSimpleReader::inputFromSocket_data()
 void tst_QXmlSimpleReader::inputFromSocket()
 {
     QFETCH(QString, file_name);
+    
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Symbian: Skipped due to problems in Open C and QtNetwork", SkipAll);
+#endif         
 
 #if defined(Q_OS_WIN32) && (defined(Q_CC_INTEL) || defined(Q_CC_MINGW) || defined(Q_CC_MSVC_NET))
     QSKIP("Regression caused by QHOstInfo change 294548, see task 202231.", SkipAll);
 #endif
     QTcpSocket sock;
-    sock.connectToHost("localhost", TEST_PORT);
+    sock.connectToHost(QHostAddress::LocalHost, TEST_PORT);
 
     const bool connectionSuccess = sock.waitForConnected();
     if(!connectionSuccess) {
diff --git a/tests/auto/qxmlstream/qxmlstream.pro b/tests/auto/qxmlstream/qxmlstream.pro
index 46eed566ce..ac03d421d1 100644
--- a/tests/auto/qxmlstream/qxmlstream.pro
+++ b/tests/auto/qxmlstream/qxmlstream.pro
@@ -4,7 +4,7 @@ SOURCES += tst_qxmlstream.cpp
 QT = core xml network
 
 
-wince*: {
+wince*|symbian*: {
    addFiles.sources = data XML-Test-Suite
    addFiles.path = .
    DEPLOYMENT += addFiles
diff --git a/tests/auto/qzip/qzip.pro b/tests/auto/qzip/qzip.pro
index 17b95436dd..632c743f1a 100644
--- a/tests/auto/qzip/qzip.pro
+++ b/tests/auto/qzip/qzip.pro
@@ -1,11 +1,11 @@
 load(qttest_p4)
 SOURCES += tst_qzip.cpp
 
-wince*: {
+wince*|symbian: {
    addFiles.sources = testdata
    addFiles.path = .
    DEPLOYMENT += addFiles
-   DEFINES += SRCDIR=\\\".\\\"
+   !symbian:DEFINES += SRCDIR=\\\".\\\"
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
diff --git a/tests/auto/qzip/tst_qzip.cpp b/tests/auto/qzip/tst_qzip.cpp
index 76cf954d30..0e248babae 100644
--- a/tests/auto/qzip/tst_qzip.cpp
+++ b/tests/auto/qzip/tst_qzip.cpp
@@ -44,6 +44,10 @@
 #include <private/qzipwriter_p.h>
 #include <private/qzipreader_p.h>
 
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR "."
+#endif
+
 class tst_QZip : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/symbian/orientationchange/orientationchange.pro b/tests/auto/symbian/orientationchange/orientationchange.pro
new file mode 100644
index 0000000000..d240fa1a48
--- /dev/null
+++ b/tests/auto/symbian/orientationchange/orientationchange.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+HEADERS += 
+SOURCES += tst_orientationchange.cpp
+
+symbian {   
+    INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+}
diff --git a/tests/auto/symbian/orientationchange/tst_orientationchange.cpp b/tests/auto/symbian/orientationchange/tst_orientationchange.cpp
new file mode 100644
index 0000000000..9d57ae1c96
--- /dev/null
+++ b/tests/auto/symbian/orientationchange/tst_orientationchange.cpp
@@ -0,0 +1,165 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#ifdef Q_OS_SYMBIAN
+
+#include <eikenv.h>
+#include <aknappui.h>
+
+class tst_orientationchange : public QObject
+{
+    Q_OBJECT
+public:
+    tst_orientationchange(){};
+    ~tst_orientationchange(){};
+
+private slots:
+    void resizeEventOnOrientationChange();
+};
+
+class TestWidget : public QWidget
+{
+public:
+    TestWidget(QWidget *parent = 0);
+    
+    void reset();
+public:
+    void resizeEvent(QResizeEvent *event);
+    
+public:
+    QSize resizeEventSize;
+    int resizeEventCount;
+};
+
+TestWidget::TestWidget(QWidget *parent)
+: QWidget(parent)
+{
+    reset();
+}
+
+void TestWidget::reset()
+{
+    resizeEventSize = QSize();
+    resizeEventCount = 0;
+}
+
+void TestWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    
+    // Size delivered in first resize event is stored.
+    if (!resizeEventCount) 
+        resizeEventSize = event->size();
+
+    resizeEventCount++;    
+}
+
+void tst_orientationchange::resizeEventOnOrientationChange()
+{
+    // This will test that when orientation 'changes', then
+    // at most one resize event is generated.
+    
+    TestWidget *normalWidget = new TestWidget();
+    TestWidget *fullScreenWidget = new TestWidget();
+    TestWidget *maximizedWidget = new TestWidget();
+    
+    fullScreenWidget->showFullScreen();
+    maximizedWidget->showMaximized();
+    normalWidget->show();
+    
+    QCoreApplication::sendPostedEvents();
+    QCoreApplication::sendPostedEvents();
+    
+    QCOMPARE(fullScreenWidget->resizeEventCount, 1);
+    QCOMPARE(fullScreenWidget->size(), fullScreenWidget->resizeEventSize);
+    QCOMPARE(maximizedWidget->resizeEventCount, 1);
+    QCOMPARE(maximizedWidget->size(), maximizedWidget->resizeEventSize);
+    QCOMPARE(normalWidget->resizeEventCount, 1);
+    QCOMPARE(normalWidget->size(), normalWidget->resizeEventSize);
+    
+    fullScreenWidget->reset();
+    maximizedWidget->reset();
+    normalWidget->reset();
+    
+    // Assumes that Qt application is AVKON application.
+    CAknAppUi *appUi = static_cast<CAknAppUi*>(CEikonEnv::Static()->EikAppUi());
+    
+    // Determine 'opposite' orientation to the current orientation.
+    
+    CAknAppUi::TAppUiOrientation orientation = CAknAppUi::EAppUiOrientationLandscape;
+    if (fullScreenWidget->size().width() > fullScreenWidget->size().height()) {
+        orientation = CAknAppUi::EAppUiOrientationPortrait;
+    }
+    
+    TRAPD(err, appUi->SetOrientationL(orientation));
+
+    QCoreApplication::sendPostedEvents();
+    QCoreApplication::sendPostedEvents();
+
+    // setOrientationL is not guaranteed to change orientation 
+    // (if emulator configured to support just portrait or landscape, then 
+    //  setOrientationL call shouldn't do anything).
+    // So let's ensure that we do not get resize event twice.
+
+    QVERIFY(fullScreenWidget->resizeEventCount <= 1);
+    if (fullScreenWidget->resizeEventCount) {
+        QCOMPARE(fullScreenWidget->size(), fullScreenWidget->resizeEventSize);
+    }
+    QVERIFY(maximizedWidget->resizeEventCount <= 1);
+    if (fullScreenWidget->resizeEventCount) {
+        QCOMPARE(maximizedWidget->size(), maximizedWidget->resizeEventSize);
+    }
+    QCOMPARE(normalWidget->resizeEventCount, 0);
+    
+    TRAP(err, appUi->SetOrientationL(CAknAppUi::EAppUiOrientationUnspecified));
+    
+    delete normalWidget;
+    delete fullScreenWidget;
+    delete maximizedWidget;
+}
+
+QTEST_MAIN(tst_orientationchange)
+#include "tst_orientationchange.moc"
+#else
+QTEST_NOOP_MAIN
+#endif
diff --git a/tests/auto/symbian/qmainexceptions/qmainexceptions.pro b/tests/auto/symbian/qmainexceptions/qmainexceptions.pro
new file mode 100644
index 0000000000..7533dd4e49
--- /dev/null
+++ b/tests/auto/symbian/qmainexceptions/qmainexceptions.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+HEADERS += 
+SOURCES += tst_qmainexceptions.cpp
+
+
diff --git a/tests/auto/symbian/qmainexceptions/tst_qmainexceptions.cpp b/tests/auto/symbian/qmainexceptions/tst_qmainexceptions.cpp
new file mode 100644
index 0000000000..adad544c3d
--- /dev/null
+++ b/tests/auto/symbian/qmainexceptions/tst_qmainexceptions.cpp
@@ -0,0 +1,318 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <e32base.h>
+
+#ifdef Q_OS_SYMBIAN
+
+typedef void TLeavingFunc();
+
+class tst_qmainexceptions : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmainexceptions(){};
+    ~tst_qmainexceptions(){};
+
+    void TestSchedulerCatchesError(TLeavingFunc* f, int error);
+    void TestSymbianRoundTrip(int leave, int trap);
+
+    bool event(QEvent *event);
+
+public slots:
+    void initTestCase();
+private slots:
+    void trap();
+    void cleanupstack();
+    void leave();
+    void testTranslateBadAlloc();
+    void testTranslateBigAlloc();
+    void testRoundTrip();
+    void testTrap();
+    void testPropagation();
+    void testDtor1();
+    void testDtor2();
+    void testNestedExceptions();
+};
+
+class CDummy : public CBase
+{
+public:
+    CDummy(){}
+    ~CDummy(){}
+};
+
+void tst_qmainexceptions::initTestCase()
+{
+}
+
+void tst_qmainexceptions::trap()
+{
+    TTrapHandler *th= User::TrapHandler();
+    QVERIFY((int)th);
+}
+
+void tst_qmainexceptions::cleanupstack()
+{
+    __UHEAP_MARK;
+    //fails if OOM
+    CDummy* dummy1 = new (ELeave) CDummy;
+    __UHEAP_CHECK(1);
+    CleanupStack::PushL(dummy1);
+    CleanupStack::PopAndDestroy(dummy1);
+    __UHEAP_MARKEND;
+}
+
+void tst_qmainexceptions::leave()
+{
+    __UHEAP_MARK;
+    CDummy* dummy1 = 0;
+    TRAPD(err,{
+        CDummy* csDummy = new (ELeave) CDummy;
+        CleanupStack::PushL(csDummy);
+        __UHEAP_FAILNEXT(1);
+        dummy1 = new (ELeave) CDummy;
+        //CleanupStack::PopAndDestroy(csDummy); not executed as previous line throws
+    });
+    QCOMPARE(err,KErrNoMemory);
+    QVERIFY(!((int)dummy1));
+    __UHEAP_MARKEND;
+}
+
+class CTestActive : public CActive
+{
+public:
+    CTestActive(TLeavingFunc* aFunc) : CActive(EPriorityStandard), iFunc(aFunc)
+    {
+        CActiveScheduler::Add(this);
+    }
+    ~CTestActive()
+    {
+        Cancel();
+    }
+    void DoCancel() {}
+    void Test()
+    {
+        // complete this AO in a nested scheduler, to make it synchronous
+        TRequestStatus* s = &iStatus;
+        SetActive();
+        User::RequestComplete(s, KErrNone);
+        CActiveScheduler::Start();
+    }
+    void RunL()
+    {
+        (*iFunc)();
+        CActiveScheduler::Stop();   // will only get here if iFunc does not leave
+    }
+    TInt RunError(TInt aError)
+    {
+        error = aError;
+        CActiveScheduler::Stop();   // will only get here if iFunc leaves
+        return KErrNone;
+    }
+public:
+    TLeavingFunc* iFunc;
+    int error;
+};
+
+void tst_qmainexceptions::TestSchedulerCatchesError(TLeavingFunc* f, int error)
+{
+    CTestActive *act = new(ELeave) CTestActive(f);
+    act->Test();
+    QCOMPARE(act->error, error);
+    delete act;
+}
+
+void ThrowBadAlloc()
+{
+    throw std::bad_alloc();
+}
+
+void TranslateThrowBadAllocL()
+{
+    QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(ThrowBadAlloc());
+}
+
+void tst_qmainexceptions::testTranslateBadAlloc()
+{
+    // bad_alloc should give KErrNoMemory in an AO
+    TestSchedulerCatchesError(&TranslateThrowBadAllocL, KErrNoMemory);
+}
+
+void BigAlloc()
+{
+    int *x = new int[100000000];
+    delete [] x;
+}
+
+void TranslateBigAllocL()
+{
+    QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE(BigAlloc());
+}
+
+void tst_qmainexceptions::testTranslateBigAlloc()
+{
+    // this test will fail if new does not throw on failure, otherwise should give KErrNoMemory in AO
+    TestSchedulerCatchesError(&TranslateBigAllocL, KErrNoMemory);
+}
+
+void tst_qmainexceptions::TestSymbianRoundTrip(int leave, int trap)
+{
+    // check that leave converted to exception, converted to error gives expected error code
+    int trapped;
+    QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_ERROR(
+        trapped,
+        QT_TRANSLATE_SYMBIAN_LEAVE_TO_EXCEPTION(
+            User::LeaveIfError(leave)));
+    QCOMPARE(trap, trapped);
+}
+
+void tst_qmainexceptions::testRoundTrip()
+{
+    for (int e=-50; e<0; e++)
+        TestSymbianRoundTrip(e, e);
+    TestSymbianRoundTrip(KErrNone, KErrNone);
+    // positive error codes are not errors
+    TestSymbianRoundTrip(1, KErrNone);
+    TestSymbianRoundTrip(1000000000, KErrNone);
+}
+
+void tst_qmainexceptions::testTrap()
+{
+    // testing qt_translateExceptionToSymbianErrorL
+    TRAPD(err, qt_translateExceptionToSymbianErrorL(std::bad_alloc()));
+    QCOMPARE(err, KErrNoMemory);
+}
+
+bool tst_qmainexceptions::event(QEvent *aEvent)
+{
+    if (aEvent->type() == QEvent::User+1)
+        throw std::bad_alloc();
+    else if (aEvent->type() == QEvent::User+2) {
+        QEvent event(QEvent::Type(QEvent::User+1));
+        QApplication::sendEvent(this, &event);
+    }
+    return QObject::event(aEvent);
+}
+
+void tst_qmainexceptions::testPropagation()
+{
+    // test exception thrown from event is propagated back to sender
+    QEvent event(QEvent::Type(QEvent::User+1));
+    bool caught = false;
+    try {
+        QApplication::sendEvent(this, &event);
+    } catch (const std::bad_alloc&) {
+        caught = true;
+    }
+    QCOMPARE(caught, true);
+
+    // testing nested events propagate back to top level sender
+    caught = false;
+    QEvent event2(QEvent::Type(QEvent::User+2));
+    try {
+        QApplication::sendEvent(this, &event2);
+    } catch (const std::bad_alloc&) {
+        caught = true;
+    }
+    QCOMPARE(caught, true);
+}
+
+void tst_qmainexceptions::testDtor1()
+{
+    // destructors work on exception
+    int i = 0;
+    struct SAutoInc {
+        SAutoInc(int& aI) : i(aI) { ++i; }
+        ~SAutoInc() { --i; }
+        int &i;
+    } ai(i);
+    QCOMPARE(i, 1);
+    try {
+        SAutoInc ai2(i);
+        QCOMPARE(i, 2);
+        throw std::bad_alloc();
+        QFAIL("should not get here");
+    } catch (const std::bad_alloc&) {
+        QCOMPARE(i, 1);
+    }
+    QCOMPARE(i, 1);
+}
+
+void tst_qmainexceptions::testDtor2()
+{
+    // memory is cleaned up correctly on exception
+    // this crashes with winscw compiler build < 481
+    __UHEAP_MARK;
+    try {
+        QString str("abc");
+        str += "def";
+        throw std::bad_alloc();
+        QFAIL("should not get here");
+    } catch (const std::bad_alloc&) { }
+    __UHEAP_MARKEND;
+}
+
+void tst_qmainexceptions::testNestedExceptions()
+{
+    // throwing exceptions while handling exceptions
+    struct Oops {
+        Oops* next;
+        Oops(int level) : next(level > 0 ? new Oops(level-1) : 0) {}
+        ~Oops() {
+            try { throw std::bad_alloc(); }
+            catch (const std::exception&) {delete next;}
+        }
+    };
+    try {
+        Oops oops(5);
+        throw std::bad_alloc();
+    }
+    catch (const std::exception&) {}
+}
+
+
+QTEST_MAIN(tst_qmainexceptions)
+#include "tst_qmainexceptions.moc"
+#else
+QTEST_NOOP_MAIN
+#endif
diff --git a/tests/auto/symbian/qsymbiantests.pro b/tests/auto/symbian/qsymbiantests.pro
new file mode 100644
index 0000000000..648335ee81
--- /dev/null
+++ b/tests/auto/symbian/qsymbiantests.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = qmainexceptions orientationchange
\ No newline at end of file
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
index 2069d031f2..796f635dc0 100644
--- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
+++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
@@ -102,6 +102,8 @@ tst_XmlPatterns::tst_XmlPatterns() : m_generatedTests(0)
                                    , m_command(QLatin1String("xmlpatterns"))
                                    , m_dontRun(false)
 {
+    Q_SET_DEFAULT_IAP
+
     Q_ASSERT(m_normalizeTestName.isValid());
     Q_ASSERT(m_filenameInStderr.isValid());
 }
diff --git a/tests/benchmarks/qfile/main.cpp b/tests/benchmarks/qfile/main.cpp
index 5360eb5d93..f1c1e26163 100644
--- a/tests/benchmarks/qfile/main.cpp
+++ b/tests/benchmarks/qfile/main.cpp
@@ -1,5 +1,10 @@
 /****************************************************************************
 **
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+****************************************************************************/
+
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/benchmarks/qgraphicsview/benchapps/scrolltest/main.cpp b/tests/benchmarks/qgraphicsview/benchapps/scrolltest/main.cpp
index 841b027623..0e7d899341 100644
--- a/tests/benchmarks/qgraphicsview/benchapps/scrolltest/main.cpp
+++ b/tests/benchmarks/qgraphicsview/benchapps/scrolltest/main.cpp
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
 #if 0
     ItemMover mover(scrollItem);
 #endif
-    
+
     CountView view;
     view.setScene(&scene);
     view.setSceneRect(-25, -25, 150, 150);
diff --git a/tests/benchmarks/qiodevice/main.cpp b/tests/benchmarks/qiodevice/main.cpp
index 5a8c9c7112..098608323e 100644
--- a/tests/benchmarks/qiodevice/main.cpp
+++ b/tests/benchmarks/qiodevice/main.cpp
@@ -66,8 +66,10 @@ void tst_qiodevice::read_data()
     QTest::newRow("100k")     << qint64(100 * 1024);
     QTest::newRow("1000k")    << qint64(1000 * 1024);
     QTest::newRow("10000k")   << qint64(10000 * 1024);
+#ifndef Q_OS_SYMBIAN // Symbian devices don't (yet) have enough available RAM to run these
     QTest::newRow("100000k")  << qint64(100000 * 1024);
     QTest::newRow("1000000k") << qint64(1000000 * 1024);
+#endif
 }
 
 void tst_qiodevice::read_old()
diff --git a/tests/benchmarks/qiodevice/qiodevice.pro b/tests/benchmarks/qiodevice/qiodevice.pro
index 59b63022dc..749a4d68d3 100755
--- a/tests/benchmarks/qiodevice/qiodevice.pro
+++ b/tests/benchmarks/qiodevice/qiodevice.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 TEMPLATE = app
 TARGET = tst_qiodevice
+TARGET.EPOCHEAPSIZE = 0x100000 0x2000000
 DEPENDPATH += .
 INCLUDEPATH += .
 
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index eeec62a8b5..14a5a95017 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -6,7 +6,10 @@ CONFIG   -= moc qt
 DEFINES  = UNICODE QT_NODLL QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NO_STL QT_NO_COMPRESS QT_BUILD_QMAKE QT_NO_THREAD QT_NO_QOBJECT _CRT_SECURE_NO_DEPRECATE
 
 
-win32 : LIBS += -lole32 -ladvapi32
+win32 : !win32-mwc : LIBS += -lole32 -ladvapi32
+win32-mwc {
+    LIBS += -ladvapi32.lib -luuid.lib
+}
 win32-msvc.net | win32-msvc2* : QMAKE_CXXFLAGS += /EHsc
 win32-g++ : LIBS += -luuid
 
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index c938919287..510e3660e7 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -303,13 +303,16 @@ Configure::Configure( int& argc, char** argv )
     dictionary[ "LIBJPEG" ]         = "auto";
     dictionary[ "LIBPNG" ]          = "auto";
     dictionary[ "LIBMNG" ]          = "auto";
+    dictionary[ "FREETYPE" ]        = "no";
 
     dictionary[ "QT3SUPPORT" ]      = "yes";
     dictionary[ "ACCESSIBILITY" ]   = "yes";
     dictionary[ "OPENGL" ]          = "yes";
+    dictionary[ "OPENVG" ]          = "no";
     dictionary[ "IPV6" ]            = "yes"; // Always, dynamicly loaded
     dictionary[ "OPENSSL" ]         = "auto";
     dictionary[ "DBUS" ]            = "auto";
+    dictionary[ "S60" ]             = "yes";
 
     dictionary[ "STYLE_WINDOWS" ]   = "yes";
     dictionary[ "STYLE_WINDOWSXP" ] = "auto";
@@ -320,6 +323,7 @@ Configure::Configure( int& argc, char** argv )
     dictionary[ "STYLE_WINDOWSMOBILE" ] = "no";
     dictionary[ "STYLE_MOTIF" ]     = "yes";
     dictionary[ "STYLE_CDE" ]       = "yes";
+    dictionary[ "STYLE_S60" ]       = "no";
     dictionary[ "STYLE_GTK" ]       = "no";
 
     dictionary[ "SQL_MYSQL" ]       = "no";
@@ -428,7 +432,7 @@ void Configure::parseCmdLine()
     }
 
     for( ; i<configCmdLine.size(); ++i ) {
-        bool continueElse = false;
+        bool continueElse[] = {false, false};
         if( configCmdLine.at(i) == "-help"
             || configCmdLine.at(i) == "-h"
             || configCmdLine.at(i) == "-?" )
@@ -579,6 +583,13 @@ void Configure::parseCmdLine()
             dictionary[ "MNG" ] = "qt";
             dictionary[ "LIBMNG" ] = "system";
         }
+
+        // Text Rendering --------------------------------------------
+        else if( configCmdLine.at(i) == "-no-freetype" )
+            dictionary[ "FREETYPE" ] = "no";
+        else if( configCmdLine.at(i) == "-qt-freetype" )
+            dictionary[ "FREETYPE" ] = "yes";
+
         // CE- C runtime --------------------------------------------
         else if( configCmdLine.at(i) == "-crt" ) {
             ++i;
@@ -661,14 +672,19 @@ void Configure::parseCmdLine()
         else if( configCmdLine.at(i) == "-no-style-cde" )
             dictionary[ "STYLE_CDE" ] = "no";
 
+        else if( configCmdLine.at(i) == "-qt-style-s60" )
+            dictionary[ "STYLE_S60" ] = "yes";
+        else if( configCmdLine.at(i) == "-no-style-s60" )
+            dictionary[ "STYLE_S60" ] = "no";
+
         // Qt 3 Support ---------------------------------------------
         else if( configCmdLine.at(i) == "-no-qt3support" )
             dictionary[ "QT3SUPPORT" ] = "no";
 
         // Work around compiler nesting limitation
         else
-            continueElse = true;
-        if (!continueElse) {
+            continueElse[1] = true;
+        if (!continueElse[1]) {
         }
 
         // OpenGL Support -------------------------------------------
@@ -684,6 +700,14 @@ void Configure::parseCmdLine()
             dictionary[ "OPENGL" ]          = "yes";
             dictionary[ "OPENGL_ES_2" ]     = "yes";
         }
+
+        // OpenVG Support -------------------------------------------
+        else if( configCmdLine.at(i) == "-openvg" ) {
+            dictionary[ "OPENVG" ]    = "yes";
+        } else if( configCmdLine.at(i) == "-no-openvg" ) {
+            dictionary[ "OPENVG" ]    = "no";
+        }
+
         // Databases ------------------------------------------------
         else if( configCmdLine.at(i) == "-qt-sql-mysql" )
             dictionary[ "SQL_MYSQL" ] = "yes";
@@ -771,6 +795,20 @@ void Configure::parseCmdLine()
             dictionary[ "INCREDIBUILD_XGE" ] = "yes";
 #if !defined(EVAL)
         // Others ---------------------------------------------------
+        else if (configCmdLine.at(i) == "-fpu" )
+        {
+            ++i;
+            if(i==argCount)
+                break;
+            dictionary[ "ARM_FPU_TYPE" ] = configCmdLine.at(i);
+        }
+
+        // S60 Support -------------------------------------------
+        else if( configCmdLine.at(i) == "-s60" )
+            dictionary[ "S60" ]    = "yes";
+        else if( configCmdLine.at(i) == "-no-s60" )
+            dictionary[ "S60" ]    = "no";
+
         else if (configCmdLine.at(i) == "-fast" )
             dictionary[ "FAST" ] = "yes";
         else if (configCmdLine.at(i) == "-no-fast" )
@@ -863,6 +901,12 @@ void Configure::parseCmdLine()
             dictionary[ "PLUGIN_MANIFESTS" ] = "yes";
         }
 
+        // Work around compiler nesting limitation
+        else
+            continueElse[0] = true;
+        if (!continueElse[0]) {
+        }
+
         else if( configCmdLine.at(i) == "-internal" )
             dictionary[ "QMAKE_INTERNAL" ] = "yes";
 
@@ -1037,7 +1081,9 @@ void Configure::parseCmdLine()
             if (i == argCount)
                 break;
             QString system = configCmdLine.at(i);
-            if (system == QLatin1String("raster") || system == QLatin1String("opengl"))
+            if (system == QLatin1String("raster")
+                || system == QLatin1String("opengl")
+                || system == QLatin1String("openvg"))
                 dictionary["GRAPHICS_SYSTEM"] = configCmdLine.at(i);
         }
 
@@ -1098,12 +1144,29 @@ void Configure::parseCmdLine()
             } else {
                 dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++";
             }
+        } else if ( dictionary[ "QMAKESPEC" ] == QString( "win32-mwc" ) ) {
+                dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-mwc";
+                dictionary[ "MAKE" ] = "make";
         } else {
             if ( dictionary[ "MAKE" ].isEmpty() ) dictionary[ "MAKE" ] = "make";
             dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
         }
     }
 
+    // Tell the user how to proceed building Qt after configure finished its job
+    dictionary["QTBUILDINSTRUCTION"] = dictionary["MAKE"];
+    if (dictionary.contains("XQMAKESPEC")) {
+        if (dictionary["XQMAKESPEC"].startsWith("symbian")) {
+            dictionary["QTBUILDINSTRUCTION"] = dictionary["MAKE"] + QString(" debug-winscw|debug-armv5|release-armv5");
+        } else if (dictionary["XQMAKESPEC"].startsWith("wince")) {
+            dictionary["QTBUILDINSTRUCTION"] =
+                QString("setcepaths.bat ") + dictionary["XQMAKESPEC"] + QString(" && ") + dictionary["MAKE"];
+        }
+    }
+
+    // Tell the user how to confclean before the next configure
+    dictionary["CONFCLEANINSTRUCTION"] = dictionary["MAKE"] + QString(" confclean");
+
     // Ensure that -spec (XQMAKESPEC) exists in the mkspecs folder as well
     if (dictionary.contains("XQMAKESPEC") &&
         !mkspecs.contains(dictionary["XQMAKESPEC"], Qt::CaseInsensitive)) {
@@ -1161,9 +1224,9 @@ void Configure::parseCmdLine()
 #if !defined(EVAL)
 void Configure::validateArgs()
 {
-    QStringList configs;
     // Validate the specified config
 
+    // Get all possible configurations from the file system.
     QDir dir;
     QStringList filters;
     filters << "qconfig-*.h";
@@ -1177,9 +1240,24 @@ void Configure::validateArgs()
         allConfigs << it->remove("qconfig-").remove(".h");
     allConfigs << "full";
 
+    // Try internal configurations first.
+    QStringList possible_configs = QStringList()
+        << "minimal"
+        << "small"
+        << "medium"
+        << "large"
+        << "full";
+    int index = possible_configs.indexOf(dictionary["QCONFIG"]);
+    if (index >= 0) {
+        for (int c = 0; c <= index; c++) {
+            qmakeConfig += possible_configs[c] + "-config";
+        }
+        return;
+    }
+
+    // If the internal configurations failed, try others.
     QStringList::Iterator config;
     for( config = allConfigs.begin(); config != allConfigs.end(); ++config ) {
-        configs += (*config) + "-config";
         if( (*config) == dictionary[ "QCONFIG" ] )
             break;
     }
@@ -1188,7 +1266,7 @@ void Configure::validateArgs()
         cout << "No such configuration \"" << qPrintable(dictionary[ "QCONFIG" ]) << "\"" << endl ;
     }
     else
-        qmakeConfig += configs;
+        qmakeConfig += (*config) + "-config";
 }
 #endif
 
@@ -1309,6 +1387,8 @@ void Configure::applySpecSpecifics()
         dictionary[ "STYLE_WINDOWSMOBILE" ] = "yes";
         dictionary[ "STYLE_MOTIF" ]         = "no";
         dictionary[ "STYLE_CDE" ]           = "no";
+        dictionary[ "STYLE_S60" ]           = "no";
+        dictionary[ "FREETYPE" ]            = "no";
         dictionary[ "QT3SUPPORT" ]          = "no";
         dictionary[ "OPENGL" ]              = "no";
         dictionary[ "OPENSSL" ]             = "no";
@@ -1335,6 +1415,49 @@ void Configure::applySpecSpecifics()
         dictionary[ "QT_HOST_PREFIX" ]      = dictionary[ "QT_INSTALL_PREFIX" ];
         dictionary[ "QT_INSTALL_PREFIX" ]   = "";
 
+    } else if(dictionary[ "XQMAKESPEC" ].startsWith("symbian")) {
+        dictionary[ "ACCESSIBILITY" ]       = "no";
+        dictionary[ "STYLE_WINDOWSXP" ]     = "no";
+        dictionary[ "STYLE_WINDOWSVISTA" ]  = "no";
+        dictionary[ "STYLE_PLASTIQUE" ]     = "no";
+        dictionary[ "STYLE_CLEANLOOKS" ]    = "no";
+        dictionary[ "STYLE_WINDOWSCE" ]     = "no";
+        dictionary[ "STYLE_WINDOWSMOBILE" ] = "no";
+        dictionary[ "STYLE_MOTIF" ]         = "no";
+        dictionary[ "STYLE_CDE" ]           = "no";
+        dictionary[ "STYLE_S60" ]           = "yes";
+        dictionary[ "FREETYPE" ]            = "no";
+        dictionary[ "QT3SUPPORT" ]          = "no";
+        dictionary[ "OPENGL" ]              = "no";
+        dictionary[ "OPENSSL" ]             = "yes";
+        dictionary[ "STL" ]                 = "yes";
+        dictionary[ "EXCEPTIONS" ]          = "yes";
+        dictionary[ "RTTI" ]                = "yes";
+        dictionary[ "ARCHITECTURE" ]        = "symbian";
+        dictionary[ "3DNOW" ]               = "no";
+        dictionary[ "SSE" ]                 = "no";
+        dictionary[ "SSE2" ]                = "no";
+        dictionary[ "MMX" ]                 = "no";
+        dictionary[ "IWMMXT" ]              = "no";
+        dictionary[ "CE_CRT" ]              = "no";
+        dictionary[ "DIRECT3D" ]            = "no";
+        dictionary[ "WEBKIT" ]              = "no";
+        dictionary[ "ASSISTANT_WEBKIT" ]    = "no";
+        dictionary[ "PHONON" ]              = "yes";
+        dictionary[ "XMLPATTERNS" ]         = "no";
+        dictionary[ "QT_GLIB" ]             = "no";
+        dictionary[ "S60" ]                 = "yes";
+        // iconv makes makes apps start and run ridiculously slowly in symbian emulator (HW not tested)
+        // iconv_open seems to return -1 always, so something is probably missing from the platform.
+        dictionary[ "QT_ICONV" ]            = "no";
+        dictionary[ "SCRIPTTOOLS" ]         = "no";
+        dictionary[ "QT_HOST_PREFIX" ]      = dictionary[ "QT_INSTALL_PREFIX" ];
+        dictionary[ "QT_INSTALL_PREFIX" ]   = "";
+        dictionary[ "QT_INSTALL_PLUGINS" ]  = "\\resource\\qt\\plugins";
+        dictionary[ "ARM_FPU_TYPE" ]        = "softvfp";
+        dictionary[ "SQL_SQLITE" ]          = "yes";
+        dictionary[ "SQL_SQLITE_LIB" ]      = "system";
+
     } else if(dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong.
       //TODO
         dictionary[ "STYLE_WINDOWSXP" ]     = "no";
@@ -1427,7 +1550,7 @@ bool Configure::displayHelp()
                     "[-phonon] [-no-phonon-backend] [-phonon-backend]\n"
                     "[-no-webkit] [-webkit]\n"
                     "[-no-scripttools] [-scripttools]\n"
-                    "[-graphicssystem raster|opengl]\n\n", 0, 7);
+                    "[-graphicssystem raster|opengl|openvg]\n\n", 0, 7);
 
         desc("Installation options:\n\n");
 
@@ -1509,6 +1632,11 @@ bool Configure::displayHelp()
         desc("QT3SUPPORT", "no","-no-qt3support",       "Disables the Qt 3 support functionality.\n");
         desc("OPENGL", "no","-no-opengl",               "Disables OpenGL functionality\n");
 
+        desc("OPENVG", "no","-no-openvg",               "Disables OpenVG functionality\n");
+        desc("OPENVG", "yes","-openvg",                 "Enables OpenVG functionality");
+        desc(                   "",                     "Requires EGL support, typically supplied by an OpenGL", false, ' ');
+        desc(                   "",                     "or other graphics implementation\n", false, ' ');
+
 #endif
         desc(                   "-platform <spec>",     "The operating system and compiler you are building on.\n(default %QMAKESPEC%)\n");
         desc(                   "-xplatform <spec>",    "The operating system and compiler you are cross compiling to.\n");
@@ -1526,6 +1654,7 @@ bool Configure::displayHelp()
                                 "Available values for <sys>:");
         desc("GRAPHICS_SYSTEM", "raster", "", "  raster - Software rasterizer", ' ');
         desc("GRAPHICS_SYSTEM", "opengl", "", "  opengl - Using OpenGL acceleration, experimental!", ' ');
+        desc("GRAPHICS_SYSTEM", "openvg", "", "  openvg - Using OpenVG acceleration, experimental!", ' ');
 
 
         desc(                   "-help, -h, -?",        "Display this information.\n");
@@ -1608,6 +1737,7 @@ bool Configure::displayHelp()
                                                         "Available values for <arch>:");
         desc("ARCHITECTURE","windows",       "",        "  windows", ' ');
         desc("ARCHITECTURE","windowsce",     "",        "  windowsce", ' ');
+        desc("ARCHITECTURE","symbian",     "",          "  symbian", ' ');
         desc("ARCHITECTURE","boundschecker",     "",    "  boundschecker", ' ');
         desc("ARCHITECTURE","generic", "",              "  generic\n", ' ');
 
@@ -1622,7 +1752,8 @@ bool Configure::displayHelp()
         desc("STYLE_MOTIF", "yes", "",                  "  motif", ' ');
         desc("STYLE_CDE", "yes", "",                    "  cde", ' ');
         desc("STYLE_WINDOWSCE", "yes", "",              "  windowsce", ' ');
-        desc("STYLE_WINDOWSMOBILE" , "yes", "",         "  windowsmobile\n", ' ');
+        desc("STYLE_WINDOWSMOBILE" , "yes", "",         "  windowsmobile", ' ');
+        desc("STYLE_S60" , "yes", "",                   "  s60\n", ' ');
 
 /*      We do not support -qconfig on Windows yet
 
@@ -1651,6 +1782,13 @@ bool Configure::displayHelp()
         desc("OPENGL_ES_2",  "no", "-opengl-es-2",         "Enable support for OpenGL ES 2.0");
         desc("DIRECTSHOW", "no",   "-phonon-wince-ds9",    "Enable Phonon Direct Show 9 backend for Windows CE");
 
+        // Qt\Symbian only options go below here -----------------------------------------------------------------------------
+        desc("Qt for Symbian OS only:\n\n");
+        desc("FREETYPE", "no",     "-no-freetype",         "Do not compile in Freetype2 support.");
+        desc("FREETYPE", "yes",    "-qt-freetype",         "Use the libfreetype bundled with Qt.");
+        desc(                      "-fpu <flags>",         "VFP type on ARM, supported options: softvfp(default) | vfpv2 | softvfp+vfpv2");
+        desc("S60", "no",          "-no-s60",              "Do not compile in S60 support.");
+        desc("S60", "yes",         "-s60",                 "Compile with support for the S60 UI Framework\n");
         return true;
     }
     return false;
@@ -1794,12 +1932,21 @@ bool Configure::checkAvailability(const QString &part)
     else if (part == "SQL_DB2")
         available = findFile("sqlcli.h") && findFile("sqlcli1.h") && findFile("db2cli.lib");
     else if (part == "SQL_SQLITE")
+        if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian"))
+            available = false; // In Symbian we only support system sqlite option
+        else
             available = true; // Built in, we have a fork
     else if (part == "SQL_SQLITE_LIB") {
         if (dictionary[ "SQL_SQLITE_LIB" ] == "system") {
-            available = findFile("sqlite3.h") && findFile("sqlite3.lib");
-            if (available)
-                dictionary[ "QT_LFLAGS_SQLITE" ] += "sqlite3.lib";
+		    // Symbian has multiple .lib/.dll files we need to find
+            if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
+			    available = true; // There is sqlite_symbian plugin which exports the necessary stuff
+			    dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3";
+		    } else {
+			    available = findFile("sqlite3.h") && findFile("sqlite3.lib");
+			    if (available)
+				    dictionary[ "QT_LFLAGS_SQLITE" ] += "sqlite3.lib";
+		    }
         } else
             available = true;
     } else if (part == "SQL_SQLITE2")
@@ -1998,6 +2145,15 @@ bool Configure::verifyConfiguration()
         if(_getch() == 3) // _Any_ keypress w/no echo(eat <Enter> for stdout)
             exit(0);      // Exit cleanly for Ctrl+C
     }
+	if (0 != dictionary["ARM_FPU_TYPE"].size())
+	{
+		QStringList l= QStringList()
+			<< "softvfp"
+			<< "softvfp+vfpv2"
+			<< "vfpv2";
+		if (!(l.contains(dictionary["ARM_FPU_TYPE"])))
+			cout << QString("WARNING: Using unsupported fpu flag: %1").arg(dictionary["ARM_FPU_TYPE"]) << endl;
+	}
 
     return true;
 }
@@ -2144,6 +2300,10 @@ void Configure::generateOutputVars()
     if( dictionary[ "LIBMNG" ] == "system" )
         qtConfig += "system-mng";
 
+    // Text rendering --------------------------------------------------
+    if( dictionary[ "FREETYPE" ] == "yes" )
+        qtConfig += "freetype";
+
     // Styles -------------------------------------------------------
     if ( dictionary[ "STYLE_WINDOWS" ] == "yes" )
         qmakeStyles += "windows";
@@ -2175,6 +2335,9 @@ void Configure::generateOutputVars()
     if ( dictionary[ "STYLE_CDE" ] == "yes" )
         qmakeStyles += "cde";
 
+    if ( dictionary[ "STYLE_S60" ] == "yes" )
+        qmakeStyles += "s60";
+
     // Databases ----------------------------------------------------
     if ( dictionary[ "SQL_MYSQL" ] == "yes" )
         qmakeSql += "mysql";
@@ -2269,6 +2432,15 @@ void Configure::generateOutputVars()
         qtConfig += "opengles1cl";
     }
 
+    if ( dictionary["OPENVG"] == "yes" ) {
+        qtConfig += "openvg";
+        qtConfig += "egl";
+    }
+
+    if ( dictionary["S60"] == "yes" ) {
+        qtConfig += "s60";
+    }
+
      if ( dictionary["DIRECTSHOW"] == "yes" )
         qtConfig += "directshow";
 
@@ -2325,6 +2497,9 @@ void Configure::generateOutputVars()
         }
     }
 
+    if (dictionary.contains("XQMAKESPEC") && ( dictionary["QMAKESPEC"] != dictionary["XQMAKESPEC"] ) )
+            qmakeConfig += "cross_compile";
+
     // Directories and settings for .qmake.cache --------------------
 
     // if QT_INSTALL_* have not been specified on commandline, define them now from QT_INSTALL_PREFIX
@@ -2365,8 +2540,12 @@ void Configure::generateOutputVars()
         qmakeVars += QString("INCLUDEPATH    += ") + qmakeIncludes.join( " " );
     if (!opensslLibs.isEmpty())
         qmakeVars += opensslLibs;
-    else if (dictionary[ "OPENSSL" ] == "linked")
-        qmakeVars += QString("OPENSSL_LIBS    = -lssleay32 -llibeay32");
+    else if (dictionary[ "OPENSSL" ] == "linked") {
+    	if(dictionary[ "XQMAKESPEC" ].startsWith("symbian") )
+            qmakeVars += QString("OPENSSL_LIBS    = -llibssl -llibcrypto");
+        else
+            qmakeVars += QString("OPENSSL_LIBS    = -lssleay32 -llibeay32");
+        }
     if (!qmakeSql.isEmpty())
         qmakeVars += QString("sql-drivers    += ") + qmakeSql.join( " " );
     if (!qmakeSqlPlugins.isEmpty())
@@ -2530,6 +2709,10 @@ void Configure::generateCachefile()
         if (!dictionary["QT_LIBINFIX"].isEmpty())
             configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl;
 
+        if(!dictionary["ARM_FPU_TYPE"].isEmpty()) {
+            configStream<<"QMAKE_CXXFLAGS.ARMCC += --fpu "<< dictionary["ARM_FPU_TYPE"];
+        }
+
         configStream.flush();
         configFile.close();
     }
@@ -2569,6 +2752,18 @@ QString Configure::addDefine(QString def)
 }
 
 #if !defined(EVAL)
+// ### This should be removed once Qt for S60 is out.
+static void applyTemporarySymbianFlags(QStringList &qconfigList)
+{
+    qconfigList += "QT_NO_CONCURRENT";
+    qconfigList += "QT_NO_QFUTURE";
+    // This is removed because it uses UNIX signals which are not implemented yet
+    qconfigList += "QT_NO_CRASHHANDLER";
+    qconfigList += "QT_NO_PRINTER";
+    qconfigList += "QT_NO_CURSOR";
+    qconfigList += "QT_NO_SYSTEMTRAYICON";
+}
+
 void Configure::generateConfigfiles()
 {
     QDir(buildPath).mkpath("src/corelib/global");
@@ -2638,6 +2833,7 @@ void Configure::generateConfigfiles()
         if(dictionary["STYLE_WINDOWSVISTA"] != "yes")   qconfigList += "QT_NO_STYLE_WINDOWSVISTA";
         if(dictionary["STYLE_MOTIF"] != "yes")       qconfigList += "QT_NO_STYLE_MOTIF";
         if(dictionary["STYLE_CDE"] != "yes")         qconfigList += "QT_NO_STYLE_CDE";
+        if(dictionary["STYLE_S60"] != "yes")         qconfigList += "QT_NO_STYLE_S60";
         if(dictionary["STYLE_WINDOWSCE"] != "yes")   qconfigList += "QT_NO_STYLE_WINDOWSCE";
         if(dictionary["STYLE_WINDOWSMOBILE"] != "yes")   qconfigList += "QT_NO_STYLE_WINDOWSMOBILE";
         if(dictionary["STYLE_GTK"] != "yes")         qconfigList += "QT_NO_STYLE_GTK";
@@ -2652,10 +2848,10 @@ void Configure::generateConfigfiles()
             qconfigList += "QT_NO_COMPRESS";
         }
 
-        if(dictionary["QT3SUPPORT"] == "no")        qconfigList += "QT_NO_QT3SUPPORT";
         if(dictionary["ACCESSIBILITY"] == "no")     qconfigList += "QT_NO_ACCESSIBILITY";
         if(dictionary["EXCEPTIONS"] == "no")        qconfigList += "QT_NO_EXCEPTIONS";
         if(dictionary["OPENGL"] == "no")            qconfigList += "QT_NO_OPENGL";
+        if(dictionary["OPENVG"] == "no")            qconfigList += "QT_NO_OPENVG";
         if(dictionary["OPENSSL"] == "no")           qconfigList += "QT_NO_OPENSSL";
         if(dictionary["OPENSSL"] == "linked")       qconfigList += "QT_LINKED_OPENSSL";
         if(dictionary["DBUS"] == "no")              qconfigList += "QT_NO_DBUS";
@@ -2664,6 +2860,8 @@ void Configure::generateConfigfiles()
         if(dictionary["PHONON"] == "no")            qconfigList += "QT_NO_PHONON";
         if(dictionary["XMLPATTERNS"] == "no")       qconfigList += "QT_NO_XMLPATTERNS";
         if(dictionary["SCRIPTTOOLS"] == "no")       qconfigList += "QT_NO_SCRIPTTOOLS";
+        if(dictionary["FREETYPE"] == "no")          qconfigList += "QT_NO_FREETYPE";
+        if(dictionary["S60"] == "no")               qconfigList += "QT_NO_S60";
 
         if(dictionary["OPENGL_ES_CM"] == "yes" ||
            dictionary["OPENGL_ES_CL"] == "yes" ||
@@ -2683,8 +2881,13 @@ void Configure::generateConfigfiles()
         if(dictionary["SQL_SQLITE2"] == "yes")      qconfigList += "QT_SQL_SQLITE2";
         if(dictionary["SQL_IBASE"] == "yes")        qconfigList += "QT_SQL_IBASE";
 
+        if (dictionary["GRAPHICS_SYSTEM"] == "openvg") qconfigList += "QT_GRAPHICSSYSTEM_OPENVG";
         if (dictionary["GRAPHICS_SYSTEM"] == "opengl") qconfigList += "QT_GRAPHICSSYSTEM_OPENGL";
         if (dictionary["GRAPHICS_SYSTEM"] == "raster") qconfigList += "QT_GRAPHICSSYSTEM_RASTER";
+        // ### This block should be removed once Qt for S60 is out.
+        if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
+            applyTemporarySymbianFlags(qconfigList);
+        }
 
         qconfigList.sort();
         for (int i = 0; i < qconfigList.count(); ++i)
@@ -2916,6 +3119,7 @@ void Configure::displayConfig()
     cout << "SSE2 support................" << dictionary[ "SSE2" ] << endl;
     cout << "IWMMXT support.............." << dictionary[ "IWMMXT" ] << endl;
     cout << "OpenGL support.............." << dictionary[ "OPENGL" ] << endl;
+    cout << "OpenVG support.............." << dictionary[ "OPENVG" ] << endl;
     cout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl;
     cout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl;
     cout << "QtXmlPatterns support......." << dictionary[ "XMLPATTERNS" ] << endl;
@@ -2931,7 +3135,8 @@ void Configure::displayConfig()
     cout << "    TIFF support............" << dictionary[ "TIFF" ] << endl;
     cout << "    JPEG support............" << dictionary[ "JPEG" ] << endl;
     cout << "    PNG support............." << dictionary[ "PNG" ] << endl;
-    cout << "    MNG support............." << dictionary[ "MNG" ] << endl << endl;
+    cout << "    MNG support............." << dictionary[ "MNG" ] << endl;
+    cout << "    FreeType support........" << dictionary[ "FREETYPE" ] << endl << endl;
 
     cout << "Styles:" << endl;
     cout << "    Windows................." << dictionary[ "STYLE_WINDOWS" ] << endl;
@@ -2942,7 +3147,8 @@ void Configure::displayConfig()
     cout << "    Motif..................." << dictionary[ "STYLE_MOTIF" ] << endl;
     cout << "    CDE....................." << dictionary[ "STYLE_CDE" ] << endl;
     cout << "    Windows CE.............." << dictionary[ "STYLE_WINDOWSCE" ] << endl;
-    cout << "    Windows Mobile.........." << dictionary[ "STYLE_WINDOWSMOBILE" ] << endl << endl;
+    cout << "    Windows Mobile.........." << dictionary[ "STYLE_WINDOWSMOBILE" ] << endl;
+    cout << "    S60....................." << dictionary[ "STYLE_S60" ] << endl << endl;
 
     cout << "Sql Drivers:" << endl;
     cout << "    ODBC...................." << dictionary[ "SQL_ODBC" ] << endl;
@@ -2974,6 +3180,10 @@ void Configure::displayConfig()
         cout << "Signature..................." << dictionary[ "CE_SIGNATURE"] << endl << endl;
     }
 
+    if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith(QLatin1String("symbian"))) {
+        cout << "Support for S60............." << dictionary[ "S60" ] << endl;
+    }
+
     if(dictionary["ASSISTANT_WEBKIT"] == "yes")
         cout << "Using WebKit as html rendering engine in Qt Assistant." << endl;
 
@@ -3119,8 +3329,10 @@ void Configure::buildHostTools()
         << "src/tools/bootstrap"
         << "src/tools/moc"
         << "src/tools/rcc"
-        << "src/tools/uic"
-        << "tools/checksdk";
+        << "src/tools/uic";
+
+    if(dictionary["XQMAKESPEC"].startsWith("wince"))
+        hostToolsDirs << "tools/checksdk";
 
     if (dictionary[ "CETEST" ] == "yes")
         hostToolsDirs << "tools/qtestlib/wince/cetest";
@@ -3343,12 +3555,15 @@ void Configure::showSummary()
     if (!dictionary.contains("XQMAKESPEC")) {
         cout << endl << endl << "Qt is now configured for building. Just run " << qPrintable(make) << "." << endl;
         cout << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
-    } else {
+    } else if(dictionary.value("QMAKESPEC").startsWith("wince")) {
         // we are cross compiling for Windows CE
         cout << endl << endl << "Qt is now configured for building. To start the build run:" << endl
              << "\tsetcepaths " << dictionary.value("XQMAKESPEC") << endl
              << "\t" << qPrintable(make) << endl
              << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
+    } else { // Compiling for Symbian OS
+        cout << endl << endl << "Qt is now configured for building. To start the build run:" << qPrintable(dictionary["QTBUILDINSTRUCTION"]) << "." << endl
+        << "To reconfigure, run '" << qPrintable(dictionary["CONFCLEANINSTRUCTION"]) << "' and configure." << endl;
     }
 }
 
@@ -3465,9 +3680,13 @@ bool Configure::showLicense(QString orgLicenseFile)
 
 void Configure::readLicense()
 {
-    dictionary[ "PLATFORM NAME" ]   = (QFile::exists(dictionary["QT_SOURCE_TREE"] + "/src/corelib/kernel/qfunctions_wince.h")
-                                      && (dictionary.value("QMAKESPEC").startsWith("wince") || dictionary.value("XQMAKESPEC").startsWith("wince")))
-                                        ? "Qt for Windows CE" : "Qt for Windows";
+   if (QFile::exists(dictionary["QT_SOURCE_TREE"] + "/src/corelib/kernel/qfunctions_wince.h") &&
+       (dictionary.value("QMAKESPEC").startsWith("wince") || dictionary.value("XQMAKESPEC").startsWith("wince")))
+        dictionary["PLATFORM NAME"] = "Qt for Windows CE";
+    else if (dictionary.value("XQMAKESPEC").startsWith("symbian"))
+        dictionary["PLATFORM NAME"] = "Qt for S60";
+    else
+        dictionary["PLATFORM NAME"] = "Qt for Windows";
     dictionary["LICENSE FILE"] = sourcePath;
 
     bool openSource = false;
diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.cpp b/tools/designer/src/components/formeditor/brushmanagerproxy.cpp
index 543e8c9434..bb89cf6cc1 100644
--- a/tools/designer/src/components/formeditor/brushmanagerproxy.cpp
+++ b/tools/designer/src/components/formeditor/brushmanagerproxy.cpp
@@ -146,14 +146,12 @@ QString BrushManagerProxyPrivate::uniqueBrushFileName(const QString &brushName)
 
 
 BrushManagerProxy::BrushManagerProxy(QDesignerFormEditorInterface *core, QObject *parent)
-    : QObject(parent)
+    : QObject(parent), d_ptr(new BrushManagerProxyPrivate(this, core))
 {
-    d_ptr = new BrushManagerProxyPrivate(this, core);
 }
 
 BrushManagerProxy::~BrushManagerProxy()
 {
-    delete d_ptr;
 }
 
 void BrushManagerProxy::setBrushManager(QtBrushManager *manager)
diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.h b/tools/designer/src/components/formeditor/brushmanagerproxy.h
index 03bf56b59d..bfd95e5a31 100644
--- a/tools/designer/src/components/formeditor/brushmanagerproxy.h
+++ b/tools/designer/src/components/formeditor/brushmanagerproxy.h
@@ -63,7 +63,7 @@ public:
     void setBrushManager(QtBrushManager *manager);
 
 private:
-    BrushManagerProxyPrivate *d_ptr;
+    QScopedPointer<BrushManagerProxyPrivate> d_ptr;
     Q_DECLARE_PRIVATE(BrushManagerProxy)
     Q_DISABLE_COPY(BrushManagerProxy)
     Q_PRIVATE_SLOT(d_func(), void brushAdded(const QString &, const QBrush &))
diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.cpp b/tools/designer/src/components/formeditor/qtbrushmanager.cpp
index 5a5ab8bd62..20de1df784 100644
--- a/tools/designer/src/components/formeditor/qtbrushmanager.cpp
+++ b/tools/designer/src/components/formeditor/qtbrushmanager.cpp
@@ -57,16 +57,13 @@ public:
 };
 
 QtBrushManager::QtBrushManager(QObject *parent)
-    : QDesignerBrushManagerInterface(parent)
+    : QDesignerBrushManagerInterface(parent), d_ptr(new QtBrushManagerPrivate)
 {
-    d_ptr = new QtBrushManagerPrivate;
     d_ptr->q_ptr = this;
-
 }
 
 QtBrushManager::~QtBrushManager()
 {
-    delete d_ptr;
 }
 
 QBrush QtBrushManager::brush(const QString &name) const
diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.h b/tools/designer/src/components/formeditor/qtbrushmanager.h
index 1f3dc5bd51..4884c57727 100644
--- a/tools/designer/src/components/formeditor/qtbrushmanager.h
+++ b/tools/designer/src/components/formeditor/qtbrushmanager.h
@@ -77,7 +77,7 @@ signals:
     void currentBrushChanged(const QString &name, const QBrush &brush);
 
 private:
-    QtBrushManagerPrivate *d_ptr;
+    QScopedPointer<QtBrushManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtBrushManager)
     Q_DISABLE_COPY(QtBrushManager)
 };
diff --git a/tools/designer/src/lib/shared/iconselector.cpp b/tools/designer/src/lib/shared/iconselector.cpp
index a6b37ed010..b7ab2169f9 100644
--- a/tools/designer/src/lib/shared/iconselector.cpp
+++ b/tools/designer/src/lib/shared/iconselector.cpp
@@ -157,7 +157,6 @@ LanguageResourceDialog::LanguageResourceDialog(QDesignerResourceBrowserInterface
 
 LanguageResourceDialog::~LanguageResourceDialog()
 {
-    delete d_ptr;
 }
 
 void LanguageResourceDialog::setCurrentPath(const QString &filePath)
@@ -427,9 +426,8 @@ void IconSelectorPrivate::slotResetAllActivated()
 
 // ------------- IconSelector
 IconSelector::IconSelector(QWidget *parent) :
-    QWidget(parent)
+    QWidget(parent), d_ptr(new IconSelectorPrivate())
 {
-    d_ptr = new IconSelectorPrivate();
     d_ptr->q_ptr = this;
 
     d_ptr->m_stateComboBox = new QComboBox(this);
@@ -500,7 +498,6 @@ IconSelector::IconSelector(QWidget *parent) :
 
 IconSelector::~IconSelector()
 {
-    delete d_ptr;
 }
 
 void IconSelector::setIcon(const PropertySheetIconValue &icon)
diff --git a/tools/designer/src/lib/shared/iconselector_p.h b/tools/designer/src/lib/shared/iconselector_p.h
index 9b650cda47..9190d54799 100644
--- a/tools/designer/src/lib/shared/iconselector_p.h
+++ b/tools/designer/src/lib/shared/iconselector_p.h
@@ -87,7 +87,7 @@ public:
     QString currentPath() const;
 
 private:
-    class LanguageResourceDialogPrivate *d_ptr;
+    QScopedPointer<class LanguageResourceDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(LanguageResourceDialog)
     Q_DISABLE_COPY(LanguageResourceDialog)
     Q_PRIVATE_SLOT(d_func(), void slotAccepted())
@@ -120,7 +120,7 @@ public:
 signals:
     void iconChanged(const PropertySheetIconValue &icon);
 private:
-    class IconSelectorPrivate *d_ptr;
+    QScopedPointer<class IconSelectorPrivate> d_ptr;
     Q_DECLARE_PRIVATE(IconSelector)
     Q_DISABLE_COPY(IconSelector)
 
diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog.cpp b/tools/designer/src/lib/shared/qtresourceeditordialog.cpp
index 4b21eb3e95..0a0e3d73f3 100644
--- a/tools/designer/src/lib/shared/qtresourceeditordialog.cpp
+++ b/tools/designer/src/lib/shared/qtresourceeditordialog.cpp
@@ -1949,9 +1949,8 @@ bool QtResourceEditorDialogPrivate::saveQrcFile(const QtQrcFileData &qrcFileData
 }
 
 QtResourceEditorDialog::QtResourceEditorDialog(QDesignerFormEditorInterface *core, QDesignerDialogGuiInterface *dlgGui, QWidget *parent)
-    : QDialog(parent)
+    : QDialog(parent), d_ptr(new QtResourceEditorDialogPrivate())
 {
-    d_ptr = new QtResourceEditorDialogPrivate();
     d_ptr->q_ptr = this;
     d_ptr->m_ui.setupUi(this);
     d_ptr->m_qrcManager = new QtQrcManager(this);
@@ -2085,8 +2084,6 @@ QtResourceEditorDialog::~QtResourceEditorDialog()
     settings->setValue(QLatin1String(SplitterPosition), d_ptr->m_ui.splitter->saveState());
     settings->setValue(QLatin1String(Geometry), geometry());
     settings->endGroup();
-
-    delete d_ptr;
 }
 
 QtResourceModel *QtResourceEditorDialog::model() const
diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
index 157d181463..6eac2b819d 100644
--- a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
+++ b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
@@ -53,6 +53,7 @@
 #ifndef QTRESOURCEEDITOR_H
 #define QTRESOURCEEDITOR_H
 
+#include <QtCore/QScopedPointer>
 #include <QtGui/QDialog>
 
 QT_BEGIN_NAMESPACE
@@ -83,7 +84,7 @@ private:
     QtResourceEditorDialog(QDesignerFormEditorInterface *core, QDesignerDialogGuiInterface *dlgGui, QWidget *parent = 0);
     ~QtResourceEditorDialog();
 
-    class QtResourceEditorDialogPrivate *d_ptr;
+    QScopedPointer<class QtResourceEditorDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceEditorDialog)
     Q_DISABLE_COPY(QtResourceEditorDialog)
 
diff --git a/tools/designer/src/lib/shared/qtresourcemodel.cpp b/tools/designer/src/lib/shared/qtresourcemodel.cpp
index 45e6c27b68..b4895d6131 100644
--- a/tools/designer/src/lib/shared/qtresourcemodel.cpp
+++ b/tools/designer/src/lib/shared/qtresourcemodel.cpp
@@ -141,7 +141,6 @@ QtResourceSet::QtResourceSet(QtResourceModel *model) :
 
 QtResourceSet::~QtResourceSet()
 {
-    delete d_ptr;
 }
 
 QStringList QtResourceSet::activeQrcPaths() const
@@ -489,7 +488,6 @@ QtResourceModel::~QtResourceModel()
     while (it.hasNext())
         removeResourceSet(it.next());
     blockSignals(false);
-    delete d_ptr;
 }
 
 QStringList QtResourceModel::loadedQrcFiles() const
diff --git a/tools/designer/src/lib/shared/qtresourcemodel_p.h b/tools/designer/src/lib/shared/qtresourcemodel_p.h
index 236e35a866..e9f1c932e6 100644
--- a/tools/designer/src/lib/shared/qtresourcemodel_p.h
+++ b/tools/designer/src/lib/shared/qtresourcemodel_p.h
@@ -56,6 +56,7 @@
 #include "shared_global_p.h"
 #include <QtCore/QMap>
 #include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 
@@ -87,7 +88,7 @@ private:
     ~QtResourceSet();
     friend class QtResourceModel;
 
-    class QtResourceSetPrivate *d_ptr;
+    QScopedPointer<class QtResourceSetPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceSet)
     Q_DISABLE_COPY(QtResourceSet)
 };
@@ -132,7 +133,7 @@ signals:
 private:
     friend class QtResourceSet;
 
-    class QtResourceModelPrivate *d_ptr;
+    QScopedPointer<class QtResourceModelPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceModel)
     Q_DISABLE_COPY(QtResourceModel)
 
diff --git a/tools/designer/src/lib/shared/qtresourceview.cpp b/tools/designer/src/lib/shared/qtresourceview.cpp
index 40be3e60e2..2fc43cdc1c 100644
--- a/tools/designer/src/lib/shared/qtresourceview.cpp
+++ b/tools/designer/src/lib/shared/qtresourceview.cpp
@@ -636,8 +636,6 @@ QtResourceView::~QtResourceView()
 {
     if (!d_ptr->m_settingsKey.isEmpty())
         d_ptr->saveSettings();
-
-    delete d_ptr;
 }
 
 bool QtResourceView::event(QEvent *event)
@@ -874,8 +872,6 @@ QtResourceViewDialog::~QtResourceViewDialog()
     settings->setValue(QLatin1String(Geometry), geometry());
 
     settings->endGroup();
-
-    delete d_ptr;
 }
 
 QString QtResourceViewDialog::selectedResource() const
diff --git a/tools/designer/src/lib/shared/qtresourceview_p.h b/tools/designer/src/lib/shared/qtresourceview_p.h
index fb8fb831d1..048468626a 100644
--- a/tools/designer/src/lib/shared/qtresourceview_p.h
+++ b/tools/designer/src/lib/shared/qtresourceview_p.h
@@ -102,7 +102,7 @@ protected:
 
 private:
 
-    class QtResourceViewPrivate *d_ptr;
+    QScopedPointer<class QtResourceViewPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceView)
     Q_DISABLE_COPY(QtResourceView)
     Q_PRIVATE_SLOT(d_func(), void slotResourceSetActivated(QtResourceSet *))
@@ -130,7 +130,7 @@ public:
     void setResourceEditingEnabled(bool enable);
 
 private:
-    class QtResourceViewDialogPrivate *d_ptr;
+    QScopedPointer<class QtResourceViewDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceViewDialog)
     Q_DISABLE_COPY(QtResourceViewDialog)
     Q_PRIVATE_SLOT(d_func(), void slotResourceSelected(const QString &))
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index 05e05c1060..1711d43ea3 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -1698,6 +1698,24 @@ public:
 };
 
 template<class T>
+static void storeItemFlags(const T *item, QList<DomProperty*> *properties)
+{
+    static const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
+    static const Qt::ItemFlags defaultFlags = T().flags();
+    static const QMetaEnum itemFlags_enum = metaEnum<QAbstractFormBuilderGadget>("itemFlags");
+
+    if (item->flags() != defaultFlags) {
+        DomProperty *p = new DomProperty;
+        p->setAttributeName(strings.flagsAttribute);
+        p->setElementSet(QString::fromAscii(itemFlags_enum.valueToKeys(item->flags())));
+        properties->append(p);
+    }
+}
+
+#ifndef Q_CC_RVCT
+// RVCT does not accept static inline functions if one argument is templated type
+// For this reason all necessary function variants are explicityly written for it.
+template<class T>
 static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const T *item,
         QList<DomProperty*> *properties)
 {
@@ -1723,21 +1741,6 @@ static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const T *i
 }
 
 template<class T>
-static void storeItemFlags(const T *item, QList<DomProperty*> *properties)
-{
-    static const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
-    static const Qt::ItemFlags defaultFlags = T().flags();
-    static const QMetaEnum itemFlags_enum = metaEnum<QAbstractFormBuilderGadget>("itemFlags");
-
-    if (item->flags() != defaultFlags) {
-        DomProperty *p = new DomProperty;
-        p->setAttributeName(strings.flagsAttribute);
-        p->setElementSet(QString::fromAscii(itemFlags_enum.valueToKeys(item->flags())));
-        properties->append(p);
-    }
-}
-
-template<class T>
 static void storeItemPropsNFlags(QAbstractFormBuilder *abstractFormBuilder, const T *item,
         QList<DomProperty*> *properties)
 {
@@ -1790,6 +1793,158 @@ static void loadItemPropsNFlags(QAbstractFormBuilder *abstractFormBuilder, T *it
         item->setFlags(enumKeysToValue<Qt::ItemFlags>(itemFlags_enum, p->elementSet().toAscii()));
 }
 
+#else
+
+static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const QTableWidgetItem *item,
+        QList<DomProperty*> *properties)
+{
+    static const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
+    FriendlyFB * const formBuilder = static_cast<FriendlyFB *>(abstractFormBuilder);
+
+    DomProperty *p;
+    QVariant v;
+
+    foreach (const QFormBuilderStrings::TextRoleNName &it, strings.itemTextRoles)
+        if ((p = formBuilder->saveText(it.second, item->data(it.first.second))))
+            properties->append(p);
+
+    foreach (const QFormBuilderStrings::RoleNName &it, strings.itemRoles)
+        if ((v = item->data(it.first)).isValid() &&
+            (p = variantToDomProperty(abstractFormBuilder,
+                static_cast<const QMetaObject *>(&QAbstractFormBuilderGadget::staticMetaObject),
+                it.second, v)))
+            properties->append(p);
+
+    if ((p = formBuilder->saveResource(item->data(Qt::DecorationPropertyRole))))
+        properties->append(p);
+}
+
+static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const QListWidgetItem *item,
+        QList<DomProperty*> *properties)
+{
+    static const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
+    FriendlyFB * const formBuilder = static_cast<FriendlyFB *>(abstractFormBuilder);
+
+    DomProperty *p;
+    QVariant v;
+
+    foreach (const QFormBuilderStrings::TextRoleNName &it, strings.itemTextRoles)
+        if ((p = formBuilder->saveText(it.second, item->data(it.first.second))))
+            properties->append(p);
+
+    foreach (const QFormBuilderStrings::RoleNName &it, strings.itemRoles)
+        if ((v = item->data(it.first)).isValid() &&
+            (p = variantToDomProperty(abstractFormBuilder,
+                static_cast<const QMetaObject *>(&QAbstractFormBuilderGadget::staticMetaObject),
+                it.second, v)))
+            properties->append(p);
+
+    if ((p = formBuilder->saveResource(item->data(Qt::DecorationPropertyRole))))
+        properties->append(p);
+}
+
+static void storeItemPropsNFlags(QAbstractFormBuilder *abstractFormBuilder, const QTableWidgetItem *item,
+        QList<DomProperty*> *properties)
+{
+    storeItemProps(abstractFormBuilder, item, properties);
+    storeItemFlags(item, properties);
+}
+
+static void storeItemPropsNFlags(QAbstractFormBuilder *abstractFormBuilder, const QListWidgetItem *item,
+        QList<DomProperty*> *properties)
+{
+    storeItemProps(abstractFormBuilder, item, properties);
+    storeItemFlags(item, properties);
+}
+
+static void loadItemProps(QAbstractFormBuilder *abstractFormBuilder, QTableWidgetItem *item,
+        const QHash<QString, DomProperty*> &properties)
+{
+    static const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
+    FriendlyFB * const formBuilder = static_cast<FriendlyFB *>(abstractFormBuilder);
+
+    DomProperty *p;
+    QVariant v;
+
+    foreach (const QFormBuilderStrings::TextRoleNName &it, strings.itemTextRoles)
+        if ((p = properties.value(it.second))) {
+            v = formBuilder->textBuilder()->loadText(p);
+            QVariant nativeValue = formBuilder->textBuilder()->toNativeValue(v);
+            item->setData(it.first.first, qVariantValue<QString>(nativeValue));
+            item->setData(it.first.second, v);
+        }
+
+    foreach (const QFormBuilderStrings::RoleNName &it, strings.itemRoles)
+        if ((p = properties.value(it.second)) &&
+            (v = formBuilder->toVariant(&QAbstractFormBuilderGadget::staticMetaObject, p)).isValid())
+            item->setData(it.first, v);
+
+    if ((p = properties.value(strings.iconAttribute))) {
+        v = formBuilder->resourceBuilder()->loadResource(formBuilder->workingDirectory(), p);
+        QVariant nativeValue = formBuilder->resourceBuilder()->toNativeValue(v);
+        item->setIcon(qVariantValue<QIcon>(nativeValue));
+        item->setData(Qt::DecorationPropertyRole, v);
+    }
+}
+
+static void loadItemProps(QAbstractFormBuilder *abstractFormBuilder, QListWidgetItem *item,
+        const QHash<QString, DomProperty*> &properties)
+{
+    static const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
+    FriendlyFB * const formBuilder = static_cast<FriendlyFB *>(abstractFormBuilder);
+
+    DomProperty *p;
+    QVariant v;
+
+    foreach (const QFormBuilderStrings::TextRoleNName &it, strings.itemTextRoles)
+        if ((p = properties.value(it.second))) {
+            v = formBuilder->textBuilder()->loadText(p);
+            QVariant nativeValue = formBuilder->textBuilder()->toNativeValue(v);
+            item->setData(it.first.first, qVariantValue<QString>(nativeValue));
+            item->setData(it.first.second, v);
+        }
+
+    foreach (const QFormBuilderStrings::RoleNName &it, strings.itemRoles)
+        if ((p = properties.value(it.second)) &&
+            (v = formBuilder->toVariant(&QAbstractFormBuilderGadget::staticMetaObject, p)).isValid())
+            item->setData(it.first, v);
+
+    if ((p = properties.value(strings.iconAttribute))) {
+        v = formBuilder->resourceBuilder()->loadResource(formBuilder->workingDirectory(), p);
+        QVariant nativeValue = formBuilder->resourceBuilder()->toNativeValue(v);
+        item->setIcon(qVariantValue<QIcon>(nativeValue));
+        item->setData(Qt::DecorationPropertyRole, v);
+    }
+}
+
+static void loadItemPropsNFlags(QAbstractFormBuilder *abstractFormBuilder, QTableWidgetItem *item,
+        const QHash<QString, DomProperty*> &properties)
+{
+    static const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
+    static const QMetaEnum itemFlags_enum = metaEnum<QAbstractFormBuilderGadget>("itemFlags");
+
+    loadItemProps(abstractFormBuilder, item, properties);
+
+    DomProperty *p;
+    if ((p = properties.value(strings.flagsAttribute)) && p->kind() == DomProperty::Set)
+        item->setFlags(enumKeysToValue<Qt::ItemFlags>(itemFlags_enum, p->elementSet().toAscii()));
+}
+
+static void loadItemPropsNFlags(QAbstractFormBuilder *abstractFormBuilder, QListWidgetItem *item,
+        const QHash<QString, DomProperty*> &properties)
+{
+    static const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
+    static const QMetaEnum itemFlags_enum = metaEnum<QAbstractFormBuilderGadget>("itemFlags");
+
+    loadItemProps(abstractFormBuilder, item, properties);
+
+    DomProperty *p;
+    if ((p = properties.value(strings.flagsAttribute)) && p->kind() == DomProperty::Set)
+        item->setFlags(enumKeysToValue<Qt::ItemFlags>(itemFlags_enum, p->elementSet().toAscii()));
+}
+
+#endif
+
 /*!
     \internal
 */
@@ -2142,7 +2297,11 @@ void QAbstractFormBuilder::loadListWidgetExtraInfo(DomWidget *ui_widget, QListWi
     foreach (DomItem *ui_item, ui_widget->elementItem()) {
         const DomPropertyHash properties = propertyMap(ui_item->elementProperty());
         QListWidgetItem *item = new QListWidgetItem(listWidget);
+#ifndef Q_CC_RVCT
         loadItemPropsNFlags<QListWidgetItem>(this, item, properties);
+#else
+        loadItemPropsNFlags(this, item, properties);
+#endif        
     }
 
     DomProperty *currentRow = propertyMap(ui_widget->elementProperty()).value(strings.currentRowProperty);
diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitools/quiloader.cpp
index 1c7d1cc931..260e9bdaf8 100644
--- a/tools/designer/src/uitools/quiloader.cpp
+++ b/tools/designer/src/uitools/quiloader.cpp
@@ -647,7 +647,6 @@ QUiLoader::QUiLoader(QObject *parent)
 */
 QUiLoader::~QUiLoader()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/tools/designer/src/uitools/quiloader.h b/tools/designer/src/uitools/quiloader.h
index dd3d32a54f..40b501085a 100644
--- a/tools/designer/src/uitools/quiloader.h
+++ b/tools/designer/src/uitools/quiloader.h
@@ -43,6 +43,7 @@
 #define QUILOADER_H
 
 #include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_HEADER
 
@@ -90,7 +91,7 @@ public:
     bool isTranslationEnabled() const;
 
 private:
-    QUiLoaderPrivate *d_ptr;
+    QScopedPointer<QUiLoaderPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QUiLoader)
     Q_DISABLE_COPY(QUiLoader)
 };
diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.cpp b/tools/shared/qtgradienteditor/qtcolorbutton.cpp
index 30a9c66f7b..d7aaa2e0ed 100644
--- a/tools/shared/qtgradienteditor/qtcolorbutton.cpp
+++ b/tools/shared/qtgradienteditor/qtcolorbutton.cpp
@@ -121,9 +121,8 @@ QPixmap QtColorButtonPrivate::generatePixmap() const
 ///////////////
 
 QtColorButton::QtColorButton(QWidget *parent)
-    : QToolButton(parent)
+    : QToolButton(parent), d_ptr(new QtColorButtonPrivate)
 {
-    d_ptr = new QtColorButtonPrivate;
     d_ptr->q_ptr = this;
     d_ptr->m_dragging = false;
     d_ptr->m_backgroundCheckered = true;
@@ -136,7 +135,6 @@ QtColorButton::QtColorButton(QWidget *parent)
 
 QtColorButton::~QtColorButton()
 {
-    delete d_ptr;
 }
 
 void QtColorButton::setColor(const QColor &color)
diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.h b/tools/shared/qtgradienteditor/qtcolorbutton.h
index 6cae0a9ba7..0348998fa9 100644
--- a/tools/shared/qtgradienteditor/qtcolorbutton.h
+++ b/tools/shared/qtgradienteditor/qtcolorbutton.h
@@ -75,7 +75,7 @@ protected:
     void dropEvent(QDropEvent *event);
 #endif
 private:
-    class QtColorButtonPrivate *d_ptr;
+    QScopedPointer<class QtColorButtonPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtColorButton)
     Q_DISABLE_COPY(QtColorButton)
     Q_PRIVATE_SLOT(d_func(), void slotEditColor())
diff --git a/tools/shared/qtgradienteditor/qtcolorline.cpp b/tools/shared/qtgradienteditor/qtcolorline.cpp
index 066596cae6..8517933f42 100644
--- a/tools/shared/qtgradienteditor/qtcolorline.cpp
+++ b/tools/shared/qtgradienteditor/qtcolorline.cpp
@@ -999,9 +999,8 @@ void QtColorLinePrivate::mouseDoubleClickEvent(QMouseEvent *event)
 ////////////////////////////////////////////////////
 
 QtColorLine::QtColorLine(QWidget *parent)
-    : QWidget(parent)
+    : QWidget(parent), d_ptr(new QtColorLinePrivate)
 {
-    d_ptr = new QtColorLinePrivate;
     d_ptr->q_ptr = this;
 
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
@@ -1009,7 +1008,6 @@ QtColorLine::QtColorLine(QWidget *parent)
 
 QtColorLine::~QtColorLine()
 {
-    delete d_ptr;
 }
 
 QSize QtColorLine::minimumSizeHint() const
diff --git a/tools/shared/qtgradienteditor/qtcolorline.h b/tools/shared/qtgradienteditor/qtcolorline.h
index bfbec9e04f..ffd3eea279 100644
--- a/tools/shared/qtgradienteditor/qtcolorline.h
+++ b/tools/shared/qtgradienteditor/qtcolorline.h
@@ -114,7 +114,7 @@ protected:
 
 private:
 
-    class QtColorLinePrivate *d_ptr;
+    QScopedPointer<class QtColorLinePrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtColorLine)
     Q_DISABLE_COPY(QtColorLine)
 };
diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.cpp b/tools/shared/qtgradienteditor/qtgradientdialog.cpp
index 6c2deff9c6..066bc35fd7 100644
--- a/tools/shared/qtgradienteditor/qtgradientdialog.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientdialog.cpp
@@ -196,10 +196,9 @@ void QtGradientDialogPrivate::slotAboutToShowDetails(bool details, int extension
 */
 
 QtGradientDialog::QtGradientDialog(QWidget *parent)
-    : QDialog(parent)
+    : QDialog(parent), d_ptr(new QtGradientDialogPrivate())
 {
 //    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    d_ptr = new QtGradientDialogPrivate();
     d_ptr->q_ptr = this;
     d_ptr->m_ui.setupUi(this);
     QPushButton *button = d_ptr->m_ui.buttonBox->button(QDialogButtonBox::Ok);
@@ -218,7 +217,6 @@ QtGradientDialog::QtGradientDialog(QWidget *parent)
 
 QtGradientDialog::~QtGradientDialog()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.h b/tools/shared/qtgradienteditor/qtgradientdialog.h
index f97e75f8de..f293a2826f 100644
--- a/tools/shared/qtgradienteditor/qtgradientdialog.h
+++ b/tools/shared/qtgradienteditor/qtgradientdialog.h
@@ -76,7 +76,7 @@ public:
     static QGradient getGradient(bool *ok, QWidget *parent = 0, const QString &caption = QString());
 
 private:
-    class QtGradientDialogPrivate *d_ptr;
+    QScopedPointer<class QtGradientDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientDialog)
     Q_DISABLE_COPY(QtGradientDialog)
     Q_PRIVATE_SLOT(d_func(), void slotAboutToShowDetails(bool details, int extensionWidthHint))
diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.cpp b/tools/shared/qtgradienteditor/qtgradienteditor.cpp
index 76562c466d..5c95d1b830 100644
--- a/tools/shared/qtgradienteditor/qtgradienteditor.cpp
+++ b/tools/shared/qtgradienteditor/qtgradienteditor.cpp
@@ -723,9 +723,8 @@ void QtGradientEditorPrivate::setAngleConical(qreal angle)
 }
 
 QtGradientEditor::QtGradientEditor(QWidget *parent)
-    : QWidget(parent)
+    : QWidget(parent), d_ptr(new QtGradientEditorPrivate())
 {
-    d_ptr = new QtGradientEditorPrivate();
     d_ptr->q_ptr = this;
     d_ptr->m_type = QGradient::RadialGradient;
     d_ptr->m_ui.setupUi(this);
@@ -831,7 +830,6 @@ QtGradientEditor::~QtGradientEditor()
 {
     if (d_ptr->m_hiddenWidget)
         delete d_ptr->m_hiddenWidget;
-    delete d_ptr;
 }
 
 void QtGradientEditor::setGradient(const QGradient &grad)
diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.h b/tools/shared/qtgradienteditor/qtgradienteditor.h
index 9e8518f06f..2d9651559b 100644
--- a/tools/shared/qtgradienteditor/qtgradienteditor.h
+++ b/tools/shared/qtgradienteditor/qtgradienteditor.h
@@ -78,7 +78,7 @@ signals:
     void aboutToShowDetails(bool details, int extenstionWidthHint);
 
 private:
-    class QtGradientEditorPrivate *d_ptr;
+    QScopedPointer<class QtGradientEditorPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientEditor)
     Q_DISABLE_COPY(QtGradientEditor)
     Q_PRIVATE_SLOT(d_func(), void slotGradientStopsChanged(const QGradientStops &stops))
diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp b/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp
index 4e6639a876..981370510a 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp
@@ -590,9 +590,8 @@ void QtGradientStopsControllerPrivate::slotZoomChanged(double zoom)
 }
 
 QtGradientStopsController::QtGradientStopsController(QObject *parent)
-    : QObject(parent)
+    : QObject(parent), d_ptr(new QtGradientStopsControllerPrivate())
 {
-    d_ptr = new QtGradientStopsControllerPrivate();
     d_ptr->q_ptr = this;
 
     d_ptr->m_spec = QColor::Hsv;
@@ -671,7 +670,6 @@ void QtGradientStopsController::setUi(Ui::QtGradientEditor *ui)
 
 QtGradientStopsController::~QtGradientStopsController()
 {
-    delete d_ptr;
 }
 
 void QtGradientStopsController::setGradientStops(const QGradientStops &stops)
diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
index ce831d8f44..7c6a660a14 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
@@ -70,7 +70,7 @@ signals:
     void gradientStopsChanged(const QGradientStops &stops);
 
 private:
-    class QtGradientStopsControllerPrivate *d_ptr;
+    QScopedPointer<class QtGradientStopsControllerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientStopsController)
     Q_DISABLE_COPY(QtGradientStopsController)
     Q_PRIVATE_SLOT(d_func(), void slotHsvClicked())
diff --git a/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp b/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp
index 4611378188..52bd367007 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp
@@ -78,8 +78,8 @@ void QtGradientStop::setPosition(qreal position)
 }
 
 QtGradientStop::QtGradientStop(QtGradientStopsModel *model)
+    : d_ptr(new QtGradientStopPrivate())
 {
-    d_ptr = new QtGradientStopPrivate();
     d_ptr->m_position = 0;
     d_ptr->m_color = Qt::white;
     d_ptr->m_model = model;
@@ -87,7 +87,6 @@ QtGradientStop::QtGradientStop(QtGradientStopsModel *model)
 
 QtGradientStop::~QtGradientStop()
 {
-    delete d_ptr;
 }
 
 class QtGradientStopsModelPrivate
@@ -104,9 +103,8 @@ public:
 
 
 QtGradientStopsModel::QtGradientStopsModel(QObject *parent)
-    : QObject(parent)
+    : QObject(parent), d_ptr(new QtGradientStopsModelPrivate)
 {
-    d_ptr = new QtGradientStopsModelPrivate;
     d_ptr->q_ptr = this;
     d_ptr->m_current = 0;
 }
@@ -114,7 +112,6 @@ QtGradientStopsModel::QtGradientStopsModel(QObject *parent)
 QtGradientStopsModel::~QtGradientStopsModel()
 {
     clear();
-    delete d_ptr;
 }
 
 QtGradientStopsModel::PositionStopMap QtGradientStopsModel::stops() const
diff --git a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
index a1d593aae3..a02ebc5a11 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
@@ -64,7 +64,7 @@ private:
     friend class QtGradientStopsModel;
     QtGradientStop(QtGradientStopsModel *model = 0);
     ~QtGradientStop();
-    class QtGradientStopPrivate *d_ptr;
+    QScopedPointer<class QtGradientStopPrivate> d_ptr;
 };
 
 class QtGradientStopsModel : public QObject
@@ -111,7 +111,7 @@ signals:
     void currentStopChanged(QtGradientStop *stop);
 
 private:
-    class QtGradientStopsModelPrivate *d_ptr;
+    QScopedPointer<class QtGradientStopsModelPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientStopsModel)
     Q_DISABLE_COPY(QtGradientStopsModel)
 };
diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp b/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp
index 6eb4d456dc..2d75832b3b 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp
@@ -360,9 +360,8 @@ void QtGradientStopsWidgetPrivate::slotResetZoom()
 }
 
 QtGradientStopsWidget::QtGradientStopsWidget(QWidget *parent)
-    : QAbstractScrollArea(parent)
+    : QAbstractScrollArea(parent), d_ptr(new QtGradientStopsWidgetPrivate)
 {
-    d_ptr = new QtGradientStopsWidgetPrivate;
     d_ptr->q_ptr = this;
     d_ptr->m_backgroundCheckered = true;
     d_ptr->m_model = 0;
@@ -391,7 +390,6 @@ QtGradientStopsWidget::QtGradientStopsWidget(QWidget *parent)
 
 QtGradientStopsWidget::~QtGradientStopsWidget()
 {
-    delete d_ptr;
 }
 
 QSize QtGradientStopsWidget::sizeHint() const
diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.h b/tools/shared/qtgradienteditor/qtgradientstopswidget.h
index 20ed9e346b..753d6952f7 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopswidget.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.h
@@ -91,7 +91,7 @@ protected:
 #endif
 
 private:
-    QtGradientStopsWidgetPrivate *d_ptr;
+    QScopedPointer<QtGradientStopsWidgetPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientStopsWidget)
     Q_DISABLE_COPY(QtGradientStopsWidget)
     Q_PRIVATE_SLOT(d_func(), void slotStopAdded(QtGradientStop *stop))
diff --git a/tools/shared/qtgradienteditor/qtgradientwidget.cpp b/tools/shared/qtgradienteditor/qtgradientwidget.cpp
index ae94a65d29..73c0547d4c 100644
--- a/tools/shared/qtgradienteditor/qtgradientwidget.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientwidget.cpp
@@ -232,9 +232,8 @@ void QtGradientWidgetPrivate::setupDrag(QtGradientStop *stop, int x)
 ////////////////////////////
 
 QtGradientWidget::QtGradientWidget(QWidget *parent)
-    : QWidget(parent)
+    : QWidget(parent), d_ptr(new QtGradientWidgetPrivate)
 {
-    d_ptr = new QtGradientWidgetPrivate;
     d_ptr->q_ptr = this;
     d_ptr->m_backgroundCheckered = true;
     d_ptr->m_handleSize = 20.0;
@@ -253,7 +252,6 @@ QtGradientWidget::QtGradientWidget(QWidget *parent)
 
 QtGradientWidget::~QtGradientWidget()
 {
-    delete d_ptr;
 }
 
 QSize QtGradientWidget::sizeHint() const
diff --git a/tools/shared/qtgradienteditor/qtgradientwidget.h b/tools/shared/qtgradienteditor/qtgradientwidget.h
index 318c03a87f..3e23bf91ba 100644
--- a/tools/shared/qtgradienteditor/qtgradientwidget.h
+++ b/tools/shared/qtgradienteditor/qtgradientwidget.h
@@ -110,7 +110,7 @@ protected:
     void mouseDoubleClickEvent(QMouseEvent *e);
 
 private:
-    class QtGradientWidgetPrivate *d_ptr;
+    QScopedPointer<class QtGradientWidgetPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientWidget)
     Q_DISABLE_COPY(QtGradientWidget)
 };
diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
index 570b29a8ab..24bf75ade3 100644
--- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
+++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
@@ -547,9 +547,8 @@ void QtButtonPropertyBrowserPrivate::updateItem(WidgetItem *item)
     Creates a property browser with the given \a parent.
 */
 QtButtonPropertyBrowser::QtButtonPropertyBrowser(QWidget *parent)
-    : QtAbstractPropertyBrowser(parent)
+    : QtAbstractPropertyBrowser(parent), d_ptr(new QtButtonPropertyBrowserPrivate)
 {
-    d_ptr = new QtButtonPropertyBrowserPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->init(this);
@@ -570,7 +569,6 @@ QtButtonPropertyBrowser::~QtButtonPropertyBrowser()
     const QMap<QtButtonPropertyBrowserPrivate::WidgetItem *, QtBrowserItem *>::ConstIterator icend = d_ptr->m_itemToIndex.constEnd();
     for (QMap<QtButtonPropertyBrowserPrivate::WidgetItem *, QtBrowserItem *>::ConstIterator  it =  d_ptr->m_itemToIndex.constBegin(); it != icend; ++it)
         delete it.key();
-    delete d_ptr;
 }
 
 /*!
diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
index 4db0318667..a5586571c1 100644
--- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
@@ -71,7 +71,7 @@ protected:
 
 private:
 
-    QtButtonPropertyBrowserPrivate *d_ptr;
+    QScopedPointer<QtButtonPropertyBrowserPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtButtonPropertyBrowser)
     Q_DISABLE_COPY(QtButtonPropertyBrowser)
     Q_PRIVATE_SLOT(d_func(), void slotUpdate())
diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.cpp b/tools/shared/qtpropertybrowser/qteditorfactory.cpp
index 60b9f04208..7729a730ca 100644
--- a/tools/shared/qtpropertybrowser/qteditorfactory.cpp
+++ b/tools/shared/qtpropertybrowser/qteditorfactory.cpp
@@ -227,9 +227,8 @@ void QtSpinBoxFactoryPrivate::slotSetValue(int value)
     Creates a factory with the given \a parent.
 */
 QtSpinBoxFactory::QtSpinBoxFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtIntPropertyManager>(parent)
+    : QtAbstractEditorFactory<QtIntPropertyManager>(parent), d_ptr(new QtSpinBoxFactoryPrivate())
 {
-    d_ptr = new QtSpinBoxFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -240,7 +239,6 @@ QtSpinBoxFactory::QtSpinBoxFactory(QObject *parent)
 QtSpinBoxFactory::~QtSpinBoxFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -383,9 +381,8 @@ void QtSliderFactoryPrivate::slotSetValue(int value)
     Creates a factory with the given \a parent.
 */
 QtSliderFactory::QtSliderFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtIntPropertyManager>(parent)
+    : QtAbstractEditorFactory<QtIntPropertyManager>(parent), d_ptr(new QtSliderFactoryPrivate())
 {
-    d_ptr = new QtSliderFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -396,7 +393,6 @@ QtSliderFactory::QtSliderFactory(QObject *parent)
 QtSliderFactory::~QtSliderFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -539,9 +535,8 @@ void QtScrollBarFactoryPrivate::slotSetValue(int value)
     Creates a factory with the given \a parent.
 */
 QtScrollBarFactory::QtScrollBarFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtIntPropertyManager>(parent)
+    : QtAbstractEditorFactory<QtIntPropertyManager>(parent), d_ptr(new QtScrollBarFactoryPrivate())
 {
-    d_ptr = new QtScrollBarFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -552,7 +547,6 @@ QtScrollBarFactory::QtScrollBarFactory(QObject *parent)
 QtScrollBarFactory::~QtScrollBarFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -661,9 +655,8 @@ void QtCheckBoxFactoryPrivate::slotSetValue(bool value)
     Creates a factory with the given \a parent.
 */
 QtCheckBoxFactory::QtCheckBoxFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtBoolPropertyManager>(parent)
+    : QtAbstractEditorFactory<QtBoolPropertyManager>(parent), d_ptr(new QtCheckBoxFactoryPrivate())
 {
-    d_ptr = new QtCheckBoxFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -674,7 +667,6 @@ QtCheckBoxFactory::QtCheckBoxFactory(QObject *parent)
 QtCheckBoxFactory::~QtCheckBoxFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -836,9 +828,8 @@ void QtDoubleSpinBoxFactoryPrivate::slotSetValue(double value)
     Creates a factory with the given \a parent.
 */
 QtDoubleSpinBoxFactory::QtDoubleSpinBoxFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtDoublePropertyManager>(parent)
+    : QtAbstractEditorFactory<QtDoublePropertyManager>(parent), d_ptr(new QtDoubleSpinBoxFactoryPrivate())
 {
-    d_ptr = new QtDoubleSpinBoxFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -849,7 +840,6 @@ QtDoubleSpinBoxFactory::QtDoubleSpinBoxFactory(QObject *parent)
 QtDoubleSpinBoxFactory::~QtDoubleSpinBoxFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -991,9 +981,8 @@ void QtLineEditFactoryPrivate::slotSetValue(const QString &value)
     Creates a factory with the given \a parent.
 */
 QtLineEditFactory::QtLineEditFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtStringPropertyManager>(parent)
+    : QtAbstractEditorFactory<QtStringPropertyManager>(parent), d_ptr(new QtLineEditFactoryPrivate())
 {
-    d_ptr = new QtLineEditFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -1004,7 +993,6 @@ QtLineEditFactory::QtLineEditFactory(QObject *parent)
 QtLineEditFactory::~QtLineEditFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -1134,9 +1122,8 @@ void QtDateEditFactoryPrivate::slotSetValue(const QDate &value)
     Creates a factory with the given \a parent.
 */
 QtDateEditFactory::QtDateEditFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtDatePropertyManager>(parent)
+    : QtAbstractEditorFactory<QtDatePropertyManager>(parent), d_ptr(new QtDateEditFactoryPrivate())
 {
-    d_ptr = new QtDateEditFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -1147,7 +1134,6 @@ QtDateEditFactory::QtDateEditFactory(QObject *parent)
 QtDateEditFactory::~QtDateEditFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -1252,9 +1238,8 @@ void QtTimeEditFactoryPrivate::slotSetValue(const QTime &value)
     Creates a factory with the given \a parent.
 */
 QtTimeEditFactory::QtTimeEditFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtTimePropertyManager>(parent)
+    : QtAbstractEditorFactory<QtTimePropertyManager>(parent), d_ptr(new QtTimeEditFactoryPrivate())
 {
-    d_ptr = new QtTimeEditFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -1265,7 +1250,6 @@ QtTimeEditFactory::QtTimeEditFactory(QObject *parent)
 QtTimeEditFactory::~QtTimeEditFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -1367,9 +1351,8 @@ void QtDateTimeEditFactoryPrivate::slotSetValue(const QDateTime &value)
     Creates a factory with the given \a parent.
 */
 QtDateTimeEditFactory::QtDateTimeEditFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtDateTimePropertyManager>(parent)
+    : QtAbstractEditorFactory<QtDateTimePropertyManager>(parent), d_ptr(new QtDateTimeEditFactoryPrivate())
 {
-    d_ptr = new QtDateTimeEditFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -1380,7 +1363,6 @@ QtDateTimeEditFactory::QtDateTimeEditFactory(QObject *parent)
 QtDateTimeEditFactory::~QtDateTimeEditFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -1481,9 +1463,8 @@ void QtKeySequenceEditorFactoryPrivate::slotSetValue(const QKeySequence &value)
     Creates a factory with the given \a parent.
 */
 QtKeySequenceEditorFactory::QtKeySequenceEditorFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtKeySequencePropertyManager>(parent)
+    : QtAbstractEditorFactory<QtKeySequencePropertyManager>(parent), d_ptr(new QtKeySequenceEditorFactoryPrivate())
 {
-    d_ptr = new QtKeySequenceEditorFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -1494,7 +1475,6 @@ QtKeySequenceEditorFactory::QtKeySequenceEditorFactory(QObject *parent)
 QtKeySequenceEditorFactory::~QtKeySequenceEditorFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -1765,9 +1745,8 @@ void QtCharEditorFactoryPrivate::slotSetValue(const QChar &value)
     Creates a factory with the given \a parent.
 */
 QtCharEditorFactory::QtCharEditorFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtCharPropertyManager>(parent)
+    : QtAbstractEditorFactory<QtCharPropertyManager>(parent), d_ptr(new QtCharEditorFactoryPrivate())
 {
-    d_ptr = new QtCharEditorFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -1778,7 +1757,6 @@ QtCharEditorFactory::QtCharEditorFactory(QObject *parent)
 QtCharEditorFactory::~QtCharEditorFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -1929,9 +1907,8 @@ void QtEnumEditorFactoryPrivate::slotSetValue(int value)
     Creates a factory with the given \a parent.
 */
 QtEnumEditorFactory::QtEnumEditorFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtEnumPropertyManager>(parent)
+    : QtAbstractEditorFactory<QtEnumPropertyManager>(parent), d_ptr(new QtEnumEditorFactoryPrivate())
 {
-    d_ptr = new QtEnumEditorFactoryPrivate();
     d_ptr->q_ptr = this;
 
 }
@@ -1942,7 +1919,6 @@ QtEnumEditorFactory::QtEnumEditorFactory(QObject *parent)
 QtEnumEditorFactory::~QtEnumEditorFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -2094,9 +2070,8 @@ void QtCursorEditorFactoryPrivate::slotEditorDestroyed(QObject *object)
     Creates a factory with the given \a parent.
 */
 QtCursorEditorFactory::QtCursorEditorFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtCursorPropertyManager>(parent)
+    : QtAbstractEditorFactory<QtCursorPropertyManager>(parent), d_ptr(new QtCursorEditorFactoryPrivate())
 {
-    d_ptr = new QtCursorEditorFactoryPrivate();
     d_ptr->q_ptr = this;
 
     d_ptr->m_enumEditorFactory = new QtEnumEditorFactory(this);
@@ -2111,7 +2086,6 @@ QtCursorEditorFactory::QtCursorEditorFactory(QObject *parent)
 */
 QtCursorEditorFactory::~QtCursorEditorFactory()
 {
-    delete d_ptr;
 }
 
 /*!
@@ -2328,7 +2302,6 @@ QtColorEditorFactory::QtColorEditorFactory(QObject *parent) :
 QtColorEditorFactory::~QtColorEditorFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
@@ -2542,7 +2515,6 @@ QtFontEditorFactory::QtFontEditorFactory(QObject *parent) :
 QtFontEditorFactory::~QtFontEditorFactory()
 {
     qDeleteAll(d_ptr->m_editorToProperty.keys());
-    delete d_ptr;
 }
 
 /*!
diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.h b/tools/shared/qtpropertybrowser/qteditorfactory.h
index ec51d0097c..bad2080353 100644
--- a/tools/shared/qtpropertybrowser/qteditorfactory.h
+++ b/tools/shared/qtpropertybrowser/qteditorfactory.h
@@ -60,7 +60,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtIntPropertyManager *manager);
 private:
-    QtSpinBoxFactoryPrivate *d_ptr;
+    QScopedPointer<QtSpinBoxFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSpinBoxFactory)
     Q_DISABLE_COPY(QtSpinBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
@@ -84,7 +84,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtIntPropertyManager *manager);
 private:
-    QtSliderFactoryPrivate *d_ptr;
+    QScopedPointer<QtSliderFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSliderFactory)
     Q_DISABLE_COPY(QtSliderFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
@@ -108,7 +108,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtIntPropertyManager *manager);
 private:
-    QtScrollBarFactoryPrivate *d_ptr;
+    QScopedPointer<QtScrollBarFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtScrollBarFactory)
     Q_DISABLE_COPY(QtScrollBarFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
@@ -132,7 +132,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtBoolPropertyManager *manager);
 private:
-    QtCheckBoxFactoryPrivate *d_ptr;
+    QScopedPointer<QtCheckBoxFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCheckBoxFactory)
     Q_DISABLE_COPY(QtCheckBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool))
@@ -154,7 +154,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtDoublePropertyManager *manager);
 private:
-    QtDoubleSpinBoxFactoryPrivate *d_ptr;
+    QScopedPointer<QtDoubleSpinBoxFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory)
     Q_DISABLE_COPY(QtDoubleSpinBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double))
@@ -179,7 +179,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtStringPropertyManager *manager);
 private:
-    QtLineEditFactoryPrivate *d_ptr;
+    QScopedPointer<QtLineEditFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtLineEditFactory)
     Q_DISABLE_COPY(QtLineEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &))
@@ -202,7 +202,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtDatePropertyManager *manager);
 private:
-    QtDateEditFactoryPrivate *d_ptr;
+    QScopedPointer<QtDateEditFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDateEditFactory)
     Q_DISABLE_COPY(QtDateEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &))
@@ -226,7 +226,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtTimePropertyManager *manager);
 private:
-    QtTimeEditFactoryPrivate *d_ptr;
+    QScopedPointer<QtTimeEditFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtTimeEditFactory)
     Q_DISABLE_COPY(QtTimeEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &))
@@ -248,7 +248,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtDateTimePropertyManager *manager);
 private:
-    QtDateTimeEditFactoryPrivate *d_ptr;
+    QScopedPointer<QtDateTimeEditFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDateTimeEditFactory)
     Q_DISABLE_COPY(QtDateTimeEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &))
@@ -270,7 +270,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtKeySequencePropertyManager *manager);
 private:
-    QtKeySequenceEditorFactoryPrivate *d_ptr;
+    QScopedPointer<QtKeySequenceEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory)
     Q_DISABLE_COPY(QtKeySequenceEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &))
@@ -292,7 +292,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtCharPropertyManager *manager);
 private:
-    QtCharEditorFactoryPrivate *d_ptr;
+    QScopedPointer<QtCharEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCharEditorFactory)
     Q_DISABLE_COPY(QtCharEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &))
@@ -314,7 +314,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtEnumPropertyManager *manager);
 private:
-    QtEnumEditorFactoryPrivate *d_ptr;
+    QScopedPointer<QtEnumEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtEnumEditorFactory)
     Q_DISABLE_COPY(QtEnumEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
@@ -340,7 +340,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtCursorPropertyManager *manager);
 private:
-    QtCursorEditorFactoryPrivate *d_ptr;
+    QScopedPointer<QtCursorEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCursorEditorFactory)
     Q_DISABLE_COPY(QtCursorEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &))
@@ -362,7 +362,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtColorPropertyManager *manager);
 private:
-    QtColorEditorFactoryPrivate *d_ptr;
+    QScopedPointer<QtColorEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtColorEditorFactory)
     Q_DISABLE_COPY(QtColorEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &))
@@ -384,7 +384,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtFontPropertyManager *manager);
 private:
-    QtFontEditorFactoryPrivate *d_ptr;
+    QScopedPointer<QtFontEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtFontEditorFactory)
     Q_DISABLE_COPY(QtFontEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &))
diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
index ee82065e47..31a2135159 100644
--- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
+++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
@@ -476,9 +476,8 @@ void QtGroupBoxPropertyBrowserPrivate::updateItem(WidgetItem *item)
     Creates a property browser with the given \a parent.
 */
 QtGroupBoxPropertyBrowser::QtGroupBoxPropertyBrowser(QWidget *parent)
-    : QtAbstractPropertyBrowser(parent)
+    : QtAbstractPropertyBrowser(parent), d_ptr(new QtGroupBoxPropertyBrowserPrivate)
 {
-    d_ptr = new QtGroupBoxPropertyBrowserPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->init(this);
@@ -499,7 +498,6 @@ QtGroupBoxPropertyBrowser::~QtGroupBoxPropertyBrowser()
     const QMap<QtGroupBoxPropertyBrowserPrivate::WidgetItem *, QtBrowserItem *>::ConstIterator icend = d_ptr->m_itemToIndex.constEnd();
     for (QMap<QtGroupBoxPropertyBrowserPrivate::WidgetItem *, QtBrowserItem *>::ConstIterator it = d_ptr->m_itemToIndex.constBegin(); it != icend; ++it)
         delete it.key();
-    delete d_ptr;
 }
 
 /*!
diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
index 2d8ae919bc..1cfda63089 100644
--- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
@@ -63,7 +63,7 @@ protected:
 
 private:
 
-    QtGroupBoxPropertyBrowserPrivate *d_ptr;
+    QScopedPointer<QtGroupBoxPropertyBrowserPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser)
     Q_DISABLE_COPY(QtGroupBoxPropertyBrowser)
     Q_PRIVATE_SLOT(d_func(), void slotUpdate())
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp
index e20fca4a22..ebe9417f93 100644
--- a/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp
@@ -142,8 +142,8 @@ public:
     \sa QtAbstractPropertyManager::addProperty()
 */
 QtProperty::QtProperty(QtAbstractPropertyManager *manager)
+    : d_ptr(new QtPropertyPrivate(manager))
 {
-    d_ptr = new QtPropertyPrivate(manager);
     d_ptr->q_ptr = this;
 }
 
@@ -177,7 +177,6 @@ QtProperty::~QtProperty()
         QtProperty *property = itParent.next();
         property->d_ptr->m_subItems.removeAll(this);
     }
-    delete d_ptr;
 }
 
 /*!
@@ -638,9 +637,8 @@ void QtAbstractPropertyManagerPrivate::propertyInserted(QtProperty *property,
     Creates an abstract property manager with the given \a parent.
 */
 QtAbstractPropertyManager::QtAbstractPropertyManager(QObject *parent)
-    : QObject(parent)
+    : QObject(parent), d_ptr(new QtAbstractPropertyManagerPrivate)
 {
-    d_ptr = new QtAbstractPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
 }
@@ -652,7 +650,6 @@ QtAbstractPropertyManager::QtAbstractPropertyManager(QObject *parent)
 QtAbstractPropertyManager::~QtAbstractPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -1167,14 +1164,13 @@ QtAbstractPropertyBrowser *QtBrowserItem::browser() const
 }
 
 QtBrowserItem::QtBrowserItem(QtAbstractPropertyBrowser *browser, QtProperty *property, QtBrowserItem *parent)
+    : d_ptr(new QtBrowserItemPrivate(browser, property, parent))
 {
-    d_ptr = new QtBrowserItemPrivate(browser, property, parent);
     d_ptr->q_ptr = this;
 }
 
 QtBrowserItem::~QtBrowserItem()
 {
-    delete d_ptr;
 }
 
 
@@ -1646,9 +1642,8 @@ void QtAbstractPropertyBrowserPrivate::slotPropertyDataChanged(QtProperty *prope
     Creates an abstract property browser with the given \a parent.
 */
 QtAbstractPropertyBrowser::QtAbstractPropertyBrowser(QWidget *parent)
-    : QWidget(parent)
+    : QWidget(parent), d_ptr(new QtAbstractPropertyBrowserPrivate)
 {
-    d_ptr = new QtAbstractPropertyBrowserPrivate;
     d_ptr->q_ptr = this;
 
 }
@@ -1671,7 +1666,6 @@ QtAbstractPropertyBrowser::~QtAbstractPropertyBrowser()
     QListIterator<QtBrowserItem *> itItem(indexes);
     while (itItem.hasNext())
         d_ptr->clearIndex(itItem.next());
-    delete d_ptr;
 }
 
 /*!
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.h b/tools/shared/qtpropertybrowser/qtpropertybrowser.h
index 55b0da05c2..19996c0c67 100644
--- a/tools/shared/qtpropertybrowser/qtpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.h
@@ -85,7 +85,7 @@ protected:
     void propertyChanged();
 private:
     friend class QtAbstractPropertyManager;
-    QtPropertyPrivate *d_ptr;
+    QScopedPointer<QtPropertyPrivate> d_ptr;
 };
 
 class QtAbstractPropertyManagerPrivate;
@@ -118,7 +118,7 @@ protected:
     virtual QtProperty *createProperty();
 private:
     friend class QtProperty;
-    QtAbstractPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtAbstractPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtAbstractPropertyManager)
     Q_DISABLE_COPY(QtAbstractPropertyManager)
 };
@@ -235,7 +235,7 @@ public:
 private:
     explicit QtBrowserItem(QtAbstractPropertyBrowser *browser, QtProperty *property, QtBrowserItem *parent);
     ~QtBrowserItem();
-    QtBrowserItemPrivate *d_ptr;
+    QScopedPointer<QtBrowserItemPrivate> d_ptr;
     friend class QtAbstractPropertyBrowserPrivate;
 };
 
@@ -292,7 +292,7 @@ private:
     bool addFactory(QtAbstractPropertyManager *abstractManager,
                 QtAbstractEditorFactoryBase *abstractFactory);
 
-    QtAbstractPropertyBrowserPrivate *d_ptr;
+    QScopedPointer<QtAbstractPropertyBrowserPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser)
     Q_DISABLE_COPY(QtAbstractPropertyBrowser)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *,
diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.cpp b/tools/shared/qtpropertybrowser/qtpropertymanager.cpp
index 50f3306fb5..43bd68afb5 100644
--- a/tools/shared/qtpropertybrowser/qtpropertymanager.cpp
+++ b/tools/shared/qtpropertybrowser/qtpropertymanager.cpp
@@ -677,9 +677,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtIntPropertyManager::QtIntPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtIntPropertyManagerPrivate)
 {
-    d_ptr = new QtIntPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 }
 
@@ -689,7 +688,6 @@ QtIntPropertyManager::QtIntPropertyManager(QObject *parent)
 QtIntPropertyManager::~QtIntPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -762,7 +760,7 @@ QString QtIntPropertyManager::valueText(const QtProperty *property) const
 void QtIntPropertyManager::setValue(QtProperty *property, int val)
 {
     void (QtIntPropertyManagerPrivate::*setSubPropertyValue)(QtProperty *, int) = 0;
-    setValueInRange<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int>(this, d_ptr,
+    setValueInRange<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int>(this, d_ptr.data(),
                 &QtIntPropertyManager::propertyChanged,
                 &QtIntPropertyManager::valueChanged,
                 property, val, setSubPropertyValue);
@@ -779,7 +777,7 @@ void QtIntPropertyManager::setValue(QtProperty *property, int val)
 */
 void QtIntPropertyManager::setMinimum(QtProperty *property, int minVal)
 {
-    setMinimumValue<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int, QtIntPropertyManagerPrivate::Data>(this, d_ptr,
+    setMinimumValue<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int, QtIntPropertyManagerPrivate::Data>(this, d_ptr.data(),
                 &QtIntPropertyManager::propertyChanged,
                 &QtIntPropertyManager::valueChanged,
                 &QtIntPropertyManager::rangeChanged,
@@ -797,7 +795,7 @@ void QtIntPropertyManager::setMinimum(QtProperty *property, int minVal)
 */
 void QtIntPropertyManager::setMaximum(QtProperty *property, int maxVal)
 {
-    setMaximumValue<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int, QtIntPropertyManagerPrivate::Data>(this, d_ptr,
+    setMaximumValue<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int, QtIntPropertyManagerPrivate::Data>(this, d_ptr.data(),
                 &QtIntPropertyManager::propertyChanged,
                 &QtIntPropertyManager::valueChanged,
                 &QtIntPropertyManager::rangeChanged,
@@ -821,7 +819,7 @@ void QtIntPropertyManager::setMaximum(QtProperty *property, int maxVal)
 void QtIntPropertyManager::setRange(QtProperty *property, int minVal, int maxVal)
 {
     void (QtIntPropertyManagerPrivate::*setSubPropertyRange)(QtProperty *, int, int, int) = 0;
-    setBorderValues<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int>(this, d_ptr,
+    setBorderValues<int, QtIntPropertyManagerPrivate, QtIntPropertyManager, int>(this, d_ptr.data(),
                 &QtIntPropertyManager::propertyChanged,
                 &QtIntPropertyManager::valueChanged,
                 &QtIntPropertyManager::rangeChanged,
@@ -968,9 +966,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtDoublePropertyManager::QtDoublePropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtDoublePropertyManagerPrivate)
 {
-    d_ptr = new QtDoublePropertyManagerPrivate;
     d_ptr->q_ptr = this;
 }
 
@@ -980,7 +977,6 @@ QtDoublePropertyManager::QtDoublePropertyManager(QObject *parent)
 QtDoublePropertyManager::~QtDoublePropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -1063,7 +1059,7 @@ QString QtDoublePropertyManager::valueText(const QtProperty *property) const
 void QtDoublePropertyManager::setValue(QtProperty *property, double val)
 {
     void (QtDoublePropertyManagerPrivate::*setSubPropertyValue)(QtProperty *, double) = 0;
-    setValueInRange<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double>(this, d_ptr,
+    setValueInRange<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double>(this, d_ptr.data(),
                 &QtDoublePropertyManager::propertyChanged,
                 &QtDoublePropertyManager::valueChanged,
                 property, val, setSubPropertyValue);
@@ -1140,7 +1136,7 @@ void QtDoublePropertyManager::setDecimals(QtProperty *property, int prec)
 */
 void QtDoublePropertyManager::setMinimum(QtProperty *property, double minVal)
 {
-    setMinimumValue<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double, QtDoublePropertyManagerPrivate::Data>(this, d_ptr,
+    setMinimumValue<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double, QtDoublePropertyManagerPrivate::Data>(this, d_ptr.data(),
                 &QtDoublePropertyManager::propertyChanged,
                 &QtDoublePropertyManager::valueChanged,
                 &QtDoublePropertyManager::rangeChanged,
@@ -1158,7 +1154,7 @@ void QtDoublePropertyManager::setMinimum(QtProperty *property, double minVal)
 */
 void QtDoublePropertyManager::setMaximum(QtProperty *property, double maxVal)
 {
-    setMaximumValue<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double, QtDoublePropertyManagerPrivate::Data>(this, d_ptr,
+    setMaximumValue<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double, QtDoublePropertyManagerPrivate::Data>(this, d_ptr.data(),
                 &QtDoublePropertyManager::propertyChanged,
                 &QtDoublePropertyManager::valueChanged,
                 &QtDoublePropertyManager::rangeChanged,
@@ -1182,7 +1178,7 @@ void QtDoublePropertyManager::setMaximum(QtProperty *property, double maxVal)
 void QtDoublePropertyManager::setRange(QtProperty *property, double minVal, double maxVal)
 {
     void (QtDoublePropertyManagerPrivate::*setSubPropertyRange)(QtProperty *, double, double, double) = 0;
-    setBorderValues<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double>(this, d_ptr,
+    setBorderValues<double, QtDoublePropertyManagerPrivate, QtDoublePropertyManager, double>(this, d_ptr.data(),
                 &QtDoublePropertyManager::propertyChanged,
                 &QtDoublePropertyManager::valueChanged,
                 &QtDoublePropertyManager::rangeChanged,
@@ -1273,9 +1269,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtStringPropertyManager::QtStringPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtStringPropertyManagerPrivate)
 {
-    d_ptr = new QtStringPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 }
 
@@ -1285,7 +1280,6 @@ QtStringPropertyManager::QtStringPropertyManager(QObject *parent)
 QtStringPropertyManager::~QtStringPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -1437,9 +1431,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtBoolPropertyManager::QtBoolPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtBoolPropertyManagerPrivate)
 {
-    d_ptr = new QtBoolPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 }
 
@@ -1449,7 +1442,6 @@ QtBoolPropertyManager::QtBoolPropertyManager(QObject *parent)
 QtBoolPropertyManager::~QtBoolPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -1630,9 +1622,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtDatePropertyManager::QtDatePropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtDatePropertyManagerPrivate)
 {
-    d_ptr = new QtDatePropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     QLocale loc;
@@ -1645,7 +1636,6 @@ QtDatePropertyManager::QtDatePropertyManager(QObject *parent)
 QtDatePropertyManager::~QtDatePropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -1706,7 +1696,7 @@ QString QtDatePropertyManager::valueText(const QtProperty *property) const
 void QtDatePropertyManager::setValue(QtProperty *property, const QDate &val)
 {
     void (QtDatePropertyManagerPrivate::*setSubPropertyValue)(QtProperty *, const QDate &) = 0;
-    setValueInRange<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, const QDate>(this, d_ptr,
+    setValueInRange<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, const QDate>(this, d_ptr.data(),
                 &QtDatePropertyManager::propertyChanged,
                 &QtDatePropertyManager::valueChanged,
                 property, val, setSubPropertyValue);
@@ -1723,7 +1713,7 @@ void QtDatePropertyManager::setValue(QtProperty *property, const QDate &val)
 */
 void QtDatePropertyManager::setMinimum(QtProperty *property, const QDate &minVal)
 {
-    setMinimumValue<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate, QtDatePropertyManagerPrivate::Data>(this, d_ptr,
+    setMinimumValue<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate, QtDatePropertyManagerPrivate::Data>(this, d_ptr.data(),
                 &QtDatePropertyManager::propertyChanged,
                 &QtDatePropertyManager::valueChanged,
                 &QtDatePropertyManager::rangeChanged,
@@ -1741,7 +1731,7 @@ void QtDatePropertyManager::setMinimum(QtProperty *property, const QDate &minVal
 */
 void QtDatePropertyManager::setMaximum(QtProperty *property, const QDate &maxVal)
 {
-    setMaximumValue<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate, QtDatePropertyManagerPrivate::Data>(this, d_ptr,
+    setMaximumValue<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate, QtDatePropertyManagerPrivate::Data>(this, d_ptr.data(),
                 &QtDatePropertyManager::propertyChanged,
                 &QtDatePropertyManager::valueChanged,
                 &QtDatePropertyManager::rangeChanged,
@@ -1766,7 +1756,7 @@ void QtDatePropertyManager::setRange(QtProperty *property, const QDate &minVal,
 {
     void (QtDatePropertyManagerPrivate::*setSubPropertyRange)(QtProperty *, const QDate &,
           const QDate &, const QDate &) = 0;
-    setBorderValues<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate>(this, d_ptr,
+    setBorderValues<const QDate &, QtDatePropertyManagerPrivate, QtDatePropertyManager, QDate>(this, d_ptr.data(),
                 &QtDatePropertyManager::propertyChanged,
                 &QtDatePropertyManager::valueChanged,
                 &QtDatePropertyManager::rangeChanged,
@@ -1835,9 +1825,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtTimePropertyManager::QtTimePropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtTimePropertyManagerPrivate)
 {
-    d_ptr = new QtTimePropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     QLocale loc;
@@ -1850,7 +1839,6 @@ QtTimePropertyManager::QtTimePropertyManager(QObject *parent)
 QtTimePropertyManager::~QtTimePropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -1950,9 +1938,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtDateTimePropertyManager::QtDateTimePropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtDateTimePropertyManagerPrivate)
 {
-    d_ptr = new QtDateTimePropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     QLocale loc;
@@ -1967,7 +1954,6 @@ QtDateTimePropertyManager::QtDateTimePropertyManager(QObject *parent)
 QtDateTimePropertyManager::~QtDateTimePropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -2068,9 +2054,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtKeySequencePropertyManager::QtKeySequencePropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtKeySequencePropertyManagerPrivate)
 {
-    d_ptr = new QtKeySequencePropertyManagerPrivate;
     d_ptr->q_ptr = this;
 }
 
@@ -2080,7 +2065,6 @@ QtKeySequencePropertyManager::QtKeySequencePropertyManager(QObject *parent)
 QtKeySequencePropertyManager::~QtKeySequencePropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -2179,9 +2163,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtCharPropertyManager::QtCharPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtCharPropertyManagerPrivate)
 {
-    d_ptr = new QtCharPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 }
 
@@ -2191,7 +2174,6 @@ QtCharPropertyManager::QtCharPropertyManager(QObject *parent)
 QtCharPropertyManager::~QtCharPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -2347,9 +2329,8 @@ void QtLocalePropertyManagerPrivate::slotPropertyDestroyed(QtProperty *property)
     Creates a manager with the given \a parent.
 */
 QtLocalePropertyManager::QtLocalePropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtLocalePropertyManagerPrivate)
 {
-    d_ptr = new QtLocalePropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_enumPropertyManager = new QtEnumPropertyManager(this);
@@ -2366,7 +2347,6 @@ QtLocalePropertyManager::QtLocalePropertyManager(QObject *parent)
 QtLocalePropertyManager::~QtLocalePropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -2586,9 +2566,8 @@ void QtPointPropertyManagerPrivate::slotPropertyDestroyed(QtProperty *property)
     Creates a manager with the given \a parent.
 */
 QtPointPropertyManager::QtPointPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtPointPropertyManagerPrivate)
 {
-    d_ptr = new QtPointPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
@@ -2604,7 +2583,6 @@ QtPointPropertyManager::QtPointPropertyManager(QObject *parent)
 QtPointPropertyManager::~QtPointPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -2818,9 +2796,8 @@ void QtPointFPropertyManagerPrivate::slotPropertyDestroyed(QtProperty *property)
     Creates a manager with the given \a parent.
 */
 QtPointFPropertyManager::QtPointFPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtPointFPropertyManagerPrivate)
 {
-    d_ptr = new QtPointFPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_doublePropertyManager = new QtDoublePropertyManager(this);
@@ -2836,7 +2813,6 @@ QtPointFPropertyManager::QtPointFPropertyManager(QObject *parent)
 QtPointFPropertyManager::~QtPointFPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -3131,9 +3107,8 @@ void QtSizePropertyManagerPrivate::setRange(QtProperty *property,
     Creates a manager with the given \a parent.
 */
 QtSizePropertyManager::QtSizePropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtSizePropertyManagerPrivate)
 {
-    d_ptr = new QtSizePropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
@@ -3149,7 +3124,6 @@ QtSizePropertyManager::QtSizePropertyManager(QObject *parent)
 QtSizePropertyManager::~QtSizePropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -3226,7 +3200,7 @@ QString QtSizePropertyManager::valueText(const QtProperty *property) const
 */
 void QtSizePropertyManager::setValue(QtProperty *property, const QSize &val)
 {
-    setValueInRange<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, const QSize>(this, d_ptr,
+    setValueInRange<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, const QSize>(this, d_ptr.data(),
                 &QtSizePropertyManager::propertyChanged,
                 &QtSizePropertyManager::valueChanged,
                 property, val, &QtSizePropertyManagerPrivate::setValue);
@@ -3243,7 +3217,7 @@ void QtSizePropertyManager::setValue(QtProperty *property, const QSize &val)
 */
 void QtSizePropertyManager::setMinimum(QtProperty *property, const QSize &minVal)
 {
-    setBorderValue<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize, QtSizePropertyManagerPrivate::Data>(this, d_ptr,
+    setBorderValue<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize, QtSizePropertyManagerPrivate::Data>(this, d_ptr.data(),
                 &QtSizePropertyManager::propertyChanged,
                 &QtSizePropertyManager::valueChanged,
                 &QtSizePropertyManager::rangeChanged,
@@ -3264,7 +3238,7 @@ void QtSizePropertyManager::setMinimum(QtProperty *property, const QSize &minVal
 */
 void QtSizePropertyManager::setMaximum(QtProperty *property, const QSize &maxVal)
 {
-    setBorderValue<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize, QtSizePropertyManagerPrivate::Data>(this, d_ptr,
+    setBorderValue<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize, QtSizePropertyManagerPrivate::Data>(this, d_ptr.data(),
                 &QtSizePropertyManager::propertyChanged,
                 &QtSizePropertyManager::valueChanged,
                 &QtSizePropertyManager::rangeChanged,
@@ -3290,7 +3264,7 @@ void QtSizePropertyManager::setMaximum(QtProperty *property, const QSize &maxVal
 */
 void QtSizePropertyManager::setRange(QtProperty *property, const QSize &minVal, const QSize &maxVal)
 {
-    setBorderValues<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize>(this, d_ptr,
+    setBorderValues<const QSize &, QtSizePropertyManagerPrivate, QtSizePropertyManager, QSize>(this, d_ptr.data(),
                 &QtSizePropertyManager::propertyChanged,
                 &QtSizePropertyManager::valueChanged,
                 &QtSizePropertyManager::rangeChanged,
@@ -3487,9 +3461,8 @@ void QtSizeFPropertyManagerPrivate::setRange(QtProperty *property,
     Creates a manager with the given \a parent.
 */
 QtSizeFPropertyManager::QtSizeFPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtSizeFPropertyManagerPrivate)
 {
-    d_ptr = new QtSizeFPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_doublePropertyManager = new QtDoublePropertyManager(this);
@@ -3505,7 +3478,6 @@ QtSizeFPropertyManager::QtSizeFPropertyManager(QObject *parent)
 QtSizeFPropertyManager::~QtSizeFPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -3593,7 +3565,7 @@ QString QtSizeFPropertyManager::valueText(const QtProperty *property) const
 */
 void QtSizeFPropertyManager::setValue(QtProperty *property, const QSizeF &val)
 {
-    setValueInRange<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF>(this, d_ptr,
+    setValueInRange<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF>(this, d_ptr.data(),
                 &QtSizeFPropertyManager::propertyChanged,
                 &QtSizeFPropertyManager::valueChanged,
                 property, val, &QtSizeFPropertyManagerPrivate::setValue);
@@ -3644,7 +3616,7 @@ void QtSizeFPropertyManager::setDecimals(QtProperty *property, int prec)
 */
 void QtSizeFPropertyManager::setMinimum(QtProperty *property, const QSizeF &minVal)
 {
-    setBorderValue<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF, QtSizeFPropertyManagerPrivate::Data>(this, d_ptr,
+    setBorderValue<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF, QtSizeFPropertyManagerPrivate::Data>(this, d_ptr.data(),
                 &QtSizeFPropertyManager::propertyChanged,
                 &QtSizeFPropertyManager::valueChanged,
                 &QtSizeFPropertyManager::rangeChanged,
@@ -3665,7 +3637,7 @@ void QtSizeFPropertyManager::setMinimum(QtProperty *property, const QSizeF &minV
 */
 void QtSizeFPropertyManager::setMaximum(QtProperty *property, const QSizeF &maxVal)
 {
-    setBorderValue<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF, QtSizeFPropertyManagerPrivate::Data>(this, d_ptr,
+    setBorderValue<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF, QtSizeFPropertyManagerPrivate::Data>(this, d_ptr.data(),
                 &QtSizeFPropertyManager::propertyChanged,
                 &QtSizeFPropertyManager::valueChanged,
                 &QtSizeFPropertyManager::rangeChanged,
@@ -3691,7 +3663,7 @@ void QtSizeFPropertyManager::setMaximum(QtProperty *property, const QSizeF &maxV
 */
 void QtSizeFPropertyManager::setRange(QtProperty *property, const QSizeF &minVal, const QSizeF &maxVal)
 {
-    setBorderValues<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF>(this, d_ptr,
+    setBorderValues<const QSizeF &, QtSizeFPropertyManagerPrivate, QtSizeFPropertyManager, QSizeF>(this, d_ptr.data(),
                 &QtSizeFPropertyManager::propertyChanged,
                 &QtSizeFPropertyManager::valueChanged,
                 &QtSizeFPropertyManager::rangeChanged,
@@ -3903,9 +3875,8 @@ void QtRectPropertyManagerPrivate::setConstraint(QtProperty *property,
     Creates a manager with the given \a parent.
 */
 QtRectPropertyManager::QtRectPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtRectPropertyManagerPrivate)
 {
-    d_ptr = new QtRectPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
@@ -3921,7 +3892,6 @@ QtRectPropertyManager::QtRectPropertyManager(QObject *parent)
 QtRectPropertyManager::~QtRectPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -4325,9 +4295,8 @@ void QtRectFPropertyManagerPrivate::setConstraint(QtProperty *property,
     Creates a manager with the given \a parent.
 */
 QtRectFPropertyManager::QtRectFPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtRectFPropertyManagerPrivate)
 {
-    d_ptr = new QtRectFPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_doublePropertyManager = new QtDoublePropertyManager(this);
@@ -4343,7 +4312,6 @@ QtRectFPropertyManager::QtRectFPropertyManager(QObject *parent)
 QtRectFPropertyManager::~QtRectFPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -4710,9 +4678,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtEnumPropertyManager::QtEnumPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtEnumPropertyManagerPrivate)
 {
-    d_ptr = new QtEnumPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 }
 
@@ -4722,7 +4689,6 @@ QtEnumPropertyManager::QtEnumPropertyManager(QObject *parent)
 QtEnumPropertyManager::~QtEnumPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -5022,9 +4988,8 @@ void QtFlagPropertyManagerPrivate::slotPropertyDestroyed(QtProperty *property)
     Creates a manager with the given \a parent.
 */
 QtFlagPropertyManager::QtFlagPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtFlagPropertyManagerPrivate)
 {
-    d_ptr = new QtFlagPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_boolPropertyManager = new QtBoolPropertyManager(this);
@@ -5040,7 +5005,6 @@ QtFlagPropertyManager::QtFlagPropertyManager(QObject *parent)
 QtFlagPropertyManager::~QtFlagPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -5350,9 +5314,8 @@ void QtSizePolicyPropertyManagerPrivate::slotPropertyDestroyed(QtProperty *prope
     Creates a manager with the given \a parent.
 */
 QtSizePolicyPropertyManager::QtSizePolicyPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtSizePolicyPropertyManagerPrivate)
 {
-    d_ptr = new QtSizePolicyPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
@@ -5374,7 +5337,6 @@ QtSizePolicyPropertyManager::QtSizePolicyPropertyManager(QObject *parent)
 QtSizePolicyPropertyManager::~QtSizePolicyPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -5762,9 +5724,8 @@ void QtFontPropertyManagerPrivate::slotFontDatabaseDelayedChange()
     Creates a manager with the given \a parent.
 */
 QtFontPropertyManager::QtFontPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtFontPropertyManagerPrivate)
 {
-    d_ptr = new QtFontPropertyManagerPrivate;
     d_ptr->q_ptr = this;
     QObject::connect(qApp, SIGNAL(fontDatabaseChanged()), this, SLOT(slotFontDatabaseChanged()));
 
@@ -5792,7 +5753,6 @@ QtFontPropertyManager::QtFontPropertyManager(QObject *parent)
 QtFontPropertyManager::~QtFontPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -6140,9 +6100,8 @@ void QtColorPropertyManagerPrivate::slotPropertyDestroyed(QtProperty *property)
     Creates a manager with the given \a parent.
 */
 QtColorPropertyManager::QtColorPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtColorPropertyManagerPrivate)
 {
-    d_ptr = new QtColorPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_intPropertyManager = new QtIntPropertyManager(this);
@@ -6159,7 +6118,6 @@ QtColorPropertyManager::QtColorPropertyManager(QObject *parent)
 QtColorPropertyManager::~QtColorPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -6364,9 +6322,8 @@ public:
     Creates a manager with the given \a parent.
 */
 QtCursorPropertyManager::QtCursorPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtCursorPropertyManagerPrivate)
 {
-    d_ptr = new QtCursorPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 }
 
@@ -6376,7 +6333,6 @@ QtCursorPropertyManager::QtCursorPropertyManager(QObject *parent)
 QtCursorPropertyManager::~QtCursorPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.h b/tools/shared/qtpropertybrowser/qtpropertymanager.h
index 5e60de0b0a..31c308e73d 100644
--- a/tools/shared/qtpropertybrowser/qtpropertymanager.h
+++ b/tools/shared/qtpropertybrowser/qtpropertymanager.h
@@ -94,7 +94,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtIntPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtIntPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtIntPropertyManager)
     Q_DISABLE_COPY(QtIntPropertyManager)
 };
@@ -120,7 +120,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtBoolPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtBoolPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtBoolPropertyManager)
     Q_DISABLE_COPY(QtBoolPropertyManager)
 };
@@ -157,7 +157,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtDoublePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtDoublePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDoublePropertyManager)
     Q_DISABLE_COPY(QtDoublePropertyManager)
 };
@@ -185,7 +185,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtStringPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtStringPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtStringPropertyManager)
     Q_DISABLE_COPY(QtStringPropertyManager)
 };
@@ -216,7 +216,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtDatePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtDatePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDatePropertyManager)
     Q_DISABLE_COPY(QtDatePropertyManager)
 };
@@ -241,7 +241,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtTimePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtTimePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtTimePropertyManager)
     Q_DISABLE_COPY(QtTimePropertyManager)
 };
@@ -266,7 +266,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtDateTimePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtDateTimePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDateTimePropertyManager)
     Q_DISABLE_COPY(QtDateTimePropertyManager)
 };
@@ -291,7 +291,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtKeySequencePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtKeySequencePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtKeySequencePropertyManager)
     Q_DISABLE_COPY(QtKeySequencePropertyManager)
 };
@@ -316,7 +316,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtCharPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtCharPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCharPropertyManager)
     Q_DISABLE_COPY(QtCharPropertyManager)
 };
@@ -344,7 +344,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtLocalePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtLocalePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtLocalePropertyManager)
     Q_DISABLE_COPY(QtLocalePropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int))
@@ -373,7 +373,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtPointPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtPointPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtPointPropertyManager)
     Q_DISABLE_COPY(QtPointPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
@@ -405,7 +405,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtPointFPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtPointFPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtPointFPropertyManager)
     Q_DISABLE_COPY(QtPointFPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double))
@@ -440,7 +440,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtSizePropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtSizePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSizePropertyManager)
     Q_DISABLE_COPY(QtSizePropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
@@ -478,7 +478,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtSizeFPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtSizeFPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSizeFPropertyManager)
     Q_DISABLE_COPY(QtSizeFPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double))
@@ -510,7 +510,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtRectPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtRectPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtRectPropertyManager)
     Q_DISABLE_COPY(QtRectPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
@@ -545,7 +545,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtRectFPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtRectFPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtRectFPropertyManager)
     Q_DISABLE_COPY(QtRectFPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double))
@@ -579,7 +579,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtEnumPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtEnumPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtEnumPropertyManager)
     Q_DISABLE_COPY(QtEnumPropertyManager)
 };
@@ -609,7 +609,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtFlagPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtFlagPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtFlagPropertyManager)
     Q_DISABLE_COPY(QtFlagPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool))
@@ -639,7 +639,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtSizePolicyPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtSizePolicyPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager)
     Q_DISABLE_COPY(QtSizePolicyPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
@@ -672,7 +672,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtFontPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtFontPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtFontPropertyManager)
     Q_DISABLE_COPY(QtFontPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
@@ -706,7 +706,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtColorPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtColorPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtColorPropertyManager)
     Q_DISABLE_COPY(QtColorPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
@@ -736,7 +736,7 @@ protected:
     virtual void initializeProperty(QtProperty *property);
     virtual void uninitializeProperty(QtProperty *property);
 private:
-    QtCursorPropertyManagerPrivate *d_ptr;
+    QScopedPointer<QtCursorPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCursorPropertyManager)
     Q_DISABLE_COPY(QtCursorPropertyManager)
 };
diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp
index 950272c5cc..51416a8a5f 100644
--- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp
+++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp
@@ -726,9 +726,8 @@ void QtTreePropertyBrowserPrivate::editItem(QtBrowserItem *browserItem)
     Creates a property browser with the given \a parent.
 */
 QtTreePropertyBrowser::QtTreePropertyBrowser(QWidget *parent)
-    : QtAbstractPropertyBrowser(parent)
+    : QtAbstractPropertyBrowser(parent), d_ptr(new QtTreePropertyBrowserPrivate)
 {
-    d_ptr = new QtTreePropertyBrowserPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->init(this);
@@ -747,7 +746,6 @@ QtTreePropertyBrowser::QtTreePropertyBrowser(QWidget *parent)
 */
 QtTreePropertyBrowser::~QtTreePropertyBrowser()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h
index c83d36cdef..ebcf185b42 100644
--- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h
@@ -118,7 +118,7 @@ protected:
 
 private:
 
-    QtTreePropertyBrowserPrivate *d_ptr;
+    QScopedPointer<QtTreePropertyBrowserPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtTreePropertyBrowser)
     Q_DISABLE_COPY(QtTreePropertyBrowser)
 
diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.cpp b/tools/shared/qtpropertybrowser/qtvariantproperty.cpp
index cdb0c2947e..b80d21dab6 100644
--- a/tools/shared/qtpropertybrowser/qtvariantproperty.cpp
+++ b/tools/shared/qtpropertybrowser/qtvariantproperty.cpp
@@ -188,9 +188,8 @@ public:
     \sa QtVariantPropertyManager
 */
 QtVariantProperty::QtVariantProperty(QtVariantPropertyManager *manager)
-    : QtProperty(manager),  d_ptr(new QtVariantPropertyPrivate(manager))
+    : QtProperty(manager), d_ptr(new QtVariantPropertyPrivate(manager))
 {
-
 }
 
 /*!
@@ -200,7 +199,6 @@ QtVariantProperty::QtVariantProperty(QtVariantPropertyManager *manager)
 */
 QtVariantProperty::~QtVariantProperty()
 {
-    delete d_ptr;
 }
 
 /*!
@@ -912,9 +910,8 @@ void QtVariantPropertyManagerPrivate::slotFlagNamesChanged(QtProperty *property,
     Creates a manager with the given \a parent.
 */
 QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent)
+    : QtAbstractPropertyManager(parent), d_ptr(new QtVariantPropertyManagerPrivate)
 {
-    d_ptr = new QtVariantPropertyManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->m_creatingProperty = false;
@@ -1234,7 +1231,6 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
 QtVariantPropertyManager::~QtVariantPropertyManager()
 {
     clear();
-    delete d_ptr;
 }
 
 /*!
@@ -1929,9 +1925,8 @@ public:
     Creates a factory with the given \a parent.
 */
 QtVariantEditorFactory::QtVariantEditorFactory(QObject *parent)
-    : QtAbstractEditorFactory<QtVariantPropertyManager>(parent)
+    : QtAbstractEditorFactory<QtVariantPropertyManager>(parent), d_ptr(new QtVariantEditorFactoryPrivate())
 {
-    d_ptr = new QtVariantEditorFactoryPrivate();
     d_ptr->q_ptr = this;
 
     d_ptr->m_spinBoxFactory = new QtSpinBoxFactory(this);
@@ -1993,7 +1988,6 @@ QtVariantEditorFactory::QtVariantEditorFactory(QObject *parent)
 */
 QtVariantEditorFactory::~QtVariantEditorFactory()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.h b/tools/shared/qtpropertybrowser/qtvariantproperty.h
index bfc9c44bde..4f32c57723 100644
--- a/tools/shared/qtpropertybrowser/qtvariantproperty.h
+++ b/tools/shared/qtpropertybrowser/qtvariantproperty.h
@@ -67,7 +67,7 @@ protected:
     QtVariantProperty(QtVariantPropertyManager *manager);
 private:
     friend class QtVariantPropertyManager;
-    class QtVariantPropertyPrivate *d_ptr;
+    QScopedPointer<class QtVariantPropertyPrivate> d_ptr;
 };
 
 class QtVariantPropertyManager : public QtAbstractPropertyManager
@@ -111,7 +111,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
     virtual QtProperty *createProperty();
 private:
-    class QtVariantPropertyManagerPrivate *d_ptr;
+    QScopedPointer<class QtVariantPropertyManagerPrivate> d_ptr;
     Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
     Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int))
@@ -165,7 +165,7 @@ protected:
                 QWidget *parent);
     void disconnectPropertyManager(QtVariantPropertyManager *manager);
 private:
-    class QtVariantEditorFactoryPrivate *d_ptr;
+    QScopedPointer<class QtVariantEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtVariantEditorFactory)
     Q_DISABLE_COPY(QtVariantEditorFactory)
 };
diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.cpp b/tools/shared/qttoolbardialog/qttoolbardialog.cpp
index c313709dc6..8ceb5821d4 100644
--- a/tools/shared/qttoolbardialog/qttoolbardialog.cpp
+++ b/tools/shared/qttoolbardialog/qttoolbardialog.cpp
@@ -119,7 +119,7 @@ signals:
     void toolBarChanged(QToolBar *toolBar, const QList<QAction *> &actions);
 
 private:
-    QtFullToolBarManagerPrivate *d_ptr;
+    QScopedPointer<QtFullToolBarManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtFullToolBarManager)
     Q_DISABLE_COPY(QtFullToolBarManager)
 };
@@ -443,15 +443,13 @@ QToolBar *QtFullToolBarManagerPrivate::toolBarByName(const QString &toolBarName)
 //////////////////////////////
 
 QtFullToolBarManager::QtFullToolBarManager(QObject *parent)
-    : QObject(parent)
+    : QObject(parent), d_ptr(new QtFullToolBarManagerPrivate)
 {
-    d_ptr = new QtFullToolBarManagerPrivate;
     d_ptr->q_ptr = this;
 }
 
 QtFullToolBarManager::~QtFullToolBarManager()
 {
-    delete d_ptr;
 }
 
 void QtFullToolBarManager::setMainWindow(QMainWindow *mainWindow)
@@ -831,9 +829,8 @@ public:
     Creates a toolbar manager with the given \a parent.
 */
 QtToolBarManager::QtToolBarManager(QObject *parent)
-    : QObject(parent)
+    : QObject(parent), d_ptr(new QtToolBarManagerPrivate)
 {
-    d_ptr = new QtToolBarManagerPrivate;
     d_ptr->q_ptr = this;
 
     d_ptr->manager = new QtFullToolBarManager(this);
@@ -844,7 +841,6 @@ QtToolBarManager::QtToolBarManager(QObject *parent)
 */
 QtToolBarManager::~QtToolBarManager()
 {
-    delete d_ptr;
 }
 
 /*!
@@ -1781,9 +1777,8 @@ void QtToolBarListWidget::dropEvent(QDropEvent *event)
     window \a flags.
 */
 QtToolBarDialog::QtToolBarDialog(QWidget *parent, Qt::WindowFlags flags)
-    : QDialog(parent, flags)
+    : QDialog(parent, flags), d_ptr(new QtToolBarDialogPrivate)
 {
-    d_ptr = new QtToolBarDialogPrivate;
     d_ptr->q_ptr = this;
     d_ptr->ui.setupUi(this);
     d_ptr->separatorText = tr("< S E P A R A T O R >");
@@ -1834,7 +1829,6 @@ QtToolBarDialog::QtToolBarDialog(QWidget *parent, Qt::WindowFlags flags)
 QtToolBarDialog::~QtToolBarDialog()
 {
     d_ptr->clearOld();
-    delete d_ptr;
 }
 
 /*!
diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.h b/tools/shared/qttoolbardialog/qttoolbardialog.h
index db4f70d5d1..9227b5668d 100644
--- a/tools/shared/qttoolbardialog/qttoolbardialog.h
+++ b/tools/shared/qttoolbardialog/qttoolbardialog.h
@@ -88,7 +88,7 @@ public:
 private:
 
     friend class QtToolBarDialog;
-    QtToolBarManagerPrivate *d_ptr;
+    QScopedPointer<QtToolBarManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtToolBarManager)
     Q_DISABLE_COPY(QtToolBarManager)
 };
@@ -112,7 +112,7 @@ protected:
 
 private:
 
-    QtToolBarDialogPrivate *d_ptr;
+    QScopedPointer<QtToolBarDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtToolBarDialog)
     Q_DISABLE_COPY(QtToolBarDialog)
 
diff --git a/util/s60pixelmetrics/bld.inf b/util/s60pixelmetrics/bld.inf
new file mode 100644
index 0000000000..748e8810d6
--- /dev/null
+++ b/util/s60pixelmetrics/bld.inf
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+PRJ_MMPFILES
+pm_mapper.mmp
+
+//  End of File
diff --git a/util/s60pixelmetrics/pixel_metrics.cpp b/util/s60pixelmetrics/pixel_metrics.cpp
new file mode 100644
index 0000000000..8925ebe0e1
--- /dev/null
+++ b/util/s60pixelmetrics/pixel_metrics.cpp
@@ -0,0 +1,1223 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pixel_metrics.h"
+
+#include <AknLayout2ScalableDef.h>
+#include <AknLayoutScalable_Avkon.cdl.h>
+#include <AknLayoutScalable_Apps.cdl.h>
+#include <AknUtils.h>
+
+// Version number for dynamic calculations. These are to be exported to static data,
+// so that we can keep dynamic and static values inline.
+// Please adjust version data if correcting dynamic PM calculations.
+const TInt KPMMajorVersion = 1;
+const TInt KPMMinorVersion = 14;
+
+TPixelMetricsVersion PixelMetrics::Version()
+    {
+    TPixelMetricsVersion version;
+    version.majorVersion = KPMMajorVersion;
+    version.minorVersion = KPMMinorVersion;
+    return version;
+    }
+
+TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
+    {
+    TInt value = -909;
+    // Main pane
+    TRect mainPaneRect;
+    AknLayoutUtils::LayoutMetricsRect(
+        AknLayoutUtils::EMainPane,
+        mainPaneRect );
+    // Screen
+    TRect screenRect;
+    AknLayoutUtils::LayoutMetricsRect(
+        AknLayoutUtils::EApplicationWindow,
+        screenRect );
+    // Navi pane
+    TRect naviPaneRect;
+    AknLayoutUtils::LayoutMetricsRect(
+        AknLayoutUtils::ENaviPane,
+        naviPaneRect );
+
+    TAknLayoutRect appWindow;
+    appWindow.LayoutRect( screenRect, AknLayoutScalable_Avkon::application_window(0) );
+
+    TInt variety = 0;
+    TBool landscape = EFalse;
+    if ( screenRect.iBr.iX > screenRect.iBr.iY )
+        {
+        // in landscape another variety is used
+        landscape = ETrue;
+        }
+    switch (metric)
+        {
+        case QStyle::PM_DockWidgetHandleExtent:
+            // what's this??? Not in S60
+            break;
+        case QStyle::PM_CheckListControllerSize:
+        case QStyle::PM_CheckListButtonSize:
+            {
+            // hierarchical menu - checkbox / radiobutton
+            // Area (width/height) of the checkbox/radio button in a Q3CheckListItem.
+            TAknLayoutRect listScrollPane;
+            listScrollPane.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::listscroll_gen_pane(0));
+            TAknLayoutRect listGenPane;
+            listGenPane.LayoutRect( listScrollPane.Rect(), AknLayoutScalable_Avkon::list_gen_pane(0));
+            TAknLayoutRect listHierarchyPane;
+            listHierarchyPane.LayoutRect( listGenPane.Rect(), AknLayoutScalable_Avkon::list_single_graphic_hl_pane(0));
+
+            TAknLayoutRect listHierarchyControllerPane;
+            listHierarchyPane.LayoutRect( listHierarchyPane.Rect(), AknLayoutScalable_Avkon::list_single_graphic_hl_pane_g3(0));
+            TAknLayoutRect listHierarchyPropertyPane;
+            listHierarchyPropertyPane.LayoutRect( listHierarchyPane.Rect(), AknLayoutScalable_Avkon::list_single_graphic_hl_pane_g2(0));
+
+            if (metric==QStyle::PM_CheckListControllerSize)value = Max( listHierarchyPane.Rect().Width(), listHierarchyPane.Rect().Width());
+            else value = Max( listHierarchyPropertyPane.Rect().Width(), listHierarchyPropertyPane.Rect().Width());
+            }
+            break;
+        case QStyle::PM_DialogButtonsSeparator:   //Distance between buttons in a dialog buttons widget.
+        case QStyle::PM_DialogButtonsButtonWidth: // Minimum width of a button in a dialog buttons widget.
+        case QStyle::PM_DialogButtonsButtonHeight:// Minimum height of a button in a dialog buttons widget.
+            {
+            TAknLayoutRect appWindow;
+            appWindow.LayoutRect( screenRect, AknLayoutScalable_Avkon::application_window(0) );
+            variety = 0;
+            if ( landscape )
+                {
+                variety = 2;
+                }
+            TAknLayoutRect areaBottomRect;
+            areaBottomRect.LayoutRect( appWindow.Rect(), AknLayoutScalable_Avkon::area_bottom_pane(variety) );
+
+            TAknLayoutRect controlPaneRect;
+            controlPaneRect.LayoutRect( areaBottomRect.Rect(), AknLayoutScalable_Avkon::control_pane() );
+            TAknLayoutText controlPaneLSKText;
+            TAknLayoutText controlPaneRSKText;
+            TAknLayoutText controlPaneMSKText;
+            variety = 0;
+            if (AknLayoutUtils::MSKEnabled())
+                {
+                variety = 3;
+                controlPaneMSKText.LayoutText( controlPaneRect.Rect(), AknLayoutScalable_Avkon::control_pane_t3(variety)); //MSK text area
+                }
+            controlPaneLSKText.LayoutText( controlPaneRect.Rect(), AknLayoutScalable_Avkon::control_pane_t1(variety)); //LSK text area
+            controlPaneRSKText.LayoutText( controlPaneRect.Rect(), AknLayoutScalable_Avkon::control_pane_t2(variety)); //RSK text area
+
+            /*
+             *
+            ==================================================================================
+            |  A  |     LSK_rect     |  B  |     MSK_rect     |  C  |     RSK_rect     |  D  |
+            ==================================================================================
+            where A is left padding (between control pane and LSK rect)
+                  B is mid-left padding (between LSK and MSK rects)
+                  C is mid-right padding (between MSK and RSK rects)
+                  D is right padding (between RSK and control pane)
+
+                  ==> Since all these can be separate, lets take Max of {A..D} for PM value
+            */
+
+            TInt itemSpacingA = 0;
+            TInt itemSpacingB = 0;
+            TInt itemSpacingC = 0;
+            TInt itemSpacingMax = 0;
+            if ( !AknLayoutUtils::MSKEnabled() )
+                {
+                itemSpacingA = controlPaneRect.Rect().iBr.iX - controlPaneRSKText.TextRect().iBr.iX;
+                itemSpacingB = controlPaneLSKText.TextRect().iTl.iX - controlPaneRect.Rect().iTl.iX;
+                if (!landscape)
+                    {
+                    // use mid-gap only in portrait
+                    itemSpacingC = controlPaneRSKText.TextRect().iTl.iX - controlPaneLSKText.TextRect().iBr.iX;
+                    }
+                itemSpacingMax = Max(itemSpacingA, Max( itemSpacingB, itemSpacingC));
+                // no itemspacing4 if no MSK
+                }
+            else
+                {
+                TInt itemSpacingD = 0;
+                itemSpacingA = controlPaneRect.Rect().iBr.iX - controlPaneRSKText.TextRect().iBr.iX;
+                itemSpacingB = controlPaneLSKText.TextRect().iTl.iX - controlPaneRect.Rect().iTl.iX;
+                if ( !(AknLayoutUtils::PenEnabled() || landscape) ) // no MSK in touch, nor in landscape
+                    {
+                    itemSpacingC = controlPaneRSKText.TextRect().iTl.iX - controlPaneMSKText.TextRect().iBr.iX;
+                    itemSpacingD = controlPaneMSKText.TextRect().iTl.iX - controlPaneLSKText.TextRect().iBr.iX;
+                    }
+                itemSpacingMax = Max(itemSpacingA, Max( itemSpacingB, Max( itemSpacingC, itemSpacingD )));
+                }
+            if (metric==QStyle::PM_DialogButtonsSeparator) value = itemSpacingMax;
+            else if (metric==QStyle::PM_DialogButtonsButtonWidth)
+                {
+                value = Max( controlPaneLSKText.TextRect().Width(), controlPaneRSKText.TextRect().Width());
+                if (AknLayoutUtils::MSKEnabled())
+                    {
+                    value = Max(value, controlPaneMSKText.TextRect().Width());
+                    }
+                }
+            else if (metric==QStyle::PM_DialogButtonsButtonHeight)
+                {
+                value = Max( controlPaneLSKText.TextRect().Height(), controlPaneRSKText.TextRect().Height());
+                if (AknLayoutUtils::MSKEnabled())
+                    {
+                    value = Max(value, controlPaneMSKText.TextRect().Height());
+                    }
+                }
+            }
+            break;
+        case QStyle::PM_DockWidgetTitleMargin: // not in S60, lets use the same margin as in button
+        case QStyle::PM_DockWidgetTitleBarButtonMargin: // not in S60, lets use the same margin as in button
+        case QStyle::PM_ButtonMargin:
+            {
+            TRect myRect(TSize( 80, 20)); // this arbitrary size - user can set it - button border does not seem to have any scalability in it
+            TAknLayoutRect buttonRect;
+            TAknLayoutRect buttonBordersRect;
+            TAknLayoutText buttonText;
+
+            buttonRect.LayoutRect( myRect, AknLayoutScalable_Avkon::eswt_ctrl_button_pane());
+            buttonBordersRect.LayoutRect( buttonRect.Rect(), AknLayoutScalable_Avkon::common_borders_pane_copy2(0)); //with text
+            buttonText.LayoutText( buttonRect.Rect(), AknLayoutScalable_Avkon::control_button_pane_t1() );
+
+            // Its better to use left-right margins, since font deployment can create funny top / bottom margins
+            TInt leftMargin = buttonText.TextRect().iTl.iX - buttonBordersRect.Rect().iTl.iX;
+            TInt rightMargin = buttonBordersRect.Rect().iBr.iX - buttonText.TextRect().iBr.iX;
+            value = (TInt) ((leftMargin+rightMargin)/2);
+            }
+            break;
+        case QStyle::PM_ButtonDefaultIndicator:
+            {
+            // no default button indicators in S60
+            value = 0;
+            }
+            break;
+        case QStyle::PM_MdiSubWindowFrameWidth:
+        case QStyle::PM_ComboBoxFrameWidth:
+        case QStyle::PM_SpinBoxFrameWidth:
+            value = 0;
+            break;
+        case QStyle::PM_ToolBarFrameWidth:
+        case QStyle::PM_DefaultFrameWidth:
+            {
+            TAknLayoutRect highLightPaneRect;
+            TAknLayoutRect centerPaneRect;
+            TRect rectParent( mainPaneRect );
+            highLightPaneRect.LayoutRect( rectParent, AknLayoutScalable_Avkon::toolbar_button_pane(0).LayoutLine());
+            centerPaneRect.LayoutRect(rectParent, AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine());
+
+            value = highLightPaneRect.Rect().iBr.iX - centerPaneRect.Rect().iBr.iX;
+            }
+            break;
+        case QStyle::PM_RadioButtonLabelSpacing:
+            {
+            /*
+             *
+            ===================================================================================
+            | A  | iconLayoutRect |B|                itemText                             | C |
+            ===================================================================================
+            mirrored:
+            ===================================================================================
+            | C |                      itemText                      |B| iconLayoutRect |  A  |
+            ===================================================================================
+            where A is left padding
+                  B is gap between icon and text
+                  C is right padding
+            */
+
+            TRect rectParent( mainPaneRect );
+            TAknLayoutRect layoutRect;
+            layoutRect.LayoutRect( rectParent,AknLayoutScalable_Avkon::list_choice_list_pane(1).LayoutLine() ); // w/ scrollbar
+            TAknLayoutText itemText;
+            itemText.LayoutText( layoutRect.Rect(), AknLayoutScalable_Avkon::list_single_choice_list_pane_t1(1) );
+            TAknLayoutRect iconLayoutRect;
+            iconLayoutRect.LayoutRect( layoutRect.Rect(), AknLayoutScalable_Avkon::list_single_choice_list_pane_g1().LayoutLine() );
+
+            if ( !AknLayoutUtils::LayoutMirrored() )
+                {
+                value = itemText.TextRect().iTl.iX - iconLayoutRect.Rect().iBr.iX;
+                }
+            else
+                {
+                value = iconLayoutRect.Rect().iTl.iX - itemText.TextRect().iBr.iX;
+                }
+            }
+
+            break;
+        case QStyle::PM_CheckBoxLabelSpacing:
+            {
+            /*
+             *
+            ===================================================================================
+            | A  | iconLayoutRect |B|                itemText                             | C |
+            ===================================================================================
+            mirrored:
+            ===================================================================================
+            | C |                      itemText                      |B| iconLayoutRect |  A  |
+            ===================================================================================
+            where A is left padding
+                  B is gap between icon and text
+                  C is right padding
+            */
+
+            TRect rectParent( mainPaneRect );
+            TAknLayoutRect layoutRect;
+            layoutRect.LayoutRect( rectParent, AknLayoutScalable_Avkon::listscroll_gen_pane(0).LayoutLine() );
+
+            TAknLayoutRect layoutRect2;
+            layoutRect2.LayoutRect( layoutRect.Rect(), AknLayoutScalable_Avkon::list_gen_pane(0).LayoutLine() );
+            TAknLayoutRect layoutRect3;
+            layoutRect3.LayoutRect( layoutRect2.Rect(), AknLayoutScalable_Avkon::list_single_graphic_pane(0).LayoutLine() );
+
+            TAknLayoutText itemText;
+            itemText.LayoutText( layoutRect3.Rect(), AknLayoutScalable_Avkon::list_single_graphic_pane_t1(0) );
+            TAknLayoutRect iconLayoutRect;
+            iconLayoutRect.LayoutRect( layoutRect3.Rect(), AknLayoutScalable_Avkon::list_single_graphic_pane_g1(0).LayoutLine() );
+
+            if ( !AknLayoutUtils::LayoutMirrored() )
+                {
+                value = itemText.TextRect().iTl.iX - iconLayoutRect.Rect().iBr.iX;
+                }
+            else
+                {
+                value = iconLayoutRect.Rect().iTl.iX - itemText.TextRect().iBr.iX;
+                }
+            }
+            break;
+        case QStyle::PM_ToolTipLabelFrameWidth:
+            {
+            /*
+             *
+            |===================================================================================|
+            |   info popup note                        B                                        |
+            |   ==============================================================================  |
+            | A |                                   hintText                                 | D|
+            |   ==============================================================================  |
+            |                                          C                                        |
+            |===================================================================================|
+            where A is left padding
+                  B is top padding
+                  C is bottom padding
+                  D is right padding
+                  we'll provide the average of top and bottom padding as PM_ToolTipLabelFrameWidth
+            */
+
+            // Set pop-up to contain only one line of text
+            TInt index = 0;
+            if ( landscape )
+                {
+                // in landscape another variety is used
+                index += 5;
+                }
+            // Get parameter and table limits for popup preview text window
+            TAknLayoutScalableParameterLimits limits =
+                AknLayoutScalable_Avkon::popup_preview_text_window_ParamLimits();
+
+            TAknLayoutScalableTableLimits tableLimits =
+                AknLayoutScalable_Avkon::popup_preview_text_window_t_Limits();
+
+            TInt windowVariety = Min( Max( index, limits.FirstVariety() ), limits.LastVariety() );
+
+            TAknLayoutScalableParameterLimits tParamLimits =
+                    AknLayoutScalable_Avkon:: popup_preview_text_window_t_ParamLimits(
+                             tableLimits.FirstIndex() );
+
+            TInt lineVariety = Min( Max( index, tParamLimits.FirstVariety() ), tParamLimits.LastVariety() );
+
+            TAknWindowLineLayout lineLayout = AknLayoutScalable_Avkon::popup_preview_text_window(windowVariety).LayoutLine();
+
+            // rect for the whole info popup
+            TAknLayoutRect layoutRect;
+            layoutRect.LayoutRect(screenRect, lineLayout);
+            TRect rectPopupWindow = layoutRect.Rect();
+
+            TAknTextComponentLayout popupTextLayout =
+                AknLayoutScalable_Avkon::popup_preview_text_window_t(
+                    tableLimits.FirstIndex(), lineVariety );
+
+            // rect for the whole the text inside the popup
+            TAknLayoutText layoutText;
+            layoutText.LayoutText( rectPopupWindow, popupTextLayout );
+
+            // Each margin has different value in S60 - let's take average of top & bottom
+            TInt topMargin = layoutText.TextRect().iTl.iY - layoutRect.Rect().iTl.iY;
+            TInt bottomMargin = layoutRect.Rect().iBr.iY - layoutText.TextRect().iBr.iY;
+            TInt averageMargin = (TInt)(topMargin+bottomMargin)/2;
+            value = averageMargin;
+            }
+            break;
+        case QStyle::PM_ListViewIconSize:
+            {
+            // todo: there are lots and lots of views with different sized icons - which one to use?
+            // todo: this is probably not a good default icon size, as this fetches A column icon size
+            // todo: preferably use settings item with graphic instead
+            TAknLayoutRect iconRect;
+            iconRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::list_double_graphic_pane_g1_cp2(0).LayoutLine());
+            //icon areas are usually squares - lets take bigger of two dimensions
+            value = Max( iconRect.Rect().Width(), iconRect.Rect().Height() );
+            }
+            break;
+
+        case QStyle::PM_LargeIconSize: // lets use AS icon as a base for large icon
+        case QStyle::PM_IconViewIconSize:
+            {
+            // Lets assume that we'd take these from grid (3x4) layout
+            TAknLayoutRect appPaneRect;
+            TAknLayoutRect gridAppRect;
+            TAknLayoutRect cellAppRect;
+            TInt varietyGrid = 2; //Let's use the 3x4 grid as a base.
+            TInt varietyCell = 1; //Let's use the 3x4 grid as a base.
+            if ( landscape )
+                {
+                varietyGrid = 3;
+                varietyCell = 2;
+                }
+            appPaneRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::listscroll_app_pane(1).LayoutLine()); //3x4 grid
+            gridAppRect.LayoutRect( appPaneRect.Rect(), AknLayoutScalable_Avkon::grid_app_pane(varietyGrid).LayoutLine());
+            cellAppRect.LayoutRect( gridAppRect.Rect(), AknLayoutScalable_Avkon::cell_app_pane(varietyCell, 0, 0).LayoutLine());
+            TAknLayoutRect cellGraphRect;
+            TAknWindowComponentLayout appIcon = AknLayoutScalable_Avkon::cell_app_pane_g1(0); // no mark, no highlight
+            cellGraphRect.LayoutRect( gridAppRect.Rect(), appIcon);
+            //icon areas are usually squares - if not, lets take larger
+            value = Max( cellGraphRect.Rect().Width(), cellGraphRect.Rect().Height());
+            }
+            break;
+        case QStyle::PM_TabBarIconSize:
+            {
+            TAknLayoutRect naviNaviRect;
+            naviNaviRect.LayoutRect( naviPaneRect, AknLayoutScalable_Avkon::navi_navi_tabs_pane().LayoutLine()); // two tabs
+            TAknLayoutRect tabRect;
+            tabRect.LayoutRect( naviNaviRect.Rect(), AknLayoutScalable_Avkon::navi_tabs_3_pane().LayoutLine()); //active tab on left
+            TAknLayoutRect activeTabRect;
+            activeTabRect.LayoutRect( tabRect.Rect(), AknLayoutScalable_Avkon::tabs_3_active_pane(0).LayoutLine()); //active tab
+            TAknLayoutRect activeTabGraphicRect;
+
+            activeTabGraphicRect.LayoutRect( activeTabRect.Rect(), AknLayoutScalable_Avkon::tabs_3_active_pane_g1().LayoutLine()); //active tab graphic
+            value = Min(activeTabGraphicRect.Rect().Width(), activeTabGraphicRect.Rect().Height());
+            }
+            break;
+        case QStyle::PM_MessageBoxIconSize:
+            {
+            TAknLayoutRect noteRect;
+            noteRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::popup_note_image_window(0).LayoutLine()); //note with image
+            TAknLayoutRect noteImageRect;
+            noteImageRect.LayoutRect( noteRect.Rect(), AknLayoutScalable_Avkon::popup_note_image_window_g2(2).LayoutLine()); //note with image
+            value = noteImageRect.Rect().Width();
+            }
+            break;
+        case QStyle::PM_TextCursorWidth:
+            {
+            TAknLayoutRect miscGraphicsRect;
+            miscGraphicsRect.LayoutRect( screenRect, AknLayoutScalable_Avkon::misc_graphics());
+            miscGraphicsRect.LayoutRect( miscGraphicsRect.Rect(), AknLayoutScalable_Avkon::misc_graphics());
+            TAknLayoutRect textsGraphicsRect;
+            textsGraphicsRect.LayoutRect( miscGraphicsRect.Rect(), AknLayoutScalable_Avkon::texts_graphics());
+            TAknLayoutRect cursorGraphicsRect;
+            cursorGraphicsRect.LayoutRect( textsGraphicsRect.Rect(), AknLayoutScalable_Avkon::cursor_graphics_pane());
+            TAknLayoutRect cursorPrimaryRect;
+            cursorPrimaryRect.LayoutRect( cursorGraphicsRect.Rect(), AknLayoutScalable_Avkon::cursor_primary_pane());
+            TAknLayoutRect cursorRect;
+            cursorRect.LayoutRect( cursorPrimaryRect.Rect(), AknLayoutScalable_Avkon::cursor_digital_pane_g1());
+            value = cursorRect.Rect().Width();
+            }
+            break;
+        case QStyle::PM_SliderLength:
+            {
+            TAknLayoutRect settingRect;
+            settingRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::listscroll_set_pane() );
+            TAknLayoutRect settingContentRect;
+            settingContentRect.LayoutRect( settingRect.Rect(), AknLayoutScalable_Avkon::set_content_pane() );
+            TAknLayoutRect sliderRect;
+            sliderRect.LayoutRect( settingContentRect.Rect(), AknLayoutScalable_Avkon::setting_slider_graphic_pane() );
+            TAknLayoutRect sliderSettingRect;
+            sliderSettingRect.LayoutRect( sliderRect.Rect(), AknLayoutScalable_Avkon::slider_set_pane_cp() );
+            TAknLayoutRect sliderGraph2Rect;
+            sliderGraph2Rect.LayoutRect( sliderSettingRect.Rect(), AknLayoutScalable_Avkon::slider_set_pane_g2() );
+            value = sliderGraph2Rect.Rect().Width();
+            }
+            break;
+        case QStyle::PM_SliderThickness:
+            {
+            TAknLayoutRect settingRect;
+            settingRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::listscroll_set_pane() );
+            TAknLayoutRect settingContentRect;
+            settingContentRect.LayoutRect( settingRect.Rect(), AknLayoutScalable_Avkon::set_content_pane() );
+            TAknLayoutRect sliderRect;
+            sliderRect.LayoutRect( settingContentRect.Rect(), AknLayoutScalable_Avkon::setting_slider_graphic_pane() );
+            TAknLayoutRect sliderSettingRect;
+            sliderSettingRect.LayoutRect( sliderRect.Rect(), AknLayoutScalable_Avkon::slider_set_pane_cp() );
+            TAknLayoutRect sliderGraph2Rect;
+            sliderGraph2Rect.LayoutRect( sliderSettingRect.Rect(), AknLayoutScalable_Avkon::slider_set_pane_g2() );
+            value = (TInt)(sliderGraph2Rect.Rect().Height()*1.5); // add assumed tickmark height
+            }
+            break;
+        case QStyle::PM_SliderTickmarkOffset:
+            {
+            TAknLayoutRect settingRect;
+            settingRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::listscroll_set_pane() );
+            TAknLayoutRect settingContentRect;
+            settingContentRect.LayoutRect( settingRect.Rect(), AknLayoutScalable_Avkon::set_content_pane() );
+            TAknLayoutRect sliderRect;
+            sliderRect.LayoutRect( settingContentRect.Rect(), AknLayoutScalable_Avkon::setting_slider_graphic_pane() );
+            TAknLayoutRect sliderSettingRect;
+            sliderSettingRect.LayoutRect( sliderRect.Rect(), AknLayoutScalable_Avkon::slider_set_pane_cp() );
+            TAknLayoutRect sliderGraph2Rect;
+            sliderGraph2Rect.LayoutRect( sliderSettingRect.Rect(), AknLayoutScalable_Avkon::slider_set_pane_g2() );
+            value = (TInt)(sliderGraph2Rect.Rect().Height()*0.5); // no tickmarks in S60, lets assume they are half the size of slider indicator
+            }
+            break;
+        case QStyle::PM_SliderControlThickness:
+            {
+            TAknLayoutRect settingRect;
+            settingRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::listscroll_set_pane() );
+            TAknLayoutRect settingContentRect;
+            settingContentRect.LayoutRect( settingRect.Rect(), AknLayoutScalable_Avkon::set_content_pane() );
+            TAknLayoutRect sliderRect;
+            sliderRect.LayoutRect( settingContentRect.Rect(), AknLayoutScalable_Avkon::setting_slider_graphic_pane() );
+            TAknLayoutRect sliderSettingRect;
+            sliderSettingRect.LayoutRect( sliderRect.Rect(), AknLayoutScalable_Avkon::slider_set_pane_cp() );
+            TAknLayoutRect sliderGraph2Rect;
+            sliderGraph2Rect.LayoutRect( sliderSettingRect.Rect(), AknLayoutScalable_Avkon::slider_set_pane_g2() );
+            value = sliderGraph2Rect.Rect().Height();
+            }
+            break;
+        case QStyle::PM_SliderSpaceAvailable:
+            {
+            TAknLayoutRect settingRect;
+            settingRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::listscroll_set_pane() );
+            TAknLayoutRect settingContentRect;
+            settingContentRect.LayoutRect( settingRect.Rect(), AknLayoutScalable_Avkon::set_content_pane() );
+            TAknLayoutRect sliderRect;
+            sliderRect.LayoutRect( settingContentRect.Rect(), AknLayoutScalable_Avkon::setting_slider_graphic_pane() );
+            TAknLayoutRect sliderSettingRect;
+            sliderSettingRect.LayoutRect( sliderRect.Rect(), AknLayoutScalable_Avkon::slider_set_pane_cp() );
+            value = sliderSettingRect.Rect().Width();
+            }
+            break;
+        case QStyle::PM_MenuBarItemSpacing:
+            {
+            TAknLayoutRect appWindow;
+            appWindow.LayoutRect( screenRect, AknLayoutScalable_Avkon::application_window(0) );
+
+            variety = 0;
+            if ( landscape )
+                {
+                variety = 2;
+                }
+            TAknLayoutRect areaBottomRect;
+            areaBottomRect.LayoutRect( appWindow.Rect(), AknLayoutScalable_Avkon::area_bottom_pane(variety) );
+
+            TAknLayoutRect controlPaneRect;
+            controlPaneRect.LayoutRect( areaBottomRect.Rect(), AknLayoutScalable_Avkon::control_pane() );
+            TAknLayoutText controlPaneLSKText;
+            TAknLayoutText controlPaneRSKText;
+            TAknLayoutText controlPaneMSKText;
+            variety = 0;
+            if (AknLayoutUtils::MSKEnabled())
+                {
+                variety = 3;
+                controlPaneMSKText.LayoutText( controlPaneRect.Rect(), AknLayoutScalable_Avkon::control_pane_t3(variety)); //MSK text area
+                }
+            controlPaneLSKText.LayoutText( controlPaneRect.Rect(), AknLayoutScalable_Avkon::control_pane_t1(variety)); //LSK text area
+            controlPaneRSKText.LayoutText( controlPaneRect.Rect(), AknLayoutScalable_Avkon::control_pane_t2(variety)); //RSK text area
+
+            /*
+             *
+            ==================================================================================
+            |  A  |     LSK_rect     |  B  |     MSK_rect     |  C  |     RSK_rect     |  D  |
+            ==================================================================================
+            where A is left padding (between control pane and LSK rect)
+                  B is mid-left padding (between LSK and MSK rects)
+                  C is mid-right padding (between MSK and RSK rects)
+                  D is right padding (between RSK and control pane)
+
+                  ==> Since all these can be separate, lets take Max of {A..D} for PM value
+            */
+
+            TInt itemSpacing1 = 0;
+            TInt itemSpacing2 = 0;
+            TInt itemSpacing3 = 0;
+            TInt itemSpacing4 = 0;
+            TInt itemSpacingMax = 0;
+            if ( !AknLayoutUtils::MSKEnabled() )
+                {
+                itemSpacing1 = controlPaneRect.Rect().iBr.iX - controlPaneRSKText.TextRect().iBr.iX;
+                itemSpacing2 = controlPaneLSKText.TextRect().iTl.iX - controlPaneRect.Rect().iTl.iX;
+                if ( !landscape )
+                    {
+                    // use mid gap only in portrait
+                    itemSpacing3 = controlPaneRSKText.TextRect().iTl.iX - controlPaneLSKText.TextRect().iBr.iX;
+                    }
+                itemSpacingMax = Max(itemSpacing1, Max( itemSpacing2, itemSpacing3));
+                // no itemspacing4 if no MSK
+                }
+            else
+                {
+                itemSpacing1 = controlPaneRect.Rect().iBr.iX - controlPaneRSKText.TextRect().iBr.iX;
+                itemSpacing2 = controlPaneLSKText.TextRect().iTl.iX - controlPaneRect.Rect().iTl.iX;
+                if ( !(AknLayoutUtils::PenEnabled() || landscape) ) // no MSK in touch, nor in landscape
+                    {
+                    itemSpacing3 = controlPaneRSKText.TextRect().iTl.iX - controlPaneMSKText.TextRect().iBr.iX;
+                    itemSpacing4 = controlPaneMSKText.TextRect().iTl.iX - controlPaneLSKText.TextRect().iBr.iX;
+                    }
+                itemSpacingMax = Max(itemSpacing1, Max( itemSpacing2, Max( itemSpacing3, itemSpacing4 )));
+                }
+            value = itemSpacingMax;
+            }
+            break;
+        case QStyle::PM_MenuBarHMargin:
+            {
+            TAknLayoutRect appWindow;
+            appWindow.LayoutRect( screenRect, AknLayoutScalable_Avkon::application_window(0) );
+
+            variety = 0;
+            if ( landscape )
+                {
+                variety = 6;
+                }
+            TAknLayoutRect areaBottomRect;
+            areaBottomRect.LayoutRect( appWindow.Rect(), AknLayoutScalable_Avkon::area_bottom_pane(variety) );
+
+            // variety 7 if thin status pane, 1 if no status pane, 3 if small status pane and with main pane, 4 otherwise (idle has bunch of own varieties)
+            TAknLayoutRect controlPaneRect;
+            controlPaneRect.LayoutRect( areaBottomRect.Rect(), AknLayoutScalable_Avkon::control_pane() );
+            value = areaBottomRect.Rect().Height() - controlPaneRect.Rect().Height();
+            }
+            break;
+        case QStyle::PM_MenuBarVMargin:
+            {
+            TAknLayoutRect appWindow;
+            appWindow.LayoutRect( screenRect, AknLayoutScalable_Avkon::application_window(0) );
+
+            variety = 0;
+            if ( landscape )
+                {
+                variety = 6;
+                }
+            TAknLayoutText controlPaneLSKText;
+            TAknLayoutRect areaBottomRect;
+            areaBottomRect.LayoutRect( appWindow.Rect(), AknLayoutScalable_Avkon::area_bottom_pane(variety) );
+            // variety 7 if thin status pane, 1 if no status pane, 3 if small status pane and with main pane, 4 otherwise (idle has bunch of own varieties)
+            TAknLayoutRect controlPaneRect;
+            controlPaneRect.LayoutRect( areaBottomRect.Rect(), AknLayoutScalable_Avkon::control_pane() );
+
+            variety = 0;
+            if (AknLayoutUtils::MSKEnabled())
+                {
+                variety = 3;
+                }
+            controlPaneLSKText.LayoutText( controlPaneRect.Rect(), AknLayoutScalable_Avkon::control_pane_t1(variety)); //LSK text area
+
+            value = controlPaneRect.Rect().Height() - controlPaneLSKText.TextRect().Height();
+            }
+            break;
+        case QStyle::PM_ToolBarItemSpacing:
+            {
+            TAknLayoutRect popupToolBarWindow;
+            variety = 4;
+            popupToolBarWindow.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::popup_toolbar_window(variety) );
+            TAknLayoutRect gridToolBarRect;
+            gridToolBarRect.LayoutRect( popupToolBarWindow.Rect(), AknLayoutScalable_Avkon::grid_toobar_pane() );
+            TAknLayoutRect cellToolBarRect1;
+            TAknLayoutRect cellToolBarRect2;
+            cellToolBarRect1.LayoutRect( gridToolBarRect.Rect(), AknLayoutScalable_Avkon::cell_toolbar_pane(0).LayoutLine() ); //first item
+            cellToolBarRect2.LayoutRect( gridToolBarRect.Rect(), AknLayoutScalable_Avkon::cell_toolbar_pane(1).LayoutLine() ); //second item
+            value = cellToolBarRect1.Rect().iBr.iX - cellToolBarRect2.Rect().iTl.iX;
+            }
+            break;
+        case QStyle::PM_ToolBarItemMargin:
+            {
+            variety = 4;
+            TAknLayoutRect popupToolBarWindow;
+            popupToolBarWindow.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::popup_toolbar_window(variety) );
+            TAknLayoutRect gridToolBarRect;
+            gridToolBarRect.LayoutRect( popupToolBarWindow.Rect(), AknLayoutScalable_Avkon::grid_toobar_pane() );
+            TAknLayoutRect cellToolBarRect1;
+            cellToolBarRect1.LayoutRect( gridToolBarRect.Rect(), AknLayoutScalable_Avkon::cell_toolbar_pane(0).LayoutLine() ); //first item
+            value = gridToolBarRect.Rect().iTl.iX - cellToolBarRect1.Rect().iTl.iX;
+            }
+            break;
+        case QStyle::PM_LayoutLeftMargin: // there really isn't a default layoutting on s60, but lets use AppShell icon deployment as base
+        case QStyle::PM_LayoutRightMargin:
+        case QStyle::PM_LayoutTopMargin:
+        case QStyle::PM_LayoutBottomMargin:
+        case QStyle::PM_LayoutHorizontalSpacing:
+        case QStyle::PM_LayoutVerticalSpacing:
+            {
+            //since spacing and margins should be globally same, lets use same easy component as base - such as find popup
+            TAknLayoutRect popup_find_windowRect;
+            TAknLayoutRect bg_popup_window_pane_cp12Rect;
+            TAknLayoutRect find_popup_paneRect;
+            popup_find_windowRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::popup_find_window(0).LayoutLine());
+            bg_popup_window_pane_cp12Rect.LayoutRect( popup_find_windowRect.Rect(), AknLayoutScalable_Avkon::bg_popup_window_pane_cp12().LayoutLine());
+            find_popup_paneRect.LayoutRect( bg_popup_window_pane_cp12Rect.Rect(), AknLayoutScalable_Avkon::find_popup_pane().LayoutLine());
+
+            const TBool mirrored = AknLayoutUtils::LayoutMirrored();
+            if ((metric==QStyle::PM_LayoutVerticalSpacing && !mirrored) || metric==QStyle::PM_LayoutLeftMargin)
+                {
+                if (mirrored)
+                    {
+                    value = find_popup_paneRect.Rect().iTl.iX - bg_popup_window_pane_cp12Rect.Rect().iTl.iX;
+                    }
+                else
+                    {
+                    value = find_popup_paneRect.Rect().iTl.iX - bg_popup_window_pane_cp12Rect.Rect().iTl.iX;
+                    }
+                }
+            else if (metric==QStyle::PM_LayoutRightMargin || (metric==QStyle::PM_LayoutVerticalSpacing && mirrored))
+                {
+                if (mirrored)
+                    {
+                    value = bg_popup_window_pane_cp12Rect.Rect().iBr.iX - find_popup_paneRect.Rect().iBr.iX;
+                    }
+                else
+                    {
+                    value = bg_popup_window_pane_cp12Rect.Rect().iBr.iX - find_popup_paneRect.Rect().iBr.iX;
+                    }
+                }
+            else if (metric==QStyle::PM_LayoutTopMargin || metric==QStyle::PM_LayoutHorizontalSpacing)
+                {
+                value = find_popup_paneRect.Rect().iTl.iY - bg_popup_window_pane_cp12Rect.Rect().iTl.iY;
+                }
+            else if (metric==QStyle::PM_LayoutBottomMargin)
+                {
+                value = bg_popup_window_pane_cp12Rect.Rect().iBr.iY - find_popup_paneRect.Rect().iBr.iY;
+                }
+            }
+            break;
+        case QStyle::PM_MaximumDragDistance:
+            {
+            value = -1; //disable - not in S60
+            }
+            break;
+        case QStyle::PM_ScrollBarExtent:
+            {
+            TAknLayoutRect miscGraphicsRect;
+            miscGraphicsRect.LayoutRect( screenRect, AknLayoutScalable_Avkon::misc_graphics());
+            miscGraphicsRect.LayoutRect( miscGraphicsRect.Rect(), AknLayoutScalable_Avkon::misc_graphics());
+            TAknLayoutRect textsGraphicsRect;
+            textsGraphicsRect.LayoutRect( miscGraphicsRect.Rect(), AknLayoutScalable_Avkon::texts_graphics());
+            TAknLayoutRect editorScrollRect;
+            editorScrollRect.LayoutRect( textsGraphicsRect.Rect(), AknLayoutScalable_Avkon::editor_scroll_pane());
+            TAknLayoutRect scrollPaneRect;
+            scrollPaneRect.LayoutRect( editorScrollRect.Rect(), AknLayoutScalable_Avkon::scroll_pane_cp13());
+            value = scrollPaneRect.Rect().Width(); // width of editor's scroll bar
+            }
+            break;
+        case QStyle::PM_ScrollBarSliderMin:
+            {
+            TAknLayoutRect listScrollPane;
+            listScrollPane.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::listscroll_gen_pane(0));
+            TAknLayoutRect scrollPane;
+            scrollPane.LayoutRect( listScrollPane.Rect(), AknLayoutScalable_Avkon::scroll_pane());
+            TAknLayoutRect scrollHandlePane;
+            scrollHandlePane.LayoutRect( scrollPane.Rect(), AknLayoutScalable_Avkon::scroll_handle_pane());
+            TAknLayoutRect aidMinSizePane;
+            aidMinSizePane.LayoutRect( scrollHandlePane.Rect(), AknLayoutScalable_Avkon::aid_size_min_handle()); // this gives min width size for horizontal scroll bar - same can be used for vertical height minimum
+            value = aidMinSizePane.Rect().Height();
+            }
+            break;
+        case QStyle::PM_MenuBarPanelWidth:
+            {
+            TAknLayoutRect appWindow;
+            appWindow.LayoutRect( screenRect, AknLayoutScalable_Avkon::application_window(0) );
+
+            variety = 0;
+            if ( landscape )
+                {
+                variety = 2;
+                }
+            TAknLayoutRect areaBottomRect;
+            areaBottomRect.LayoutRect( appWindow.Rect(), AknLayoutScalable_Avkon::area_bottom_pane(variety) );
+
+            // todo: prt: variety 7 if thin status pane, 1 if no status pane, 3 if small status pane and with main pane, 4 otherwise (idle has bunch of own varieties)
+            // todo: lsc: variety 6 if thin status pane
+            // todo: should stacon be considered?
+            TAknLayoutRect controlPaneRect;
+            controlPaneRect.LayoutRect( areaBottomRect.Rect(), AknLayoutScalable_Avkon::control_pane() );
+            value = areaBottomRect.Rect().Height() - controlPaneRect.Rect().Height(); //usually zero
+            }
+            break;
+        case QStyle::PM_ProgressBarChunkWidth:
+            {
+            // This is either deduced or skinned (for Java) in S60
+            // Layout data does not know it. It would require parameters from the
+            // actual progress dialog to be able to calc this (max. value and increment)
+            // So we need to set up some values - lets take one tenth of progress dialog area:
+            TAknLayoutRect appWindow;
+            appWindow.LayoutRect( screenRect, AknLayoutScalable_Avkon::application_window(variety) );
+            if (landscape)
+                {
+                variety = 6;
+                }
+            TAknLayoutRect popupWaitWindowRect;
+            popupWaitWindowRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::popup_note_wait_window(variety) );
+            TAknLayoutRect waitbarPaneRect;
+            waitbarPaneRect.LayoutRect( popupWaitWindowRect.Rect(), AknLayoutScalable_Avkon::wait_bar_pane(0) );
+            TAknLayoutRect waitAnimRect;
+            waitAnimRect.LayoutRect( waitbarPaneRect.Rect(), AknLayoutScalable_Avkon::wait_anim_pane() );
+            value = (TInt) (waitAnimRect.Rect().Width() / 10);
+            }
+            break;
+        case QStyle::PM_TabBarTabOverlap:
+        case QStyle::PM_TabBarTabHSpace:
+        case QStyle::PM_TabBarTabVSpace:
+        case QStyle::PM_TabBarBaseHeight:
+        case QStyle::PM_TabBarBaseOverlap:
+        case QStyle::PM_TabBarScrollButtonWidth:
+        case QStyle::PM_TabBarTabShiftHorizontal:
+        case QStyle::PM_TabBarTabShiftVertical:
+            value = PixelMetricTabValue(metric, appWindow.Rect(), landscape);
+            break;
+        case QStyle::PM_MenuPanelWidth:
+        case QStyle::PM_MenuHMargin:
+        case QStyle::PM_MenuVMargin:
+            value = PixelMetricMenuValue(metric, mainPaneRect);
+            break;
+        case QStyle::PM_ButtonIconSize:
+            //lets use voice recorder icons as a base
+            //Unfortunately S60 graphics don't separate button bevel graphics from the actual icon.
+            //Se we have no means to query the margin from bevel border to "central icon" border.
+            //So, we need to make a estimate...
+
+            const TInt varietyForButtons = !landscape ? 0 : 1;
+
+            TAknLayoutRect vRMainRect;
+            vRMainRect.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::main_vorec_pane() );
+
+            TAknLayoutRect vRButtonGridRect;
+            vRButtonGridRect.LayoutRect( vRMainRect.Rect(), AknLayoutScalable_Apps::grid_vorec_pane() );
+
+            TAknLayoutRect vRButtonCellRect;
+            vRButtonCellRect.LayoutRect( vRButtonGridRect.Rect(), AknLayoutScalable_Apps::cell_vorec_pane(0) );
+
+            TAknLayoutRect vRButtonCellGraphicsRect;
+            vRButtonCellGraphicsRect.LayoutRect( vRButtonCellRect.Rect(), AknLayoutScalable_Apps::cell_vorec_pane_g1() );
+
+            // 0.32 is the estimate how much the icon occupies of the button bevel area
+            value = vRButtonCellGraphicsRect.Rect().Width() * 0.32;
+
+            break;
+        case QStyle::PM_SmallIconSize:
+            {
+            // lets use AI2 icon as a base
+            TAknLayoutRect idlePaneRect;
+            idlePaneRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::main_idle_act2_pane() );
+            TAknLayoutRect idleDataRect;
+            idleDataRect.LayoutRect( idlePaneRect.Rect(), AknLayoutScalable_Avkon::popup_ai2_data_window(1) );
+            TAknLayoutRect ai2GridRect;
+            ai2GridRect.LayoutRect( idleDataRect.Rect(), AknLayoutScalable_Avkon::grid_ai2_button_pane() );
+            TAknLayoutRect ai2MpRect;
+            ai2MpRect.LayoutRect( ai2GridRect.Rect(), AknLayoutScalable_Avkon::ai2_mp_button_pane() );
+            TAknLayoutRect ai2CellPaneRect;
+            ai2CellPaneRect.LayoutRect( ai2MpRect.Rect(), AknLayoutScalable_Avkon::cell_ai2_button_pane(1).LayoutLine() );
+            TAknLayoutRect ai2CellButtonRect;
+            ai2CellButtonRect.LayoutRect( ai2CellPaneRect.Rect(), AknLayoutScalable_Avkon::cell_ai2_button_pane_g1());
+            value = Min( ai2CellButtonRect.Rect().Width(), ai2CellButtonRect.Rect().Height());
+            }
+            break;
+        case QStyle::PM_FocusFrameHMargin:
+        case QStyle::PM_FocusFrameVMargin:
+            {
+            TAknLayoutRect gridRect;
+            gridRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::grid_highlight_pane(0));
+            TAknLayoutRect gridRectCenter;
+            gridRectCenter.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::cell_highlight_pane_g1());
+
+            // The difference of center piece from border tell the frame width.
+            if ( value == QStyle::PM_FocusFrameHMargin)
+                {
+                value = gridRect.Rect().iBr.iX - gridRectCenter.Rect().iBr.iX;
+                }
+            else
+                {
+                value = gridRect.Rect().iBr.iY - gridRectCenter.Rect().iBr.iY;
+                }
+            }
+            break;
+        case QStyle::PM_ToolBarIconSize:
+            {
+            TAknLayoutRect popupToolBarWindow;
+            variety = 4;
+            popupToolBarWindow.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::popup_toolbar_window(variety) );
+            TAknLayoutRect gridToolBarRect;
+            gridToolBarRect.LayoutRect( popupToolBarWindow.Rect(), AknLayoutScalable_Avkon::grid_toobar_pane() );
+            TAknLayoutRect cellToolBarRect1;
+            TAknLayoutRect cellToolBarRect2;
+            cellToolBarRect1.LayoutRect( gridToolBarRect.Rect(), AknLayoutScalable_Avkon::cell_toolbar_pane(0).LayoutLine() ); //first item
+            value = Min( cellToolBarRect1.Rect().Height(), cellToolBarRect1.Rect().Width() );
+            }
+            break;
+
+        case QStyle::PM_TitleBarHeight: // use titlepane height
+            {
+            TAknLayoutRect statusPaneRect;
+            TAknLayoutRect titlePane;
+            TAknLayoutRect areaTopRect;
+            if (landscape)
+                {
+                if ( AknLayoutUtils::PenEnabled() )
+                    {
+                    // Top area - 0 is for classic landscape (used in touch landscape as well)
+                    areaTopRect.LayoutRect( appWindow.Rect(), AknLayoutScalable_Avkon::area_top_pane(2) );
+                    // Status pane - 0 softkeys on right
+                    statusPaneRect.LayoutRect( areaTopRect.Rect(), AknLayoutScalable_Avkon::stacon_top_pane() );
+                    }
+                else
+                    {
+                    // Top area - 2 is for classic landscape.
+                    areaTopRect.LayoutRect( appWindow.Rect(), AknLayoutScalable_Avkon::area_bottom_pane(2) );
+                    // Stacon top pane (default ok)
+                    statusPaneRect.LayoutRect( areaTopRect.Rect(), AknLayoutScalable_Avkon::stacon_bottom_pane() );
+                    }
+                titlePane.LayoutRect( areaTopRect.Rect(), AknLayoutScalable_Avkon::title_pane_stacon(0) ); //softkeys on right
+                }
+            else
+                {
+                // Top area - 0 is for classic portrait
+                areaTopRect.LayoutRect( appWindow.Rect(), AknLayoutScalable_Avkon::area_top_pane(0) );
+                // Status pane - 0 is for classic portrait
+                statusPaneRect.LayoutRect( areaTopRect.Rect(), AknLayoutScalable_Avkon::status_pane(0) );
+                titlePane.LayoutRect( statusPaneRect.Rect(), AknLayoutScalable_Avkon::title_pane(0) );
+                }
+            value = titlePane.Rect().Height();
+            }
+            break;
+        case QStyle::PM_IndicatorWidth:
+        case QStyle::PM_IndicatorHeight:
+            {
+            TRect rectParent( mainPaneRect );
+
+            TAknLayoutRect layoutRect;
+            layoutRect.LayoutRect( rectParent,AknLayoutScalable_Avkon::set_content_pane().LayoutLine() );
+            TAknLayoutRect layoutRect2;
+            layoutRect2.LayoutRect( layoutRect.Rect(),AknLayoutScalable_Avkon::list_set_graphic_pane(0).LayoutLine() );
+
+            TAknLayoutRect iconLayoutRect;
+            iconLayoutRect.LayoutRect( layoutRect2.Rect(), AknLayoutScalable_Avkon::list_set_graphic_pane_g1(0).LayoutLine() );
+            if (metric==QStyle::PM_IndicatorWidth)
+                {
+                value = iconLayoutRect.Rect().Width();
+                }
+            else
+                {
+                value = iconLayoutRect.Rect().Height();
+                }
+            }
+            break;
+        case QStyle::PM_ExclusiveIndicatorHeight:
+        case QStyle::PM_ExclusiveIndicatorWidth:
+            {
+            TRect rectParent( mainPaneRect );
+            TAknLayoutRect layoutRect;
+            layoutRect.LayoutRect( rectParent,AknLayoutScalable_Avkon::list_choice_list_pane(1).LayoutLine() ); // w/ scrollbar
+            TAknLayoutText itemText;
+            itemText.LayoutText( layoutRect.Rect(), AknLayoutScalable_Avkon::list_single_choice_list_pane_t1(1) );
+            TAknLayoutRect iconLayoutRect;
+            iconLayoutRect.LayoutRect( layoutRect.Rect(), AknLayoutScalable_Avkon::list_single_choice_list_pane_g1().LayoutLine() );
+
+            if (metric==QStyle::PM_ExclusiveIndicatorHeight)
+                {
+                value = iconLayoutRect.Rect().Height();
+                }
+            else
+                {
+                value = iconLayoutRect.Rect().Width();
+                }
+            }
+            break;
+
+        // These are obsolete.
+        case QStyle::PM_DefaultTopLevelMargin:
+        case QStyle::PM_DefaultChildMargin:
+        case QStyle::PM_DefaultLayoutSpacing:
+            break;
+
+        case QStyle::PM_Custom_FrameCornerWidth:
+            {
+            TAknLayoutRect inputFocusRect;
+            inputFocusRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::input_focus_pane(0));
+            TAknLayoutRect inputFocusInnerRect;
+            inputFocusInnerRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::input_focus_pane_g1());
+
+            value = inputFocusRect.Rect().iBr.iX - inputFocusInnerRect.Rect().iBr.iX;
+            value+= 2; //visually better value for generic cases
+            }
+            break;
+        case QStyle::PM_Custom_FrameCornerHeight:
+            {
+            TAknLayoutRect inputFocusRect;
+            inputFocusRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::input_focus_pane(0));
+            TAknLayoutRect inputFocusInnerRect;
+            inputFocusInnerRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::input_focus_pane_g1());
+            value = inputFocusRect.Rect().iBr.iY - inputFocusInnerRect.Rect().iBr.iY;
+            value+= 2; //visually better value for generic cases
+            }
+            break;
+        case QStyle::PM_Custom_BoldLineWidth:
+            value = 3;
+            break;
+        case QStyle::PM_Custom_ThinLineWidth:
+            value = 1;
+            break;
+        case QStyle::PM_ButtonShiftHorizontal:
+        case QStyle::PM_ButtonShiftVertical:
+            value = 0;
+            break;
+        
+        case QStyle::PM_ToolBarExtensionExtent:
+            value = PixelMetricTabValue(QStyle::PM_TabBarScrollButtonWidth, appWindow.Rect(), landscape);
+            break;
+
+// todo: re-check if these really are not available in s60
+        case QStyle::PM_MenuDesktopFrameWidth:    // not needed in S60 - dislocates Menu both horizontally and vertically
+        case QStyle::PM_HeaderMarkSize:           // The size of the sort indicator in a header. Not in S60
+        case QStyle::PM_SpinBoxSliderHeight:       // The height of the optional spin box slider. Not in S60
+        case QStyle::PM_HeaderMargin: // not in S60
+        case QStyle::PM_MenuScrollerHeight: // not in S60
+        case QStyle::PM_MenuTearoffHeight: // not in S60
+        case QStyle::PM_DockWidgetFrameWidth: // not in S60
+        case QStyle::PM_DockWidgetSeparatorExtent: // not in S60
+        case QStyle::PM_MdiSubWindowMinimizedWidth: //no such thing in S60
+        case QStyle::PM_HeaderGripMargin: // not in S60
+        case QStyle::PM_SplitterWidth: // not in S60
+        case QStyle::PM_ToolBarSeparatorExtent: // not in S60
+        case QStyle::PM_ToolBarHandleExtent: // not in s60
+        case QStyle::PM_MenuButtonIndicator: // none???
+        case QStyle::PM_TabBar_ScrollButtonOverlap: // not used in S60 - tab arrows are on left and right side of tab group - not together
+        case QStyle::PM_SizeGripSize: // use default
+        case QStyle::PM_TabCloseIndicatorWidth:
+        case QStyle::PM_TabCloseIndicatorHeight:
+        case QStyle::PM_ScrollView_ScrollBarSpacing:
+        case QStyle::PM_SubMenuOverlap:
+        default:
+            break;
+        }
+    return value;
+    }
+
+TInt PixelMetrics::PixelMetricTabValue(QStyle::PixelMetric tabMetric, TRect appWindow, TBool landscape)
+    {
+    TInt tabValue = 0;
+    // common ones
+    TAknLayoutRect mainAreaRect;
+    TAknLayoutRect rightIndicationRect;
+    TAknLayoutRect leftIndicationRect;
+    TAknLayoutRect activeTabRect;
+    TAknLayoutText activeTabTextRect;
+    TAknLayoutRect passiveTabRect;
+    TAknLayoutText passiveTabTextRect;
+    TAknLayoutRect tabsPaneRect;
+    if ( landscape )
+        {
+        TAknLayoutRect statusPaneRect;
+        TAknLayoutRect areaTopRect;
+        if ( AknLayoutUtils::PenEnabled() )
+            {
+            // Top area - 0 is for classic landscape (used in touch landscape as well)
+            areaTopRect.LayoutRect( appWindow, AknLayoutScalable_Avkon::area_top_pane(2) );
+            // Status pane - 0 softkeys on right
+            statusPaneRect.LayoutRect( areaTopRect.Rect(), AknLayoutScalable_Avkon::stacon_top_pane() );
+            }
+        else
+            {
+            // Top area - 2 is for classic landscape.
+            areaTopRect.LayoutRect( appWindow, AknLayoutScalable_Avkon::area_bottom_pane(2) );
+            // Stacon top pane (default ok)
+            statusPaneRect.LayoutRect( areaTopRect.Rect(), AknLayoutScalable_Avkon::stacon_bottom_pane() );
+            }
+        // main pane for landscape
+        mainAreaRect.LayoutRect( appWindow, AknLayoutScalable_Avkon::main_pane(4) );
+
+        // navi pane
+        TAknLayoutRect naviPaneRect;
+        naviPaneRect.LayoutRect( statusPaneRect.Rect(), AknLayoutScalable_Avkon::navi_pane_stacon(0) ); // softkeys on right
+        // navi-navi pane
+        tabsPaneRect.LayoutRect( naviPaneRect.Rect(), AknLayoutScalable_Avkon::navi_navi_pane_stacon(0) ); // softkeys on right
+        // Passive tab item - lets use layout where active is on left side of passive
+        passiveTabRect.LayoutRect( tabsPaneRect.Rect(), AknLayoutScalable_Avkon::tabs_3_passive_pane(0) );
+        // Active tab item
+        activeTabRect.LayoutRect( tabsPaneRect.Rect(), AknLayoutScalable_Avkon::tabs_3_active_pane(0) );
+        // Left indication
+        leftIndicationRect.LayoutRect( tabsPaneRect.Rect(), AknLayoutScalable_Avkon::navi_navi_pane_g1(0) );
+        // Right indication
+        rightIndicationRect.LayoutRect( tabsPaneRect.Rect(), AknLayoutScalable_Avkon::navi_navi_pane_g2(0) );
+        // active tab text rect
+        activeTabTextRect.LayoutText( activeTabRect.Rect(), AknLayoutScalable_Avkon::tabs_3_active_pane_t1(1) );
+        // passive tab text rect
+        passiveTabTextRect.LayoutText( passiveTabRect.Rect(), AknLayoutScalable_Avkon::tabs_3_passive_pane_t1(1) );
+        }
+    else
+        {
+        // main pane for portait
+        mainAreaRect.LayoutRect( appWindow, AknLayoutScalable_Avkon::main_pane(3) );
+        // Top area - 0 is for classic portrait
+        TAknLayoutRect areaTopRect;
+        areaTopRect.LayoutRect( appWindow, AknLayoutScalable_Avkon::area_top_pane(0) );
+        // Status pane - 0 is for classic portrait
+        TAknLayoutRect statusPaneRect;
+        statusPaneRect.LayoutRect( areaTopRect.Rect(), AknLayoutScalable_Avkon::status_pane(0) );
+
+        // Navi pane
+        TAknLayoutRect naviPaneRect;
+        naviPaneRect.LayoutRect( statusPaneRect.Rect(), AknLayoutScalable_Avkon::navi_pane(0) );
+        // Navi-navi pane for tabs (0)
+        TAknLayoutRect navi2PaneRect;
+        navi2PaneRect.LayoutRect( naviPaneRect.Rect(), AknLayoutScalable_Avkon::navi_navi_pane() );
+        // Short tab pane
+        tabsPaneRect.LayoutRect( navi2PaneRect.Rect(), AknLayoutScalable_Avkon::navi_navi_tabs_pane() );
+        // Tab pane for 2 items
+        TAknLayoutRect tab2PaneRect;
+        tab2PaneRect.LayoutRect( tabsPaneRect.Rect(), AknLayoutScalable_Avkon::navi_tabs_3_pane() );
+        // Passive tab item - lets use layout where active is on left side of passive
+        passiveTabRect.LayoutRect( tab2PaneRect.Rect(), AknLayoutScalable_Avkon::tabs_3_passive_pane(0) );
+        // Active tab item
+        activeTabRect.LayoutRect( tab2PaneRect.Rect(), AknLayoutScalable_Avkon::tabs_3_active_pane(0) );
+        // Left indication
+        leftIndicationRect.LayoutRect( tabsPaneRect.Rect(), AknLayoutScalable_Avkon::navi_navi_pane_g1(0) );
+        // Right indication
+        rightIndicationRect.LayoutRect( tabsPaneRect.Rect(), AknLayoutScalable_Avkon::navi_navi_pane_g2(0) );
+        // active tab text rect
+        activeTabTextRect.LayoutText( activeTabRect.Rect(), AknLayoutScalable_Avkon::tabs_3_active_pane_t1(0) );
+        // passive tab text rect
+        passiveTabTextRect.LayoutText( passiveTabRect.Rect(), AknLayoutScalable_Avkon::tabs_3_passive_pane_t1(0) );
+        }
+
+    // active tab on left, passive on rightside
+    TInt tabOverlap = activeTabRect.Rect().iBr.iX - passiveTabRect.Rect().iTl.iX;
+    TInt tabHSpace = (TInt) ((activeTabTextRect.TextRect().iTl.iX - activeTabRect.Rect().iTl.iX + activeTabRect.Rect().iBr.iX - activeTabTextRect.TextRect().iBr.iX)/2);
+    TInt tabVSpace = (TInt) ((activeTabTextRect.TextRect().iTl.iY - activeTabRect.Rect().iTl.iY + activeTabRect.Rect().iBr.iY - activeTabTextRect.TextRect().iBr.iY)/2);
+    TInt tabBaseHeight = 0;
+    if ( landscape && !AknLayoutUtils::PenEnabled())
+        {
+        // In landscape tab is below mainpane
+        tabBaseHeight = mainAreaRect.Rect().iBr.iY - tabsPaneRect.Rect().iTl.iY;
+        }
+    else
+        {
+        // In portrait (and in landscape touch) tab is above mainpane
+        tabBaseHeight = tabsPaneRect.Rect().iBr.iY - mainAreaRect.Rect().iTl.iY;
+        }
+    TInt tabBaseOverlap = 0;
+    if ( landscape && !AknLayoutUtils::PenEnabled())
+        {
+        // In landscape tab is below mainpane
+        tabBaseOverlap = Max( 0, mainAreaRect.Rect().iBr.iY - tabsPaneRect.Rect().iTl.iY);
+        }
+    else
+        {
+        // In portrait tab is above mainpane
+        tabBaseOverlap = Max( 0, mainAreaRect.Rect().iTl.iY - tabsPaneRect.Rect().iBr.iY);
+        }
+    TInt tabButtonWidth = Max(leftIndicationRect.Rect().Width(), rightIndicationRect.Rect().Width());
+    TInt tabVShift = Max( Abs(activeTabTextRect.TextRect().iBr.iY - passiveTabTextRect.TextRect().iBr.iY), Abs(activeTabTextRect.TextRect().iTl.iY - passiveTabTextRect.TextRect().iTl.iY) );
+    TInt tabHShift = Max( Abs(activeTabTextRect.TextRect().iBr.iX - passiveTabTextRect.TextRect().iBr.iX), Abs(activeTabTextRect.TextRect().iTl.iX - passiveTabTextRect.TextRect().iTl.iX) );
+    tabHShift -= (passiveTabRect.Rect().Width() - tabOverlap); // remove tab change and add overlapping area
+
+    switch( tabMetric )
+        {
+        case QStyle::PM_TabBarTabOverlap:
+            tabValue = tabOverlap;
+            break;
+        case QStyle::PM_TabBarTabHSpace:
+            tabValue = tabHSpace;
+            break;
+        case QStyle::PM_TabBarTabVSpace:
+            tabValue = tabVSpace;
+            break;
+        case QStyle::PM_TabBarBaseHeight:
+            tabValue = tabBaseHeight;
+            break;
+        case QStyle::PM_TabBarBaseOverlap:
+            tabValue = tabBaseOverlap;
+            break;
+        case QStyle::PM_TabBarScrollButtonWidth:
+            // Since in Qt the scroll indicator is shown within a button, we need to add button margins to this value
+            {
+            tabValue = tabButtonWidth + 2*PixelMetricValue(QStyle::PM_ButtonMargin);
+            }
+            break;
+        case QStyle::PM_TabBarTabShiftHorizontal:
+            tabValue = tabHShift;
+            break;
+        case QStyle::PM_TabBarTabShiftVertical:
+            tabValue = tabVShift;
+            break;
+        default:
+            break;
+        }
+    return tabValue;
+    }
+
+TInt PixelMetrics::PixelMetricMenuValue(QStyle::PixelMetric tabMetric, TRect mainPaneRect )
+    {
+    TInt menuValue = 0;
+    TAknLayoutRect popupMenuRect;
+    popupMenuRect.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::popup_menu_window(0) );
+    TAknLayoutRect listScrollPaneRect;
+    listScrollPaneRect.LayoutRect( popupMenuRect.Rect(), AknLayoutScalable_Avkon::listscroll_menu_pane(0) );
+    TAknLayoutRect listMenuPaneRect;
+    listMenuPaneRect.LayoutRect( listScrollPaneRect.Rect(), AknLayoutScalable_Avkon::list_menu_pane(0) );
+    TAknLayoutRect listMenuRow1Rect;
+    listMenuRow1Rect.LayoutRect( listScrollPaneRect.Rect(), AknLayoutScalable_Avkon::list_single_pane_cp2(0));
+
+    switch (tabMetric)
+        {
+        case QStyle::PM_MenuPanelWidth:
+            menuValue = listMenuPaneRect.Rect().iTl.iX - listScrollPaneRect.Rect().iTl.iX;
+            if ( AknLayoutUtils::LayoutMirrored() )
+                {
+                menuValue = listScrollPaneRect.Rect().iBr.iX - listMenuPaneRect.Rect().iBr.iX;
+                }
+            break;
+        case QStyle::PM_MenuHMargin:
+            menuValue = listMenuRow1Rect.Rect().iTl.iX - popupMenuRect.Rect().iTl.iX;
+            if ( AknLayoutUtils::LayoutMirrored() )
+                {
+                menuValue = popupMenuRect.Rect().iBr.iX - listMenuRow1Rect.Rect().iBr.iX;
+                }
+            break;
+        case QStyle::PM_MenuVMargin:
+            menuValue = listMenuRow1Rect.Rect().iTl.iY - popupMenuRect.Rect().iTl.iY;
+            break;
+        default:
+            break;
+        }
+    return menuValue;
+    }
diff --git a/util/s60pixelmetrics/pixel_metrics.h b/util/s60pixelmetrics/pixel_metrics.h
new file mode 100644
index 0000000000..692564ca6e
--- /dev/null
+++ b/util/s60pixelmetrics/pixel_metrics.h
@@ -0,0 +1,216 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PIXELMETRICS_H
+#define PIXELMETRICS_H
+
+#include <e32base.h>
+#define S60_Rnd_Env
+
+#ifdef S60_Rnd_Env
+#pragma message ("Building in supported environment")
+
+const TInt KUnknownBase = -5000;
+
+NONSHARABLE_CLASS( QStyle )
+    {
+    public:
+        enum PixelMetric {
+            PM_ButtonMargin,
+            PM_ButtonDefaultIndicator,
+            PM_MenuButtonIndicator,
+            PM_ButtonShiftHorizontal,
+            PM_ButtonShiftVertical,
+
+            PM_DefaultFrameWidth,
+            PM_SpinBoxFrameWidth,
+            PM_ComboBoxFrameWidth,
+
+            PM_MaximumDragDistance,
+
+            PM_ScrollBarExtent,
+            PM_ScrollBarSliderMin,
+
+            PM_SliderThickness,             // total slider thickness
+            PM_SliderControlThickness,      // thickness of the business part
+            PM_SliderLength,                // total length of slider
+            PM_SliderTickmarkOffset,        //
+            PM_SliderSpaceAvailable,        // available space for slider to move
+
+            PM_DockWidgetSeparatorExtent,
+            PM_DockWidgetHandleExtent,
+            PM_DockWidgetFrameWidth,
+
+            PM_TabBarTabOverlap,
+            PM_TabBarTabHSpace,
+            PM_TabBarTabVSpace,
+            PM_TabBarBaseHeight,
+            PM_TabBarBaseOverlap,
+
+            PM_ProgressBarChunkWidth,
+
+            PM_SplitterWidth,
+            PM_TitleBarHeight,
+
+            PM_MenuScrollerHeight,
+            PM_MenuHMargin,
+            PM_MenuVMargin,
+            PM_MenuPanelWidth,
+            PM_MenuTearoffHeight,
+            PM_MenuDesktopFrameWidth,
+
+            PM_MenuBarPanelWidth,
+            PM_MenuBarItemSpacing,
+            PM_MenuBarVMargin,
+            PM_MenuBarHMargin,
+
+            PM_IndicatorWidth,
+            PM_IndicatorHeight,
+            PM_ExclusiveIndicatorWidth,
+            PM_ExclusiveIndicatorHeight,
+            PM_CheckListButtonSize,
+            PM_CheckListControllerSize,
+
+            PM_DialogButtonsSeparator,
+            PM_DialogButtonsButtonWidth,
+            PM_DialogButtonsButtonHeight,
+
+            PM_MdiSubWindowFrameWidth,
+            PM_MDIFrameWidth = PM_MdiSubWindowFrameWidth,            //obsolete
+            PM_MdiSubWindowMinimizedWidth,
+            PM_MDIMinimizedWidth = PM_MdiSubWindowMinimizedWidth,    //obsolete
+
+            PM_HeaderMargin,
+            PM_HeaderMarkSize,
+            PM_HeaderGripMargin,
+            PM_TabBarTabShiftHorizontal,
+            PM_TabBarTabShiftVertical,
+            PM_TabBarScrollButtonWidth,
+
+            PM_ToolBarFrameWidth,
+            PM_ToolBarHandleExtent,
+            PM_ToolBarItemSpacing,
+            PM_ToolBarItemMargin,
+            PM_ToolBarSeparatorExtent,
+            PM_ToolBarExtensionExtent,
+
+            PM_SpinBoxSliderHeight,
+
+            PM_DefaultTopLevelMargin,
+            PM_DefaultChildMargin,
+            PM_DefaultLayoutSpacing,
+
+            PM_ToolBarIconSize,
+            PM_ListViewIconSize,
+            PM_IconViewIconSize,
+            PM_SmallIconSize,
+            PM_LargeIconSize,
+
+            PM_FocusFrameVMargin,
+            PM_FocusFrameHMargin,
+
+            PM_ToolTipLabelFrameWidth,
+            PM_CheckBoxLabelSpacing,
+            PM_TabBarIconSize,
+            PM_SizeGripSize,
+            PM_DockWidgetTitleMargin,
+            PM_MessageBoxIconSize,
+            PM_ButtonIconSize,
+
+            PM_DockWidgetTitleBarButtonMargin,
+
+            PM_RadioButtonLabelSpacing,
+            PM_LayoutLeftMargin,
+            PM_LayoutTopMargin,
+            PM_LayoutRightMargin,
+            PM_LayoutBottomMargin,
+            PM_LayoutHorizontalSpacing,
+            PM_LayoutVerticalSpacing,
+            PM_TabBar_ScrollButtonOverlap,
+
+            PM_TextCursorWidth,
+
+            PM_TabCloseIndicatorWidth,
+            PM_TabCloseIndicatorHeight,
+
+            PM_ScrollView_ScrollBarSpacing,
+            PM_SubMenuOverlap,
+
+            // do not add any values below/greater than this
+            PM_CustomBase = 0xf0000000,
+
+            // The following are custom values needed to draw the S60Style according scalable UIs.
+            // Width of 9-part frame-corner
+            PM_Custom_FrameCornerWidth,
+            // Height of 9-part frame corner
+            PM_Custom_FrameCornerHeight,
+            // Bold line width
+            PM_Custom_BoldLineWidth,
+            // Thin line width
+            PM_Custom_ThinLineWidth
+        };
+
+    };
+#else
+#pragma message ("Building in non-supported environment, this probably fails")
+#endif
+
+
+// Pixel metrics version information.
+class TPixelMetricsVersion
+    {
+    public:
+        TInt majorVersion;
+        TInt minorVersion;
+    };
+
+NONSHARABLE_CLASS(PixelMetrics)
+{
+    public:
+        static TPixelMetricsVersion Version();
+        static TInt PixelMetricValue(QStyle::PixelMetric);
+
+    private:
+        static TInt PixelMetricMenuValue( QStyle::PixelMetric menuValue, TRect mainPaneRect );
+        static TInt PixelMetricTabValue( QStyle::PixelMetric tabValue, TRect appWindow, TBool landscape );
+};
+
+#endif // PIXELMETRICS_H
diff --git a/util/s60pixelmetrics/pm_mapper.hrh b/util/s60pixelmetrics/pm_mapper.hrh
new file mode 100644
index 0000000000..afd47db974
--- /dev/null
+++ b/util/s60pixelmetrics/pm_mapper.hrh
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PMMAPPER_HRH
+#define PMMAPPER_HRH
+
+// DATA TYPES
+
+// View IDs.
+enum
+    {
+    EPMMapperViewId = 1             // Base view.
+    };
+
+// Menu items (commands)
+enum
+    {
+    ECmdStartCalculations = 8500,
+    ECmdSwitchOrientation,
+    ECmdSwitchMirroring,
+    ECmdStatus,
+    ECmdSwitchOutput,
+    ECmdCreateHeaderFile,
+    ECmdSetAutoMode
+    };
+
+enum
+    {
+    EWaitNote = 9000
+    };
+
+#endif    // PMMAPPER_HRH
+
+
+// End of File
diff --git a/util/s60pixelmetrics/pm_mapper.mmp b/util/s60pixelmetrics/pm_mapper.mmp
new file mode 100644
index 0000000000..a277404e00
--- /dev/null
+++ b/util/s60pixelmetrics/pm_mapper.mmp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include    <data_caging_paths.hrh>
+#include    <domain\osextensions\platform_paths.hrh>
+
+TARGET          pm_mapper.exe
+TARGETTYPE      exe
+UID             0x100039CE 0x2002121F
+
+CAPABILITY CAP_APPLICATION
+VENDORID VID_DEFAULT
+
+SOURCEPATH      .
+SOURCE          pm_mapperview.cpp
+SOURCE          pm_mapperapp.cpp
+SOURCE          pixel_metrics.cpp
+
+START RESOURCE  pm_mapper.rss
+HEADER
+TARGETPATH      APP_RESOURCE_DIR
+END
+
+START RESOURCE  pm_mapper_reg.rss
+TARGETPATH      \private\10003a3f\apps
+END
+
+APP_LAYER_SYSTEMINCLUDE
+USERINCLUDE     .
+
+LIBRARY    eikcoctl.lib
+LIBRARY    avkon.lib
+LIBRARY    euser.lib
+LIBRARY    apparc.lib
+LIBRARY    cone.lib
+LIBRARY    eikcore.lib
+LIBRARY    bafl.lib
+LIBRARY    eikctl.lib
+LIBRARY    apgrfx.lib
+LIBRARY    aknnotify.lib
+LIBRARY    ws32.lib
+LIBRARY    commonengine.lib
+LIBRARY    fbscli.lib
+LIBRARY    eikdlg.lib
+LIBRARY    aknskins.lib
+LIBRARY    gdi.lib
+LIBRARY    CentralRepository.lib
+LIBRARY    efsrv.lib
+LIBRARY    cdlengine.lib
+LIBRARY    AknLayout2.lib
+LIBRARY    AknLayout2Scalable.lib
+
+// End of File
diff --git a/util/s60pixelmetrics/pm_mapper.pkg b/util/s60pixelmetrics/pm_mapper.pkg
new file mode 100644
index 0000000000..1f2e38fab0
--- /dev/null
+++ b/util/s60pixelmetrics/pm_mapper.pkg
@@ -0,0 +1,32 @@
+; ==============================================================================
+;  Name        : PMMapper.pkg
+;  Part of     : Pixel Metrics Mapper
+;  Description : Package file for pixel metrics mapper
+;                SIS creation.
+;  Version     :
+;
+;  Copyright (c) 2009 Nokia Corporation.
+;  This material, including documentation and any related
+;  computer programs, is protected by copyright controlled by
+;  Nokia Corporation. All rights are reserved. Copying,
+;  including reproducing, storing, adapting or translating, any
+;  or all of this material requires the prior written consent of
+;  Nokia Corporation. This material also contains confidential
+;  information which may not be disclosed to others without the
+;  prior written consent of Nokia Corporation.
+; ==============================================================================
+
+
+;Header
+#{"PMMapper"},(0x2002121F),1,0,0
+
+;Localised Vendor name
+%{"Nokia Test EN"}
+
+;Unique Vendor name
+:"Vendor"
+
+;Files to install
+"\Epoc32\release\armv5\urel\pm_mapper.exe"                   -"!:\sys\bin\pm_mapper.exe"
+"\epoc32\data\z\private\10003a3f\apps\pm_mapper_reg.rsc"     -"!:\private\10003a3f\import\apps\pm_mapper_reg.rsc"
+"\epoc32\data\Z\Resource\Apps\pm_mapper.RSC"                 -"!:\resource\apps\pm_mapper.rsc"
diff --git a/util/s60pixelmetrics/pm_mapper.rss b/util/s60pixelmetrics/pm_mapper.rss
new file mode 100644
index 0000000000..85432718ae
--- /dev/null
+++ b/util/s60pixelmetrics/pm_mapper.rss
@@ -0,0 +1,162 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+//  RESOURCE IDENTIFIER
+NAME TATR
+
+
+//  INCLUDES
+#include <eikon.rh>
+#include <avkon.rh>
+#include <avkon.mbg>
+#include <avkon.rsg>
+#include <avkon.hrh>
+#include <uikon.hrh>
+#include <avkonIcons.hrh>
+#include <data_caging_paths_strings.hrh>
+#include <appinfo.rh>
+
+#include "pm_mapper.hrh"
+
+
+//  RESOURCE DEFINITIONS
+
+// -----------------------------------------------------------------------------
+//
+// RSS_SIGNATURE
+//
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE RSS_SIGNATURE { }
+
+
+// -----------------------------------------------------------------------------
+//
+// TBUF
+//
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF { buf = "pm_mapper"; }
+
+
+// -----------------------------------------------------------------------------
+//
+// EIK_APP_INFO
+//
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE EIK_APP_INFO
+    {
+    }
+
+// -----------------------------------------------------------------------------
+//
+// r_pmmapper_localisable_app_info
+// Captions for this application.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE LOCALISABLE_APP_INFO r_pmmapper_localisable_app_info
+    {
+    short_caption = "pm_mapper";
+    caption_and_icon =
+        CAPTION_AND_ICON_INFO
+            {
+            caption = "PixelMetricsMapper";
+            };
+    }
+
+// -----------------------------------------------------------------------------
+//
+// r_pmmapper_view
+//
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE AVKON_VIEW r_pmmapper_view
+    {
+    menubar = r_pmmapper_view_menu;
+    cba     = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// r_pmmapper_view_menu
+//
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE MENU_BAR r_pmmapper_view_menu
+    {
+    titles=
+        {
+        MENU_TITLE { txt = "A"; menu_pane = r_pmmapper_system_menu; }
+        };
+    }
+
+// -----------------------------------------------------------------------------
+//
+// r_pmmapper_system_menu
+//
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE MENU_PANE r_pmmapper_system_menu
+    {
+    items =
+        {
+        MENU_ITEM { command = ECmdStartCalculations; txt = "Start calculations"; },
+        MENU_ITEM { command = ECmdSwitchOrientation; txt = "Switch orientation"; },
+        MENU_ITEM { command = ECmdSwitchMirroring;   txt = "Switch mirroring";},
+        MENU_ITEM { command = ECmdStatus;            txt = "Status"; },
+        MENU_ITEM { command = ECmdSwitchOutput;      txt = "Switch output (file/screen)"; },
+        MENU_ITEM { command = ECmdCreateHeaderFile;  txt = "Create header file"; },
+        MENU_ITEM { command = ECmdSetAutoMode;       txt = "Switch autoMode";}
+        };
+    }
+
+
+// End of File
diff --git a/util/s60pixelmetrics/pm_mapper_reg.rss b/util/s60pixelmetrics/pm_mapper_reg.rss
new file mode 100644
index 0000000000..d21a2c8314
--- /dev/null
+++ b/util/s60pixelmetrics/pm_mapper_reg.rss
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <appinfo.rh>
+#include <pm_mapper.rsg>
+#include <data_caging_paths_strings.hrh>
+
+UID2 KUidAppRegistrationResourceFile
+UID3 0x2002121F // application UID
+
+RESOURCE APP_REGISTRATION_INFO
+    {
+    app_file = "pm_mapper";
+    localisable_resource_file =
+        APP_RESOURCE_DIR"\\pm_mapper";
+    localisable_resource_id = R_PMMAPPER_LOCALISABLE_APP_INFO;
+    }
+
+// End of File
diff --git a/util/s60pixelmetrics/pm_mapperapp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp
new file mode 100644
index 0000000000..e699019e35
--- /dev/null
+++ b/util/s60pixelmetrics/pm_mapperapp.cpp
@@ -0,0 +1,1044 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// INCLUDE FILES
+
+#include <avkon.rsg>
+#include <avkon.hrh>
+#include "pm_mapper.hrh"
+#include "pm_mapperapp.h"
+#include "pm_mapperview.h"
+#include <pm_mapper.rsg>
+
+#include <BldVariant.hrh>
+
+#include <w32std.h>
+#include <apgwgnam.h>
+#include <eikstart.h>
+#include <eikenv.h>
+#include <f32file.h>
+
+#include <avkon.hrh>
+#include <aknenv.h>
+
+#include <aknnotedialog.h>
+#include <stringloader.h>
+#include <coneresloader.h>
+#include <aknglobalnote.h>
+
+#include <CentralRepository.h>
+#include <AvkonInternalCRKeys.h>    // KAknLayoutId
+
+#include <Aknsutils.h>
+#include <AknUtils.h>
+#include "pixel_metrics.h"
+
+#include <avkon.mbg>
+
+#include <AknLayoutConfig.h>
+#include <aknsgcc.h>
+
+typedef TBuf<2048> TMySmallBuffer;
+typedef TBuf<8192> TMyBigBuffer;
+
+_LIT(KLayoutSourceFileAndPath, "\\private\\2002121f\\pm_layout.cpp");
+_LIT(KPixelMetricsDataFiles, "\\private\\2002121f\\*.txt");
+_LIT(KOpenBrace, "{");
+_LIT(KComma, ",");
+_LIT(KColon, ":");
+_LIT(KTab, "\t");
+_LIT(KEndBraceWithCommaAndCRLF, "},\n");
+_LIT(KCRLF, "\n");
+
+// Number of header lines in layout data.
+const TInt KHeaderValues = 5;
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// C++ constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CPixelMetricsMapperAppUi::CPixelMetricsMapperAppUi() : iFileOutputOn(EFalse)
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CPixelMetricsMapperAppUi::~CPixelMetricsMapperAppUi()
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperAppUi::ConstructL()
+    {
+    BaseConstructL();
+
+    CEikonEnv& eikEnv = *CEikonEnv::Static();
+
+    eikEnv.WsSession().ComputeMode(
+        RWsSession::EPriorityControlDisabled );
+    RThread().SetProcessPriority( EPriorityHigh );
+
+    CPixelMetricsMapperView* view = new( ELeave ) CPixelMetricsMapperView;
+    CleanupStack::PushL( view );
+    view->ConstructL();
+    CleanupStack::Pop();    // view
+    AddViewL(view);    // transfer ownership to CAknViewAppUi
+    iView = view;
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TKeyResponse CPixelMetricsMapperAppUi::HandleKeyEventL(
+        const TKeyEvent& /*aKeyEvent*/,
+        TEventCode aType )
+    {
+    return EKeyWasNotConsumed;
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
+    {
+    switch ( aCommand )
+        {
+        case EAknSoftkeyExit:
+        case EEikCmdExit:
+            Exit();
+            break;
+        case ECmdSwitchOutput:
+            iFileOutputOn = !iFileOutputOn;
+            break;
+        case ECmdStatus:
+            {
+            ClearL();
+
+            // layout
+            CRepository* repository = NULL;
+            TInt value = KErrNotFound;
+            TRAPD(ret, repository = CRepository::NewL(KCRUidAvkon));
+            if (ret == KErrNone)
+                {
+                ret = repository->Get(KAknLayoutId, value);
+                }
+            delete repository;
+            ret= 0;
+            HBufC* buffer = HBufC::NewLC( 100 );
+            TPtr bufferPtr = buffer->Des();
+            bufferPtr.Append(_L("Layout: "));
+            if (ret==KErrNone)
+                {
+                bufferPtr.AppendNum(value);
+                }
+            else
+                {
+                bufferPtr.Append(_L("(error) "));
+                bufferPtr.AppendNum(ret);
+                }
+            TBool last = ETrue;
+            ShowL( *buffer, last );
+            bufferPtr.Zero();
+
+            // Orientation
+            bufferPtr.Append(_L("Orientation: "));
+            bufferPtr.AppendNum((TInt)iAvkonAppUi->Orientation());
+            ShowL( *buffer, last );
+            bufferPtr.Zero();
+
+            // Output
+            bufferPtr.Append(_L("Output: "));
+            if (iFileOutputOn) bufferPtr.Append(_L("File"));
+            else bufferPtr.Append(_L("Screen"));
+            ShowL( *buffer, last );
+            bufferPtr.Zero();
+
+            // Automode
+            bufferPtr.Append(_L("AutoMode: "));
+            bufferPtr.AppendNum((TInt)iAutoMode);
+            ShowL( *buffer, last );
+            bufferPtr.Zero();
+
+            CAknLayoutConfig::TScreenMode localAppScreenMode = CAknSgcClient::ScreenMode();
+            TInt hashValue = localAppScreenMode.ScreenStyleHash();
+            TPixelsTwipsAndRotation pixels = CAknSgcClient::PixelsAndRotation();
+            TSize pixelSize = pixels.iPixelSize;
+
+            bufferPtr.Append(_L("LayoutName: "));
+
+            if ( (pixelSize.iWidth == 320 || pixelSize.iWidth == 240 )&&
+                 (pixelSize.iHeight == 320 || pixelSize.iHeight == 240 ))
+                 {
+                if (hashValue==0x996F7AA7)
+                    bufferPtr.Append(_L("QVGA2"));
+                else
+                    bufferPtr.Append(_L("QVGA1"));
+                }
+            else if ((pixelSize.iWidth == 640 || pixelSize.iWidth == 360 )&&
+                    (pixelSize.iHeight == 360 || pixelSize.iHeight == 640 ))
+                {
+                bufferPtr.Append(_L("nHD"));
+                }
+            else if ((pixelSize.iWidth == 640 || pixelSize.iWidth == 480 )&&
+                    (pixelSize.iHeight == 480 || pixelSize.iHeight == 640 ))
+                {
+                bufferPtr.Append(_L("VGA"));
+                }
+            else if ((pixelSize.iWidth == 352 || pixelSize.iWidth == 800 )&&
+                    (pixelSize.iHeight == 800 || pixelSize.iHeight == 352 ))
+                {
+                bufferPtr.Append(_L("E90"));
+                }
+            else if ((pixelSize.iWidth == 320 || pixelSize.iWidth == 480 ||
+                      pixelSize.iWidth == 240 || pixelSize.iWidth == 640 )&&
+                    (pixelSize.iHeight == 320 || pixelSize.iHeight == 480 ||
+                     pixelSize.iHeight == 240 || pixelSize.iHeight == 640))
+                {
+                bufferPtr.Append(_L("HVGA"));
+                }
+            else if ((pixelSize.iWidth == 480 || pixelSize.iWidth == 854 ||
+                      pixelSize.iWidth == 848 || pixelSize.iWidth == 800 )&&
+                    (pixelSize.iHeight == 800 || pixelSize.iHeight == 480 ||
+                     pixelSize.iHeight == 848 || pixelSize.iHeight == 854))
+                {
+                bufferPtr.Append(_L("WVGA"));
+                }
+            else
+                {
+                bufferPtr.Append(_L("Unknown"));
+                }
+
+            ShowL( *buffer, last );
+            bufferPtr.Zero();
+            CleanupStack::PopAndDestroy( buffer );
+            }
+            break;
+        case ECmdSwitchMirroring:
+            {
+            // set the shared data value
+            CRepository* repository = NULL;
+            TRAPD(ret, repository = CRepository::NewL(KCRUidAvkon));
+            if (ret == KErrNone)
+                {
+                TInt value = KErrNotFound;
+                repository->Get(KAknLayoutId, value);
+                if ( value == EAknLayoutIdELAF)
+                    {
+                    value = EAknLayoutIdABRW;
+                    }
+                else if (value ==EAknLayoutIdABRW)
+                    {
+                    value = EAknLayoutIdELAF;
+                    }
+                ret = repository->Set(KAknLayoutId, value);
+                }
+            delete repository;
+            // now inform all open apps of the switch
+            TWsEvent event;
+            event.SetType(KEikDynamicLayoutVariantSwitch);
+            iEikonEnv->WsSession().SendEventToAllWindowGroups(event);
+            }
+            break;
+        case ECmdSwitchOrientation:
+            {
+            ClearL();
+            #ifndef __SERIES60_31__
+            if (!iAvkonAppUi->OrientationCanBeChanged())
+                {
+                HBufC* buffer = HBufC::NewLC( 100 );
+                TPtr bufferPtr = buffer->Des();
+                bufferPtr.Append(_L("Orientation cannot be changed."));
+                TBool last = EFalse;
+                ShowL( *buffer, last );
+                bufferPtr.Zero();
+                delete buffer;
+                }
+            #endif //__SERIES60_31__
+            if ( iAvkonAppUi->Orientation() == CAknAppUiBase::EAppUiOrientationPortrait)
+                {
+                iAvkonAppUi->SetOrientationL(CAknAppUiBase::EAppUiOrientationLandscape);
+                }
+            else if (iAvkonAppUi->Orientation() == CAknAppUiBase::EAppUiOrientationLandscape)
+                {
+                iAvkonAppUi->SetOrientationL(CAknAppUiBase::EAppUiOrientationPortrait);
+                }
+            else
+                {
+                // unspecified
+                iAvkonAppUi->SetOrientationL(CAknAppUiBase::EAppUiOrientationLandscape);
+                /*User::After(100000);
+                HBufC* buffer = HBufC::NewLC( 100 );
+                TPtr bufferPtr = buffer->Des();
+                bufferPtr.Append(_L("Orientation unspecified."));
+                TBool last = EFalse;
+                ShowL( *buffer, last );
+                bufferPtr.Zero();
+                delete buffer;*/
+                }
+            break;
+            }
+        case ECmdStartCalculations:
+            {
+            ClearL();
+            // Get known values
+            TInt index = 0;
+            TBool last = EFalse;
+            if (iFileOutputOn)
+                {
+                TRect screenRect;
+                AknLayoutUtils::LayoutMetricsRect(
+                    AknLayoutUtils::EApplicationWindow,
+                    screenRect );
+
+                // Add screen dimensions
+                TInt height = screenRect.Height();
+                TInt width = screenRect.Width();
+                TBuf16<32> tgt;
+                // HEIGTH
+                tgt.Append(_L("height: \t"));
+                tgt.AppendNum(height, EDecimal); // put max height into text file
+                ShowL( tgt, last );
+                tgt.Zero();
+                // WIDTH
+                tgt.Append(_L("width: \t"));
+                tgt.AppendNum(width, EDecimal); // put max width into text file
+                ShowL( tgt, last );
+                tgt.Zero();
+                // VERSION
+                TPixelMetricsVersion version = PixelMetrics::Version();
+                tgt.Append(_L("major_version: \t"));
+                tgt.AppendNum(version.majorVersion, EDecimal); // put major version into text file
+                ShowL( tgt, last );
+                tgt.Zero();
+                tgt.Append(_L("minor_version: \t"));
+                tgt.AppendNum(version.minorVersion, EDecimal); // put minor version into text file
+                ShowL( tgt, last );
+                tgt.Zero();
+                // MIRRORED
+                TBool mirrored = AknLayoutUtils::LayoutMirrored();
+                tgt.Append(_L("mirrored: \t"));
+                tgt.AppendNum(mirrored, EDecimal); // put mirrored state into text file
+                ShowL( tgt, last );
+                tgt.Zero();
+                }
+
+            TInt myValue = KErrNotFound;
+            for (;;)
+                {
+                if (index==QStyle::PM_Custom_ThinLineWidth)
+                    {
+                    last = ETrue;
+                    }
+                myValue = PixelMetrics::PixelMetricValue(static_cast<QStyle::PixelMetric>(index));
+                ShowSingleValueL( index, myValue, last );
+
+                if (last) break;
+                // if last before custom values, "jump" to custom base
+                if (index==QStyle::PM_SubMenuOverlap) index = QStyle::PM_CustomBase;
+                index++;
+                }
+            if (iAutoMode && !iMode)
+                {
+                HandleCommandL(ECmdSwitchMirroring);
+                iMode = ETrue;
+                }
+            }
+            break;
+        case ECmdCreateHeaderFile:
+            CreateHeaderFileL();
+            break;
+        case ECmdSetAutoMode:
+            iAutoMode = !iAutoMode;
+        default:
+            break;
+        }
+    }
+void CPixelMetricsMapperAppUi::DoAutoOperationL()
+    {
+    HandleCommandL(ECmdStartCalculations);
+    iMode = EFalse;
+    HandleCommandL(ECmdSwitchMirroring);
+    }
+
+TBool CPixelMetricsMapperAppUi::ReadyForAutoOp() const
+    {
+    return (iAutoMode && iMode);
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperAppUi::ShowL( const TDesC& aText, TBool& aLast, const TBool& aFileOutput )
+    {
+    _LIT( KTestPrefix, "\t" );
+
+    HBufC* buffer = HBufC::NewLC( aText.Length() + KTestPrefix().Length() );
+    TPtr ptr = buffer->Des();
+    ptr.Append( KTestPrefix );
+    ptr.Append( aText );
+    iView->ShowL( *buffer, aLast, aFileOutput );
+    CleanupStack::PopAndDestroy( buffer );
+    }
+
+void CPixelMetricsMapperAppUi::ShowSingleValueL(TInt& aPixelMetric, TInt& aValue, TBool& aLast )
+    {
+    HBufC* buffer = HBufC::NewLC( 100 );
+    TPtr bufferPtr = buffer->Des();
+
+    switch (aPixelMetric)
+        {
+        case QStyle::PM_DockWidgetTitleMargin:
+            bufferPtr.Append(_L("DockTitleMargin: "));
+            break;
+        case QStyle::PM_DockWidgetTitleBarButtonMargin:
+            bufferPtr.Append(_L("DockTitleBtnMargin: "));
+            break;
+        case QStyle::PM_ButtonMargin:
+            bufferPtr.Append(_L("ButtonMargin: "));
+            break;
+        case QStyle::PM_ButtonDefaultIndicator:
+            bufferPtr.Append(_L("ButtonDefaultIndicator: "));
+            break;
+        case QStyle::PM_MdiSubWindowFrameWidth:
+            bufferPtr.Append(_L("MdiSubWndFrameW: "));
+            break;
+        case QStyle::PM_ComboBoxFrameWidth:
+            bufferPtr.Append(_L("ComboBoxFrameWidth: "));
+            break;
+        case QStyle::PM_SpinBoxFrameWidth:
+            bufferPtr.Append(_L("SpinBoxFrameWidth: "));
+            break;
+        case QStyle::PM_DefaultFrameWidth:
+            bufferPtr.Append(_L("DefaultFrameWidth: "));
+            break;
+        case QStyle::PM_RadioButtonLabelSpacing:
+            bufferPtr.Append(_L("RadioButtonLabelSpc: "));
+            break;
+        case QStyle::PM_CheckBoxLabelSpacing:
+            bufferPtr.Append(_L("CheckBoxLabelSpacing: "));
+            break;
+        case QStyle::PM_ToolTipLabelFrameWidth:
+            bufferPtr.Append(_L("ToolTipLabelFrameW: "));
+            break;
+        case QStyle::PM_ListViewIconSize:
+            bufferPtr.Append(_L("ListViewIconSize: "));
+            break;
+        case QStyle::PM_LargeIconSize:
+            bufferPtr.Append(_L("LargeIconSize: "));
+            break;
+        case QStyle::PM_IconViewIconSize:
+            bufferPtr.Append(_L("IconViewIconSize: "));
+            break;
+        case QStyle::PM_TabBarIconSize:
+            bufferPtr.Append(_L("TabBarIconSize: "));
+            break;
+        case QStyle::PM_MessageBoxIconSize:
+            bufferPtr.Append(_L("MessageBoxIconSize: "));
+            break;
+        case QStyle::PM_ButtonIconSize:
+            bufferPtr.Append(_L("ButtonIconSize: "));
+            break;
+        case QStyle::PM_TextCursorWidth:
+            bufferPtr.Append(_L("TextCursorWidth: "));
+            break;
+        case QStyle::PM_SliderLength:
+            bufferPtr.Append(_L("SliderLength: "));
+            break;
+        case QStyle::PM_SliderThickness:
+            bufferPtr.Append(_L("SliderThickness: "));
+            break;
+        case QStyle::PM_SliderTickmarkOffset:
+            bufferPtr.Append(_L("SliderTickmarkOffset: "));
+            break;
+        case QStyle::PM_SliderControlThickness:
+            bufferPtr.Append(_L("SliderCntrlThickness: "));
+            break;
+        case QStyle::PM_SliderSpaceAvailable:
+            bufferPtr.Append(_L("SliderSpaceAvailable: "));
+            break;
+        case QStyle::PM_MenuBarItemSpacing:
+            bufferPtr.Append(_L("MenuBarItemSpacing: "));
+            break;
+        case QStyle::PM_MenuBarHMargin:
+            bufferPtr.Append(_L("MenuBarHMargin: "));
+            break;
+        case QStyle::PM_MenuBarVMargin:
+            bufferPtr.Append(_L("MenuBarVMargin: "));
+            break;
+        case QStyle::PM_ToolBarItemSpacing:
+            bufferPtr.Append(_L("ToolBarItemSpacing: "));
+            break;
+        case QStyle::PM_ToolBarFrameWidth:
+            bufferPtr.Append(_L("ToolBarFrameWidth: "));
+            break;
+        case QStyle::PM_ToolBarItemMargin:
+            bufferPtr.Append(_L("ToolBarItemMargin: "));
+            break;
+        case QStyle::PM_LayoutLeftMargin:
+            bufferPtr.Append(_L("LayoutLeftMargin: "));
+            break;
+        case QStyle::PM_LayoutRightMargin:
+            bufferPtr.Append(_L("LayoutRightMargin: "));
+            break;
+        case QStyle::PM_LayoutTopMargin:
+            bufferPtr.Append(_L("LayoutTopMargin: "));
+            break;
+        case QStyle::PM_LayoutBottomMargin:
+            bufferPtr.Append(_L("LayoutBottomMargin: "));
+            break;
+        case QStyle::PM_LayoutHorizontalSpacing:
+            bufferPtr.Append(_L("LayoutHSpacing: "));
+            break;
+        case QStyle::PM_LayoutVerticalSpacing:
+            bufferPtr.Append(_L("LayoutVSpacing: "));
+            break;
+        case QStyle::PM_MaximumDragDistance:
+            bufferPtr.Append(_L("MaxDragDistance: "));
+            break;
+        case QStyle::PM_ScrollBarExtent:
+            bufferPtr.Append(_L("ScrollBarExtent: "));
+            break;
+        case QStyle::PM_ScrollBarSliderMin:
+            bufferPtr.Append(_L("ScrollBarSliderMin: "));
+            break;
+        case QStyle::PM_MenuBarPanelWidth:
+            bufferPtr.Append(_L("MenuBarPanelWidth: "));
+            break;
+        case QStyle::PM_ProgressBarChunkWidth:
+            bufferPtr.Append(_L("ProgBarChunkWidth: "));
+            break;
+        case QStyle::PM_TabBarTabOverlap:
+            bufferPtr.Append(_L("TabBarTabOverlap: "));
+            break;
+        case QStyle::PM_TabBarTabHSpace:
+            bufferPtr.Append(_L("TabBarTabHSpace: "));
+            break;
+        case QStyle::PM_TabBarTabVSpace:
+            bufferPtr.Append(_L("TabBarTabVSpace: "));
+            break;
+        case QStyle::PM_TabBarBaseHeight:
+            bufferPtr.Append(_L("TabBarBaseHeight: "));
+            break;
+        case QStyle::PM_TabBarBaseOverlap:
+            bufferPtr.Append(_L("TabBarBaseOverlap: "));
+            break;
+        case QStyle::PM_TabBarScrollButtonWidth:
+            bufferPtr.Append(_L("TabBarScrollBtnWidth: "));
+            break;
+        case QStyle::PM_TabBarTabShiftHorizontal:
+            bufferPtr.Append(_L("TabBarTabShiftH: "));
+            break;
+        case QStyle::PM_TabBarTabShiftVertical:
+            bufferPtr.Append(_L("TabBarTabShiftV: "));
+            break;
+        case QStyle::PM_MenuPanelWidth:
+            bufferPtr.Append(_L("MenuPanelWidth: "));
+            break;
+        case QStyle::PM_MenuHMargin:
+            bufferPtr.Append(_L("MenuHMargin: "));
+            break;
+        case QStyle::PM_MenuVMargin:
+            bufferPtr.Append(_L("MenuVMargin: "));
+            break;
+        case QStyle::PM_MenuDesktopFrameWidth:
+            bufferPtr.Append(_L("MenuFrameWidth: "));
+            break;
+        case QStyle::PM_SmallIconSize:
+            bufferPtr.Append(_L("SmallIconSize: "));
+            break;
+        case QStyle::PM_FocusFrameHMargin:
+            bufferPtr.Append(_L("FocusFrameHMargin: "));
+            break;
+        case QStyle::PM_FocusFrameVMargin:
+            bufferPtr.Append(_L("FocusFrameVMargin: "));
+            break;
+        case QStyle::PM_ToolBarIconSize:
+            bufferPtr.Append(_L("ToolBarIconSize: "));
+            break;
+        case QStyle::PM_TitleBarHeight: // use titlepane height
+            bufferPtr.Append(_L("TitleBarHeight: "));
+            break;
+        case QStyle::PM_IndicatorWidth:
+            bufferPtr.Append(_L("IndicatorWidth: "));
+            break;
+        case QStyle::PM_IndicatorHeight:
+            bufferPtr.Append(_L("IndicatorHeight: "));
+            break;
+        case QStyle::PM_ExclusiveIndicatorHeight:
+            bufferPtr.Append(_L("ExclusiveIndHeight: "));
+            break;
+        case QStyle::PM_ExclusiveIndicatorWidth:
+            bufferPtr.Append(_L("ExclusiveIndWidth: "));
+            break;
+        case QStyle::PM_HeaderMargin: // not in S60
+            bufferPtr.Append(_L("HeaderMargin: "));
+            break;
+        case QStyle::PM_MenuScrollerHeight: // not in S60
+            bufferPtr.Append(_L("MenuScrollerHeight: "));
+            break;
+        case QStyle::PM_MenuTearoffHeight: // not in S60
+            bufferPtr.Append(_L("MenuTearoffHeight: "));
+            break;
+        case QStyle::PM_DockWidgetFrameWidth: // not in S60
+            bufferPtr.Append(_L("DockFrameWidth: "));
+            break;
+        case QStyle::PM_DockWidgetSeparatorExtent: // not in S60
+            bufferPtr.Append(_L("DockSepExtent: "));
+            break;
+        case QStyle::PM_MdiSubWindowMinimizedWidth: //no such thing in S60
+            bufferPtr.Append(_L("MdiSubWndMinWidth: "));
+            break;
+        case QStyle::PM_HeaderGripMargin: // not in S60
+            bufferPtr.Append(_L("HeaderGripMargin: "));
+            break;
+        case QStyle::PM_SplitterWidth: // not in S60
+            bufferPtr.Append(_L("SplitterWidth: "));
+            break;
+        case QStyle::PM_ToolBarExtensionExtent: // not in S60
+            bufferPtr.Append(_L("ToolBarExtExtent: "));
+            break;
+        case QStyle::PM_ToolBarSeparatorExtent: // not in S60
+            bufferPtr.Append(_L("ToolBarSepExtent: "));
+            break;
+        case QStyle::PM_ToolBarHandleExtent: // not in s60
+            bufferPtr.Append(_L("ToolBarHandleExtent: "));
+            break;
+        case QStyle::PM_MenuButtonIndicator: // none???
+            bufferPtr.Append(_L("MenuButtonIndicator: "));
+            break;
+        case QStyle::PM_ButtonShiftHorizontal: //none in 3.x
+            bufferPtr.Append(_L("ButtonShiftHorizontal: "));
+            break;
+        case QStyle::PM_ButtonShiftVertical: // none in 3.x
+            bufferPtr.Append(_L("ButtonShiftVertical: "));
+            break;
+        case QStyle::PM_TabBar_ScrollButtonOverlap: // not used in S60 - tab arrows are on left and right side of tab group - not together
+            bufferPtr.Append(_L("TabScrollBtnOverlap: "));
+            break;
+        case QStyle::PM_SizeGripSize: // use default
+            bufferPtr.Append(_L("SizeGripSize: "));
+            break;
+        case QStyle::PM_DockWidgetHandleExtent:
+            bufferPtr.Append(_L("DockWdgtHandleExt: "));
+            break;
+        case QStyle::PM_CheckListButtonSize:
+            bufferPtr.Append(_L("CheckListButtonSize: "));
+            break;
+        case QStyle::PM_CheckListControllerSize:
+            bufferPtr.Append(_L("CheckListCntlerSize: "));
+            break;
+        case QStyle::PM_DialogButtonsSeparator:
+            bufferPtr.Append(_L("DialogBtnSeparator: "));
+            break;
+        case QStyle::PM_DialogButtonsButtonWidth:
+            bufferPtr.Append(_L("DialogBtnWidth: "));
+            break;
+        case QStyle::PM_DialogButtonsButtonHeight:
+            bufferPtr.Append(_L("DialogBtnHeight: "));
+            break;
+        case QStyle::PM_HeaderMarkSize:
+            bufferPtr.Append(_L("HeaderMarkSize: "));
+            break;
+        case QStyle::PM_SpinBoxSliderHeight:
+            bufferPtr.Append(_L("SpinBoxSliderHeight: "));
+            break;
+        case QStyle::PM_DefaultTopLevelMargin:
+            bufferPtr.Append(_L("DefaultTopLvlMrg: "));
+            break;
+        case QStyle::PM_DefaultChildMargin:
+            bufferPtr.Append(_L("DefaultChildMrg: "));
+            break;
+        case QStyle::PM_DefaultLayoutSpacing:
+            bufferPtr.Append(_L("DefaultlayoutSpc: "));
+            break;
+        case QStyle::PM_TabCloseIndicatorWidth:
+            bufferPtr.Append(_L("TabCloseIndWidth: "));
+            break;
+        case QStyle::PM_TabCloseIndicatorHeight:
+            bufferPtr.Append(_L("TabCloseIndHeight: "));
+            break;
+        case QStyle::PM_ScrollView_ScrollBarSpacing:
+            bufferPtr.Append(_L("ScrollViewBarSpc: "));
+            break;
+        case QStyle::PM_SubMenuOverlap:
+            bufferPtr.Append(_L("SubMenuOverlap: "));
+            break;
+        case QStyle::PM_Custom_FrameCornerHeight:
+            bufferPtr.Append(_L("C_FrCornerHeight: "));
+            break;
+        case QStyle::PM_Custom_FrameCornerWidth:
+            bufferPtr.Append(_L("C_FrCornerWidth: "));
+            break;
+        case QStyle::PM_Custom_ThinLineWidth:
+            bufferPtr.Append(_L("C_ThinLineWidth: "));
+            break;
+        case QStyle::PM_Custom_BoldLineWidth:
+            bufferPtr.Append(_L("C_BoldLineWidth: "));
+            break;
+        default:
+            bufferPtr.Append(_L("Default: "));
+            break;
+        }
+
+    if (iFileOutputOn)
+        {
+        bufferPtr.Append('\t');
+        }
+    bufferPtr.AppendNum(aValue);
+    bufferPtr.Append(_L(" "));
+    ShowL( *buffer, aLast, iFileOutputOn );
+    CleanupStack::PopAndDestroy( buffer );
+    }
+
+void CPixelMetricsMapperAppUi::ClearL()
+    {
+    iView->ClearL();
+    }
+
+void CPixelMetricsMapperAppUi::CreateHeaderFileL() const
+    {
+    // Open/create resulting file.
+    RFile file;
+    HBufC* layoutFile = HBufC::NewLC( KMaxFileName );
+    *layoutFile = KLayoutSourceFileAndPath;
+    TFileName fileName = *layoutFile;
+    CleanupStack::PopAndDestroy(layoutFile);
+    RFs& fs = CEikonEnv::Static()->FsSession();
+    TInt error = file.Open(fs,fileName, EFileWrite|EFileShareAny|EFileStreamText );
+    if (error==KErrNotFound)
+        {
+       file.Create(fs,fileName, EFileWrite|EFileShareAny|EFileStreamText);
+        }
+    CleanupClosePushL( file );
+    file.SetSize( 0 );
+
+    // Make all writes as from textfile.
+    TFileText textFile;
+    textFile.Set( file );
+    textFile.Seek( ESeekStart );
+
+    // Take all layout files from private folder.
+    CDir* dirList;
+    User::LeaveIfError(fs.GetDir(
+        KPixelMetricsDataFiles,
+        KEntryAttMaskSupported,
+        ESortByName,
+        dirList));
+
+    TMySmallBuffer bufferLayoutHdr;
+    TMyBigBuffer bufferPMData;
+    TInt fileCount = dirList->Count();
+    for (TInt i=0;i<fileCount;i++)
+        {
+        // open sourcefile
+        RFile sourceFile;
+        TFileName layoutFile = (*dirList)[i].iName;
+        User::LeaveIfError( sourceFile.Open(
+            fs,layoutFile, EFileRead|EFileShareAny|EFileStreamText ));
+        CleanupClosePushL( sourceFile );
+
+        // Make all reads as from textfile.
+        TFileText textSourceFile;
+        textSourceFile.Set( sourceFile );
+        TFileName layoutName = CreateLayoutNameL( textSourceFile );
+
+        // rewind - just in case.
+        textSourceFile.Seek( ESeekStart );
+        TFileName oneline;
+        bufferLayoutHdr.Append(KOpenBrace);
+        bufferPMData.Append(KOpenBrace);
+        TInt loop = 0;
+        FOREVER
+            {
+            if( textSourceFile.Read(oneline) != KErrNone )
+                {
+                break;
+                }
+            // Add commas for all but first line
+            if (loop != 0)
+                {
+                if ( loop <= KHeaderValues-1)
+                    {
+                    bufferLayoutHdr.Append(KComma);
+                    }
+                else
+                    {
+                    if (loop != KHeaderValues)
+                        {
+                        bufferPMData.Append(KComma);
+                        }
+                    }
+                if (loop==KHeaderValues)
+                    {
+                    bufferLayoutHdr.Append(_L(",QLatin1String(\""));
+                    bufferLayoutHdr.Append(layoutName);
+                    bufferLayoutHdr.Append(_L("\")"));
+                    }
+                }
+            // Remove pixel metrics name and ":"
+            oneline = oneline.Mid(oneline.Find(KColon)+1);
+            // Remove tab
+            oneline = oneline.Mid(oneline.Find(KTab)+1);
+            // remove crap from the end of line
+            TLex lex(oneline);
+            TInt nextValue = -666;
+            User::LeaveIfError( lex.Val(nextValue) );
+            if ( loop <= KHeaderValues-1)
+                {
+                if (loop == KHeaderValues -1 ) // true / false values
+                    {
+                    if (nextValue == 1)
+                        {
+                        bufferLayoutHdr.Append(_L("true"));
+                        }
+                    else
+                        {
+                        bufferLayoutHdr.Append(_L("false"));
+                        }
+                    }
+                else
+                    {
+                    bufferLayoutHdr.AppendNum(nextValue);
+                    }
+                }
+            else
+                {
+                if (nextValue == -909)
+                    bufferPMData.Append(_L("ECommonStyleValue"));
+                else
+                    bufferPMData.AppendNum(nextValue);
+                }
+            oneline.Zero();
+            loop++;
+            }
+        file.Flush();
+        bufferLayoutHdr.Append(KEndBraceWithCommaAndCRLF);
+        bufferPMData.Append(KEndBraceWithCommaAndCRLF);
+        CleanupStack::PopAndDestroy(); //sourceFile
+        }
+
+    bufferLayoutHdr = bufferLayoutHdr.Left(bufferLayoutHdr.Length()-2);
+    bufferPMData = bufferPMData.Left(bufferPMData.Length()-2);
+    textFile.Write(bufferLayoutHdr);
+    textFile.Write(KCRLF);
+    textFile.Write(bufferPMData);
+    delete dirList;
+
+    CleanupStack::PopAndDestroy(); //file
+    }
+
+TFileName CPixelMetricsMapperAppUi::CreateLayoutNameL(TFileText& aFileHandle) const
+{
+    aFileHandle.Seek(ESeekStart);
+    // Layout data is deployed like this:
+    // first line - height
+    // second line - width
+    // fifth line mirror info
+    TFileName lines;
+    TFileName layoutName;
+
+    TInt height = -666;
+    TInt width = -666;
+    TInt mirroring = -666;
+    // Collect name information.
+    for (TInt i=0; i<6; i++)
+        {
+        User::LeaveIfError(aFileHandle.Read(lines));
+        // Remove pixel metrics name and ":"
+        lines = lines.Mid(lines.Find(KColon)+1);
+        // Remove tab
+        lines = lines.Mid(lines.Find(KTab)+1);
+        TLex myLexer(lines);
+        TInt error = KErrNone;
+        if (i==0) //height is first
+            {
+            error = myLexer.Val(height);
+            }
+        if (i==1) //width is second
+            {
+            error = myLexer.Val(width);
+            }
+        if (i==4) //mirror info is fourth
+            {
+            error = myLexer.Val(mirroring);
+            }
+        User::LeaveIfError(error);
+        }
+
+    // Interpret results and write name to buffer.
+    if ( (width == 240 && height == 320) ||
+         (width == 320 && height == 240))
+        {
+        layoutName.Append(_L("QVGA "));
+        }
+    else if ( (width == 360 && height == 640) ||
+         (width == 640 && height == 360))
+        {
+        layoutName.Append(_L("NHD "));
+        }
+    else if ( (width == 480 && height == 640) ||
+         (width == 640 && height == 480))
+        {
+        layoutName.Append(_L("VGA "));
+        }
+    else if ( (width == 800 && height == 352) ||
+         (width == 352 && height == 800))
+        {
+        layoutName.Append(_L("E90 "));
+        }
+    else if ( (width == 800 && height == 480) ||
+         (width == 480 && height == 800) ||
+         (width == 848 && height == 480) ||
+         (width == 480 && height == 848) ||
+         (width == 854 && height == 480) ||
+         (width == 480 && height == 854))
+        {
+        layoutName.Append(_L("WVGA "));
+        }
+    else if ( (width == 480 && height == 320) ||
+         (width == 320 && height == 480) ||
+         (width == 640 && height == 240) ||
+         (width == 240 && height == 640))
+        {
+        layoutName.Append(_L("HVGA "));
+        }
+    else
+        {
+        layoutName.Append(_L("Unknown "));
+        layoutName.AppendNum(height);
+        layoutName.Append(_L("x"));
+        layoutName.AppendNum(width);
+        }
+    if (width > height)
+        {
+        layoutName.Append(_L("Landscape"));
+        }
+    else
+        {
+        layoutName.Append(_L("Portrait"));
+        }
+    if (mirroring)
+        {
+        layoutName.Append(_L(" Mirrored"));
+        }
+    return layoutName;
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+CEikAppUi* CPixelMetricsMapperDocument::CreateAppUiL()
+    {
+    return( new ( ELeave ) CPixelMetricsMapperAppUi );
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperDocument::ConstructL()
+    {
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TUid CPixelMetricsMapperApplication::AppDllUid() const
+    {
+    return KUidPMMapperApplication;
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+CApaDocument* CPixelMetricsMapperApplication::CreateDocumentL()
+    {
+    CPixelMetricsMapperDocument* document =
+        new( ELeave ) CPixelMetricsMapperDocument( *this );
+    CleanupStack::PushL( document );
+    document->ConstructL();
+    CleanupStack::Pop();
+    return( document );
+    }
+
+// ========================== OTHER EXPORTED FUNCTIONS =========================
+// ---------------------------------------------------------
+// NewApplication implements
+//
+// Creates an instance of application.
+//
+// Returns: an instance of CVtUiApp
+// ---------------------------------------------------------
+//
+LOCAL_C CApaApplication* NewApplication()
+    {
+    return new CPixelMetricsMapperApplication;
+    }
+
+// ---------------------------------------------------------
+// E32Main implements
+//
+// It is called when executable is started.
+//
+// Returns: error code.
+// ---------------------------------------------------------
+//
+GLDEF_C TInt E32Main()
+    {
+    return EikStart::RunApplication( NewApplication );
+    }
+
+// End of File
diff --git a/util/s60pixelmetrics/pm_mapperapp.h b/util/s60pixelmetrics/pm_mapperapp.h
new file mode 100644
index 0000000000..02d297eca2
--- /dev/null
+++ b/util/s60pixelmetrics/pm_mapperapp.h
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PMMAPPERAPP_H
+#define PMMAPPERAPP_H
+
+//  INCLUDES
+#include <eikapp.h>
+#include <eikdoc.h>
+#include <e32std.h>
+#include <aknViewAppUi.h>
+
+// CONSTANTS
+const TUid KUidPMMapperApplication = { 0x2002121F };
+
+
+// FORWARD DECLARATIONS
+class CPixelMetricsMapperView;
+class MAknsSkinInstance;
+
+// CLASS DECLARATION
+/**
+*  CPixelMetricsMapperDocument
+*/
+class CPixelMetricsMapperDocument : public CEikDocument
+    {
+    public:  // Constructors and destructor
+
+        /**
+        * Symbian 2nd phase constructor.
+        */
+        void ConstructL();
+
+        /**
+        * Constructor.
+        */
+        CPixelMetricsMapperDocument( CEikApplication& aApp )
+            : CEikDocument( aApp ) {}
+
+        /**
+        * Destructor.
+        */
+        ~CPixelMetricsMapperDocument(){}
+
+    public: // Functions from base classes
+
+        /**
+        * From CEikDocument.
+        */
+        CFileStore* OpenFileL(
+            TBool         /*aDoOpen*/,
+            const TDesC&  /*aFilename*/,
+            RFs&          /*aFs*/ )
+            {
+            return NULL;
+            }
+
+    private: // Functions from base classes
+
+        /**
+        * From CEikDocument.
+        */
+        CEikAppUi* CreateAppUiL();
+    };
+
+/**
+*  CPixelMetricsMapperAppUi
+*/
+class CPixelMetricsMapperAppUi : public CAknViewAppUi
+    {
+    public:  // Constructors and destructor
+
+        /**
+        * Constructor.
+        */
+    	CPixelMetricsMapperAppUi();
+
+        /**
+        * Symbian 2nd phase constructor.
+        */
+        void ConstructL();
+
+        /**
+        * Destructor.
+        */
+        ~CPixelMetricsMapperAppUi();
+
+    public:
+    	void DoAutoOperationL();
+
+    	TBool ReadyForAutoOp() const;
+
+
+    private: // Functions from base classes
+
+        /**
+        * From CEikAppUi.
+        */
+        void HandleCommandL(TInt aCommand);
+
+        /**
+        * From CEikAppUi.
+        */
+        virtual TKeyResponse HandleKeyEventL(
+            const TKeyEvent& aKeyEvent,
+            TEventCode aType );
+
+    private:
+
+        /**
+        * Shows text given.
+        */
+        void ShowL( const TDesC& aText, TBool& aLast, const TBool& aFileOutput = EFalse );
+        void ShowSingleValueL(TInt& aPixelMetric, TInt& aValue, TBool& aLast);
+        void ClearL();
+        void CreateHeaderFileL() const;
+
+        TFileName CreateLayoutNameL(TFileText& aFileHandle) const;
+
+    private:    // Data
+
+        // Test view.
+    	CPixelMetricsMapperView* iView;
+
+        CEikDialog* iDialog;
+
+        TBool iFileOutputOn;
+
+        CFbsBitmap* icon;
+        CFbsBitmap* iconMask;
+
+        TBool iAutoMode;
+        TBool iMode;
+
+    };
+
+
+/**
+*  CPixelMetricsMapperApplication
+*/
+class CPixelMetricsMapperApplication : public CEikApplication
+    {
+    private: // Functions from base classes
+
+        /**
+        * From CApaApplication.
+        */
+        CApaDocument* CreateDocumentL();
+
+        /**
+        * From CApaApplication.
+        */
+        TUid AppDllUid() const;
+    };
+
+
+#endif  // PMMAPPERAPP_H
+
+
+// End of File
diff --git a/util/s60pixelmetrics/pm_mapperview.cpp b/util/s60pixelmetrics/pm_mapperview.cpp
new file mode 100644
index 0000000000..f7ab2acca2
--- /dev/null
+++ b/util/s60pixelmetrics/pm_mapperview.cpp
@@ -0,0 +1,375 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// INCLUDE FILES
+
+#include <eiklabel.h>
+#include <avkon.rsg>
+#include <aknviewappui.h>
+#include <aknconsts.h>
+
+#include "pm_mapper.hrh"
+#include <pm_mapper.rsg>
+#include "pm_mapperView.h"
+#include "pm_mapperApp.h"
+
+#include <aknlists.h>
+#include <avkon.hrh>
+#include <AknUtils.h>
+
+// -----------------------------------------------------------------------------
+// C++ constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CPixelMetricsMapperViewContainer::CPixelMetricsMapperViewContainer(): iCount( 1 )
+    {
+    }
+
+
+// -----------------------------------------------------------------------------
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperViewContainer::ConstructL( const TRect& aRect )
+    {
+    CreateWindowL();
+    SetCanDrawOutsideRect();
+
+    iTexts = new( ELeave ) CDesCArrayFlat( 10 );
+    iTexts->AppendL( _L( "\tStarted." ) );
+
+    iListbox = new( ELeave ) CAknSingleStyleListBox;
+    iListbox->SetContainerWindowL( *this );
+    iListbox->ConstructL( this, EAknListBoxViewerFlags  );
+
+    iListbox->Model()->SetItemTextArray( iTexts );
+    iListbox->SetRect( TRect( aRect.Size() ) );
+
+    iListbox->CreateScrollBarFrameL( ETrue );
+    iListbox->ScrollBarFrame()->SetScrollBarVisibilityL(
+        CEikScrollBarFrame::EOn,
+        CEikScrollBarFrame::EOn );
+
+    SetRect( aRect );
+    iListbox->ActivateL();
+    ActivateL();
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperViewContainer::ShowL( const TDesC& aString, TBool& aLast, const TBool& aFileOutput )
+    {
+    MDesCArray* itemList = iListbox->Model()->ItemTextArray();
+    CDesCArray* itemArray = ( CDesCArray* ) itemList;
+
+    itemArray->AppendL( aString );
+
+    iListbox->HandleItemAdditionL();
+    iListbox->SetCurrentItemIndex( iCount );
+    iCount++;
+    if ( aLast )
+        {
+        if (aFileOutput)
+            {
+            RFile file;
+            RFs& fs = CEikonEnv::Static()->FsSession();
+            TFileName fileName =_L("Layout_");
+
+            TRect screenRect;
+            AknLayoutUtils::LayoutMetricsRect(
+                AknLayoutUtils::EApplicationWindow,
+                screenRect );
+
+            // Add screen dimensions
+            TInt height = screenRect.Height();
+            TInt width = screenRect.Width();
+            fileName.AppendNum(height);
+            fileName.Append('_');
+            fileName.AppendNum(width);
+
+            if (AknLayoutUtils::LayoutMirrored())
+                fileName.Append(_L("_mirrored"));
+            fileName.Append(_L(".txt"));
+
+            TInt err=file.Open(fs,fileName,EFileStreamText|EFileWrite|EFileShareAny);
+            if (err==KErrNotFound) // file does not exist - create it
+                err=file.Create(fs,fileName,EFileStreamText|EFileWrite|EFileShareAny);
+            else
+                file.SetSize(0); //sweep the file
+            TFileText textFile;
+            textFile.Set(file);
+            err = textFile.Seek(ESeekStart);
+            if (err) User::InfoPrint(_L("File corrupted"));
+
+            // Finally loop through all the entries:
+            TInt idx = 0;
+            for(;idx!=itemList->MdcaCount();idx++)
+                {
+                err = textFile.Write(itemList->MdcaPoint(idx));
+                if (err) User::InfoPrint(_L("File corrupted"));
+                }
+            file.Close();
+            }
+        DrawNow();
+        }
+    }
+
+void CPixelMetricsMapperViewContainer::ClearL()
+    {
+    MDesCArray* itemList = iListbox->Model()->ItemTextArray();
+    CDesCArray* itemArray = ( CDesCArray* ) itemList;
+
+    itemArray->Reset();
+
+    iListbox->HandleItemAdditionL();
+    iCount = 0;
+    DrawNow();
+    }
+
+
+// -----------------------------------------------------------------------------
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CPixelMetricsMapperViewContainer::~CPixelMetricsMapperViewContainer()
+    {
+    delete iListbox;
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperViewContainer::SizeChanged()
+    {
+    CCoeControl::SizeChanged();
+    if ( iListbox )
+        {
+        iListbox->SetRect( Rect() );
+        }
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TInt CPixelMetricsMapperViewContainer::CountComponentControls() const
+    {
+    return 1;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CTestAppViewContainer::ComponentControl
+//
+//
+// -----------------------------------------------------------------------------
+//
+CCoeControl* CPixelMetricsMapperViewContainer::ComponentControl(
+        TInt /*aIndex*/ ) const
+    {
+    return iListbox;
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperViewContainer::Draw( const TRect& /*aRect*/ ) const
+    {
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperViewContainer::HandleControlEventL(
+    CCoeControl* /*aControl*/,
+    TCoeEvent /*aEventType*/ )
+    {
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TKeyResponse CPixelMetricsMapperViewContainer::OfferKeyEventL(
+    const TKeyEvent& aKeyEvent,
+    TEventCode aType )
+    {
+    if (aKeyEvent.iCode == EKeyUpArrow ||
+        aKeyEvent.iCode == EKeyDownArrow )
+        {
+        return iListbox->OfferKeyEventL( aKeyEvent, aType );
+        }
+    return EKeyWasNotConsumed;
+    }
+
+void CPixelMetricsMapperViewContainer::HandleResourceChange(TInt aType)
+    {
+    CCoeControl::HandleResourceChange( aType );
+    if ( aType == KEikDynamicLayoutVariantSwitch )
+         {
+         TRect mainPaneRect;
+         AknLayoutUtils::LayoutMetricsRect(
+             AknLayoutUtils::EMainPane,
+             mainPaneRect );
+         SetRect( mainPaneRect );
+
+         CPixelMetricsMapperAppUi* myApp = static_cast<CPixelMetricsMapperAppUi*> (ControlEnv()->AppUi());
+         if (myApp->ReadyForAutoOp())
+        	 myApp->DoAutoOperationL();
+         }
+    if (iListbox) iListbox->HandleResourceChange(aType);
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperView::ShowL( const TDesC& aString, TBool& aLast, const TBool& aFileOutput )
+    {
+    iView->ShowL( aString, aLast, aFileOutput );
+    }
+
+void CPixelMetricsMapperView::ClearL()
+    {
+    iView->ClearL();
+    }
+
+
+// -----------------------------------------------------------------------------
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperView::ConstructL()
+    {
+    BaseConstructL( R_PMMAPPER_VIEW );
+    }
+
+
+// -----------------------------------------------------------------------------
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CPixelMetricsMapperView::~CPixelMetricsMapperView()
+    {
+    if ( iView )
+        {
+        AppUi()->RemoveFromViewStack( *this, iView );
+        }
+    delete iView;
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TUid CPixelMetricsMapperView::Id() const
+    {
+    return TUid::Uid( EPMMapperViewId );
+    }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperView::HandleCommandL( TInt aCommand )
+    {
+    AppUi()->HandleCommandL( aCommand );
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperView::HandleStatusPaneSizeChange()
+    {
+    if ( iView )
+        {
+        TRect cr = ClientRect();
+        iView->SetRect( cr );
+        }
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperView::DoActivateL(
+    const TVwsViewId& /*aPrevViewId*/,
+    TUid              /*aCustomMessageId*/,
+    const TDesC8&     /*aCustomMessage*/ )
+    {
+    iView = new( ELeave ) CPixelMetricsMapperViewContainer;
+
+    TRect cr = ClientRect();
+    iView->ConstructL( cr );
+    AppUi()->AddToViewStackL( *this, iView );
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CPixelMetricsMapperView::DoDeactivate()
+    {
+    if (iView)
+        {
+        AppUi()->RemoveFromViewStack( *this, iView );
+        }
+    delete iView;
+    iView = NULL;
+    }
+
+// End of File
diff --git a/util/s60pixelmetrics/pm_mapperview.h b/util/s60pixelmetrics/pm_mapperview.h
new file mode 100644
index 0000000000..e9eb42eb9d
--- /dev/null
+++ b/util/s60pixelmetrics/pm_mapperview.h
@@ -0,0 +1,228 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the utility applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PMMAPPERVIEW_H
+#define PMMAPPERVIEW_H
+
+
+//  INCLUDES
+#include <aknview.h>
+#include <EIKLBO.H>
+
+// CONSTANTS
+// FORWARD DECLARATIONS
+class CAknSingleStyleListBox;
+class CAknSettingStyleListBox;
+
+// CLASS DECLARATION
+
+/**
+*  CPixelMetricsMapperViewContainer
+*
+*/
+class CPixelMetricsMapperViewContainer
+:   public CCoeControl,
+    public MCoeControlObserver
+    {
+    public:  // Constructors and destructor
+
+        /**
+        * C++ constructor.
+        */
+    	CPixelMetricsMapperViewContainer();
+
+        /**
+        * Symbian 2nd phase constructor.
+        *
+        * @param aRect Rectangle.
+        */
+        void ConstructL( const TRect& aRect );
+
+        /**
+        * Destructor.
+        */
+        ~CPixelMetricsMapperViewContainer();
+
+
+    public: // New functions
+
+        /**
+        * Show the given string.
+        *
+        * @param aString The string to be shown.
+        */
+        void ShowL( const TDesC& aString, TBool& aLast, const TBool& aFileOutput = EFalse );
+
+        void ClearL();
+
+
+    public:  // Functions from base classes
+
+        /**
+        * From CCoeControl.
+        */
+        TKeyResponse OfferKeyEventL(
+            const TKeyEvent& aKeyEvent,
+            TEventCode aType );
+
+
+        void HandleResourceChange(TInt aType);
+
+
+    private:  // Functions from base classes
+
+        /**
+        * From CCoeControl.
+        */
+        void SizeChanged();
+
+        /**
+        * From CCoeControl.
+        */
+        TInt CountComponentControls() const;
+
+        /**
+        * From CCoeControl.
+        */
+        CCoeControl* ComponentControl( TInt aIndex ) const;
+
+        /**
+        * From CCoeControl.
+        */
+        void Draw( const TRect& aRect ) const;
+
+
+    private:  // Functions from base classes
+
+        /**
+        * From MCoeControlObserver.
+        */
+        void HandleControlEventL(
+            CCoeControl* aControl,
+            TCoeEvent aEventType );
+
+
+    private:    // Data
+
+        // Texts.
+        CDesCArray*                 iTexts;
+
+        // Count.
+        TInt                        iCount;
+
+        // Listbox.
+        CAknSingleStyleListBox*     iListbox;
+
+    };
+
+
+
+/**
+*  CPixelMetricsMapperView
+*
+*
+*  @since 1.0
+*/
+class CPixelMetricsMapperView : public CAknView
+    {
+    public:  // Constructors and destructor
+
+        /**
+        * Symbian 2nd phase constructor.
+        */
+        void ConstructL();
+
+        /**
+        * Destructor.
+        */
+        ~CPixelMetricsMapperView();
+
+
+    public: // Functions from base classes
+
+        /**
+        * From CAknView.
+        */
+        TUid Id() const;
+
+        /**
+        * From CAknView.
+        */
+        void HandleCommandL( TInt aCommand );
+
+        /**
+        * From CAknView.
+        */
+        void HandleStatusPaneSizeChange();
+
+        /**
+        * From CAknView.
+        */
+        void ShowL( const TDesC& aString, TBool& aLast, const TBool& aFileOutput =EFalse );
+        void ClearL();
+
+
+    private: // from CAknView
+
+        /**
+        * From CAknView.
+        */
+        void DoActivateL(
+            const TVwsViewId& aPrevViewId,
+            TUid aCustomMessageId,
+            const TDesC8& aCustomMessage );
+
+        /**
+        * From CAknView.
+        */
+        void DoDeactivate();
+
+
+    private:    // Data
+
+        // The view container.
+    	CPixelMetricsMapperViewContainer*    iView;
+
+    };
+
+#endif // PMMAPPERVIEW_H
+
+// End of File
diff --git a/util/s60theme/README b/util/s60theme/README
new file mode 100644
index 0000000000..da4e81a6a9
--- /dev/null
+++ b/util/s60theme/README
@@ -0,0 +1,31 @@
+'s60theme' is a commandline tool which converts Carbide.ui themes into
+an intermediate binary format that can be read by the simulated
+QS60Style. So, for example Designer (standalone or in Carbide) will
+be able to display a realistic S60 Ui.
+
+The intermediate binary format consists of hashes of QPictures and
+QColors, streamed to a QByteArray and compressed. QS60Style could not load
+the Carbide.ui theme directly because SVG handling is unfortunately
+not part of QtGui, and would require a dependency on the QtSvg module.
+
+Also, 's60theme' uses QWebkit to parse the SVG graphics (inspired by
+Ariya's 'WebKit-based SVG rasterizer' labs post). QtSvg had some issues
+with the SVGs that come with Carbide.ui.
+
+Usage examples:
+> s60theme "com.nokia.tools.theme.s60.50_3.4.0.0\config\model" Default.blob
+  (Reads the default 's60.50' theme and saves it as 'Default.blob')
+
+> s60theme "Eclipse\Examples\Haze\Haze.tdf" Haze.blob
+  (Reads the Haze theme and saves it as 'Haze.blob')
+
+To use the blob in a Qt application, get an instance of a QS60Style and call
+  style->loadS60ThemeFromBlob("Theme.blob");
+
+The simulated QS60Style will, in its constructor by default, try to load a
+":/s60Stylethemes/Default.blob". If your application has that a resource with
+exactly that filename, it will be used by default.
+'Default.blob' is not included in the current Qt source package. But it can
+easily be created with 's60theme' and a fresh install of Carbide.ui
+
+Visit http://www.forum.nokia.com for details about Carbide.ui
diff --git a/util/s60theme/main.cpp b/util/s60theme/main.cpp
new file mode 100644
index 0000000000..f092a9a20d
--- /dev/null
+++ b/util/s60theme/main.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include "s60themeconvert.h"
+
+int help()
+{
+    qDebug() << "Usage: s60theme [modeldir|theme.tdf] output.blob";
+    qDebug() << "";
+    qDebug() << "Options:";
+    qDebug() << "   modeldir:    Theme 'model' directory in Carbide.ui tree";
+    qDebug() << "   theme.tdf:   Theme .tdf file";
+    qDebug() << "   output.blob: Theme blob output filename";
+    qDebug() << "";
+    qDebug() << "s60theme takes an S60 theme from Carbide.ui and converts";
+    qDebug() << "it into a compact, binary format, that can be directly loaded by";
+    qDebug() << "the QtS60Style.";
+    qDebug() << "";
+    qDebug() << "Visit http://www.forum.nokia.com for details about Carbide.ui";
+    return 1;
+}
+
+int main(int argc, char *argv[])
+{
+    if (argc != 3)
+        return help();
+
+    QApplication app(argc, argv);
+
+    const QString input = QString::fromLatin1(argv[1]);
+    const QFileInfo inputInfo(input);
+    const QString output = QString::fromLatin1(argv[2]);
+    if (inputInfo.isDir())
+        return S60ThemeConvert::convertDefaultThemeToBlob(input, output);
+    else if (inputInfo.suffix().compare(QString::fromLatin1("tdf"), Qt::CaseInsensitive) == 0)
+        return S60ThemeConvert::convertTdfToBlob(input, output);
+
+    return help();
+}
diff --git a/util/s60theme/s60theme.pro b/util/s60theme/s60theme.pro
new file mode 100644
index 0000000000..83c0cf2357
--- /dev/null
+++ b/util/s60theme/s60theme.pro
@@ -0,0 +1,12 @@
+SOURCES += \
+    s60themeconvert.cpp \
+    main.cpp
+
+HEADERS += \
+    s60themeconvert.h
+
+QT += \
+    webkit
+
+CONFIG += \
+    console
diff --git a/util/s60theme/s60themeconvert.cpp b/util/s60theme/s60themeconvert.cpp
new file mode 100644
index 0000000000..a1e1d58422
--- /dev/null
+++ b/util/s60theme/s60themeconvert.cpp
@@ -0,0 +1,301 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "s60themeconvert.h"
+
+#include <QtGui>
+#include <QtWebKit>
+
+static const int pictureSize = 256;
+
+void dumpPartPictures(const QHash<QString, QPicture> &partPictures) {
+    foreach (const QString &partKey, partPictures.keys()) {
+        QPicture partPicture = partPictures.value(partKey);
+        qDebug() << partKey << partPicture.boundingRect();
+        QImage image(partPicture.boundingRect().size(), QImage::Format_ARGB32);
+        image.fill(Qt::transparent);
+        QPainter p(&image);
+        partPicture.play(&p);
+        image.save(partKey + QString::fromLatin1(".png"));
+    }
+}
+
+void dumpColors(const QHash<QPair<QString, int>, QColor> &colors) {
+    foreach (const QColor &color, colors.values()) {
+        const QPair<QString, int> key = colors.key(color);
+        qDebug() << key << color;
+    }
+}
+
+class WebKitSVGRenderer : public QWebView
+{
+    Q_OBJECT
+
+public:
+    WebKitSVGRenderer(QWidget *parent = 0);
+    QPicture svgToQPicture(const QString &svgFileName);
+
+private slots:
+    void loadFinishedSlot(bool ok);
+
+private:
+    QEventLoop m_loop;
+    QPicture m_result;
+};
+
+WebKitSVGRenderer::WebKitSVGRenderer(QWidget *parent)
+    : QWebView(parent)
+{
+    connect(this, SIGNAL(loadFinished(bool)), SLOT(loadFinishedSlot(bool)));
+    setFixedSize(pictureSize, pictureSize);
+    QPalette pal = palette();
+    pal.setColor(QPalette::Base, Qt::transparent);
+    setPalette(pal);
+}
+
+QPicture WebKitSVGRenderer::svgToQPicture(const QString &svgFileName)
+{
+    load(QUrl::fromLocalFile(svgFileName));
+    m_loop.exec();
+    return m_result;
+}
+
+void WebKitSVGRenderer::loadFinishedSlot(bool ok)
+{
+    // crude error-checking
+    if (!ok)
+        qDebug() << "Failed loading " << qPrintable(url().toString());
+
+    page()->mainFrame()->evaluateJavaScript(QString::fromLatin1(
+        "document.rootElement.preserveAspectRatio.baseVal.align = SVGPreserveAspectRatio.SVG_PRESERVEASPECTRATIO_NONE;"
+        "document.rootElement.style.width = '100%';"
+        "document.rootElement.style.height = '100%';"
+        "document.rootElement.width.baseVal.newValueSpecifiedUnits(SVGLength.SVG_LENGTHTYPE_PERCENTAGE, 100);"
+        "document.rootElement.height.baseVal.newValueSpecifiedUnits(SVGLength.SVG_LENGTHTYPE_PERCENTAGE, 100);"
+    ));
+
+    m_result = QPicture(); // "Clear"
+    QPainter p(&m_result);
+    page()->mainFrame()->render(&p);
+    p.end();
+    m_result.setBoundingRect(QRect(0, 0, pictureSize, pictureSize));
+
+    m_loop.exit();
+}
+
+QPair<QString, int> colorIdPair(const QString &colorID)
+{
+    QPair<QString, int> result;
+    QString idText = colorID;
+    idText.remove(QRegExp(QString::fromLatin1("[0-9]")));
+    if (QS60Style::colorListKeys().contains(idText)) {
+        QString idNumber = colorID;
+        idNumber.remove(QRegExp(QString::fromLatin1("[a-zA-Z]")));
+        result.first = idText;
+        result.second = idNumber.toInt();
+    }
+    return result;
+}
+
+bool parseTdfFile(const QString &tdfFile,
+        QHash<QString, QString> &partSvgs,
+        QHash<QPair<QString, int>, QColor> &colors)
+{
+    QFile file(tdfFile);
+    if (!file.open(QIODevice::ReadOnly))
+        return false;
+
+    const QLatin1String elementKey("element");
+    const QLatin1String partKey("part");
+    const QLatin1String elementIdKey("id");
+    const QLatin1String layerKey("layer");
+    const QLatin1String layerFileNameKey("filename");
+    const QLatin1String layerColourrgbKey("colourrgb");
+    const QString annoyingPrefix = QString::fromLatin1("S60_2_6%");
+
+    QXmlStreamReader reader(&file);
+    QString partId;
+    QPair<QString, int> colorId;
+    // Somebody with a sense of aesthetics may implement proper XML parsing, here.
+    while (!reader.atEnd()) {
+        const QXmlStreamReader::TokenType token = reader.readNext();
+        switch (token) {
+            case QXmlStreamReader::StartElement:
+                if (reader.name() == elementKey || reader.name() == partKey) {
+                    QString id = reader.attributes().value(elementIdKey).toString();
+                    if (QS60Style::partKeys().contains(id))
+                        partId = id;
+                    else if (!id.isEmpty() && id.at(id.length()-1).isDigit())
+                        colorId = colorIdPair(id);
+                    else if (QS60Style::partKeys().contains(id.mid(annoyingPrefix.length())))
+                        partId = id.mid(annoyingPrefix.length());
+                } else if(reader.name() == layerKey) {
+                    if (!partId.isEmpty()) {
+                        const QString svgFile = reader.attributes().value(layerFileNameKey).toString();
+                        partSvgs.insert(partId, svgFile);
+                        partId.clear();
+                    } else if (!colorId.first.isEmpty()) {
+                        const QColor colorValue(reader.attributes().value(layerColourrgbKey).toString().toInt(NULL, 16));
+                        colors.insert(colorId, colorValue);
+                        colorId.first.clear();
+                    }
+                }
+                break;
+            case QXmlStreamReader::EndElement:
+                if (reader.tokenString() == elementKey || reader.name() == partKey)
+                    partId.clear();
+                break;
+            default:
+                break;
+        }
+    }
+    return true;
+}
+
+bool loadThemeFromTdf(const QString &tdfFile,
+        QHash<QString, QPicture> &partPictures,
+        QHash<QPair<QString, int>, QColor> &colors)
+{
+    QHash<QString, QString> parsedPartSvgs;
+    QHash<QString, QPicture> parsedPartPictures;
+    QHash<QPair<QString, int>, QColor> parsedColors;
+    bool success = parseTdfFile(tdfFile, parsedPartSvgs, parsedColors);
+    if (!success)
+        return false;
+    const QString tdfBasePath = QFileInfo(tdfFile).absolutePath();
+    WebKitSVGRenderer renderer;
+    foreach(const QString& partKey, parsedPartSvgs.keys()) {
+        const QString tdfFullName =
+            tdfBasePath + QDir::separator() + parsedPartSvgs.value(partKey);
+        if (!QFile(tdfFullName).exists())
+            qWarning() << "Could not find part:" << parsedPartSvgs.value(partKey);
+        const QPicture partPicture = renderer.svgToQPicture(tdfFullName);
+        parsedPartPictures.insert(partKey, partPicture);
+    }
+//    dumpPartPictures(parsedPartPictures);
+//    dumpColors(colors);
+    partPictures = parsedPartPictures;
+    colors = parsedColors;
+    return true;
+}
+
+bool S60ThemeConvert::convertTdfToBlob(const QString &themeTdf, const QString &themeBlob)
+{
+    QHash<QString, QPicture> partPictures;
+    QHash<QPair<QString, int>, QColor> colors;
+
+    if (!::loadThemeFromTdf(themeTdf, partPictures, colors))
+        return false;
+
+    QS60Style style;
+    style.setS60Theme(partPictures, colors);
+    return style.saveS60ThemeToBlob(themeBlob);
+}
+
+bool parseDesignFile(const QString &designFile,
+        QHash<QPair<QString, int>, QColor> &colors)
+{
+    const QLatin1String elementKey("element");
+    const QLatin1String elementIdKey("id");
+    const QLatin1String colorKey("defaultcolour_rgb");
+    QFile file(designFile);
+    if (!file.open(QIODevice::ReadOnly))
+        return false;
+    QXmlStreamReader reader(&file);
+    QPair<QString, int> colorId;
+    // Somebody with a sense of aesthetics may implement proper XML parsing, here.
+    while (!reader.atEnd()) {
+        const QXmlStreamReader::TokenType token = reader.readNext();
+        switch (token) {
+            case QXmlStreamReader::StartElement:
+                if (reader.name() == elementKey) {
+                    const QString colorString = reader.attributes().value(colorKey).toString();
+                    if (!colorString.isEmpty()) {
+                        const QString colorId = reader.attributes().value(elementIdKey).toString();
+                        colors.insert(colorIdPair(colorId), colorString.toInt(NULL, 16));
+                    }
+                }
+            default:
+                break;
+        }
+    }
+    return true;
+}
+
+bool loadDefaultTheme(const QString &themePath,
+        QHash<QString, QPicture> &partPictures,
+        QHash<QPair<QString, int>, QColor> &colors)
+{
+    const QDir dir(themePath);
+    if (!dir.exists())
+        return false;
+
+    if (!parseDesignFile(themePath + QDir::separator() + QString::fromLatin1("defaultdesign.xml"), colors))
+        return false;
+
+    WebKitSVGRenderer renderer;
+    foreach (const QString &partKey, QS60Style::partKeys()) {
+        const QString partFileName = partKey + QLatin1String(".svg");		
+        const QString partFile(dir.absolutePath() + QDir::separator() + partFileName);
+        if (!QFile::exists(partFile)) {
+            qWarning() << "Could not find part:" << partFileName;
+            continue;
+        }
+        const QPicture partPicture = renderer.svgToQPicture(partFile);
+        partPictures.insert(partKey, partPicture);
+    }
+    return true;
+}
+
+bool S60ThemeConvert::convertDefaultThemeToBlob(const QString &themePath, const QString &themeBlob)
+{
+    QHash<QString, QPicture> partPictures;
+    QHash<QPair<QString, int>, QColor> colors;
+
+    if (!::loadDefaultTheme(themePath, partPictures, colors))
+        return false;
+
+    QS60Style style;
+    style.setS60Theme(partPictures, colors);
+    return style.saveS60ThemeToBlob(themeBlob);
+}
+
+#include "s60themeconvert.moc"
diff --git a/util/s60theme/s60themeconvert.h b/util/s60theme/s60themeconvert.h
new file mode 100644
index 0000000000..e48922f620
--- /dev/null
+++ b/util/s60theme/s60themeconvert.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef S60THEMECONVERT_H
+#define S60THEMECONVERT_H
+
+#include <QString>
+
+class S60ThemeConvert
+{
+public:
+    static bool convertTdfToBlob(const QString &themeTdf, const QString &themeBlob);
+    static bool convertDefaultThemeToBlob(const QString &themePath, const QString &themeBlob);
+};
+
+#endif // S60THEMECONVERT_H