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

180 files changed, 1694 insertions, 1045 deletions

diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
index 3008fca..3c9df93 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
@@ -1551,6 +1551,7 @@ static bool indic_shape_syllable(HB_Bool openType, HB_ShaperItem *item, bool inv
                               | PreSubstProperty
                               | BelowSubstProperty
                               | AboveSubstProperty
+                              | PostSubstProperty
                               | HalantProperty
                               | PositioningProperties);
 
@@ -1608,14 +1609,7 @@ static bool indic_shape_syllable(HB_Bool openType, HB_ShaperItem *item, bool inv
         // pres always applies
         // blws always applies
         // abvs always applies
-
-        // psts
-        // ### this looks slightly different from before, but I believe it's correct
-        if (reordered[len-1] != halant || base != len-2)
-            properties[base] &= ~PostSubstProperty;
-        for (i = base+1; i < len; ++i)
-            properties[i] &= ~PostSubstProperty;
-
+        // psts always applies
         // halant always applies
 
 #ifdef INDIC_DEBUG
diff --git a/src/3rdparty/harfbuzz/tests/shaping/main.cpp b/src/3rdparty/harfbuzz/tests/shaping/main.cpp
index 12fa7c4..827ac30 100644
--- a/src/3rdparty/harfbuzz/tests/shaping/main.cpp
+++ b/src/3rdparty/harfbuzz/tests/shaping/main.cpp
@@ -686,7 +686,7 @@ void tst_QScriptEngine::bengali()
 void tst_QScriptEngine::gurmukhi()
 {
     {
-        FT_Face face = loadFace("lohit.punjabi.1.1.ttf");
+        FT_Face face = loadFace("lohit_pa.ttf");
         if (face) {
 	    const ShapeTable shape_table [] = {
 		{ { 0xA15, 0xA4D, 0xa39, 0x0 },
@@ -998,6 +998,36 @@ void tst_QScriptEngine::malayalam()
 	    QSKIP("couln't find AkrutiMal2Normal.ttf", SkipAll);
 	}
     }
+
+    {
+        FT_Face face = loadFace("Rachana.ttf");
+        if (face) {
+            const ShapeTable shape_table [] = {
+                { { 0xd37, 0xd4d, 0xd1f, 0xd4d, 0xd30, 0xd40, 0x0 },
+                  { 0x385, 0xa3, 0x0 } },
+                { { 0xd2f, 0xd4d, 0xd15, 0xd4d, 0xd15, 0xd41, 0x0 },
+                  { 0x2ff, 0x0 } },
+                { { 0xd33, 0xd4d, 0xd33, 0x0 },
+                  { 0x3f8, 0x0 } },
+                { { 0xd2f, 0xd4d, 0xd15, 0xd4d, 0xd15, 0xd41, 0x0 },
+                  { 0x2ff, 0x0 } },
+
+                { {0}, {0} }
+            };
+
+
+            const ShapeTable *s = shape_table;
+            while (s->unicode[0]) {
+                QVERIFY( shaping(face, s, HB_Script_Malayalam) );
+                ++s;
+            }
+
+            FT_Done_Face(face);
+        } else {
+            QSKIP("couln't find Rachana.ttf", SkipAll);
+        }
+    }
+
 }
 
 void tst_QScriptEngine::sinhala()
@@ -1113,7 +1143,7 @@ void tst_QScriptEngine::nko()
 void tst_QScriptEngine::linearB()
 {
     {
-        FT_Face face = loadFace("PENUTURE.TTF");
+        FT_Face face = loadFace("penuture.ttf");
         if (face) {
 	    const ShapeTable shape_table [] = {
 		{ { 0xd800, 0xdc01, 0xd800, 0xdc02, 0xd800, 0xdc03,  0 },
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro
deleted file mode 100644
index 0cd2e1a..0000000
--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro
+++ /dev/null
@@ -1,69 +0,0 @@
-# JavaScriptCore - qmake build info
-CONFIG += building-libs
-include($$PWD/../WebKit.pri)
-
-TEMPLATE = lib
-CONFIG += staticlib
-TARGET = JavaScriptCore
-
-CONFIG += depend_includepath
-
-contains(QT_CONFIG, embedded):CONFIG += embedded
-
-CONFIG(QTDIR_build) {
-    GENERATED_SOURCES_DIR = $$PWD/generated
-    OLDDESTDIR = $$DESTDIR
-    include($$QT_SOURCE_TREE/src/qbase.pri)
-    INSTALLS =
-    DESTDIR = $$OLDDESTDIR
-    PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
-    DEFINES *= NDEBUG
-}
-
-isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
-GENERATED_SOURCES_DIR_SLASH = $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}
-
-INCLUDEPATH += $$GENERATED_SOURCES_DIR
-
-!CONFIG(QTDIR_build) {
-    CONFIG(debug, debug|release) {
-        OBJECTS_DIR = obj/debug
-    } else { # Release
-        OBJECTS_DIR = obj/release
-    }
-}
-
-CONFIG(release):!CONFIG(QTDIR_build) {
-    contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-    unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
-}
-
-linux-*: DEFINES += HAVE_STDINT_H
-freebsd-*: DEFINES += HAVE_PTHREAD_NP_H
-
-DEFINES += BUILD_WEBKIT
-
-win32-*: DEFINES += _HAS_TR1=0
-
-# Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
-win32-g++ {
-    TMPPATH            = $$quote($$(INCLUDE))
-    QMAKE_INCDIR_POST += $$split(TMPPATH,";")
-    TMPPATH            = $$quote($$(LIB))
-    QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
-}
-
-DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1
-
-DEFINES += WTF_CHANGES=1
-
-include(JavaScriptCore.pri)
-
-QMAKE_EXTRA_TARGETS += generated_files
-
-lessThan(QT_MINOR_VERSION, 4) {
-    DEFINES += QT_BEGIN_NAMESPACE="" QT_END_NAMESPACE=""
-}
-
-*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
-*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
index 073b35a..b098728 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
@@ -561,6 +561,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
 
 asm volatile (
 ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
+HIDE_SYMBOL(ctiTrampoline) "\n"
 SYMBOL_STRING(ctiTrampoline) ":" "\n"
     "stmdb sp!, {r1-r3}" "\n"
     "stmdb sp!, {r4-r8, lr}" "\n"
@@ -584,6 +585,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
 
 asm volatile (
 ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
+HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
     "mov r0, sp" "\n"
     "mov lr, r6" "\n"
@@ -593,6 +595,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
 
 // Both has the same return sequence
 ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
+HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
 SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
     "add sp, sp, #32" "\n"
     "ldmia sp!, {r4-r8, lr}" "\n"
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.h b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.h
index 43975ff..c2b8c02 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.h
@@ -246,6 +246,10 @@ namespace JSC {
         MacroAssemblerCodePtr m_ctiNativeCallThunk;
     };
 
+#if COMPILER(GCC)
+#pragma GCC visibility push(hidden)
+#endif
+
 extern "C" {
     EncodedJSValue JIT_STUB cti_op_add(STUB_ARGS_DECLARATION);
     EncodedJSValue JIT_STUB cti_op_bitand(STUB_ARGS_DECLARATION);
@@ -363,6 +367,10 @@ extern "C" {
     void* JIT_STUB cti_vm_lazyLinkCall(STUB_ARGS_DECLARATION);
 } // extern "C"
 
+#if COMPILER(GCC)
+#pragma GCC visibility pop
+#endif
+
 } // namespace JSC
 
 #endif // ENABLE(JIT)
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
index 188b68f..be74e2a 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -328,6 +328,16 @@
 #define WTF_PLATFORM_BIG_ENDIAN 1
 #endif
 
+/* PLATFORM(SPARC32) */
+#if defined(__sparc) && !defined(__arch64__) || defined(__sparcv8)
+#define WTF_PLATFORM_SPARC32 1
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
+
+#if PLATFORM(SPARC32) || PLATFORM(SPARC64)
+#define WTF_PLATFORM_SPARC
+#endif
+
 /* PLATFORM(HPPA) */
 /* a.k.a. PA-RISC */
 #if defined(__hppa) || defined(__hppa__)
diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp
index 106a4c8..34f92c2 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.cpp
+++ b/src/3rdparty/phonon/ds9/mediaobject.cpp
@@ -361,17 +361,17 @@ namespace Phonon
                 m_graphs[i] = new MediaGraph(this, i);
             }
 
-            connect(&m_thread, SIGNAL(stateReady(Graph, Phonon::State)),
-                               SLOT(slotStateReady(Graph, Phonon::State)));
+            connect(&m_thread, SIGNAL(stateReady(Graph,Phonon::State)),
+                               SLOT(slotStateReady(Graph,Phonon::State)));
 
-            connect(&m_thread, SIGNAL(eventReady(Graph, long, long)),
-                               SLOT(handleEvents(Graph, long, long)));
+            connect(&m_thread, SIGNAL(eventReady(Graph,long,long)),
+                               SLOT(handleEvents(Graph,long,long)));
 
-            connect(&m_thread, SIGNAL(asyncRenderFinished(quint16, HRESULT, Graph)),
-                SLOT(finishLoading(quint16, HRESULT, Graph)));
+            connect(&m_thread, SIGNAL(asyncRenderFinished(quint16,HRESULT,Graph)),
+                SLOT(finishLoading(quint16,HRESULT,Graph)));
 
-            connect(&m_thread, SIGNAL(asyncSeekingFinished(quint16, qint64)),
-                SLOT(finishSeeking(quint16, qint64)));
+            connect(&m_thread, SIGNAL(asyncSeekingFinished(quint16,qint64)),
+                SLOT(finishSeeking(quint16,qint64)));
             //really special case
             m_mediaObject = this;
             m_thread.start();
diff --git a/src/3rdparty/phonon/gstreamer/mediaobject.cpp b/src/3rdparty/phonon/gstreamer/mediaobject.cpp
index eafaeec..b6d23ec 100644
--- a/src/3rdparty/phonon/gstreamer/mediaobject.cpp
+++ b/src/3rdparty/phonon/gstreamer/mediaobject.cpp
@@ -95,8 +95,8 @@ MediaObject::MediaObject(Backend *backend, QObject *parent)
         m_backend->addBusWatcher(this);
         connect(m_tickTimer, SIGNAL(timeout()), SLOT(emitTick()));
     }
-    connect(this, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 
-            this, SLOT(notifyStateChange(Phonon::State, Phonon::State)));
+    connect(this, SIGNAL(stateChanged(Phonon::State,Phonon::State)), 
+            this, SLOT(notifyStateChange(Phonon::State,Phonon::State)));
 
 }
 
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp
index e42e0fa..21dcfe1 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.cpp
+++ b/src/3rdparty/phonon/mmf/mediaobject.cpp
@@ -319,10 +319,10 @@ void MMF::MediaObject::createPlayer(const MediaSource &source)
     }
 
     connect(m_player.data(), SIGNAL(totalTimeChanged(qint64)), SIGNAL(totalTimeChanged(qint64)));
-    connect(m_player.data(), SIGNAL(stateChanged(Phonon::State, Phonon::State)), SIGNAL(stateChanged(Phonon::State, Phonon::State)));
+    connect(m_player.data(), SIGNAL(stateChanged(Phonon::State,Phonon::State)), SIGNAL(stateChanged(Phonon::State,Phonon::State)));
     connect(m_player.data(), SIGNAL(finished()), SIGNAL(finished()));
     connect(m_player.data(), SIGNAL(tick(qint64)), SIGNAL(tick(qint64)));
-    connect(m_player.data(), SIGNAL(metaDataChanged(const QMultiMap<QString, QString>&)), SIGNAL(metaDataChanged(const QMultiMap<QString, QString>&)));
+    connect(m_player.data(), SIGNAL(metaDataChanged(QMultiMap<QString,QString>)), SIGNAL(metaDataChanged(QMultiMap<QString,QString>)));
 
     // We need to call setError() after doing the connects, otherwise the
     // error won't be received.
diff --git a/src/3rdparty/phonon/mmf/objectdump.cpp b/src/3rdparty/phonon/mmf/objectdump.cpp
index 6b6b71e..3d10be4 100644
--- a/src/3rdparty/phonon/mmf/objectdump.cpp
+++ b/src/3rdparty/phonon/mmf/objectdump.cpp
@@ -16,8 +16,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#ifndef QT_NO_DEBUG
-
 #include <QByteArray>
 #include <QDebug>
 #include <QHash>
@@ -525,5 +523,3 @@ void dumpAncestors(const QObject& leaf, QVisitor& visitor)
 
 QT_END_NAMESPACE
 
-#endif
-
diff --git a/src/3rdparty/phonon/mmf/objectdump.h b/src/3rdparty/phonon/mmf/objectdump.h
index e94b3ac..86aeaba 100644
--- a/src/3rdparty/phonon/mmf/objectdump.h
+++ b/src/3rdparty/phonon/mmf/objectdump.h
@@ -19,8 +19,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OBJECTDUMP_H
 #define OBJECTDUMP_H
 
-#include "objectdump_global.h"
-
 #include <QObject>
 #include <QList>
 #include <QByteArray>
@@ -34,7 +32,7 @@ namespace ObjectDump
 /**
  * Abstract base for annotator classes invoked by QVisitor.
  */
-class OBJECTDUMP_EXPORT QAnnotator : public QObject
+class QAnnotator : public QObject
 {
     Q_OBJECT
 public:
@@ -45,7 +43,7 @@ public:
 /**
  * Annotator which replicates QObject::dumpObjectTree functionality.
  */
-class OBJECTDUMP_EXPORT QAnnotatorBasic : public QAnnotator
+class QAnnotatorBasic : public QAnnotator
 {
     Q_OBJECT
 public:
@@ -55,7 +53,7 @@ public:
 /**
  * Annotator which returns widget information.
  */
-class OBJECTDUMP_EXPORT QAnnotatorWidget : public QAnnotator
+class QAnnotatorWidget : public QAnnotator
 {
     Q_OBJECT
 public:
@@ -68,7 +66,7 @@ class QDumperPrivate;
 /**
  * Class used to dump information about individual QObjects.
  */
-class OBJECTDUMP_EXPORT QDumper : public QObject
+class QDumper : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDumper)
@@ -103,7 +101,7 @@ class QVisitorPrivate;
 /**
  * Visitor class which dumps information about nodes in the object tree.
  */
-class OBJECTDUMP_EXPORT QVisitor : public QObject
+class QVisitor : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QVisitor)
@@ -152,12 +150,12 @@ private:
 // Utility functions
 //-----------------------------------------------------------------------------
 
-void OBJECTDUMP_EXPORT addDefaultAnnotators(QDumper& dumper);
-void OBJECTDUMP_EXPORT addDefaultAnnotators(QVisitor& visitor);
+void addDefaultAnnotators(QDumper& dumper);
+void addDefaultAnnotators(QVisitor& visitor);
 
-void OBJECTDUMP_EXPORT dumpTreeFromRoot(const QObject& root, QVisitor& visitor);
-void OBJECTDUMP_EXPORT dumpTreeFromLeaf(const QObject& leaf, QVisitor& visitor);
-void OBJECTDUMP_EXPORT dumpAncestors(const QObject& leaf, QVisitor& visitor);
+void dumpTreeFromRoot(const QObject& root, QVisitor& visitor);
+void dumpTreeFromLeaf(const QObject& leaf, QVisitor& visitor);
+void dumpAncestors(const QObject& leaf, QVisitor& visitor);
 
 } // namespace ObjectDump
 
diff --git a/src/3rdparty/phonon/mmf/objectdump_global.h b/src/3rdparty/phonon/mmf/objectdump_global.h
deleted file mode 100644
index b8987e0..0000000
--- a/src/3rdparty/phonon/mmf/objectdump_global.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  This file is part of the KDE project.
-
-Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-
-This library is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 2.1 or 3 of the License.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this library.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#ifndef OBJECTDUMP_GLOBAL_H
-#define OBJECTDUMP_GLOBAL_H
-
-#include <QtCore/QtGlobal>
-
-#if defined(OBJECTDUMP_LIBRARY)
-#  define OBJECTDUMP_EXPORT
-#else
-#  define OBJECTDUMP_EXPORT
-#endif
-
-#endif
diff --git a/src/3rdparty/phonon/mmf/objectdump_symbian.cpp b/src/3rdparty/phonon/mmf/objectdump_symbian.cpp
index 41dd240..2efebdb 100644
--- a/src/3rdparty/phonon/mmf/objectdump_symbian.cpp
+++ b/src/3rdparty/phonon/mmf/objectdump_symbian.cpp
@@ -16,8 +16,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#ifndef QT_NO_DEBUG
-
 #include <QTextStream>
 #include <QWidget>
 #include <coecntrl.h>
@@ -160,5 +158,3 @@ void addDefaultAnnotators_sys(QVisitor& visitor)
 
 QT_END_NAMESPACE
 
-#endif
-
diff --git a/src/3rdparty/phonon/mmf/objecttree.cpp b/src/3rdparty/phonon/mmf/objecttree.cpp
index 750db22..06b0ced 100644
--- a/src/3rdparty/phonon/mmf/objecttree.cpp
+++ b/src/3rdparty/phonon/mmf/objecttree.cpp
@@ -16,8 +16,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#ifndef QT_NO_DEBUG
-
 #include <QTextStream>
 #include <QWidget>
 #include "objecttree.h"
@@ -100,5 +98,3 @@ AncestorConstIterator::AncestorConstIterator(const QObject& leaf)
 
 QT_END_NAMESPACE
 
-#endif
-
diff --git a/src/3rdparty/phonon/mmf/objecttree.h b/src/3rdparty/phonon/mmf/objecttree.h
index 98bdf14..96adb6f 100644
--- a/src/3rdparty/phonon/mmf/objecttree.h
+++ b/src/3rdparty/phonon/mmf/objecttree.h
@@ -19,8 +19,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OBJECTTREE_H
 #define OBJECTTREE_H
 
-#include "objectdump_global.h"
-
 #include <QObject>
 #include <QStack>
 
@@ -32,7 +30,7 @@ namespace ObjectTree
 /**
  * Depth-first iterator for QObject tree
  */
-class OBJECTDUMP_EXPORT DepthFirstConstIterator
+class DepthFirstConstIterator
 {
 public:
     DepthFirstConstIterator();
@@ -60,7 +58,7 @@ private:
 /**
  * Ancestor iterator for QObject tree
  */
-class OBJECTDUMP_EXPORT AncestorConstIterator
+class AncestorConstIterator
 {
 public:
     AncestorConstIterator();
diff --git a/src/3rdparty/phonon/phonon/factory.cpp b/src/3rdparty/phonon/phonon/factory.cpp
index ab1f44f..9967c971 100644
--- a/src/3rdparty/phonon/phonon/factory.cpp
+++ b/src/3rdparty/phonon/phonon/factory.cpp
@@ -469,7 +469,7 @@ GET_STRING_PROPERTY(backendWebsite)
 QObject *Factory::registerQObject(QObject *o)
 {
     if (o) {
-        QObject::connect(o, SIGNAL(destroyed(QObject *)), globalFactory, SLOT(objectDestroyed(QObject *)), Qt::DirectConnection);
+        QObject::connect(o, SIGNAL(destroyed(QObject*)), globalFactory, SLOT(objectDestroyed(QObject*)), Qt::DirectConnection);
         globalFactory->objects.append(o);
     }
     return o;
diff --git a/src/3rdparty/phonon/phonon/mediaobject.cpp b/src/3rdparty/phonon/phonon/mediaobject.cpp
index 13d303c..41e8dc2 100644
--- a/src/3rdparty/phonon/phonon/mediaobject.cpp
+++ b/src/3rdparty/phonon/phonon/mediaobject.cpp
@@ -453,9 +453,9 @@ void MediaObjectPrivate::setupBackendObject()
     //pDebug() << Q_FUNC_INFO;
 
 #ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
-    QObject::connect(m_backendObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)), q, SLOT(_k_stateChanged(Phonon::State, Phonon::State)));
+    QObject::connect(m_backendObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), q, SLOT(_k_stateChanged(Phonon::State,Phonon::State)));
 #else
-    QObject::connect(m_backendObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)), q, SIGNAL(stateChanged(Phonon::State, Phonon::State)));
+    QObject::connect(m_backendObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), q, SIGNAL(stateChanged(Phonon::State,Phonon::State)));
 #endif // QT_NO_PHONON_ABSTRACTMEDIASTREAM
     QObject::connect(m_backendObject, SIGNAL(tick(qint64)),             q, SIGNAL(tick(qint64)));
     QObject::connect(m_backendObject, SIGNAL(seekableChanged(bool)),    q, SIGNAL(seekableChanged(bool)));
@@ -467,10 +467,10 @@ void MediaObjectPrivate::setupBackendObject()
     QObject::connect(m_backendObject, SIGNAL(aboutToFinish()),          q, SLOT(_k_aboutToFinish()));
     QObject::connect(m_backendObject, SIGNAL(prefinishMarkReached(qint32)), q, SIGNAL(prefinishMarkReached(qint32)));
     QObject::connect(m_backendObject, SIGNAL(totalTimeChanged(qint64)), q, SIGNAL(totalTimeChanged(qint64)));
-    QObject::connect(m_backendObject, SIGNAL(metaDataChanged(const QMultiMap<QString, QString> &)),
-            q, SLOT(_k_metaDataChanged(const QMultiMap<QString, QString> &)));
-    QObject::connect(m_backendObject, SIGNAL(currentSourceChanged(const MediaSource&)), 
-        q, SLOT(_k_currentSourceChanged(const MediaSource&)));
+    QObject::connect(m_backendObject, SIGNAL(metaDataChanged(QMultiMap<QString,QString>)),
+            q, SLOT(_k_metaDataChanged(QMultiMap<QString,QString>)));
+    QObject::connect(m_backendObject, SIGNAL(currentSourceChanged(MediaSource)), 
+        q, SLOT(_k_currentSourceChanged(MediaSource)));
 
     // set up attributes
     pINTERFACE_CALL(setTickInterval(tickInterval));
diff --git a/src/3rdparty/phonon/phonon/seekslider.cpp b/src/3rdparty/phonon/phonon/seekslider.cpp
index b5b25f0..41baf2d 100644
--- a/src/3rdparty/phonon/phonon/seekslider.cpp
+++ b/src/3rdparty/phonon/phonon/seekslider.cpp
@@ -72,12 +72,12 @@ void SeekSlider::setMediaObject(MediaObject *media)
     d->media = media;
 
     if (media) {
-        connect(media, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
+        connect(media, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
                 SLOT(_k_stateChanged(Phonon::State)));
         connect(media, SIGNAL(totalTimeChanged(qint64)), SLOT(_k_length(qint64)));
         connect(media, SIGNAL(tick(qint64)), SLOT(_k_tick(qint64)));
         connect(media, SIGNAL(seekableChanged(bool)), SLOT(_k_seekableChanged(bool)));
-        connect(media, SIGNAL(currentSourceChanged(const Phonon::MediaSource&)), SLOT(_k_currentSourceChanged()));
+        connect(media, SIGNAL(currentSourceChanged(Phonon::MediaSource)), SLOT(_k_currentSourceChanged()));
         d->_k_stateChanged(media->state());
         d->_k_seekableChanged(media->isSeekable());
         d->_k_length(media->totalTime());
diff --git a/src/3rdparty/phonon/waveout/mediaobject.cpp b/src/3rdparty/phonon/waveout/mediaobject.cpp
index 35d9e0b..db71942 100644
--- a/src/3rdparty/phonon/waveout/mediaobject.cpp
+++ b/src/3rdparty/phonon/waveout/mediaobject.cpp
@@ -247,7 +247,7 @@ namespace Phonon
                                                     m_stopped(0)
         {
             m_thread = new WorkerThread();
-            connect(this, SIGNAL(outOfData(QIODevice*, QByteArray*, bool*)), m_thread, SLOT(stream(QIODevice*, QByteArray*, bool*)));
+            connect(this, SIGNAL(outOfData(QIODevice*,QByteArray*,bool*)), m_thread, SLOT(stream(QIODevice*,QByteArray*,bool*)));
             m_thread->start();
             m_soundBuffer1.waveHeader = new WAVEHDR;
             m_soundBuffer2.waveHeader = new WAVEHDR;
@@ -258,7 +258,7 @@ namespace Phonon
         MediaObject::~MediaObject()
         {
             stop();
-            disconnect(this, SIGNAL(outOfData(QIODevice*, QByteArray*, bool*)), m_thread, SLOT(stream(QIODevice*, QByteArray*, bool*)));
+            disconnect(this, SIGNAL(outOfData(QIODevice*,QByteArray*,bool*)), m_thread, SLOT(stream(QIODevice*,QByteArray*,bool*)));
             do { //The event loop of m_thread might not be started, yet
                 m_thread->quit(); //If the event loop is not started yet quit() does nothing
                 m_thread->wait(100);
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
index 0cbb3a5..382a8c7 100644
--- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
@@ -1,3 +1,32 @@
+2009-11-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Symbian] Fix lastIndexOf() for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=31773
+
+        Symbian soft floating point library has problems with operators
+        comparing NaN to numbers. Without a workaround lastIndexOf() 
+        function does not work.
+
+        Patch developed by David Leong.
+
+        * runtime/StringPrototype.cpp:
+        (JSC::stringProtoFuncLastIndexOf):Add an extra test 
+        to check for NaN for Symbian.
+
+2009-11-18  Harald Fernengel  <harald.fernengel@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix detection of linux-g++
+
+        Never use "linux-g++*" to check for linux-g++, since this will break embedded
+        builds which use linux-arm-g++ and friends. Use 'linux*-g++*' to check for any
+        g++ on linux mkspec.
+
+        * JavaScriptCore.pri:
+
 2009-11-16  Joerg Bornemann  <joerg.bornemann@trolltech.com>
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/StringPrototype.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/StringPrototype.cpp
index a0713b8..a0cc9f1 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/StringPrototype.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/StringPrototype.cpp
@@ -469,6 +469,11 @@ JSValue JSC_HOST_CALL stringProtoFuncLastIndexOf(ExecState* exec, JSObject*, JSV
         dpos = 0;
     else if (!(dpos <= len)) // true for NaN
         dpos = len;
+#if PLATFORM(SYMBIAN)
+    // Work around for broken NaN compare operator
+    else if (isnan(dpos))
+        dpos = len;
+#endif
     return jsNumber(exec, s.rfind(u2, static_cast<int>(dpos)));
 }
 
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 2653e83..5818e83 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
 
 and has the sha1 checksum
 
-        ca38203fba92cf48d59328403f64036907fd3433
+        efa69b6181ce5c045097351cdcf6c158da3f4888
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index abb372a..9644470 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2009-11-19  Olivier Goffart  <ogoffart@trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Normalize signal and slot signatures.
+
+        * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+
+2009-11-18  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] WebKit crashes when loading certain SVG images
+
+        Check if the familly exist before creating the PlatformData from it.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29443
+
+        Test: svg/text/text-font-invalid.html
+
+        * platform/graphics/qt/FontFallbackListQt.cpp:
+        (WebCore::FontFallbackList::fontDataAt):
+
 2009-11-14  Antonio Gomes  <tonikitoo@webkit.org>
 
         Reviewed by Antti Koivisto.
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp
index 8e1e4f6..0306abf 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp
@@ -102,7 +102,7 @@ const FontData* FontFallbackList::fontDataAt(const WebCore::Font* _font, unsigne
     const FontDescription& description = _font->fontDescription();
     const FontFamily* family = &description.family();
     while (family) {
-        if (m_fontSelector) {
+        if (family->family().length() && m_fontSelector) {
             FontData* data = m_fontSelector->getFontData(description, family->family());
             if (data) {
                 if (data->isLoading())
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
index f0d513c..9faa234 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
@@ -104,15 +104,15 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
     foreach (QWidget* widget, qFindChildren<QWidget*>(m_videoWidget))
         widget->installEventFilter(this);
 
-    connect(m_mediaObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
-            this, SLOT(stateChanged(Phonon::State, Phonon::State)));
+    connect(m_mediaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
+            this, SLOT(stateChanged(Phonon::State,Phonon::State)));
     connect(m_mediaObject, SIGNAL(metaDataChanged()), this, SLOT(metaDataChanged()));
     connect(m_mediaObject, SIGNAL(seekableChanged(bool)), this, SLOT(seekableChanged(bool)));
     connect(m_mediaObject, SIGNAL(hasVideoChanged(bool)), this, SLOT(hasVideoChanged(bool)));
     connect(m_mediaObject, SIGNAL(bufferStatus(int)), this, SLOT(bufferStatus(int)));
     connect(m_mediaObject, SIGNAL(finished()), this, SLOT(finished()));
-    connect(m_mediaObject, SIGNAL(currentSourceChanged(const Phonon::MediaSource&)),
-            this, SLOT(currentSourceChanged(const Phonon::MediaSource&)));
+    connect(m_mediaObject, SIGNAL(currentSourceChanged(Phonon::MediaSource)),
+            this, SLOT(currentSourceChanged(Phonon::MediaSource)));
     connect(m_mediaObject, SIGNAL(aboutToFinish()), this, SLOT(aboutToFinish()));
     connect(m_mediaObject, SIGNAL(totalTimeChanged(qint64)), this, SLOT(totalTimeChanged(qint64)));
 }
diff --git a/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp b/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp
index 5ccce0e..b313afb 100644
--- a/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp
+++ b/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp
@@ -145,7 +145,7 @@ HDC WINAPI PluginView::hookedBeginPaint(HWND hWnd, PAINTSTRUCT* lpPaint)
          "push    %3\n"
          "call    *%4\n"
          : "=a" (result)
-         : "a" (beginPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (*beginPaint)
+         : "a" (beginPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (beginPaint)
          : "memory"
         );
     return result;
@@ -175,7 +175,7 @@ BOOL WINAPI PluginView::hookedEndPaint(HWND hWnd, const PAINTSTRUCT* lpPaint)
          "push   %3\n"
          "call   *%4\n"
          : "=a" (result)
-         : "a" (endPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (*endPaint)
+         : "a" (endPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (endPaint)
         );
     return result;
 #elif defined (_M_IX86)
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
index 640a924..ceb5ee1 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
@@ -419,22 +419,22 @@ void QGraphicsWebView::setPage(QWebPage* page)
 
     QWebFrame* mainFrame = d->page->mainFrame();
 
-    connect(mainFrame, SIGNAL(titleChanged(const QString&)),
-            this, SIGNAL(titleChanged(const QString&)));
+    connect(mainFrame, SIGNAL(titleChanged(QString)),
+            this, SIGNAL(titleChanged(QString)));
     connect(mainFrame, SIGNAL(iconChanged()),
             this, SIGNAL(iconChanged()));
-    connect(mainFrame, SIGNAL(urlChanged(const QUrl&)),
-            this, SIGNAL(urlChanged(const QUrl&)));
+    connect(mainFrame, SIGNAL(urlChanged(QUrl)),
+            this, SIGNAL(urlChanged(QUrl)));
     connect(d->page, SIGNAL(loadStarted()),
             this, SIGNAL(loadStarted()));
     connect(d->page, SIGNAL(loadProgress(int)),
             this, SIGNAL(loadProgress(int)));
     connect(d->page, SIGNAL(loadFinished(bool)),
             this, SLOT(_q_doLoadFinished(bool)));
-    connect(d->page, SIGNAL(statusBarMessage(const QString&)),
-            this, SIGNAL(statusBarMessage(const QString&)));
-    connect(d->page, SIGNAL(linkClicked(const QUrl &)),
-            this, SIGNAL(linkClicked(const QUrl &)));
+    connect(d->page, SIGNAL(statusBarMessage(QString)),
+            this, SIGNAL(statusBarMessage(QString)));
+    connect(d->page, SIGNAL(linkClicked(QUrl)),
+            this, SIGNAL(linkClicked(QUrl)));
 }
 
 /*!
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
index 8ee43a1..1d4b46f 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
@@ -219,12 +219,12 @@ void QWebView::setPage(QWebPage* page)
         d->page->setPalette(palette());
         // #### connect signals
         QWebFrame *mainFrame = d->page->mainFrame();
-        connect(mainFrame, SIGNAL(titleChanged(const QString&)),
-                this, SIGNAL(titleChanged(const QString&)));
+        connect(mainFrame, SIGNAL(titleChanged(QString)),
+                this, SIGNAL(titleChanged(QString)));
         connect(mainFrame, SIGNAL(iconChanged()),
                 this, SIGNAL(iconChanged()));
-        connect(mainFrame, SIGNAL(urlChanged(const QUrl &)),
-                this, SIGNAL(urlChanged(const QUrl &)));
+        connect(mainFrame, SIGNAL(urlChanged(QUrl)),
+                this, SIGNAL(urlChanged(QUrl)));
 
         connect(d->page, SIGNAL(loadStarted()),
                 this, SIGNAL(loadStarted()));
@@ -232,10 +232,10 @@ void QWebView::setPage(QWebPage* page)
                 this, SIGNAL(loadProgress(int)));
         connect(d->page, SIGNAL(loadFinished(bool)),
                 this, SIGNAL(loadFinished(bool)));
-        connect(d->page, SIGNAL(statusBarMessage(const QString &)),
-                this, SIGNAL(statusBarMessage(const QString &)));
-        connect(d->page, SIGNAL(linkClicked(const QUrl &)),
-                this, SIGNAL(linkClicked(const QUrl &)));
+        connect(d->page, SIGNAL(statusBarMessage(QString)),
+                this, SIGNAL(statusBarMessage(QString)));
+        connect(d->page, SIGNAL(linkClicked(QUrl)),
+                this, SIGNAL(linkClicked(QUrl)));
 
         connect(d->page, SIGNAL(microFocusChanged()),
                 this, SLOT(updateMicroFocus()));
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 1294d66..2408dd4 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,51 @@
+2009-11-19  Olivier Goffart  <ogoffart@trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Normalize signal and slot signatures.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::setPage):
+        * Api/qwebview.cpp:
+        (QWebView::setPage):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::setFrame):
+        * docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp:
+        (wrapInFunction):
+        * tests/qwebframe/tst_qwebframe.cpp:
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::modified):
+        (tst_QWebPage::database):
+
+2009-11-18  Paul Olav Tvete  <paul.tvete@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit.
+
+        * tests/qwebelement/tst_qwebelement.cpp:
+        (tst_QWebElement::render):
+
+2009-11-18  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Clarify and simplify the legal section in the overview documentation,
+        after review with our legal team.
+
+        * docs/qtwebkit.qdoc:
+
+2009-11-18  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed and suggested by Tor Arne Vestbø.
+
+        Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f
+        to compare the Qt::ImFont property's family against an explicitly
+        previously configured family.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+
 2009-11-16  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 9e13339..5cabca0 100644
--- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -177,8 +177,8 @@ void FrameLoaderClientQt::setFrame(QWebFrame* webFrame, Frame* frame)
             m_webFrame->page(), SIGNAL(loadFinished(bool)));
     connect(this, SIGNAL(loadFinished(bool)),
             m_webFrame, SIGNAL(loadFinished(bool)));
-    connect(this, SIGNAL(titleChanged(const QString&)),
-            m_webFrame, SIGNAL(titleChanged(const QString&)));
+    connect(this, SIGNAL(titleChanged(QString)),
+            m_webFrame, SIGNAL(titleChanged(QString)));
 }
 
 QWebFrame* FrameLoaderClientQt::webFrame() const
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp
index 0ba1cad..a6b6620 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp
@@ -10,7 +10,7 @@ void wrapInFunction()
     QWebInspector *inspector = new QWebInspector;
     inspector->setPage(page);
 
-    connect(page, SIGNAL(webInspectorTriggered(const QWebElement&)), inspector, SLOT(show()));
+    connect(page, SIGNAL(webInspectorTriggered(QWebElement)), inspector, SLOT(show()));
 //! [0]
 
 }
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
index a04e661..e9dae18 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
@@ -995,7 +995,7 @@ void tst_QWebElement::render()
     QImage testImage(resource.width(), resource.height(), QImage::Format_ARGB32);
     QPainter painter0(&testImage);
     painter0.fillRect(imageRect, Qt::white);
-    //render() uses pixmaps internally, and pixmaps might have bit depths
+    // render() uses pixmaps internally, and pixmaps might have bit depths
     // other than 32, giving different pixel values due to rounding.
     QPixmap pix = QPixmap::fromImage(resource);
     painter0.drawPixmap(0, 0, pix);
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index b00cf09..d88d905 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -2291,7 +2291,7 @@ void tst_QWebFrame::requestedUrl()
     qRegisterMetaType<QList<QSslError> >("QList<QSslError>");
     qRegisterMetaType<QNetworkReply* >("QNetworkReply*");
 
-    QSignalSpy spy2(page.networkAccessManager(), SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)));
+    QSignalSpy spy2(page.networkAccessManager(), SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)));
     frame->setUrl(QUrl("qrc:/fake-ssl-error.html"));
     QTest::qWait(200);
     QCOMPARE(spy2.count(), 1);
@@ -2780,7 +2780,7 @@ void tst_QWebFrame::evaluateWillCauseRepaint()
     view.page()->mainFrame()->evaluateJavaScript(
         "document.getElementById('junk').style.display = 'none';");
 
-    ::waitForSignal(view.page(), SIGNAL(repaintRequested( const QRect &)));
+    ::waitForSignal(view.page(), SIGNAL(repaintRequested(QRect)));
 
     QTest::qWait(2000);
 }
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 7fc3640..32002e7 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -448,7 +448,7 @@ void tst_QWebPage::modified()
     m_page->mainFrame()->setUrl(QUrl("data:text/html,<body>This is fourth page"));
     QVERIFY(m_page->history()->count() == 2);
     m_page->mainFrame()->setUrl(QUrl("data:text/html,<body>This is fifth page"));
-    QVERIFY(::waitForSignal(m_page, SIGNAL(saveFrameStateRequested(QWebFrame*, QWebHistoryItem*))));
+    QVERIFY(::waitForSignal(m_page, SIGNAL(saveFrameStateRequested(QWebFrame*,QWebHistoryItem*))));
 }
 
 void tst_QWebPage::contextMenuCrash()
@@ -484,7 +484,7 @@ void tst_QWebPage::database()
         QFile::remove(dbFileName);
 
     qRegisterMetaType<QWebFrame*>("QWebFrame*");
-    QSignalSpy spy(m_page, SIGNAL(databaseQuotaExceeded(QWebFrame *, QString)));
+    QSignalSpy spy(m_page, SIGNAL(databaseQuotaExceeded(QWebFrame*,QString)));
     m_view->setHtml(QString("<html><head><script>var db; db=openDatabase('testdb', '1.0', 'test database API', 50000); </script></head><body><div></div></body></html>"), QUrl("http://www.myexample.com"));
     QTRY_COMPARE(spy.count(), 1);
     m_page->mainFrame()->evaluateJavaScript("var db2; db2=openDatabase('testdb', '1.0', 'test database API', 50000);");
@@ -1371,6 +1371,7 @@ void tst_QWebPage::inputMethods()
     else
         QVERIFY2(false, "Unknown view type");
 
+    page->settings()->setFontFamily(QWebSettings::SerifFont, "FooSerifFont");
     page->mainFrame()->setHtml("<html><body>" \
                                             "<input type='text' id='input1' style='font-family: serif' value='' maxlength='20'/><br>" \
                                             "<input type='password'/>" \
@@ -1404,9 +1405,9 @@ void tst_QWebPage::inputMethods()
     QVERIFY(inputs.at(0).geometry().contains(variant.toRect().topLeft()));
 
     //ImFont
-    //variant = page->inputMethodQuery(Qt::ImFont);
-    //QFont font = variant.value<QFont>();
-    //QCOMPARE(QString("-webkit-serif"), font.family());
+    variant = page->inputMethodQuery(Qt::ImFont);
+    QFont font = variant.value<QFont>();
+    QCOMPARE(page->settings()->fontFamily(QWebSettings::SerifFont), font.family());
 
     QList<QInputMethodEvent::Attribute> inputAttributes;
 
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index c735778..d529f67 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -104,15 +104,32 @@ QT_BEGIN_NAMESPACE
         \o \l{QMetaType::}{QLine}
         \o \l{QMetaType::}{QLineF}
         \o \l{QMetaType::}{QPoint}
+        \o \l{QMetaType::}{QPointF}
         \o \l{QMetaType::}{QSize}
         \o \l{QMetaType::}{QSizeF}
         \o \l{QMetaType::}{QRect}
         \o \l{QMetaType::}{QRectF}
+        \o \l{QMetaType::}{QColor}
     \endlist
 
     If you need to interpolate other variant types, including custom
     types, you have to implement interpolation for these yourself.
-    You do this by reimplementing interpolated(), which returns
+    To do this, you can register an interpolator function for a given
+    type. This function takes 3 parameters: the start value, the end value
+    and the current progress.
+
+    Example:
+    \code
+        QVariant myColorInterpolator(const QColor &start, const QColor &end, qreal progress)
+        {
+            ...
+            return QColor(...);
+        }
+        ...
+        qRegisterAnimationInterpolator<QColor>(myColorInterpolator);
+    \endcode
+
+    Another option is to reimplement interpolated(), which returns
     interpolation values for the value being interpolated.
 
     \omit We need some snippets around here. \endomit
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 680fcd7..5d62095 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -1573,9 +1573,6 @@ QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba)
     cannot be detected from the content provided, \a defaultCodec is
     returned.
 
-    The behavior of this function is undefined if \a ba is not
-    encoded in unicode.
-
     \sa codecForHtml()
 */
 QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba, QTextCodec *defaultCodec)
@@ -1620,9 +1617,6 @@ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba, QTextCodec *defaul
     that is capable of decoding the text to unicode. If the codec
     cannot be detected, this overload returns a Latin-1 QTextCodec.
 
-    The behavior of this function is undefined if \a ba is not
-    encoded in unicode.
-
     \sa codecForHtml()
 */
 QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba)
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 9558256..2e9f839 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -910,6 +910,8 @@ QT_END_INCLUDE_NAMESPACE
 /* Symbian OS defines TRUE = 1 and FALSE = 0,
 redefine to built-in booleans to make autotests work properly */
 #ifdef Q_OS_SYMBIAN
+    #include <e32def.h> /* Symbian OS defines */
+
     #undef TRUE
     #undef FALSE
 #endif
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp
index f3cc211..87fe630 100644
--- a/src/corelib/io/qfilesystemwatcher_win.cpp
+++ b/src/corelib/io/qfilesystemwatcher_win.cpp
@@ -201,10 +201,10 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
                 else
                     files->append(path);
 
-                connect(thread, SIGNAL(fileChanged(const QString &, bool)),
-                        this, SIGNAL(fileChanged(const QString &, bool)));
-                connect(thread, SIGNAL(directoryChanged(const QString &, bool)),
-                        this, SIGNAL(directoryChanged(const QString &, bool)));
+                connect(thread, SIGNAL(fileChanged(QString,bool)),
+                        this, SIGNAL(fileChanged(QString,bool)));
+                connect(thread, SIGNAL(directoryChanged(QString,bool)),
+                        this, SIGNAL(directoryChanged(QString,bool)));
                 
                 thread->msg = '@';
                 thread->start();
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 05e6fab..8cbf6a3 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -1245,7 +1245,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
     }
 
     if (offset < 0 || offset != qint64(QT_OFF_T(offset))
-            || size < 0 || size > qint64(size_t(-1))) {
+            || size < 0 || quint64(size) > quint64(size_t(-1))) {
         q->setError(QFile::UnspecifiedError, qt_error_string(int(EINVAL)));
         return 0;
     }
@@ -1254,7 +1254,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
     // undefined behavior. Otherwise, let mmap have its say.
     if (doStat()
             && (QT_OFF_T(size) > st.st_size - QT_OFF_T(offset)))
-        return 0;
+        qWarning("QFSFileEngine::map: Mapping a file beyond its size is not portable");
 
     int access = 0;
     if (openMode & QIODevice::ReadOnly) access |= PROT_READ;
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index e4e6a15..0e5a2de 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -1157,6 +1157,10 @@ QByteArray QIODevice::readLine(qint64 maxSize)
         // If resize fails or maxSize == 0, read incrementally
         if (maxSize == 0)
             maxSize = INT_MAX;
+
+        // The first iteration needs to leave an extra byte for the terminating null
+        result.resize(1);
+
         qint64 readResult;
         do {
             result.resize(int(qMin(maxSize, result.size() + QIODEVICE_BUFFERSIZE)));
@@ -1164,7 +1168,7 @@ QByteArray QIODevice::readLine(qint64 maxSize)
             if (readResult > 0 || readBytes == 0)
                 readBytes += readResult;
         } while (readResult == QIODEVICE_BUFFERSIZE
-                && result[int(readBytes)] != '\n');
+                && result[int(readBytes - 1)] != '\n');
     } else
         readBytes = readLine(result.data(), result.size());
 
@@ -1404,6 +1408,9 @@ bool QIODevicePrivate::putCharHelper(char c)
 */
 bool QIODevice::getChar(char *c)
 {
+    Q_D(QIODevice);
+    CHECK_READABLE(getChar, false);
+
     char ch;
     return (1 == read(c ? c : &ch, 1));
 }
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index b3497b9..b197b9d 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -725,7 +725,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
                 }
             }
             if (haveMessage) {
-                if (msg.message == WM_QT_SENDPOSTEDEVENTS) {
+                if (d->internalHwnd == msg.hwnd && msg.message == WM_QT_SENDPOSTEDEVENTS) {
                     if (seenWM_QT_SENDPOSTEDEVENTS) {
                         needWM_QT_SENDPOSTEDEVENTS = true;
                         continue;
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 1260d47..95602d9 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -154,6 +154,15 @@ QObjectPrivate::QObjectPrivate(int version)
     hasGuards = false;
 }
 
+#ifdef Q_CC_INTEL
+/* Workaround for a bug in win32-icc where it seems to inline ~QObjectPrivate too aggressive.
+   When icc compiles QtGui, it inlines ~QObjectPrivate so that it would generate a call to
+  ~QObjectData. However, ~QObjectData is not exported from QtCore, so it does not link.
+  See also QTBUG-5145 for info on how this manifested itself.
+ */
+# pragma auto_inline(off)
+#endif
+
 QObjectPrivate::~QObjectPrivate()
 {
     delete static_cast<QAbstractDynamicMetaObject*>(metaObject);
@@ -165,6 +174,9 @@ QObjectPrivate::~QObjectPrivate()
     delete extraData;
 #endif
 }
+#ifdef Q_CC_INTEL
+# pragma auto_inline(on)
+#endif
 
 
 int *QObjectPrivate::setDeleteWatch(QObjectPrivate *d, int *w) {
diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp
index fe47a30..d5eb8c2 100644
--- a/src/corelib/kernel/qtcore_eval.cpp
+++ b/src/corelib/kernel/qtcore_eval.cpp
@@ -88,23 +88,12 @@ static const char will_shutdown_now[] =
     "timeout and will shut down.\n"
     "Contact http://qt.nokia.com/about/contact-us for pricing and purchasing information.\n";
 
-static int qt_eval_days_left()
+static int qt_eval_is_supported()
 {
     const char *const license_key = qt_eval_key_data + 12;
 
     // fast fail
     if (!qt_eval_key_data[0] || !*license_key)
-        return -2;
-
-    QDate today = QDate::currentDate();
-    QDate build = QLibraryInfo::buildDate();
-    return qMax(-1, today.daysTo(build) + 30);
-}
-
-static int qt_eval_is_supported()
-{
-    const char *const license_key = qt_eval_key_data + 12;
-    if (!qt_eval_key_data[0] || !*license_key)
         return -1;
 
     // is this an unsupported evaluation?
@@ -123,6 +112,16 @@ static int qt_eval_is_supported()
     return -1;
 }
 
+static int qt_eval_days_left()
+{
+    if (qt_eval_is_supported() < 0)
+        return -2;
+
+    QDate today = QDate::currentDate();
+    QDate build = QLibraryInfo::buildDate();
+    return qMax(-1, today.daysTo(build) + 30);
+}
+
 static QString qt_eval_string()
 {
     const char *msg;
@@ -178,6 +177,9 @@ public:
 
 void qt_core_eval_init(uint type)
 {
+    if (!type)
+        return;     // GUI app
+
     switch (qt_eval_days_left()) {
     case -2:
         return;
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index ff2b667..13c43e5 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -70,7 +70,7 @@ class Q_CORE_EXPORT QStateMachine : public QState
     Q_PROPERTY(bool animated READ isAnimated WRITE setAnimated)
 #endif
 public:
-    class SignalEvent : public QEvent
+    class Q_CORE_EXPORT SignalEvent : public QEvent
     {
     public:
         SignalEvent(QObject *sender, int signalIndex,
@@ -89,7 +89,7 @@ public:
         friend class QSignalTransitionPrivate;
     };
 
-    class WrappedEvent : public QEvent
+    class Q_CORE_EXPORT WrappedEvent : public QEvent
     {
     public:
         WrappedEvent(QObject *object, QEvent *event);
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index 7b86ee0..5017dbd 100644
--- a/src/corelib/thread/qbasicatomic.h
+++ b/src/corelib/thread/qbasicatomic.h
@@ -137,7 +137,12 @@ public:
 #if defined(QT_ARCH_WINDOWS) || defined(QT_ARCH_WINDOWSCE)
     union {
         T * volatile _q_value;
-        long volatile _q_value_integral;
+#  if !defined(Q_OS_WINCE) && !defined(__i386__) && !defined(_M_IX86)
+        qint64
+#  else
+        long
+#  endif
+        volatile _q_value_integral;
     };
 #else
     T * volatile _q_value;
diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g
index 22ba33d..9921d41 100644
--- a/src/corelib/xml/qxmlstream.g
+++ b/src/corelib/xml/qxmlstream.g
@@ -915,6 +915,7 @@ markup ::= markup_start markup_list RBRACK;
 
 markup_list ::= markup_decl | space | pereference;
 markup_list ::= markup_list markup_decl | markup_list space | markup_list pereference;
+markup_list ::=;
 
 markup_decl ::= element_decl | attlist_decl | entity_decl | entity_done | notation_decl | processing_instruction | comment;
 
diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h
index 253f8bd..5eea065 100644
--- a/src/corelib/xml/qxmlstream_p.h
+++ b/src/corelib/xml/qxmlstream_p.h
@@ -121,7 +121,7 @@ public:
     XML = 54,
 
     ACCEPT_STATE = 416,
-    RULE_COUNT = 269,
+    RULE_COUNT = 270,
     STATE_COUNT = 427,
     TERMINAL_COUNT = 57,
     NON_TERMINAL_COUNT = 84,
@@ -172,105 +172,105 @@ const char *const QXmlStreamReader_Table::spell [] = {
 const short QXmlStreamReader_Table::lhs [] = {
   57, 57, 59, 59, 59, 59, 59, 59, 59, 59, 
   67, 68, 64, 72, 72, 72, 75, 66, 66, 66, 
-  66, 79, 78, 80, 80, 80, 80, 80, 80, 81, 
-  81, 81, 81, 81, 81, 81, 87, 83, 88, 88, 
-  88, 88, 91, 92, 93, 93, 93, 93, 94, 94, 
-  96, 96, 96, 97, 97, 98, 98, 99, 99, 100, 
-  100, 89, 89, 95, 90, 101, 101, 103, 103, 103, 
-  103, 103, 103, 103, 103, 103, 103, 104, 105, 105, 
-  105, 105, 107, 108, 109, 109, 84, 84, 110, 110, 
-  112, 112, 85, 85, 85, 65, 65, 76, 114, 63, 
-  115, 116, 86, 86, 86, 117, 117, 117, 117, 117, 
+  66, 79, 78, 80, 80, 80, 80, 80, 80, 80, 
+  81, 81, 81, 81, 81, 81, 81, 87, 83, 88, 
+  88, 88, 88, 91, 92, 93, 93, 93, 93, 94, 
+  94, 96, 96, 96, 97, 97, 98, 98, 99, 99, 
+  100, 100, 89, 89, 95, 90, 101, 101, 103, 103, 
+  103, 103, 103, 103, 103, 103, 103, 103, 104, 105, 
+  105, 105, 105, 107, 108, 109, 109, 84, 84, 110, 
+  110, 112, 112, 85, 85, 85, 65, 65, 76, 114, 
+  63, 115, 116, 86, 86, 86, 117, 117, 117, 117, 
   117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 
-  117, 117, 117, 117, 117, 117, 117, 117, 118, 118, 
-  119, 119, 119, 119, 119, 119, 119, 119, 122, 70, 
-  70, 70, 70, 123, 124, 123, 124, 123, 124, 123, 
-  124, 126, 126, 126, 126, 126, 126, 126, 126, 126, 
+  117, 117, 117, 117, 117, 117, 117, 117, 117, 118, 
+  118, 119, 119, 119, 119, 119, 119, 119, 119, 122, 
+  70, 70, 70, 70, 123, 124, 123, 124, 123, 124, 
+  123, 124, 126, 126, 126, 126, 126, 126, 126, 126, 
   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 
-  126, 126, 126, 125, 73, 113, 113, 113, 113, 127, 
-  128, 127, 128, 127, 128, 127, 128, 129, 129, 129, 
+  126, 126, 126, 126, 125, 73, 113, 113, 113, 113, 
+  127, 128, 127, 128, 127, 128, 127, 128, 129, 129, 
   129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 
   129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 
-  129, 129, 106, 106, 106, 106, 131, 132, 131, 132, 
-  131, 131, 132, 132, 133, 133, 133, 133, 135, 71, 
-  71, 71, 136, 136, 137, 62, 60, 61, 138, 121, 
-  82, 130, 134, 120, 139, 139, 139, 139, 58, 58, 
-  58, 58, 58, 58, 58, 58, 58, 58, 74, 69, 
-  69, 77, 111, 102, 102, 102, 102, 102, 140};
+  129, 129, 129, 106, 106, 106, 106, 131, 132, 131, 
+  132, 131, 131, 132, 132, 133, 133, 133, 133, 135, 
+  71, 71, 71, 136, 136, 137, 62, 60, 61, 138, 
+  121, 82, 130, 134, 120, 139, 139, 139, 139, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 74, 
+  69, 69, 77, 111, 102, 102, 102, 102, 102, 140};
 
 const short QXmlStreamReader_Table::rhs [] = {
   2, 1, 4, 2, 2, 2, 2, 2, 2, 0, 
   1, 1, 9, 2, 4, 0, 4, 4, 6, 6, 
-  4, 1, 3, 1, 1, 1, 2, 2, 2, 1, 
-  1, 1, 1, 1, 1, 1, 4, 4, 1, 1, 
-  1, 1, 1, 2, 1, 1, 1, 0, 2, 2, 
-  2, 6, 6, 1, 5, 1, 5, 3, 5, 0, 
-  1, 6, 8, 4, 2, 1, 5, 1, 1, 1, 
-  1, 1, 1, 1, 1, 6, 7, 1, 2, 2, 
-  1, 4, 3, 3, 1, 2, 5, 6, 4, 6, 
-  3, 5, 5, 3, 4, 4, 5, 2, 3, 2, 
-  2, 4, 5, 5, 7, 1, 1, 1, 1, 1, 
+  4, 1, 3, 1, 1, 1, 2, 2, 2, 0, 
+  1, 1, 1, 1, 1, 1, 1, 4, 4, 1, 
+  1, 1, 1, 1, 2, 1, 1, 1, 0, 2, 
+  2, 2, 6, 6, 1, 5, 1, 5, 3, 5, 
+  0, 1, 6, 8, 4, 2, 1, 5, 1, 1, 
+  1, 1, 1, 1, 1, 1, 6, 7, 1, 2, 
+  2, 1, 4, 3, 3, 1, 2, 5, 6, 4, 
+  6, 3, 5, 5, 3, 4, 4, 5, 2, 3, 
+  2, 2, 4, 5, 5, 7, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 
-  2, 3, 3, 2, 2, 2, 2, 1, 1, 1, 
+  1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 
+  2, 2, 3, 3, 2, 2, 2, 2, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 2, 2, 3, 3, 2, 
-  2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 
+  2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 2, 2, 3, 3, 2, 2, 2, 2, 
-  1, 1, 1, 1, 1, 1, 1, 1, 5, 0, 
-  1, 3, 1, 3, 2, 4, 3, 5, 1, 3, 
-  3, 3, 3, 4, 1, 1, 2, 2, 2, 4, 
-  2, 2, 2, 2, 2, 2, 2, 0, 1, 0, 
-  1, 1, 1, 1, 1, 1, 1, 1, 2};
+  1, 1, 1, 2, 2, 3, 3, 2, 2, 2, 
+  2, 1, 1, 1, 1, 1, 1, 1, 1, 5, 
+  0, 1, 3, 1, 3, 2, 4, 3, 5, 1, 
+  3, 3, 3, 3, 4, 1, 1, 2, 2, 2, 
+  4, 2, 2, 2, 2, 2, 2, 2, 0, 1, 
+  0, 1, 1, 1, 1, 1, 1, 1, 1, 2};
 
 const short QXmlStreamReader_Table::action_default [] = {
-  10, 258, 0, 2, 1, 0, 124, 116, 118, 119, 
-  126, 128, 122, 11, 113, 107, 0, 108, 127, 110, 
-  114, 112, 120, 123, 125, 106, 109, 111, 117, 115, 
-  130, 121, 239, 12, 253, 135, 249, 252, 0, 129, 
-  139, 256, 16, 251, 137, 136, 0, 255, 138, 258, 
-  230, 257, 254, 0, 0, 263, 0, 246, 245, 0, 
-  248, 247, 244, 240, 98, 262, 0, 235, 0, 0, 
-  259, 96, 97, 100, 0, 131, 133, 132, 134, 0, 
-  0, 260, 0, 0, 175, 0, 172, 164, 166, 167, 
-  141, 153, 170, 161, 155, 156, 152, 158, 162, 160, 
-  168, 171, 151, 154, 157, 159, 165, 163, 173, 169, 
-  149, 174, 0, 143, 147, 145, 150, 140, 148, 0, 
-  146, 142, 144, 0, 15, 14, 261, 0, 22, 21, 
-  260, 0, 0, 20, 0, 0, 31, 36, 30, 0, 
-  32, 260, 0, 33, 0, 24, 0, 34, 0, 26, 
-  35, 25, 0, 241, 40, 39, 260, 42, 48, 260, 
-  41, 0, 43, 260, 48, 260, 0, 260, 0, 48, 
-  0, 47, 45, 46, 50, 51, 260, 260, 0, 56, 
-  260, 53, 260, 0, 57, 0, 54, 260, 52, 260, 
-  0, 55, 64, 0, 260, 60, 260, 0, 58, 61, 
-  62, 0, 260, 0, 0, 59, 63, 44, 49, 65, 
-  0, 38, 0, 0, 260, 0, 93, 94, 0, 0, 
-  0, 0, 260, 0, 209, 200, 202, 204, 177, 189, 
-  207, 198, 192, 190, 193, 188, 195, 197, 205, 208, 
-  187, 191, 194, 196, 201, 199, 203, 206, 210, 212, 
-  211, 185, 0, 0, 242, 179, 183, 181, 0, 0, 
-  92, 186, 176, 184, 0, 182, 178, 180, 91, 0, 
-  95, 0, 0, 0, 0, 0, 260, 85, 260, 0, 
-  261, 0, 86, 0, 88, 68, 73, 72, 69, 70, 
-  71, 260, 74, 75, 0, 0, 0, 268, 267, 265, 
-  266, 264, 66, 260, 0, 260, 0, 0, 67, 76, 
-  260, 0, 260, 0, 0, 77, 0, 78, 0, 81, 
-  84, 0, 0, 214, 224, 223, 0, 226, 228, 227, 
-  225, 0, 243, 216, 220, 218, 222, 213, 221, 0, 
-  219, 215, 217, 0, 80, 79, 0, 82, 0, 83, 
-  87, 99, 0, 37, 0, 0, 0, 0, 90, 89, 
-  0, 102, 23, 27, 29, 28, 0, 0, 260, 261, 
-  0, 260, 0, 105, 104, 260, 0, 103, 101, 0, 
-  0, 18, 260, 17, 0, 19, 0, 0, 250, 0, 
-  260, 0, 238, 0, 231, 237, 0, 236, 233, 260, 
-  260, 261, 232, 234, 0, 260, 0, 229, 260, 0, 
-  260, 0, 230, 0, 0, 13, 269, 9, 5, 8, 
-  4, 0, 7, 258, 6, 0, 3};
+  10, 259, 0, 2, 1, 0, 125, 117, 119, 120, 
+  127, 129, 123, 11, 114, 108, 0, 109, 128, 111, 
+  115, 113, 121, 124, 126, 107, 110, 112, 118, 116, 
+  131, 122, 240, 12, 254, 136, 250, 253, 0, 130, 
+  140, 257, 16, 252, 138, 137, 0, 256, 139, 259, 
+  231, 258, 255, 0, 0, 264, 0, 247, 246, 0, 
+  249, 248, 245, 241, 99, 263, 0, 236, 0, 0, 
+  260, 97, 98, 101, 0, 132, 134, 133, 135, 0, 
+  0, 261, 0, 0, 176, 0, 173, 165, 167, 168, 
+  142, 154, 171, 162, 156, 157, 153, 159, 163, 161, 
+  169, 172, 152, 155, 158, 160, 166, 164, 174, 170, 
+  150, 175, 0, 144, 148, 146, 151, 141, 149, 0, 
+  147, 143, 145, 0, 15, 14, 262, 0, 22, 21, 
+  261, 30, 0, 20, 0, 0, 32, 37, 31, 0, 
+  33, 261, 0, 34, 0, 24, 0, 35, 0, 26, 
+  36, 25, 0, 242, 41, 40, 261, 43, 49, 261, 
+  42, 0, 44, 261, 49, 261, 0, 261, 0, 49, 
+  0, 48, 46, 47, 51, 52, 261, 261, 0, 57, 
+  261, 54, 261, 0, 58, 0, 55, 261, 53, 261, 
+  0, 56, 65, 0, 261, 61, 261, 0, 59, 62, 
+  63, 0, 261, 0, 0, 60, 64, 45, 50, 66, 
+  0, 39, 0, 0, 261, 0, 94, 95, 0, 0, 
+  0, 0, 261, 0, 210, 201, 203, 205, 178, 190, 
+  208, 199, 193, 191, 194, 189, 196, 198, 206, 209, 
+  188, 192, 195, 197, 202, 200, 204, 207, 211, 213, 
+  212, 186, 0, 0, 243, 180, 184, 182, 0, 0, 
+  93, 187, 177, 185, 0, 183, 179, 181, 92, 0, 
+  96, 0, 0, 0, 0, 0, 261, 86, 261, 0, 
+  262, 0, 87, 0, 89, 69, 74, 73, 70, 71, 
+  72, 261, 75, 76, 0, 0, 0, 269, 268, 266, 
+  267, 265, 67, 261, 0, 261, 0, 0, 68, 77, 
+  261, 0, 261, 0, 0, 78, 0, 79, 0, 82, 
+  85, 0, 0, 215, 225, 224, 0, 227, 229, 228, 
+  226, 0, 244, 217, 221, 219, 223, 214, 222, 0, 
+  220, 216, 218, 0, 81, 80, 0, 83, 0, 84, 
+  88, 100, 0, 38, 0, 0, 0, 0, 91, 90, 
+  0, 103, 23, 27, 29, 28, 0, 0, 261, 262, 
+  0, 261, 0, 106, 105, 261, 0, 104, 102, 0, 
+  0, 18, 261, 17, 0, 19, 0, 0, 251, 0, 
+  261, 0, 239, 0, 232, 238, 0, 237, 234, 261, 
+  261, 262, 233, 235, 0, 261, 0, 230, 261, 0, 
+  261, 0, 231, 0, 0, 13, 270, 9, 5, 8, 
+  4, 0, 7, 259, 6, 0, 3};
 
 const short QXmlStreamReader_Table::goto_default [] = {
   2, 4, 3, 49, 388, 43, 37, 52, 47, 41, 
@@ -736,8 +736,8 @@ public:
     }
 };
 
-class QXmlStreamEntityResolver;
 
+class QXmlStreamEntityResolver;
 #ifndef QT_NO_XMLSTREAMREADER
 class QXmlStreamReaderPrivate : public QXmlStreamReader_Table, public QXmlStreamPrivateTagStack{
     QXmlStreamReader *q_ptr;
@@ -1355,44 +1355,44 @@ bool QXmlStreamReaderPrivate::parse()
             scanDtd = false;
         break;
 
-        case 36:
+        case 37:
             if (!scanString(spell[EMPTY], EMPTY, false)
                 && !scanString(spell[ANY], ANY, false)
                 && atEnd) {
-                resume(36);
+                resume(37);
                 return false;
             }
         break;
 
-        case 42:
+        case 43:
             if (!scanString(spell[PCDATA], PCDATA, false) && atEnd) {
-                resume(42);
+                resume(43);
                 return false;
             }
         break;
 
-        case 67: {
+        case 68: {
             lastAttributeIsCData = true;
         } break;
 
-        case 77:
+        case 78:
             if (!scanAfterDefaultDecl() && atEnd) {
-                resume(77);
+                resume(78);
                 return false;
             }
         break;
 
-        case 82:
+        case 83:
                 sym(1) = sym(2);
                 lastAttributeValue.clear();
                 lastAttributeIsCData = false;
                 if (!scanAttType() && atEnd) {
-                    resume(82);
+                    resume(83);
                     return false;
                 }
         break;
 
-        case 83: {
+        case 84: {
             DtdAttribute &dtdAttribute = dtdAttributes.push();
             dtdAttribute.tagName.clear();
             dtdAttribute.isCDATA = lastAttributeIsCData;
@@ -1413,7 +1413,7 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 87: {
+        case 88: {
             if (referenceToUnparsedEntityDetected && !standalone)
                 break;
             int n = dtdAttributes.size();
@@ -1433,9 +1433,9 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 88: {
+        case 89: {
             if (!scanPublicOrSystem() && atEnd) {
-                resume(88);
+                resume(89);
                 return false;
             }
             EntityDeclaration &entityDeclaration = entityDeclarations.push();
@@ -1443,9 +1443,9 @@ bool QXmlStreamReaderPrivate::parse()
             entityDeclaration.name = symString(3);
         } break;
 
-        case 89: {
+        case 90: {
             if (!scanPublicOrSystem() && atEnd) {
-                resume(89);
+                resume(90);
                 return false;
             }
             EntityDeclaration &entityDeclaration = entityDeclarations.push();
@@ -1454,9 +1454,9 @@ bool QXmlStreamReaderPrivate::parse()
             entityDeclaration.parameter = true;
         } break;
 
-        case 90: {
+        case 91: {
             if (!scanNData() && atEnd) {
-                resume(90);
+                resume(91);
                 return false;
             }
             EntityDeclaration &entityDeclaration = entityDeclarations.top();
@@ -1464,9 +1464,9 @@ bool QXmlStreamReaderPrivate::parse()
             entityDeclaration.external = true;
         } break;
 
-        case 91: {
+        case 92: {
             if (!scanNData() && atEnd) {
-                resume(91);
+                resume(92);
                 return false;
             }
             EntityDeclaration &entityDeclaration = entityDeclarations.top();
@@ -1475,7 +1475,7 @@ bool QXmlStreamReaderPrivate::parse()
             entityDeclaration.external = true;
         } break;
 
-        case 92: {
+        case 93: {
             EntityDeclaration &entityDeclaration = entityDeclarations.top();
             entityDeclaration.notationName = symString(3);
             if (entityDeclaration.parameter)
@@ -1483,8 +1483,8 @@ bool QXmlStreamReaderPrivate::parse()
         }
         //fall through
 
-        case 93:
-        case 94: {
+        case 94:
+        case 95: {
             if (referenceToUnparsedEntityDetected && !standalone) {
                 entityDeclarations.pop();
                 break;
@@ -1502,7 +1502,7 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 95: {
+        case 96: {
             setType(QXmlStreamReader::ProcessingInstruction);
             int pos = sym(4).pos + sym(4).len;
             processingInstructionTarget = symString(3);
@@ -1515,39 +1515,39 @@ bool QXmlStreamReaderPrivate::parse()
                 else if(!QXmlUtils::isNCName(piTarget))
                     raiseWellFormedError(QXmlStream::tr("%1 is an invalid processing instruction name.").arg(piTarget));
             } else if (type != QXmlStreamReader::Invalid){
-                resume(95);
+                resume(96);
                 return false;
             }
         } break;
 
-        case 96:
+        case 97:
             setType(QXmlStreamReader::ProcessingInstruction);
             processingInstructionTarget = symString(3);
             if (!processingInstructionTarget.toString().compare(QLatin1String("xml"), Qt::CaseInsensitive))
                 raiseWellFormedError(QXmlStream::tr("Invalid processing instruction name."));
         break;
 
-        case 97:
+        case 98:
             if (!scanAfterLangleBang() && atEnd) {
-                resume(97);
+                resume(98);
                 return false;
             }
         break;
 
-        case 98:
+        case 99:
             if (!scanUntil("--")) {
-                resume(98);
+                resume(99);
                 return false;
             }
         break;
 
-        case 99: {
+        case 100: {
             setType(QXmlStreamReader::Comment);
             int pos = sym(1).pos + 4;
             text = QStringRef(&textBuffer, pos, textBuffer.size() - pos - 3);
         } break;
 
-        case 100: {
+        case 101: {
             setType(QXmlStreamReader::Characters);
             isCDATA = true;
 	    isWhitespace = false;
@@ -1555,131 +1555,131 @@ bool QXmlStreamReaderPrivate::parse()
             if (scanUntil("]]>", -1)) {
                 text = QStringRef(&textBuffer, pos, textBuffer.size() - pos - 3);
             } else {
-                resume(100);
+                resume(101);
                 return false;
             }
         } break;
 
-        case 101: {
+        case 102: {
             if (!scanPublicOrSystem() && atEnd) {
-                resume(101);
+                resume(102);
                 return false;
             }
             NotationDeclaration &notationDeclaration = notationDeclarations.push();
             notationDeclaration.name = symString(3);
         } break;
 
-        case 102: {
+        case 103: {
             NotationDeclaration &notationDeclaration = notationDeclarations.top();
             notationDeclaration.systemId = symString(3);
             notationDeclaration.publicId.clear();
         } break;
 
-        case 103: {
+        case 104: {
             NotationDeclaration &notationDeclaration = notationDeclarations.top();
             notationDeclaration.systemId.clear();
             checkPublicLiteral((notationDeclaration.publicId = symString(3)));
         } break;
 
-        case 104: {
+        case 105: {
             NotationDeclaration &notationDeclaration = notationDeclarations.top();
             checkPublicLiteral((notationDeclaration.publicId = symString(3)));
             notationDeclaration.systemId = symString(5);
         } break;
 
-        case 128:
+        case 129:
             isWhitespace = false;
             // fall through
 
-        case 129:
+        case 130:
             sym(1).len += fastScanContentCharList();
             if (atEnd && !inParseEntity) {
-                resume(129);
+                resume(130);
                 return false;
             }
 	break;
 
-        case 138:
+        case 139:
 	    if (!textBuffer.isEmpty()) {
                 setType(QXmlStreamReader::Characters);
                 text = &textBuffer;
 	    }
 	break;
 
-        case 139:
         case 140:
+        case 141:
             clearSym();
         break;
 
-        case 141:
         case 142:
+        case 143:
             sym(1) = sym(2);
         break;
 
-        case 143:
         case 144:
         case 145:
         case 146:
+        case 147:
             sym(1).len += sym(2).len;
         break;
 
-        case 172:
+        case 173:
 	    if (normalizeLiterals)
                 textBuffer.data()[textBuffer.size()-1] = QLatin1Char(' ');
         break;
 
-        case 173:
+        case 174:
             sym(1).len += fastScanLiteralContent();
             if (atEnd) {
-                resume(173);
+                resume(174);
                 return false;
             }
         break;
 
-        case 174: {
+        case 175: {
             if (!QXmlUtils::isPublicID(symString(1).toString())) {
                 raiseWellFormedError(QXmlStream::tr("%1 is an invalid PUBLIC identifier.").arg(symString(1).toString()));
-                resume(174);
+                resume(175);
                 return false;
             }
         } break;
 
-        case 175:
         case 176:
+        case 177:
             clearSym();
         break;
 
-        case 177:
         case 178:
+        case 179:
 	    sym(1) = sym(2);
         break;
 
-        case 179:
         case 180:
         case 181:
         case 182:
+        case 183:
             sym(1).len += sym(2).len;
         break;
 
-        case 212:
         case 213:
+        case 214:
             clearSym();
         break;
 
-        case 214:
         case 215:
+        case 216:
             sym(1) = sym(2);
             lastAttributeValue = symString(1);
         break;
 
-        case 216:
         case 217:
         case 218:
         case 219:
+        case 220:
             sym(1).len += sym(2).len;
         break;
 
-        case 228: {
+        case 229: {
             QStringRef prefix = symPrefix(1);
             if (prefix.isEmpty() && symString(1) == QLatin1String("xmlns") && namespaceProcessing) {
                 NamespaceDeclaration &namespaceDeclaration = namespaceDeclarations.push();
@@ -1749,7 +1749,7 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 234: {
+        case 235: {
             normalizeLiterals = true;
             Tag &tag = tagStack_push();
             prefix = tag.namespaceDeclaration.prefix  = addToStringStorage(symPrefix(2));
@@ -1759,11 +1759,11 @@ bool QXmlStreamReaderPrivate::parse()
                 raiseWellFormedError(QXmlStream::tr("Invalid XML name."));
         } break;
 
-        case 235:
+        case 236:
             isEmptyElement = true;
         // fall through
 
-        case 236:
+        case 237:
             setType(QXmlStreamReader::StartElement);
             resolveTag();
             if (tagStack.size() == 1 && hasSeenTag && !inParseEntity)
@@ -1771,7 +1771,7 @@ bool QXmlStreamReaderPrivate::parse()
             hasSeenTag = true;
         break;
 
-        case 237: {
+        case 238: {
             setType(QXmlStreamReader::EndElement);
             Tag &tag = tagStack_pop();
 
@@ -1782,7 +1782,7 @@ bool QXmlStreamReaderPrivate::parse()
                 raiseWellFormedError(QXmlStream::tr("Opening and ending tag mismatch."));
         } break;
 
-        case 238:
+        case 239:
             if (entitiesMustBeDeclared()) {
                 raiseWellFormedError(QXmlStream::tr("Entity '%1' not declared.").arg(unresolvedEntity));
                 break;
@@ -1791,7 +1791,7 @@ bool QXmlStreamReaderPrivate::parse()
             name = &unresolvedEntity;
 	break;
 
-        case 239: {
+        case 240: {
             sym(1).len += sym(2).len + 1;
             QString reference = symString(2).toString();
             if (entityHash.contains(reference)) {
@@ -1830,7 +1830,7 @@ bool QXmlStreamReaderPrivate::parse()
 
         } break;
 
-        case 240: {
+        case 241: {
             sym(1).len += sym(2).len + 1;
             QString reference = symString(2).toString();
             if (parameterEntityHash.contains(reference)) {
@@ -1849,11 +1849,11 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 241:
+        case 242:
             sym(1).len += sym(2).len + 1;
         break;
 
-        case 242: {
+        case 243: {
             sym(1).len += sym(2).len + 1;
             QString reference = symString(2).toString();
             if (entityHash.contains(reference)) {
@@ -1889,7 +1889,7 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 243: {
+        case 244: {
             if (uint s = resolveCharRef(3)) {
                 if (s >= 0xffff)
                     putStringLiteral(QString::fromUcs4(&s, 1));
@@ -1903,43 +1903,43 @@ bool QXmlStreamReaderPrivate::parse()
             }
         } break;
 
-        case 246:
         case 247:
+        case 248:
             sym(1).len += sym(2).len;
         break;
 
-        case 258:
+        case 259:
             sym(1).len += fastScanSpace();
             if (atEnd) {
-                resume(258);
+                resume(259);
                 return false;
             }
         break;
 
-        case 261: {
+        case 262: {
             sym(1).len += fastScanName(&sym(1).prefix);
             if (atEnd) {
-                resume(261);
+                resume(262);
                 return false;
             }
         } break;
 
-        case 262:
+        case 263:
             sym(1).len += fastScanName();
             if (atEnd) {
-                resume(262);
+                resume(263);
                 return false;
             }
         break;
 
-        case 263:
         case 264:
         case 265:
         case 266:
         case 267:
+        case 268:
             sym(1).len += fastScanNMTOKEN();
             if (atEnd) {
-                resume(267);
+                resume(268);
                 return false;
             }
 
@@ -1958,7 +1958,8 @@ bool QXmlStreamReaderPrivate::parse()
     }
     return false;
 }
+#endif //QT_NO_XMLSTREAMREADER.xml
+
 
-#endif //QT_NO_XMLSTREAMREADER
 #endif // QXMLSTREAM_P_H
 
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index ed29e4e..b65e101 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -123,6 +123,7 @@ public:
         QObject* obj;
         int midx;
         QList<int> params;
+        QStringList argumentMatch;
         QByteArray matchRule;
     };
 
@@ -198,9 +199,6 @@ public:
     QDBusMetaObject *findMetaObject(const QString &service, const QString &path,
                                     const QString &interface, QDBusError &error);
 
-    void registerService(const QString &serviceName);
-    void unregisterService(const QString &serviceName);
-
     void postEventToThread(int action, QObject *target, QEvent *event);
 
     inline void serverConnection(const QDBusConnection &connection)
@@ -237,6 +235,8 @@ public slots:
     void objectDestroyed(QObject *o);
     void relaySignal(QObject *obj, const QMetaObject *, int signalId, const QVariantList &args);
     void _q_serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
+    void registerService(const QString &serviceName);
+    void unregisterService(const QString &serviceName);
 
 signals:
     void serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp
index 414d318..0f9a67f 100644
--- a/src/dbus/qdbusconnectioninterface.cpp
+++ b/src/dbus/qdbusconnectioninterface.cpp
@@ -394,6 +394,12 @@ void QDBusConnectionInterface::disconnectNotify(const char *signalName)
     empty string, it means the name \a name has just been created; if
     \a newOwner is empty, the name \a name has no current owner and is
     no longer available.
+
+    \note connecting to this signal will make the application listen for and
+    receive every single service ownership change on the bus. Depending on
+    how many services are running, this make the application be activated to
+    receive more signals than it needs. To avoid this problem, use the
+    QDBusServiceWatcher class, which can listen for specific changes.
 */
 
 /*!
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 2d27668..40febc4 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -948,9 +948,6 @@ QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p)
 
     rootNode.flags = 0;
     watchedServiceNames[QLatin1String(DBUS_SERVICE_DBUS)] = 1;
-
-    connect(this, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
-            this, SLOT(_q_serviceOwnerChanged(QString,QString,QString)));
 }
 
 QDBusConnectionPrivate::~QDBusConnectionPrivate()
@@ -1180,11 +1177,7 @@ void QDBusConnectionPrivate::relaySignal(QObject *obj, const QMetaObject *mo, in
 void QDBusConnectionPrivate::_q_serviceOwnerChanged(const QString &name,
                                                     const QString &oldOwner, const QString &newOwner)
 {
-    if (oldOwner == baseService)
-        unregisterService(name);
-    if (newOwner == baseService)
-        registerService(name);
-
+    Q_UNUSED(oldOwner);
     QDBusWriteLocker locker(UpdateSignalHookOwnerAction, this);
     QMutableHashIterator<QString, SignalHook> it(signalHooks);
     it.toFront();
@@ -1230,6 +1223,7 @@ bool QDBusConnectionPrivate::prepareHook(QDBusConnectionPrivate::SignalHook &hoo
     hook.owner = owner; // we don't care if the service has an owner yet
     hook.path = path;
     hook.obj = receiver;
+    hook.argumentMatch = argMatch;
 
     // build the D-Bus signal name and signature
     // This should not happen for QDBusConnection::connect, use buildSignature here, since
@@ -1502,6 +1496,24 @@ void QDBusConnectionPrivate::handleSignal(const QString &key, const QDBusMessage
             continue;
         if (hook.signature.isEmpty() && !hook.signature.isNull() && !msg.signature().isEmpty())
             continue;
+        if (!hook.argumentMatch.isEmpty()) {
+            const QVariantList arguments = msg.arguments();
+            if (hook.argumentMatch.size() > arguments.size())
+                continue;
+
+            bool matched = true;
+            for (int i = 0; i < hook.argumentMatch.size(); ++i) {
+                const QString &param = hook.argumentMatch.at(i);
+                if (param.isNull())
+                    continue;   // don't try to match against this
+                if (param == arguments.at(i).toString())
+                    continue;   // matched
+                matched = false;
+                break;
+            }
+            if (!matched)
+                continue;
+        }
 
         activateSignal(hook, msg);
     }
@@ -1636,9 +1648,16 @@ void QDBusConnectionPrivate::setConnection(DBusConnection *dbc, const QDBusError
 
         baseService = QString::fromUtf8(service);
     } else {
-        qWarning("QDBusConnectionPrivate::SetConnection: Unable to get base service");
+        qWarning("QDBusConnectionPrivate::setConnection: Unable to get base service");
     }
 
+    QString busService = QLatin1String(DBUS_SERVICE_DBUS);
+    connectSignal(busService, QString(), QString(), QString(), QLatin1String("NameAcquired"), QStringList(), QString(),
+                  this, SLOT(registerService(QString)));
+    connectSignal(busService, QString(), QString(), QString(), QLatin1String("NameLost"), QStringList(), QString(),
+                  this, SLOT(unregisterService(QString)));
+
+
     q_dbus_connection_add_filter(connection, qDBusSignalFilter, this, 0);
 
     //qDebug("base service: %s", service);
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp
index e028940..d4e90f6 100644
--- a/src/dbus/qdbusserver.cpp
+++ b/src/dbus/qdbusserver.cpp
@@ -69,8 +69,8 @@ QDBusServer::QDBusServer(const QString &address, QObject *parent)
     if (address.isEmpty())
         return;
 
-    QObject::connect(d, SIGNAL(newServerConnection(const QDBusConnection &)),
-                     this, SIGNAL(newConnection(const QDBusConnection &)));
+    QObject::connect(d, SIGNAL(newServerConnection(QDBusConnection)),
+                     this, SIGNAL(newConnection(QDBusConnection)));
 
     // server = q_dbus_server_listen( "unix:tmpdir=/tmp", &error);
     QDBusErrorInternal error;
diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp
index 1557b47..4328558 100644
--- a/src/dbus/qdbusservicewatcher.cpp
+++ b/src/dbus/qdbusservicewatcher.cpp
@@ -50,7 +50,6 @@
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC_WITH_ARGS(QString, busService, (QLatin1String(DBUS_SERVICE_DBUS)))
-Q_GLOBAL_STATIC_WITH_ARGS(QString, busPath, (QLatin1String(DBUS_PATH_DBUS)))
 Q_GLOBAL_STATIC_WITH_ARGS(QString, busInterface, (QLatin1String(DBUS_INTERFACE_DBUS)))
 Q_GLOBAL_STATIC_WITH_ARGS(QString, signalName, (QLatin1String("NameOwnerChanged")))
 
@@ -127,7 +126,7 @@ QStringList QDBusServiceWatcherPrivate::matchArgsForService(const QString &servi
 void QDBusServiceWatcherPrivate::addService(const QString &service)
 {
     QStringList matchArgs = matchArgsForService(service);
-    connection.connect(*busService(), *busPath(), *busInterface(), *signalName(),
+    connection.connect(*busService(), QString(), *busInterface(), *signalName(),
                        matchArgs, QString(), q_func(),
                        SLOT(_q_serviceOwnerChanged(QString,QString,QString)));
 }
@@ -135,7 +134,7 @@ void QDBusServiceWatcherPrivate::addService(const QString &service)
 void QDBusServiceWatcherPrivate::removeService(const QString &service)
 {
     QStringList matchArgs = matchArgsForService(service);
-    connection.disconnect(*busService(), *busPath(), *busInterface(), *signalName(),
+    connection.disconnect(*busService(), QString(), *busInterface(), *signalName(),
                           matchArgs, QString(), q_func(),
                           SLOT(_q_serviceOwnerChanged(QString,QString,QString)));
 }
diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
index 7719469..b964e22 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
@@ -97,8 +97,9 @@ public:
         }
 
         MouseRegion {
-            anchors.fill: parent
+            // change between default and 'back' states
             onClicked: flipable.state = (flipable.state == 'back' ? '' : 'back')
+            anchors.fill: parent
         }
     }
     \endqml
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index 2c03aad..323525b 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE
 #define QML_DEFINE_INTERFACE(INTERFACE) \
     static int defineInterface##INTERFACE = qmlRegisterInterface<INTERFACE>(#INTERFACE);
 
-#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERS, NAME, TYPE, EXTENSION) \
+#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \
     static int registerExtended##TYPE = qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE);
 
 #define QML_DEFINE_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE) \
diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp
index 44a82ef..a9126f6 100644
--- a/src/gui/dialogs/qcolordialog.cpp
+++ b/src/gui/dialogs/qcolordialog.cpp
@@ -1594,8 +1594,8 @@ void QColorDialogPrivate::init(const QColor &initial)
 
     cs = new QColorShower(q);
     QObject::connect(cs, SIGNAL(newCol(QRgb)), q, SLOT(_q_newColorTypedIn(QRgb)));
-    QObject::connect(cs, SIGNAL(currentColorChanged(const QColor&)),
-                     q, SIGNAL(currentColorChanged(const QColor&)));
+    QObject::connect(cs, SIGNAL(currentColorChanged(QColor)),
+                     q, SIGNAL(currentColorChanged(QColor)));
 #if defined(Q_WS_S60)
     if (!nonTouchUI)
         pWidth -= cp->size().width();
@@ -1904,7 +1904,7 @@ void QColorDialog::setVisible(bool visible)
 void QColorDialog::open(QObject *receiver, const char *member)
 {
     Q_D(QColorDialog);
-    connect(this, SIGNAL(colorSelected(const QColor&)), receiver, member);
+    connect(this, SIGNAL(colorSelected(QColor)), receiver, member);
     d->receiverToDisconnectOnClose = receiver;
     d->memberToDisconnectOnClose = member;
     QDialog::open();
@@ -2036,7 +2036,7 @@ void QColorDialog::done(int result)
         d->selectedQColor = QColor();
     }
     if (d->receiverToDisconnectOnClose) {
-        disconnect(this, SIGNAL(colorSelected(const QColor&)),
+        disconnect(this, SIGNAL(colorSelected(QColor)),
                    d->receiverToDisconnectOnClose, d->memberToDisconnectOnClose);
         d->receiverToDisconnectOnClose = 0;
     }
diff --git a/src/gui/dialogs/qcolordialog_mac.mm b/src/gui/dialogs/qcolordialog_mac.mm
index 5f074c0..53d2e1e 100644
--- a/src/gui/dialogs/qcolordialog_mac.mm
+++ b/src/gui/dialogs/qcolordialog_mac.mm
@@ -336,7 +336,6 @@ QT_USE_NAMESPACE
         }
     }
 
-    QAbstractEventDispatcher::instance()->interrupt();
     if (mResultCode == NSCancelButton)
         mPriv->colorDialog()->reject();
     else
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 3b1befd..45a410f 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -691,8 +691,8 @@ QFileDialog::Options QFileDialog::options() const
 void QFileDialog::open(QObject *receiver, const char *member)
 {
     Q_D(QFileDialog);
-    const char *signal = (fileMode() == ExistingFiles) ? SIGNAL(filesSelected(const QStringList&))
-                                                       : SIGNAL(fileSelected(const QString&));
+    const char *signal = (fileMode() == ExistingFiles) ? SIGNAL(filesSelected(QStringList))
+                                                       : SIGNAL(fileSelected(QString));
     connect(this, signal, receiver, member);
     d->signalToDisconnectOnClose = signal;
     d->receiverToDisconnectOnClose = receiver;
@@ -2145,11 +2145,11 @@ void QFileDialogPrivate::createWidgets()
     model->setNameFilterDisables(false);
 #endif
     model->d_func()->disableRecursiveSort = true;
-    QFileDialog::connect(model, SIGNAL(fileRenamed(const QString &, const QString &, const QString &)), q, SLOT(_q_fileRenamed(const QString &, const QString &, const QString &)));
-    QFileDialog::connect(model, SIGNAL(rootPathChanged(const QString &)),
-            q, SLOT(_q_pathChanged(const QString &)));
-    QFileDialog::connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-            q, SLOT(_q_rowsInserted(const QModelIndex &)));
+    QFileDialog::connect(model, SIGNAL(fileRenamed(QString,QString,QString)), q, SLOT(_q_fileRenamed(QString,QString,QString)));
+    QFileDialog::connect(model, SIGNAL(rootPathChanged(QString)),
+            q, SLOT(_q_pathChanged(QString)));
+    QFileDialog::connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            q, SLOT(_q_rowsInserted(QModelIndex)));
     model->setReadOnly(false);
 
     qFileDialogUi.reset(new Ui_QFileDialog());
@@ -2159,8 +2159,8 @@ void QFileDialogPrivate::createWidgets()
     initialBookmarks << QUrl::fromLocalFile(QLatin1String(""))
                      << QUrl::fromLocalFile(QDir::homePath());
     qFileDialogUi->sidebar->init(model, initialBookmarks);
-    QFileDialog::connect(qFileDialogUi->sidebar, SIGNAL(goToUrl(const QUrl &)),
-                         q, SLOT(_q_goToUrl(const QUrl &)));
+    QFileDialog::connect(qFileDialogUi->sidebar, SIGNAL(goToUrl(QUrl)),
+                         q, SLOT(_q_goToUrl(QUrl)));
 
     QObject::connect(qFileDialogUi->buttonBox, SIGNAL(accepted()), q, SLOT(accept()));
     QObject::connect(qFileDialogUi->buttonBox, SIGNAL(rejected()), q, SLOT(reject()));
@@ -2194,8 +2194,8 @@ void QFileDialogPrivate::createWidgets()
     qFileDialogUi->fileTypeCombo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(activated(int)),
                      q, SLOT(_q_useNameFilter(int)));
-    QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(activated(const QString &)),
-                     q, SIGNAL(filterSelected(const QString &)));
+    QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(activated(QString)),
+                     q, SIGNAL(filterSelected(QString)));
 
     qFileDialogUi->listView->init(this);
     qFileDialogUi->listView->setModel(model);
@@ -2221,8 +2221,8 @@ void QFileDialogPrivate::createWidgets()
 
     QActionGroup *showActionGroup = new QActionGroup(q);
     showActionGroup->setExclusive(false);
-    QObject::connect(showActionGroup, SIGNAL(triggered(QAction *)),
-                     q, SLOT(_q_showHeader(QAction *)));;
+    QObject::connect(showActionGroup, SIGNAL(triggered(QAction*)),
+                     q, SLOT(_q_showHeader(QAction*)));;
 
     QAbstractItemModel *abstractModel = model;
 #ifndef QT_NO_PROXYMODEL
@@ -2251,7 +2251,7 @@ void QFileDialogPrivate::createWidgets()
 
     // Selections
     QItemSelectionModel *selections = qFileDialogUi->listView->selectionModel();
-    QObject::connect(selections, SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
+    QObject::connect(selections, SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
                      q, SLOT(_q_selectionChanged()));
     QObject::connect(selections, SIGNAL(currentChanged(QModelIndex,QModelIndex)),
                      q, SLOT(_q_currentChanged(QModelIndex)));
@@ -2289,11 +2289,11 @@ void QFileDialog::setProxyModel(QAbstractProxyModel *proxyModel)
 
     QModelIndex idx = d->rootIndex();
     if (d->proxyModel) {
-        disconnect(d->proxyModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-            this, SLOT(_q_rowsInserted(const QModelIndex &)));
+        disconnect(d->proxyModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(_q_rowsInserted(QModelIndex)));
     } else {
-        disconnect(d->model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-            this, SLOT(_q_rowsInserted(const QModelIndex &)));
+        disconnect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(_q_rowsInserted(QModelIndex)));
     }
 
     if (proxyModel != 0) {
@@ -2306,8 +2306,8 @@ void QFileDialog::setProxyModel(QAbstractProxyModel *proxyModel)
         d->completer->setModel(d->proxyModel);
         d->completer->proxyModel = d->proxyModel;
 #endif
-        connect(d->proxyModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-            this, SLOT(_q_rowsInserted(const QModelIndex &)));
+        connect(d->proxyModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(_q_rowsInserted(QModelIndex)));
     } else {
         d->proxyModel = 0;
         d->qFileDialogUi->listView->setModel(d->model);
@@ -2317,8 +2317,8 @@ void QFileDialog::setProxyModel(QAbstractProxyModel *proxyModel)
         d->completer->sourceModel = d->model;
         d->completer->proxyModel = 0;
 #endif
-        connect(d->model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-            this, SLOT(_q_rowsInserted(const QModelIndex &)));
+        connect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(_q_rowsInserted(QModelIndex)));
     }
     QScopedPointer<QItemSelectionModel> selModel(d->qFileDialogUi->treeView->selectionModel());
     d->qFileDialogUi->treeView->setSelectionModel(d->qFileDialogUi->listView->selectionModel());
@@ -2327,7 +2327,7 @@ void QFileDialog::setProxyModel(QAbstractProxyModel *proxyModel)
 
     // reconnect selection
     QItemSelectionModel *selections = d->qFileDialogUi->listView->selectionModel();
-    QObject::connect(selections, SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
+    QObject::connect(selections, SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
                      this, SLOT(_q_selectionChanged()));
     QObject::connect(selections, SIGNAL(currentChanged(QModelIndex,QModelIndex)),
                      this, SLOT(_q_currentChanged(QModelIndex)));
diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp
index 76d87ae..2729530 100644
--- a/src/gui/dialogs/qfileinfogatherer.cpp
+++ b/src/gui/dialogs/qfileinfogatherer.cpp
@@ -75,8 +75,8 @@ QFileInfoGatherer::QFileInfoGatherer(QObject *parent)
 #endif
 #ifndef QT_NO_FILESYSTEMWATCHER
     watcher = new QFileSystemWatcher(this);
-    connect(watcher, SIGNAL(directoryChanged(const QString &)), this, SLOT(list(const QString &)));
-    connect(watcher, SIGNAL(fileChanged(const QString &)), this, SLOT(updateFile(const QString &)));
+    connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(list(QString)));
+    connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(updateFile(QString)));
 #endif
     start(LowPriority);
 }
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index b9012c7..8e78503 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -1864,12 +1864,12 @@ void QFileSystemModelPrivate::init()
 {
     Q_Q(QFileSystemModel);
     qRegisterMetaType<QList<QPair<QString,QFileInfo> > >("QList<QPair<QString,QFileInfo> >");
-    q->connect(&fileInfoGatherer, SIGNAL(newListOfFiles(const QString &, const QStringList &)),
-               q, SLOT(_q_directoryChanged(const QString &, const QStringList &)));
-    q->connect(&fileInfoGatherer, SIGNAL(updates(const QString &, const QList<QPair<QString, QFileInfo> > &)),
-            q, SLOT(_q_fileSystemChanged(const QString &, const QList<QPair<QString, QFileInfo> > &)));
-    q->connect(&fileInfoGatherer, SIGNAL(nameResolved(const QString &, const QString &)),
-            q, SLOT(_q_resolvedName(const QString &, const QString &)));
+    q->connect(&fileInfoGatherer, SIGNAL(newListOfFiles(QString,QStringList)),
+               q, SLOT(_q_directoryChanged(QString,QStringList)));
+    q->connect(&fileInfoGatherer, SIGNAL(updates(QString,QList<QPair<QString,QFileInfo> >)),
+            q, SLOT(_q_fileSystemChanged(QString,QList<QPair<QString,QFileInfo> >)));
+    q->connect(&fileInfoGatherer, SIGNAL(nameResolved(QString,QString)),
+            q, SLOT(_q_resolvedName(QString,QString)));
     q->connect(&delayedSortTimer, SIGNAL(timeout()), q, SLOT(_q_performDelayedSort()), Qt::QueuedConnection);
 }
 
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp
index 60fae27..d035ef4 100644
--- a/src/gui/dialogs/qfontdialog.cpp
+++ b/src/gui/dialogs/qfontdialog.cpp
@@ -948,7 +948,7 @@ bool QFontDialogPrivate::sharedFontPanelAvailable = true;
 void QFontDialog::open(QObject *receiver, const char *member)
 {
     Q_D(QFontDialog);
-    connect(this, SIGNAL(fontSelected(const QFont&)), receiver, member);
+    connect(this, SIGNAL(fontSelected(QFont)), receiver, member);
     d->receiverToDisconnectOnClose = receiver;
     d->memberToDisconnectOnClose = member;
     QDialog::open();
@@ -1038,7 +1038,7 @@ void QFontDialog::done(int result)
         d->selectedFont = QFont();
     }
     if (d->receiverToDisconnectOnClose) {
-        disconnect(this, SIGNAL(fontSelected(const QFont&)),
+        disconnect(this, SIGNAL(fontSelected(QFont)),
                    d->receiverToDisconnectOnClose, d->memberToDisconnectOnClose);
         d->receiverToDisconnectOnClose = 0;
     }
diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp
index 86213b4..39ce1ab 100644
--- a/src/gui/dialogs/qinputdialog.cpp
+++ b/src/gui/dialogs/qinputdialog.cpp
@@ -95,7 +95,7 @@ class QInputDialogSpinBox : public QSpinBox
 public:
     QInputDialogSpinBox(QWidget *parent)
         : QSpinBox(parent) {
-        connect(lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(notifyTextChanged()));
+        connect(lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(notifyTextChanged()));
         connect(this, SIGNAL(editingFinished()), this, SLOT(notifyTextChanged()));
     }
 
@@ -130,7 +130,7 @@ class QInputDialogDoubleSpinBox : public QDoubleSpinBox
 public:
     QInputDialogDoubleSpinBox(QWidget *parent = 0)
         : QDoubleSpinBox(parent) {
-        connect(lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(notifyTextChanged()));
+        connect(lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(notifyTextChanged()));
         connect(this, SIGNAL(editingFinished()), this, SLOT(notifyTextChanged()));
     }
 
@@ -245,8 +245,8 @@ void QInputDialogPrivate::ensureLineEdit()
     if (!lineEdit) {
         lineEdit = new QLineEdit(q);
         lineEdit->hide();
-        QObject::connect(lineEdit, SIGNAL(textChanged(const QString&)),
-                         q, SLOT(_q_textChanged(const QString&)));
+        QObject::connect(lineEdit, SIGNAL(textChanged(QString)),
+                         q, SLOT(_q_textChanged(QString)));
     }
 }
 
@@ -256,10 +256,10 @@ void QInputDialogPrivate::ensureComboBox()
     if (!comboBox) {
         comboBox = new QComboBox(q);
         comboBox->hide();
-        QObject::connect(comboBox, SIGNAL(editTextChanged(const QString&)),
-                         q, SLOT(_q_textChanged(const QString&)));
-        QObject::connect(comboBox, SIGNAL(currentIndexChanged(const QString&)),
-                         q, SLOT(_q_textChanged(const QString&)));
+        QObject::connect(comboBox, SIGNAL(editTextChanged(QString)),
+                         q, SLOT(_q_textChanged(QString)));
+        QObject::connect(comboBox, SIGNAL(currentIndexChanged(QString)),
+                         q, SLOT(_q_textChanged(QString)));
     }
 }
 
@@ -276,8 +276,8 @@ void QInputDialogPrivate::ensureListView()
         listView->setModel(comboBox->model());
         listView->setCurrentIndex(QModelIndex()); // ###
         QObject::connect(listView->selectionModel(),
-                         SIGNAL(currentRowChanged(const QModelIndex&, const QModelIndex&)),
-                         q, SLOT(_q_currentRowChanged(const QModelIndex&, const QModelIndex&)));
+                         SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
+                         q, SLOT(_q_currentRowChanged(QModelIndex,QModelIndex)));
     }
 }
 
diff --git a/src/gui/dialogs/qprintdialog_qws.cpp b/src/gui/dialogs/qprintdialog_qws.cpp
index 37f01be..05a290d 100644
--- a/src/gui/dialogs/qprintdialog_qws.cpp
+++ b/src/gui/dialogs/qprintdialog_qws.cpp
@@ -266,8 +266,8 @@ void QPrintDialogPrivate::setupDestination()
 
     // print destinations
     printerOrFile = new QButtonGroup(q);
-    QObject::connect(printerOrFile, SIGNAL(buttonClicked(QAbstractButton *)),
-            q, SLOT(_q_printerOrFileSelected(QAbstractButton *)));
+    QObject::connect(printerOrFile, SIGNAL(buttonClicked(QAbstractButton*)),
+            q, SLOT(_q_printerOrFileSelected(QAbstractButton*)));
 
     printToPrinterButton = q->findChild<QRadioButton *>("printToPrinterButton");
     printerOrFile->addButton(printToPrinterButton);
@@ -288,8 +288,8 @@ void QPrintDialogPrivate::setupPrinterSettings()
 
     // color mode
     colorMode = new QButtonGroup(q);
-    QObject::connect(colorMode, SIGNAL(buttonClicked(QAbstractButton *)),
-        q, SLOT(_q_colorModeSelected(QAbstractButton *)));
+    QObject::connect(colorMode, SIGNAL(buttonClicked(QAbstractButton*)),
+        q, SLOT(_q_colorModeSelected(QAbstractButton*)));
 
     printColor = q->findChild<QRadioButton *>("printColor");
     colorMode->addButton(printColor);
diff --git a/src/gui/dialogs/qprintpreviewdialog.cpp b/src/gui/dialogs/qprintpreviewdialog.cpp
index 1f0b51d..bb8437c 100644
--- a/src/gui/dialogs/qprintpreviewdialog.cpp
+++ b/src/gui/dialogs/qprintpreviewdialog.cpp
@@ -224,7 +224,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
         printer = new QPrinter;
         preview = new QPrintPreviewWidget(printer, q);
     }
-    QObject::connect(preview, SIGNAL(paintRequested(QPrinter *)), q, SIGNAL(paintRequested(QPrinter *)));
+    QObject::connect(preview, SIGNAL(paintRequested(QPrinter*)), q, SIGNAL(paintRequested(QPrinter*)));
     QObject::connect(preview, SIGNAL(previewChanged()), q, SLOT(_q_previewChanged()));
     setupActions();
 
diff --git a/src/gui/dialogs/qsidebar.cpp b/src/gui/dialogs/qsidebar.cpp
index 396889d..879d1b1 100644
--- a/src/gui/dialogs/qsidebar.cpp
+++ b/src/gui/dialogs/qsidebar.cpp
@@ -293,20 +293,20 @@ void QUrlModel::setFileSystemModel(QFileSystemModel *model)
     if (model == fileSystemModel)
         return;
     if (fileSystemModel != 0) {
-        disconnect(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
-            this, SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
+        disconnect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+            this, SLOT(dataChanged(QModelIndex,QModelIndex)));
         disconnect(model, SIGNAL(layoutChanged()),
             this, SLOT(layoutChanged()));
-        disconnect(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+        disconnect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
             this, SLOT(layoutChanged()));
     }
     fileSystemModel = model;
     if (fileSystemModel != 0) {
-        connect(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
-            this, SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
+        connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+            this, SLOT(dataChanged(QModelIndex,QModelIndex)));
         connect(model, SIGNAL(layoutChanged()),
             this, SLOT(layoutChanged()));
-        connect(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+        connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
             this, SLOT(layoutChanged()));
     }
     clear();
@@ -381,14 +381,14 @@ void QSidebar::init(QFileSystemModel *model, const QList<QUrl> &newUrls)
     setModel(urlModel);
     setItemDelegate(new QSideBarDelegate(this));
 
-    connect(selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
-            this, SLOT(clicked(const QModelIndex &)));
+    connect(selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+            this, SLOT(clicked(QModelIndex)));
 #ifndef QT_NO_DRAGANDDROP
     setDragDropMode(QAbstractItemView::DragDrop);
 #endif
     setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
-            this, SLOT(showContextMenu(const QPoint &)));
+    connect(this, SIGNAL(customContextMenuRequested(QPoint)),
+            this, SLOT(showContextMenu(QPoint)));
     urlModel->setUrls(newUrls);
     setCurrentIndex(this->model()->index(0,0));
 }
@@ -414,8 +414,8 @@ QSize QSidebar::sizeHint() const
 
 void QSidebar::selectUrl(const QUrl &url)
 {
-    disconnect(selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
-               this, SLOT(clicked(const QModelIndex &)));
+    disconnect(selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+               this, SLOT(clicked(QModelIndex)));
 
     selectionModel()->clear();
     for (int i = 0; i < model()->rowCount(); ++i) {
@@ -425,8 +425,8 @@ void QSidebar::selectUrl(const QUrl &url)
         }
     }
 
-    connect(selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
-            this, SLOT(clicked(const QModelIndex &)));
+    connect(selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+            this, SLOT(clicked(QModelIndex)));
 }
 
 #ifndef QT_NO_MENU
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp
index db1c9e9..472ca35 100644
--- a/src/gui/dialogs/qwizard.cpp
+++ b/src/gui/dialogs/qwizard.cpp
@@ -759,8 +759,8 @@ void QWizardPrivate::addField(const QWizardField &field)
         QObject::connect(myField.object, myField.changedSignal,
                          myField.page, SLOT(_q_maybeEmitCompleteChanged()));
     QObject::connect(
-        myField.object, SIGNAL(destroyed(QObject *)), q,
-        SLOT(_q_handleFieldObjectDestroyed(QObject *)));
+        myField.object, SIGNAL(destroyed(QObject*)), q,
+        SLOT(_q_handleFieldObjectDestroyed(QObject*)));
 }
 
 void QWizardPrivate::removeFieldAt(int index)
@@ -773,8 +773,8 @@ void QWizardPrivate::removeFieldAt(int index)
         QObject::disconnect(field.object, field.changedSignal,
                             field.page, SLOT(_q_maybeEmitCompleteChanged()));
     QObject::disconnect(
-        field.object, SIGNAL(destroyed(QObject *)), q,
-        SLOT(_q_handleFieldObjectDestroyed(QObject *)));
+        field.object, SIGNAL(destroyed(QObject*)), q,
+        SLOT(_q_handleFieldObjectDestroyed(QObject*)));
     fields.remove(index);
 }
 
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index fb67278..a6f5992 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -1272,7 +1272,6 @@ void QGraphicsAnchorLayoutPrivate::createLayoutEdges()
     addAnchor_helper(layout, Qt::AnchorLeft, layout,
                      Qt::AnchorRight, data);
     data->maxSize = QWIDGETSIZE_MAX;
-    data->skipInPreferred = 1;
 
     // Save a reference to layout vertices
     layoutFirstVertex[Horizontal] = internalVertex(layout, Qt::AnchorLeft);
@@ -1284,7 +1283,6 @@ void QGraphicsAnchorLayoutPrivate::createLayoutEdges()
     addAnchor_helper(layout, Qt::AnchorTop, layout,
                      Qt::AnchorBottom, data);
     data->maxSize = QWIDGETSIZE_MAX;
-    data->skipInPreferred = 1;
 
     // Save a reference to layout vertices
     layoutFirstVertex[Vertical] = internalVertex(layout, Qt::AnchorTop);
@@ -2271,13 +2269,21 @@ QList<QSimplexConstraint *> QGraphicsAnchorLayoutPrivate::constraintsFromSizeHin
         layoutEdge = graph[orient].edgeData(layoutFirstVertex[orient], layoutCentralVertex[orient]);
     } else {
         layoutEdge = graph[orient].edgeData(layoutFirstVertex[orient], layoutLastVertex[orient]);
+    }
 
-        // If maxSize is less then "infinite", that means there are other anchors
-        // grouped together with this one. We can't ignore its maximum value so we
-        // set back the variable to NULL to prevent the continue condition from being
-        // satisfied in the loop below.
-        if (layoutEdge->maxSize < QWIDGETSIZE_MAX)
-            layoutEdge = 0;
+    // If maxSize is less then "infinite", that means there are other anchors
+    // grouped together with this one. We can't ignore its maximum value so we
+    // set back the variable to NULL to prevent the continue condition from being
+    // satisfied in the loop below.
+    const qreal expectedMax = layoutCentralVertex[orient] ? QWIDGETSIZE_MAX / 2 : QWIDGETSIZE_MAX;
+    qreal actualMax;
+    if (layoutEdge->from == layoutFirstVertex[orient]) {
+        actualMax = layoutEdge->maxSize;
+    } else {
+        actualMax = -layoutEdge->minSize;
+    }
+    if (actualMax != expectedMax) {
+        layoutEdge = 0;
     }
 
     // For each variable, create constraints based on size hints
@@ -2700,7 +2706,9 @@ bool QGraphicsAnchorLayoutPrivate::solvePreferred(const QList<QSimplexConstraint
     //
     for (int i = 0; i < variables.size(); ++i) {
         AnchorData *ad = variables.at(i);
-        if (ad->skipInPreferred)
+
+        // The layout original structure anchors are not relevant in preferred size calculation
+        if (ad->isLayoutAnchor)
             continue;
 
         QSimplexVariable *grower = new QSimplexVariable;
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index 2b365fb..8529e2e 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -124,8 +124,7 @@ struct AnchorData : public QSimplexVariable {
         : QSimplexVariable(), from(0), to(0),
           minSize(0), prefSize(0), maxSize(0),
           sizeAtMinimum(0), sizeAtPreferred(0),
-          sizeAtMaximum(0), item(0),
-          graphicsAnchor(0), skipInPreferred(0),
+          sizeAtMaximum(0), item(0), graphicsAnchor(0),
           type(Normal), isLayoutAnchor(false),
           isCenterAnchor(false), orientation(0),
           dependency(Independent) {}
@@ -169,7 +168,6 @@ struct AnchorData : public QSimplexVariable {
     QGraphicsLayoutItem *item;
     QGraphicsAnchor *graphicsAnchor;
 
-    uint skipInPreferred : 1;
     uint type : 2;            // either Normal, Sequential or Parallel
     uint isLayoutAnchor : 1;  // if this anchor is an internal layout anchor
     uint isCenterAnchor : 1;
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 3f6dff2..94a37a0 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -52,7 +52,7 @@
     painting implementation and item interaction through its event handlers.
     QGraphicsItem is part of \l{The Graphics View Framework}
 
-    \img graphicsview-items.png
+    \image graphicsview-items.png
 
     For convenience, Qt provides a set of standard graphics items for the most
     common shapes. These are:
@@ -378,14 +378,14 @@
     it's parent if it's z-value is negative. This flag enables setZValue() to
     toggle ItemStacksBehindParent.
 
-    \value ItemIsPanel. The item is a panel. A panel provides activation and
+    \value ItemIsPanel The item is a panel. A panel provides activation and
     contained focus handling. Only one panel can be active at a time (see
     QGraphicsItem::isActive()). When no panel is active, QGraphicsScene
     activates all non-panel items. Window items (i.e.,
     QGraphicsItem::isWindow() returns true) are panels. This flag was
     introduced in Qt 4.6.
 
-    \omitvalue ItemIsFocusScope Internal only (for now).
+    \omitvalue ItemIsFocusScope \omit Internal only (for now). \endomit
 
     \value ItemSendsScenePositionChanges The item enables itemChange()
     notifications for ItemScenePositionHasChanged. For performance reasons,
@@ -1240,7 +1240,7 @@ void QGraphicsItemPrivate::initStyleOption(QStyleOptionGraphicsItem *option, con
         const QTransform reverseMap = worldTransform.inverted();
         const QVector<QRect> exposedRects(exposedRegion.rects());
         for (int i = 0; i < exposedRects.size(); ++i) {
-            option->exposedRect |= reverseMap.mapRect(exposedRects.at(i));
+            option->exposedRect |= reverseMap.mapRect(QRectF(exposedRects.at(i)));
             if (option->exposedRect.contains(brect))
                 break;
         }
diff --git a/src/gui/graphicsview/qgraphicsitemanimation.cpp b/src/gui/graphicsview/qgraphicsitemanimation.cpp
index be2f300..b67ee2e 100644
--- a/src/gui/graphicsview/qgraphicsitemanimation.cpp
+++ b/src/gui/graphicsview/qgraphicsitemanimation.cpp
@@ -45,6 +45,7 @@
     support for QGraphicsItem.
     \since 4.2
     \ingroup graphicsview-api
+    \deprecated
 
     The QGraphicsItemAnimation class animates a QGraphicsItem. You can
     schedule changes to the item's transformation matrix at
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 5b0643d..10d251d 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -2556,11 +2556,9 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
     item->d_ptr->resolveFont(d->font.resolve());
     item->d_ptr->resolvePalette(d->palette.resolve());
 
-    if (!item->d_ptr->explicitlyHidden) {
-       if (d->unpolishedItems.isEmpty())
-           QMetaObject::invokeMethod(this, "_q_polishItems", Qt::QueuedConnection);
-       d->unpolishedItems.insert(item);
-    }
+   if (d->unpolishedItems.isEmpty())
+       QMetaObject::invokeMethod(this, "_q_polishItems", Qt::QueuedConnection);
+   d->unpolishedItems.insert(item);
 
     // Reenable selectionChanged() for individual items
     --d->selectionChanging;
@@ -4422,9 +4420,12 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte
         bool allowPartialCacheExposure = !viewRect.contains(deviceRect);
 #else
         // Only if deviceRect is 20% taller or wider than the desktop.
-        QRect desktopRect = QApplication::desktop()->availableGeometry(widget);
-        bool allowPartialCacheExposure = (desktopRect.width() * 1.2 < deviceRect.width()
-                                          || desktopRect.height() * 1.2 < deviceRect.height());
+        bool allowPartialCacheExposure = false;
+        if (widget) {
+            QRect desktopRect = QApplication::desktop()->availableGeometry(widget);
+            allowPartialCacheExposure = (desktopRect.width() * 1.2 < deviceRect.width()
+                                         || desktopRect.height() * 1.2 < deviceRect.height());
+        }
 #endif
         QRegion scrollExposure;
         if (deviceData->cacheIndent != QPoint() || allowPartialCacheExposure) {
diff --git a/src/gui/graphicsview/qgraphicssceneindex.cpp b/src/gui/graphicsview/qgraphicssceneindex.cpp
index f0404fd..70ecd49 100644
--- a/src/gui/graphicsview/qgraphicssceneindex.cpp
+++ b/src/gui/graphicsview/qgraphicssceneindex.cpp
@@ -354,8 +354,8 @@ void QGraphicsSceneIndexPrivate::init()
     if (!scene)
         return;
 
-    QObject::connect(scene, SIGNAL(sceneRectChanged(const QRectF&)),
-                     q_func(), SLOT(updateSceneRect(const QRectF&)));
+    QObject::connect(scene, SIGNAL(sceneRectChanged(QRectF)),
+                     q_func(), SLOT(updateSceneRect(QRectF)));
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicsview_p.h b/src/gui/graphicsview/qgraphicsview_p.h
index 762cad1..cd161ad 100644
--- a/src/gui/graphicsview/qgraphicsview_p.h
+++ b/src/gui/graphicsview/qgraphicsview_p.h
@@ -172,10 +172,17 @@ public:
 
     inline void dispatchPendingUpdateRequests()
     {
+#ifndef Q_WS_MAC
+        // QWidget::update() works slightly different on the Mac; it's not part of
+        // our backing store so it needs special threatment.
         if (qt_widget_private(viewport)->paintOnScreen())
             QCoreApplication::sendPostedEvents(viewport, QEvent::UpdateRequest);
         else
             QCoreApplication::sendPostedEvents(viewport->window(), QEvent::UpdateRequest);
+#else
+        QCoreApplication::processEvents(QEventLoop::AllEvents | QEventLoop::ExcludeSocketNotifiers
+                                        | QEventLoop::ExcludeUserInputEvents);
+#endif
     }
 
     bool updateRect(const QRect &rect);
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 7c24002..4215f97 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -54,4 +54,4 @@ 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"
+symbian-sbsv2: QMAKE_LFLAGS.ARMCC += --rw-base 0x800000"
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index 15af7a2..ad9bdd0 100644
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -249,21 +249,19 @@ QThemeIconEntries QIconLoader::findIconHelper(const QString &themeName,
         const QIconDirInfo &dirInfo = subDirs.at(i);
         QString subdir = dirInfo.path;
         QDir currentDir(contentDir + subdir);
-
-        if (dirInfo.type == QIconDirInfo::Scalable && m_supportsSvg &&
-            currentDir.exists(iconName + svgext)) {
-            ScalableEntry *iconEntry = new ScalableEntry;
-            iconEntry->dir = dirInfo;
-            iconEntry->filename = currentDir.filePath(iconName + svgext);
-            entries.append(iconEntry);
-
-        } else if (currentDir.exists(iconName + pngext)) {
+        if (currentDir.exists(iconName + pngext)) {
             PixmapEntry *iconEntry = new PixmapEntry;
             iconEntry->dir = dirInfo;
             iconEntry->filename = currentDir.filePath(iconName + pngext);
             // Notice we ensure that pixmap entries allways come before
             // scalable to preserve search order afterwards
             entries.prepend(iconEntry);
+        } else if (m_supportsSvg &&
+            currentDir.exists(iconName + svgext)) {
+            ScalableEntry *iconEntry = new ScalableEntry;
+            iconEntry->dir = dirInfo;
+            iconEntry->filename = currentDir.filePath(iconName + svgext);
+            entries.append(iconEntry);
         }
     }
 
@@ -444,10 +442,8 @@ QIconLoaderEngineEntry *QIconLoaderEngine::entryForSize(const QSize &size)
 
 /*
  * Returns the actual icon size. For scalable svg's this is equivalent
- * to the requested size. Otherwise the closest match is returned.
- *
- * todo: the spec is a bit fuzzy in this area, but we should probably
- * allow scaling down pixmap icons as well.
+ * to the requested size. Otherwise the closest match is returned but
+ * we can never return a bigger size than the requested size.
  *
  */
 QSize QIconLoaderEngine::actualSize(const QSize &size, QIcon::Mode mode,
@@ -460,8 +456,10 @@ QSize QIconLoaderEngine::actualSize(const QSize &size, QIcon::Mode mode,
         const QIconDirInfo &dir = entry->dir;
         if (dir.type == QIconDirInfo::Scalable)
             return size;
-        else
-            return QSize(dir.size, dir.size);
+        else {
+            int result = qMin<int>(dir.size, qMin(size.width(), size.height()));
+            return QSize(result, result);
+        }
     }
     return QIconEngineV2::actualSize(size, mode, state);
 }
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index e4ea2e9..3b43ab6 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -178,6 +178,8 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
     if (ok) {
         xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0);
         xshminfo.shmaddr = xshmimg->data;
+        if (shmctl(xshminfo.shmid, IPC_RMID, 0) == -1)
+            qWarning() << "Error while marking the shared memory segment to be destroyed";
         ok = (xshminfo.shmaddr != (char*)-1);
         if (ok)
             image = QImage((uchar *)xshmimg->data, width, height, systemFormat());
diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp
index 6175931..365c271 100644
--- a/src/gui/image/qpixmap_mac.cpp
+++ b/src/gui/image/qpixmap_mac.cpp
@@ -160,8 +160,8 @@ QSet<QMacPixmapData*> QMacPixmapData::validDataPointers;
 
 QMacPixmapData::QMacPixmapData(PixelType type)
     : QPixmapData(type, MacClass), has_alpha(0), has_mask(0),
-      uninit(true), pixels(0), pixelsToFree(0), bytesPerRow(0),
-      cg_data(0), cg_dataBeingReleased(0), cg_mask(0),
+      uninit(true), pixels(0), pixelsSize(0), pixelsToFree(0),
+      bytesPerRow(0), cg_data(0), cg_dataBeingReleased(0), cg_mask(0),
       pengine(0)
 {
 }
@@ -637,8 +637,9 @@ void QMacPixmapData::macCreatePixels()
     }
 
     if (pixels)
-        memcpy(base_pixels, pixels, numBytes);
+        memcpy(base_pixels, pixels, pixelsSize);
     pixels = base_pixels;
+    pixelsSize = numBytes;
 }
 
 #if 0
diff --git a/src/gui/image/qpixmap_mac_p.h b/src/gui/image/qpixmap_mac_p.h
index a3fb95f..45ab8e2 100644
--- a/src/gui/image/qpixmap_mac_p.h
+++ b/src/gui/image/qpixmap_mac_p.h
@@ -107,6 +107,7 @@ private:
            pixelsToFree later on instead of malloc'ing memory.
     */
     quint32 *pixels;
+    uint pixelsSize;
     quint32 *pixelsToFree;
     uint bytesPerRow;
     QRectF cg_mask_rect;
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index 17baa50..dc33ade 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -977,4 +977,9 @@ void QS60PixmapData::fromNativeType(void* pixmap, NativeType nativeType)
     }
 }
 
+QPixmapData *QS60PixmapData::createCompatiblePixmapData() const
+{
+    return new QS60PixmapData(pixelType());
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/image/qpixmap_s60_p.h b/src/gui/image/qpixmap_s60_p.h
index b1b5824..8631ebd 100644
--- a/src/gui/image/qpixmap_s60_p.h
+++ b/src/gui/image/qpixmap_s60_p.h
@@ -87,6 +87,8 @@ public:
     QS60PixmapData(PixelType type);
     ~QS60PixmapData();
 
+    QPixmapData *createCompatiblePixmapData() const;
+
     void resize(int width, int height);
     void fromImage(const QImage &image, Qt::ImageConversionFlags flags);
     void copy(const QPixmapData *data, const QRect &rect);
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 23bef12..ad15655 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -96,6 +96,7 @@ QAbstractItemViewPrivate::QAbstractItemViewPrivate()
         autoScrollMargin(16),
         autoScrollCount(0),
         shouldScrollToCurrentOnShow(false),
+        shouldClearStatusTip(false),
         alternatingColors(false),
         textElideMode(Qt::ElideRight),
         verticalScrollMode(QAbstractItemView::ScrollPerItem),
@@ -138,10 +139,22 @@ void QAbstractItemViewPrivate::init()
 #endif
 }
 
+void QAbstractItemViewPrivate::setHoverIndex(const QPersistentModelIndex &index)
+{
+    Q_Q(QAbstractItemView);
+    if (hover == index)
+        return;
+
+    q->update(hover); //update the old one
+    hover = index;
+    q->update(hover); //update the new one
+}
+
 void QAbstractItemViewPrivate::checkMouseMove(const QPersistentModelIndex &index)
 {
     //we take a persistent model index because the model might change by emitting signals
     Q_Q(QAbstractItemView);
+    setHoverIndex(index);
     if (viewportEnteredNeeded || enteredIndex != index) {
         viewportEnteredNeeded = false;
 
@@ -149,14 +162,15 @@ void QAbstractItemViewPrivate::checkMouseMove(const QPersistentModelIndex &index
             emit q->entered(index);
 #ifndef QT_NO_STATUSTIP
             QString statustip = model->data(index, Qt::StatusTipRole).toString();
-            if (parent && !statustip.isEmpty()) {
+            if (parent && (shouldClearStatusTip || !statustip.isEmpty())) {
                 QStatusTipEvent tip(statustip);
                 QApplication::sendEvent(parent, &tip);
+                shouldClearStatusTip = !statustip.isEmpty();
             }
 #endif
         } else {
 #ifndef QT_NO_STATUSTIP
-            if (parent) {
+            if (parent && shouldClearStatusTip) {
                 QString emptyString;
                 QStatusTipEvent tip( emptyString );
                 QApplication::sendEvent(parent, &tip);
@@ -1536,26 +1550,25 @@ bool QAbstractItemView::viewportEvent(QEvent *event)
 {
     Q_D(QAbstractItemView);
     switch (event->type()) {
-    case QEvent::HoverEnter: {
-        QHoverEvent *he = static_cast<QHoverEvent*>(event);
-        d->hover = indexAt(he->pos());
-        update(d->hover);
-        break; }
-    case QEvent::HoverLeave: {
-        update(d->hover); // update old
-        d->hover = QModelIndex();
-        break; }
-    case QEvent::HoverMove: {
-        QHoverEvent *he = static_cast<QHoverEvent*>(event);
-        QModelIndex old = d->hover;
-        d->hover = indexAt(he->pos());
-        if (d->hover != old)
-            d->viewport->update(visualRect(old)|visualRect(d->hover));
-        break; }
+    case QEvent::HoverMove:
+    case QEvent::HoverEnter:
+        d->setHoverIndex(indexAt(static_cast<QHoverEvent*>(event)->pos()));
+        break;
+    case QEvent::HoverLeave:
+        d->setHoverIndex(QModelIndex());
+        break;
     case QEvent::Enter:
         d->viewportEnteredNeeded = true;
         break;
     case QEvent::Leave:
+    #ifndef QT_NO_STATUSTIP
+        if (d->shouldClearStatusTip && d->parent) {
+            QString empty;
+            QStatusTipEvent tip(empty);
+            QApplication::sendEvent(d->parent, &tip);
+            d->shouldClearStatusTip = false;
+        }
+    #endif
         d->enteredIndex = QModelIndex();
         break;
     case QEvent::ToolTip:
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index c691f61..0b5cfbe 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -152,6 +152,8 @@ public:
                                                                    const QEvent *event) const;
     virtual void selectAll(QItemSelectionModel::SelectionFlags command);
 
+    void setHoverIndex(const QPersistentModelIndex &index);
+
     void checkMouseMove(const QPersistentModelIndex &index);
     inline void checkMouseMove(const QPoint &pos) { checkMouseMove(q_func()->indexAt(pos)); }
 
@@ -394,6 +396,7 @@ public:
     int autoScrollMargin;
     int autoScrollCount;
     bool shouldScrollToCurrentOnShow; //used to know if we should scroll to current on show event
+    bool shouldClearStatusTip; //if there is a statustip currently shown that need to be cleared when leaving.
 
     bool alternatingColors;
 
diff --git a/src/gui/itemviews/qcolumnview.cpp b/src/gui/itemviews/qcolumnview.cpp
index d27d061..da3e5a0 100644
--- a/src/gui/itemviews/qcolumnview.cpp
+++ b/src/gui/itemviews/qcolumnview.cpp
@@ -672,8 +672,8 @@ QAbstractItemView *QColumnViewPrivate::createColumn(const QModelIndex &index, bo
     QAbstractItemView *view = 0;
     if (model->hasChildren(index)) {
         view = q->createColumn(index);
-        q->connect(view, SIGNAL(clicked(const QModelIndex &)),
-                   q, SLOT(_q_clicked(const QModelIndex &)));
+        q->connect(view, SIGNAL(clicked(QModelIndex)),
+                   q, SLOT(_q_clicked(QModelIndex)));
     } else {
         if (!previewColumn)
             setPreviewWidget(new QWidget(q));
@@ -681,16 +681,16 @@ QAbstractItemView *QColumnViewPrivate::createColumn(const QModelIndex &index, bo
         view->setMinimumWidth(qMax(view->minimumWidth(), previewWidget->minimumWidth()));
     }
 
-    q->connect(view, SIGNAL(activated(const QModelIndex &)),
-            q, SIGNAL(activated(const QModelIndex &)));
-    q->connect(view, SIGNAL(clicked(const QModelIndex &)),
-            q, SIGNAL(clicked(const QModelIndex &)));
-    q->connect(view, SIGNAL(doubleClicked(const QModelIndex &)),
-            q, SIGNAL(doubleClicked(const QModelIndex &)));
-    q->connect(view, SIGNAL(entered(const QModelIndex &)),
-            q, SIGNAL(entered(const QModelIndex &)));
-    q->connect(view, SIGNAL(pressed(const QModelIndex &)),
-            q, SIGNAL(pressed(const QModelIndex &)));
+    q->connect(view, SIGNAL(activated(QModelIndex)),
+            q, SIGNAL(activated(QModelIndex)));
+    q->connect(view, SIGNAL(clicked(QModelIndex)),
+            q, SIGNAL(clicked(QModelIndex)));
+    q->connect(view, SIGNAL(doubleClicked(QModelIndex)),
+            q, SIGNAL(doubleClicked(QModelIndex)));
+    q->connect(view, SIGNAL(entered(QModelIndex)),
+            q, SIGNAL(entered(QModelIndex)));
+    q->connect(view, SIGNAL(pressed(QModelIndex)),
+            q, SIGNAL(pressed(QModelIndex)));
 
     view->setFocusPolicy(Qt::NoFocus);
     view->setParent(viewport);
diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp
index 6f2cff9..6f0fba6 100644
--- a/src/gui/itemviews/qheaderview.cpp
+++ b/src/gui/itemviews/qheaderview.cpp
@@ -1913,7 +1913,6 @@ void QHeaderView::initializeSections(int start, int end)
     Q_ASSERT(start >= 0);
     Q_ASSERT(end >= 0);
 
-    d->executePostedLayout();
     d->invalidateCachedSizeHint();
 
     if (end + 1 < d->sectionCount) {
@@ -1939,11 +1938,25 @@ void QHeaderView::initializeSections(int start, int end)
     d->sectionCount = end + 1;
 
     if (!d->logicalIndices.isEmpty()) {
-        d->logicalIndices.resize(d->sectionCount);
-        d->visualIndices.resize(d->sectionCount);
-        for (int i = start; i < d->sectionCount; ++i){
-            d->logicalIndices[i] = i;
-            d->visualIndices[i] = i;
+        if (oldCount <= d->sectionCount) {
+            d->logicalIndices.resize(d->sectionCount);
+            d->visualIndices.resize(d->sectionCount);
+            for (int i = oldCount; i < d->sectionCount; ++i) {
+                d->logicalIndices[i] = i;
+                d->visualIndices[i] = i;
+            }
+        } else {
+            int j = 0;
+            for (int i = 0; i < oldCount; ++i) {
+                int v = d->logicalIndices.at(i);
+                if (v < d->sectionCount) {
+                    d->logicalIndices[j] = v;
+                    d->visualIndices[v] = j;
+                    j++;
+                }
+            }
+            d->logicalIndices.resize(d->sectionCount);
+            d->visualIndices.resize(d->sectionCount);
         }
     }
 
@@ -2396,7 +2409,12 @@ bool QHeaderView::viewportEvent(QEvent *e)
         d->state = QHeaderViewPrivate::NoState;
         d->pressed = d->section = d->target = -1;
         d->updateSectionIndicator(d->section, -1);
-    }
+        break; }
+    case QEvent::Wheel: {
+        QAbstractScrollArea *asa = qobject_cast<QAbstractScrollArea *>(parentWidget());
+        if (asa)
+            return QApplication::sendEvent(asa->viewport(), e);
+        break; }
     default:
         break;
     }
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp
index c6622cb..d03cdd3 100644
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
@@ -773,7 +773,7 @@ void QListView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
 void QListView::mouseMoveEvent(QMouseEvent *e)
 {
     if (!isVisible())
-	return;
+        return;
     Q_D(QListView);
     QAbstractItemView::mouseMoveEvent(e);
     if (state() == DragSelectingState
@@ -832,16 +832,16 @@ void QListView::resizeEvent(QResizeEvent *e)
       return;
 
     bool listWrap = (d->viewMode == ListMode) && d->wrapItemText;
-    bool flowDimensionChanged = (d->flow == LeftToRight && delta.width() != 0) 
-				|| (d->flow == TopToBottom && delta.height() != 0);
+    bool flowDimensionChanged = (d->flow == LeftToRight && delta.width() != 0)
+                                || (d->flow == TopToBottom && delta.height() != 0);
 
     // We post a delayed relayout in the following cases :
     // - we're wrapping
     // - the state is NoState, we're adjusting and the size has changed in the flowing direction
-    if (listWrap 
+    if (listWrap
         || (state() == NoState && d->resizeMode == Adjust && flowDimensionChanged)) {
-	d->doDelayedItemsLayout(100); // wait 1/10 sec before starting the layout
-    } else {	
+        d->doDelayedItemsLayout(100); // wait 1/10 sec before starting the layout
+    } else {
         QAbstractItemView::resizeEvent(e);
     }
 }
@@ -966,15 +966,19 @@ void QListView::paintEvent(QPaintEvent *e)
     bool alternateBase = false;
     int previousRow = -2; // trigger the alternateBase adjustment on first pass
 
+    int maxSize = (flow() == TopToBottom)
+        ? qMax(viewport()->size().width(), d->contentsSize().width()) - 2 * d->spacing()
+        : qMax(viewport()->size().height(), d->contentsSize().height()) - 2 * d->spacing();
+
     QVector<QModelIndex>::const_iterator end = toBeRendered.constEnd();
     for (QVector<QModelIndex>::const_iterator it = toBeRendered.constBegin(); it != end; ++it) {
         Q_ASSERT((*it).isValid());
         option.rect = visualRect(*it);
 
         if (flow() == TopToBottom)
-            option.rect.setWidth(qMin(d->contentsSize().width() - 2 * d->spacing(), option.rect.width()));
+            option.rect.setWidth(qMin(maxSize, option.rect.width()));
         else
-            option.rect.setHeight(qMin(d->contentsSize().height() - 2 * d->spacing(), option.rect.height()));
+            option.rect.setHeight(qMin(maxSize, option.rect.height()));
 
         option.state = state;
         if (selections && selections->isSelected(*it))
@@ -1147,7 +1151,9 @@ QModelIndex QListView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
         }
         return d->closestIndex(initialRect, intersectVector);
     case MovePageUp:
-        rect.moveTop(rect.top() - d->viewport->height());
+        // move current by (visibileRowCount - 1) items.
+        // rect.translate(0, -rect.height()); will happen in the switch fallthrough for MoveUp.
+        rect.moveTop(rect.top() - d->viewport->height() + 2 * rect.height());
         if (rect.top() < rect.height())
             rect.moveTop(rect.height());
     case MovePrevious:
@@ -1173,7 +1179,9 @@ QModelIndex QListView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
         }
         return d->closestIndex(initialRect, intersectVector);
     case MovePageDown:
-        rect.moveTop(rect.top() + d->viewport->height());
+        // move current by (visibileRowCount - 1) items.
+        // rect.translate(0, rect.height()); will happen in the switch fallthrough for MoveDown.
+        rect.moveTop(rect.top() + d->viewport->height() - 2 * rect.height());
         if (rect.bottom() > contents.height() - rect.height())
             rect.moveBottom(contents.height() - rect.height());
     case MoveNext:
@@ -1445,7 +1453,7 @@ void QListView::doItemsLayout()
     // so we set the state to expanding to avoid
     // triggering another layout
     QAbstractItemView::State oldState = state();
-    setState(ExpandingState); 
+    setState(ExpandingState);
     if (d->model->columnCount(d->root) > 0) { // no columns means no contents
         d->resetBatchStartRow();
         if (layoutMode() == SinglePass)
diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp
index 02e5fff..d27e693 100644
--- a/src/gui/itemviews/qtableview.cpp
+++ b/src/gui/itemviews/qtableview.cpp
@@ -114,7 +114,7 @@ void QSpanCollection::updateSpan(QSpanCollection::Span *span, int old_height)
         }
     } else if (old_height > span->height()) {
         //remove the span from all the subspans lists that intersect the columns not covered anymore
-        Index::iterator it_y = index.lowerBound(-span->bottom());
+        Index::iterator it_y = index.lowerBound(qMin(-span->bottom(), 0));
         Q_ASSERT(it_y != index.end()); //it_y must exist since the span is in the list
         while (-it_y.key() <= span->top() + old_height -1) {
             if (-it_y.key() > span->bottom()) {
@@ -1064,14 +1064,29 @@ QTableView::~QTableView()
 void QTableView::setModel(QAbstractItemModel *model)
 {
     Q_D(QTableView);
-    connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
-            this, SLOT(_q_updateSpanInsertedRows(QModelIndex,int,int)));
-    connect(model, SIGNAL(columnsInserted(QModelIndex,int,int)),
-            this, SLOT(_q_updateSpanInsertedColumns(QModelIndex,int,int)));
-    connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
-            this, SLOT(_q_updateSpanRemovedRows(QModelIndex,int,int)));
-    connect(model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
-            this, SLOT(_q_updateSpanRemovedColumns(QModelIndex,int,int)));
+    if (model == d->model)
+        return;
+    //let's disconnect from the old model
+    if (d->model && d->model != QAbstractItemModelPrivate::staticEmptyModel()) {
+        disconnect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+                this, SLOT(_q_updateSpanInsertedRows(QModelIndex,int,int)));
+        disconnect(d->model, SIGNAL(columnsInserted(QModelIndex,int,int)),
+                this, SLOT(_q_updateSpanInsertedColumns(QModelIndex,int,int)));
+        disconnect(d->model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+                this, SLOT(_q_updateSpanRemovedRows(QModelIndex,int,int)));
+        disconnect(d->model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+                this, SLOT(_q_updateSpanRemovedColumns(QModelIndex,int,int)));
+    }
+    if (model) { //and connect to the new one
+        connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+                this, SLOT(_q_updateSpanInsertedRows(QModelIndex,int,int)));
+        connect(model, SIGNAL(columnsInserted(QModelIndex,int,int)),
+                this, SLOT(_q_updateSpanInsertedColumns(QModelIndex,int,int)));
+        connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+                this, SLOT(_q_updateSpanRemovedRows(QModelIndex,int,int)));
+        connect(model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+                this, SLOT(_q_updateSpanRemovedColumns(QModelIndex,int,int)));
+    }
     d->verticalHeader->setModel(model);
     d->horizontalHeader->setModel(model);
     QAbstractItemView::setModel(model);
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index a3cbc0d..3ad9fbb 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -215,6 +215,13 @@ void QTreeView::setModel(QAbstractItemModel *model)
     Q_D(QTreeView);
     if (model == d->model)
         return;
+    if (d->model && d->model != QAbstractItemModelPrivate::staticEmptyModel()) {
+        disconnect(d->model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+                this, SLOT(rowsRemoved(QModelIndex,int,int)));
+
+        disconnect(d->model, SIGNAL(modelAboutToBeReset()), this, SLOT(_q_modelAboutToBeReset()));
+    }
+
     if (d->selectionModel) { // support row editing
         disconnect(d->selectionModel, SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
                    d->model, SLOT(submit()));
@@ -838,10 +845,10 @@ void QTreeView::setSortingEnabled(bool enable)
         // because otherwise it will not call sort on the model.
         sortByColumn(header()->sortIndicatorSection(), header()->sortIndicatorOrder());
         connect(header(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)),
-                this, SLOT(_q_sortIndicatorChanged(int, Qt::SortOrder)), Qt::UniqueConnection);
+                this, SLOT(_q_sortIndicatorChanged(int,Qt::SortOrder)), Qt::UniqueConnection);
     } else {
         disconnect(header(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)),
-                   this, SLOT(_q_sortIndicatorChanged(int, Qt::SortOrder)));
+                   this, SLOT(_q_sortIndicatorChanged(int,Qt::SortOrder)));
     }
     d->sortingEnabled = enable;
 }
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index c133ae4..948ca79 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -1580,7 +1580,7 @@ void QTreeWidgetItem::setChildIndicatorPolicy(QTreeWidgetItem::ChildIndicatorPol
     if (!view)
         return;
 
-    view->viewport()->update( view->d_func()->itemDecorationRect(view->d_func()->index(this)));
+    view->scheduleDelayedItemsLayout();
 }
 
 /*!
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 8859358..7d0e5c7 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -188,9 +188,8 @@ embedded {
             HEADERS += \
                 kernel/qeventdispatcher_glib_qws_p.h
             QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
+            LIBS_PRIVATE +=$$QT_LIBS_GLIB
 	}
-
-
 }
 
 !embedded:!x11:mac {
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 4b8f6a0..9f4cd0c 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -933,7 +933,8 @@ void QApplicationPrivate::initialize()
     QApplicationPrivate::wheel_scroll_lines = 3;
 #endif
 
-    initializeMultitouch();
+    if (qt_is_gui_used)
+        initializeMultitouch();
 }
 
 /*!
@@ -4105,8 +4106,17 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
             } else if (widget->isWindow() || widget->testAttribute(Qt::WA_NoMousePropagation)) {
                 break;
             }
+            QPoint offset = widget->pos();
             widget = widget->parentWidget();
-            d->updateTouchPointsForWidget(widget, touchEvent);
+            touchEvent->setWidget(widget);
+            for (int i = 0; i < touchEvent->_touchPoints.size(); ++i) {
+                QTouchEvent::TouchPoint &pt = touchEvent->_touchPoints[i];
+                QRectF rect = pt.rect();
+                rect.moveCenter(offset);
+                pt.d->rect = rect;
+                pt.d->startPos = pt.startPos() + offset;
+                pt.d->lastPos = pt.lastPos() + offset;
+            }
         }
 
         touchEvent->setAccepted(eventAccepted);
@@ -5417,9 +5427,11 @@ void QApplicationPrivate::updateTouchPointsForWidget(QWidget *widget, QTouchEven
         const QPointF delta = screenPos - screenPos.toPoint();
 
         rect.moveCenter(widget->mapFromGlobal(screenPos.toPoint()) + delta);
-        touchPoint.setRect(rect);
-        touchPoint.setStartPos(widget->mapFromGlobal(touchPoint.startScreenPos().toPoint()) + delta);
-        touchPoint.setLastPos(widget->mapFromGlobal(touchPoint.lastScreenPos().toPoint()) + delta);
+        touchPoint.d->rect = rect;
+        if (touchPoint.state() == Qt::TouchPointPressed) {
+            touchPoint.d->startPos = widget->mapFromGlobal(touchPoint.startScreenPos().toPoint()) + delta;
+            touchPoint.d->lastPos = widget->mapFromGlobal(touchPoint.lastScreenPos().toPoint()) + delta;
+        }
     }
 }
 
@@ -5463,16 +5475,20 @@ void QApplicationPrivate::translateRawTouchEvent(QWidget *window,
 
     for (int i = 0; i < touchPoints.count(); ++i) {
         QTouchEvent::TouchPoint touchPoint = touchPoints.at(i);
+        // explicitly detach from the original touch point that we got, so even
+        // if the touchpoint structs are reused, we will make a copy that we'll
+        // deliver to the user (which might want to store the struct for later use).
+        touchPoint.d = touchPoint.d->detach();
 
         // update state
-        QWidget *widget = 0;
+        QWeakPointer<QWidget> widget;
         switch (touchPoint.state()) {
         case Qt::TouchPointPressed:
         {
             if (deviceType == QTouchEvent::TouchPad) {
                 // on touch-pads, send all touch points to the same widget
                 widget = d->widgetForTouchPointId.isEmpty()
-                         ? 0
+                         ? QWeakPointer<QWidget>()
                          : d->widgetForTouchPointId.constBegin().value();
             }
 
@@ -5489,20 +5505,21 @@ void QApplicationPrivate::translateRawTouchEvent(QWidget *window,
 
             if (deviceType == QTouchEvent::TouchScreen) {
                 int closestTouchPointId = d->findClosestTouchPointId(touchPoint.screenPos());
-                QWidget *closestWidget = d->widgetForTouchPointId.value(closestTouchPointId);
+                QWidget *closestWidget = d->widgetForTouchPointId.value(closestTouchPointId).data();
                 if (closestWidget
-                    && (widget->isAncestorOf(closestWidget) || closestWidget->isAncestorOf(widget))) {
+                    && (widget.data()->isAncestorOf(closestWidget) || closestWidget->isAncestorOf(widget.data()))) {
                     widget = closestWidget;
                 }
             }
 
             d->widgetForTouchPointId[touchPoint.id()] = widget;
-            touchPoint.setStartScreenPos(touchPoint.screenPos());
-            touchPoint.setLastScreenPos(touchPoint.screenPos());
-            touchPoint.setStartNormalizedPos(touchPoint.normalizedPos());
-            touchPoint.setLastNormalizedPos(touchPoint.normalizedPos());
+            touchPoint.d->startScreenPos = touchPoint.screenPos();
+            touchPoint.d->lastScreenPos = touchPoint.screenPos();
+            touchPoint.d->startNormalizedPos = touchPoint.normalizedPos();
+            touchPoint.d->lastNormalizedPos = touchPoint.normalizedPos();
             if (touchPoint.pressure() < qreal(0.))
-                touchPoint.setPressure(qreal(1.));
+                touchPoint.d->pressure = qreal(1.);
+
             d->appCurrentTouchPoints.insert(touchPoint.id(), touchPoint);
             break;
         }
@@ -5513,12 +5530,14 @@ void QApplicationPrivate::translateRawTouchEvent(QWidget *window,
                 continue;
 
             QTouchEvent::TouchPoint previousTouchPoint = d->appCurrentTouchPoints.take(touchPoint.id());
-            touchPoint.setStartScreenPos(previousTouchPoint.startScreenPos());
-            touchPoint.setLastScreenPos(previousTouchPoint.screenPos());
-            touchPoint.setStartNormalizedPos(previousTouchPoint.startNormalizedPos());
-            touchPoint.setLastNormalizedPos(previousTouchPoint.normalizedPos());
+            touchPoint.d->startScreenPos = previousTouchPoint.startScreenPos();
+            touchPoint.d->lastScreenPos = previousTouchPoint.screenPos();
+            touchPoint.d->startPos = previousTouchPoint.startPos();
+            touchPoint.d->lastPos = previousTouchPoint.pos();
+            touchPoint.d->startNormalizedPos = previousTouchPoint.startNormalizedPos();
+            touchPoint.d->lastNormalizedPos = previousTouchPoint.normalizedPos();
             if (touchPoint.pressure() < qreal(0.))
-                touchPoint.setPressure(qreal(0.));
+                touchPoint.d->pressure = qreal(0.);
             break;
         }
         default:
@@ -5528,23 +5547,25 @@ void QApplicationPrivate::translateRawTouchEvent(QWidget *window,
 
             Q_ASSERT(d->appCurrentTouchPoints.contains(touchPoint.id()));
             QTouchEvent::TouchPoint previousTouchPoint = d->appCurrentTouchPoints.value(touchPoint.id());
-            touchPoint.setStartScreenPos(previousTouchPoint.startScreenPos());
-            touchPoint.setLastScreenPos(previousTouchPoint.screenPos());
-            touchPoint.setStartNormalizedPos(previousTouchPoint.startNormalizedPos());
-            touchPoint.setLastNormalizedPos(previousTouchPoint.normalizedPos());
+            touchPoint.d->startScreenPos = previousTouchPoint.startScreenPos();
+            touchPoint.d->lastScreenPos = previousTouchPoint.screenPos();
+            touchPoint.d->startPos = previousTouchPoint.startPos();
+            touchPoint.d->lastPos = previousTouchPoint.pos();
+            touchPoint.d->startNormalizedPos = previousTouchPoint.startNormalizedPos();
+            touchPoint.d->lastNormalizedPos = previousTouchPoint.normalizedPos();
             if (touchPoint.pressure() < qreal(0.))
-                touchPoint.setPressure(qreal(1.));
+                touchPoint.d->pressure = qreal(1.);
             d->appCurrentTouchPoints[touchPoint.id()] = touchPoint;
             break;
         }
-        Q_ASSERT(widget != 0);
+        Q_ASSERT(widget.data() != 0);
 
         // make the *scene* functions return the same as the *screen* functions
-        touchPoint.setSceneRect(touchPoint.screenRect());
-        touchPoint.setStartScenePos(touchPoint.startScreenPos());
-        touchPoint.setLastScenePos(touchPoint.lastScreenPos());
+        touchPoint.d->sceneRect = touchPoint.screenRect();
+        touchPoint.d->startScenePos = touchPoint.startScreenPos();
+        touchPoint.d->lastScenePos = touchPoint.lastScreenPos();
 
-        StatesAndTouchPoints &maskAndPoints = widgetsNeedingEvents[widget];
+        StatesAndTouchPoints &maskAndPoints = widgetsNeedingEvents[widget.data()];
         maskAndPoints.first |= touchPoint.state();
         if (touchPoint.isPrimary())
             maskAndPoints.first |= Qt::TouchPointPrimary;
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm
index 84da56e..22a0959 100644
--- a/src/gui/kernel/qapplication_mac.mm
+++ b/src/gui/kernel/qapplication_mac.mm
@@ -2449,7 +2449,7 @@ OSStatus QApplicationPrivate::globalAppleEventProcessor(const AppleEvent *ae, Ap
         switch(aeID) {
         case kAEQuitApplication: {
             extern bool qt_mac_quit_menu_item_enabled; // qmenu_mac.cpp
-            if(!QApplicationPrivate::modalState() && qt_mac_quit_menu_item_enabled) {
+            if (qt_mac_quit_menu_item_enabled) {
                 QCloseEvent ev;
                 QApplication::sendSpontaneousEvent(app, &ev);
                 if(ev.isAccepted()) {
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 992e4be..14d7215 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -511,7 +511,7 @@ public:
 
     QWidget *gestureWidget;
 
-    QMap<int, QWidget *> widgetForTouchPointId;
+    QMap<int, QWeakPointer<QWidget> > widgetForTouchPointId;
     QMap<int, QTouchEvent::TouchPoint> appCurrentTouchPoints;
     static void updateTouchPointsForWidget(QWidget *widget, QTouchEvent *touchEvent);
     void initializeMultitouch();
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index c7f0c00..fb2bc72 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -712,7 +712,7 @@ TKeyResponse QSymbianControl::OfferKeyEvent(const TKeyEvent& keyEvent, TEventCod
         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, keyEvent.iModifiers);
+                (keyEvent.iRepeats != 0), 1, keyEvent.iScanCode, s60Keysym, keyEvent.iModifiers);
 //        WId wid = reinterpret_cast<RWindowGroup *>(keyEvent.Handle())->Child();
 //        if (!wid)
 //             Could happen if window isn't shown yet.
@@ -908,6 +908,8 @@ void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */)
         }
 
         QApplication::setActiveWindow(qwidget->window());
+        qwidget->d_func()->setWindowIcon_sys(true);
+        qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle());
 #ifdef Q_WS_S60
         // If widget is fullscreen, hide status pane and button container
         // otherwise show them.
@@ -945,7 +947,10 @@ void QSymbianControl::HandleResourceChange(int resourceType)
             TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
             SetExtent(r.iTl, r.Size());
         }
-        qwidget->d_func()->setWindowIcon_sys(true);
+        if (IsFocused() && IsVisible()) {
+            qwidget->d_func()->setWindowIcon_sys(true);
+            qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle());
+        }
         break;
     case KUidValueCoeFontChangeEvent:
         // font change event
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 05e75a2..b677228 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -243,8 +243,12 @@ static PtrWTGet ptrWTGet = 0;
 static PACKET localPacketBuf[QT_TABLET_NPACKETQSIZE];  // our own tablet packet queue.
 HCTX qt_tablet_context;  // the hardware context for the tablet (like a window handle)
 bool qt_tablet_tilt_support;
-static void tabletInit(UINT wActiveCsr, HCTX hTab);
+
+#ifndef QT_NO_TABLETEVENT
+static void tabletInit(const quint64 uniqueId, const UINT csr_type, HCTX hTab);
+static void tabletUpdateCursor(QTabletDeviceData &tdd, const UINT currentCursor);
 static void initWinTabFunctions();        // resolve the WINTAB api functions
+#endif // QT_NO_TABLETEVENT
 
 
 #ifndef QT_NO_ACCESSIBILITY
@@ -256,7 +260,7 @@ extern QWidget* qt_get_tablet_widget();
 extern bool qt_sendSpontaneousEvent(QObject*, QEvent*);
 extern QRegion qt_dirtyRegion(QWidget *);
 
-typedef QHash<UINT, QTabletDeviceData> QTabletCursorInfo;
+typedef QHash<quint64, QTabletDeviceData> QTabletCursorInfo;
 Q_GLOBAL_STATIC(QTabletCursorInfo, tCursorInfo)
 QTabletDeviceData currentTabletPointer;
 
@@ -791,7 +795,9 @@ void qt_init(QApplicationPrivate *priv, int)
     if (QApplication::desktopSettingsAware())
         qt_set_windows_resources();
 
+#ifndef QT_NO_TABLETEVENT
     initWinTabFunctions();
+#endif // QT_NO_TABLETEVENT
     QApplicationPrivate::inputContext = new QWinInputContext(0);
 
     // Read the initial cleartype settings...
@@ -2325,25 +2331,43 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             }
             break;
         case WT_PROXIMITY:
-            if (ptrWTPacketsGet) {
-                bool enteredProximity = LOWORD(lParam) != 0;
-                PACKET proximityBuffer[QT_TABLET_NPACKETQSIZE];
-                int totalPacks = ptrWTPacketsGet(qt_tablet_context, QT_TABLET_NPACKETQSIZE, proximityBuffer);
-                if (totalPacks > 0 && enteredProximity) {
-                    uint currentCursor = proximityBuffer[0].pkCursor;
-                    if (!tCursorInfo()->contains(currentCursor))
-                        tabletInit(currentCursor, qt_tablet_context);
-                    currentTabletPointer = tCursorInfo()->value(currentCursor);
+
+            #ifndef QT_NO_TABLETEVENT
+            if (ptrWTPacketsGet && ptrWTInfo) {
+                const bool enteredProximity = LOWORD(lParam) != 0;
+                PACKET proximityBuffer[1]; // we are only interested in the first packet in this case
+                const int totalPacks = ptrWTPacketsGet(qt_tablet_context, 1, proximityBuffer);
+                if (totalPacks > 0) {
+                    const UINT currentCursor = proximityBuffer[0].pkCursor;
+
+                    UINT csr_physid;
+                    ptrWTInfo(WTI_CURSORS + currentCursor, CSR_PHYSID, &csr_physid);
+                    UINT csr_type;
+                    ptrWTInfo(WTI_CURSORS + currentCursor, CSR_TYPE, &csr_type);
+                    const UINT deviceIdMask = 0xFF6; // device type mask && device color mask
+                    quint64 uniqueId = (csr_type & deviceIdMask);
+                    uniqueId = (uniqueId << 32) | csr_physid;
+
+                    // initialising and updating the cursor should be done in response to
+                    // WT_CSRCHANGE. We do it in WT_PROXIMITY because some wintab never send
+                    // the event WT_CSRCHANGE even if asked with CXO_CSRMESSAGES
+                    const QTabletCursorInfo *const globalCursorInfo = tCursorInfo();
+                    if (!globalCursorInfo->contains(uniqueId))
+                        tabletInit(uniqueId, csr_type, qt_tablet_context);
+
+                    currentTabletPointer = globalCursorInfo->value(uniqueId);
+                    tabletUpdateCursor(currentTabletPointer, currentCursor);
                 }
                 qt_tabletChokeMouse = false;
-#ifndef QT_NO_TABLETEVENT
+
                 QTabletEvent tabletProximity(enteredProximity ? QEvent::TabletEnterProximity
                                                               : QEvent::TabletLeaveProximity,
                                              QPoint(), QPoint(), QPointF(), currentTabletPointer.currentDevice, currentTabletPointer.currentPointerType, 0, 0,
                                              0, 0, 0, 0, 0, currentTabletPointer.llId);
                 QApplication::sendEvent(qApp, &tabletProximity);
-#endif // QT_NO_TABLETEVENT
             }
+            #endif // QT_NO_TABLETEVENT
+
             break;
 #ifdef Q_WS_WINCE_WM
         case WM_SETFOCUS: {
@@ -3317,63 +3341,57 @@ bool QETWidget::translateWheelEvent(const MSG &msg)
 
 // the following is adapted from the wintab syspress example (public domain)
 /* -------------------------------------------------------------------------- */
-static void tabletInit(UINT wActiveCsr, HCTX hTab)
+// Initialize the "static" information of a cursor device (pen, airbrush, etc).
+// The QTabletDeviceData is initialized with the data that do not change in time
+// (number of button, type of device, etc) but do not initialize the variable data
+// (e.g.: pen or eraser)
+#ifndef QT_NO_TABLETEVENT
+
+static void tabletInit(const quint64 uniqueId, const UINT csr_type, HCTX hTab)
 {
+    Q_ASSERT(ptrWTInfo);
+    Q_ASSERT(ptrWTGet);
+
+    Q_ASSERT(!tCursorInfo()->contains(uniqueId));
+
     /* browse WinTab's many info items to discover pressure handling. */
-    if (ptrWTInfo && ptrWTGet) {
-        AXIS np;
-        LOGCONTEXT lc;
-        BYTE wPrsBtn;
-        BYTE logBtns[32];
-        UINT size;
-
-        /* discover the LOGICAL button generated by the pressure channel. */
-        /* get the PHYSICAL button from the cursor category and run it */
-        /* through that cursor's button map (usually the identity map). */
-        wPrsBtn = (BYTE)-1;
-        ptrWTInfo(WTI_CURSORS + wActiveCsr, CSR_NPBUTTON, &wPrsBtn);
-        size = ptrWTInfo(WTI_CURSORS + wActiveCsr, CSR_BUTTONMAP, &logBtns);
-        if ((UINT)wPrsBtn < size)
-            wPrsBtn = logBtns[wPrsBtn];
-
-        /* get the current context for its device variable. */
-        ptrWTGet(hTab, &lc);
-
-        /* get the size of the pressure axis. */
-        QTabletDeviceData tdd;
-        ptrWTInfo(WTI_DEVICES + lc.lcDevice, DVC_NPRESSURE, &np);
-        tdd.minPressure = int(np.axMin);
-        tdd.maxPressure = int(np.axMax);
-
-        ptrWTInfo(WTI_DEVICES + lc.lcDevice, DVC_TPRESSURE, &np);
-        tdd.minTanPressure = int(np.axMin);
-        tdd.maxTanPressure = int(np.axMax);
-
-        LOGCONTEXT lcMine;
-
-      	/* get default region */
-        ptrWTInfo(WTI_DEFCONTEXT, 0, &lcMine);
-
-        tdd.minX = 0;
-        tdd.maxX = int(lcMine.lcInExtX) - int(lcMine.lcInOrgX);
-
-        tdd.minY = 0;
-        tdd.maxY = int(lcMine.lcInExtY) - int(lcMine.lcInOrgY);
-
-        tdd.minZ = 0;
-        tdd.maxZ = int(lcMine.lcInExtZ) - int(lcMine.lcInOrgZ);
-
-        int csr_type,
-            csr_physid;
-        ptrWTInfo(WTI_CURSORS + wActiveCsr, CSR_TYPE, &csr_type);
-        ptrWTInfo(WTI_CURSORS + wActiveCsr, CSR_PHYSID, &csr_physid);
-        tdd.llId = csr_type & 0x0F06;
-        tdd.llId = (tdd.llId << 24) | csr_physid;
-#ifndef QT_NO_TABLETEVENT
-        if (((csr_type & 0x0006) == 0x0002) && ((csr_type & 0x0F06) != 0x0902)) {
-            tdd.currentDevice = QTabletEvent::Stylus;
-        } else {
-            switch (csr_type & 0x0F06) {
+    AXIS np;
+    LOGCONTEXT lc;
+
+    /* get the current context for its device variable. */
+    ptrWTGet(hTab, &lc);
+
+    /* get the size of the pressure axis. */
+    QTabletDeviceData tdd;
+    tdd.llId = uniqueId;
+
+    ptrWTInfo(WTI_DEVICES + lc.lcDevice, DVC_NPRESSURE, &np);
+    tdd.minPressure = int(np.axMin);
+    tdd.maxPressure = int(np.axMax);
+
+    ptrWTInfo(WTI_DEVICES + lc.lcDevice, DVC_TPRESSURE, &np);
+    tdd.minTanPressure = int(np.axMin);
+    tdd.maxTanPressure = int(np.axMax);
+
+    LOGCONTEXT lcMine;
+
+    /* get default region */
+    ptrWTInfo(WTI_DEFCONTEXT, 0, &lcMine);
+
+    tdd.minX = 0;
+    tdd.maxX = int(lcMine.lcInExtX) - int(lcMine.lcInOrgX);
+
+    tdd.minY = 0;
+    tdd.maxY = int(lcMine.lcInExtY) - int(lcMine.lcInOrgY);
+
+    tdd.minZ = 0;
+    tdd.maxZ = int(lcMine.lcInExtZ) - int(lcMine.lcInOrgZ);
+
+    const uint cursorTypeBitMask = 0x0F06; // bitmask to find the specific cursor type (see Wacom FAQ)
+    if (((csr_type & 0x0006) == 0x0002) && ((csr_type & cursorTypeBitMask) != 0x0902)) {
+        tdd.currentDevice = QTabletEvent::Stylus;
+    } else {
+        switch (csr_type & cursorTypeBitMask) {
             case 0x0802:
                 tdd.currentDevice = QTabletEvent::Stylus;
                 break;
@@ -3391,26 +3409,34 @@ static void tabletInit(UINT wActiveCsr, HCTX hTab)
                 break;
             default:
                 tdd.currentDevice = QTabletEvent::NoDevice;
-            }
-        }
-
-        switch (wActiveCsr % 3) {
-        case 2:
-            tdd.currentPointerType = QTabletEvent::Eraser;
-            break;
-        case 1:
-            tdd.currentPointerType = QTabletEvent::Pen;
-            break;
-        case 0:
-            tdd.currentPointerType = QTabletEvent::Cursor;
-            break;
-        default:
-            tdd.currentPointerType = QTabletEvent::UnknownPointer;
         }
+    }
+    tCursorInfo()->insert(uniqueId, tdd);
+}
 #endif // QT_NO_TABLETEVENT
-        tCursorInfo()->insert(wActiveCsr, tdd);
+
+// Update the "dynamic" informations of a cursor device (pen, airbrush, etc).
+// The dynamic information is the information of QTabletDeviceData that can change
+// in time (eraser or pen if a device is turned around).
+#ifndef QT_NO_TABLETEVENT
+
+static void tabletUpdateCursor(QTabletDeviceData &tdd, const UINT currentCursor)
+{
+    switch (currentCursor % 3) { // %3 for dual track
+    case 0:
+        tdd.currentPointerType = QTabletEvent::Cursor;
+        break;
+    case 1:
+        tdd.currentPointerType = QTabletEvent::Pen;
+        break;
+    case 2:
+        tdd.currentPointerType = QTabletEvent::Eraser;
+        break;
+    default:
+        tdd.currentPointerType = QTabletEvent::UnknownPointer;
     }
 }
+#endif // QT_NO_TABLETEVENT
 
 bool QETWidget::translateTabletEvent(const MSG &msg, PACKET *localPacketBuf,
                                       int numPackets)
@@ -3546,6 +3572,10 @@ bool QETWidget::translateTabletEvent(const MSG &msg, PACKET *localPacketBuf,
 }
 
 extern bool qt_is_gui_used;
+
+
+#ifndef QT_NO_TABLETEVENT
+
 static void initWinTabFunctions()
 {
 #if defined(Q_OS_WINCE)
@@ -3564,6 +3594,7 @@ static void initWinTabFunctions()
     }
 #endif // Q_OS_WINCE
 }
+#endif // QT_NO_TABLETEVENT
 
 
 //
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 37dcc67..304e5d3 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -178,6 +178,9 @@ static void cleanupCocoaApplicationDelegate()
     return [[qtMenuLoader retain] autorelease];
 }
 
+// This function will only be called when NSApp is actually running. Before
+// that, the kAEQuitApplication apple event will be sendt to 
+// QApplicationPrivate::globalAppleEventProcessor in qapplication_mac.mm
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
     Q_UNUSED(sender);
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
index 9ab077f..990571d 100644
--- a/src/gui/kernel/qcocoamenuloader_mac.mm
+++ b/src/gui/kernel/qcocoamenuloader_mac.mm
@@ -76,9 +76,14 @@ QT_USE_NAMESPACE
 
 - (void)ensureAppMenuInMenu:(NSMenu *)menu
 {
+    // The application menu is the menu in the menu bar that contains the
+    // 'Quit' item. When changing menu bar (e.g when swithing between
+    // windows with different menu bars), we never recreate this menu, but
+    // instead pull it out the current menu bar and place into the new one:
     NSMenu *mainMenu = [NSApp mainMenu];
     if ([NSApp mainMenu] == menu)
-        return; // nothing to do!
+        return; // nothing to do (menu is the current menu bar)!
+
 #ifndef QT_NAMESPACE
     Q_ASSERT(mainMenu);
 #endif
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index a16d1f8..3da783f 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -64,12 +64,16 @@
 
 #include <qdebug.h>
 
-@interface NSEvent (DeviceDelta)
+@interface NSEvent (Qt_Compile_Leopard_DeviceDelta)
   - (CGFloat)deviceDeltaX;
   - (CGFloat)deviceDeltaY;
   - (CGFloat)deviceDeltaZ;
 @end
 
+@interface NSEvent (Qt_Compile_Leopard_Gestures)
+  - (CGFloat)magnification;
+@end
+
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(DnDParams, qMacDnDParams);
@@ -79,6 +83,7 @@ extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); // qapplication.cpp
 extern OSViewRef qt_mac_nativeview_for(const QWidget *w); // qwidget_mac.mm
 extern const QStringList& qEnabledDraggedTypes(); // qmime_mac.cpp
 extern QPointer<QWidget> qt_mouseover; //qapplication_mac.mm
+extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 
 Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)
 {
@@ -691,6 +696,9 @@ extern "C" {
 
 - (void)mouseDown:(NSEvent *)theEvent
 {
+    if (!qt_button_down)
+        qt_button_down = qwidget;
+
     qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::LeftButton);
     // Don't call super here. This prevents us from getting the mouseUp event,
     // which we need to send even if the mouseDown event was not accepted.
@@ -700,75 +708,62 @@ extern "C" {
 
 - (void)mouseUp:(NSEvent *)theEvent
 {
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::LeftButton);
+    qt_button_down = 0;
 
-    if (!mouseOK)
-        [super mouseUp:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::LeftButton);
 }
 
 - (void)rightMouseDown:(NSEvent *)theEvent
 {
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::RightButton);
+    if (!qt_button_down)
+        qt_button_down = qwidget;
 
-    if (!mouseOK)
-        [super rightMouseDown:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::RightButton);
 }
 
 - (void)rightMouseUp:(NSEvent *)theEvent
 {
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::RightButton);
+    qt_button_down = 0;
 
-    if (!mouseOK)
-        [super rightMouseUp:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::RightButton);
 }
 
 - (void)otherMouseDown:(NSEvent *)theEvent
 {
-    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, mouseButton);
+    if (!qt_button_down)
+        qt_button_down = qwidget;
 
-    if (!mouseOK)
-        [super otherMouseDown:theEvent];
+    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, mouseButton);
 }
 
 - (void)otherMouseUp:(NSEvent *)theEvent
 {
-    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent,  QEvent::MouseButtonRelease, mouseButton);
-
-    if (!mouseOK)
-        [super otherMouseUp:theEvent];
+    qt_button_down = 0;
 
+    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
+    qt_mac_handleMouseEvent(self, theEvent,  QEvent::MouseButtonRelease, mouseButton);
 }
 
 - (void)mouseDragged:(NSEvent *)theEvent
 {
     qMacDnDParams()->view = self;
     qMacDnDParams()->theEvent = theEvent;
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-
-    if (!mouseOK)
-        [super mouseDragged:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
 }
 
 - (void)rightMouseDragged:(NSEvent *)theEvent
 {
     qMacDnDParams()->view = self;
     qMacDnDParams()->theEvent = theEvent;
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-
-    if (!mouseOK)
-        [super rightMouseDragged:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
 }
 
 - (void)otherMouseDragged:(NSEvent *)theEvent
 {
     qMacDnDParams()->view = self;
     qMacDnDParams()->theEvent = theEvent;
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-
-    if (!mouseOK)
-        [super otherMouseDragged:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
 }
 
 - (void)scrollWheel:(NSEvent *)theEvent
@@ -893,6 +888,7 @@ extern "C" {
     bool all = qwidget->testAttribute(Qt::WA_TouchPadAcceptSingleTouchEvents);
     qt_translateRawTouchEvent(qwidget, QTouchEvent::TouchPad, QCocoaTouch::getCurrentTouchPointList(event, all));
 }
+#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 
 - (void)magnifyWithEvent:(NSEvent *)event;
 {
@@ -963,7 +959,6 @@ extern "C" {
     qNGEvent.position = flipPoint(p).toPoint();
     qt_sendSpontaneousEvent(qwidget, &qNGEvent);
 }
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 
 - (void)frameDidChange:(NSNotification *)note
 {
@@ -1451,7 +1446,7 @@ Qt::DropAction QDragManager::drag(QDrag *o)
     [image release];
     dragPrivate()->executed_action = Qt::IgnoreAction;
     object = 0;
-    Qt::DropAction performedAction(qt_mac_mapNSDragOperation(dndParams.performedAction));
+    Qt::DropAction performedAction(qt_mac_mapNSDragOperation(qMacDnDParams()->performedAction));
     // do post drag processing, if required.
     if(performedAction != Qt::IgnoreAction) {
         // check if the receiver points us to a file location.
diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm
index 9fb674e..8a22a65 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac.mm
+++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm
@@ -324,8 +324,13 @@ static void cleanupCocoaWindowDelegate()
     NSRect frameToReturn = defaultFrame;
     QWidget *qwidget = m_windowHash->value(window);
     QSizeF size = qwidget->maximumSize();
-    frameToReturn.size.width = qMin<CGFloat>(frameToReturn.size.width, size.width());
-    frameToReturn.size.height = qMin<CGFloat>(frameToReturn.size.height, size.height());
+    NSRect windowFrameRect = [window frame];
+    NSRect viewFrameRect = [[window contentView] frame];
+    // consider additional size required for titlebar & frame
+    frameToReturn.size.width = qMin<CGFloat>(frameToReturn.size.width,
+            size.width()+(windowFrameRect.size.width - viewFrameRect.size.width));
+    frameToReturn.size.height = qMin<CGFloat>(frameToReturn.size.height,
+            size.height()+(windowFrameRect.size.height - viewFrameRect.size.height));
     return frameToReturn;
 }
 
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 9839269..461cc92 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -787,6 +787,8 @@ public:
 
     private:
         QTouchEventTouchPointPrivate *d;
+        friend class QApplication;
+        friend class QApplicationPrivate;
     };
 
     enum DeviceType {
@@ -818,6 +820,7 @@ protected:
     Qt::TouchPointStates _touchPointStates;
     QList<QTouchEvent::TouchPoint> _touchPoints;
 
+    friend class QApplication;
     friend class QApplicationPrivate;
 };
 
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm
index 427f0b0..e0eebfd 100644
--- a/src/gui/kernel/qeventdispatcher_mac.mm
+++ b/src/gui/kernel/qeventdispatcher_mac.mm
@@ -572,7 +572,7 @@ bool QEventDispatcherMac::processEvents(QEventLoop::ProcessEventsFlags flags)
                 while (!d->interrupt && [NSApp runModalSession:session] == NSRunContinuesResponse)
                     qt_mac_waitForMoreModalSessionEvents();
                 if (!d->interrupt && session == d->currentModalSessionCached) {
-                    // Someone called e.g. [NSApp stopModal:] from outside the event
+                    // INVARIANT: Someone called e.g. [NSApp stopModal:] from outside the event
                     // dispatcher (e.g to stop a native dialog). But that call wrongly stopped
                     // 'session' as well. As a result, we need to restart all internal sessions:
                     d->temporarilyStopAllModalSessions();
@@ -596,7 +596,13 @@ bool QEventDispatcherMac::processEvents(QEventLoop::ProcessEventsFlags flags)
                 if (NSModalSession session = d->currentModalSession()) {
                     if (flags & QEventLoop::WaitForMoreEvents)
                         qt_mac_waitForMoreModalSessionEvents();
-                    [NSApp runModalSession:session];
+                    NSInteger status = [NSApp runModalSession:session];
+                    if (status != NSRunContinuesResponse && session == d->currentModalSessionCached) {
+                        // INVARIANT: Someone called e.g. [NSApp stopModal:] from outside the event
+                        // dispatcher (e.g to stop a native dialog). But that call wrongly stopped
+                        // 'session' as well. As a result, we need to restart all internal sessions:
+                        d->temporarilyStopAllModalSessions();
+                    }
                     retVal = true;
                     break;
                 } else {
diff --git a/src/gui/kernel/qeventdispatcher_s60.cpp b/src/gui/kernel/qeventdispatcher_s60.cpp
index 9d18c9b..4c1429a 100644
--- a/src/gui/kernel/qeventdispatcher_s60.cpp
+++ b/src/gui/kernel/qeventdispatcher_s60.cpp
@@ -92,7 +92,7 @@ void QEventDispatcherS60::saveInputEvent(QSymbianControl *control, QWidget *widg
 {
     DeferredInputEvent inputEvent = {control, widget, event};
     m_deferredInputEvents.append(inputEvent);
-    connect(widget, SIGNAL(destroyed(QObject *)), SLOT(removeInputEventsForWidget(QObject *)));
+    connect(widget, SIGNAL(destroyed(QObject*)), SLOT(removeInputEventsForWidget(QObject*)));
 }
 
 bool QEventDispatcherS60::sendDeferredInputEvents()
diff --git a/src/gui/kernel/qformlayout.cpp b/src/gui/kernel/qformlayout.cpp
index 3e5dadc..33f5489 100644
--- a/src/gui/kernel/qformlayout.cpp
+++ b/src/gui/kernel/qformlayout.cpp
@@ -1124,14 +1124,15 @@ QStyle* QFormLayoutPrivate::getStyle() const
 
     \value DontWrapRows
            Fields are always laid out next to their label.  This is
-           the default policy for all styles except Qt Extended styles.
+           the default policy for all styles except Qt Extended styles
+           and QS60Style.
 
     \value WrapLongRows
            Labels are given enough horizontal space to fit the widest label,
            and the rest of the space is given to the fields. If the minimum
            size of a field pair is wider than the available space, the field
            is wrapped to the next line.  This is the default policy for
-           Qt Extended styles.
+           Qt Extended styles and and QS60Style.
 
     \value WrapAllRows
            Fields are always laid out below their label.
@@ -1720,8 +1721,8 @@ QFormLayout::FieldGrowthPolicy QFormLayout::fieldGrowthPolicy() const
     \brief the way in which the form's rows wrap
 
     The default value depends on the widget or application style. For
-    Qt Extended styles, the default is WrapLongRows; for the other styles,
-    the default is DontWrapRows.
+    Qt Extended styles and QS60Style, the default is WrapLongRows;
+    for the other styles, the default is DontWrapRows.
 
     If you want to display each label above its associated field
     (instead of next to it), set this property to WrapAllRows.
diff --git a/src/gui/kernel/qmultitouch_mac.mm b/src/gui/kernel/qmultitouch_mac.mm
index 2f6f9ca..f736146 100644
--- a/src/gui/kernel/qmultitouch_mac.mm
+++ b/src/gui/kernel/qmultitouch_mac.mm
@@ -180,7 +180,6 @@ QCocoaTouch::getCurrentTouchPointList(NSEvent *event, bool acceptSingleTouch)
     if (_touchCount != _currentTouches.size()) {
         // Remove all instances, and basically start from scratch:
         touchPoints.clear();
-        QList<QCocoaTouch *> list = _currentTouches.values();
         foreach (QCocoaTouch *qcocoaTouch, _currentTouches.values()) {
             if (!_updateInternalStateOnly) {
                 qcocoaTouch->_touchPoint.setState(Qt::TouchPointReleased);
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index c0fb8aa..2bf1465 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -899,6 +899,14 @@ bool qt_mac_handleMouseEvent(void * /* NSView * */view, void * /* NSEvent * */ev
             widgetToGetMouse =
                 [static_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(tmpView) qt_qwidget];
         }
+    } else {
+        extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
+        if (!mac_mouse_grabber && qt_button_down) {
+            // if there is no explicit grabber, and the mouse was grabbed
+            // implicitely (i.e. a mousebutton was pressed)
+            widgetToGetMouse = qt_button_down;
+            tmpView = qt_mac_nativeview_for(widgetToGetMouse);
+        }
     }
 
     NSPoint localPoint = [tmpView convertPoint:windowPoint fromView:nil];
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 709f6f3..fbb9115 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -8248,7 +8248,8 @@ bool QWidget::event(QEvent *event)
             QList<QObject*> childList = d->children;
             for (int i = 0; i < childList.size(); ++i) {
                 QObject *o = childList.at(i);
-                QApplication::sendEvent(o, event);
+                if (o)
+                    QApplication::sendEvent(o, event);
             }
         }
         update();
@@ -8277,7 +8278,7 @@ bool QWidget::event(QEvent *event)
             QList<QObject*> childList = d->children;
             for (int i = 0; i < childList.size(); ++i) {
                 QObject *o = childList.at(i);
-                if (o != QApplication::activeModalWidget()) {
+                if (o && o != QApplication::activeModalWidget()) {
                     if (qobject_cast<QWidget *>(o) && static_cast<QWidget *>(o)->isWindow()) {
                         // do not forward the event to child windows,
                         // QApplication does this for us
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 71f0077..0d9f9ee 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -725,6 +725,23 @@ static OSWindowRef qt_mac_create_window(QWidget *, WindowClass wclass, WindowAtt
     return window;
 }
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+/* We build the release package against the 10.4 SDK.
+   So, to enable gestures for applications running on
+   10.6+, we define the missing constants here: */
+enum {
+    kEventClassGesture              = 'gest',
+    kEventGestureStarted            = 1,
+    kEventGestureEnded              = 2,
+    kEventGestureMagnify            = 4,
+    kEventGestureSwipe              = 5,
+    kEventGestureRotate             = 6,
+    kEventParamRotationAmount       = 'rota',
+    kEventParamSwipeDirection       = 'swip',
+    kEventParamMagnificationAmount  = 'magn'
+};
+#endif
+
 // window events
 static EventTypeSpec window_events[] = {
     { kEventClassWindow, kEventWindowClose },
@@ -741,13 +758,11 @@ static EventTypeSpec window_events[] = {
     { kEventClassWindow, kEventWindowGetRegion },
     { kEventClassWindow, kEventWindowGetClickModality },
     { kEventClassWindow, kEventWindowTransitionCompleted },
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
     { kEventClassGesture, kEventGestureStarted },
     { kEventClassGesture, kEventGestureEnded },
     { kEventClassGesture, kEventGestureMagnify },
     { kEventClassGesture, kEventGestureSwipe },
     { kEventClassGesture, kEventGestureRotate },
-#endif
     { kEventClassMouse, kEventMouseDown }
 };
 static EventHandlerUPP mac_win_eventUPP = 0;
@@ -1036,7 +1051,6 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
         handled_event = false;
         break; }
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
     case kEventClassGesture: {
         // First, find the widget that was under
         // the mouse when the gesture happened:
@@ -1064,7 +1078,7 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
                 break;
             case kEventGestureRotate: {
                 CGFloat amount;
-                if (GetEventParameter(event, kEventParamRotationAmount, typeCGFloat, 0,
+                if (GetEventParameter(event, kEventParamRotationAmount, 'cgfl', 0,
                             sizeof(amount), 0, &amount) != noErr) {
                     handled_event = false;
                     break;
@@ -1091,7 +1105,7 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
                 break; }
             case kEventGestureMagnify: {
                 CGFloat amount;
-                if (GetEventParameter(event, kEventParamMagnificationAmount, typeCGFloat, 0,
+                if (GetEventParameter(event, kEventParamMagnificationAmount, 'cgfl', 0,
                             sizeof(amount), 0, &amount) != noErr) {
                     handled_event = false;
                     break;
@@ -1103,7 +1117,6 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
 
         QApplication::sendSpontaneousEvent(widget, &qNGEvent);
     break; }
-#endif // gestures
 
     default:
         handled_event = false;
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index b1c37d3..359df2a 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -488,12 +488,6 @@ void QWidgetPrivate::show_sys()
 
         if(q->isWindow())
             id->setFocusSafely(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
-        if(q->isWindow())
-            setWindowIcon_sys(true);
     }
 
     invalidateBuffer(q->rect());
@@ -1180,18 +1174,6 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
             if (id->IsFocused()) // Avoid unnecessry calls to FocusChanged()
                 id->setFocusSafely(false);
             id->ControlEnv()->AppUi()->RemoveFromStack(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);
-                if (widget) {
-                    // Reset global window title for focusing window
-                    widget->d_func()->setWindowTitle_sys(widget->windowTitle());
-                }
-            }
         }
     }
 
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 7461637..0bc9cbc 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -527,8 +527,13 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         QX11InfoData *xd = &X11->screens[qt_x11_create_desktop_on_screen];
         xinfo.setX11Data(xd);
     } else if (parentXinfo && (parentXinfo->screen() != xinfo.screen()
-                               || parentXinfo->visual() != xinfo.visual()))
+                               || (parentXinfo->visual() != xinfo.visual()
+                                   && !q->inherits("QGLWidget"))))
     {
+        // QGLWidgets have to be excluded here as they have a
+        // specially crafted QX11Info structure which can't be swapped
+        // out with the parent widgets QX11Info. The parent visual,
+        // for instance, might not even be GL capable.
         xinfo = *parentXinfo;
     }
 
diff --git a/src/gui/kernel/qwidgetaction.cpp b/src/gui/kernel/qwidgetaction.cpp
index 7dc2c67..b72a41a 100644
--- a/src/gui/kernel/qwidgetaction.cpp
+++ b/src/gui/kernel/qwidgetaction.cpp
@@ -212,8 +212,8 @@ void QWidgetAction::releaseWidget(QWidget *widget)
     if (!d->createdWidgets.contains(widget))
         return;
 
-    disconnect(widget, SIGNAL(destroyed(QObject *)),
-               this, SLOT(_q_widgetDestroyed(QObject *)));
+    disconnect(widget, SIGNAL(destroyed(QObject*)),
+               this, SLOT(_q_widgetDestroyed(QObject*)));
     d->createdWidgets.removeAll(widget);
     deleteWidget(widget);
 }
diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp
index b92c5c2..1d15dac 100644
--- a/src/gui/painting/qblendfunctions.cpp
+++ b/src/gui/painting/qblendfunctions.cpp
@@ -739,10 +739,6 @@ template <typename T> void qt_scale_image_32bit(uchar *destPixels, int dbpl,
     quint32 basex;
     quint32 srcy;
 
-    const int dstx = qCeil((tx1 + 0.5 - qMin(targetRect.left(), targetRect.right())) * ix) - 1;
-    const int dsty = qCeil((ty1 + 0.5 - qMin(targetRect.top(), targetRect.bottom())) * iy) - 1;
-
-
     if (sx < 0) {
         int dstx = qFloor((tx1 + qreal(0.5) - targetRect.right()) * ix) + 1;
         basex = quint32(srcRect.right() * 65536) + dstx;
diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp
index b8700c3..51be3b3 100644
--- a/src/gui/painting/qpaintbuffer.cpp
+++ b/src/gui/painting/qpaintbuffer.cpp
@@ -1708,7 +1708,7 @@ void QPaintEngineExReplayer::process(const QPaintBufferCommand &cmd)
 
 QPaintBufferResource::QPaintBufferResource(FreeFunc f, QObject *parent) : QObject(parent), free(f)
 {
-    connect(QPaintBufferSignalProxy::instance(), SIGNAL(aboutToDestroy(const QPaintBufferPrivate *)), this, SLOT(remove(const QPaintBufferPrivate *)));
+    connect(QPaintBufferSignalProxy::instance(), SIGNAL(aboutToDestroy(const QPaintBufferPrivate*)), this, SLOT(remove(const QPaintBufferPrivate*)));
 }
 
 QPaintBufferResource::~QPaintBufferResource()
diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp
index 4cccc91..3d82edf 100644
--- a/src/gui/painting/qprintengine_pdf.cpp
+++ b/src/gui/painting/qprintengine_pdf.cpp
@@ -206,7 +206,7 @@ void QPdfEngine::drawImage(const QRectF &rectangle, const QImage &image, const Q
     QRect sourceRect = sr.toRect();
     QImage im = sourceRect != image.rect() ? image.copy(sourceRect) : image;
     bool bitmap = true;
-    const int object = d->addImage(image, &bitmap, im.cacheKey());
+    const int object = d->addImage(im, &bitmap, im.cacheKey());
     if (object < 0)
         return;
 
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index a192e87..46fbaa9 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -101,7 +101,7 @@ void QTextureGlyphCache::populate(const QTextItemInt &ti,
         Coord c = { 0, 0, // will be filled in later
                     glyph_width,
                     glyph_height, // texture coords
-                    metrics.x.truncate(),
+                    metrics.x.round().truncate(),
                     -metrics.y.truncate() }; // baseline for horizontal scripts
 
         listItemCoordinates.insert(glyph, c);
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 5566cc6..b32c55b 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -1368,7 +1368,7 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
                     else {
                         gtkCachedPainter.paintFlatBox(gtkEntry, "entry_bg", contentRect,
                                                 option->state & State_Enabled ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE,
-                                                GTK_SHADOW_NONE, style, entryPath + QString::number(focus));
+                                                GTK_SHADOW_NONE, gtkCombo->style, entryPath + QString::number(focus));
                     }
 
                     gtkCachedPainter.paintShadow(gtkEntry, comboBox->editable ? "entry" : "frame", frameRect, frameState,
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 38c3feb..51c2a96 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -2155,9 +2155,9 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW
             wdi.titleWidth = tb->rect.width();
             QCFType<HIShapeRef> region;
             HIRect hirect = qt_hirectForQRect(tb->rect);
-            if (hirect.size.width == -1)
+            if (hirect.size.width <= 0)
                 hirect.size.width = 100;
-            if (hirect.size.height == -1)
+            if (hirect.size.height <= 0)
                 hirect.size.height = 30;
 
             HIThemeGetWindowShape(&hirect, &wdi, kWindowTitleBarRgn, &region);
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 7c3e11f..ee10ff6 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -67,6 +67,7 @@
 #include "qtoolbar.h"
 #include "qtoolbutton.h"
 #include "qfocusframe.h"
+#include "qformlayout.h"
 
 #include "private/qtoolbarextension_p.h"
 #include "private/qcombobox_p.h"
@@ -474,6 +475,8 @@ void QS60StylePrivate::setBackgroundTexture(QApplication *app) const
     QPalette applicationPalette = QApplication::palette();
     applicationPalette.setBrush(QPalette::Window, backgroundTexture());
     setThemePalette(&applicationPalette);
+    QApplication::setPalette(applicationPalette);
+    setThemePaletteHash(&applicationPalette);
 }
 
 void QS60StylePrivate::deleteBackground()
@@ -867,6 +870,13 @@ QSize QS60StylePrivate::partSize(QS60StyleEnums::SkinParts part, SkinElementFlag
     return result;
 }
 
+bool QS60StylePrivate::canDrawThemeBackground(const QBrush &backgroundBrush) 
+{
+    //If brush is not changed from style's default values, draw theme graphics.
+    return (backgroundBrush.color() == Qt::transparent ||
+            backgroundBrush.style() == Qt::NoBrush) ? true : false;
+}
+
 /*!
   \class QS60Style
   \brief The QS60Style class provides a look and feel suitable for applications on S60.
@@ -1380,8 +1390,10 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
                     highlightRect = option->rect.adjusted(xBeginning, yBeginning, xEnd, yEnd);
                 }
                 if (vopt->showDecorationSelected &&
-                    (vopt->palette.highlight().color() == d->themePalette()->highlight().color()))
+                    (vopt->palette.highlight().color() == QS60StylePrivate::themePalette()->highlight().color()))
                     QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ListHighlight, painter, highlightRect, flags);
+                else
+                    painter->fillRect(highlightRect, vopt->palette.highlight());
             }
 
              // draw the icon
@@ -1853,7 +1865,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
     case CE_ShapedFrame:
         if (const QTextEdit *textEdit = qobject_cast<const QTextEdit *>(widget)) {
             const QStyleOptionFrame *frame = qstyleoption_cast<const QStyleOptionFrame *>(option);
-            if (frame->palette.base().color()==Qt::transparent)
+            if (QS60StylePrivate::canDrawThemeBackground(frame->palette.base()))
                 QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_Editor, painter, option->rect, flags);
             else
                 QCommonStyle::drawControl(element, option, painter, widget);
@@ -1927,7 +1939,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
         if (option->state & State_Sunken && option->state & State_Enabled) {
             painter->save();
             painter->setOpacity(0.5);
-            painter->setBrush(d->themePalette()->light());
+            painter->setBrush(QS60StylePrivate::themePalette()->light());
             painter->setRenderHint(QPainter::Antialiasing);
             const qreal roundRectRadius = 4 * goldenRatio;
             painter->drawRoundedRect(option->rect, roundRectRadius, roundRectRadius);
@@ -1946,6 +1958,8 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
 {
     Q_D(const QS60Style);
     const QS60StylePrivate::SkinElementFlags flags = (option->state & State_Enabled) ?  QS60StylePrivate::SF_StateEnabled : QS60StylePrivate::SF_StateDisabled;
+    bool commonStyleDraws = false;
+
     switch (element) {
 #ifndef QT_NO_LINEEDIT
     case PE_PanelLineEdit:
@@ -1954,12 +1968,10 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
             if (widget && qobject_cast<const QComboBox *>(widget->parentWidget()))
                 break;
 #endif
-            QBrush editBrush = option->palette.brush(QPalette::Base);
-            if (editBrush.color() == Qt::transparent)
-                QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_FrameLineEdit,
-                        painter, option->rect, flags);
+            if (QS60StylePrivate::canDrawThemeBackground(option->palette.base()))
+                QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_FrameLineEdit, painter, option->rect, flags);
             else
-                QCommonStyle::drawPrimitive(element, option, painter, widget);
+                commonStyleDraws = true;
         }
     break;
 #endif // QT_NO_LINEEDIT
@@ -1969,10 +1981,13 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
             const QS60StyleEnums::SkinParts skinPart = (option->state & QStyle::State_On) ?
                 QS60StyleEnums::SP_QgnIndiCheckboxOn : QS60StyleEnums::SP_QgnIndiCheckboxOff;
             painter->save();
-            QColor themeColor = d->s60Color(QS60StyleEnums::CL_QsnIconColors, 13, option);
-            QColor buttonTextColor = option->palette.buttonText().color();
-            if (themeColor != buttonTextColor)
-                painter->setPen(buttonTextColor);
+
+            QColor themeColor = QS60StylePrivate::themePalette()->windowText().color();
+            QColor windowTextColor = option->palette.windowText().color();
+
+            if (themeColor != windowTextColor)
+                painter->setPen(windowTextColor);
+
             QS60StylePrivate::drawSkinPart(skinPart, painter, option->rect, flags | QS60StylePrivate::SF_ColorSkinned );
             painter->restore();
         }
@@ -2019,6 +2034,8 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
             QColor buttonTextColor = option->palette.buttonText().color();
             if (themeColor != buttonTextColor)
                 painter->setPen(buttonTextColor);
+            else
+                painter->setPen(themeColor);
 
             // Draw radiobutton indicator as color skinned graphics.
             QS60StyleEnums::SkinParts skinPart = (option->state & QStyle::State_On) ?
@@ -2032,14 +2049,13 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
     case PE_PanelButtonTool:
     case PE_PanelButtonBevel:
     case PE_FrameButtonBevel: {
-        QBrush editBrush = option->palette.brush(QPalette::Base);
-        if (editBrush.color() == Qt::transparent) {
+        if (QS60StylePrivate::canDrawThemeBackground(option->palette.base())) {
             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);
         } else {
-            QCommonStyle::drawPrimitive(element, option, painter, widget);
+            commonStyleDraws = true;
             }
         }
         break;
@@ -2067,7 +2083,7 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
     case PE_IndicatorSpinUp:
         if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
             QStyleOptionSpinBox optionSpinBox = *spinBox;
-            if (optionSpinBox.palette.base().color()==Qt::transparent) {
+            if (QS60StylePrivate::canDrawThemeBackground(optionSpinBox.palette.base())) {
                 const QS60StyleEnums::SkinParts part = (element == PE_IndicatorSpinUp) ?
                     QS60StyleEnums::SP_QgnGrafScrollArrowUp :
                     QS60StyleEnums::SP_QgnGrafScrollArrowDown;
@@ -2075,12 +2091,12 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
                 optionSpinBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? adjustment : -adjustment );
                 QS60StylePrivate::drawSkinPart(part, painter, optionSpinBox.rect,flags);
             } else {
-                QCommonStyle::drawPrimitive(element, &optionSpinBox, painter, widget);
+                commonStyleDraws = true;
             }
         }
 #ifndef QT_NO_COMBOBOX
         else if (const QStyleOptionFrame *cmb = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
-            if (cmb->palette.base().color()==Qt::transparent) {
+            if (QS60StylePrivate::canDrawThemeBackground( option->palette.base())) {
                 // We want to draw down arrow here for comboboxes as well.
                 const QS60StyleEnums::SkinParts part = QS60StyleEnums::SP_QgnGrafScrollArrowDown;
                 QStyleOptionFrame comboBox = *cmb;
@@ -2088,7 +2104,7 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
                 comboBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? adjustment : -adjustment );
                 QS60StylePrivate::drawSkinPart(part, painter, comboBox.rect,flags);
             } else {
-                QCommonStyle::drawPrimitive(element, cmb, painter, widget);
+                commonStyleDraws = true;
             }
         }
 #endif //QT_NO_COMBOBOX
@@ -2119,12 +2135,10 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
             || qobject_cast<const QMenu *> (widget)
 #endif //QT_NO_MENU
             ) {
-                if (option->palette.base().color()==Qt::transparent) {
-                    QS60StylePrivate::SkinElements skinElement = QS60StylePrivate::SE_OptionsMenu;
-                    QS60StylePrivate::drawSkinElement(skinElement, painter, option->rect, flags);
-                } else {
-                    QCommonStyle::drawPrimitive(element, option, painter, widget);
-                }
+            if (QS60StylePrivate::canDrawThemeBackground(option->palette.base()))
+                QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_OptionsMenu, painter, option->rect, flags);
+            else
+                commonStyleDraws = true;
         }
         break;
     case PE_FrameWindow:
@@ -2256,6 +2270,9 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
 #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:
+        commonStyleDraws = true;
+    }
+    if (commonStyleDraws) {
         QCommonStyle::drawPrimitive(element, option, painter, widget);
     }
 }
@@ -2387,6 +2404,9 @@ int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w
         case SH_RequestSoftwareInputPanel:
             retValue = RSIP_OnMouseClickAndAlreadyFocused;
             break;
+        case SH_FormLayoutWrapPolicy:
+            retValue = QFormLayout::WrapLongRows;
+            break;
         default:
             break;
     }
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index cfe87ac..ea86bb2 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -453,6 +453,10 @@ public:
 
     static QSize naviPaneSize();
 
+    //Checks that the current brush is transparent or has BrushStyle NoBrush,
+    //so that theme graphic background can be drawn. 
+    static bool canDrawThemeBackground(const QBrush &backgroundBrush);
+
 private:
     static void drawPart(QS60StyleEnums::SkinParts part, QPainter *painter,
         const QRect &rect, SkinElementFlags flags = KDefaultSkinElementFlags);
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index a8dbf8d..48b8fad 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -1324,9 +1324,9 @@ QS60Style::QS60Style()
 void QS60StylePrivate::handleDynamicLayoutVariantSwitch()
 {
     clearCaches(QS60StylePrivate::CC_LayoutChange);
+    setBackgroundTexture(qApp);
     setActiveLayout();
     refreshUI();
-    setBackgroundTexture(qApp);
     foreach (QWidget *widget, QApplication::allWidgets())
         widget->ensurePolished();
 }
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp
index f894b82..30f2f35 100644
--- a/src/gui/styles/qwindowsstyle.cpp
+++ b/src/gui/styles/qwindowsstyle.cpp
@@ -2989,7 +2989,6 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp
 #ifndef QT_NO_COMBOBOX
     case CC_ComboBox:
         if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) {
-            p->save();
             QBrush editBrush = cmb->palette.brush(QPalette::Base);
             if ((cmb->subControls & SC_ComboBoxFrame)) {
                 if (cmb->frame) {
@@ -3059,7 +3058,6 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp
                     proxy()->drawPrimitive(PE_FrameFocusRect, &focus, p, widget);
                 }
             }
-            p->restore();
         }
         break;
 #endif // QT_NO_COMBOBOX
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp
index 6c367ab..18851b7 100644
--- a/src/gui/text/qfontengine_win.cpp
+++ b/src/gui/text/qfontengine_win.cpp
@@ -485,61 +485,78 @@ glyph_metrics_t QFontEngineWin::boundingBox(const QGlyphLayout &glyphs)
     return glyph_metrics_t(0, -tm.tmAscent, w, tm.tmHeight, w, 0);
 }
 
+bool QFontEngineWin::getOutlineMetrics(glyph_t glyph, const QTransform &t, glyph_metrics_t *metrics) const
+{
+    Q_ASSERT(metrics != 0);
+
+    HDC hdc = shared_dc();
+
+    GLYPHMETRICS gm;
+    DWORD res = 0;
+    MAT2 mat;
+    mat.eM11.value = mat.eM22.value = 1;
+    mat.eM11.fract = mat.eM22.fract = 0;
+    mat.eM21.value = mat.eM12.value = 0;
+    mat.eM21.fract = mat.eM12.fract = 0;
+
+    if (t.type() > QTransform::TxTranslate) {
+        // We need to set the transform using the HDC's world
+        // matrix rather than using the MAT2 above, because the
+        // results provided when transforming via MAT2 does not
+        // match the glyphs that are drawn using a WorldTransform
+        XFORM xform;
+        xform.eM11 = t.m11();
+        xform.eM12 = t.m12();
+        xform.eM21 = t.m21();
+        xform.eM22 = t.m22();
+        xform.eDx = 0;
+        xform.eDy = 0;
+        SetGraphicsMode(hdc, GM_ADVANCED);
+        SetWorldTransform(hdc, &xform);
+    }
+
+    uint format = GGO_METRICS;
+    if (ttf)
+        format |= GGO_GLYPH_INDEX;
+    res = GetGlyphOutline(hdc, glyph, format, &gm, 0, 0, &mat);
+
+    if (t.type() > QTransform::TxTranslate) {
+        XFORM xform;
+        xform.eM11 = xform.eM22 = 1;
+        xform.eM12 = xform.eM21 = xform.eDx = xform.eDy = 0;
+        SetWorldTransform(hdc, &xform);
+        SetGraphicsMode(hdc, GM_COMPATIBLE);
+    }
+
+    if (res != GDI_ERROR) {
+        *metrics = glyph_metrics_t(gm.gmptGlyphOrigin.x, -gm.gmptGlyphOrigin.y,
+                                  (int)gm.gmBlackBoxX, (int)gm.gmBlackBoxY, gm.gmCellIncX, gm.gmCellIncY);
+        return true;
+    } else {
+        return false;
+    }
+}
 
 glyph_metrics_t QFontEngineWin::boundingBox(glyph_t glyph, const QTransform &t)
 {
 #ifndef Q_WS_WINCE
-    GLYPHMETRICS gm;
-
     HDC hdc = shared_dc();
     SelectObject(hdc, hfont);
-    if (!ttf) {
+
+    glyph_metrics_t glyphMetrics;
+    bool success = getOutlineMetrics(glyph, t, &glyphMetrics);
+
+    if (!ttf && !success) {
+        // Bitmap fonts
         wchar_t ch = glyph;
         ABCFLOAT abc;
         GetCharABCWidthsFloat(hdc, ch, ch, &abc);
         int width = qRound(abc.abcfB);
 
-        return glyph_metrics_t(0, -tm.tmAscent, width, tm.tmHeight, width, 0).transformed(t);
-    } else {
-        DWORD res = 0;
-        MAT2 mat;
-        mat.eM11.value = mat.eM22.value = 1;
-        mat.eM11.fract = mat.eM22.fract = 0;
-        mat.eM21.value = mat.eM12.value = 0;
-        mat.eM21.fract = mat.eM12.fract = 0;
-
-        if (t.type() > QTransform::TxTranslate) {
-            // We need to set the transform using the HDC's world
-            // matrix rather than using the MAT2 above, because the
-            // results provided when transforming via MAT2 does not
-            // match the glyphs that are drawn using a WorldTransform
-            XFORM xform;
-            xform.eM11 = t.m11();
-            xform.eM12 = t.m12();
-            xform.eM21 = t.m21();
-            xform.eM22 = t.m22();
-            xform.eDx = 0;
-            xform.eDy = 0;
-            SetGraphicsMode(hdc, GM_ADVANCED);
-            SetWorldTransform(hdc, &xform);
-        }
-
-        res = GetGlyphOutline(hdc, glyph, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, 0, &mat);
-
-        if (t.type() > QTransform::TxTranslate) {
-            XFORM xform;
-            xform.eM11 = xform.eM22 = 1;
-            xform.eM12 = xform.eM21 = xform.eDx = xform.eDy = 0;
-            SetWorldTransform(hdc, &xform);
-            SetGraphicsMode(hdc, GM_COMPATIBLE);
-        }
-
-        if (res != GDI_ERROR) {
-            return glyph_metrics_t(gm.gmptGlyphOrigin.x, -gm.gmptGlyphOrigin.y,
-                                  (int)gm.gmBlackBoxX, (int)gm.gmBlackBoxY, gm.gmCellIncX, gm.gmCellIncY);
-        }
+        return glyph_metrics_t(QFixed::fromReal(abc.abcfA), -tm.tmAscent, width, tm.tmHeight, width, 0).transformed(t);
     }
-    return glyph_metrics_t();
+
+    return glyphMetrics;
 #else
     HDC hdc = shared_dc();
     HGDIOBJ oldFont = SelectObject(hdc, hfont);
@@ -1135,7 +1152,7 @@ QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin
     {
         ExtTextOut(hdc, -gx + margin, -gy + margin, options, 0, (LPCWSTR) &glyph, 1, 0);
     }
-
+    
     SelectObject(hdc, old_font);
     return ni;
 }
diff --git a/src/gui/text/qfontengine_win_p.h b/src/gui/text/qfontengine_win_p.h
index 9c4b0a9..43e1f12 100644
--- a/src/gui/text/qfontengine_win_p.h
+++ b/src/gui/text/qfontengine_win_p.h
@@ -109,6 +109,8 @@ public:
     int getGlyphIndexes(const QChar *ch, int numChars, QGlyphLayout *glyphs, bool mirrored) const;
     void getCMap();
 
+    bool getOutlineMetrics(glyph_t glyph, const QTransform &t, glyph_metrics_t *metrics) const;
+
     QString     _name;
     HFONT       hfont;
     LOGFONT     logfont;
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index b8c1b33..3d3f1e1 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -1367,10 +1367,13 @@ qreal QFontMetricsF::rightBearing(QChar ch) const
 */
 qreal QFontMetricsF::width(const QString &text) const
 {
+    int pos = text.indexOf(QLatin1Char('\x9c'));
+    int len = (pos != -1) ? pos : text.length();
+
     QTextEngine layout(text, d.data());
     layout.ignoreBidi = true;
     layout.itemize();
-    return layout.width(0, text.length()).toReal();
+    return layout.width(0, len).toReal();
 }
 
 /*!
@@ -1587,7 +1590,7 @@ QRectF QFontMetricsF::boundingRect(const QRectF &rect, int flags, const QString&
 */
 QSizeF QFontMetricsF::size(int flags, const QString &text, int tabStops, int *tabArray) const
 {
-    return boundingRect(QRectF(), flags, text, tabStops, tabArray).size();
+    return boundingRect(QRectF(), flags | Qt::TextLongestVariant, text, tabStops, tabArray).size();
 }
 
 /*!
@@ -1642,7 +1645,20 @@ QRectF QFontMetricsF::tightBoundingRect(const QString &text) const
 */
 QString QFontMetricsF::elidedText(const QString &text, Qt::TextElideMode mode, qreal width, int flags) const
 {
-    QStackTextEngine engine(text, QFont(d.data()));
+    QString _text = text;
+    if (!(flags & Qt::TextLongestVariant)) {
+        int posA = 0;
+        int posB = _text.indexOf(QLatin1Char('\x9c'));
+        while (posB >= 0) {
+            QString portion = _text.mid(posA, posB - posA);
+            if (size(flags, portion).width() <= width)
+                return portion;
+            posA = posB + 1;
+            posB = _text.indexOf(QLatin1Char('\x9c'), posA);
+        }
+        _text = _text.mid(posA);
+    }
+    QStackTextEngine engine(_text, QFont(d.data()));
     return engine.elidedText(mode, QFixed::fromReal(width), flags);
 }
 
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index be79773..f96f66b 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -1849,8 +1849,8 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
             || e->preeditString() != cursor.block().layout()->preeditAreaText()
             || e->replacementLength() > 0;
 
+    cursor.beginEditBlock();
     if (isGettingInput) {
-        cursor.beginEditBlock();
         cursor.removeSelectedText();
     }
 
@@ -1876,7 +1876,8 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
 
     QTextBlock block = cursor.block();
     QTextLayout *layout = block.layout();
-    layout->setPreeditArea(cursor.position() - block.position(), e->preeditString());
+    if (isGettingInput)
+        layout->setPreeditArea(cursor.position() - block.position(), e->preeditString());
     QList<QTextLayout::FormatRange> overrides;
     preeditCursor = e->preeditString().length();
     hideCursor = false;
@@ -1897,9 +1898,7 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
         }
     }
     layout->setAdditionalFormats(overrides);
-
-    if (isGettingInput)
-        cursor.endEditBlock();
+    cursor.endEditBlock();
 }
 
 QVariant QTextControl::inputMethodQuery(Qt::InputMethodQuery property) const
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 048325c..523dd18 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1767,6 +1767,12 @@ void QTextDocument::print(QPrinter *printer) const
     fromPage = qMax(1, fromPage);
     toPage = qMin(doc->pageCount(), toPage);
 
+    if (toPage < fromPage) {
+        // if the user entered a page range outside the actual number
+        // of printable pages, just return
+        return;
+    }
+
     if (printer->pageOrder() == QPrinter::LastPageFirst) {
         int tmp = fromPage;
         fromPage = toPage;
diff --git a/src/gui/widgets/qabstractbutton.cpp b/src/gui/widgets/qabstractbutton.cpp
index cb46791..8834373 100644
--- a/src/gui/widgets/qabstractbutton.cpp
+++ b/src/gui/widgets/qabstractbutton.cpp
@@ -165,7 +165,7 @@ QAbstractButtonPrivate::QAbstractButtonPrivate(QSizePolicy::ControlType type)
     shortcutId(0),
 #endif
     checkable(false), checked(false), autoRepeat(false), autoExclusive(false),
-    down(false), blockRefresh(false),
+    down(false), blockRefresh(false), pressed(false),
 #ifndef QT_NO_BUTTONGROUP
     group(0),
 #endif
@@ -1090,6 +1090,7 @@ void QAbstractButton::mousePressEvent(QMouseEvent *e)
     }
     if (hitButton(e->pos())) {
         setDown(true);
+        d->pressed = true;
         repaint(); //flush paint event before invoking potentially expensive operation
         QApplication::flush();
         d->emitPressed();
@@ -1103,6 +1104,8 @@ void QAbstractButton::mousePressEvent(QMouseEvent *e)
 void QAbstractButton::mouseReleaseEvent(QMouseEvent *e)
 {
     Q_D(QAbstractButton);
+    d->pressed = false;
+
     if (e->button() != Qt::LeftButton) {
         e->ignore();
         return;
@@ -1127,7 +1130,7 @@ void QAbstractButton::mouseReleaseEvent(QMouseEvent *e)
 void QAbstractButton::mouseMoveEvent(QMouseEvent *e)
 {
     Q_D(QAbstractButton);
-    if (!(e->buttons() & Qt::LeftButton)) {
+    if (!(e->buttons() & Qt::LeftButton) || !d->pressed) {
         e->ignore();
         return;
     }
diff --git a/src/gui/widgets/qabstractbutton_p.h b/src/gui/widgets/qabstractbutton_p.h
index be7c022..d86163b 100644
--- a/src/gui/widgets/qabstractbutton_p.h
+++ b/src/gui/widgets/qabstractbutton_p.h
@@ -77,6 +77,7 @@ public:
     uint autoExclusive :1;
     uint down :1;
     uint blockRefresh :1;
+    uint pressed : 1;
 
 #ifndef QT_NO_BUTTONGROUP
     QButtonGroup* group;
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp
index e0db9c2..988a7e7 100644
--- a/src/gui/widgets/qabstractslider.cpp
+++ b/src/gui/widgets/qabstractslider.cpp
@@ -219,6 +219,10 @@ QAbstractSliderPrivate::QAbstractSliderPrivate()
       blocktracking(false), pressed(false),
       invertedAppearance(false), invertedControls(false),
       orientation(Qt::Horizontal), repeatAction(QAbstractSlider::SliderNoAction)
+#ifdef QT_KEYPAD_NAVIGATION
+      , isAutoRepeating(false)
+      , repeatMultiplier(1)
+#endif
 {
 }
 
@@ -371,6 +375,9 @@ int QAbstractSlider::maximum() const
     abstract sliders provides and typically corresponds to the user
     pressing an arrow key.
 
+    If the property is modified during an auto repeating key event, behavior
+    is undefined.
+
     \sa pageStep
 */
 
@@ -598,10 +605,10 @@ void QAbstractSlider::triggerAction(SliderAction action)
     d->blocktracking = true;
     switch (action) {
     case SliderSingleStepAdd:
-        setSliderPosition(d->overflowSafeAdd(d->singleStep));
+        setSliderPosition(d->overflowSafeAdd(d->effectiveSingleStep()));
         break;
     case SliderSingleStepSub:
-        setSliderPosition(d->overflowSafeAdd(-d->singleStep));
+        setSliderPosition(d->overflowSafeAdd(-d->effectiveSingleStep()));
         break;
     case SliderPageStepAdd:
         setSliderPosition(d->overflowSafeAdd(d->pageStep));
@@ -702,7 +709,7 @@ void QAbstractSlider::wheelEvent(QWheelEvent * e)
         // Calculate how many lines to scroll. Depending on what delta is (and 
         // offset), we might end up with a fraction (e.g. scroll 1.3 lines). We can
         // only scroll whole lines, so we keep the reminder until next event.
-        qreal stepsToScrollF = offset * QApplication::wheelScrollLines() * d->singleStep;
+        qreal stepsToScrollF = offset * QApplication::wheelScrollLines() * d->effectiveSingleStep();
         // Check if wheel changed direction since last event:
         if (d->offset_accumulated != 0 && (offset / d->offset_accumulated) < 0)
             d->offset_accumulated = 0;
@@ -773,6 +780,38 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
 {
     Q_D(QAbstractSlider);
     SliderAction action = SliderNoAction;
+#ifdef QT_KEYPAD_NAVIGATION
+    if (ev->isAutoRepeat()) {
+        if (d->firstRepeat.isNull())
+            d->firstRepeat = QTime::currentTime();
+        else if (1 == d->repeatMultiplier) {
+            // This is the interval in milli seconds which one key repetition
+            // takes.
+            const int repeatMSecs = d->firstRepeat.msecsTo(QTime::currentTime());
+
+            /**
+             * The time it takes to currently navigate the whole slider.
+             */
+            const qreal currentTimeElapse = (qreal(maximum()) / singleStep()) * repeatMSecs;
+
+            /**
+             * This is an arbitrarily determined constant in msecs that
+             * specifies how long time it should take to navigate from the
+             * start to the end(excluding starting key auto repeat).
+             */
+            const int SliderRepeatElapse = 2500;
+
+            d->repeatMultiplier = currentTimeElapse / SliderRepeatElapse;
+        }
+
+    }
+    else if (!d->firstRepeat.isNull()) {
+        d->firstRepeat = QTime();
+        d->repeatMultiplier = 1;
+    }
+
+#endif
+
     switch (ev->key()) {
 #ifdef QT_KEYPAD_NAVIGATION
         case Qt::Key_Select:
diff --git a/src/gui/widgets/qabstractslider_p.h b/src/gui/widgets/qabstractslider_p.h
index 9324d44..6591981 100644
--- a/src/gui/widgets/qabstractslider_p.h
+++ b/src/gui/widgets/qabstractslider_p.h
@@ -68,7 +68,13 @@ public:
 
     void setSteps(int single, int page);
 
-    int minimum, maximum, singleStep, pageStep, value, position, pressValue;
+    int minimum, maximum, pageStep, value, position, pressValue;
+
+    /**
+     * Call effectiveSingleStep() when changing the slider value.
+     */
+    int singleStep;
+
     float offset_accumulated;
     uint tracking : 1;
     uint blocktracking :1;
@@ -83,8 +89,33 @@ public:
     
 #ifdef QT_KEYPAD_NAVIGATION
     int origValue;
+
+    /**
+     */
+    bool isAutoRepeating;
+
+    /**
+     * When we're auto repeating, we multiply singleStep with this value to
+     * get our effective step.
+     */
+    qreal repeatMultiplier;
+
+    /**
+     * The time of when the first auto repeating key press event occurs.
+     */
+    QTime firstRepeat;
+
 #endif
 
+    inline int effectiveSingleStep() const
+    {
+        return singleStep
+#ifdef QT_KEYPAD_NAVIGATION
+        * repeatMultiplier
+#endif
+        ;
+    }
+
     inline int bound(int val) const { return qMax(minimum, qMin(maximum, val)); }
     inline int overflowSafeAdd(int add) const
     {
diff --git a/src/gui/widgets/qcommandlinkbutton.cpp b/src/gui/widgets/qcommandlinkbutton.cpp
index 9adf280..8f47f25 100644
--- a/src/gui/widgets/qcommandlinkbutton.cpp
+++ b/src/gui/widgets/qcommandlinkbutton.cpp
@@ -326,7 +326,8 @@ int QCommandLinkButton::heightForWidth(int width) const
     Q_D(const QCommandLinkButton);
     int heightWithoutDescription = d->descriptionOffset() + d->bottomMargin();
     // find the width available for the description area
-    return heightWithoutDescription + d->descriptionHeight(width);
+    return qMax(heightWithoutDescription + d->descriptionHeight(width),
+                iconSize().height() + d->topMargin() + d->bottomMargin());
 }
 
 /*! \reimp */
diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp
index 2ee5751..0e859f1 100644
--- a/src/gui/widgets/qdialogbuttonbox.cpp
+++ b/src/gui/widgets/qdialogbuttonbox.cpp
@@ -1215,6 +1215,30 @@ bool QDialogButtonBox::event(QEvent *event)
     }else if (event->type() == QEvent::LanguageChange) {
         d->retranslateStrings();
     }
+#ifdef QT_SOFTKEYS_ENABLED
+    else if (event->type() == QEvent::ParentChange) {
+        QWidget *dialog = 0;
+        QWidget *p = this;
+        while (p && !p->isWindow()) {
+            p = p->parentWidget();
+            if ((dialog = qobject_cast<QDialog *>(p)))
+                break;
+        }
+
+        // If the parent changes, then move the softkeys
+        for (QHash<QAbstractButton *, QAction *>::const_iterator it = d->softKeyActions.constBegin();
+            it != d->softKeyActions.constEnd(); ++it) {
+            QAction *current = it.value();
+            QList<QWidget *> widgets = current->associatedWidgets();
+            foreach (QWidget *w, widgets)
+                w->removeAction(current);
+            if (dialog)
+                dialog->addAction(current);
+            else
+                addAction(current);
+        }
+    }
+#endif
 
     return QWidget::event(event);
 }
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index 300a2ea..87975c3 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -138,7 +138,12 @@ void QLineControl::copy(QClipboard::Mode mode) const
 */
 void QLineControl::paste()
 {
-    insert(QApplication::clipboard()->text(QClipboard::Clipboard));
+    QString clip = QApplication::clipboard()->text(QClipboard::Clipboard);
+    if (!clip.isEmpty() || hasSelectedText()) {
+        separate(); //make it a separate undo/redo command
+        insert(clip);
+        separate();
+    }
 }
 
 #endif // !QT_NO_CLIPBOARD
@@ -1666,6 +1671,7 @@ void QLineControl::processKeyEvent(QKeyEvent* event)
     }
 #endif // QT_NO_SHORTCUT
     else {
+        bool handled = false;
 #ifdef Q_WS_MAC
         if (event->key() == Qt::Key_Up || event->key() == Qt::Key_Down) {
             Qt::KeyboardModifiers myModifiers = (event->modifiers() & ~Qt::KeypadModifier);
@@ -1683,6 +1689,7 @@ void QLineControl::processKeyEvent(QKeyEvent* event)
                     event->key() == Qt::Key_Up ? home(0) : end(0);
                 }
             }
+            handled = true;
         }
 #endif
         if (event->modifiers() & Qt::ControlModifier) {
@@ -1715,7 +1722,8 @@ void QLineControl::processKeyEvent(QKeyEvent* event)
             break;
 #endif
             default:
-                unknown = true;
+                if (!handled)
+                    unknown = true;
             }
         } else { // ### check for *no* modifier
             switch (event->key()) {
@@ -1748,7 +1756,8 @@ void QLineControl::processKeyEvent(QKeyEvent* event)
 #endif
 
             default:
-                unknown = true;
+                if (!handled)
+                    unknown = true;
             }
         }
     }
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp
index 9f3fe4f..3800224 100644
--- a/src/gui/widgets/qlineedit.cpp
+++ b/src/gui/widgets/qlineedit.cpp
@@ -2004,38 +2004,48 @@ QMenu *QLineEdit::createStandardContextMenu()
     Q_D(QLineEdit);
     QMenu *popup = new QMenu(this);
     popup->setObjectName(QLatin1String("qt_edit_menu"));
+    QAction *action = 0;
 
-    QAction *action = popup->addAction(QLineEdit::tr("&Undo") + ACCEL_KEY(QKeySequence::Undo));
-    action->setEnabled(d->control->isUndoAvailable());
-    connect(action, SIGNAL(triggered()), SLOT(undo()));
+    if (!isReadOnly()) {
+        action = popup->addAction(QLineEdit::tr("&Undo") + ACCEL_KEY(QKeySequence::Undo));
+        action->setEnabled(d->control->isUndoAvailable());
+        connect(action, SIGNAL(triggered()), SLOT(undo()));
 
-    action = popup->addAction(QLineEdit::tr("&Redo") + ACCEL_KEY(QKeySequence::Redo));
-    action->setEnabled(d->control->isRedoAvailable());
-    connect(action, SIGNAL(triggered()), SLOT(redo()));
+        action = popup->addAction(QLineEdit::tr("&Redo") + ACCEL_KEY(QKeySequence::Redo));
+        action->setEnabled(d->control->isRedoAvailable());
+        connect(action, SIGNAL(triggered()), SLOT(redo()));
 
-    popup->addSeparator();
+        popup->addSeparator();
+    }
 
 #ifndef QT_NO_CLIPBOARD
-    action = popup->addAction(QLineEdit::tr("Cu&t") + ACCEL_KEY(QKeySequence::Cut));
-    action->setEnabled(!d->control->isReadOnly() && d->control->hasSelectedText()
-            && d->control->echoMode() == QLineEdit::Normal);
-    connect(action, SIGNAL(triggered()), SLOT(cut()));
+    if (!isReadOnly()) {
+        action = popup->addAction(QLineEdit::tr("Cu&t") + ACCEL_KEY(QKeySequence::Cut));
+        action->setEnabled(!d->control->isReadOnly() && d->control->hasSelectedText()
+                && d->control->echoMode() == QLineEdit::Normal);
+        connect(action, SIGNAL(triggered()), SLOT(cut()));
+    }
 
     action = popup->addAction(QLineEdit::tr("&Copy") + ACCEL_KEY(QKeySequence::Copy));
     action->setEnabled(d->control->hasSelectedText()
             && d->control->echoMode() == QLineEdit::Normal);
     connect(action, SIGNAL(triggered()), SLOT(copy()));
 
-    action = popup->addAction(QLineEdit::tr("&Paste") + ACCEL_KEY(QKeySequence::Paste));
-    action->setEnabled(!d->control->isReadOnly() && !QApplication::clipboard()->text().isEmpty());
-    connect(action, SIGNAL(triggered()), SLOT(paste()));
+    if (!isReadOnly()) {
+        action = popup->addAction(QLineEdit::tr("&Paste") + ACCEL_KEY(QKeySequence::Paste));
+        action->setEnabled(!d->control->isReadOnly() && !QApplication::clipboard()->text().isEmpty());
+        connect(action, SIGNAL(triggered()), SLOT(paste()));
+    }
 #endif
 
-    action = popup->addAction(QLineEdit::tr("Delete"));
-    action->setEnabled(!d->control->isReadOnly() && !d->control->text().isEmpty() && d->control->hasSelectedText());
-    connect(action, SIGNAL(triggered()), d->control, SLOT(_q_deleteSelected()));
+    if (!isReadOnly()) {
+        action = popup->addAction(QLineEdit::tr("Delete"));
+        action->setEnabled(!d->control->isReadOnly() && !d->control->text().isEmpty() && d->control->hasSelectedText());
+        connect(action, SIGNAL(triggered()), d->control, SLOT(_q_deleteSelected()));
+    }
 
-    popup->addSeparator();
+    if (!popup->isEmpty())
+        popup->addSeparator();
 
     action = popup->addAction(QLineEdit::tr("Select All") + ACCEL_KEY(QKeySequence::SelectAll));
     action->setEnabled(!d->control->text().isEmpty() && !d->control->allSelected());
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp
index 148da1b..d03c003 100644
--- a/src/gui/widgets/qlineedit_p.cpp
+++ b/src/gui/widgets/qlineedit_p.cpp
@@ -131,12 +131,12 @@ void QLineEditPrivate::init(const QString& txt)
     Q_Q(QLineEdit);
     control = new QLineControl(txt);
     control->setFont(q->font());
-    QObject::connect(control, SIGNAL(textChanged(const QString &)),
-            q, SIGNAL(textChanged(const QString &)));
-    QObject::connect(control, SIGNAL(textEdited(const QString &)),
-            q, SLOT(_q_textEdited(const QString &)));
-    QObject::connect(control, SIGNAL(cursorPositionChanged(int, int)),
-            q, SLOT(_q_cursorPositionChanged(int, int)));
+    QObject::connect(control, SIGNAL(textChanged(QString)),
+            q, SIGNAL(textChanged(QString)));
+    QObject::connect(control, SIGNAL(textEdited(QString)),
+            q, SLOT(_q_textEdited(QString)));
+    QObject::connect(control, SIGNAL(cursorPositionChanged(int,int)),
+            q, SLOT(_q_cursorPositionChanged(int,int)));
     QObject::connect(control, SIGNAL(selectionChanged()),
             q, SIGNAL(selectionChanged()));
     QObject::connect(control, SIGNAL(accepted()),
@@ -147,17 +147,17 @@ void QLineEditPrivate::init(const QString& txt)
     QObject::connect(control, SIGNAL(editFocusChange(bool)),
             q, SLOT(_q_editFocusChange(bool)));
 #endif
-    QObject::connect(control, SIGNAL(cursorPositionChanged(int, int)),
+    QObject::connect(control, SIGNAL(cursorPositionChanged(int,int)),
             q, SLOT(updateMicroFocus()));
 
     // for now, going completely overboard with updates.
     QObject::connect(control, SIGNAL(selectionChanged()),
             q, SLOT(update()));
 
-    QObject::connect(control, SIGNAL(displayTextChanged(const QString &)),
+    QObject::connect(control, SIGNAL(displayTextChanged(QString)),
             q, SLOT(update()));
 
-    QObject::connect(control, SIGNAL(updateNeeded(const QRect &)),
+    QObject::connect(control, SIGNAL(updateNeeded(QRect)),
             q, SLOT(update()));
 
     QStyleOptionFrameV2 opt;
diff --git a/src/gui/widgets/qmdiarea.cpp b/src/gui/widgets/qmdiarea.cpp
index 60c5d7b..f3dbe34 100644
--- a/src/gui/widgets/qmdiarea.cpp
+++ b/src/gui/widgets/qmdiarea.cpp
@@ -841,8 +841,8 @@ void QMdiAreaPrivate::appendChild(QMdiSubWindow *child)
     child->installEventFilter(q);
 
     QObject::connect(child, SIGNAL(aboutToActivate()), q, SLOT(_q_deactivateAllWindows()));
-    QObject::connect(child, SIGNAL(windowStateChanged(Qt::WindowStates, Qt::WindowStates)),
-                     q, SLOT(_q_processWindowStateChanged(Qt::WindowStates, Qt::WindowStates)));
+    QObject::connect(child, SIGNAL(windowStateChanged(Qt::WindowStates,Qt::WindowStates)),
+                     q, SLOT(_q_processWindowStateChanged(Qt::WindowStates,Qt::WindowStates)));
 }
 
 /*!
@@ -1947,8 +1947,10 @@ QMdiSubWindow *QMdiArea::addSubWindow(QWidget *widget, Qt::WindowFlags windowFla
 /*!
     Removes \a widget from the MDI area. The \a widget must be
     either a QMdiSubWindow or a widget that is the internal widget of
-    a subwindow. Note that the subwindow is not deleted by QMdiArea
-    and that its parent is set to 0.
+    a subwindow. Note \a widget is never actually deleted by QMdiArea.
+    If a QMdiSubWindow is passed in its parent is set to 0 and it is
+    removed, but if an internal widget is passed in the child widget
+    is set to 0 but the QMdiSubWindow is not removed.
 
     \sa addSubWindow()
 */
diff --git a/src/gui/widgets/qmdisubwindow.cpp b/src/gui/widgets/qmdisubwindow.cpp
index b5e28da..350f8579 100644
--- a/src/gui/widgets/qmdisubwindow.cpp
+++ b/src/gui/widgets/qmdisubwindow.cpp
@@ -2268,8 +2268,8 @@ QMdiSubWindow::QMdiSubWindow(QWidget *parent, Qt::WindowFlags flags)
     else
         d->menuIcon = windowIcon();
 #endif
-    connect(qApp, SIGNAL(focusChanged(QWidget *, QWidget *)),
-            this, SLOT(_q_processFocusChanged(QWidget *, QWidget *)));
+    connect(qApp, SIGNAL(focusChanged(QWidget*,QWidget*)),
+            this, SLOT(_q_processFocusChanged(QWidget*,QWidget*)));
 }
 
 /*!
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index fc88d06..761a060 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -654,6 +654,24 @@ void QMenuPrivate::_q_overrideMenuActionDestroyed()
     menuAction=defaultMenuAction;
 }
 
+
+void QMenuPrivate::updateLayoutDirection()
+{
+    Q_Q(QMenu);
+    //we need to mimic the cause of the popup's layout direction
+    //to allow setting it on a mainwindow for example
+    //we call setLayoutDirection_helper to not overwrite a user-defined value
+    if (!q->testAttribute(Qt::WA_SetLayoutDirection)) {
+        if (QWidget *w = causedPopup.widget)
+            setLayoutDirection_helper(w->layoutDirection());
+        else if (QWidget *w = q->parentWidget())
+            setLayoutDirection_helper(w->layoutDirection());
+        else
+            setLayoutDirection_helper(QApplication::layoutDirection());
+    }
+}
+
+
 /*!
     Returns the action associated with this menu.
 */
@@ -1797,6 +1815,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     d->tearoffHighlighted = 0;
     d->motions = 0;
     d->doChildEffects = true;
+    d->updateLayoutDirection();
 
 #ifndef QT_NO_MENUBAR
     // if this menu is part of a chain attached to a QMenuBar, set the
@@ -2347,6 +2366,9 @@ QMenu::event(QEvent *e)
 {
     Q_D(QMenu);
     switch (e->type()) {
+    case QEvent::Polish:
+        d->updateLayoutDirection();
+        break;
     case QEvent::ShortcutOverride: {
             QKeyEvent *kev = static_cast<QKeyEvent*>(e);
             if (kev->key() == Qt::Key_Up || kev->key() == Qt::Key_Down
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 9510cc6..30bbd31 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -763,7 +763,9 @@ QMacMenuAction::~QMacMenuAction()
 {
 #ifdef QT_MAC_USE_COCOA
     [menu release];
-    if (action) {
+    // Update the menu item if this action still owns it. For some items
+    // (like 'Quit') ownership will be transferred between all menu bars...
+    if (action && action.data() == reinterpret_cast<QAction *>([menuItem tag])) {
         QAction::MenuRole role = action->menuRole();
         // Check if the item is owned by Qt, and should be hidden to keep it from causing
         // problems. Do it for everything but the quit menu item since that should always
@@ -774,8 +776,8 @@ QMacMenuAction::~QMacMenuAction()
                    && menuItem != [getMenuLoader() quitMenuItem]) {
             [menuItem setHidden:YES];
         }
+        [menuItem setTag:nil];
     }
-    [menuItem setTag:nil];
     [menuItem release];
 #endif
 }
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index c021063..5757885 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -292,6 +292,9 @@ public:
 
     bool hasMouseMoved(const QPoint &globalPos);
 
+    void updateLayoutDirection();
+
+
     //menu fading/scrolling effects
     bool doChildEffects;
 
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index b1ff662..599f15b 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -736,6 +736,9 @@ void QMenuBarPrivate::init()
         if(wce_menubar)
             q->hide();
     }
+    else {
+        QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
+    }
 #endif
 #ifdef Q_WS_S60
     symbianCreateMenuBar(q->parentWidget());
@@ -1486,7 +1489,8 @@ bool QMenuBar::event(QEvent *e)
     break;
     case QEvent::ShortcutOverride: {
         QKeyEvent *kev = static_cast<QKeyEvent*>(e);
-        if (kev->key() == Qt::Key_Escape) {
+        //we only filter out escape if there is a current action
+        if (kev->key() == Qt::Key_Escape && d->currentAction) {
             e->accept();
             return true;
         }
@@ -1934,7 +1938,7 @@ void QMenuBar::setDefaultAction(QAction *act)
     if (qt_wince_is_mobile())
         if (d->defaultAction) {
             disconnect(d->defaultAction, SIGNAL(changed()), this, SLOT(_q_updateDefaultAction()));
-            disconnect(d->defaultAction, SIGNAL(destroyed ()), this, SLOT(_q_updateDefaultAction()));
+            disconnect(d->defaultAction, SIGNAL(destroyed()), this, SLOT(_q_updateDefaultAction()));
         }
 #endif
     d->defaultAction = act;
diff --git a/src/gui/widgets/qsizegrip.cpp b/src/gui/widgets/qsizegrip.cpp
index cf193dc..6575dbb 100644
--- a/src/gui/widgets/qsizegrip.cpp
+++ b/src/gui/widgets/qsizegrip.cpp
@@ -99,6 +99,7 @@ public:
     int dyMax;
     Qt::Corner m_corner;
     bool gotMousePress;
+    QWidget *tlw;
 #ifdef Q_WS_MAC
     void updateMacSizer(bool hide) const;
 #endif
@@ -113,6 +114,19 @@ public:
         return m_corner == Qt::BottomLeftCorner || m_corner == Qt::TopLeftCorner;
     }
 
+    void updateTopLevelWidget()
+    {
+        Q_Q(QSizeGrip);
+        QWidget *w = qt_sizegrip_topLevelWidget(q);
+        if (tlw == w)
+            return;
+        if (tlw)
+            tlw->removeEventFilter(q);
+        tlw = w;
+        if (tlw)
+            tlw->installEventFilter(q);
+    }
+
     // This slot is invoked by QLayout when the size grip is added to
     // a layout or reparented after the tlw is shown. This re-implementation is basically
     // the same as QWidgetPrivate::_q_showIfNotHidden except that it checks
@@ -121,7 +135,7 @@ public:
     {
         Q_Q(QSizeGrip);
         bool showSizeGrip = !(q->isHidden() && q->testAttribute(Qt::WA_WState_ExplicitShowHide));
-        QWidget *tlw = qt_sizegrip_topLevelWidget(q);
+        updateTopLevelWidget();
         if (tlw && showSizeGrip) {
             Qt::WindowStates sizeGripNotVisibleState = Qt::WindowFullScreen;
 #ifndef Q_WS_MAC
@@ -232,6 +246,7 @@ void QSizeGripPrivate::init()
     Q_Q(QSizeGrip);
     dxMax = 0;
     dyMax = 0;
+    tlw = 0;
     m_corner = q->isLeftToRight() ? Qt::BottomRightCorner : Qt::BottomLeftCorner;
     gotMousePress = false;
 
@@ -240,8 +255,7 @@ void QSizeGripPrivate::init()
                  ? Qt::SizeFDiagCursor : Qt::SizeBDiagCursor);
 #endif
     q->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed));
-    QWidget *tlw = qt_sizegrip_topLevelWidget(q);
-    tlw->installEventFilter(q);
+    updateTopLevelWidget();
 }
 
 
@@ -524,19 +538,18 @@ void QSizeGrip::setVisible(bool visible)
 /*! \reimp */
 bool QSizeGrip::eventFilter(QObject *o, QEvent *e)
 {
+    Q_D(QSizeGrip);
     if ((isHidden() && testAttribute(Qt::WA_WState_ExplicitShowHide))
-        || e->type() != QEvent::WindowStateChange) {
+        || e->type() != QEvent::WindowStateChange
+		|| o != d->tlw) {
         return QWidget::eventFilter(o, e);
     }
-    QWidget *tlw = qt_sizegrip_topLevelWidget(this);
-    if (o != tlw)
-        return QWidget::eventFilter(o, e);
     Qt::WindowStates sizeGripNotVisibleState = Qt::WindowFullScreen;
 #ifndef Q_WS_MAC
     sizeGripNotVisibleState |= Qt::WindowMaximized;
 #endif
     // Don't show the size grip if the tlw is maximized or in full screen mode.
-    setVisible(!(tlw->windowState() & sizeGripNotVisibleState));
+    setVisible(!(d->tlw->windowState() & sizeGripNotVisibleState));
     setAttribute(Qt::WA_WState_ExplicitShowHide, false);
     return QWidget::eventFilter(o, e);
 }
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index 3935c55..8ef6017 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -1948,7 +1948,8 @@ void QTabBar::changeEvent(QEvent *event)
     Q_D(QTabBar);
     if (event->type() == QEvent::StyleChange) {
         d->elideMode = Qt::TextElideMode(style()->styleHint(QStyle::SH_TabBar_ElideMode, 0, this));
-        d->useScrollButtons = !style()->styleHint(QStyle::SH_TabBar_PreferNoArrows, 0, this);
+        if (!d->useScrollButtonsSetByUser)
+            d->useScrollButtons = !style()->styleHint(QStyle::SH_TabBar_PreferNoArrows, 0, this);
         d->refresh();
     } else if (event->type() == QEvent::FontChange) {
         d->refresh();
@@ -2003,6 +2004,7 @@ bool QTabBar::usesScrollButtons() const
 void QTabBar::setUsesScrollButtons(bool useButtons)
 {
     Q_D(QTabBar);
+    d->useScrollButtonsSetByUser = true;
     if (d->useScrollButtons == useButtons)
         return;
     d->useScrollButtons = useButtons;
diff --git a/src/gui/widgets/qtabbar_p.h b/src/gui/widgets/qtabbar_p.h
index 9f3285b..2e8fb6d 100644
--- a/src/gui/widgets/qtabbar_p.h
+++ b/src/gui/widgets/qtabbar_p.h
@@ -75,7 +75,7 @@ class QTabBarPrivate  : public QWidgetPrivate
 public:
     QTabBarPrivate()
         :currentIndex(-1), pressedIndex(-1), shape(QTabBar::RoundedNorth), layoutDirty(false),
-        drawBase(true), scrollOffset(0), expanding(true), closeButtonOnTabs(false),
+        drawBase(true), scrollOffset(0), useScrollButtonsSetByUser(false) , expanding(true), closeButtonOnTabs(false),
         selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false),
         dragInProgress(false), documentMode(false), movingTab(0)
 #ifdef Q_WS_MAC
@@ -187,6 +187,7 @@ public:
     QSize iconSize;
     Qt::TextElideMode elideMode;
     bool useScrollButtons;
+    bool useScrollButtonsSetByUser;
 
     bool expanding;
     bool closeButtonOnTabs;
diff --git a/src/gui/widgets/qtabwidget.cpp b/src/gui/widgets/qtabwidget.cpp
index d22bd54..49651a3 100644
--- a/src/gui/widgets/qtabwidget.cpp
+++ b/src/gui/widgets/qtabwidget.cpp
@@ -699,8 +699,8 @@ void QTabWidget::setTabBar(QTabBar* tb)
     setFocusProxy(d->tabs);
     connect(d->tabs, SIGNAL(currentChanged(int)),
             this, SLOT(_q_showTab(int)));
-    connect(d->tabs, SIGNAL(tabMoved(int, int)),
-            this, SLOT(_q_tabMoved(int, int)));
+    connect(d->tabs, SIGNAL(tabMoved(int,int)),
+            this, SLOT(_q_tabMoved(int,int)));
     if (d->tabs->tabsClosable())
         connect(d->tabs, SIGNAL(tabCloseRequested(int)),
                 this, SIGNAL(tabCloseRequested(int)));
diff --git a/src/gui/widgets/qtoolbararealayout_p.h b/src/gui/widgets/qtoolbararealayout_p.h
index f0ab80c..134e95a 100644
--- a/src/gui/widgets/qtoolbararealayout_p.h
+++ b/src/gui/widgets/qtoolbararealayout_p.h
@@ -118,7 +118,7 @@ public:
 
     void extendSize(Qt::Orientation o, int extent)
     {
-        int newSize = qMax(pick(o, minimumSize()), (preferredSize > 0 ? preferredSize : size) + extent);
+        int newSize = qMax(pick(o, minimumSize()), (preferredSize > 0 ? preferredSize : pick(o, sizeHint())) + extent);
         int sizeh = pick(o, sizeHint());
         if (newSize == sizeh) {
             preferredSize = -1;
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index f006fba..7365435 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -3115,14 +3115,14 @@ void QHttpPrivate::setSock(QTcpSocket *sock)
     QObject::connect(socket, SIGNAL(bytesWritten(qint64)),
                      q, SLOT(_q_slotBytesWritten(qint64)));
 #ifndef QT_NO_NETWORKPROXY
-    QObject::connect(socket, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)),
-                     q, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)));
+    QObject::connect(socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+                     q, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
 #endif
 
 #ifndef QT_NO_OPENSSL
     if (qobject_cast<QSslSocket *>(socket)) {
-        QObject::connect(socket, SIGNAL(sslErrors(const QList<QSslError> &)),
-                         q, SIGNAL(sslErrors(const QList<QSslError> &)));
+        QObject::connect(socket, SIGNAL(sslErrors(QList<QSslError>)),
+                         q, SIGNAL(sslErrors(QList<QSslError>)));
         QObject::connect(socket, SIGNAL(encryptedBytesWritten(qint64)),
                          q, SLOT(_q_slotEncryptedBytesWritten(qint64)));
     }
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 6962ab3..fa89fcc 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -90,8 +90,8 @@ void QHttpNetworkConnectionChannel::init()
                      this, SLOT(_q_error(QAbstractSocket::SocketError)),
                      Qt::DirectConnection);
 #ifndef QT_NO_NETWORKPROXY
-    QObject::connect(socket, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
-                     this, SLOT(_q_proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
+    QObject::connect(socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+                     this, SLOT(_q_proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
                      Qt::DirectConnection);
 #endif
 
@@ -102,8 +102,8 @@ void QHttpNetworkConnectionChannel::init()
         QObject::connect(sslSocket, SIGNAL(encrypted()),
                          this, SLOT(_q_encrypted()),
                          Qt::DirectConnection);
-        QObject::connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError>&)),
-                         this, SLOT(_q_sslErrors(const QList<QSslError>&)),
+        QObject::connect(sslSocket, SIGNAL(sslErrors(QList<QSslError>)),
+                         this, SLOT(_q_sslErrors(QList<QSslError>)),
                          Qt::DirectConnection);
         QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)),
                          this, SLOT(_q_encryptedBytesWritten(qint64)),
@@ -774,6 +774,8 @@ void QHttpNetworkConnectionChannel::_q_connected()
 {
     // improve performance since we get the request sent by the kernel ASAP
     socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
+    // not sure yet if it helps, but it makes sense
+    socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
 
     pipeliningSupported = QHttpNetworkConnectionChannel::PipeliningSupportUnknown;
 
diff --git a/src/network/access/qnetworkcookiejar.cpp b/src/network/access/qnetworkcookiejar.cpp
index 19f7217..f826115 100644
--- a/src/network/access/qnetworkcookiejar.cpp
+++ b/src/network/access/qnetworkcookiejar.cpp
@@ -192,9 +192,10 @@ bool QNetworkCookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieLis
         // validate the cookie & set the defaults if unset
         if (cookie.path().isEmpty())
             cookie.setPath(defaultPath);
-        else if (!isParentPath(pathAndFileName, cookie.path()))
-            continue;           // not accepted
-
+        // don't do path checking. See http://bugreports.qt.nokia.com/browse/QTBUG-5815
+//        else if (!isParentPath(pathAndFileName, cookie.path())) {
+//            continue;           // not accepted
+//        }
         if (cookie.domain().isEmpty()) {
             cookie.setDomain(defaultDomain);
         } else {
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp
index 6f92424..0e2dd2b 100644
--- a/src/network/kernel/qnetworkproxy_win.cpp
+++ b/src/network/kernel/qnetworkproxy_win.cpp
@@ -291,7 +291,10 @@ void QWindowsSystemProxy::init()
             GlobalFree(ieProxyConfig.lpszAutoConfigUrl);
         }
         if (ieProxyConfig.lpszProxy) {
-            proxyServerList << QString::fromWCharArray(ieProxyConfig.lpszProxy);
+            // http://msdn.microsoft.com/en-us/library/aa384250%28VS.85%29.aspx speaks only about a "proxy URL",
+            // not multiple URLs. However we tested this and it can return multiple URLs. So we use splitSpaceSemicolon
+            // on it.
+            proxyServerList = splitSpaceSemicolon(QString::fromWCharArray(ieProxyConfig.lpszProxy));
             GlobalFree(ieProxyConfig.lpszProxy);
         }
         if (ieProxyConfig.lpszProxyBypass) {
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index ecf5ad9..5d17022 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -876,7 +876,7 @@ bool QNativeSocketEngine::waitForRead(int msecs, bool *timedOut)
 */
 bool QNativeSocketEngine::waitForWrite(int msecs, bool *timedOut)
 {
-    Q_D(const QNativeSocketEngine);
+    Q_D(QNativeSocketEngine);
     Q_CHECK_VALID_SOCKETLAYER(QNativeSocketEngine::waitForWrite(), false);
     Q_CHECK_NOT_STATE(QNativeSocketEngine::waitForWrite(),
                       QAbstractSocket::UnconnectedState, false);
@@ -893,6 +893,24 @@ bool QNativeSocketEngine::waitForWrite(int msecs, bool *timedOut)
         setState(QAbstractSocket::ConnectedState);
         d_func()->fetchConnectionParameters();
         return true;
+    } else {
+        int value = 0;
+        int valueSize = sizeof(value);
+        if (::getsockopt(d->socketDescriptor, SOL_SOCKET, SO_ERROR, (char *) &value, &valueSize) == 0) {
+            if (value == WSAECONNREFUSED) {
+                d->setError(QAbstractSocket::ConnectionRefusedError, QNativeSocketEnginePrivate::ConnectionRefusedErrorString);
+                d->socketState = QAbstractSocket::UnconnectedState;
+                return false;
+            } else if (value == WSAETIMEDOUT) {
+                d->setError(QAbstractSocket::NetworkError, QNativeSocketEnginePrivate::ConnectionTimeOutErrorString);
+                d->socketState = QAbstractSocket::UnconnectedState;
+                return false;
+            } else if (value == WSAEHOSTUNREACH) {
+                d->setError(QAbstractSocket::NetworkError, QNativeSocketEnginePrivate::HostUnreachableErrorString);
+                d->socketState = QAbstractSocket::UnconnectedState;
+                return false;
+            }
+        }
     }
 #endif
 
@@ -913,7 +931,7 @@ bool QNativeSocketEngine::waitForReadOrWrite(bool *readyToRead, bool *readyToWri
                                       bool checkRead, bool checkWrite,
                                       int msecs, bool *timedOut)
 {
-    Q_D(const QNativeSocketEngine);
+    Q_D(QNativeSocketEngine);
     Q_CHECK_VALID_SOCKETLAYER(QNativeSocketEngine::waitForWrite(), false);
     Q_CHECK_NOT_STATE(QNativeSocketEngine::waitForReadOrWrite(),
                       QAbstractSocket::UnconnectedState, false);
@@ -927,6 +945,24 @@ bool QNativeSocketEngine::waitForReadOrWrite(bool *readyToRead, bool *readyToWri
         setState(QAbstractSocket::ConnectedState);
         d_func()->fetchConnectionParameters();
         return true;
+    } else {
+        int value = 0;
+        int valueSize = sizeof(value);
+        if (::getsockopt(d->socketDescriptor, SOL_SOCKET, SO_ERROR, (char *) &value, &valueSize) == 0) {
+            if (value == WSAECONNREFUSED) {
+                d->setError(QAbstractSocket::ConnectionRefusedError, QNativeSocketEnginePrivate::ConnectionRefusedErrorString);
+                d->socketState = QAbstractSocket::UnconnectedState;
+                return false;
+            } else if (value == WSAETIMEDOUT) {
+                d->setError(QAbstractSocket::NetworkError, QNativeSocketEnginePrivate::ConnectionTimeOutErrorString);
+                d->socketState = QAbstractSocket::UnconnectedState;
+                return false;
+            } else if (value == WSAEHOSTUNREACH) {
+                d->setError(QAbstractSocket::NetworkError, QNativeSocketEnginePrivate::HostUnreachableErrorString);
+                d->socketState = QAbstractSocket::UnconnectedState;
+                return false;
+            }
+        }
     }
 #endif
     if (ret == 0) {
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp
index 63fe78e..91f930a 100644
--- a/src/network/socket/qnativesocketengine_win.cpp
+++ b/src/network/socket/qnativesocketengine_win.cpp
@@ -1107,10 +1107,22 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) co
     tv.tv_sec = timeout / 1000;
     tv.tv_usec = (timeout % 1000) * 1000;
 
-    if (selectForRead)
+    if (selectForRead) {
         ret = select(0, &fds, 0, 0, timeout < 0 ? 0 : &tv);
-    else
-        ret = select(0, 0, &fds, 0, timeout < 0 ? 0 : &tv);
+    } else {
+        // select for write
+
+        // Windows needs this to report errors when connecting a socket ...
+        fd_set fdexception;
+        FD_ZERO(&fdexception);
+        FD_SET(socketDescriptor, &fdexception);
+
+        ret = select(0, 0, &fds, &fdexception, timeout < 0 ? 0 : &tv);
+
+        // ... but if it is actually set, pretend it did not happen
+        if (ret > 0 && FD_ISSET(socketDescriptor, &fdexception))
+            ret--;
+    }
 
     if (readEnabled)
         readNotifier->setEnabled(true);
@@ -1125,9 +1137,10 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout,
     bool readEnabled = checkRead && readNotifier && readNotifier->isEnabled();
     if (readEnabled)
         readNotifier->setEnabled(false);
-    
+
     fd_set fdread;
     fd_set fdwrite;
+    fd_set fdexception;
 
     int ret = 0;
 
@@ -1137,9 +1150,13 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout,
         fdread.fd_array[0] = socketDescriptor;
     }
     memset(&fdwrite, 0, sizeof(fd_set));
+    FD_ZERO(&fdexception);
     if (checkWrite) {
         fdwrite.fd_count = 1;
         fdwrite.fd_array[0] = socketDescriptor;
+
+        // Windows needs this to report errors when connecting a socket
+        FD_SET(socketDescriptor, &fdexception);
     }
 
     struct timeval tv;
@@ -1147,10 +1164,15 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout,
     tv.tv_usec = (timeout % 1000) * 1000;
 
 #if !defined(Q_OS_WINCE)
-    ret = select(socketDescriptor + 1, &fdread, &fdwrite, 0, timeout < 0 ? 0 : &tv);
+    ret = select(socketDescriptor + 1, &fdread, &fdwrite, &fdexception, timeout < 0 ? 0 : &tv);
 #else
-    ret = select(1, &fdread, &fdwrite, 0, timeout < 0 ? 0 : &tv);
+    ret = select(1, &fdread, &fdwrite, &fdexception, timeout < 0 ? 0 : &tv);
 #endif
+
+     //... but if it is actually set, pretend it did not happen
+    if (ret > 0 && FD_ISSET(socketDescriptor, &fdexception))
+        ret--;
+
     if (readEnabled)
         readNotifier->setEnabled(true);
 
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 8c5bf0e..823f919 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -158,8 +158,8 @@ QGLTextureGlyphCache::QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyph
     , m_height(0)
 {
     glGenFramebuffers(1, &m_fbo);
-    connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext *)),
-            SLOT(contextDestroyed(const QGLContext *)));
+    connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext*)),
+            SLOT(contextDestroyed(const QGLContext*)));
 }
 
 QGLTextureGlyphCache::~QGLTextureGlyphCache()
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index aa6b6c9..8ab17a0 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -248,8 +248,8 @@ public:
           bound(false)
     {
         connect(QGLSignalProxy::instance(),
-                SIGNAL(aboutToDestroyContext(const QGLContext *)),
-                SLOT(cleanupGLContextRefs(const QGLContext *)));
+                SIGNAL(aboutToDestroyContext(const QGLContext*)),
+                SLOT(cleanupGLContextRefs(const QGLContext*)));
     }
 
     inline void setDevice(QPaintDevice *pdev);
@@ -525,8 +525,8 @@ public:
     QGLProgramCache() {
         // we have to know when a context is deleted so we can free
         // any program handles it holds
-        connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext *)),
-                SLOT(cleanupPrograms(const QGLContext *)));
+        connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext*)),
+                SLOT(cleanupPrograms(const QGLContext*)));
 
     }
     ~QGLProgramCache() {
@@ -639,8 +639,8 @@ public:
         : p(priv)
     {
         connect(QGLSignalProxy::instance(),
-                SIGNAL(aboutToDestroyContext(const QGLContext *)),
-                SLOT(cleanupGLContextRefs(const QGLContext *)));
+                SIGNAL(aboutToDestroyContext(const QGLContext*)),
+                SLOT(cleanupGLContextRefs(const QGLContext*)));
     }
 
 public Q_SLOTS:
@@ -1010,8 +1010,8 @@ public:
     QGLGradientCache() : QObject(), buffer_ctx(0)
     {
         connect(QGLSignalProxy::instance(),
-                SIGNAL(aboutToDestroyContext(const QGLContext *)),
-                SLOT(cleanupGLContextRefs(const QGLContext *)));
+                SIGNAL(aboutToDestroyContext(const QGLContext*)),
+                SLOT(cleanupGLContextRefs(const QGLContext*)));
     }
 
     inline GLuint getBuffer(const QGradient &gradient, qreal opacity, QGLContext *ctx) {
@@ -4712,8 +4712,8 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, const QTextItemInt &ti,
             QWidget *widget = static_cast<QWidget *>(context->device());
             connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)));
             connect(QGLSignalProxy::instance(),
-                    SIGNAL(aboutToDestroyContext(const QGLContext *)),
-                    SLOT(cleanupContext(const QGLContext *)));
+                    SIGNAL(aboutToDestroyContext(const QGLContext*)),
+                    SLOT(cleanupContext(const QGLContext*)));
         }
     } else {
         font_cache = dev_it.value();
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index f1f5976..e353f5d 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -374,7 +374,7 @@ void QGLWindowSurface::hijackWindow(QWidget *widget)
 
     union { QGLContext **ctxPtr; void **voidPtr; };
 
-    connect(widget, SIGNAL(destroyed(QObject *)), this, SLOT(deleted(QObject *)));
+    connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(deleted(QObject*)));
 
     voidPtr = &widgetPrivate->extraData()->glContext;
     d_ptr->contexts << ctxPtr;
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 75b7fa5..fda4b10 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -3407,6 +3407,34 @@ void QVGPaintEngine::restoreState(QPaintEngine::DirtyFlags dirty)
 #endif
 }
 
+void QVGPaintEngine::fillRegion
+    (const QRegion& region, const QColor& color, const QSize& surfaceSize)
+{
+    Q_D(QVGPaintEngine);
+    if (d->clearColor != color || d->clearOpacity != 1.0f) {
+        VGfloat values[4];
+        values[0] = color.redF();
+        values[1] = color.greenF();
+        values[2] = color.blueF();
+        values[3] = color.alphaF();
+        vgSetfv(VG_CLEAR_COLOR, 4, values);
+        d->clearColor = color;
+        d->clearOpacity = 1.0f;
+    }
+    if (region.rectCount() == 1) {
+        QRect r = region.boundingRect();
+        vgClear(r.x(), surfaceSize.height() - r.y() - r.height(),
+                r.width(), r.height());
+    } else {
+        const QVector<QRect> rects = region.rects();
+        for (int i = 0; i < rects.size(); ++i) {
+            QRect r = rects.at(i);
+            vgClear(r.x(), surfaceSize.height() - r.y() - r.height(),
+                    r.width(), r.height());
+        }
+    }
+}
+
 #if !defined(QVG_NO_SINGLE_CONTEXT) && !defined(QT_NO_EGL)
 
 QVGCompositionHelper::QVGCompositionHelper()
diff --git a/src/openvg/qpaintengine_vg_p.h b/src/openvg/qpaintengine_vg_p.h
index 1202b55..86a522a 100644
--- a/src/openvg/qpaintengine_vg_p.h
+++ b/src/openvg/qpaintengine_vg_p.h
@@ -151,6 +151,8 @@ public:
 
     QVGPaintEnginePrivate *vgPrivate() { Q_D(QVGPaintEngine); return d; }
 
+    void fillRegion(const QRegion& region, const QColor& color, const QSize& surfaceSize);
+
 protected:
     QVGPaintEngine(QVGPaintEnginePrivate &data);
 
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index 3254aa3..19c90ed 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -92,7 +92,6 @@ QVGPixmapData::~QVGPixmapData()
         vgDestroyImage(vgImage);
         if (vgImageOpacity != VG_INVALID_HANDLE)
             vgDestroyImage(vgImageOpacity);
-        } else {
 #endif
     }
 #if !defined(QT_NO_EGL)
@@ -202,6 +201,14 @@ QPaintEngine* QVGPixmapData::paintEngine() const
     return source.paintEngine();
 }
 
+// This function works around QImage::bits() making a deep copy if the
+// QImage is not const.  We force it to be const and then get the bits.
+// XXX: Should add a QImage::constBits() in the future to replace this.
+static inline const uchar *qt_vg_imageBits(const QImage& image)
+{
+    return image.bits();
+}
+
 VGImage QVGPixmapData::toVGImage()
 {
     if (!isValid())
@@ -213,7 +220,7 @@ VGImage QVGPixmapData::toVGImage()
         context = qt_vg_create_context(0);
 #endif
 
-    if (recreate) {
+    if (recreate && prevSize != QSize(w, h)) {
         if (vgImage != VG_INVALID_HANDLE) {
             vgDestroyImage(vgImage);
             vgImage = VG_INVALID_HANDLE;
@@ -222,6 +229,8 @@ VGImage QVGPixmapData::toVGImage()
             vgDestroyImage(vgImageOpacity);
             vgImageOpacity = VG_INVALID_HANDLE;
         }
+    } else if (recreate) {
+        cachedOpacity = -1.0f;  // Force opacity image to be refreshed later.
     }
 
     if (vgImage == VG_INVALID_HANDLE) {
@@ -232,11 +241,12 @@ VGImage QVGPixmapData::toVGImage()
     if (!source.isNull() && recreate) {
         vgImageSubData
             (vgImage,
-             source.bits(), source.bytesPerLine(),
+             qt_vg_imageBits(source), source.bytesPerLine(),
              VG_sARGB_8888_PRE, 0, 0, w, h);
     }
 
     recreate = false;
+    prevSize = QSize(w, h);
 
     return vgImage;
 }
@@ -244,43 +254,14 @@ VGImage QVGPixmapData::toVGImage()
 VGImage QVGPixmapData::toVGImage(qreal opacity)
 {
 #if !defined(QT_SHIVAVG)
-    if (!isValid())
+    // Force the primary VG image to be recreated if necessary.
+    if (toVGImage() == VG_INVALID_HANDLE)
         return VG_INVALID_HANDLE;
 
-#if !defined(QT_NO_EGL)
-    // Increase the reference count on the shared context.
-    if (!context)
-        context = qt_vg_create_context(0);
-#endif
-
-    if (recreate) {
-        if (vgImage != VG_INVALID_HANDLE) {
-            vgDestroyImage(vgImage);
-            vgImage = VG_INVALID_HANDLE;
-        }
-        if (vgImageOpacity != VG_INVALID_HANDLE) {
-            vgDestroyImage(vgImageOpacity);
-            vgImageOpacity = VG_INVALID_HANDLE;
-        }
-    }
-
-    if (vgImage == VG_INVALID_HANDLE) {
-        vgImage = vgCreateImage
-            (VG_sARGB_8888_PRE, w, h, VG_IMAGE_QUALITY_FASTER);
-    }
-
-    if (!source.isNull() && recreate) {
-        vgImageSubData
-            (vgImage,
-             source.bits(), source.bytesPerLine(),
-             VG_sARGB_8888_PRE, 0, 0, w, h);
-    }
-
-    recreate = false;
-
     if (opacity == 1.0f)
         return vgImage;
 
+    // Create an alternative image for the selected opacity.
     if (vgImageOpacity == VG_INVALID_HANDLE || cachedOpacity != opacity) {
         if (vgImageOpacity == VG_INVALID_HANDLE) {
             vgImageOpacity = vgCreateImage
@@ -405,6 +386,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type)
             vgDestroyImage(vgImageOpacity);
             vgImageOpacity = VG_INVALID_HANDLE;
         }
+        prevSize = QSize();
 
         TInt err = 0;
 
@@ -465,6 +447,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type)
         is_null = (w <= 0 || h <= 0);
         source = QImage();
         recreate = false;
+        prevSize = QSize(w, h);
         setSerialNumber(++qt_vg_pixmap_serial);
         // release stuff
         eglDestroyImageKHR(context->display(), eglImage);
diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h
index f6fac88..fe19f35 100644
--- a/src/openvg/qpixmapdata_vg_p.h
+++ b/src/openvg/qpixmapdata_vg_p.h
@@ -109,6 +109,7 @@ protected:
 #endif
 
 protected:
+    QSize prevSize;
     VGImage vgImage;
     VGImage vgImageOpacity;
     qreal cachedOpacity;
diff --git a/src/openvg/qwindowsurface_vg.cpp b/src/openvg/qwindowsurface_vg.cpp
index f8486a6..a1301e3 100644
--- a/src/openvg/qwindowsurface_vg.cpp
+++ b/src/openvg/qwindowsurface_vg.cpp
@@ -48,6 +48,7 @@
 #if !defined(QT_NO_EGL)
 
 #include <QtGui/private/qegl_p.h>
+#include <QtGui/private/qwidget_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -71,7 +72,6 @@ QVGWindowSurface::~QVGWindowSurface()
 
 QPaintDevice *QVGWindowSurface::paintDevice()
 {
-    d_ptr->beginPaint(window());
     return this;
 }
 
@@ -94,8 +94,16 @@ bool QVGWindowSurface::scroll(const QRegion &area, int dx, int dy)
 
 void QVGWindowSurface::beginPaint(const QRegion &region)
 {
-    // Nothing to do here.
-    Q_UNUSED(region);
+    d_ptr->beginPaint(window());
+
+    // If the window is not opaque, then fill the region we are about
+    // to paint with the transparent color.
+    if (!qt_widget_private(window())->isOpaque &&
+            window()->testAttribute(Qt::WA_TranslucentBackground)) {
+        QVGPaintEngine *engine = static_cast<QVGPaintEngine *>
+            (d_ptr->paintEngine());
+        engine->fillRegion(region, Qt::transparent, d_ptr->surfaceSize());
+    }
 }
 
 void QVGWindowSurface::endPaint(const QRegion &region)
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index eb771ba..4cb0184 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -131,8 +131,8 @@ QDirectFBScreenPrivate::QDirectFBScreenPrivate(QDirectFBScreen *qptr)
     QWSSignalHandler::instance()->addObject(this);
 #endif
 #ifdef QT_DIRECTFB_WM
-    connect(QWSServer::instance(), SIGNAL(windowEvent(QWSWindow*, QWSServer::WindowEvent)),
-            this, SLOT(onWindowEvent(QWSWindow*, QWSServer::WindowEvent)));
+    connect(QWSServer::instance(), SIGNAL(windowEvent(QWSWindow*,QWSServer::WindowEvent)),
+            this, SLOT(onWindowEvent(QWSWindow*,QWSServer::WindowEvent)));
 #endif
 }
 
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index c070605..854f893 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -39,7 +39,7 @@ HEADERS +=                                           \
            $$PHONON_MMF_DIR/mmf_medianode.h          \
            $$PHONON_MMF_DIR/mmf_videoplayer.h        \
            $$PHONON_MMF_DIR/objectdump.h             \
-           $$PHONON_MMF_DIR/objectdump_global.h      \
+           $$PHONON_MMF_DIR/objectdump_symbian.h     \
            $$PHONON_MMF_DIR/objecttree.h             \
            $$PHONON_MMF_DIR/utils.h                  \
            $$PHONON_MMF_DIR/videooutput.h            \
@@ -61,14 +61,12 @@ SOURCES +=                                           \
            $$PHONON_MMF_DIR/mmf_medianode.cpp        \
            $$PHONON_MMF_DIR/mmf_videoplayer.cpp      \
            $$PHONON_MMF_DIR/objectdump.cpp           \
+           $$PHONON_MMF_DIR/objectdump_symbian.cpp   \
            $$PHONON_MMF_DIR/objecttree.cpp           \
            $$PHONON_MMF_DIR/utils.cpp                \
            $$PHONON_MMF_DIR/videooutput.cpp          \
            $$PHONON_MMF_DIR/videowidget.cpp
 
-HEADERS += $$PHONON_MMF_DIR/objectdump_symbian.h
-SOURCES += $$PHONON_MMF_DIR/objectdump_symbian.cpp
-
 LIBS += -lcone
 LIBS += -lws32
 
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
index 158633d..9687908 100644
--- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
+++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
@@ -2,6 +2,8 @@
 TEMPLATE = subdirs
 
 # We just want to export the sqlite3 binaries for Symbian for platforms that do not have them.
-!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) {
-    BLD_INF_RULES.prj_exports +=  ":zip SQLite3_v9.2.zip"
+symbian {
+    !exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) {
+        BLD_INF_RULES.prj_exports +=  ":zip SQLite3_v9.2.zip"
+    }
 }
diff --git a/src/qt3support/dialogs/q3filedialog.cpp b/src/qt3support/dialogs/q3filedialog.cpp
index c14ff5c..22bec63 100644
--- a/src/qt3support/dialogs/q3filedialog.cpp
+++ b/src/qt3support/dialogs/q3filedialog.cpp
@@ -116,8 +116,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_MAC_USE_COCOA
-
 /* XPM */
 static const char * const start_xpm[]={
     "16 15 8 1",
@@ -6053,8 +6051,7 @@ Q3FilePreview::Q3FilePreview()
   function to provide file previewing.
 */
 
-#endif // QT_MAC_USE_COCOA
-    
+   
 QT_END_NAMESPACE
 
 #include "moc_q3filedialog.cpp"
diff --git a/src/qt3support/dialogs/q3filedialog.h b/src/qt3support/dialogs/q3filedialog.h
index 8644b4c..f6a7950 100644
--- a/src/qt3support/dialogs/q3filedialog.h
+++ b/src/qt3support/dialogs/q3filedialog.h
@@ -69,8 +69,6 @@ class QUrlInfo;
 
 #ifndef QT_NO_FILEDIALOG
 
-#ifndef QT_MAC_USE_COCOA
-
 class Q_COMPAT_EXPORT Q3FileIconProvider : public QObject
 {
     Q_OBJECT
@@ -339,8 +337,6 @@ private:
 #endif
 };
 
-#endif // QT_MAC_USE_COCOA
-
 #endif // QT_NO_FILEDIALOG
 
 QT_END_NAMESPACE
diff --git a/src/qt3support/dialogs/q3filedialog_mac.cpp b/src/qt3support/dialogs/q3filedialog_mac.cpp
index 585fa8f..6c5675b 100644
--- a/src/qt3support/dialogs/q3filedialog_mac.cpp
+++ b/src/qt3support/dialogs/q3filedialog_mac.cpp
@@ -56,11 +56,32 @@
 #include "qstringlist.h"
 #include "qtextcodec.h"
 #include "qdesktopwidget.h"
+#include "qfiledialog.h"
 #include <stdlib.h>
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_MAC_USE_COCOA
+#ifdef QT_MAC_USE_COCOA
+
+QStringList Q3FileDialog::macGetOpenFileNames(const QString &filter, QString *pwd,
+                                              QWidget *parent, const char* /*name*/,
+                                              const QString& caption, QString *selectedFilter,
+                                              bool /*multi*/, bool /*directory*/)
+{
+    return QFileDialog::getOpenFileNames(filter, *pwd, parent, 0, 
+                                         caption);
+}
+
+
+QString Q3FileDialog::macGetSaveFileName(const QString &start, const QString &filter,
+                                         QString *, QWidget *parent, const char* /*name*/,
+                                         const QString& caption, QString *selectedFilter)
+{
+    return QFileDialog::getSaveFileName(start, filter, parent, 0,
+                                        caption, selectedFilter);
+}
+
+#else 
 
 /*****************************************************************************
   Externals
diff --git a/src/qt3support/other/q3process_unix.cpp b/src/qt3support/other/q3process_unix.cpp
index 955b65f..32a68e0 100644
--- a/src/qt3support/other/q3process_unix.cpp
+++ b/src/qt3support/other/q3process_unix.cpp
@@ -249,7 +249,7 @@ int qnx6SocketPairReplacement (int socketFD[2]) {
 	if (errno != EINPROGRESS) { BAILOUT };
 
     // Accept connection
-    socketFD[0] = accept(tmpSocket, (struct sockaddr *)NULL, (size_t *)NULL);
+    socketFD[0] = accept(tmpSocket, (struct sockaddr *)NULL, (QT_SOCKLEN_T *)NULL);
     if(socketFD[0] == -1) { BAILOUT };
 
     // We're done
diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def
index 1218b75..49c4361 100644
--- a/src/s60installs/bwins/QtCoreu.def
+++ b/src/s60installs/bwins/QtCoreu.def
@@ -4387,4 +4387,15 @@ EXPORTS
 	?QBasicAtomicPointer_isFetchAndAddNative@@YA_NXZ @ 4386 NONAME ; bool QBasicAtomicPointer_isFetchAndAddNative(void)
 	?QBasicAtomicPointer_isFetchAndStoreNative@@YA_NXZ @ 4387 NONAME ; bool QBasicAtomicPointer_isFetchAndStoreNative(void)
 	?QBasicAtomicPointer_isTestAndSetNative@@YA_NXZ @ 4388 NONAME ; bool QBasicAtomicPointer_isTestAndSetNative(void)
+	??0SignalEvent@QStateMachine@@QAE@PAVQObject@@HABV?$QList@VQVariant@@@@@Z @ 4389 NONAME ; QStateMachine::SignalEvent::SignalEvent(class QObject *, int, class QList<class QVariant> const &)
+	??0WrappedEvent@QStateMachine@@QAE@PAVQObject@@PAVQEvent@@@Z @ 4390 NONAME ; QStateMachine::WrappedEvent::WrappedEvent(class QObject *, class QEvent *)
+	??1SignalEvent@QStateMachine@@UAE@XZ @ 4391 NONAME ; QStateMachine::SignalEvent::~SignalEvent(void)
+	??1WrappedEvent@QStateMachine@@UAE@XZ @ 4392 NONAME ; QStateMachine::WrappedEvent::~WrappedEvent(void)
+	??_ESignalEvent@QStateMachine@@UAE@I@Z @ 4393 NONAME ; QStateMachine::SignalEvent::~SignalEvent(unsigned int)
+	??_EWrappedEvent@QStateMachine@@UAE@I@Z @ 4394 NONAME ; QStateMachine::WrappedEvent::~WrappedEvent(unsigned int)
+	?arguments@SignalEvent@QStateMachine@@QBE?AV?$QList@VQVariant@@@@XZ @ 4395 NONAME ; class QList<class QVariant> QStateMachine::SignalEvent::arguments(void) const
+	?event@WrappedEvent@QStateMachine@@QBEPAVQEvent@@XZ @ 4396 NONAME ; class QEvent * QStateMachine::WrappedEvent::event(void) const
+	?object@WrappedEvent@QStateMachine@@QBEPAVQObject@@XZ @ 4397 NONAME ; class QObject * QStateMachine::WrappedEvent::object(void) const
+	?sender@SignalEvent@QStateMachine@@QBEPAVQObject@@XZ @ 4398 NONAME ; class QObject * QStateMachine::SignalEvent::sender(void) const
+	?signalIndex@SignalEvent@QStateMachine@@QBEHXZ @ 4399 NONAME ; int QStateMachine::SignalEvent::signalIndex(void) const
 
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 8a43f21..166b6fe 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12514,4 +12514,7 @@ EXPORTS
 	?app_compile_version@QApplicationPrivate@@2HA @ 12513 NONAME ; int QApplicationPrivate::app_compile_version
 	?spacerItemFactoryMethod@QLayoutPrivate@@2P6APAVQSpacerItem@@PBVQLayout@@HHW4Policy@QSizePolicy@@1@ZA @ 12514 NONAME ; class QSpacerItem * (*QLayoutPrivate::spacerItemFactoryMethod)(class QLayout const *, int, int, enum QSizePolicy::Policy, enum QSizePolicy::Policy)
 	?allWidgets@QWidgetPrivate@@2PAV?$QSet@PAVQWidget@@@@A @ 12515 NONAME ; class QSet<class QWidget *> * QWidgetPrivate::allWidgets
+	?effectiveFocusWidget@QWidgetPrivate@@QAEPAVQWidget@@XZ @ 12516 NONAME ; class QWidget * QWidgetPrivate::effectiveFocusWidget(void)
+	?ignoreUnusedNavigationEvents@QTextControl@@QBE_NXZ @ 12517 NONAME ; bool QTextControl::ignoreUnusedNavigationEvents(void) const
+	?setIgnoreUnusedNavigationEvents@QTextControl@@QAEX_N@Z @ 12518 NONAME ; void QTextControl::setIgnoreUnusedNavigationEvents(bool)
 
diff --git a/src/s60installs/bwins/QtWebKitu.def b/src/s60installs/bwins/QtWebKitu.def
index c14abe2..e5631f8 100644
--- a/src/s60installs/bwins/QtWebKitu.def
+++ b/src/s60installs/bwins/QtWebKitu.def
@@ -361,8 +361,8 @@ EXPORTS
 	?previousSibling@QWebElement@@QBE?AV1@XZ @ 360 NONAME ; class QWebElement QWebElement::previousSibling(void) const
 	?print@QWebView@@QBEXPAVQPrinter@@@Z @ 361 NONAME ; void QWebView::print(class QPrinter *) const
 	?printRequested@QWebPage@@IAEXPAVQWebFrame@@@Z @ 362 NONAME ; void QWebPage::printRequested(class QWebFrame *)
-	?printingMaximumShrinkFactor@QWebSettings@@QBEMXZ @ 363 NONAME ; float QWebSettings::printingMaximumShrinkFactor(void) const
-	?printingMinimumShrinkFactor@QWebSettings@@QBEMXZ @ 364 NONAME ; float QWebSettings::printingMinimumShrinkFactor(void) const
+	?printingMaximumShrinkFactor@QWebSettings@@QBEMXZ @ 363 NONAME ABSENT ; float QWebSettings::printingMaximumShrinkFactor(void) const
+	?printingMinimumShrinkFactor@QWebSettings@@QBEMXZ @ 364 NONAME ABSENT ; float QWebSettings::printingMinimumShrinkFactor(void) const
 	?provisionalLoad@QWebFrame@@IAEXXZ @ 365 NONAME ; void QWebFrame::provisionalLoad(void)
 	?qWebKitMajorVersion@@YAHXZ @ 366 NONAME ; int qWebKitMajorVersion(void)
 	?qWebKitMinorVersion@@YAHXZ @ 367 NONAME ; int qWebKitMinorVersion(void)
@@ -488,8 +488,8 @@ EXPORTS
 	?setPluginFactory@QWebPage@@QAEXPAVQWebPluginFactory@@@Z @ 487 NONAME ; void QWebPage::setPluginFactory(class QWebPluginFactory *)
 	?setPreferredContentsSize@QWebPage@@QBEXABVQSize@@@Z @ 488 NONAME ; void QWebPage::setPreferredContentsSize(class QSize const &) const
 	?setPreferredPluginForMimeType@QWebPluginDatabase@@QAEXABVQString@@ABVQWebPluginInfo@@@Z @ 489 NONAME ; void QWebPluginDatabase::setPreferredPluginForMimeType(class QString const &, class QWebPluginInfo const &)
-	?setPrintingMaximumShrinkFactor@QWebSettings@@QAEXM@Z @ 490 NONAME ; void QWebSettings::setPrintingMaximumShrinkFactor(float)
-	?setPrintingMinimumShrinkFactor@QWebSettings@@QAEXM@Z @ 491 NONAME ; void QWebSettings::setPrintingMinimumShrinkFactor(float)
+	?setPrintingMaximumShrinkFactor@QWebSettings@@QAEXM@Z @ 490 NONAME ABSENT ; void QWebSettings::setPrintingMaximumShrinkFactor(float)
+	?setPrintingMinimumShrinkFactor@QWebSettings@@QAEXM@Z @ 491 NONAME ABSENT ; void QWebSettings::setPrintingMinimumShrinkFactor(float)
 	?setRenderHint@QWebView@@QAEXW4RenderHint@QPainter@@_N@Z @ 492 NONAME ; void QWebView::setRenderHint(enum QPainter::RenderHint, bool)
 	?setRenderHints@QWebView@@QAEXV?$QFlags@W4RenderHint@QPainter@@@@@Z @ 493 NONAME ; void QWebView::setRenderHints(class QFlags<enum QPainter::RenderHint>)
 	?setScrollBarPolicy@QWebFrame@@QAEXW4Orientation@Qt@@W4ScrollBarPolicy@3@@Z @ 494 NONAME ; void QWebFrame::setScrollBarPolicy(enum Qt::Orientation, enum Qt::ScrollBarPolicy)
@@ -619,4 +619,5 @@ EXPORTS
 	?staticMetaObject@QGraphicsWebView@@2UQMetaObject@@B @ 618 NONAME ; struct QMetaObject const QGraphicsWebView::staticMetaObject
 	?staticMetaObject@QWebPage@@2UQMetaObject@@B @ 619 NONAME ; struct QMetaObject const QWebPage::staticMetaObject
 	?staticMetaObject@QWebView@@2UQMetaObject@@B @ 620 NONAME ; struct QMetaObject const QWebView::staticMetaObject
+	?attributeNames@QWebElement@@QBE?AVQStringList@@ABVQString@@@Z @ 621 NONAME ; class QStringList QWebElement::attributeNames(class QString const &) const
 
diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index 99be68e..6a4cdbd 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3619,4 +3619,18 @@ EXPORTS
 	_ZN15QBasicAtomicInt19isFetchAndAddNativeEv @ 3618 NONAME
 	_ZN15QBasicAtomicInt21isFetchAndStoreNativeEv @ 3619 NONAME
 	_ZN15QBasicAtomicInt25isReferenceCountingNativeEv @ 3620 NONAME
+	_ZN13QStateMachine11SignalEventC1EP7QObjectiRK5QListI8QVariantE @ 3621 NONAME
+	_ZN13QStateMachine11SignalEventC2EP7QObjectiRK5QListI8QVariantE @ 3622 NONAME
+	_ZN13QStateMachine11SignalEventD0Ev @ 3623 NONAME
+	_ZN13QStateMachine11SignalEventD1Ev @ 3624 NONAME
+	_ZN13QStateMachine11SignalEventD2Ev @ 3625 NONAME
+	_ZN13QStateMachine12WrappedEventC1EP7QObjectP6QEvent @ 3626 NONAME
+	_ZN13QStateMachine12WrappedEventC2EP7QObjectP6QEvent @ 3627 NONAME
+	_ZN13QStateMachine12WrappedEventD0Ev @ 3628 NONAME
+	_ZN13QStateMachine12WrappedEventD1Ev @ 3629 NONAME
+	_ZN13QStateMachine12WrappedEventD2Ev @ 3630 NONAME
+	_ZTIN13QStateMachine11SignalEventE @ 3631 NONAME
+	_ZTIN13QStateMachine12WrappedEventE @ 3632 NONAME
+	_ZTVN13QStateMachine11SignalEventE @ 3633 NONAME
+	_ZTVN13QStateMachine12WrappedEventE @ 3634 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 43e291c..6c45a6e 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -11735,4 +11735,6 @@ EXPORTS
 	_Zls6QDebugP15QGraphicsObject @ 11734 NONAME
 	_Zls6QDebugRK12QStyleOption @ 11735 NONAME
 	_Zls6QDebugRKN12QStyleOption10OptionTypeE @ 11736 NONAME
+	_ZN12QTextControl31setIgnoreUnusedNavigationEventsEb @ 11737 NONAME
+	_ZNK12QTextControl28ignoreUnusedNavigationEventsEv @ 11738 NONAME
 
diff --git a/src/s60installs/eabi/QtWebKitu.def b/src/s60installs/eabi/QtWebKitu.def
index 88343c1..4aad884 100644
--- a/src/s60installs/eabi/QtWebKitu.def
+++ b/src/s60installs/eabi/QtWebKitu.def
@@ -654,8 +654,8 @@ EXPORTS
 	_Z34qt_drt_resetOriginAccessWhiteListsv @ 653 NONAME
 	_ZN11QWebElement17removeAllChildrenEv @ 654 NONAME
 	_ZN11QWebElement6renderEP8QPainter @ 655 NONAME
-	_ZN12QWebSettings30setPrintingMaximumShrinkFactorEf @ 656 NONAME
-	_ZN12QWebSettings30setPrintingMinimumShrinkFactorEf @ 657 NONAME
+	_ZN12QWebSettings30setPrintingMaximumShrinkFactorEf @ 656 NONAME ABSENT
+	_ZN12QWebSettings30setPrintingMinimumShrinkFactorEf @ 657 NONAME ABSENT
 	_ZN16QGraphicsWebView10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 658 NONAME
 	_ZN16QGraphicsWebView11linkClickedERK4QUrl @ 659 NONAME
 	_ZN16QGraphicsWebView12loadFinishedEb @ 660 NONAME
@@ -674,8 +674,8 @@ EXPORTS
 	_ZN21QWebElementCollectionD2Ev @ 673 NONAME
 	_ZN21QWebElementCollectionaSERKS_ @ 674 NONAME
 	_ZN9QWebFrame6renderEP8QPainterNS_11RenderLayerERK7QRegion @ 675 NONAME
-	_ZNK12QWebSettings27printingMaximumShrinkFactorEv @ 676 NONAME
-	_ZNK12QWebSettings27printingMinimumShrinkFactorEv @ 677 NONAME
+	_ZNK12QWebSettings27printingMaximumShrinkFactorEv @ 676 NONAME ABSENT
+	_ZNK12QWebSettings27printingMinimumShrinkFactorEv @ 677 NONAME ABSENT
 	_ZNK16QGraphicsWebView10isModifiedEv @ 678 NONAME
 	_ZNK16QGraphicsWebView10pageActionEN8QWebPage9WebActionE @ 679 NONAME
 	_ZNK16QGraphicsWebView16inputMethodQueryEN2Qt16InputMethodQueryE @ 680 NONAME
@@ -689,4 +689,5 @@ EXPORTS
 	_ZThn16_NK16QGraphicsWebView8sizeHintEN2Qt8SizeHintERK6QSizeF @ 688 NONAME
 	_ZThn8_N16QGraphicsWebView10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 689 NONAME
 	_ZThn8_NK16QGraphicsWebView16inputMethodQueryEN2Qt16InputMethodQueryE @ 690 NONAME
+	_ZNK11QWebElement14attributeNamesERK7QString @ 691 NONAME
 
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 3fade73..2d9c489 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -109,10 +109,6 @@ symbian: {
         qtlibraries.sources += QtWebKit.dll
     }
 
-    contains(QT_CONFIG, declarative): {
-        qtlibraries.sources += QtDeclarative.dll
-    }
-
     graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems
     contains(QT_CONFIG, openvg) {
         qtlibraries.sources += QtOpenVG.dll
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index d519102..dc0e0d0 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -776,7 +776,11 @@ QScriptEnginePrivate::QScriptEnginePrivate()
     qMetaTypeId<QObjectList>();
 #endif
 
-    JSC::initializeThreading(); // ### hmmm
+    if (!QCoreApplication::instance()) {
+        qFatal("QScriptEngine: Must construct a Q(Core)Application before a QScriptEngine");
+        return;
+    }
+    JSC::initializeThreading();
 
     globalData = JSC::JSGlobalData::create().releaseRef();
     globalData->clientData = new QScript::GlobalClientData(this);
@@ -1302,7 +1306,7 @@ QScript::QObjectData *QScriptEnginePrivate::qobjectData(QObject *object)
     QScript::QObjectData *data = new QScript::QObjectData(this);
     m_qobjectData.insert(object, data);
     QObject::connect(object, SIGNAL(destroyed(QObject*)),
-                     q_func(), SLOT(_q_objectDestroyed(QObject *)));
+                     q_func(), SLOT(_q_objectDestroyed(QObject*)));
     return data;
 }
 
diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp
index e7998b7..a2af514 100644
--- a/src/script/api/qscriptengineagent.cpp
+++ b/src/script/api/qscriptengineagent.cpp
@@ -154,7 +154,10 @@ void QScriptEngineAgentPrivate::exceptionCatch(const JSC::DebuggerCallFrame& fra
 void QScriptEngineAgentPrivate::atStatement(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno, int column)
 {
     QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID);
-    Q_ASSERT(source != 0);
+    if (!source) {
+        // QTBUG-6108: We don't have the source for this script, so ignore.
+        return;
+    }
     column = source->columnNumberFromOffset(column);
     JSC::CallFrame *oldFrame = engine->currentFrame;
     int oldAgentLineNumber = engine->agentLineNumber;
@@ -183,7 +186,10 @@ void QScriptEngineAgentPrivate::didReachBreakpoint(const JSC::DebuggerCallFrame&
 {
     if (q_ptr->supportsExtension(QScriptEngineAgent::DebuggerInvocationRequest)) {
         QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID);
-        Q_ASSERT(source != 0);
+        if (!source) {
+            // QTBUG-6108: We don't have the source for this script, so ignore.
+            return;
+        }
         column = source->columnNumberFromOffset(column);
         JSC::CallFrame *oldFrame = engine->currentFrame;
         int oldAgentLineNumber = engine->agentLineNumber;
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
index 8ed0aaa..e25bb04 100644
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
@@ -143,7 +143,7 @@ QScriptDebuggerCodeFinderWidget::QScriptDebuggerCodeFinderWidget(QWidget *parent
 
     d->editFind = new QLineEdit(this);
     d->editFind->setMinimumSize(QSize(150, 0));
-    connect(d->editFind, SIGNAL(textChanged(const QString&)),
+    connect(d->editFind, SIGNAL(textChanged(QString)),
             this, SLOT(_q_updateButtons()));
     connect(d->editFind, SIGNAL(returnPressed()),
             this, SLOT(_q_next()));
diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp
index 7f0a5e0..67d82a3 100644
--- a/src/scripttools/debugging/qscriptedit.cpp
+++ b/src/scripttools/debugging/qscriptedit.cpp
@@ -110,8 +110,8 @@ QScriptEdit::QScriptEdit(QWidget *parent)
 
     QObject::connect(this, SIGNAL(blockCountChanged(int)),
                      this, SLOT(updateExtraAreaWidth()));
-    QObject::connect(this, SIGNAL(updateRequest(const QRect &, int)),
-                     this, SLOT(updateExtraArea(const QRect &, int)));
+    QObject::connect(this, SIGNAL(updateRequest(QRect,int)),
+                     this, SLOT(updateExtraArea(QRect,int)));
     QObject::connect(this, SIGNAL(cursorPositionChanged()),
                      this, SLOT(highlightCurrentLine()));
 
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index f368d1d..b74babc 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -509,15 +509,24 @@ bool QMYSQLResult::fetchNext()
         return false;
     if (d->preparedQuery) {
 #if MYSQL_VERSION_ID >= 40108
-        if (mysql_stmt_fetch(d->stmt))
+        int nRC = mysql_stmt_fetch(d->stmt);
+        if (nRC) {
+#ifdef MYSQL_DATA_TRUNCATED
+            if (nRC == 1 || nRC == MYSQL_DATA_TRUNCATED)
+#else
+            if (nRC == 1)
+#endif // MYSQL_DATA_TRUNCATED
+                setLastError(qMakeStmtError(QCoreApplication::translate("QMYSQLResult",
+                                    "Unable to fetch data"), QSqlError::StatementError, d->stmt));
             return false;
+        }
 #else
         return false;
 #endif
     } else {
-    d->row = mysql_fetch_row(d->result);
-    if (!d->row)
-        return false;
+        d->row = mysql_fetch_row(d->result);
+        if (!d->row)
+            return false;
     }
     setAt(at() + 1);
     return true;
@@ -1365,7 +1374,6 @@ QStringList QMYSQLDriver::tables(QSql::TableType type) const
 QSqlIndex QMYSQLDriver::primaryIndex(const QString& tablename) const
 {
     QSqlIndex idx;
-    bool prepQ;
     if (!isOpen())
         return idx;
 
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 722981c..0dbb90f 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -30,8 +30,7 @@ win32:DEFINES += QT_NODLL
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \
             $$QT_BUILD_TREE/include/QtCore \
-            $$QT_BUILD_TREE/include/QtXml \
-            $$QT_BUILD_TREE/src/corelib/global   # qlibraryinfo.cpp includes qconfig.cpp
+            $$QT_BUILD_TREE/include/QtXml
 
 DEPENDPATH += $$INCLUDEPATH \
               ../../corelib/global \
@@ -49,7 +48,6 @@ SOURCES += \
            ../../corelib/codecs/qtsciicodec.cpp \
            ../../corelib/codecs/qutfcodec.cpp \
            ../../corelib/global/qglobal.cpp \
-           ../../corelib/global/qlibraryinfo.cpp \
            ../../corelib/global/qmalloc.cpp \
            ../../corelib/global/qnumeric.cpp \
            ../../corelib/io/qabstractfileengine.cpp \
@@ -65,7 +63,6 @@ SOURCES += \
            ../../corelib/io/qtemporaryfile.cpp \
            ../../corelib/io/qtextstream.cpp \
            ../../corelib/io/qurl.cpp \
-           ../../corelib/io/qsettings.cpp \
            ../../corelib/kernel/qmetatype.cpp \
            ../../corelib/kernel/qvariant.cpp \
            ../../corelib/tools/qbitarray.cpp \
@@ -90,12 +87,11 @@ unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp \
                 ../../corelib/io/qfsfileengine_iterator_unix.cpp
 
 win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp \
-                 ../../corelib/io/qfsfileengine_iterator_win.cpp \
-                 ../../corelib/io/qsettings_win.cpp
+                 ../../corelib/io/qfsfileengine_iterator_win.cpp
 
 macx: {
    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
-   SOURCES += ../../corelib/kernel/qcore_mac.cpp ../../corelib/io/qsettings_mac.cpp
+   SOURCES += ../../corelib/kernel/qcore_mac.cpp
    LIBS += -framework CoreServices
 }
 
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index b2e8f4f..88dfa98 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -2709,11 +2709,11 @@ void WriteInitialization::acceptConnection(DomConnection *connection)
     m_output << m_indent << "QObject::connect("
         << sender
         << ", "
-        << "SIGNAL(" << connection->elementSignal() << ')'
+        << "SIGNAL("<<connection->elementSignal()<<')'
         << ", "
         << receiver
         << ", "
-        << "SLOT(" << connection->elementSlot() << ')'
+        << "SLOT("<<connection->elementSlot()<<')'
         << ");\n";
 }
 
diff --git a/src/xmlpatterns/api/qxmlschema.cpp b/src/xmlpatterns/api/qxmlschema.cpp
index 287cf11..ee92195 100644
--- a/src/xmlpatterns/api/qxmlschema.cpp
+++ b/src/xmlpatterns/api/qxmlschema.cpp
@@ -65,6 +65,11 @@ QT_BEGIN_NAMESPACE
 
   \snippet doc/src/snippets/qxmlschema/main.cpp 0
 
+  \section1 XML Schema Version
+
+  This class is used to represent schemas that conform to the \l{XML Schema} 1.0
+  specification.
+
   \sa QXmlSchemaValidator, {xmlpatterns/schema}{XML Schema Validation Example}
 */
 
diff --git a/src/xmlpatterns/api/qxmlschemavalidator.cpp b/src/xmlpatterns/api/qxmlschemavalidator.cpp
index 11e0417..682d34f 100644
--- a/src/xmlpatterns/api/qxmlschemavalidator.cpp
+++ b/src/xmlpatterns/api/qxmlschemavalidator.cpp
@@ -71,6 +71,11 @@ QT_BEGIN_NAMESPACE
 
   \snippet doc/src/snippets/qxmlschemavalidator/main.cpp 3
 
+  \section1 XML Schema Version
+
+  This class implements schema validation according to the \l{XML Schema} 1.0
+  specification.
+
   \sa QXmlSchema, {xmlpatterns/schema}{XML Schema Validation Example}
 */