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

131 files changed, 2124 insertions, 948 deletions

diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h
index 392924e..9e05fad 100644
--- a/demos/boxes/glbuffers.h
+++ b/demos/boxes/glbuffers.h
@@ -58,7 +58,9 @@ if (m_failed || !(assertion)) {
     returnStatement;                                                                        \
 }
 
+QT_BEGIN_NAMESPACE
 class QMatrix4x4;
+QT_END_NAMESPACE
 
 class GLTexture
 {
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp
index e2aa16b..2376782 100644
--- a/demos/boxes/scene.cpp
+++ b/demos/boxes/scene.cpp
@@ -559,7 +559,7 @@ void Scene::initGL()
          << ":/res/boxes/cubemap_negy.jpg" << ":/res/boxes/cubemap_posz.jpg" << ":/res/boxes/cubemap_negz.jpg";
     m_environment = new GLTextureCube(list, qMin(1024, m_maxTextureSize));
     m_environmentShader = new QGLShader(QGLShader::FragmentShader);
-    m_environmentShader->setSourceCode(environmentShaderText);
+    m_environmentShader->compile(environmentShaderText);
     m_environmentProgram = new QGLShaderProgram;
     m_environmentProgram->addShader(m_vertexShader);
     m_environmentProgram->addShader(m_environmentShader);
diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h
index 48ecaba..9f8d2af 100644
--- a/demos/boxes/scene.h
+++ b/demos/boxes/scene.h
@@ -56,7 +56,10 @@
 
 #define PI 3.14159265358979
 
+QT_BEGIN_NAMESPACE
 class QMatrix4x4;
+QT_END_NAMESPACE
+
 class ParameterEdit : public QWidget
 {
 public:
diff --git a/dist/changes-4.5.2 b/dist/changes-4.5.2
index 1e00208..c87ad92 100644
--- a/dist/changes-4.5.2
+++ b/dist/changes-4.5.2
@@ -46,6 +46,48 @@ Third party components
        Plugins (r41346, r43550, r43915, r43917, r43923)
        Clipboard (r41360)
 
+- QAbstractNetworkCache
+   * Only cache responses to HTTP GET by default, not HTTP PUT or POST
+
+- QMacStyle
+    * [253339] Don't draw arrows on toolbuttons that have a menu and text only.
+    * [252301] Ensure that small and mini spin boxes are drawn correctly.
+
+- QFontDialog
+    * [252000] Ensure that QFontDialog::getFont() works on Mac OS X.
+
+- QNetworkCookie
+   * [251959] fix parsing of multiple cookies separated by a newline
+
+- QNetworkCookieJar
+   * [251467] do not allow cookies for domains like ".com"
+   * [228974] allow cookies whose domain attribute is missing a leading dot
+
+- QWidget
+    * [250668] Don't send extra wheel events when using the scroll wheel in Cocoa.
+    * [253448] Prevent a crash when using the Qt::WA_MacBrushedMetal attribute
+      in conjunction with style sheets.
+
+- QPainter
+    * [253783] Fixed text shaping bugs when using ligatures and different
+      scripts in a single text item.
+    * Fixed various inconsistencies for image drawing on non-integer
+      coordinates.
+    * Fixed bug with 0-opacity causing images to be drawn fully opaque.
+    * Fixed crash when drawing on a null pixmap.
+    * [251534] Fixed issue where text with non-opaque color from widget
+      palette would be blitted instead of blended.
+
+- QTransform
+    * Fixed issue in QTransform::type() causing a projective transform to be
+    treated as a scaling transform.
+
+- QtOpenGL
+    * [247083] Re-enabled antialiasing for large font sizes in OpenGL paint
+      engine.
+    * [251485] Fixed crash that could occur with projective transforms and
+      high quality antialiasing.
+
 ****************************************************************************
 *                          Database Drivers                                *
 ****************************************************************************
@@ -57,14 +99,27 @@ Third party components
 
 Qt for Linux/X11
 ----------------
-
+[253186] Fixed compile error in qfontengine_ft.cpp on 64-bit platforms with
+legacy freetype headers.
+[241361] Prevented asynchronous access to non-thread safe libfontconfig API.
+[244362] Worked around X server crash when calling XFillPolygon with more than
+200000 points by falling back to raster paint engine.
+[250326] Titlebar wasn't shown on X11 with Qt::CustomizeWindowHint for
+	 fixed-size windows.
+[251925] Improved showing QMessageBox on small screens.
 
 Qt for Windows
 --------------
 
+[251259] Switching to another app left text cursor in line edits with
+	 QtMfc framework.
 
 Qt for Mac OS X
 ---------------
+[252795] Ensure that we send Apple Events in the Cocoa port even when Cocoa isn't ready.
+[252176] Fix regression in drawing parts of pixmaps on Panther.
+[253402] Fix a crash when a Cocoa window that used to be a QWidget would get events
+         after the QWidget was destroyed.
 
 
 Qt for Embedded Linux
@@ -101,6 +156,8 @@ Qt for Windows CE
      of 'Fixed' on the main cointainer.
    * [253278] Made it possible to set QString-type properties using
      QDesignerFormWindowCursor::setProperty().
+   * [253539] Prevent crash in Designer with the Cocoa port when when using a scroll
+     wheel to change a property.
 
 - Linguist
   - Linguist GUI
@@ -139,6 +196,26 @@ Qt for Windows CE
 *                          Plugins                                         *
 ****************************************************************************
 
+- directfb
+  * Make sure we pick an approriate format for pixmaps. E.g. use the same as
+    the primary surface for opaque pixmaps and pick an appropriate one for
+    transparent pixmaps if the primary surface format is not transparent.
+  * Properly fall back to the raster engine for pens that aren't solidcolor
+  * Properly fall back to raster engine with "mirrored" scales
+  * Make sure window surfaces are the approriate pixel format and created in
+    video memory if supported
+  * Fix clipping bug that would cause painting errors
+  * Fix various crash bugs
+  * Fix bugs when transforming/copying pixmaps with alpha channel
+  * Fix various bugs with regards to painting with alpha channel/porter duff
+  * Optimize a coupld of internal functions to slightly speed up drawing
+  * Optimize raster fall backs
+  * Allow more customization for Flipping options
+  * Fix drawing with opacity != 1.0
+  * Support for better logging when trying to debug performance problems.
+  * Fix bug in keyboard handling that caused modifiers not to work
+  * Get rid of some compiler warnings
+
 
 ****************************************************************************
 *                   Important Behavior Changes                             *
diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index 6a94f26..bedf58a 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -49,3 +49,8 @@ information about a particular change.
  - QStyleOptionGraphicsItem::levelOfDetails is obsoleted and its value
    is always initialized to 1. For a more fine-grained value use
    QStyleOptionGraphicsItem::levelOfDetailFromTransform(const QTransform &).
+
+ - When mixing OpenGL and QPainter calls you need to first call syncState()
+   on the paint engine, for example "painter->paintEngine()->syncState()".
+   This is to ensure that the engine flushes any pending drawing and sets up
+   the GL modelview/projection matrices properly.
diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc
index ee240b5..bc39c56 100644
--- a/doc/src/designer-manual.qdoc
+++ b/doc/src/designer-manual.qdoc
@@ -465,18 +465,23 @@
     spin boxes and sliders as well.
 
     The next step is to combine all three layouts into one \bold{main layout}.
-    It is important that your form has a main layout; otherwise, the widgets
-    on your form will not resize when your form is resized. To set the main
-    layout, \gui{Right click} anywhere on your form, outside of the three
-    separate layouts, and select \gui{Lay Out Horizontally}. Alternatively, you
-    could also select \gui{Lay Out in a Grid} -- you will still see the same
-    arrangement (shown below).
+    The main layout is the top level widget's (in this case, the QWidget)
+    layout. It is important that your top level widget has a layout; otherwise,
+    the widgets on your window will not resize when your window is resized. To
+    set the layout, \gui{Right click} anywhere on your form, outside of the
+    three separate layouts, and select \gui{Lay Out Horizontally}.
+    Alternatively, you could also select \gui{Lay Out in a Grid} -- you will
+    still see the same arrangement (shown below).
 
     \image rgbController-final-layout.png
 
     \note Main layouts cannot be seen on the form. To check if you have a main
     layout installed, try resizing your form; your widgets should resize
-    accordingly.
+    accordingly. Alternatively, you can take a look at \QD's
+    \gui{Object Inspector}. If your top level widget does not have a layout,
+    you will see the broken layout icon next to it,
+    \inlineimage rgbController-no-toplevel-layout.png
+    .
 
     When you click on the slider and drag it to a certain value, you want the
     spin box to display the slider's position. To accomplish this behavior, you
diff --git a/doc/src/images/rgbController-no-toplevel-layout.png b/doc/src/images/rgbController-no-toplevel-layout.png
new file mode 100644
index 0000000..0a9bc29
--- /dev/null
+++ b/doc/src/images/rgbController-no-toplevel-layout.png
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 6a689f9..bc310c9 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -612,6 +612,14 @@ in the \l{Qt for Windows CE Requirements} document.
     </tr><tr id="OptionalColor">
     <td> Xinerama </td><td> libXinerama </td><td> Multi-head support</td>
     <td><tt>-xinerama</tt> or auto-detected</td><td>1.1.0</td>
+
+    </tr><tr id="OptionalColor">
+    <td> Fontconfig </td><td> libfontconfig </td><td> Font customization and configuration</td>
+    <td><tt>-fontconfig</tt> or auto-detected</td><td>2.1</td>
+    </tr><tr id="OptionalColor">
+    <td> FreeType </td><td> libfreetype </td><td> Font engine</td>
+    <td></td><td>2.1.3</td>
+
     </tr><tr id="DefaultColor">
     <td> Xi </td><td> libXi </td><td> X11 Input Extensions</td>
     <td><tt>-xinput</tt> or auto-detected</td><td>1.3.0</td>
@@ -621,12 +629,14 @@ in the \l{Qt for Windows CE Requirements} document.
     <td> Xext </td><td> libXext </td><td> X Extensions</td><td></td><td>6.4.3</td>
     </tr><tr id="DefaultColor">
     <td> X11 </td><td> libX11 </td><td> X11 Client-Side Library</td><td></td><td>6.2.1</td>
+
     </tr><tr id="SMColor">
     <td> SM </td><td> libSM </td><td> X Session Management</td>
     <td><tt>-sm</tt> or auto-detected</td><td>6.0.4</td>
     </tr><tr id="SMColor">
     <td> ICE </td><td> libICE </td><td> Inter-Client Exchange</td>
     <td><tt>-sm</tt> or auto-detected</td><td>6.3.5</td>
+
     </tr><tr id="GlibColor">
     <td> glib </td><td> libglib-2.0 </td><td> Common event loop handling</td>
     <td><tt>-glib</tt> or auto-detected</td><td>2.8.3</td>
diff --git a/doc/src/properties.qdoc b/doc/src/properties.qdoc
index d934f13..0251d3f 100644
--- a/doc/src/properties.qdoc
+++ b/doc/src/properties.qdoc
@@ -71,10 +71,10 @@
     \list 
 
     \o A \c READ accessor function is required. It is for reading the
-    property value. It must be const and must return either the
-    property's type or a pointer or reference to that type. e.g.,
-    QWidget::focus is a read-only property with \c READ function
-    QWidget::hasFocus().
+    property value. Ideally, a const function is used for this purpose,
+    and it must return either the property's type or a pointer or
+    reference to that type. e.g., QWidget::focus is a read-only property
+    with \c READ function, QWidget::hasFocus().
 
     \o A \c WRITE accessor function is optional. It is for setting the
     property value. It must return void and must take exactly one
diff --git a/examples/animation/sub-attaq/mainwindow.cpp b/examples/animation/sub-attaq/mainwindow.cpp
index 5e8e259..123363b 100644
--- a/examples/animation/sub-attaq/mainwindow.cpp
+++ b/examples/animation/sub-attaq/mainwindow.cpp
@@ -44,6 +44,8 @@
 #include "graphicsscene.h"
 
 //Qt
+#include <QGraphicsView>
+
 #ifdef QT_NO_OPENGL
     #include <QtGui/QMenuBar>
     #include <QtGui/QLayout>
diff --git a/examples/dialogs/sipdialog/dialog.cpp b/examples/dialogs/sipdialog/dialog.cpp
index 9f1b9ad..653b518 100644
--- a/examples/dialogs/sipdialog/dialog.cpp
+++ b/examples/dialogs/sipdialog/dialog.cpp
@@ -90,7 +90,7 @@ Dialog::Dialog()
 //! [Dialog constructor part4]
 
 //! [Dialog constructor part5]
-    connect(button, SIGNAL(pressed()), 
+    connect(button, SIGNAL(clicked()),
         qApp, SLOT(closeAllWindows()));
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), 
         this, SLOT(desktopResized(int)));
@@ -111,14 +111,13 @@ void Dialog::reactToSIP()
 {
     QRect availableGeometry = QApplication::desktop()->availableGeometry(0);
 
-    if (desktopGeometry.width() == availableGeometry.width()) {
-        if (desktopGeometry.height() > availableGeometry.height()) {
+    if (desktopGeometry != availableGeometry) {
+        if (windowState() | Qt::WindowMaximized)
             setWindowState(windowState() & ~Qt::WindowMaximized);
-            setGeometry(availableGeometry);
-        } else {
-            setWindowState(windowState() | Qt::WindowMaximized);
-        }
+
+        setGeometry(availableGeometry);
     }
+
     desktopGeometry = availableGeometry;
 }
 //! [reactToSIP() function]
diff --git a/examples/dialogs/sipdialog/main.cpp b/examples/dialogs/sipdialog/main.cpp
index 5fcbfd8..fec6de2 100644
--- a/examples/dialogs/sipdialog/main.cpp
+++ b/examples/dialogs/sipdialog/main.cpp
@@ -48,6 +48,6 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     Dialog dialog;
-    dialog.exec();
+    return dialog.exec();
 }
 //! [main() function]
diff --git a/examples/opengl/hellogl_es2/glwidget.cpp b/examples/opengl/hellogl_es2/glwidget.cpp
index ee50670..cb4a48d 100644
--- a/examples/opengl/hellogl_es2/glwidget.cpp
+++ b/examples/opengl/hellogl_es2/glwidget.cpp
@@ -190,7 +190,7 @@ void GLWidget::initializeGL ()
         "    color = clamp(color, 0.0, 1.0);\n"
         "    gl_Position = matrix * vertex;\n"
         "}\n";
-    vshader1->setSourceCode(vsrc1);
+    vshader1->compile(vsrc1);
 
     QGLShader *fshader1 = new QGLShader(QGLShader::FragmentShader, this);
     const char *fsrc1 =
@@ -199,7 +199,7 @@ void GLWidget::initializeGL ()
         "{\n"
         "    gl_FragColor = color;\n"
         "}\n";
-    fshader1->setSourceCode(fsrc1);
+    fshader1->compile(fsrc1);
 
     program1.addShader(vshader1);
     program1.addShader(fshader1);
@@ -224,7 +224,7 @@ void GLWidget::initializeGL ()
         "    gl_Position = matrix * vertex;\n"
         "    texc = texCoord;\n"
         "}\n";
-    vshader2->setSourceCode(vsrc2);
+    vshader2->compile(vsrc2);
 
     QGLShader *fshader2 = new QGLShader(QGLShader::FragmentShader);
     const char *fsrc2 =
@@ -237,7 +237,7 @@ void GLWidget::initializeGL ()
         "    color = color * 0.2 + color * 0.8 * angle;\n"
         "    gl_FragColor = vec4(clamp(color, 0.0, 1.0), 1.0);\n"
         "}\n";
-    fshader2->setSourceCode(fsrc2);
+    fshader2->compile(fsrc2);
 
     program2.addShader(vshader2);
     program2.addShader(fshader2);
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 8901289..13bc05b 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -574,7 +574,7 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
                         }
 
                         // We assume project filename is [QMAKE_ORIG_TARGET].vcproj
-                        QString vcproj = unescapeFilePath(fixFilename(tmp_vcproj.project->first("QMAKE_ORIG_TARGET")) + project->first("VCPROJ_EXTENSION"));
+                        QString vcproj = unescapeFilePath(tmp_vcproj.project->first("QMAKE_ORIG_TARGET") + project->first("VCPROJ_EXTENSION"));
                         QString vcprojDir = qmake_getpwd();
 
                         // If file doesn't exsist, then maybe the users configuration
diff --git a/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp b/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp
index 298e9fa..81ebb8b 100644
--- a/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp
+++ b/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp
@@ -169,6 +169,7 @@ namespace Phonon
             Q_ASSERT(SUCCEEDED(hr));
             ComPointer<IVMRWindowlessControl9> windowlessControl(m_filter, IID_IVMRWindowlessControl9);
             windowlessControl->SetVideoClippingWindow(reinterpret_cast<HWND>(target->winId()));
+            windowlessControl->SetAspectRatioMode(VMR9ARMode_None); //we're in control of the size
         }
 
         QImage VideoRendererVMR9::snapshot() const
diff --git a/src/3rdparty/phonon/ds9/videowidget.cpp b/src/3rdparty/phonon/ds9/videowidget.cpp
index de7ce5f..0ef653f 100644
--- a/src/3rdparty/phonon/ds9/videowidget.cpp
+++ b/src/3rdparty/phonon/ds9/videowidget.cpp
@@ -261,6 +261,7 @@ namespace Phonon
         {
             m_aspectRatio = aspectRatio;
             updateVideoSize();
+            m_widget->update();
         }
 
         Phonon::VideoWidget::ScaleMode VideoWidget::scaleMode() const
@@ -279,6 +280,7 @@ namespace Phonon
         {
             m_scaleMode = scaleMode;
             updateVideoSize();
+            m_widget->update();
         }
 
         void VideoWidget::setBrightness(qreal b)
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index b0ce10c..962e2fb 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -159,7 +159,7 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QThreadStorage<QUnifiedTimer *>, unifiedTimer);
+Q_GLOBAL_STATIC(QThreadStorage<QUnifiedTimer *>, unifiedTimer)
 
 QUnifiedTimer::QUnifiedTimer() : QObject(), lastTick(0), timingInterval(DEFAULT_TIMER_INTERVAL), consistentTiming(false)
 {
diff --git a/src/corelib/animation/qanimationgroup_p.h b/src/corelib/animation/qanimationgroup_p.h
index a7bd0fa..0f07138 100644
--- a/src/corelib/animation/qanimationgroup_p.h
+++ b/src/corelib/animation/qanimationgroup_p.h
@@ -57,7 +57,7 @@
 
 #include <QtCore/qlist.h>
 
-#include "qabstractanimation_p.h"
+#include "private/qabstractanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/animation/qparallelanimationgroup_p.h b/src/corelib/animation/qparallelanimationgroup_p.h
index f36d972..ecd6791 100644
--- a/src/corelib/animation/qparallelanimationgroup_p.h
+++ b/src/corelib/animation/qparallelanimationgroup_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qparallelanimationgroup.h"
-#include "qanimationgroup_p.h"
+#include "private/qanimationgroup_p.h"
 #include <QtCore/QHash>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index 47361a5..357a6ac 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -91,19 +91,17 @@
 
 #include "qpropertyanimation.h"
 #include "qanimationgroup.h"
-#include <QtCore/qdebug.h>
-
 #include "qpropertyanimation_p.h"
 
 #include <QtCore/qmath.h>
 #include <QtCore/qmutex.h>
+#include <private/qmutexpool_p.h>
 
 QT_BEGIN_NAMESPACE
 
 typedef QPair<QObject *, QByteArray> QPropertyAnimationPair;
 typedef QHash<QPropertyAnimationPair, QPropertyAnimation*> QPropertyAnimationHash;
-Q_GLOBAL_STATIC(QPropertyAnimationHash, _q_runningAnimations);
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, guardHashLock, (QMutex::Recursive) )
+Q_GLOBAL_STATIC(QPropertyAnimationHash, _q_runningAnimations)
 
 void QPropertyAnimationPrivate::updateMetaProperty()
 {
@@ -284,27 +282,32 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State oldState,
     }
 
     QVariantAnimation::updateState(oldState, newState);
-    QMutexLocker locker(guardHashLock());
-    QPropertyAnimationHash * hash = _q_runningAnimations();
-    QPropertyAnimationPair key(d->target, d->propertyName);
-    if (newState == Running) {
-        d->updateMetaProperty();
-        QPropertyAnimation *oldAnim = hash->value(key, 0);
-        if (oldAnim) {
-            // try to stop the top level group
-            QAbstractAnimation *current = oldAnim;
-            while (current->group() && current->state() != Stopped)
-                current = current->group();
-            current->stop();
-        }
-        hash->insert(key, this);
 
-        // update the default start value
-        if (oldState == Stopped) {
-            d->setDefaultStartValue(d->target->property(d->propertyName.constData()));
+    QPropertyAnimation *animToStop = 0;
+    {
+        QPropertyAnimationHash * hash = _q_runningAnimations();
+        QMutexLocker locker(QMutexPool::globalInstanceGet(hash));
+        QPropertyAnimationPair key(d->target, d->propertyName);
+        if (newState == Running) {
+            d->updateMetaProperty();
+            animToStop = hash->value(key, 0);
+            hash->insert(key, this);
+            // update the default start value
+            if (oldState == Stopped) {
+                d->setDefaultStartValue(d->target->property(d->propertyName.constData()));
+            }
+        } else if (hash->value(key) == this) {
+            hash->remove(key);
         }
-    } else if (hash->value(key) == this) {
-        hash->remove(key);
+    }
+
+    //we need to do that after the mutex was unlocked
+    if (animToStop) {
+        // try to stop the top level group
+        QAbstractAnimation *current = animToStop;
+        while (current->group() && current->state() != Stopped)
+            current = current->group();
+        current->stop();
     }
 }
 
diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h
index 39317ba..2fdd50c 100644
--- a/src/corelib/animation/qpropertyanimation.h
+++ b/src/corelib/animation/qpropertyanimation.h
@@ -76,7 +76,7 @@ protected:
     void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState);
 
 private:
-    Q_PRIVATE_SLOT(d_func(), void _q_targetDestroyed());
+    Q_PRIVATE_SLOT(d_func(), void _q_targetDestroyed())
     Q_DISABLE_COPY(QPropertyAnimation)
     Q_DECLARE_PRIVATE(QPropertyAnimation)
 };
diff --git a/src/corelib/animation/qpropertyanimation_p.h b/src/corelib/animation/qpropertyanimation_p.h
index a4387dd..16c63ab 100644
--- a/src/corelib/animation/qpropertyanimation_p.h
+++ b/src/corelib/animation/qpropertyanimation_p.h
@@ -56,7 +56,7 @@
 #include "qpropertyanimation.h"
 #include <QtCore/qmetaobject.h>
 
-#include "qvariantanimation_p.h"
+#include "private/qvariantanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/animation/qsequentialanimationgroup_p.h b/src/corelib/animation/qsequentialanimationgroup_p.h
index 3ac90f8..c01aaf0 100644
--- a/src/corelib/animation/qsequentialanimationgroup_p.h
+++ b/src/corelib/animation/qsequentialanimationgroup_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qsequentialanimationgroup.h"
-#include "qanimationgroup_p.h"
+#include "private/qanimationgroup_p.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index 827993c..9303034 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -44,11 +44,10 @@
 #include "qvariantanimation.h"
 #include "qvariantanimation_p.h"
 
-#include <QtCore/QRect>
-#include <QtCore/QLineF>
-#include <QtCore/QLine>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/qdebug.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qline.h>
+#include <QtCore/qmutex.h>
+#include <private/qmutexpool_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -365,8 +364,8 @@ void QVariantAnimation::setEasingCurve(const QEasingCurve &easing)
     d->recalculateCurrentInterval();
 }
 
-Q_GLOBAL_STATIC(QVector<QVariantAnimation::Interpolator>, registeredInterpolators)
-Q_GLOBAL_STATIC(QReadWriteLock, registeredInterpolatorsLock)
+typedef QVector<QVariantAnimation::Interpolator> QInterpolatorVector;
+Q_GLOBAL_STATIC(QInterpolatorVector, registeredInterpolators)
 
 /*!
     \fn void qRegisterAnimationInterpolator(QVariant (*func)(const T &from, const T &to, qreal progress))
@@ -398,10 +397,11 @@ Q_GLOBAL_STATIC(QReadWriteLock, registeredInterpolatorsLock)
 void QVariantAnimation::registerInterpolator(QVariantAnimation::Interpolator func, int interpolationType)
 {
     // will override any existing interpolators
-    QWriteLocker locker(registeredInterpolatorsLock());
-    if (int(interpolationType) >= registeredInterpolators()->count())
-        registeredInterpolators()->resize(int(interpolationType) + 1);
-    registeredInterpolators()->replace(interpolationType, func);
+    QInterpolatorVector *interpolators = registeredInterpolators();
+    QMutexLocker locker(QMutexPool::globalInstanceGet(interpolators));
+    if (int(interpolationType) >= interpolators->count())
+        interpolators->resize(int(interpolationType) + 1);
+    interpolators->replace(interpolationType, func);
 }
 
 
@@ -412,10 +412,11 @@ template<typename T> static inline QVariantAnimation::Interpolator castToInterpo
 
 QVariantAnimation::Interpolator QVariantAnimationPrivate::getInterpolator(int interpolationType)
 {
-    QReadLocker locker(registeredInterpolatorsLock());
+    QInterpolatorVector *interpolators = registeredInterpolators();
+    QMutexLocker locker(QMutexPool::globalInstanceGet(interpolators));
     QVariantAnimation::Interpolator ret = 0;
-    if (interpolationType < registeredInterpolators()->count()) {
-        ret = registeredInterpolators()->at(interpolationType);
+    if (interpolationType < interpolators->count()) {
+        ret = interpolators->at(interpolationType);
         if (ret) return ret;
     }
 
diff --git a/src/corelib/animation/qvariantanimation_p.h b/src/corelib/animation/qvariantanimation_p.h
index aee2324..3ae0e39 100644
--- a/src/corelib/animation/qvariantanimation_p.h
+++ b/src/corelib/animation/qvariantanimation_p.h
@@ -58,7 +58,7 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qvector.h>
 
-#include "qabstractanimation_p.h"
+#include "private/qabstractanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/arch/qatomic_windows.h b/src/corelib/arch/qatomic_windows.h
index ac26b4f..5135575 100644
--- a/src/corelib/arch/qatomic_windows.h
+++ b/src/corelib/arch/qatomic_windows.h
@@ -220,6 +220,9 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo
 
 #if !defined(Q_OS_WINCE)
 // use compiler intrinsics for all atomic functions
+//those functions need to be define in the global namespace
+QT_END_NAMESPACE
+
 extern "C" {
     long __cdecl _InterlockedIncrement(volatile long *);
     long __cdecl _InterlockedDecrement(volatile long *);
@@ -252,6 +255,9 @@ extern "C" {
 #    define _InterlockedExchangeAddPointer(a,b) \
         _InterlockedExchangeAdd(reinterpret_cast<volatile long *>(a), long(b))
 #  endif
+
+QT_BEGIN_NAMESPACE
+
 inline bool QBasicAtomicInt::ref()
 {
     return _InterlockedIncrement(reinterpret_cast<volatile long *>(&_q_value)) != 0;
@@ -335,6 +341,8 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo
 #define Q_ARGUMENT_TYPE
 #endif
 
+QT_END_NAMESPACE
+
 extern "C" {
 long __cdecl InterlockedIncrement(long Q_ARGUMENT_TYPE * lpAddend);
 long __cdecl InterlockedDecrement(long Q_ARGUMENT_TYPE * lpAddend);
@@ -351,6 +359,8 @@ long __cdecl InterlockedExchangeAdd(long Q_ARGUMENT_TYPE * Addend, long Value);
 #  pragma intrinsic (_InterlockedExchangeAdd)
 #endif
 
+QT_BEGIN_NAMESPACE
+
 #endif
 
 
@@ -409,6 +419,8 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo
 // MinGW's definition, such that we pick up variations in the headers.
 #ifndef __INTERLOCKED_DECLARED
 #define __INTERLOCKED_DECLARED
+QT_END_NAMESPACE
+
 extern "C" {
     __declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long);
     __declspec(dllimport) long __stdcall InterlockedIncrement(long *);
@@ -416,6 +428,8 @@ extern "C" {
     __declspec(dllimport) long __stdcall InterlockedExchange(long *, long);
     __declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long);
 }
+
+QT_BEGIN_NAMESPACE
 #endif
 
 inline bool QBasicAtomicInt::ref()
diff --git a/src/corelib/io/qfilesystemwatcher_dnotify.cpp b/src/corelib/io/qfilesystemwatcher_dnotify.cpp
index e87375a..a8397f8 100644
--- a/src/corelib/io/qfilesystemwatcher_dnotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_dnotify.cpp
@@ -114,7 +114,7 @@ private:
     bool isExecing;
 };
 
-Q_GLOBAL_STATIC(QDnotifySignalThread, dnotifySignal);
+Q_GLOBAL_STATIC(QDnotifySignalThread, dnotifySignal)
 
 QDnotifySignalThread::QDnotifySignalThread()
 : isExecing(false)
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index 790f1eb..9da9e66 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -1770,10 +1770,10 @@ QString QFSFileEngine::fileName(FileName file) const
         if(slash == -1) {
             if(d->filePath.length() >= 2 && d->filePath.at(1) == QLatin1Char(':'))
                 return d->filePath.left(2);
-            return QLatin1Char('.');
+            return QString(QLatin1Char('.'));
         } else {
             if(!slash)
-                return QLatin1Char('/');
+                return QString(QLatin1Char('/'));
             if(slash == 2 && d->filePath.length() >= 2 && d->filePath.at(1) == QLatin1Char(':'))
                 slash++;
             return d->filePath.left(slash);
@@ -1831,7 +1831,7 @@ QString QFSFileEngine::fileName(FileName file) const
             if (slash == -1)
                 ret = QDir::currentPath();
             else if (slash == 0)
-                ret = QLatin1Char('/');
+                ret = QString(QLatin1Char('/'));
             ret = ret.left(slash);
         }
         return ret;
diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
index f50acdb..1ff3a4c 100644
--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
@@ -143,11 +143,11 @@ QT_BEGIN_NAMESPACE
 
 QNonContiguousByteDevice::QNonContiguousByteDevice() : QObject((QObject*)0), resetDisabled(false)
 {
-};
+}
 
 QNonContiguousByteDevice::~QNonContiguousByteDevice()
 {
-};
+}
 
 void QNonContiguousByteDevice::disableReset()
 {
@@ -253,7 +253,7 @@ QNonContiguousByteDeviceRingBufferImpl::QNonContiguousByteDeviceRingBufferImpl(Q
 
 QNonContiguousByteDeviceRingBufferImpl::~QNonContiguousByteDeviceRingBufferImpl()
 {
-};
+}
 
 const char* QNonContiguousByteDeviceRingBufferImpl::readPointer(qint64 maximumLength, qint64 &len)
 {
@@ -268,19 +268,19 @@ const char* QNonContiguousByteDeviceRingBufferImpl::readPointer(qint64 maximumLe
         len = qMin(len, maximumLength);
 
     return returnValue;
-};
+}
 
 bool QNonContiguousByteDeviceRingBufferImpl::advanceReadPointer(qint64 amount)
 {
     currentPosition += amount;
     emit readProgress(currentPosition, size());
     return true;
-};
+}
 
 bool QNonContiguousByteDeviceRingBufferImpl::atEnd()
 {
     return currentPosition >= size();
-};
+}
 
 bool QNonContiguousByteDeviceRingBufferImpl::reset()
 {
@@ -289,12 +289,12 @@ bool QNonContiguousByteDeviceRingBufferImpl::reset()
 
     currentPosition = 0;
     return true;
-};
+}
 
 qint64 QNonContiguousByteDeviceRingBufferImpl::size()
 {
     return ringBuffer->size();
-};
+}
 
 QNonContiguousByteDeviceIoDeviceImpl::QNonContiguousByteDeviceIoDeviceImpl(QIODevice *d)
     : QNonContiguousByteDevice(),
@@ -306,12 +306,12 @@ QNonContiguousByteDeviceIoDeviceImpl::QNonContiguousByteDeviceIoDeviceImpl(QIODe
     initialPosition = d->pos();
     connect(device, SIGNAL(readyRead()), this, SIGNAL(readyRead()), Qt::QueuedConnection);
     connect(device, SIGNAL(readChannelFinished()), this, SIGNAL(readyRead()), Qt::QueuedConnection);
-};
+}
 
 QNonContiguousByteDeviceIoDeviceImpl::~QNonContiguousByteDeviceIoDeviceImpl()
 {
     delete currentReadBuffer;
-};
+}
 
 const char* QNonContiguousByteDeviceIoDeviceImpl::readPointer(qint64 maximumLength, qint64 &len)
 {
@@ -347,7 +347,7 @@ const char* QNonContiguousByteDeviceIoDeviceImpl::readPointer(qint64 maximumLeng
 
     len = haveRead;
     return currentReadBuffer->data();
-};
+}
 
 bool QNonContiguousByteDeviceIoDeviceImpl::advanceReadPointer(qint64 amount)
 {
@@ -377,12 +377,12 @@ bool QNonContiguousByteDeviceIoDeviceImpl::advanceReadPointer(qint64 amount)
         emit readProgress(totalAdvancements, size());
 
     return true;
-};
+}
 
 bool QNonContiguousByteDeviceIoDeviceImpl::atEnd()
 {
     return eof == true;
-};
+}
 
 bool QNonContiguousByteDeviceIoDeviceImpl::reset()
 {
@@ -395,7 +395,7 @@ bool QNonContiguousByteDeviceIoDeviceImpl::reset()
     }
 
     return false;
-};
+}
 
 qint64 QNonContiguousByteDeviceIoDeviceImpl::size()
 {
@@ -405,7 +405,7 @@ qint64 QNonContiguousByteDeviceIoDeviceImpl::size()
         return -1;
 
     return device->size() - initialPosition;
-};
+}
 
 QByteDeviceWrappingIoDevice::QByteDeviceWrappingIoDevice(QNonContiguousByteDevice *bd) : QIODevice((QObject*)0)
 {
@@ -497,7 +497,7 @@ QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QIODevice *dev
 
     // generic QIODevice
     return new QNonContiguousByteDeviceIoDeviceImpl(device); // FIXME
-};
+}
 
 /*!
     \fn static QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QRingBuffer *ringBuffer);
@@ -509,7 +509,7 @@ QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QIODevice *dev
 QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QRingBuffer *ringBuffer)
 {
     return new QNonContiguousByteDeviceRingBufferImpl(ringBuffer);
-};
+}
 
 /*!
     \fn static QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QByteArray *byteArray);
@@ -521,7 +521,7 @@ QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QRingBuffer *r
 QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QByteArray *byteArray)
 {
     return new QNonContiguousByteDeviceByteArrayImpl(byteArray);
-};
+}
 
 /*!
     \fn static QIODevice* QNonContiguousByteDeviceFactory::wrap(QNonContiguousByteDevice* byteDevice);
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 6aa3b56..1b9cb93 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -263,7 +263,7 @@ QTimerInfoList::QTimerInfoList()
 #  if (_POSIX_MONOTONIC_CLOCK == 0)
     // detect if the system support monotonic timers
     long x = sysconf(_SC_MONOTONIC_CLOCK);
-    useMonotonicTimers = x >= 200112L;
+    useMonotonicTimers = x != -1;
 #  endif
 
     getTime(currentTime);
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 751bc44..f3a8438 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2061,7 +2061,7 @@ void QObject::deleteLater()
 
     or
 
-    \tt{/*: ... \starslash}
+    \tt{\begincomment: ... \endcomment}
 
     Examples:
 
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 08821d4..8ca53b9 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -211,7 +211,7 @@ void QTimer::start()
 */
 void QTimer::start(int msec)
 {
-    setInterval(msec);
+    inter = msec;
     start();
 }
 
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 3e4b467..5ba9898 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -206,8 +206,6 @@ static int numerusHelper(int n, const uchar *rules, int rulesSize)
     return -1;
 }
 
-extern bool qt_detectRTLLanguage();
-
 class QTranslatorPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QTranslator)
@@ -348,7 +346,7 @@ QTranslator::QTranslator(QObject * parent, const char * name)
 QTranslator::~QTranslator()
 {
     if (QCoreApplication::instance())
-        QCoreApplication::instance()->removeTranslator(this);
+        QCoreApplication::removeTranslator(this);
     Q_D(QTranslator);
     d->clear();
 }
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
index 5163027..4740bf1 100644
--- a/src/corelib/plugin/qfactoryloader.cpp
+++ b/src/corelib/plugin/qfactoryloader.cpp
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QList<QFactoryLoader *>, qt_factory_loaders);
+Q_GLOBAL_STATIC(QList<QFactoryLoader *>, qt_factory_loaders)
 
 Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_factoryloader_mutex, (QMutex::Recursive))
 
diff --git a/src/corelib/statemachine/qeventtransition_p.h b/src/corelib/statemachine/qeventtransition_p.h
index 600cec0..ab17ad3 100644
--- a/src/corelib/statemachine/qeventtransition_p.h
+++ b/src/corelib/statemachine/qeventtransition_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qabstracttransition_p.h"
+#include "private/qabstracttransition_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/statemachine/qhistorystate_p.h b/src/corelib/statemachine/qhistorystate_p.h
index 5aaa64c..875dac8 100644
--- a/src/corelib/statemachine/qhistorystate_p.h
+++ b/src/corelib/statemachine/qhistorystate_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qabstractstate_p.h"
+#include "private/qabstractstate_p.h"
 
 #include <QtCore/qlist.h>
 
diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h
index 339de63..aacb6fc 100644
--- a/src/corelib/statemachine/qsignaltransition_p.h
+++ b/src/corelib/statemachine/qsignaltransition_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qabstracttransition_p.h"
+#include "private/qabstracttransition_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index 5463059..ebb0b47 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -329,9 +329,10 @@ QSignalTransition *QState::addTransition(QObject *sender, const char *signal,
         qWarning("QState::addTransition: cannot add transition to null state");
         return 0;
     }
-    if (*signal && sender->metaObject()->indexOfSignal(signal+1) == -1) {
+    int offset = (*signal == '0'+QSIGNAL_CODE) ? 1 : 0;
+    if (sender->metaObject()->indexOfSignal(signal+offset) == -1) {
         qWarning("QState::addTransition: no such signal %s::%s",
-                 sender->metaObject()->className(), signal+1);
+                 sender->metaObject()->className(), signal+offset);
         return 0;
     }
     QSignalTransition *trans = new QSignalTransition(sender, signal, QList<QAbstractState*>() << target);
diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h
index 93744b9..eddd831 100644
--- a/src/corelib/statemachine/qstate_p.h
+++ b/src/corelib/statemachine/qstate_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qabstractstate_p.h"
+#include "private/qabstractstate_p.h"
 
 #include <QtCore/qlist.h>
 #include <QtCore/qbytearray.h>
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 84619d7..d5f6b76 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -92,7 +92,7 @@ QT_BEGIN_NAMESPACE
     QAbstractState) and transitions (descendants of
     QAbstractTransition) between those states; these states and
     transitions define a state graph. Once a state graph has been
-    built, the state machine can execute it. \l{QStateMachine}'s
+    built, the state machine can execute it. QStateMachine's
     execution algorithm is based on the \l{State Chart XML: State
     Machine Notation for Control Abstraction}{State Chart XML (SCXML)}
     algorithm. The framework's \l{The State Machine
@@ -1329,7 +1329,7 @@ void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transitio
         if (!ok) {
 #ifdef QSTATEMACHINE_DEBUG
             qDebug() << q << ": FAILED to add signal transition from" << transition->sourceState()
-                     << ": ( sender =" << sender << ", signal =" << (signal.mid(1))
+                     << ": ( sender =" << sender << ", signal =" << signal
                      << ", targets =" << transition->targetStates() << ')';
 #endif
             return;
@@ -1339,7 +1339,7 @@ void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transitio
     QSignalTransitionPrivate::get(transition)->signalIndex = signalIndex;
 #ifdef QSTATEMACHINE_DEBUG
     qDebug() << q << ": added signal transition from" << transition->sourceState()
-             << ": ( sender =" << sender << ", signal =" << (signal.mid(1))
+             << ": ( sender =" << sender << ", signal =" << signal
              << ", targets =" << transition->targetStates() << ')';
 #endif
 }
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index 54953b4..24073ca 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -62,7 +62,7 @@
 #include <QtCore/qvector.h>
 
 #include "qstate.h"
-#include "qstate_p.h"
+#include "private/qstate_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 9953155..8c740bd 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -42,7 +42,6 @@
 #include "qglobal.h"
 
 #ifndef QT_NO_SYSTEMLOCALE
-#define QLOCALE_CPP
 QT_BEGIN_NAMESPACE
 class QSystemLocale;
 static QSystemLocale *QSystemLocale_globalSystemLocale();
@@ -1602,6 +1601,8 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l)
     This constructor converts the locale name to a language/country
     pair; it does not use the system locale database.
 
+    QLocale's data is based on Common Locale Data Repository v1.6.1.
+
     The double-to-string and string-to-double conversion functions are
     covered by the following licenses:
 
@@ -1622,8 +1623,6 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l)
     This product includes software developed by the University of
     California, Berkeley and its contributors.
 
-    QLocale's data is based on Common Locale Data Repository v1.6.1.
-
     \sa QString::arg(), QString::toInt(), QString::toDouble()
 */
 
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index 5b611eb..987ab4e 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -99,11 +99,9 @@ public:
     virtual QVariant query(QueryType type, QVariant in) const;
     virtual QLocale fallbackLocale() const;
 
-#ifdef QLOCALE_CPP
 private:
     QSystemLocale(bool);
     friend QSystemLocale *QSystemLocale_globalSystemLocale();
-#endif
 };
 #endif
 
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h
index 9d36a83..b07b948 100644
--- a/src/corelib/tools/qlocale_p.h
+++ b/src/corelib/tools/qlocale_p.h
@@ -96,7 +96,7 @@ public:
 
         ShowBase            = 0x80,
         UppercaseBase       = 0x100,
-        ForcePoint          = Alternate,
+        ForcePoint          = Alternate
     };
 
     enum GroupSeparatorMode {
diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp
index b807a89..4f24f76 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/tools/qstringbuilder.cpp
@@ -64,15 +64,15 @@
     \sa QStringBuilder, QLatin1String, QString, QStringRef
 */
 
-/*! \fn QLatin1Literal::QLatin1Literal(const char(&string)[])
+/*! \fn QLatin1Literal::QLatin1Literal(const char(&string)[N])
  
     Constructs a new literal from the given \a string.
 */
 
 /*! \fn int QLatin1Literal::size() const
  
-    Returns the number of characters in the literal \i{excluding} the trailing
-    NUL char.
+    Returns the number of characters in the literal \e{excluding} the trailing
+    NULL char.
 */
 
 /*! \fn char *QLatin1Literal::data() const
@@ -93,7 +93,7 @@
     \reentrant
     \since 4.6
 
-    \brief QStringBuilder is a template class that provides a facility to build
+    \brief The QStringBuilder class is a template class that provides a facility to build
     up QStrings from smaller chunks.
 
     \ingroup tools
@@ -102,7 +102,7 @@
     \mainclass
 
     When creating strings from smaller chunks, typically \c QString::operator+()
-    is used, resulting in \i{n - 1} reallocations when operating on \i{n} chunks.
+    is used, resulting in \e{n - 1} reallocations when operating on \e{n} chunks.
 
     QStringBuilder uses expression templates to collect the individual parts,
     compute the total size, allocate memory for the resulting QString object,
@@ -122,7 +122,7 @@
     \sa QLatin1Literal, QString
 */
 
-/* !fn template <class A, class B> QStringBuilder<A, B> operator%(const A &a, const B &b)
+/* \fn template <class A, class B> QStringBuilder<A, B> operator%(const A &a, const B &b)
 
     Returns a \c QStringBuilder object that is converted to a QString object
     when assigned to a variable of QString type or passed to a function that
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 7bdcba0..38254cd 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -94,7 +94,14 @@ template <typename T>
 class QVector
 {
     typedef QVectorTypedData<T> Data;
-    union { QVectorData *d; Data *p; };
+    union {
+        QVectorData *d;
+#if defined(Q_CC_SUN) && (__SUNPRO_CC <= 0x550)
+        QVectorTypedData<T> *p;
+#else
+        Data *p;
+#endif
+    };
 
 public:
     inline QVector() : d(&QVectorData::shared_null) { d->ref.ref(); }
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 0ebbbfb..e06afb5 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -194,6 +194,8 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl
         d->imports += QUrl(td->data.imports().at(i).uri);
     }
 
+    d->automaticSemicolonOffsets = td->data.automaticSemicolonOffsets();
+
     if (td->data.tree()) {
         if (compilerDump()) {
             qWarning() << "-AST------------------------------------------------------------------------------";
@@ -251,6 +253,14 @@ QmlDomObject QmlDomDocument::rootObject() const
     return rv;
 }
 
+QList<int> QmlDomDocument::automaticSemicolonOffsets() const
+{
+    if (d)
+        return d->automaticSemicolonOffsets;
+    else
+        return QList<int>();
+}
+
 QmlDomPropertyPrivate::QmlDomPropertyPrivate()
 : property(0)
 {
diff --git a/src/declarative/qml/qmldom.h b/src/declarative/qml/qmldom.h
index 86eaecb..442a4fc 100644
--- a/src/declarative/qml/qmldom.h
+++ b/src/declarative/qml/qmldom.h
@@ -78,6 +78,9 @@ public:
     QByteArray save() const;
 
     QmlDomObject rootObject() const;
+
+    QList<int> automaticSemicolonOffsets() const;
+
 private:
     QSharedDataPointer<QmlDomDocumentPrivate> d;
 };
diff --git a/src/declarative/qml/qmldom_p.h b/src/declarative/qml/qmldom_p.h
index 74edd47..441269c 100644
--- a/src/declarative/qml/qmldom_p.h
+++ b/src/declarative/qml/qmldom_p.h
@@ -62,6 +62,7 @@ public:
     QList<QmlError> errors;
     QList<QUrl> imports;
     QmlParser::Object *root;
+    QList<int> automaticSemicolonOffsets;
 };
 
 class QmlDomObjectPrivate : public QSharedData
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 31a20be..5207292 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -178,6 +178,8 @@ protected:
     virtual bool visit(AST::UiArrayBinding *node);
     virtual bool visit(AST::UiSourceElement *node);
 
+    virtual bool visit(AST::ExpressionStatement *node);
+
     void accept(AST::Node *node);
 
     QString asString(AST::UiQualifiedId *node) const;
@@ -638,6 +640,14 @@ bool ProcessAST::visit(AST::UiScriptBinding *node)
     return true;
 }
 
+bool ProcessAST::visit(AST::ExpressionStatement *node)
+{
+    if (!node->semicolonToken.isValid())
+        _parser->addAutomaticSemicolonOffset(node->semicolonToken.offset);
+
+    return true;
+}
+
 // UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiObjectMemberList T_RBRACKET ;
 bool ProcessAST::visit(AST::UiArrayBinding *node)
 {
@@ -825,6 +835,7 @@ void QmlScriptParser::clear()
     _nameSpacePaths.clear();
     _typeNames.clear();
     _errors.clear();
+    _automaticSemicolonOffsets.clear();
 
     if (data) {
         delete data;
diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h
index 3993194..b057e2b 100644
--- a/src/declarative/qml/qmlscriptparser_p.h
+++ b/src/declarative/qml/qmlscriptparser_p.h
@@ -82,6 +82,9 @@ public:
 
     QList<QmlError> errors() const;
 
+    QList<int> automaticSemicolonOffsets() const { return _automaticSemicolonOffsets; }
+    void addAutomaticSemicolonOffset(int offset) { _automaticSemicolonOffsets.append(offset); }
+
 // ### private:
     int findOrCreateTypeId(const QString &name);
     void setTree(QmlParser::Object *tree);
@@ -100,6 +103,7 @@ public:
     QStringList _typeNames;
     QString _scriptFile;
     QmlScriptParserJsASTData *data;
+    QList<int> _automaticSemicolonOffsets;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qperformancelog.h b/src/declarative/util/qperformancelog.h
index 6bb9037..3203685 100644
--- a/src/declarative/util/qperformancelog.h
+++ b/src/declarative/util/qperformancelog.h
@@ -126,49 +126,9 @@ namespace QPerformanceLog
 
 #else // Q_ENABLE_PERFORMANCE_LOG
 
-#define Q_DECLARE_PERFORMANCE_METRIC(name) \
-    enum { name = ValueChoice<0, ValueTracker<0, __LINE__>::value, __LINE__>::value };  \
-    template<int L> \
-    struct ValueTracker<name, L> \
-    { \
-        enum { value = name }; \
-    }; \
-
-#define Q_DECLARE_PERFORMANCE_LOG(name) \
-    namespace name { \
-        inline void displayData() { }; \
-        inline void clear() { }; \
-    } \
-    template<int N> \
-    class name ## Timer { \
-    public: \
-            name ## Timer() { \
-            } \
-            ~ name ## Timer() { \
-            } \
-    }; \
-    namespace name { \
-        template<int N, int L> \
-        struct ValueTracker \
-        { \
-            enum { value = -1 }; \
-        }; \
-        template<int DefNextValue, int NextValue, int L> \
-        struct ValueChoice \
-        { \
-            enum { value = ValueChoice<DefNextValue + 1, ValueTracker<DefNextValue + 1, L>::value, L>::value }; \
-        }; \
-        template<int DefNextValue, int L> \
-        struct ValueChoice<DefNextValue, -1, L> \
-        { \
-            enum { value = DefNextValue }; \
-        }; \
-    } \
-    namespace name 
-
-#define Q_DEFINE_PERFORMANCE_LOG(name, desc) \
-    namespace name
-
+#define Q_DECLARE_PERFORMANCE_METRIC(name)
+#define Q_DECLARE_PERFORMANCE_LOG(name) namespace name
+#define Q_DEFINE_PERFORMANCE_LOG(name, desc) namespace name
 #define Q_DEFINE_PERFORMANCE_METRIC(name, desc) 
 
 #endif // Q_ENABLE_PERFORMANCE_LOG
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 56b89f0..76f0309 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -565,8 +565,9 @@ bool QFileDialogPrivate::canBeNativeDialog()
 }
 
 /*!
-    Sets the given \a option to be enabled if \a on is true;
-    otherwise, clears the given \a option.
+    \since 4.5
+    Sets the given \a option to be enabled if \a on is true; otherwise,
+    clears the given \a option.
 
     \sa options, testOption()
 */
@@ -2108,6 +2109,7 @@ void QFileDialogPrivate::createWidgets()
 #else
     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 &)));
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index 825f8b6..2c47116 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -1083,6 +1083,7 @@ private:
 */
 void QFileSystemModelPrivate::sortChildren(int column, const QModelIndex &parent)
 {
+    Q_Q(QFileSystemModel);
     QFileSystemModelPrivate::QFileSystemNode *indexNode = node(parent);
     if (indexNode->children.count() == 0)
         return;
@@ -1106,6 +1107,16 @@ void QFileSystemModelPrivate::sortChildren(int column, const QModelIndex &parent
         indexNode->visibleChildren.append(values.at(i).first->fileName);
         values.at(i).first->isVisible = true;
     }
+
+    if (!disableRecursiveSort) {
+        for (int i = 0; i < q->rowCount(parent); ++i) {
+            const QModelIndex childIndex = q->index(i, 0, parent);
+            QFileSystemModelPrivate::QFileSystemNode *indexNode = node(childIndex);
+            //Only do a recursive sort on visible nodes
+            if (indexNode->isVisible)
+                sortChildren(column, childIndex);
+        }
+    }
 }
 
 /*!
diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h
index 61e8b4c..af4fada 100644
--- a/src/gui/dialogs/qfilesystemmodel_p.h
+++ b/src/gui/dialogs/qfilesystemmodel_p.h
@@ -208,7 +208,8 @@ public:
             readOnly(true),
             setRootPath(false),
             filters(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs),
-            nameFilterDisables(true) // false on windows, true on mac and unix
+            nameFilterDisables(true), // false on windows, true on mac and unix
+            disableRecursiveSort(false)
     {
         delayedSortTimer.setSingleShot(true);
     }
@@ -294,6 +295,10 @@ public:
     QDir::Filters filters;
     QHash<const QFileSystemNode*, bool> bypassFilters;
     bool nameFilterDisables;
+    //This flag is an optimization for the QFileDialog
+    //It enable a sort which is not recursive, it means
+    //we sort only what we see.
+    bool disableRecursiveSort;
 #ifndef QT_NO_REGEXP
     QList<QRegExp> nameFilters;
 #endif
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp
index 1734e85..648cda8 100644
--- a/src/gui/dialogs/qmessagebox.cpp
+++ b/src/gui/dialogs/qmessagebox.cpp
@@ -1699,7 +1699,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
         "and Qt for Windows CE.</p>"
         "<p>Qt is available under three different licensing options designed "
         "to accommodate the needs of our various users.</p>"
-        "Qt licensed under our commercial license agreement is appropriate "
+        "<p>Qt licensed under our commercial license agreement is appropriate "
         "for development of proprietary/commercial software where you do not "
         "want to share any source code with third parties or otherwise cannot "
         "comply with the terms of the GNU LGPL version 2.1 or GNU GPL version "
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index 5302925..8d6d880 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -2004,8 +2004,10 @@ void QGraphicsWidget::insertAction(QAction *before, QAction *action)
     }
     d->actions.insert(pos, action);
 
-    QActionPrivate *apriv = action->d_func();
-    apriv->graphicsWidgets.append(this);
+    if (index == -1) {
+        QActionPrivate *apriv = action->d_func();
+        apriv->graphicsWidgets.append(this);
+    }
 
     QActionEvent e(QEvent::ActionAdded, action, before);
     QApplication::sendEvent(this, &e);
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 471062f..f24aeff 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -430,10 +430,13 @@ bool QPixmapIconEngine::read(QDataStream &in)
         in >> sz;
         in >> mode;
         in >> state;
-        if (pm.isNull())
+        if (pm.isNull()) {
             addFile(fileName, sz, QIcon::Mode(mode), QIcon::State(state));
-        else
-            addPixmap(pm, QIcon::Mode(mode), QIcon::State(state));
+        } else {
+            QPixmapIconEngineEntry pe(fileName, sz, QIcon::Mode(mode), QIcon::State(state));
+            pe.pixmap = pm;
+            pixmaps += pe;
+        }
     }
     return true;
 }
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 670058b..7e97784 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -2063,9 +2063,13 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                 // WM_ACTIVATEAPP handles the "true" false case, as this is only when the application
                 // loses focus. Doing it here would result in the widget getting focus to not know
                 // where it got it from; it would simply get a 0 value as the old focus widget.
+#ifndef Q_WS_WINCE_WM
                 if (!(widget->windowState() & Qt::WindowMinimized)) {
                     // Ignore the activate message send by WindowsXP to a minimized window
-#ifdef Q_WS_WINCE_WM
+#else
+                {
+                    if (widget->windowState() & Qt::WindowMinimized)
+                        widget->dataPtr()->window_state &= ~Qt::WindowMinimized;
                     if  (widget->windowState() & Qt::WindowFullScreen)
                         qt_wince_hide_taskbar(widget->winId());
 #endif
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 90376b3..1473421 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -2954,10 +2954,10 @@ QWidget *QApplication::topLevelAt(const QPoint &p)
                     Window wid = widget->internalWinId();
                     while (ctarget && !w) {
                         X11->ignoreBadwindow();
-                        XTranslateCoordinates(X11->display,
-                                              QX11Info::appRootWindow(screen),
-                                              ctarget, x, y, &unused, &unused, &ctarget);
-                        if (X11->badwindow())
+                        if (!XTranslateCoordinates(X11->display,
+                                                   QX11Info::appRootWindow(screen),
+                                                   ctarget, x, y, &unused, &unused, &ctarget)
+                                || X11->badwindow())
                             break;
                         if (ctarget == wid) {
                             // Found!
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 9165836..554e9d5 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -88,6 +88,52 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_GLOBAL_STATIC(QMacWindowFader, macwindowFader);
+
+QMacWindowFader::QMacWindowFader()
+    : m_duration(0.250)
+{
+}
+
+QMacWindowFader *QMacWindowFader::currentFader()
+{
+    return macwindowFader();
+}
+
+void QMacWindowFader::registerWindowToFade(QWidget *window)
+{
+    m_windowsToFade.append(window);
+}
+
+void QMacWindowFader::performFade()
+{
+    const QWidgetList myWidgetsToFade = m_windowsToFade;
+    const int widgetCount = myWidgetsToFade.count();
+#if QT_MAC_USE_COCOA
+    QMacCocoaAutoReleasePool pool;
+    [NSAnimationContext beginGrouping];
+    [[NSAnimationContext currentContext] setDuration:NSTimeInterval(m_duration)];
+#endif
+
+    for (int i = 0; i < widgetCount; ++i) {
+        QWidget *widget = m_windowsToFade.at(i);
+        OSWindowRef window = qt_mac_window_for(widget);
+#if QT_MAC_USE_COCOA
+        [[window animator] setAlphaValue:0.0];
+        QTimer::singleShot(qRound(m_duration * 1000), widget, SLOT(hide()));
+#else
+        TransitionWindowOptions options = {0, m_duration, 0, 0};
+        TransitionWindowWithOptions(window, kWindowFadeTransitionEffect, kWindowHideTransitionAction,
+                                    0, 1, &options);
+#endif
+    }
+#if QT_MAC_USE_COCOA
+    [NSAnimationContext endGrouping];
+#endif
+    m_duration = 0.250;
+    m_windowsToFade.clear();
+}
+
 extern bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event); // qapplication.cpp;
 extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm
 extern QWidget * mac_mouse_grabber;
@@ -95,29 +141,26 @@ extern QWidget * mac_mouse_grabber;
 void macWindowFade(void * /*OSWindowRef*/ window, float durationSeconds)
 {
     OSWindowRef wnd = static_cast<OSWindowRef>(window);
-	if( wnd ) {
+    if (wnd) {
+        QWidget *widget;
 #if QT_MAC_USE_COCOA
-        QMacCocoaAutoReleasePool pool;
-        [NSAnimationContext beginGrouping];
-        [[wnd animator] setAlphaValue:0.0];
-        if (durationSeconds > 0) {
-            [[NSAnimationContext currentContext] setDuration:NSTimeInterval(durationSeconds)];
-        } else {
-            durationSeconds = [[NSAnimationContext currentContext] duration];
-        }
-        [NSAnimationContext endGrouping];
-        QTimer::singleShot(qRound(durationSeconds * 1000), [wnd QT_MANGLE_NAMESPACE(qt_qwidget)], SLOT(hide()));
+        widget = [wnd QT_MANGLE_NAMESPACE(qt_qwidget)];
 #else
-        if (durationSeconds <= 0)
-            durationSeconds = 0.15;
-		TransitionWindowOptions options = {0, durationSeconds, 0, 0};
-		TransitionWindowWithOptions(wnd, kWindowFadeTransitionEffect, kWindowHideTransitionAction, 0, 1, &options);
+    const UInt32 kWidgetCreatorQt = kEventClassQt;
+    enum {
+        kWidgetPropertyQWidget = 'QWId' //QWidget *
+    };
+        if (GetWindowProperty(static_cast<WindowRef>(window), kWidgetCreatorQt, kWidgetPropertyQWidget, sizeof(widget), 0, &widget) != noErr)
+            widget = 0;
 #endif
-	}
+        if (widget) {
+            QMacWindowFader::currentFader()->setFadeDuration(durationSeconds);
+            QMacWindowFader::currentFader()->registerWindowToFade(widget);
+            QMacWindowFader::currentFader()->performFade();
+        }
+    }
 }
 
-
-
 bool macWindowIsTextured( void * /*OSWindowRef*/ window )
 {
     OSWindowRef wnd = static_cast<OSWindowRef>(window);
diff --git a/src/gui/kernel/qt_mac_p.h b/src/gui/kernel/qt_mac_p.h
index ca995dc..3b0f546 100644
--- a/src/gui/kernel/qt_mac_p.h
+++ b/src/gui/kernel/qt_mac_p.h
@@ -120,6 +120,21 @@ public:
     }
 };
 
+// Class for chaining to gether a bunch of fades. It pretty much is only used for qmenu fading.
+class QMacWindowFader
+{
+    QWidgetList m_windowsToFade;
+    float m_duration;
+    Q_DISABLE_COPY(QMacWindowFader)
+public:
+    QMacWindowFader(); // PLEASE DON'T CALL THIS.
+    static QMacWindowFader *currentFader();
+    void registerWindowToFade(QWidget *window);
+    void setFadeDuration(float durationInSecs) { m_duration = durationInSecs; }
+    float fadeDuration() const { return m_duration; }
+    void performFade();
+};
+
 class Q_GUI_EXPORT QMacCocoaAutoReleasePool
 {
 private:
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index c9f624f..d03d2df 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -5674,10 +5674,15 @@ void QWidget::setFocus(Qt::FocusReason reason)
             w = w->isWindow() ? 0 : w->parentWidget();
         }
     } else {
-        while (w) {
+        while (w && w->isVisible()) {
             w->d_func()->focus_child = f;
             w = w->isWindow() ? 0 : w->parentWidget();
         }
+        // a special case, if there is an invisible parent, notify him
+        // about the focus_child widget, so that if it becomes
+        // visible, the focus widget will be respected.
+        if (w)
+            w->d_func()->focus_child = f;
     }
 
 #ifndef QT_NO_GRAPHICSVIEW
@@ -6729,6 +6734,10 @@ void QWidgetPrivate::show_helper()
     if (QApplicationPrivate::hidden_focus_widget == q) {
         QApplicationPrivate::hidden_focus_widget = 0;
         q->setFocus(Qt::OtherFocusReason);
+    } else if (focus_child) {
+        // if we are shown and there is an explicit focus child widget
+        // set, respect it by giving him focus.
+        focus_child->setFocus(Qt::OtherFocusReason);
     }
 
     // Process events when showing a Qt::SplashScreen widget before the event loop
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 8243f32..f389bfd 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -1304,8 +1304,11 @@ OSStatus QWidgetPrivate::qt_widget_event(EventHandlerCallRef er, EventRef event,
                 if(part == kControlFocusNoPart){
                     if (widget->hasFocus())
                         QApplicationPrivate::setFocusWidget(0, Qt::OtherFocusReason);
-                } else
+                } else if (widget->focusPolicy() != Qt::NoFocus) {
                     widget->setFocus();
+                } else {
+                    handled_event = false;
+                }
             }
             if(!HIObjectIsOfClass((HIObjectRef)hiview, kObjectQWidget))
                 CallNextEventHandler(er, event);
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 7e41ea1..4e34045 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -1359,17 +1359,10 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
         // already been set
         return;
 
-    XWMHints *h = 0;
-    if (q->internalWinId())
-        h = XGetWMHints(X11->display, q->internalWinId());
-    XWMHints wm_hints;
-    if (!h) {
-        memset(&wm_hints, 0, sizeof(wm_hints)); // make valgrind happy
-        h = &wm_hints;
-    }
-
     // preparing images to set the _NET_WM_ICON property
     QIcon icon = q->windowIcon();
+    QVector<long> icon_data;
+    Qt::HANDLE pixmap_handle = 0;
     if (!icon.isNull()) {
         QList<QSize> availableSizes = icon.availableSizes();
         if(availableSizes.isEmpty()) {
@@ -1379,7 +1372,6 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
             availableSizes.push_back(QSize(64,64));
             availableSizes.push_back(QSize(128,128));
         }
-        QVector<long> icon_data;
         for(int i = 0; i < availableSizes.size(); ++i) {
             QSize size = availableSizes.at(i);
             QPixmap pixmap = icon.pixmap(size);
@@ -1401,11 +1393,6 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
             }
         }
         if (!icon_data.isEmpty()) {
-            if (q->internalWinId()) {
-                XChangeProperty(X11->display, q->internalWinId(), ATOM(_NET_WM_ICON), XA_CARDINAL, 32,
-                                PropModeReplace, (unsigned char *) icon_data.data(),
-                                icon_data.size());
-            }
             extern QPixmap qt_toX11Pixmap(const QPixmap &pixmap);
             /*
               if the app is running on an unknown desktop, or it is not
@@ -1419,22 +1406,44 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
                 // unknown DE or non-default visual/colormap, use 1bpp bitmap
                 if (!forceReset || !topData->iconPixmap)
                     topData->iconPixmap = new QBitmap(qt_toX11Pixmap(icon.pixmap(QSize(64,64))));
-                h->icon_pixmap = topData->iconPixmap->handle();
+                pixmap_handle = topData->iconPixmap->handle();
             } else {
                 // default depth, use a normal pixmap (even though this
                 // violates the ICCCM), since this works on all DEs known to Qt
                 if (!forceReset || !topData->iconPixmap)
                     topData->iconPixmap = new QPixmap(qt_toX11Pixmap(icon.pixmap(QSize(64,64))));
-                h->icon_pixmap = static_cast<QX11PixmapData*>(topData->iconPixmap->data)->x11ConvertToDefaultDepth();
+                pixmap_handle = static_cast<QX11PixmapData*>(topData->iconPixmap->data)->x11ConvertToDefaultDepth();
             }
-            h->flags |= IconPixmapHint;
-        } else {
-            h->flags &= ~(IconPixmapHint | IconMaskHint);
         }
     }
 
-    if (q->internalWinId())
-        XSetWMHints(X11->display, q->internalWinId(), h);
+    if (!q->internalWinId())
+        return;
+
+    if (!icon_data.isEmpty()) {
+        XChangeProperty(X11->display, q->internalWinId(), ATOM(_NET_WM_ICON), XA_CARDINAL, 32,
+                        PropModeReplace, (unsigned char *) icon_data.data(),
+                        icon_data.size());
+    } else {
+        XDeleteProperty(X11->display, q->internalWinId(), ATOM(_NET_WM_ICON));
+    }
+
+    XWMHints *h = XGetWMHints(X11->display, q->internalWinId());
+    XWMHints wm_hints;
+    if (!h) {
+        memset(&wm_hints, 0, sizeof(wm_hints)); // make valgrind happy
+        h = &wm_hints;
+    }
+
+    if (pixmap_handle) {
+        h->icon_pixmap = pixmap_handle;
+        h->flags |= IconPixmapHint;
+    } else {
+        h->icon_pixmap = 0;
+        h->flags &= ~(IconPixmapHint | IconMaskHint);
+    }
+
+    XSetWMHints(X11->display, q->internalWinId(), h);
     if (h != &wm_hints)
         XFree((char *)h);
 }
@@ -1560,7 +1569,6 @@ QWidget *QWidget::keyboardGrabber()
 
 void QWidget::activateWindow()
 {
-    Q_D(QWidget);
     QWidget *tlw = window();
     if (tlw->isVisible() && !tlw->d_func()->topData()->embedded && !X11->deferred_map.contains(tlw)) {
         if (X11->userTime == 0)
@@ -2538,6 +2546,8 @@ void QWidgetPrivate::scroll_sys(int dx, int dy, const QRect &r)
     QRect sr = valid_rect ? r : clipRect();
     if (just_update)
         q->update();
+    else if (!valid_rect)
+        dirty.translate(dx, dy);
 
     int x1, y1, x2, y2, w = sr.width(), h = sr.height();
     if (dx > 0) {
diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp
index 2b48161..61df367 100644
--- a/src/gui/math3d/qgenericmatrix.cpp
+++ b/src/gui/math3d/qgenericmatrix.cpp
@@ -116,7 +116,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn void QGenericMatrix::fill(qreal value)
+    \fn void QGenericMatrix::fill(T value)
 
     Fills all elements of this matrix with \a value.
 */
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h
index d0b22de..b4d3707 100644
--- a/src/gui/math3d/qgenericmatrix.h
+++ b/src/gui/math3d/qgenericmatrix.h
@@ -65,7 +65,7 @@ public:
     bool isIdentity() const;
     void setIdentity();
 
-    void fill(qreal value);
+    void fill(T value);
 
     QGenericMatrix<M, N, T, InnerT> transposed() const;
 
@@ -175,7 +175,7 @@ Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T, InnerT>::setIdentity()
 }
 
 template <int N, int M, typename T, typename InnerT>
-Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T, InnerT>::fill(qreal value)
+Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T, InnerT>::fill(T value)
 {
     for (int col = 0; col < N; ++col)
         for (int row = 0; row < M; ++row)
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index fd4f69a..8ef4da3 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -1488,8 +1488,6 @@ QTransform QMatrix4x4::toTransform() const
 #endif
 
 /*!
-    \fn QRect QMatrix4x4::mapRect(const QRect& rect) const
-
     Maps \a rect by multiplying this matrix by the corners
     of \a rect and then forming a new rectangle from the results.
     The returned rectangle will be an ordinary 2D rectangle
@@ -1497,10 +1495,43 @@ QTransform QMatrix4x4::toTransform() const
 
     \sa map()
 */
+QRect QMatrix4x4::mapRect(const QRect& rect) const
+{
+    if (flagBits == (Translation | Scale) || flagBits == Scale) {
+        qreal x = rect.x() * m[0][0] + m[3][0];
+        qreal y = rect.y() * m[1][1] + m[3][1];
+        qreal w = rect.width() * m[0][0];
+        qreal h = rect.height() * m[1][1];
+        if (w < 0) {
+            w = -w;
+            x -= w;
+        }
+        if (h < 0) {
+            h = -h;
+            y -= h;
+        }
+        return QRect(qRound(x), qRound(y), qRound(w), qRound(h));
+    } else if (flagBits == Translation) {
+        return QRect(qRound(rect.x() + m[3][0]),
+                     qRound(rect.y() + m[3][1]),
+                     rect.width(), rect.height());
+    }
 
-/*!
-    \fn QRectF QMatrix4x4::mapRect(const QRectF& rect) const
+    QPoint tl = map(rect.topLeft());
+    QPoint tr = map(QPoint(rect.x() + rect.width(), rect.y()));
+    QPoint bl = map(QPoint(rect.x(), rect.y() + rect.height()));
+    QPoint br = map(QPoint(rect.x() + rect.width(),
+                           rect.y() + rect.height()));
 
+    int xmin = qMin(qMin(tl.x(), tr.x()), qMin(bl.x(), br.x()));
+    int xmax = qMax(qMax(tl.x(), tr.x()), qMax(bl.x(), br.x()));
+    int ymin = qMin(qMin(tl.y(), tr.y()), qMin(bl.y(), br.y()));
+    int ymax = qMax(qMax(tl.y(), tr.y()), qMax(bl.y(), br.y()));
+
+    return QRect(xmin, ymin, xmax - xmin, ymax - ymin);
+}
+
+/*!
     Maps \a rect by multiplying this matrix by the corners
     of \a rect and then forming a new rectangle from the results.
     The returned rectangle will be an ordinary 2D rectangle
@@ -1510,24 +1541,22 @@ QTransform QMatrix4x4::toTransform() const
 */
 QRectF QMatrix4x4::mapRect(const QRectF& rect) const
 {
-    if (flagBits & Translation) {
-        if (flagBits & Scale) {
-            qreal x = rect.x() * m[0][0] + m[3][0];
-            qreal y = rect.y() * m[1][1] + m[3][1];
-            qreal w = rect.width() * m[0][0];
-            qreal h = rect.height() * m[1][1];
-            if (w < 0) {
-                w = -w;
-                x -= w;
-            }
-            if (h < 0) {
-                h = -h;
-                y -= h;
-            }
-            return QRectF(x, y, w, h);
-        } else {
-            return rect.translated(m[3][0], m[3][1]);
+    if (flagBits == (Translation | Scale) || flagBits == Scale) {
+        qreal x = rect.x() * m[0][0] + m[3][0];
+        qreal y = rect.y() * m[1][1] + m[3][1];
+        qreal w = rect.width() * m[0][0];
+        qreal h = rect.height() * m[1][1];
+        if (w < 0) {
+            w = -w;
+            x -= w;
+        }
+        if (h < 0) {
+            h = -h;
+            y -= h;
         }
+        return QRectF(x, y, w, h);
+    } else if (flagBits == Translation) {
+        return rect.translated(m[3][0], m[3][1]);
     }
 
     QPointF tl = map(rect.topLeft()); QPointF tr = map(rect.topRight());
@@ -1541,7 +1570,6 @@ QRectF QMatrix4x4::mapRect(const QRectF& rect) const
     return QRectF(QPointF(xmin, ymin), QPointF(xmax, ymax));
 }
 
-
 /*!
     \fn float *QMatrix4x4::data()
 
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 79613a0..ba7f67f 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -631,26 +631,43 @@ inline QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix)
 inline QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector)
 {
     float x, y, z, w;
-    x = vector.xp * matrix.m[0][0] +
-        vector.yp * matrix.m[1][0] +
-        vector.zp * matrix.m[2][0] +
-        matrix.m[3][0];
-    y = vector.xp * matrix.m[0][1] +
-        vector.yp * matrix.m[1][1] +
-        vector.zp * matrix.m[2][1] +
-        matrix.m[3][1];
-    z = vector.xp * matrix.m[0][2] +
-        vector.yp * matrix.m[1][2] +
-        vector.zp * matrix.m[2][2] +
-        matrix.m[3][2];
-    w = vector.xp * matrix.m[0][3] +
-        vector.yp * matrix.m[1][3] +
-        vector.zp * matrix.m[2][3] +
-        matrix.m[3][3];
-    if (w == 1.0f)
-        return QVector3D(x, y, z, 1);
-    else
-        return QVector3D(x / w, y / w, z / w, 1);
+    if (matrix.flagBits == QMatrix4x4::Identity) {
+        return vector;
+    } else if (matrix.flagBits == QMatrix4x4::Translation) {
+        return QVector3D(vector.xp + matrix.m[3][0],
+                         vector.yp + matrix.m[3][1],
+                         vector.zp + matrix.m[3][2], 1);
+    } else if (matrix.flagBits ==
+                    (QMatrix4x4::Translation | QMatrix4x4::Scale)) {
+        return QVector3D(vector.xp * matrix.m[0][0] + matrix.m[3][0],
+                         vector.yp * matrix.m[1][1] + matrix.m[3][1],
+                         vector.zp * matrix.m[2][2] + matrix.m[3][2], 1);
+    } else if (matrix.flagBits == QMatrix4x4::Scale) {
+        return QVector3D(vector.xp * matrix.m[0][0],
+                         vector.yp * matrix.m[1][1],
+                         vector.zp * matrix.m[2][2], 1);
+    } else {
+        x = vector.xp * matrix.m[0][0] +
+            vector.yp * matrix.m[1][0] +
+            vector.zp * matrix.m[2][0] +
+            matrix.m[3][0];
+        y = vector.xp * matrix.m[0][1] +
+            vector.yp * matrix.m[1][1] +
+            vector.zp * matrix.m[2][1] +
+            matrix.m[3][1];
+        z = vector.xp * matrix.m[0][2] +
+            vector.yp * matrix.m[1][2] +
+            vector.zp * matrix.m[2][2] +
+            matrix.m[3][2];
+        w = vector.xp * matrix.m[0][3] +
+            vector.yp * matrix.m[1][3] +
+            vector.zp * matrix.m[2][3] +
+            matrix.m[3][3];
+        if (w == 1.0f)
+            return QVector3D(x, y, z, 1);
+        else
+            return QVector3D(x / w, y / w, z / w, 1);
+    }
 }
 
 #endif
@@ -752,19 +769,33 @@ inline QPoint operator*(const QMatrix4x4& matrix, const QPoint& point)
     float x, y, w;
     xin = point.x();
     yin = point.y();
-    x = xin * matrix.m[0][0] +
-        yin * matrix.m[1][0] +
-        matrix.m[3][0];
-    y = xin * matrix.m[0][1] +
-        yin * matrix.m[1][1] +
-        matrix.m[3][1];
-    w = xin * matrix.m[0][3] +
-        yin * matrix.m[1][3] +
-        matrix.m[3][3];
-    if (w == 1.0f)
-        return QPoint(qRound(x), qRound(y));
-    else
-        return QPoint(qRound(x / w), qRound(y / w));
+    if (matrix.flagBits == QMatrix4x4::Identity) {
+        return point;
+    } else if (matrix.flagBits == QMatrix4x4::Translation) {
+        return QPoint(qRound(xin + matrix.m[3][0]),
+                      qRound(yin + matrix.m[3][1]));
+    } else if (matrix.flagBits ==
+                    (QMatrix4x4::Translation | QMatrix4x4::Scale)) {
+        return QPoint(qRound(xin * matrix.m[0][0] + matrix.m[3][0]),
+                      qRound(yin * matrix.m[1][1] + matrix.m[3][1]));
+    } else if (matrix.flagBits == QMatrix4x4::Scale) {
+        return QPoint(qRound(xin * matrix.m[0][0]),
+                      qRound(yin * matrix.m[1][1]));
+    } else {
+        x = xin * matrix.m[0][0] +
+            yin * matrix.m[1][0] +
+            matrix.m[3][0];
+        y = xin * matrix.m[0][1] +
+            yin * matrix.m[1][1] +
+            matrix.m[3][1];
+        w = xin * matrix.m[0][3] +
+            yin * matrix.m[1][3] +
+            matrix.m[3][3];
+        if (w == 1.0f)
+            return QPoint(qRound(x), qRound(y));
+        else
+            return QPoint(qRound(x / w), qRound(y / w));
+    }
 }
 
 inline QPointF operator*(const QMatrix4x4& matrix, const QPointF& point)
@@ -773,19 +804,33 @@ inline QPointF operator*(const QMatrix4x4& matrix, const QPointF& point)
     float x, y, w;
     xin = point.x();
     yin = point.y();
-    x = xin * matrix.m[0][0] +
-        yin * matrix.m[1][0] +
-        matrix.m[3][0];
-    y = xin * matrix.m[0][1] +
-        yin * matrix.m[1][1] +
-        matrix.m[3][1];
-    w = xin * matrix.m[0][3] +
-        yin * matrix.m[1][3] +
-        matrix.m[3][3];
-    if (w == 1.0f) {
-        return QPointF(qreal(x), qreal(y));
+    if (matrix.flagBits == QMatrix4x4::Identity) {
+        return point;
+    } else if (matrix.flagBits == QMatrix4x4::Translation) {
+        return QPointF(xin + matrix.m[3][0],
+                       yin + matrix.m[3][1]);
+    } else if (matrix.flagBits ==
+                    (QMatrix4x4::Translation | QMatrix4x4::Scale)) {
+        return QPointF(xin * matrix.m[0][0] + matrix.m[3][0],
+                       yin * matrix.m[1][1] + matrix.m[3][1]);
+    } else if (matrix.flagBits == QMatrix4x4::Scale) {
+        return QPointF(xin * matrix.m[0][0],
+                       yin * matrix.m[1][1]);
     } else {
-        return QPointF(qreal(x / w), qreal(y / w));
+        x = xin * matrix.m[0][0] +
+            yin * matrix.m[1][0] +
+            matrix.m[3][0];
+        y = xin * matrix.m[0][1] +
+            yin * matrix.m[1][1] +
+            matrix.m[3][1];
+        w = xin * matrix.m[0][3] +
+            yin * matrix.m[1][3] +
+            matrix.m[3][3];
+        if (w == 1.0f) {
+            return QPointF(qreal(x), qreal(y));
+        } else {
+            return QPointF(qreal(x / w), qreal(y / w));
+        }
     }
 }
 
@@ -903,19 +948,6 @@ inline QVector4D QMatrix4x4::map(const QVector4D& point) const
 
 #endif
 
-inline QRect QMatrix4x4::mapRect(const QRect& rect) const
-{
-    QPoint tl = map(rect.topLeft()); QPoint tr = map(rect.topRight());
-    QPoint bl = map(rect.bottomLeft()); QPoint br = map(rect.bottomRight());
-
-    int xmin = qMin(qMin(tl.x(), tr.x()), qMin(bl.x(), br.x()));
-    int xmax = qMax(qMax(tl.x(), tr.x()), qMax(bl.x(), br.x()));
-    int ymin = qMin(qMin(tl.y(), tr.y()), qMin(bl.y(), br.y()));
-    int ymax = qMax(qMax(tl.y(), tr.y()), qMax(bl.y(), br.y()));
-
-    return QRect(QPoint(xmin, ymin), QPoint(xmax, ymax));
-}
-
 inline float *QMatrix4x4::data()
 {
     // We have to assume that the caller will modify the matrix elements,
diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp
index 7de1ec4..9859425 100644
--- a/src/gui/painting/qpaintengine.cpp
+++ b/src/gui/painting/qpaintengine.cpp
@@ -49,6 +49,7 @@
 #include <private/qtextengine_p.h>
 #include <qvarlengtharray.h>
 #include <private/qfontengine_p.h>
+#include <private/qpaintengineex_p.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -302,6 +303,9 @@ void QPaintEngine::syncState()
 {
     Q_ASSERT(state);
     updateState(*state);
+
+    if (isExtended())
+        static_cast<QPaintEngineEx *>(this)->sync();
 }
 
 static QPaintEngine *qt_polygon_recursion = 0;
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 3f85095..30c454c 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3917,11 +3917,7 @@ static void qt_merge_clip(const QClipData *c1, const QClipData *c2, QClipData *r
 {
     Q_ASSERT(c1->clipSpanHeight == c2->clipSpanHeight && c1->clipSpanHeight == result->clipSpanHeight);
 
-    // ### buffer overflow possible
-    const int BUFFER_SIZE = 4096;
-    int buffer[BUFFER_SIZE];
-    int *b = buffer;
-    int bsize = BUFFER_SIZE;
+    QVarLengthArray<short, 4096> buffer;
 
     QClipData::ClipLine *c1ClipLines = const_cast<QClipData *>(c1)->clipLines();
     QClipData::ClipLine *c2ClipLines = const_cast<QClipData *>(c2)->clipLines();
@@ -3948,11 +3944,8 @@ static void qt_merge_clip(const QClipData *c1, const QClipData *c2, QClipData *r
         // find required length
         int max = qMax(c1_spans[c1_count - 1].x + c1_spans[c1_count - 1].len,
                        c2_spans[c2_count - 1].x + c2_spans[c2_count - 1].len);
-        if (max > bsize) {
-            b = (int *)realloc(bsize == BUFFER_SIZE ? 0 : b, max*sizeof(int));
-            bsize = max;
-        }
-        memset(buffer, 0, BUFFER_SIZE * sizeof(int));
+        buffer.resize(max);
+        memset(buffer.data(), 0, buffer.size() * sizeof(short));
 
         // Fill with old spans.
         for (int i = 0; i < c1_count; ++i) {
@@ -3988,8 +3981,6 @@ static void qt_merge_clip(const QClipData *c1, const QClipData *c2, QClipData *r
             result->appendSpan(sx, x - sx, y, coverage);
         }
     }
-    if (b != buffer)
-        free(b);
 }
 
 void QRasterPaintEnginePrivate::initializeRasterizer(QSpanData *data)
@@ -4475,14 +4466,12 @@ void QClipData::fixup()
         if (sl != left || sr != right)
             isRect = false;
     }
-    ++xmax;
 //     qDebug("xmin=%d,xmax=%d,ymin=%d,ymax=%d %s", xmin, xmax, ymin, ymax, isRect ? "rectangular" : "");
 
     if (isRect) {
         hasRectClip = true;
         clipRect.setRect(xmin, ymin, xmax - xmin, ymax - ymin);
     }
-
 }
 
 /*
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index 593726c..1c55242 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -216,6 +216,8 @@ public:
     inline QPainterState *state() { return static_cast<QPainterState *>(QPaintEngine::state); }
     inline const QPainterState *state() const { return static_cast<const QPainterState *>(QPaintEngine::state); }
 
+    virtual void sync() {}
+
     virtual QPixmapFilter *createPixmapFilter(int /*type*/) const { return 0; }
 
 protected:
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index 89df869..6b195bf 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -157,6 +157,46 @@ void QTextureGlyphCache::populate(const QTextItemInt &ti,
 
 }
 
+QImage QTextureGlyphCache::textureMapForGlyph(glyph_t g) const
+{
+#if defined(Q_WS_X11)
+    if (m_transform.type() > QTransform::TxTranslate) {
+        QFontEngineFT::GlyphFormat format = QFontEngineFT::Format_None;
+        QImage::Format imageFormat = QImage::Format_Invalid;
+        switch (m_type) {
+        case Raster_RGBMask:
+            format = QFontEngineFT::Format_A32;
+            imageFormat = QImage::Format_RGB32;
+            break;
+        case Raster_A8:
+            format = QFontEngineFT::Format_A8;
+            imageFormat = QImage::Format_Indexed8;
+            break;
+        case Raster_Mono:
+            format = QFontEngineFT::Format_Mono;
+            imageFormat = QImage::Format_Mono;
+            break;
+        };
+
+        QFontEngineFT *ft = static_cast<QFontEngineFT*> (m_current_textitem->fontEngine);
+        QFontEngineFT::QGlyphSet *gset = ft->loadTransformedGlyphSet(m_transform);
+
+        if (gset && ft->loadGlyphs(gset, &g, 1, format)) {
+            QFontEngineFT::Glyph *glyph = gset->glyph_data.value(g);
+            const int bytesPerLine = (format == QFontEngineFT::Format_Mono ? ((glyph->width + 31) & ~31) >> 3
+                               : (glyph->width + 3) & ~3);
+            return QImage(glyph->data, glyph->width, glyph->height, bytesPerLine, imageFormat);
+        }
+    } else
+#endif
+    if (m_type == QFontEngineGlyphCache::Raster_RGBMask)
+        return m_current_textitem->fontEngine->alphaRGBMapForGlyph(g, glyphMargin(), m_transform);
+    else
+        return m_current_textitem->fontEngine->alphaMapForGlyph(g, m_transform);
+
+    return QImage();
+}
+
 /************************************************************************
  * QImageTextureGlyphCache
  */
@@ -198,34 +238,7 @@ int QImageTextureGlyphCache::glyphMargin() const
 
 void QImageTextureGlyphCache::fillTexture(const Coord &c, glyph_t g)
 {
-    QImage mask;
-#if defined(Q_WS_X11)
-    if (m_transform.type() > QTransform::TxTranslate) {
-        QFontEngineFT::GlyphFormat format = QFontEngineFT::Format_None;
-        switch (m_type) {
-        case Raster_RGBMask:
-            format = QFontEngineFT::Format_A32; break;
-        case Raster_A8:
-            format = QFontEngineFT::Format_A8; break;
-        case Raster_Mono:
-            format = QFontEngineFT::Format_Mono; break;
-        };
-
-        QFontEngineFT *ft = static_cast<QFontEngineFT*> (m_current_textitem->fontEngine);
-        QFontEngineFT::QGlyphSet *gset = ft->loadTransformedGlyphSet(m_transform);
-
-        if (gset && ft->loadGlyphs(gset, &g, 1, format)) {
-            QFontEngineFT::Glyph *glyph = gset->glyph_data.value(g);
-            const int bytesPerLine = (format == QFontEngineFT::Format_Mono ? ((glyph->width + 31) & ~31) >> 3
-                               : (glyph->width + 3) & ~3);
-            mask = QImage(glyph->data, glyph->width, glyph->height, bytesPerLine, m_image.format());
-        }
-    } else
-#endif
-    if (m_type == QFontEngineGlyphCache::Raster_RGBMask)
-        mask = m_current_textitem->fontEngine->alphaRGBMapForGlyph(g, glyphMargin(), m_transform);
-    else
-        mask = m_current_textitem->fontEngine->alphaMapForGlyph(g, m_transform);
+    QImage mask = textureMapForGlyph(g);
 
 #ifdef CACHE_DEBUG
     printf("fillTexture of %dx%d at %d,%d in the cache of %dx%d\n", c.w, c.h, c.x, c.y, m_image.width(), m_image.height());
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index 7f2c478..cb5be75 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/src/gui/painting/qtextureglyphcache_p.h
@@ -108,6 +108,8 @@ public:
 
     QHash<glyph_t, Coord> coords;
 
+    QImage textureMapForGlyph(glyph_t g) const;
+
 protected:
     const QTextItemInt *m_current_textitem;
 
@@ -116,7 +118,6 @@ protected:
     int m_cx; // current x
     int m_cy; // current y
     QFontEngineGlyphCache::Type m_type;
-
 };
 
 
diff --git a/src/gui/statemachine/qkeyeventtransition.h b/src/gui/statemachine/qkeyeventtransition.h
index 3c8295f..d9c7760 100644
--- a/src/gui/statemachine/qkeyeventtransition.h
+++ b/src/gui/statemachine/qkeyeventtransition.h
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Core)
+QT_MODULE(Gui)
 
 class QKeyEventTransitionPrivate;
 class Q_GUI_EXPORT QKeyEventTransition : public QEventTransition
diff --git a/src/gui/statemachine/qmouseeventtransition.h b/src/gui/statemachine/qmouseeventtransition.h
index 3f5f3ac..9c7af5b 100644
--- a/src/gui/statemachine/qmouseeventtransition.h
+++ b/src/gui/statemachine/qmouseeventtransition.h
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Core)
+QT_MODULE(Gui)
 
 class QMouseEventTransitionPrivate;
 class QPainterPath;
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 2478f20..43efedf 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -851,7 +851,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
         }
         break;
     case QStyle::CT_HeaderSection:
-        if (sz == QAquaSizeLarge && isTreeView(widg))
+        if (isTreeView(widg))
            ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricListHeaderHeight));
         break;
     case QStyle::CT_MenuBar:
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index d3020b0..9c3c4a4 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -827,6 +827,7 @@ static void getEngineData(const QFontPrivate *d, const QFontCache::Key &key)
         d->engineData->ref.ref();
     }
 }
+#endif
 
 static QStringList familyList(const QFontDef &req)
 {
@@ -855,7 +856,6 @@ static QStringList familyList(const QFontDef &req)
 
     return family_list;
 }
-#endif
 
 Q_GLOBAL_STATIC(QFontDatabasePrivate, privateDb)
 Q_GLOBAL_STATIC_WITH_ARGS(QMutex, fontDatabaseMutex, (QMutex::Recursive))
diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/text/qfontdatabase_mac.cpp
index 80ddbd5..26d8687 100644
--- a/src/gui/text/qfontdatabase_mac.cpp
+++ b/src/gui/text/qfontdatabase_mac.cpp
@@ -281,14 +281,7 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
     }
 
     //find the font
-    QStringList family_list = req.family.split(QLatin1Char(','));
-    // append the substitute list for each family in family_list
-    {
-	    QStringList subs_list;
-	    for(QStringList::ConstIterator it = family_list.constBegin(); it != family_list.constEnd(); ++it)
-		    subs_list += QFont::substitutes(*it);
-	    family_list += subs_list;
-    }
+    QStringList family_list = familyList(req);
 
     const char *stylehint = styleHint(req);
     if (stylehint)
diff --git a/src/gui/util/qdesktopservices_mac.cpp b/src/gui/util/qdesktopservices_mac.cpp
index fb1e193..4f730b7 100644
--- a/src/gui/util/qdesktopservices_mac.cpp
+++ b/src/gui/util/qdesktopservices_mac.cpp
@@ -134,13 +134,15 @@ static QString getFullPath(const FSRef &ref)
 
 QString QDesktopServices::storageLocation(StandardLocation type)
 {
-     if (QDesktopServices::HomeLocation == type)
+     if (type == HomeLocation)
         return QDir::homePath();
 
+     if (type == TempLocation)
+         return QDir::tempPath();
+
     short domain = kOnAppropriateDisk;
 
-    if (QDesktopServices::DataLocation == type
-        || QDesktopServices::CacheLocation == type)
+    if (type == DataLocation || type == CacheLocation)
         domain = kUserDomain;
 
      // http://developer.apple.com/documentation/Carbon/Reference/Folder_Manager/Reference/reference.html
@@ -152,8 +154,7 @@ QString QDesktopServices::storageLocation(StandardLocation type)
     QString path = getFullPath(ref);
 
     QString appName = QCoreApplication::applicationName();
-    if (!appName.isEmpty() &&
-        (QDesktopServices::DataLocation == type || QDesktopServices::CacheLocation == type))
+    if (!appName.isEmpty() && (type == DataLocation || type == CacheLocation))
         path += QLatin1Char('/') + appName;
 
     return path;
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 3004841..711f1f4 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -398,9 +398,12 @@ QRect QMenuPrivate::actionRect(QAction *act) const
     return ret;
 }
 
+static const qreal MenuFadeTimeInSec = 0.150;
+
 void QMenuPrivate::hideUpToMenuBar()
 {
     Q_Q(QMenu);
+    bool fadeMenus = q->style()->styleHint(QStyle::SH_Menu_FadeOutOnHide);
     if (!tornoff) {
         QWidget *caused = causedPopup.widget;
         hideMenu(q); //hide after getting causedPopup
@@ -415,8 +418,9 @@ void QMenuPrivate::hideUpToMenuBar()
             if (QMenu *m = qobject_cast<QMenu*>(caused)) {
                 caused = m->d_func()->causedPopup.widget;
                 if (!m->d_func()->tornoff)
-                    hideMenu(m);
-                m->d_func()->setCurrentAction(0);
+                    hideMenu(m, fadeMenus);
+                if (!fadeMenus) // Mac doesn't clear the action until after hidden.
+                    m->d_func()->setCurrentAction(0);
             } else {
 #ifndef QT_NO_TOOLBUTTON
                 if (qobject_cast<QToolButton*>(caused) == 0)
@@ -425,26 +429,32 @@ void QMenuPrivate::hideUpToMenuBar()
                 caused = 0;
             }
         }
+#if defined(Q_WS_MAC)
+        if (fadeMenus) {
+            QEventLoop eventLoop;
+            QTimer::singleShot(int(MenuFadeTimeInSec * 1000), &eventLoop, SLOT(quit()));
+            QMacWindowFader::currentFader()->performFade();
+            eventLoop.exec();
+        }
+#endif
     }
     setCurrentAction(0);
 }
 
-void QMenuPrivate::hideMenu(QMenu *menu)
+void QMenuPrivate::hideMenu(QMenu *menu, bool justRegister)
 {
     if (!menu)
         return;
-
 #if !defined(QT_NO_EFFECTS)
     menu->blockSignals(true);
     aboutToHide = true;
     // Flash item which is about to trigger (if any).
     if (menu->style()->styleHint(QStyle::SH_Menu_FlashTriggeredItem)
-        && currentAction && currentAction == actionAboutToTrigger) {
-
+        && currentAction && currentAction == actionAboutToTrigger
+        && menu->actions().contains(currentAction)) {
         QEventLoop eventLoop;
         QAction *activeAction = currentAction;
 
-        // Deselect and wait 60 ms.
         menu->setActiveAction(0);
         QTimer::singleShot(60, &eventLoop, SLOT(quit()));
         eventLoop.exec();
@@ -458,22 +468,24 @@ void QMenuPrivate::hideMenu(QMenu *menu)
     // Fade out.
     if (menu->style()->styleHint(QStyle::SH_Menu_FadeOutOnHide)) {
         // ### Qt 4.4:
-        // Should be something like: q->transitionWindow(Qt::FadeOutTransition, 150);
+        // Should be something like: q->transitionWindow(Qt::FadeOutTransition, MenuFadeTimeInSec);
         // Hopefully we'll integrate qt/research/windowtransitions into main before 4.4.
         // Talk to Richard, Trenton or Bjoern.
 #if defined(Q_WS_MAC)
-		macWindowFade(qt_mac_window_for(menu));		// FIXME - what is the default duration for view animations
+        if (justRegister) {
+            QMacWindowFader::currentFader()->setFadeDuration(MenuFadeTimeInSec);
+            QMacWindowFader::currentFader()->registerWindowToFade(menu);
+        } else {
+            macWindowFade(qt_mac_window_for(menu), MenuFadeTimeInSec);
+        }
 
-        // Wait for the transition to complete.
-		QEventLoop eventLoop;
-        QTimer::singleShot(150, &eventLoop, SLOT(quit()));
-        eventLoop.exec();
 #endif // Q_WS_MAC
     }
     aboutToHide = false;
     menu->blockSignals(false);
 #endif // QT_NO_EFFECTS
-    menu->hide();
+    if (!justRegister)
+        menu->hide();
 }
 
 void QMenuPrivate::popupAction(QAction *action, int delay, bool activateFirst)
@@ -535,10 +547,12 @@ void QMenuPrivate::setCurrentAction(QAction *action, int popup, SelectionReason
 {
     Q_Q(QMenu);
     tearoffHighlighted = 0;
-    if (action == currentAction && !(action && action->menu() && action->menu() != activeMenu)) {
-        if(QMenu *menu = qobject_cast<QMenu*>(causedPopup.widget)) {
-            if(causedPopup.action && menu->d_func()->activeMenu == q)
-                menu->d_func()->setCurrentAction(causedPopup.action, 0, reason, false);
+    if (action == currentAction) {
+        if (!action || !action->menu() || action->menu() == activeMenu) {
+            if(QMenu *menu = qobject_cast<QMenu*>(causedPopup.widget)) {
+                if(causedPopup.action && menu->d_func()->activeMenu == q)
+                    menu->d_func()->setCurrentAction(causedPopup.action, 0, reason, false);
+            }
         }
         return;
     }
@@ -553,7 +567,7 @@ void QMenuPrivate::setCurrentAction(QAction *action, int popup, SelectionReason
     QAction *previousAction = currentAction;
 #endif
 #ifdef QT3_SUPPORT
-    emitHighlighted = (action && action != currentAction);
+    emitHighlighted = action;
 #endif
     currentAction = action;
     if (action) {
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index cce083f..786633c 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -623,7 +623,7 @@ static inline QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *getMenuLoader()
 static NSMenuItem *createNSMenuItem(const QString &title)
 {
     NSMenuItem *item = [[NSMenuItem alloc] 
-                         initWithTitle:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(title)))
+                         initWithTitle:qt_mac_QStringToNSString(title)
                          action:@selector(qtDispatcherToQAction:) keyEquivalent:@""];
     [item setTarget:getMenuLoader()];
     return item;
@@ -1381,18 +1381,18 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action)
     // Cocoa Font and title
     if (action->action->font().resolve()) {
         const QFont &actionFont = action->action->font();
-        NSFont *customMenuFont = [NSFont fontWithName:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(actionFont.family())))
+        NSFont *customMenuFont = [NSFont fontWithName:qt_mac_QStringToNSString(actionFont.family())
                                   size:actionFont.pointSize()];
         NSArray *keys = [NSArray arrayWithObjects:NSFontAttributeName, nil];
         NSArray *objects = [NSArray arrayWithObjects:customMenuFont, nil];
         NSDictionary *attributes = [NSDictionary dictionaryWithObjects:objects forKeys:keys];
-        NSAttributedString *str = [[[NSAttributedString alloc] initWithString:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(finalString)))
+        NSAttributedString *str = [[[NSAttributedString alloc] initWithString:qt_mac_QStringToNSString(finalString)
                                  attributes:attributes] autorelease];
        [item setAttributedTitle: str];
     } else {
-        [item setTitle: reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(finalString)))];
+        [item setTitle: qt_mac_QStringToNSString(finalString)];
     }
-    [item setTitle:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(qt_mac_removeMnemonics(text))))];
+    [item setTitle:qt_mac_QStringToNSString(qt_mac_removeMnemonics(text))];
 
     // Cocoa Enabled
     [item setEnabled: action->action->isEnabled()];
@@ -1694,7 +1694,7 @@ QMenuBarPrivate::QMacMenuBarPrivate::syncAction(QMacMenuAction *action)
             ChangeMenuAttributes(submenu, kMenuAttrHidden, 0);
 #else
         [item setSubmenu: submenu];
-        [submenu setTitle:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(qt_mac_removeMnemonics(action->action->text()))))];
+        [submenu setTitle:qt_mac_QStringToNSString(qt_mac_removeMnemonics(action->action->text()))];
         syncNSMenuItemVisiblity(item, visible);
 #endif
         if (release_submenu) { //no pointers to it
@@ -1786,7 +1786,7 @@ OSMenuRef QMenuBarPrivate::macMenu()
                 SetMenuItemHierarchicalMenu(mac_menubar->menu, index, mac_menubar->apple_menu);
                 SetMenuItemProperty(mac_menubar->apple_menu, 0, kMenuCreatorQt, kMenuPropertyQWidget, sizeof(q), &q);
 #else
-                [mac_menubar->apple_menu setTitle:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(QString(QChar(0x14)))))];
+                [mac_menubar->apple_menu setTitle:qt_mac_QStringToNSString(QString(QChar(0x14)))];
                 NSMenuItem *apple_menuItem = [[NSMenuItem alloc] init];
                 [apple_menuItem setSubmenu:mac_menubar->menu];
                 [mac_menubar->apple_menu addItem:apple_menuItem];
@@ -1829,6 +1829,9 @@ OSMenuRef QMenuBar::macMenu() { return d_func()->macMenu(); }
 */
 static bool qt_mac_is_ancestor(QWidget* possibleAncestor, QWidget *child)
 {
+    if (!possibleAncestor)
+        return false;
+
     QWidget * current = child->parentWidget();
     while (current != 0) {
         if (current == possibleAncestor)
@@ -1847,22 +1850,19 @@ static bool qt_mac_should_disable_menu(QMenuBar *menuBar, QWidget *modalWidget)
 {
     if (modalWidget == 0 || menuBar == 0)
         return false;
-    const Qt::WindowModality modality = modalWidget->windowModality();
-    if (modality == Qt::ApplicationModal) {
-        return true;
-    } else if (modality == Qt::WindowModal) {
-        QWidget * parent = menuBar->parentWidget();
-
-        // Special case for the global menu bar: It's not associated
-        // with a window so don't disable it.
-        if (parent == 0)
-            return false;
 
-        // Disable menu entries in menu bars that belong to ancestors of
-        // the modal widget, leave entries in unrelated menu bars enabled.
-        return qt_mac_is_ancestor(parent, modalWidget);
+    // If there is an application modal window on
+    // screen, the entries of the menubar should be disabled:
+    QWidget *w = modalWidget;
+    while (w) {
+        if (w->isVisible() && w->windowModality() == Qt::ApplicationModal)
+            return true;
+        w = w->parentWidget();
     }
-    return false; // modality == NonModal
+
+    // INVARIANT: modalWidget is window modal. Disable menu entries
+    // if the menu bar belongs to an ancestor of modalWidget:
+    return qt_mac_is_ancestor(menuBar->parentWidget(), modalWidget);
 }
 
 static void cancelAllMenuTracking()
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index edfeee7..f08283d 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -220,7 +220,7 @@ public:
     virtual QList<QPointer<QWidget> > calcCausedStack() const;
     QMenuCaused causedPopup;
     void hideUpToMenuBar();
-    void hideMenu(QMenu *menu);
+    void hideMenu(QMenu *menu, bool justRegister = false);
 
     //index mappings
     inline QAction *actionAt(int i) const { return q_func()->actions().at(i); }
diff --git a/src/gui/widgets/qstatusbar.cpp b/src/gui/widgets/qstatusbar.cpp
index c970838..3829bcb 100644
--- a/src/gui/widgets/qstatusbar.cpp
+++ b/src/gui/widgets/qstatusbar.cpp
@@ -144,7 +144,7 @@ QRect QStatusBarPrivate::messageRect() const
                     if (rtl)
                         left = qMax(left, item->w->x() + item->w->width() + 2);
                     else
-                        right = qMin(right, item->w->x()-1);
+                        right = qMin(right, item->w->x() - 2);
                 }
                 break;
         }
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index f64af85..ea57fdf 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -64,6 +64,7 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
       maskType(NoMask),
       useTextureCoords(false),
       compositionMode(QPainter::CompositionMode_SourceOver),
+      blitShaderProg(0),
       simpleShaderProg(0),
       currentShaderProg(0)
 {
@@ -83,6 +84,7 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
         code[MainVertexShader] = qglslMainVertexShader;
         code[MainWithTexCoordsVertexShader] = qglslMainWithTexCoordsVertexShader;
 
+        code[UntransformedPositionVertexShader] = qglslUntransformedPositionVertexShader;
         code[PositionOnlyVertexShader] = qglslPositionOnlyVertexShader;
         code[PositionWithPatternBrushVertexShader] = qglslPositionWithPatternBrushVertexShader;
         code[PositionWithLinearGradientBrushVertexShader] = qglslPositionWithLinearGradientBrushVertexShader;
@@ -160,6 +162,24 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
         qCritical() << "Errors linking simple shader:"
                     << simpleShaderProg->log();
     }
+
+    // Compile the blit shader:
+    blitShaderProg = new QGLShaderProgram(ctx, this);
+    compileNamedShader(MainWithTexCoordsVertexShader,     QGLShader::PartialVertexShader);
+    compileNamedShader(UntransformedPositionVertexShader, QGLShader::PartialVertexShader);
+    compileNamedShader(MainFragmentShader,                QGLShader::PartialFragmentShader);
+    compileNamedShader(ImageSrcFragmentShader,            QGLShader::PartialFragmentShader);
+    blitShaderProg->addShader(compiledShaders[MainWithTexCoordsVertexShader]);
+    blitShaderProg->addShader(compiledShaders[UntransformedPositionVertexShader]);
+    blitShaderProg->addShader(compiledShaders[MainFragmentShader]);
+    blitShaderProg->addShader(compiledShaders[ImageSrcFragmentShader]);
+    blitShaderProg->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
+    blitShaderProg->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
+    blitShaderProg->link();
+    if (!blitShaderProg->isLinked()) {
+        qCritical() << "Errors linking blit shader:"
+                    << blitShaderProg->log();
+    }
 }
 
 QGLEngineShaderManager::~QGLEngineShaderManager()
@@ -176,6 +196,11 @@ void QGLEngineShaderManager::optimiseForBrushTransform(const QTransform &transfo
     Q_UNUSED(transform); // Currently ignored
 }
 
+void QGLEngineShaderManager::setDirty()
+{
+    shaderProgNeedsChanging = true;
+}
+
 void QGLEngineShaderManager::setSrcPixelType(Qt::BrushStyle style)
 {
     srcPixelType = style;
@@ -222,6 +247,10 @@ QGLShaderProgram* QGLEngineShaderManager::simpleProgram()
     return simpleShaderProg;
 }
 
+QGLShaderProgram* QGLEngineShaderManager::blitProgram()
+{
+    return blitShaderProg;
+}
 
 
 
@@ -452,8 +481,7 @@ void QGLEngineShaderManager::compileNamedShader(QGLEngineShaderManager::ShaderNa
         return;
 
     QGLShader *newShader = new QGLShader(type, ctx, this);
-    newShader->setSourceCode(qglEngineShaderSourceCode[name]);
-    // newShader->compile(); ### does not exist?
+    newShader->compile(qglEngineShaderSourceCode[name]);
 
 #if defined(QT_DEBUG)
     // Name the shader for easier debugging
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index b8b2745..9bc81ef 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -279,15 +279,18 @@ public:
     void setMaskType(MaskType);
     void setCompositionMode(QPainter::CompositionMode);
 
+    void setDirty(); // someone has manually changed the current shader program
     bool useCorrectShaderProg(); // returns true if the shader program needed to be changed
 
     QGLShaderProgram* currentProgram(); // Returns pointer to the shader the manager has chosen
     QGLShaderProgram* simpleProgram(); // Used to draw into e.g. stencil buffers
+    QGLShaderProgram* blitProgram(); // Used to blit a texture into the framebuffer
 
     enum ShaderName {
         MainVertexShader,
         MainWithTexCoordsVertexShader,
 
+        UntransformedPositionVertexShader,
         PositionOnlyVertexShader,
         PositionWithPatternBrushVertexShader,
         PositionWithLinearGradientBrushVertexShader,
@@ -365,6 +368,7 @@ private:
     bool                        useTextureCoords;
     QPainter::CompositionMode   compositionMode;
 
+    QGLShaderProgram*   blitShaderProg;
     QGLShaderProgram*   simpleShaderProg;
     QGLShaderProgram*   currentShaderProg;
 
diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
index fdbba72..920d0bc 100644
--- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
@@ -89,6 +89,12 @@ static const char* const qglslPositionOnlyVertexShader = "\
             gl_Position = pmvMatrix * vertexCoordsArray;\
     }";
 
+static const char* const qglslUntransformedPositionVertexShader = "\
+    attribute highp vec4    vertexCoordsArray;\
+    void setPosition(void)\
+    {\
+            gl_Position = vertexCoordsArray;\
+    }";
 
 // Pattern Brush - This assumes the texture size is 8x8 and thus, the inverted size is 0.125
 static const char* const qglslPositionWithPatternBrushVertexShader = "\
@@ -354,7 +360,7 @@ static const char* const qglslMaskFragmentShader = "\
     lowp vec4 applyMask(lowp vec4 src) \
     {\
         lowp vec4 mask = texture2D(maskTexture, textureCoords); \
-        return src * mask.r; \
+        return src * mask.a; \
     }";
 
 /*
@@ -375,7 +381,6 @@ static const char* const qglslMaskFragmentShader = "\
         ExclusionCompositionModeFragmentShader,
 */
 
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index e7b6ee4..868adcf 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -79,18 +79,165 @@
 #include "qglengineshadermanager_p.h"
 #include "qgl2pexvertexarray_p.h"
 
-
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
 
-extern QImage qt_imageForBrush(int brushStyle, bool invert);
-
 static const GLuint QT_BRUSH_TEXTURE_UNIT       = 0;
 static const GLuint QT_IMAGE_TEXTURE_UNIT       = 0; //Can be the same as brush texture unit
 static const GLuint QT_MASK_TEXTURE_UNIT        = 1;
 static const GLuint QT_BACKGROUND_TEXTURE_UNIT  = 2;
 
+class QGLTextureGlyphCache : public QTextureGlyphCache
+{
+public:
+    QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyphCache::Type type, const QTransform &matrix);
+    ~QGLTextureGlyphCache();
+
+    virtual void createTextureData(int width, int height);
+    virtual void resizeTextureData(int width, int height);
+    virtual void fillTexture(const Coord &c, glyph_t glyph);
+
+    inline GLuint texture() const { return m_texture; }
+
+    inline int width() const { return m_width; }
+    inline int height() const { return m_height; }
+
+    inline void setPaintEnginePrivate(QGL2PaintEngineExPrivate *p) { pex = p; }
+
+private:
+    QGLContext *ctx;
+
+    QGL2PaintEngineExPrivate *pex;
+
+    GLuint m_texture;
+    GLuint m_fbo;
+
+    int m_width;
+    int m_height;
+
+    QGLShaderProgram *m_program;
+};
+
+QGLTextureGlyphCache::QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyphCache::Type type, const QTransform &matrix)
+    : QTextureGlyphCache(type, matrix)
+    , ctx(context)
+    , m_width(0)
+    , m_height(0)
+{
+    glGenFramebuffers(1, &m_fbo);
+}
+
+QGLTextureGlyphCache::~QGLTextureGlyphCache()
+{
+    glDeleteFramebuffers(1, &m_fbo);
+
+    if (m_width || m_height)
+        glDeleteTextures(1, &m_texture);
+}
+
+void QGLTextureGlyphCache::createTextureData(int width, int height)
+{
+    glGenTextures(1, &m_texture);
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+
+    m_width = width;
+    m_height = height;
+
+    QVarLengthArray<uchar> data(width * height);
+    for (int i = 0; i < width * height; ++i)
+        data[i] = 0;
+
+    if (m_type == QFontEngineGlyphCache::Raster_RGBMask)
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, &data[0]);
+    else
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, width, height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, &data[0]);
+
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+}
+
+void QGLTextureGlyphCache::resizeTextureData(int width, int height)
+{
+    // ### the QTextureGlyphCache API needs to be reworked to allow
+    // ### resizeTextureData to fail
+
+    int oldWidth = m_width;
+    int oldHeight = m_height;
+
+    GLuint oldTexture = m_texture;
+    createTextureData(width, height);
+
+    glBindFramebuffer(GL_FRAMEBUFFER_EXT, m_fbo);
+
+    GLuint colorBuffer;
+    glGenRenderbuffers(1, &colorBuffer);
+    glBindRenderbuffer(GL_RENDERBUFFER_EXT, colorBuffer);
+    glRenderbufferStorage(GL_RENDERBUFFER_EXT, GL_RGBA, oldWidth, oldHeight);
+    glFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+                              GL_RENDERBUFFER_EXT, colorBuffer);
+    glBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
+
+    glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT);
+    glBindTexture(GL_TEXTURE_2D, oldTexture);
+
+    pex->transferMode(BrushDrawingMode);
+
+    glDisable(GL_SCISSOR_TEST);
+    glDisable(GL_DEPTH_TEST);
+
+    glViewport(0, 0, oldWidth, oldHeight);
+
+    float vertexCoordinateArray[] = { -1, -1, 1, -1, 1, 1, -1, 1 };
+    float textureCoordinateArray[] = { 0, 0, 1, 0, 1, 1, 0, 1 };
+
+    glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
+    glEnableVertexAttribArray(QT_TEXTURE_COORDS_ATTR);
+
+    glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, vertexCoordinateArray);
+    glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray);
+
+    pex->shaderManager->blitProgram()->enable();
+    pex->shaderManager->blitProgram()->setUniformValue("imageTexture", QT_IMAGE_TEXTURE_UNIT);
+    pex->shaderManager->setDirty();
+
+    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+    glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
+    glDisableVertexAttribArray(QT_TEXTURE_COORDS_ATTR);
+
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+    glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, oldWidth, oldHeight);
+
+    glFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+                              GL_RENDERBUFFER_EXT, 0);
+    glDeleteRenderbuffers(1, &colorBuffer);
+    glDeleteTextures(1, &oldTexture);
+
+    glBindFramebuffer(GL_FRAMEBUFFER_EXT, ctx->d_ptr->current_fbo);
+
+    glViewport(0, 0, pex->width, pex->height);
+    pex->updateDepthClip();
+}
+
+void QGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph)
+{
+    QImage mask = textureMapForGlyph(glyph);
+
+    const uint maskWidth = mask.width();
+    const uint maskHeight = mask.height();
+
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+    if (mask.format() == QImage::Format_RGB32) {
+        glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, m_height - c.y, maskWidth, maskHeight, GL_BGRA, GL_UNSIGNED_BYTE, mask.bits());
+    } else {
+        mask = mask.convertToFormat(QImage::Format_Indexed8);
+        glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, GL_ALPHA, GL_UNSIGNED_BYTE, mask.bits());
+    }
+}
+
+extern QImage qt_imageForBrush(int brushStyle, bool invert);
+
 ////////////////////////////////// Private Methods //////////////////////////////////////////
 
 QGL2PaintEngineExPrivate::~QGL2PaintEngineExPrivate()
@@ -141,6 +288,7 @@ void QGL2PaintEngineExPrivate::setBrush(const QBrush* brush)
 void QGL2PaintEngineExPrivate::useSimpleShader()
 {
     shaderManager->simpleProgram()->enable();
+    shaderManager->setDirty();
 
     if (matrixDirty)
         updateMatrix();
@@ -449,6 +597,43 @@ void QGL2PaintEngineExPrivate::drawTexture(const QGLRect& dest, const QGLRect& s
     glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 }
 
+void QGL2PaintEngineEx::sync()
+{
+    Q_D(QGL2PaintEngineEx);
+    ensureActive();
+    d->transferMode(BrushDrawingMode);
+
+    QGLContext *ctx = d->ctx;
+    glUseProgram(0);
+
+#ifndef QT_OPENGL_ES_2
+    // be nice to people who mix OpenGL 1.x code with QPainter commands
+    // by setting modelview and projection matrices to mirror the GL 1
+    // paint engine
+    const QTransform& mtx = state()->matrix;
+
+    float mv_matrix[4][4] =
+    {
+        { mtx.m11(), mtx.m12(),     0, mtx.m13() },
+        { mtx.m21(), mtx.m22(),     0, mtx.m23() },
+        {         0,         0,     1,         0 },
+        {  mtx.dx(),  mtx.dy(),     0, mtx.m33() }
+    };
+
+    const QSize sz = d->drawable.size();
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(0, sz.width(), sz.height(), 0, -999999, 999999);
+
+    glMatrixMode(GL_MODELVIEW);
+    glLoadMatrixf(&mv_matrix[0][0]);
+#endif
+
+    glDisable(GL_BLEND);
+    glActiveTexture(GL_TEXTURE0);
+}
+
 void QGL2PaintEngineExPrivate::transferMode(EngineMode newMode)
 {
     if (newMode == mode)
@@ -868,8 +1053,6 @@ void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem
 
 void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, const QTextItemInt &ti)
 {
-    transferMode(TextDrawingMode);
-
     Q_Q(QGL2PaintEngineEx);
     QOpenGL2PaintEngineState *s = q->state();
 
@@ -884,34 +1067,32 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, const QTextIte
         ? QFontEngineGlyphCache::Type(ti.fontEngine->glyphFormat)
         : QFontEngineGlyphCache::Raster_A8;
 
-    GLenum maskFormat = GL_RGBA;
-    if (glyphType == QFontEngineGlyphCache::Raster_A8) {
-        shaderManager->setMaskType(QGLEngineShaderManager::PixelMask);
-//        maskFormat = GL_ALPHA;
+    QGLTextureGlyphCache *cache =
+        (QGLTextureGlyphCache *) ti.fontEngine->glyphCache(ctx, s->matrix);
+    if (!cache) {
+        cache = new QGLTextureGlyphCache(ctx, glyphType, s->matrix);
+        ti.fontEngine->setGlyphCache(ctx, cache);
     }
+
+    cache->setPaintEnginePrivate(this);
+    cache->populate(ti, glyphs, positions);
+
+    if (cache->width() == 0 || cache->height() == 0)
+        return;
+
+    transferMode(TextDrawingMode);
+
+    if (glyphType == QFontEngineGlyphCache::Raster_A8)
+        shaderManager->setMaskType(QGLEngineShaderManager::PixelMask);
     else if (glyphType == QFontEngineGlyphCache::Raster_RGBMask)
         shaderManager->setMaskType(QGLEngineShaderManager::SubPixelMask);
     //### TODO: Gamma correction
     shaderManager->setTextureCoordsEnabled(true);
 
-
-    QImageTextureGlyphCache *cache =
-        (QImageTextureGlyphCache *) ti.fontEngine->glyphCache(glyphType, s->matrix);
-    if (!cache) {
-        cache = new QImageTextureGlyphCache(glyphType, s->matrix);
-        ti.fontEngine->setGlyphCache(glyphType, cache);
-    }
-
-    cache->populate(ti, glyphs, positions);
-
-    const QImage &image = cache->image();
     int margin = cache->glyphMargin();
 
-    if (image.isNull())
-        return;
-
-    GLfloat dx = 1.0 / image.width();
-    GLfloat dy = 1.0 / image.height();
+    GLfloat dx = 1.0 / cache->width();
+    GLfloat dy = 1.0 / cache->height();
 
     QGLPoint *oldVertexCoordinateDataPtr = vertexCoordinateArray.data();
     QGLPoint *oldTextureCoordinateDataPtr = textureCoordinateArray.data();
@@ -925,11 +1106,11 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, const QTextIte
         int y = positions[i].y.toInt() - c.baseLineY - margin;
 
         vertexCoordinateArray.addRect(QRectF(x, y, c.w, c.h));
-        textureCoordinateArray.addRect(QRectF(c.x*dx, 1 - c.y*dy, c.w * dx, -c.h * dy));
+        textureCoordinateArray.addRect(QRectF(c.x*dx, c.y*dy, c.w * dx, c.h * dy));
     }
 
     glActiveTexture(GL_TEXTURE0 + QT_MASK_TEXTURE_UNIT);
-    ctx->d_func()->bindTexture(image, GL_TEXTURE_2D, GL_RGBA, true);
+    glBindTexture(GL_TEXTURE_2D, cache->texture());
     updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, false);
 
     QBrush pensBrush = q->state()->pen.brush();
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index dececa3..7213474 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -126,6 +126,7 @@ public:
         return static_cast<const QOpenGL2PaintEngineState *>(QPaintEngineEx::state());
     }
     void updateClipRegion(const QRegion &clipRegion, Qt::ClipOperation op);
+    virtual void sync();
 
 private:
     Q_DISABLE_COPY(QGL2PaintEngineEx)
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 19d779a..6b511e2 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -363,6 +363,7 @@ private:
     friend class QGLWindowSurface;
     friend class QGLPixmapData;
     friend class QGLPixmapFilterBase;
+    friend class QGLTextureGlyphCache;
     friend QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags();
 #ifdef Q_WS_MAC
 public:
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index b1a63b5..b3523d4 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -440,7 +440,7 @@ inline bool qt_gl_preferGL2Engine()
     return true;
 #else
     return (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0)
-           && !qgetenv("QT_GL_USE_OPENGL2ENGINE").isEmpty();
+           && qgetenv("QT_GL_USE_OPENGL1ENGINE").isEmpty();
 #endif
 }
 
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index d74b930..37732dd 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 
     \code
     QGLShader shader(QGLShader::VertexShader);
-    shader.setSourceCode(code);
+    shader.compile(code);
 
     QGLShaderProgram program(context);
     program.addShader(shader);
@@ -245,14 +245,14 @@ class QGLShaderPrivate
 {
 public:
     QGLShaderPrivate(QGLShader::ShaderType type, const QGLContext *ctx)
+        : context(ctx)
+        , shader(0)
+        , shaderType(type)
+        , compiled(false)
+        , isPartial(type == QGLShader::PartialVertexShader ||
+                    type == QGLShader::PartialFragmentShader)
+        , hasPartialSource(false)
     {
-        context = ctx;
-        shader = 0;
-        shaderType = type;
-        compiled = false;
-        isPartial = (type == QGLShader::PartialVertexShader ||
-                     type == QGLShader::PartialFragmentShader);
-        hasPartialSource = false;
     }
 
     const QGLContext *context;
@@ -265,7 +265,7 @@ public:
     QByteArray partialSource;
 
     bool create();
-    bool compile();
+    bool compile(QGLShader *q);
 };
 
 #define ctx     context
@@ -293,7 +293,7 @@ bool QGLShaderPrivate::create()
     }
 }
 
-bool QGLShaderPrivate::compile()
+bool QGLShaderPrivate::compile(QGLShader *q)
 {
     // Partial shaders are compiled during QGLShaderProgram::link().
     if (isPartial && hasPartialSource) {
@@ -313,7 +313,11 @@ bool QGLShaderPrivate::compile()
         GLint len;
         glGetShaderInfoLog(shader, value, &len, logbuf);
         log = QString::fromLatin1(logbuf);
-        qWarning() << "QGLShader::compile:" << log;
+        QString name = q->objectName();
+        if (name.isEmpty())
+            qWarning() << "QGLShader::compile:" << log;
+        else
+            qWarning() << "QGLShader::compile[" << name << "]:" << log;
         delete [] logbuf;
     }
     return compiled;
@@ -325,14 +329,14 @@ bool QGLShaderPrivate::compile()
 /*!
     Constructs a new QGLShader object of the specified \a type
     and attaches it to \a parent.  If shader programs are not supported,
-    then isValid() will return false.
+    QGLShaderProgram::hasShaderPrograms() will return false.
 
-    This constructor is normally followed by a call to setSourceCode()
-    or setSourceCodeFile().
+    This constructor is normally followed by a call to compile()
+    or compileFile().
 
     The shader will be associated with the current QGLContext.
 
-    \sa setSourceCode(), setSourceCodeFile(), isValid()
+    \sa compile(), compileFile()
 */
 QGLShader::QGLShader(QGLShader::ShaderType type, QObject *parent)
     : QObject(parent)
@@ -346,11 +350,11 @@ QGLShader::QGLShader(QGLShader::ShaderType type, QObject *parent)
     and attaches it to \a parent.  If the filename ends in \c{.fsh},
     it is assumed to be a fragment shader, otherwise it is assumed to
     be a vertex shader (normally the extension is \c{.vsh} for vertex shaders).
-    If the shader could not be loaded, then isValid() will return false.
+    If the shader could not be loaded, then isCompiled() will return false.
 
     The shader will be associated with the current QGLContext.
 
-    \sa isValid()
+    \sa isCompiled()
 */
 QGLShader::QGLShader(const QString& fileName, QObject *parent)
     : QObject(parent)
@@ -359,7 +363,7 @@ QGLShader::QGLShader(const QString& fileName, QObject *parent)
         d = new QGLShaderPrivate(QGLShader::FragmentShader, QGLContext::currentContext());
     else
         d = new QGLShaderPrivate(QGLShader::VertexShader, QGLContext::currentContext());
-    if (d->create() && !setSourceCodeFile(fileName)) {
+    if (d->create() && !compileFile(fileName)) {
         if (d->shader)
             glDeleteShader(d->shader);
         d->shader = 0;
@@ -369,18 +373,18 @@ QGLShader::QGLShader(const QString& fileName, QObject *parent)
 /*!
     Constructs a new QGLShader object of the specified \a type from the
     source code in \a fileName and attaches it to \a parent.
-    If the shader could not be loaded, then isValid() will return false.
+    If the shader could not be loaded, then isCompiled() will return false.
 
     The shader will be associated with the current QGLContext.
 
-    \sa isValid()
+    \sa isCompiled()
 */
 QGLShader::QGLShader
         (const QString& fileName, QGLShader::ShaderType type, QObject *parent)
     : QObject(parent)
 {
     d = new QGLShaderPrivate(type, QGLContext::currentContext());
-    if (d->create() && !setSourceCodeFile(fileName)) {
+    if (d->create() && !compileFile(fileName)) {
         if (d->shader)
             glDeleteShader(d->shader);
         d->shader = 0;
@@ -390,14 +394,14 @@ QGLShader::QGLShader
 /*!
     Constructs a new QGLShader object of the specified \a type
     and attaches it to \a parent.  If shader programs are not supported,
-    then isValid() will return false.
+    then QGLShaderProgram::hasShaderPrograms() will return false.
 
-    This constructor is normally followed by a call to setSourceCode()
-    or setSourceCodeFile().
+    This constructor is normally followed by a call to compile()
+    or compileFile().
 
     The shader will be associated with \a context.
 
-    \sa setSourceCode(), setSourceCodeFile(), isValid()
+    \sa compile(), compileFile()
 */
 QGLShader::QGLShader(QGLShader::ShaderType type, const QGLContext *context, QObject *parent)
     : QObject(parent)
@@ -411,11 +415,11 @@ QGLShader::QGLShader(QGLShader::ShaderType type, const QGLContext *context, QObj
     and attaches it to \a parent.  If the filename ends in \c{.fsh},
     it is assumed to be a fragment shader, otherwise it is assumed to
     be a vertex shader (normally the extension is \c{.vsh} for vertex shaders).
-    If the shader could not be loaded, then isValid() will return false.
+    If the shader could not be loaded, then isCompiled() will return false.
 
     The shader will be associated with \a context.
 
-    \sa isValid()
+    \sa isCompiled()
 */
 QGLShader::QGLShader(const QString& fileName, const QGLContext *context, QObject *parent)
     : QObject(parent)
@@ -424,7 +428,7 @@ QGLShader::QGLShader(const QString& fileName, const QGLContext *context, QObject
         d = new QGLShaderPrivate(QGLShader::FragmentShader, context);
     else
         d = new QGLShaderPrivate(QGLShader::VertexShader, context);
-    if (d->create() && !setSourceCodeFile(fileName)) {
+    if (d->create() && !compileFile(fileName)) {
         if (d->shader)
             glDeleteShader(d->shader);
         d->shader = 0;
@@ -434,18 +438,18 @@ QGLShader::QGLShader(const QString& fileName, const QGLContext *context, QObject
 /*!
     Constructs a new QGLShader object of the specified \a type from the
     source code in \a fileName and attaches it to \a parent.
-    If the shader could not be loaded, then isValid() will return false.
+    If the shader could not be loaded, then isCompiled() will return false.
 
     The shader will be associated with \a context.
 
-    \sa isValid()
+    \sa isCompiled()
 */
 QGLShader::QGLShader
         (const QString& fileName, QGLShader::ShaderType type, const QGLContext *context, QObject *parent)
     : QObject(parent)
 {
     d = new QGLShaderPrivate(type, context);
-    if (d->create() && !setSourceCodeFile(fileName)) {
+    if (d->create() && !compileFile(fileName)) {
         if (d->shader)
             glDeleteShader(d->shader);
         d->shader = 0;
@@ -465,24 +469,6 @@ QGLShader::~QGLShader()
 }
 
 /*!
-    Returns true if this shader is valid.  Shaders become invalid
-    when they are destroyed and no longer attached to a QGLShaderProgram.
-*/
-bool QGLShader::isValid() const
-{
-    if (d->isPartial && d->hasPartialSource)
-        return true;
-    if (!d->shader)
-        return false;
-#if defined(QT_OPENGL_ES_2)
-    return glIsShader(d->shader);
-#else
-    // glIsShader() may not exist on some systems.
-    return (!glIsShader || glIsShader(d->shader));
-#endif
-}
-
-/*!
     Returns the type of this shader.
 */
 QGLShader::ShaderType QGLShader::shaderType() const
@@ -509,13 +495,15 @@ static const char qualifierDefines[] =
     then this function will always return true, even if the source code
     is invalid.  Partial shaders are compiled when QGLShaderProgram::link()
     is called.
+
+    \sa compileFile()
 */
-bool QGLShader::setSourceCode(const char *source)
+bool QGLShader::compile(const char *source)
 {
     if (d->isPartial) {
         d->partialSource = QByteArray(source);
         d->hasPartialSource = true;
-        return d->compile();
+        return d->compile(this);
     } else if (d->shader) {
         QVarLengthArray<const char *> src;
 #ifdef QGL_DEFINE_QUALIFIERS
@@ -523,7 +511,7 @@ bool QGLShader::setSourceCode(const char *source)
 #endif
         src.append(source);
         glShaderSource(d->shader, src.size(), src.data(), 0);
-        return d->compile();
+        return d->compile(this);
     } else {
         return false;
     }
@@ -539,10 +527,12 @@ bool QGLShader::setSourceCode(const char *source)
     then this function will always return true, even if the source code
     is invalid.  Partial shaders are compiled when QGLShaderProgram::link()
     is called.
+
+    \sa compileFile()
 */
-bool QGLShader::setSourceCode(const QByteArray& source)
+bool QGLShader::compile(const QByteArray& source)
 {
-    return setSourceCode(source.constData());
+    return compile(source.constData());
 }
 
 /*!
@@ -555,10 +545,12 @@ bool QGLShader::setSourceCode(const QByteArray& source)
     then this function will always return true, even if the source code
     is invalid.  Partial shaders are compiled when QGLShaderProgram::link()
     is called.
+
+    \sa compileFile()
 */
-bool QGLShader::setSourceCode(const QString& source)
+bool QGLShader::compile(const QString& source)
 {
-    return setSourceCode(source.toLatin1().constData());
+    return compile(source.toLatin1().constData());
 }
 
 /*!
@@ -570,8 +562,10 @@ bool QGLShader::setSourceCode(const QString& source)
     then this function will always return true, even if the source code
     is invalid.  Partial shaders are compiled when QGLShaderProgram::link()
     is called.
+
+    \sa compile()
 */
-bool QGLShader::setSourceCodeFile(const QString& fileName)
+bool QGLShader::compileFile(const QString& fileName)
 {
     QFile file(fileName);
     if (!file.open(QFile::ReadOnly)) {
@@ -580,7 +574,7 @@ bool QGLShader::setSourceCodeFile(const QString& fileName)
     }
 
     QByteArray contents = file.readAll();
-    return setSourceCode(contents.constData());
+    return compile(contents.constData());
 }
 
 /*!
@@ -592,9 +586,11 @@ bool QGLShader::setSourceCodeFile(const QString& fileName)
     This function cannot be used with PartialVertexShader or
     PartialFragmentShader.
 
+    If this function succeeds, then the shader will be considered compiled.
+
     \sa shaderBinaryFormats()
 */
-bool QGLShader::setBinaryCode(GLenum format, const void *binary, int length)
+bool QGLShader::setShaderBinary(GLenum format, const void *binary, int length)
 {
 #if !defined(QT_OPENGL_ES_2)
     if (!glShaderBinary)
@@ -604,7 +600,8 @@ bool QGLShader::setBinaryCode(GLenum format, const void *binary, int length)
         return false;
     glGetError();   // Clear error state.
     glShaderBinary(1, &(d->shader), format, binary, length);
-    return (glGetError() == GL_NO_ERROR);
+    d->compiled = (glGetError() == GL_NO_ERROR);
+    return d->compiled;
 }
 
 /*!
@@ -620,9 +617,11 @@ bool QGLShader::setBinaryCode(GLenum format, const void *binary, int length)
     This function cannot be used with PartialVertexShader or
     PartialFragmentShader.
 
+    If this function succeeds, then the shader will be considered compiled.
+
     \sa shaderBinaryFormats()
 */
-bool QGLShader::setBinaryCode
+bool QGLShader::setShaderBinary
     (QGLShader& otherShader, GLenum format, const void *binary, int length)
 {
 #if !defined(QT_OPENGL_ES_2)
@@ -638,14 +637,16 @@ bool QGLShader::setBinaryCode
     shaders[0] = d->shader;
     shaders[1] = otherShader.d->shader;
     glShaderBinary(2, shaders, format, binary, length);
-    return (glGetError() == GL_NO_ERROR);
+    d->compiled = (glGetError() == GL_NO_ERROR);
+    otherShader.d->compiled = d->compiled;
+    return d->compiled;
 }
 
 /*!
     Returns a list of all binary formats that are supported by
-    setBinaryCode() on this system.
+    setShaderBinary() on this system.
 
-    \sa setBinaryCode()
+    \sa setShaderBinary()
 */
 QList<GLenum> QGLShader::shaderBinaryFormats()
 {
@@ -665,7 +666,7 @@ QList<GLenum> QGLShader::shaderBinaryFormats()
 /*!
     Returns the source code for this shader.
 
-    \sa setSourceCode()
+    \sa compile()
 */
 QByteArray QGLShader::sourceCode() const
 {
@@ -688,7 +689,7 @@ QByteArray QGLShader::sourceCode() const
 /*!
     Returns true if this shader has been compiled; false otherwise.
 
-    \sa setSourceCode()
+    \sa compile()
 */
 bool QGLShader::isCompiled() const
 {
@@ -698,7 +699,7 @@ bool QGLShader::isCompiled() const
 /*!
     Returns the errors and warnings that occurred during the last compile.
 
-    \sa setSourceCode()
+    \sa compile()
 */
 QString QGLShader::log() const
 {
@@ -726,14 +727,14 @@ class QGLShaderProgramPrivate
 {
 public:
     QGLShaderProgramPrivate(const QGLContext *ctx)
+        : context(ctx)
+        , program(0)
+        , linked(false)
+        , inited(false)
+        , hasPartialShaders(false)
+        , vertexShader(0)
+        , fragmentShader(0)
     {
-        context = ctx;
-        program = 0;
-        linked = false;
-        inited = false;
-        hasPartialShaders = false;
-        vertexShader = 0;
-        fragmentShader = 0;
     }
     ~QGLShaderProgramPrivate()
     {
@@ -762,7 +763,7 @@ public:
 
     The shader program will be associated with the current QGLContext.
 
-    \sa isValid(), addShader()
+    \sa addShader()
 */
 QGLShaderProgram::QGLShaderProgram(QObject *parent)
     : QObject(parent)
@@ -776,7 +777,7 @@ QGLShaderProgram::QGLShaderProgram(QObject *parent)
 
     The shader program will be associated with \a context.
 
-    \sa isValid(), addShader()
+    \sa addShader()
 */
 QGLShaderProgram::QGLShaderProgram(const QGLContext *context, QObject *parent)
     : QObject(parent)
@@ -815,21 +816,6 @@ bool QGLShaderProgram::init()
 }
 
 /*!
-    Returns true if this shader program object is valid, false otherwise.
-*/
-bool QGLShaderProgram::isValid() const
-{
-    if (!d->program)
-        return false;
-#if defined(QT_OPENGL_ES_2)
-    return glIsProgram(d->program);
-#else
-    // glIsProgram() may not exist on some systems.
-    return (!glIsProgram || glIsProgram(d->program));
-#endif
-}
-
-/*!
     Adds a compiled \a shader to this shader program.  Returns true
     if the shader could be added, or false otherwise.
 
@@ -881,7 +867,7 @@ bool QGLShaderProgram::addShader(QGLShader::ShaderType type, const char *source)
     if (!init())
         return false;
     QGLShader *shader = new QGLShader(type, this);
-    if (!shader->setSourceCode(source)) {
+    if (!shader->compile(source)) {
         d->log = shader->log();
         delete shader;
         return false;
@@ -1058,7 +1044,11 @@ bool QGLShaderProgram::setProgramBinary(int format, const QByteArray& binary)
         GLint len;
         glGetProgramInfoLog(d->program, value, &len, logbuf);
         d->log = QString::fromLatin1(logbuf);
-        qWarning() << "QGLShaderProgram::setProgramBinary:" << d->log;
+        QString name = objectName();
+        if (name.isEmpty())
+            qWarning() << "QGLShader::setProgramBinary:" << d->log;
+        else
+            qWarning() << "QGLShader::setProgramBinary[" << name << "]:" << d->log;
         delete [] logbuf;
     }
     return d->linked;
@@ -1130,7 +1120,7 @@ bool QGLShaderProgram::link()
                 d->vertexShader =
                     new QGLShader(QGLShader::VertexShader, this);
             }
-            if (!d->vertexShader->setSourceCode(vertexSource)) {
+            if (!d->vertexShader->compile(vertexSource)) {
                 d->log = d->vertexShader->log();
                 return false;
             }
@@ -1147,7 +1137,7 @@ bool QGLShaderProgram::link()
                 d->fragmentShader =
                     new QGLShader(QGLShader::FragmentShader, this);
             }
-            if (!d->fragmentShader->setSourceCode(fragmentSource)) {
+            if (!d->fragmentShader->compile(fragmentSource)) {
                 d->log = d->fragmentShader->log();
                 return false;
             }
@@ -1166,7 +1156,11 @@ bool QGLShaderProgram::link()
         GLint len;
         glGetProgramInfoLog(d->program, value, &len, logbuf);
         d->log = QString::fromLatin1(logbuf);
-        qWarning() << "QGLShaderProgram::link:" << d->log;
+        QString name = objectName();
+        if (name.isEmpty())
+            qWarning() << "QGLShader::link:" << d->log;
+        else
+            qWarning() << "QGLShader::link[" << name << "]:" << d->log;
         delete [] logbuf;
     }
     return d->linked;
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h
index b69d28e..ab30c32 100644
--- a/src/opengl/qglshaderprogram.h
+++ b/src/opengl/qglshaderprogram.h
@@ -79,17 +79,15 @@ public:
     QGLShader(const QString& fileName, QGLShader::ShaderType type, const QGLContext *context, QObject *parent = 0);
     virtual ~QGLShader();
 
-    bool isValid() const;
-
     QGLShader::ShaderType shaderType() const;
 
-    bool setSourceCode(const char *source);
-    bool setSourceCode(const QByteArray& source);
-    bool setSourceCode(const QString& source);
-    bool setSourceCodeFile(const QString& fileName);
+    bool compile(const char *source);
+    bool compile(const QByteArray& source);
+    bool compile(const QString& source);
+    bool compileFile(const QString& fileName);
 
-    bool setBinaryCode(GLenum format, const void *binary, int length);
-    bool setBinaryCode(QGLShader& otherShader, GLenum format, const void *binary, int length);
+    bool setShaderBinary(GLenum format, const void *binary, int length);
+    bool setShaderBinary(QGLShader& otherShader, GLenum format, const void *binary, int length);
 
     static QList<GLenum> shaderBinaryFormats();
 
@@ -118,8 +116,6 @@ public:
     explicit QGLShaderProgram(const QGLContext *context, QObject *parent = 0);
     virtual ~QGLShaderProgram();
 
-    bool isValid() const;
-
     bool addShader(QGLShader *shader);
     void removeShader(QGLShader *shader);
     QList<QGLShader *> shaders() const;
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index 85bcda5..8d94c8b 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -372,45 +372,50 @@ QPaintEngine* QGLPixmapData::paintEngine() const
 
     if (m_engine)
         return m_engine;
-    else if (!useFramebufferObjects()) {
-        m_dirty = true;
-        if (m_source.size() != size())
-            m_source = QImage(size(), QImage::Format_ARGB32_Premultiplied);
-        if (m_hasFillColor) {
-            m_source.fill(PREMUL(m_fillColor.rgba()));
-            m_hasFillColor = false;
-        }
-        return m_source.paintEngine();
-    }
 
-    extern QGLWidget* qt_gl_share_widget();
+    if (useFramebufferObjects()) {
+        extern QGLWidget* qt_gl_share_widget();
 
-    if (!QGLContext::currentContext())
-        qt_gl_share_widget()->makeCurrent();
-    QGLShareContextScope ctx(qt_gl_share_widget()->context());
+        if (!QGLContext::currentContext())
+            qt_gl_share_widget()->makeCurrent();
+        QGLShareContextScope ctx(qt_gl_share_widget()->context());
 
-    if (textureBufferStack.size() <= currentTextureBuffer) {
-        textureBufferStack << createTextureBuffer(size());
-    } else {
-        QSize sz = textureBufferStack.at(currentTextureBuffer).fbo->size();
-        if (sz.width() < m_width || sz.height() < m_height) {
-            if (sz.width() < m_width)
-                sz.setWidth(qMax(m_width, qRound(sz.width() * 1.5)));
-            if (sz.height() < m_height)
-                sz.setHeight(qMax(m_height, qRound(sz.height() * 1.5)));
-            delete textureBufferStack.at(currentTextureBuffer).fbo;
-            textureBufferStack[currentTextureBuffer] =
-                createTextureBuffer(sz, textureBufferStack.at(currentTextureBuffer).engine);
-            qDebug() << "Creating new pixmap texture buffer:" << sz;
+        if (textureBufferStack.size() <= currentTextureBuffer) {
+            textureBufferStack << createTextureBuffer(size());
+        } else {
+            QSize sz = textureBufferStack.at(currentTextureBuffer).fbo->size();
+            if (sz.width() < m_width || sz.height() < m_height) {
+                if (sz.width() < m_width)
+                    sz.setWidth(qMax(m_width, qRound(sz.width() * 1.5)));
+                if (sz.height() < m_height)
+                    sz.setHeight(qMax(m_height, qRound(sz.height() * 1.5)));
+                delete textureBufferStack.at(currentTextureBuffer).fbo;
+                textureBufferStack[currentTextureBuffer] =
+                    createTextureBuffer(sz, textureBufferStack.at(currentTextureBuffer).engine);
+                qDebug() << "Creating new pixmap texture buffer:" << sz;
+            }
         }
-    }
 
-    m_renderFbo = textureBufferStack.at(currentTextureBuffer).fbo;
-    m_engine = textureBufferStack.at(currentTextureBuffer).engine;
+        if (textureBufferStack.at(currentTextureBuffer).fbo->isValid()) {
+            m_renderFbo = textureBufferStack.at(currentTextureBuffer).fbo;
+            m_engine = textureBufferStack.at(currentTextureBuffer).engine;
+
+            ++currentTextureBuffer;
+
+            return m_engine;
+        }
 
-    ++currentTextureBuffer;
+        qWarning() << "Failed to create pixmap texture buffer of size " << size() << ", falling back to raster paint engine";
+    }
 
-    return m_engine;
+    m_dirty = true;
+    if (m_source.size() != size())
+        m_source = QImage(size(), QImage::Format_ARGB32_Premultiplied);
+    if (m_hasFillColor) {
+        m_source.fill(PREMUL(m_fillColor.rgba()));
+        m_hasFillColor = false;
+    }
+    return m_source.paintEngine();
 }
 
 GLuint QGLPixmapData::bind(bool copyBack) const
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
index 13f0a8f..180acaf 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
@@ -61,8 +61,6 @@ public:
     void lockDirectFB(uint flags);
     void unlockDirectFB();
 
-    inline bool forceRasterPrimitives() const { return forceRaster; }
-
     // Reimplemented from QCustomRasterPaintDevice:
     void* memory() const;
     QImage::Format format() const;
@@ -77,7 +75,6 @@ protected:
           dfbSurface(0),
           lockedImage(0),
           screen(scr),
-          forceRaster(false),
           lock(0),
           mem(0)
     {}
@@ -95,7 +92,6 @@ protected:
     QImage *lockedImage;
     QDirectFBScreen *screen;
     int bpl;
-    bool forceRaster;
     uint lock;
     uchar *mem;
 private:
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index a68bc8f..2fb533a 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -81,7 +81,7 @@ template <> inline const bool* ptr<bool>(const bool &) { return 0; }
 template <typename device, typename T1, typename T2, typename T3>
 static void rasterFallbackWarn(const char *msg, const char *func, const device *dev,
                                int scale, bool matrixRotShear, bool simplePen,
-                               bool dfbHandledClip, bool forceRasterPrimitives,
+                               bool dfbHandledClip,
                                const char *nameOne, const T1 &one,
                                const char *nameTwo, const T2 &two,
                                const char *nameThree, const T3 &three)
@@ -98,8 +98,7 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device *
     dbg << "scale" << scale
         << "matrixRotShear" << matrixRotShear
         << "simplePen" << simplePen
-        << "dfbHandledClip" << dfbHandledClip
-        << "forceRasterPrimitives" << forceRasterPrimitives;
+        << "dfbHandledClip" << dfbHandledClip;
 
     const T1 *t1 = ptr(one);
     const T2 *t2 = ptr(two);
@@ -125,7 +124,6 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device *
                            __FUNCTION__, state()->painter->device(),    \
                            d_func()->scale, d_func()->matrixRotShear, \
                            d_func()->simplePen, d_func()->dfbCanHandleClip(), \
-                           d_func()->forceRasterPrimitives,             \
                            #one, one, #two, two, #three, three);        \
     if (op & (QT_DIRECTFB_DISABLE_RASTERFALLBACKS))                     \
         return;
@@ -140,7 +138,6 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device *
                            __FUNCTION__, state()->painter->device(),    \
                            d_func()->scale, d_func()->matrixRotShear, \
                            d_func()->simplePen, d_func()->dfbCanHandleClip(), \
-                           d_func()->forceRasterPrimitives,             \
                            #one, one, #two, two, #three, three);
 #else
 #define RASTERFALLBACK(op, one, two, three)
@@ -218,8 +215,8 @@ public:
 
     void setTransform(const QTransform &m);
     void setPen(const QPen &pen);
-    void setCompositionMode(QPainter::CompositionMode mode);
-    void setOpacity(quint8 value);
+    inline void setCompositionMode(QPainter::CompositionMode mode);
+    inline void setOpacity(quint8 value);
     void setRenderHints(QPainter::RenderHints hints);
 
     inline void setDFBColor(const QColor &color);
@@ -263,7 +260,6 @@ private:
     QPen pen;
 
     bool antialiased;
-    bool forceRasterPrimitives;
 
     bool simplePen;
 
@@ -280,14 +276,12 @@ private:
 
     quint8 opacity;
 
-    quint32 drawFlagsFromCompositionMode, blitFlagsFromCompositionMode;
-    DFBSurfacePorterDuffRule porterDuffRule;
-
     bool dirtyClip;
     bool dfbHandledClip;
     bool ignoreSystemClip;
     QDirectFBPaintDevice *dfbDevice;
     void *lockedMemory;
+    bool unsupportedCompositionMode;
 
     QDirectFBPaintEngine *q;
     friend class QDirectFBPaintEngine;
@@ -407,9 +401,8 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount)
     Q_D(QDirectFBPaintEngine);
     d->updateClip();
     const QBrush &brush = state()->brush;
-    if (!d->dfbCanHandleClip() || d->matrixRotShear
-        || !d->simplePen || d->forceRasterPrimitives
-        || !d->isSimpleBrush(brush)) {
+    if (d->unsupportedCompositionMode || !d->dfbCanHandleClip() || d->matrixRotShear
+        || !d->simplePen || !d->isSimpleBrush(brush)) {
         RASTERFALLBACK(DRAW_RECTS, rectCount, VOID_ARG(), VOID_ARG());
         d->lock();
         QRasterPaintEngine::drawRects(rects, rectCount);
@@ -433,9 +426,8 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount)
     Q_D(QDirectFBPaintEngine);
     d->updateClip();
     const QBrush &brush = state()->brush;
-    if (!d->dfbCanHandleClip() || d->matrixRotShear
-        || !d->simplePen || d->forceRasterPrimitives
-        || !d->isSimpleBrush(brush)) {
+    if (d->unsupportedCompositionMode || !d->dfbCanHandleClip() || d->matrixRotShear
+        || !d->simplePen || !d->isSimpleBrush(brush)) {
         RASTERFALLBACK(DRAW_RECTS, rectCount, VOID_ARG(), VOID_ARG());
         d->lock();
         QRasterPaintEngine::drawRects(rects, rectCount);
@@ -458,7 +450,7 @@ void QDirectFBPaintEngine::drawLines(const QLine *lines, int lineCount)
 {
     Q_D(QDirectFBPaintEngine);
     d->updateClip();
-    if (!d->simplePen || !d->dfbCanHandleClip() || d->forceRasterPrimitives) {
+    if (d->unsupportedCompositionMode || !d->simplePen || !d->dfbCanHandleClip()) {
         RASTERFALLBACK(DRAW_LINES, lineCount, VOID_ARG(), VOID_ARG());
         d->lock();
         QRasterPaintEngine::drawLines(lines, lineCount);
@@ -476,7 +468,7 @@ void QDirectFBPaintEngine::drawLines(const QLineF *lines, int lineCount)
 {
     Q_D(QDirectFBPaintEngine);
     d->updateClip();
-    if (!d->simplePen || !d->dfbCanHandleClip() || d->forceRasterPrimitives) {
+    if (d->unsupportedCompositionMode || !d->simplePen || !d->dfbCanHandleClip()) {
         RASTERFALLBACK(DRAW_LINES, lineCount, VOID_ARG(), VOID_ARG());
         d->lock();
         QRasterPaintEngine::drawLines(lines, lineCount);
@@ -516,7 +508,8 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image,
 
     d->updateClip();
 #if !defined QT_NO_DIRECTFB_PREALLOCATED || defined QT_DIRECTFB_IMAGECACHE
-    if (d->matrixRotShear
+    if (d->unsupportedCompositionMode
+        || d->matrixRotShear
         || d->scale == QDirectFBPaintEnginePrivate::NegativeScale
         || !d->dfbCanHandleClip(r)
 #ifndef QT_DIRECTFB_IMAGECACHE
@@ -560,7 +553,7 @@ void QDirectFBPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap,
         RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr);
         d->lock();
         QRasterPaintEngine::drawPixmap(r, pixmap, sr);
-    } else if (!d->dfbCanHandleClip(r) || d->matrixRotShear
+    } else if (d->unsupportedCompositionMode || !d->dfbCanHandleClip(r) || d->matrixRotShear
                || d->scale == QDirectFBPaintEnginePrivate::NegativeScale) {
         RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr);
         const QImage *img = static_cast<QDirectFBPixmapData*>(pixmap.pixmapData())->buffer(DSLF_READ);
@@ -592,7 +585,7 @@ void QDirectFBPaintEngine::drawTiledPixmap(const QRectF &r,
         RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), sp);
         d->lock();
         QRasterPaintEngine::drawTiledPixmap(r, pixmap, sp);
-    } else if (!d->dfbCanHandleClip(r) || d->matrixRotShear || !sp.isNull()
+    } else if (d->unsupportedCompositionMode || !d->dfbCanHandleClip(r) || d->matrixRotShear || !sp.isNull()
                || d->scale == QDirectFBPaintEnginePrivate::NegativeScale) {
         RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), sp);
         const QImage *img = static_cast<QDirectFBPixmapData*>(pixmap.pixmapData())->buffer(DSLF_READ);
@@ -688,11 +681,9 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush)
 {
     Q_D(QDirectFBPaintEngine);
     d->updateClip();
-    if (d->dfbCanHandleClip(rect) && !d->matrixRotShear) {
+    if (!d->unsupportedCompositionMode && d->dfbCanHandleClip(rect) && !d->matrixRotShear) {
         switch (brush.style()) {
         case Qt::SolidPattern: {
-            if (d->forceRasterPrimitives)
-                break;
             d->unlock();
             d->setDFBColor(brush.color());
             const QRect r = d->transform.mapRect(rect).toRect();
@@ -720,7 +711,7 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QColor &color)
 {
     Q_D(QDirectFBPaintEngine);
     d->updateClip();
-    if (!d->dfbCanHandleClip() || d->matrixRotShear || d->forceRasterPrimitives) {
+    if (d->unsupportedCompositionMode || !d->dfbCanHandleClip() || d->matrixRotShear) {
         RASTERFALLBACK(FILL_RECT, rect, color, VOID_ARG());
         d->lock();
         QRasterPaintEngine::fillRect(rect, color);
@@ -737,38 +728,32 @@ void QDirectFBPaintEngine::drawColorSpans(const QSpan *spans, int count,
                                           uint color)
 {
     Q_D(QDirectFBPaintEngine);
-    if (d->forceRasterPrimitives) {
-        RASTERFALLBACK(DRAW_COLORSPANS, count, color, VOID_ARG());
-        d->lock();
-        QRasterPaintEngine::drawColorSpans(spans, count, color);
-    } else {
-        color = INV_PREMUL(color);
-
-        QVarLengthArray<DFBRegion> lines(count);
-        int j = 0;
-        for (int i = 0; i < count; ++i) {
-            if (spans[i].coverage == 255) {
-                lines[j].x1 = spans[i].x;
-                lines[j].y1 = spans[i].y;
-                lines[j].x2 = spans[i].x + spans[i].len - 1;
-                lines[j].y2 = spans[i].y;
-                ++j;
-            } else {
-                DFBSpan span = { spans[i].x, spans[i].len };
-                uint c = BYTE_MUL(color, spans[i].coverage);
-                // ### how does this play with setDFBColor
-                d->surface->SetColor(d->surface,
-                                     qRed(c), qGreen(c), qBlue(c), qAlpha(c));
-                d->surface->FillSpans(d->surface, spans[i].y, &span, 1);
-            }
-        }
-        if (j > 0) {
+    color = INV_PREMUL(color);
+
+    QVarLengthArray<DFBRegion> lines(count);
+    int j = 0;
+    for (int i = 0; i < count; ++i) {
+        if (spans[i].coverage == 255) {
+            lines[j].x1 = spans[i].x;
+            lines[j].y1 = spans[i].y;
+            lines[j].x2 = spans[i].x + spans[i].len - 1;
+            lines[j].y2 = spans[i].y;
+            ++j;
+        } else {
+            DFBSpan span = { spans[i].x, spans[i].len };
+            uint c = BYTE_MUL(color, spans[i].coverage);
+            // ### how does this play with setDFBColor
             d->surface->SetColor(d->surface,
-                                 qRed(color), qGreen(color), qBlue(color),
-                                 qAlpha(color));
-            d->surface->DrawLines(d->surface, lines.data(), j);
+                                 qRed(c), qGreen(c), qBlue(c), qAlpha(c));
+            d->surface->FillSpans(d->surface, spans[i].y, &span, 1);
         }
     }
+    if (j > 0) {
+        d->surface->SetColor(d->surface,
+                             qRed(color), qGreen(color), qBlue(color),
+                             qAlpha(color));
+        d->surface->DrawLines(d->surface, lines.data(), j);
+    }
 }
 
 void QDirectFBPaintEngine::drawBufferSpan(const uint *buffer, int bufsize,
@@ -803,11 +788,11 @@ void QDirectFBPaintEngine::initImageCache(int size)
 
 
 QDirectFBPaintEnginePrivate::QDirectFBPaintEnginePrivate(QDirectFBPaintEngine *p)
-    : surface(0), antialiased(false), forceRasterPrimitives(false), simplePen(false),
+    : surface(0), antialiased(false), simplePen(false),
       matrixRotShear(false), scale(NoScale), lastLockedHeight(-1),
-      fbWidth(-1), fbHeight(-1), opacity(255), drawFlagsFromCompositionMode(0),
-      blitFlagsFromCompositionMode(0), porterDuffRule(DSPD_SRC_OVER), dirtyClip(true),
-      dfbHandledClip(false), dfbDevice(0), lockedMemory(0), q(p)
+      fbWidth(-1), fbHeight(-1), opacity(255), dirtyClip(true),
+      dfbHandledClip(false), dfbDevice(0), lockedMemory(0),
+      unsupportedCompositionMode(false), q(p)
 {
     fb = QDirectFBScreen::instance()->dfb();
     ignoreSystemClip = QDirectFBScreen::instance()->directFBFlags() & QDirectFBScreen::IgnoreSystemClip;
@@ -896,13 +881,12 @@ void QDirectFBPaintEnginePrivate::begin(QPaintDevice *device)
                device->devType());
     }
     lockedMemory = 0;
-    forceRasterPrimitives = dfbDevice->forceRasterPrimitives();
 
     surface->GetSize(surface, &fbWidth, &fbHeight);
 
     setTransform(QTransform());
     antialiased = false;
-    opacity = 255;
+    setOpacity(255);
     setCompositionMode(q->state()->compositionMode());
     dirtyClip = true;
     setPen(q->state()->pen);
@@ -930,72 +914,13 @@ void QDirectFBPaintEnginePrivate::setPen(const QPen &p)
 
 void QDirectFBPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode mode)
 {
-    blitFlagsFromCompositionMode = DSBLIT_NOFX;
-    drawFlagsFromCompositionMode = DSDRAW_NOFX;
-
-    bool blend = true;
-    switch (mode) {
-    case QPainter::CompositionMode_SourceOver:
-        porterDuffRule = DSPD_SRC_OVER;
-        break;
-    case QPainter::CompositionMode_DestinationOver:
-        porterDuffRule = DSPD_DST_OVER;
-        break;
-    case QPainter::CompositionMode_Clear:
-        porterDuffRule = DSPD_CLEAR;
-        blend = false;
-        break;
-    case QPainter::CompositionMode_Source:
-        porterDuffRule = DSPD_SRC;
-        blend = false;
-        break;
-    case QPainter::CompositionMode_Destination:
-        porterDuffRule = DSPD_NONE; // ### need to double check this
-        blend = false;
-        return;
-    case QPainter::CompositionMode_SourceIn:
-        porterDuffRule = DSPD_SRC_IN;
-        break;
-    case QPainter::CompositionMode_DestinationIn:
-        porterDuffRule = DSPD_DST_IN;
-        break;
-    case QPainter::CompositionMode_SourceOut:
-        porterDuffRule = DSPD_SRC_OUT;
-        break;
-    case QPainter::CompositionMode_DestinationOut:
-        porterDuffRule = DSPD_DST_OUT;
-        break;
-    case QPainter::CompositionMode_Xor:
-        porterDuffRule = DSPD_XOR;
-        blitFlagsFromCompositionMode |= DSBLIT_XOR;
-        drawFlagsFromCompositionMode |= DSDRAW_XOR;
-        break;
-//     case QPainter::CompositionMode_Plus: // ???
-//         porterDuffRule = DSPD_ADD;
-//         break;
-    default:
-        qWarning("QDirectFBPaintEnginePrivate::setCompositionMode(): "
-                 "mode %d not implemented", mode);
-        return;
-    }
-    // intentially not comparing with current porterDuffRule. surface might have changed.
-    if (blend) {
-        blitFlagsFromCompositionMode |= DSBLIT_BLEND_ALPHACHANNEL;
-        drawFlagsFromCompositionMode |= DSDRAW_BLEND;
-    }
-    if (opacity != 255) {
-        setOpacity(opacity);
-    }
+    unsupportedCompositionMode = (mode != QPainter::CompositionMode_SourceOver);
 }
 
+
 void QDirectFBPaintEnginePrivate::setOpacity(quint8 op)
 {
     opacity = op;
-    if (opacity == 255) {
-        blitFlagsFromCompositionMode &= ~DSBLIT_BLEND_COLORALPHA;
-    } else {
-        blitFlagsFromCompositionMode |= DSBLIT_BLEND_COLORALPHA;
-    }
 }
 
 void QDirectFBPaintEnginePrivate::setRenderHints(QPainter::RenderHints hints)
@@ -1009,15 +934,9 @@ void QDirectFBPaintEnginePrivate::setRenderHints(QPainter::RenderHints hints)
 
 void QDirectFBPaintEnginePrivate::prepareForBlit(bool alpha)
 {
-    quint32 blittingFlags = blitFlagsFromCompositionMode;
-    if (alpha) {
-        surface->SetPorterDuff(surface,
-                               (blittingFlags & DSBLIT_BLEND_COLORALPHA)
-                               ? DSPD_NONE
-                               : porterDuffRule);
-    } else {
-        blittingFlags &= ~DSBLIT_BLEND_ALPHACHANNEL;
-        surface->SetPorterDuff(surface, DSPD_NONE);
+    quint32 blittingFlags = alpha ? DSBLIT_BLEND_ALPHACHANNEL : DSBLIT_NOFX;
+    if (opacity != 255) {
+        blittingFlags |= DSBLIT_BLEND_COLORALPHA;
     }
     surface->SetColor(surface, 0xff, 0xff, 0xff, opacity);
     surface->SetBlittingFlags(surface, DFBSurfaceBlittingFlags(blittingFlags));
@@ -1028,15 +947,9 @@ void QDirectFBPaintEnginePrivate::setDFBColor(const QColor &color)
     Q_ASSERT(surface);
     const quint8 alpha = (opacity == 255 ?
                           color.alpha() : ALPHA_MUL(color.alpha(), opacity));
-    surface->SetColor(surface,
-                      color.red(), color.green(), color.blue(), alpha);
-    quint32 drawingFlags = drawFlagsFromCompositionMode;
-    if (alpha == 255) {
-        drawingFlags &= ~DSDRAW_BLEND;
-    }
+    surface->SetColor(surface, color.red(), color.green(), color.blue(), alpha);
     surface->SetPorterDuff(surface, DSPD_NONE);
-    // PorterDuff messes up alpha values for primitives
-    surface->SetDrawingFlags(surface, DFBSurfaceDrawingFlags(drawingFlags));
+    surface->SetDrawingFlags(surface, alpha == 255 ? DSDRAW_NOFX : DSDRAW_BLEND);
 }
 
 void QDirectFBPaintEnginePrivate::drawLines(const QLine *lines, int n)
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index c9b676a..dba1b51 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -76,7 +76,6 @@ void QDirectFBPixmapData::resize(int width, int height)
                                                                format,
                                                                QDirectFBScreen::TrackSurface);
     alpha = false;
-    forceRaster = (format == QImage::Format_RGB32);
     if (!dfbSurface) {
         invalidate();
         qWarning("QDirectFBPixmapData::resize(): Unable to allocate surface");
@@ -187,7 +186,6 @@ void QDirectFBPixmapData::fromImage(const QImage &i,
     }
     dfbSurface = screen->copyToDFBSurface(img, format,
                                           QDirectFBScreen::TrackSurface);
-    forceRaster = (format == QImage::Format_RGB32);
     if (!dfbSurface) {
         qWarning("QDirectFBPixmapData::fromImage()");
         invalidate();
@@ -216,7 +214,6 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect)
         invalidate();
         return;
     }
-    forceRaster = (format == QImage::Format_RGB32);
 
     if (hasAlpha) {
         dfbSurface->Clear(dfbSurface, 0, 0, 0, 0);
@@ -268,7 +265,6 @@ void QDirectFBPixmapData::fill(const QColor &color)
         screen->releaseDFBSurface(dfbSurface);
         format = screen->alphaPixmapFormat();
         dfbSurface = screen->createDFBSurface(size, screen->alphaPixmapFormat(), QDirectFBScreen::TrackSurface);
-        forceRaster = false;
         setSerialNumber(++global_ser_no);
         if (!dfbSurface) {
             qWarning("QDirectFBPixmapData::fill()");
@@ -277,24 +273,7 @@ void QDirectFBPixmapData::fill(const QColor &color)
         }
     }
 
-    if (forceRaster) {
-        // in DSPF_RGB32 all dfb drawing causes the Alpha byte to be
-        // set to 0. This causes issues for the raster engine.
-        uchar *mem = QDirectFBScreen::lockSurface(dfbSurface, DSLF_WRITE, &bpl);
-        if (mem) {
-            const int h = QPixmapData::height();
-            const int w = QPixmapData::width() * 4; // 4 bytes per 32 bit pixel
-            const int c = color.rgba();
-            for (int i = 0; i < h; ++i) {
-                memset(mem, c, w);
-                mem += bpl;
-            }
-            dfbSurface->Unlock(dfbSurface);
-        }
-    } else {
-        dfbSurface->Clear(dfbSurface, color.red(), color.green(), color.blue(),
-                          color.alpha());
-    }
+    dfbSurface->Clear(dfbSurface, color.red(), color.green(), color.blue(), color.alpha());
 }
 
 QPixmap QDirectFBPixmapData::transformed(const QTransform &transform,
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index 98e32ed..9e35a66 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -958,9 +958,6 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
         return false;
     }
 
-    if (displayArgs.contains(QLatin1String("debug"), Qt::CaseInsensitive))
-        printDirectFBInfo(d_ptr->dfb, d_ptr->dfbSurface);
-
     // Work out what format we're going to use for surfaces with an alpha channel
     d_ptr->alphaPixmapFormat = QDirectFBScreen::getImageFormat(d_ptr->dfbSurface);
     setPixelFormat(d_ptr->alphaPixmapFormat);
@@ -971,12 +968,17 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
     case QImage::Format_RGB444:
         d_ptr->alphaPixmapFormat = QImage::Format_ARGB4444_Premultiplied;
         break;
+    case QImage::Format_RGB32:
+        qWarning("QDirectFBScreen::connect(). Qt/DirectFB does not work with the RGB32 pixelformat. "
+                 "We recommmend using ARGB instead");
+        return false;
+    case QImage::Format_Indexed8:
+        qWarning("QDirectFBScreen::connect(). Qt/DirectFB does not work with the LUT8  pixelformat.");
+        return false;
     case QImage::NImageFormats:
     case QImage::Format_Invalid:
     case QImage::Format_Mono:
     case QImage::Format_MonoLSB:
-    case QImage::Format_Indexed8:
-    case QImage::Format_RGB32:
     case QImage::Format_RGB888:
     case QImage::Format_RGB16:
     case QImage::Format_RGB555:
@@ -1037,6 +1039,9 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
 
     setGraphicsSystem(d_ptr);
 
+    if (displayArgs.contains(QLatin1String("debug"), Qt::CaseInsensitive))
+        printDirectFBInfo(d_ptr->dfb, d_ptr->dfbSurface);
+
     return true;
 }
 
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index cd8796b..330eb88 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -127,7 +127,6 @@ void QDirectFBWindowSurface::createWindow()
         dfbSurface->Release(dfbSurface);
 
     dfbWindow->GetSurface(dfbWindow, &dfbSurface);
-    forceRaster = (format == QImage::Format_RGB32);
 #endif
 }
 #endif // QT_NO_DIRECTFB_WM
@@ -164,7 +163,6 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect, const QRegion &mask)
                                          rect.width(), rect.height() };
                 result = primarySurface->GetSubSurface(primarySurface, &r, &dfbSurface);
             }
-            forceRaster = (dfbSurface && QDirectFBScreen::getImageFormat(dfbSurface) == QImage::Format_RGB32);
         } else {
             const bool isResize = rect.size() != geometry().size();
 #ifdef QT_NO_DIRECTFB_WM
@@ -179,7 +177,6 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect, const QRegion &mask)
                 }
 
                 dfbSurface = screen->createDFBSurface(rect.size(), screen->pixelFormat(), QDirectFBScreen::DontTrackSurface);
-                forceRaster = (dfbSurface && QDirectFBScreen::getImageFormat(dfbSurface) == QImage::Format_RGB32);
             } else {
                 Q_ASSERT(dfbSurface);
             }
@@ -242,31 +239,28 @@ void QDirectFBWindowSurface::setPermanentState(const QByteArray &state)
 #endif
 }
 
-bool QDirectFBWindowSurface::scroll(const QRegion &region, int dx, int dy)
+static inline void scrollSurface(IDirectFBSurface *surface, const QRect &r, int dx, int dy)
 {
-    if (!dfbSurface || !(flipFlags & DSFLIP_BLIT))
-        return false;
-
-    const QVector<QRect> rects = region.rects();
-    const int n = rects.size();
-
-    QVarLengthArray<DFBRectangle, 8> dfbRects(n);
-    QVarLengthArray<DFBPoint, 8> dfbPoints(n);
+    surface->SetBlittingFlags(surface, DSBLIT_NOFX);
+    const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() };
+    surface->Blit(surface, surface, &rect, r.x() + dx, r.y() + dy);
+}
 
-    for (int i = 0; i < n; ++i) {
-        const QRect r = rects.at(i);
-        dfbRects[i].x = r.x();
-        dfbRects[i].y = r.y();
-        dfbRects[i].w = r.width();
-        dfbRects[i].h = r.height();
-        dfbPoints[i].x = r.x() + dx;
-        dfbPoints[i].y = r.y() + dy;
-    }
 
+bool QDirectFBWindowSurface::scroll(const QRegion &region, int dx, int dy)
+{
+    if (!dfbSurface || !(flipFlags & DSFLIP_BLIT) || region.isEmpty())
+        return false;
     dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
-    dfbSurface->BatchBlit(dfbSurface, dfbSurface,
-                          dfbRects.data(), dfbPoints.data(), n);
-    dfbSurface->ReleaseSource(dfbSurface);
+    if (region.numRects() == 1) {
+        ::scrollSurface(dfbSurface, region.boundingRect(), dx, dy);
+    } else {
+        const QVector<QRect> rects = region.rects();
+        const int n = rects.size();
+        for (int i=0; i<n; ++i) {
+            ::scrollSurface(dfbSurface, rects.at(i), dx, dy);
+        }
+    }
     return true;
 }
 
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp
index d8908ed..97021fc 100644
--- a/src/script/qscriptengine.cpp
+++ b/src/script/qscriptengine.cpp
@@ -587,7 +587,7 @@ QScriptValue QScriptEngine::newQObject(const QScriptValue &scriptObject,
     QScriptValuePrivate *p = QScriptValuePrivate::get(scriptObject);
     if (!p || !p->value.isObject())
         return newQObject(qtObject, ownership, options);
-    if (p->value.isVariant()) {
+    if (p->value.isQObject()) {
         QScript::ExtQObject::Instance *data;
         data = d->qobjectConstructor->get(p->value);
         Q_ASSERT(data != 0);
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index c4da3ce..c1bf2f4 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -351,7 +351,6 @@ SUBDIRS += _networkselftest \
            qtranslator \
            qtransform \
            qtransformedscreen \
-           qtransition \
            qtreeview \
            qtreewidget \
            qtreewidgetitemiterator \
diff --git a/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
index bb510fc..4d51e89 100644
--- a/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
+++ b/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
@@ -167,6 +167,9 @@ private slots:
 
     void fill();
 
+    void mapRect_data();
+    void mapRect();
+
 private:
     static void setMatrix(QMatrix2x2& m, const qreal *values);
     static void setMatrixFixed(QMatrix2x2& m, const qreal *values);
@@ -1975,6 +1978,14 @@ void tst_QMatrix::scale4x4_data()
          0.0f, 0.0f, 0.0f, 1.0f};
     QTest::newRow("complex")
         << (qreal)2.0f << (qreal)11.0f << (qreal)-6.5f << (void *)complexScale;
+
+    static const qreal complexScale2D[] =
+        {2.0f, 0.0f, 0.0f, 0.0f,
+         0.0f, -11.0f, 0.0f, 0.0f,
+         0.0f, 0.0f, 1.0f, 0.0f,
+         0.0f, 0.0f, 0.0f, 1.0f};
+    QTest::newRow("complex2D")
+        << (qreal)2.0f << (qreal)-11.0f << (qreal)1.0f << (void *)complexScale2D;
 }
 void tst_QMatrix::scale4x4()
 {
@@ -1993,6 +2004,12 @@ void tst_QMatrix::scale4x4()
     m2.scale(x, y, z);
     QVERIFY(isSame(m2, (const qreal *)resultValues));
 
+    if (z == 1.0f) {
+        QMatrix4x4 m2b;
+        m2b.scale(x, y);
+        QVERIFY(m2b == m2);
+    }
+
     QVector3D v1(2.0f, 3.0f, -4.0f);
     QVector3D v2 = m1 * v1;
     QCOMPARE(v2.x(), (qreal)(2.0f * x));
@@ -2046,6 +2063,12 @@ void tst_QMatrix::scale4x4()
         QVERIFY(isSame(m5, (const qreal *)resultValues));
     }
 
+    if (z == 1.0f) {
+        QMatrix4x4 m4b(m3);
+        m4b.scale(x, y);
+        QVERIFY(m4b == m4);
+    }
+
     // Test coverage when the special matrix type is unknown.
 
     QMatrix4x4 m6;
@@ -2101,6 +2124,14 @@ void tst_QMatrix::translate4x4_data()
          0.0f, 0.0f, 0.0f, 1.0f};
     QTest::newRow("complex")
         << (qreal)2.0f << (qreal)11.0f << (qreal)-6.5f << (void *)complexTranslate;
+
+    static const qreal complexTranslate2D[] =
+        {1.0f, 0.0f, 0.0f, 2.0f,
+         0.0f, 1.0f, 0.0f, -11.0f,
+         0.0f, 0.0f, 1.0f, 0.0f,
+         0.0f, 0.0f, 0.0f, 1.0f};
+    QTest::newRow("complex2D")
+        << (qreal)2.0f << (qreal)-11.0f << (qreal)0.0f << (void *)complexTranslate2D;
 }
 void tst_QMatrix::translate4x4()
 {
@@ -2119,6 +2150,12 @@ void tst_QMatrix::translate4x4()
     m2.translate(x, y, z);
     QVERIFY(isSame(m2, (const qreal *)resultValues));
 
+    if (z == 0.0f) {
+        QMatrix4x4 m2b;
+        m2b.translate(x, y);
+        QVERIFY(m2b == m2);
+    }
+
     QVector3D v1(2.0f, 3.0f, -4.0f);
     QVector3D v2 = m1 * v1;
     QCOMPARE(v2.x(), (qreal)(2.0f + x));
@@ -2153,6 +2190,12 @@ void tst_QMatrix::translate4x4()
     QMatrix4x4 m4(m3);
     m4.translate(x, y, z);
     QVERIFY(m4 == m3 * m1);
+
+    if (z == 0.0f) {
+        QMatrix4x4 m4b(m3);
+        m4b.translate(x, y);
+        QVERIFY(m4b == m4);
+    }
 }
 
 // Test the generation and use of 4x4 rotation matrices.
@@ -3180,6 +3223,117 @@ void tst_QMatrix::fill()
     QVERIFY(isSame(m2, fillValues4x3));
 }
 
+// Test the mapRect() function for QRect and QRectF.
+void tst_QMatrix::mapRect_data()
+{
+    QTest::addColumn<qreal>("x");
+    QTest::addColumn<qreal>("y");
+    QTest::addColumn<qreal>("width");
+    QTest::addColumn<qreal>("height");
+
+    QTest::newRow("null")
+        << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f;
+    QTest::newRow("rect")
+        << (qreal)1.0f << (qreal)-20.5f << (qreal)100.0f << (qreal)63.75f;
+}
+void tst_QMatrix::mapRect()
+{
+    QFETCH(qreal, x);
+    QFETCH(qreal, y);
+    QFETCH(qreal, width);
+    QFETCH(qreal, height);
+
+    QRectF rect(x, y, width, height);
+    QRect recti(qRound(x), qRound(y), qRound(width), qRound(height));
+
+    QMatrix4x4 m1;
+    QVERIFY(m1.mapRect(rect) == rect);
+    QVERIFY(m1.mapRect(recti) == recti);
+
+    QMatrix4x4 m2;
+    m2.translate(-100.5f, 64.0f);
+    QRectF translated = rect.translated(-100.5f, 64.0f);
+    QRect translatedi = QRect(qRound(recti.x() - 100.5f), recti.y() + 64,
+                              recti.width(), recti.height());
+    QVERIFY(m2.mapRect(rect) == translated);
+    QVERIFY(m2.mapRect(recti) == translatedi);
+
+    QMatrix4x4 m3;
+    m3.scale(-100.5f, 64.0f);
+    qreal scalex = x * -100.5f;
+    qreal scaley = y * 64.0f;
+    qreal scalewid = width * -100.5f;
+    qreal scaleht = height * 64.0f;
+    if (scalewid < 0.0f) {
+        scalewid = -scalewid;
+        scalex -= scalewid;
+    }
+    if (scaleht < 0.0f) {
+        scaleht = -scaleht;
+        scaley -= scaleht;
+    }
+    QRectF scaled(scalex, scaley, scalewid, scaleht);
+    QVERIFY(m3.mapRect(rect) == scaled);
+    scalex = recti.x() * -100.5f;
+    scaley = recti.y() * 64.0f;
+    scalewid = recti.width() * -100.5f;
+    scaleht = recti.height() * 64.0f;
+    if (scalewid < 0.0f) {
+        scalewid = -scalewid;
+        scalex -= scalewid;
+    }
+    if (scaleht < 0.0f) {
+        scaleht = -scaleht;
+        scaley -= scaleht;
+    }
+    QRect scaledi(qRound(scalex), qRound(scaley),
+                  qRound(scalewid), qRound(scaleht));
+    QVERIFY(m3.mapRect(recti) == scaledi);
+
+    QMatrix4x4 m4;
+    m4.translate(-100.5f, 64.0f);
+    m4.scale(-2.5f, 4.0f);
+    qreal transx1 = x * -2.5f - 100.5f;
+    qreal transy1 = y * 4.0f + 64.0f;
+    qreal transx2 = (x + width) * -2.5f - 100.5f;
+    qreal transy2 = (y + height) * 4.0f + 64.0f;
+    if (transx1 > transx2)
+        qSwap(transx1, transx2);
+    if (transy1 > transy2)
+        qSwap(transy1, transy2);
+    QRectF trans(transx1, transy1, transx2 - transx1, transy2 - transy1);
+    QVERIFY(m4.mapRect(rect) == trans);
+    transx1 = recti.x() * -2.5f - 100.5f;
+    transy1 = recti.y() * 4.0f + 64.0f;
+    transx2 = (recti.x() + recti.width()) * -2.5f - 100.5f;
+    transy2 = (recti.y() + recti.height()) * 4.0f + 64.0f;
+    if (transx1 > transx2)
+        qSwap(transx1, transx2);
+    if (transy1 > transy2)
+        qSwap(transy1, transy2);
+    QRect transi(qRound(transx1), qRound(transy1),
+                 qRound(transx2) - qRound(transx1),
+                 qRound(transy2) - qRound(transy1));
+    QVERIFY(m4.mapRect(recti) == transi);
+
+    m4.rotate(45.0f, 0.0f, 0.0f, 1.0f);
+
+    QTransform t4;
+    t4.translate(-100.5f, 64.0f);
+    t4.scale(-2.5f, 4.0f);
+    t4.rotate(45.0f);
+    QRectF mr = m4.mapRect(rect);
+    QRectF tr = t4.mapRect(rect);
+    QVERIFY(fuzzyCompare(mr.x(), tr.x()));
+    QVERIFY(fuzzyCompare(mr.y(), tr.y()));
+    QVERIFY(fuzzyCompare(mr.width(), tr.width()));
+    QVERIFY(fuzzyCompare(mr.height(), tr.height()));
+
+    QRect mri = m4.mapRect(recti);
+    QRect tri = t4.mapRect(recti);
+    QVERIFY(mri == tri);
+}
+
 QTEST_APPLESS_MAIN(tst_QMatrix)
 
 #include "tst_qmatrixnxn.moc"
diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_cssparser.cpp
index 7c4fac1..b41a745 100644
--- a/tests/auto/qcssparser/tst_cssparser.cpp
+++ b/tests/auto/qcssparser/tst_cssparser.cpp
@@ -1475,7 +1475,7 @@ void tst_CssParser::extractFontFamily_data()
     QTest::newRow("unquoted-family-name2") << "font-family: Times        New     Roman" << QString("Times New Roman");
     QTest::newRow("multiple") << "font-family: Times New Roman  , foobar, 'baz'" << QString("Times New Roman");
     QTest::newRow("multiple2") << "font-family: invalid,  Times New   Roman " << QString("Times New Roman");
-    QTest::newRow("invalid") << "font-family: invalid" << QFont().family();
+    QTest::newRow("invalid") << "font-family: invalid" << QFontInfo(QFont("invalid font")).family();
     QTest::newRow("shorthand") << "font: 12pt Times New Roman" << QString("Times New Roman");
     QTest::newRow("shorthand multiple quote") << "font: 12pt invalid, \"Times New Roman\" " << QString("Times New Roman");
     QTest::newRow("shorthand multiple") << "font: 12pt invalid, Times New Roman " << QString("Times New Roman");
diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp
index d7ca7bc..6a69fcc 100644
--- a/tests/auto/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/qdatastream/tst_qdatastream.cpp
@@ -462,7 +462,7 @@ void tst_QDataStream::writeQString(QDataStream* s)
 {
     QString test(QStringData(dataIndex(QTest::currentDataTag())));
     *s << test;
-    *s << QString("Faen her spyr man");
+    *s << QString("Her er det noe tekst");
     *s << test;
     *s << QString();
     *s << test;
@@ -480,7 +480,7 @@ void tst_QDataStream::readQString(QDataStream *s)
     *s >> S;
     QCOMPARE(S, test);
     *s >> S;
-    QCOMPARE(S, QString("Faen her spyr man"));
+    QCOMPARE(S, QString("Her er det noe tekst"));
     *s >> S;
     QCOMPARE(S, test);
     *s >> S;
@@ -533,7 +533,7 @@ void tst_QDataStream::writeQRegExp(QDataStream* s)
 {
     QRegExp test(QRegExpData(dataIndex(QTest::currentDataTag())));
     *s << test;
-    *s << QString("Faen her spyr man");
+    *s << QString("Her er det noe tekst");
     *s << test;
     *s << QString("nonempty");
     *s << test;
@@ -550,7 +550,7 @@ void tst_QDataStream::readQRegExp(QDataStream *s)
     *s >> R;
     QCOMPARE(R, test);
     *s >> S;
-    QCOMPARE(S, QString("Faen her spyr man"));
+    QCOMPARE(S, QString("Her er det noe tekst"));
     *s >> R;
     QCOMPARE(R, test);
     *s >> S;
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 59d57ce..b109d4b 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -43,6 +43,7 @@
 #include <QtTest/QtTest>
 #include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
 #include <QFileIconProvider>
+#include <QTreeView>
 #include "../../shared/util.h"
 #include <QTime>
 #include <QStyle>
@@ -102,6 +103,7 @@ private slots:
     void setData_data();
     void setData();
 
+    void sort_data();
     void sort();
 
     void mkdir();
@@ -452,8 +454,12 @@ void tst_QFileSystemModel::rowsInserted()
     } else {
         QCOMPARE(model->index(model->rowCount(root) - 1, 0, root).data().toString(), QString("b"));
     }
-    if (spy0.count() > 0)
-    if (count == 0) QCOMPARE(spy0.count(), 0); else QVERIFY(spy0.count() >= 1);
+    if (spy0.count() > 0) {
+        if (count == 0)
+            QCOMPARE(spy0.count(), 0);
+        else
+            QVERIFY(spy0.count() >= 1);
+    }
     if (count == 0) QCOMPARE(spy1.count(), 0); else QVERIFY(spy1.count() >= 1);
 
     QVERIFY(createFiles(tmp, QStringList(".hidden_file"), 5 + count));
@@ -722,6 +728,19 @@ void tst_QFileSystemModel::setData()
     QTRY_COMPARE(model->rowCount(root), files.count());
 }
 
+class MyFriendFileSystemModel : public QFileSystemModel
+{
+    friend class tst_QFileSystemModel;
+    Q_DECLARE_PRIVATE(QFileSystemModel)
+};
+
+void tst_QFileSystemModel::sort_data()
+{
+    QTest::addColumn<bool>("fileDialogMode");
+    QTest::newRow("standard usage") << false;
+    QTest::newRow("QFileDialog usage") << true;
+}
+
 void tst_QFileSystemModel::sort()
 {
     QTemporaryFile file;
@@ -733,8 +752,48 @@ void tst_QFileSystemModel::sort()
     model->sort(0, Qt::AscendingOrder);
     model->sort(0, Qt::DescendingOrder);
     QVERIFY(idx.column() != 0);
-}
 
+    QFETCH(bool, fileDialogMode);
+
+    MyFriendFileSystemModel *myModel = new MyFriendFileSystemModel();
+    QTreeView *tree = new QTreeView();
+
+    if (fileDialogMode)
+        myModel->d_func()->disableRecursiveSort = true;
+
+    const QString dirPath = QString("%1/sortTemp").arg(QDir::tempPath());
+    QDir dir(dirPath);
+    dir.mkpath(dirPath);
+    QVERIFY(dir.exists());
+    dir.mkdir("a");
+    dir.mkdir("b");
+    dir.mkdir("c");
+    dir.mkdir("d");
+    dir.mkdir("e");
+    dir.mkdir("f");
+    dir.mkdir("g");
+    QTemporaryFile tempFile(dirPath + "/rXXXXXX");
+    tempFile.open();
+    myModel->setRootPath(QDir::rootPath());
+    tree->setModel(myModel);
+    tree->show();
+    QTest::qWait(500);
+    tree->expand(myModel->index(dir.absolutePath(), 0));
+    while (dir.cdUp())
+    {
+        tree->expand(myModel->index(dir.absolutePath(), 0));
+    }
+    QTest::qWait(250);
+    //File dialog Mode means sub trees are not sorted, only the current root
+    if (fileDialogMode)
+        QVERIFY(myModel->index(0, 1, myModel->index(dirPath, 0)).data(QFileSystemModel::FilePathRole).toString() != dirPath + QLatin1String("/a"));
+    else
+        QCOMPARE(myModel->index(0, 1, myModel->index(dirPath, 0)).data(QFileSystemModel::FilePathRole).toString(), dirPath + QLatin1String("/a"));
+
+    delete tree;
+    delete myModel;
+
+}
 
 void tst_QFileSystemModel::mkdir()
 {
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index a23ada9..56d42c3 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -51,6 +51,7 @@
 #include <qlineedit.h>
 #include <qboxlayout.h>
 #include <qaction.h>
+#include <qwidgetaction.h>
 #include "../../shared/util.h"
 
 
@@ -153,6 +154,7 @@ private slots:
     void popupMouseGrabber();
     void windowFlags_data();
     void windowFlags();
+    void shortcutsDeletion();
 
     // Task fixes
     void task236127_bspTreeIndexFails();
@@ -2266,6 +2268,20 @@ void tst_QGraphicsWidget::windowFlags()
     QCOMPARE(widget5->windowFlags(), Qt::WindowFlags(outputFlags));
 }
 
+void tst_QGraphicsWidget::shortcutsDeletion()
+{
+    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsWidget *widget2 = new QGraphicsWidget;
+    widget->setMinimumSize(40, 40);
+    QWidgetAction *del = new QWidgetAction(widget);
+    del->setIcon(QIcon("edit-delete"));
+    del->setShortcut(Qt::Key_Delete);
+    del->setShortcutContext(Qt::WidgetShortcut);
+    widget2->addAction(del);
+    widget2->addAction(del);
+    delete widget;
+}
+
 class ProxyStyle : public QCommonStyle
 {
 public:
diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/qicon/tst_qicon.cpp
index 4e9a880..1dd223f 100644
--- a/tests/auto/qicon/tst_qicon.cpp
+++ b/tests/auto/qicon/tst_qicon.cpp
@@ -72,6 +72,8 @@ private slots:
     void svg();
     void addFile();
     void availableSizes();
+    void streamAvailableSizes_data();
+    void streamAvailableSizes();
 
     void task184901_badCache();
     void task223279_inconsistentAddFile();
@@ -540,6 +542,47 @@ void tst_QIcon::availableSizes()
     }
 }
 
+void tst_QIcon::streamAvailableSizes_data()
+{
+    QTest::addColumn<QIcon>("icon");
+
+    QIcon icon;
+    icon.addFile(":/image.png", QSize(32,32));
+    QTest::newRow( "32x32" ) << icon;
+    icon.addFile(":/image.png", QSize(64,64));
+    QTest::newRow( "64x64" ) << icon;
+    icon.addFile(":/image.png", QSize(128,128));
+    QTest::newRow( "128x128" ) << icon;
+    icon.addFile(":/image.png", QSize(256,256));
+    QTest::newRow( "256x256" ) << icon;
+}
+
+void tst_QIcon::streamAvailableSizes()
+{
+    QFETCH(QIcon, icon);
+
+    QByteArray ba;
+    // write to QByteArray
+    {
+        QBuffer buffer(&ba);
+        buffer.open(QIODevice::WriteOnly);
+        QDataStream stream(&buffer);
+        stream << icon;
+    }
+
+    // read from QByteArray
+    {
+        QBuffer buffer(&ba);
+        buffer.open(QIODevice::ReadOnly);
+        QDataStream stream(&buffer);
+        QIcon i;
+        stream >> i;
+        QCOMPARE(i.isNull(), icon.isNull());
+        QCOMPARE(i.availableSizes(), icon.availableSizes());
+    }
+}
+
+
 static inline bool operator<(const QSize &lhs, const QSize &rhs)
 {
     if (lhs.width() < rhs.width())
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index 87f9c13..af0f6cf 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -226,6 +226,7 @@ private slots:
     void extendedBlendModes();
 
     void zeroOpacity();
+    void clippingBug();
 
 private:
     void fillData();
@@ -4168,5 +4169,28 @@ void tst_QPainter::zeroOpacity()
     QCOMPARE(target.pixel(0, 0), 0xff000000);
 }
 
+void tst_QPainter::clippingBug()
+{
+    QImage img(32, 32, QImage::Format_ARGB32_Premultiplied);
+    img.fill(0);
+
+    QImage expected = img;
+    QPainter p(&expected);
+    p.fillRect(1, 1, 30, 30, Qt::red);
+    p.end();
+
+    QPainterPath path;
+    path.addRect(1, 1, 30, 30);
+    path.addRect(1, 1, 30, 30);
+    path.addRect(1, 1, 30, 30);
+
+    p.begin(&img);
+    p.setClipPath(path);
+    p.fillRect(0, 0, 32, 32, Qt::red);
+    p.end();
+
+    QCOMPARE(img, expected);
+}
+
 QTEST_MAIN(tst_QPainter)
 #include "tst_qpainter.moc"
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 5339fb4..fe60cd0 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -636,9 +636,21 @@ void tst_QScriptEngine::newQObject()
         QScriptValue val = ret.property("objectName");
         QVERIFY(val.isString());
     }
+    // "promote" variant object to QObject
+    {
+        QScriptValue obj = eng.newVariant(123);
+        QVERIFY(obj.isVariant());
+        QScriptValue originalProto = obj.prototype();
+        QScriptValue ret = eng.newQObject(obj, this);
+        QVERIFY(ret.isQObject());
+        QVERIFY(ret.strictlyEquals(obj));
+        QVERIFY(obj.isQObject());
+        QCOMPARE(ret.toQObject(), (QObject *)this);
+        QVERIFY(ret.prototype().strictlyEquals(originalProto));
+    }
     // replace QObject* of existing object
     {
-        QScriptValue object = eng.newQObject(this);
+        QScriptValue object = eng.newVariant(123);
         QScriptValue originalProto = object.prototype();
         QObject otherQObject;
         QScriptValue ret = eng.newQObject(object, &otherQObject);
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp
index 768a683..66e50ba 100644
--- a/tests/auto/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp
@@ -1768,6 +1768,34 @@ void tst_QStateMachine::signalTransitions()
         QState *s0 = new QState(machine.rootState());
         QFinalState *s1 = new QFinalState(machine.rootState());
         SignalEmitter emitter;
+        QSignalTransition *trans = s0->addTransition(&emitter, "signalWithNoArg()", s1);
+        QVERIFY(trans != 0);
+        QCOMPARE(trans->sourceState(), s0);
+        QCOMPARE(trans->targetState(), (QAbstractState*)s1);
+        QCOMPARE(trans->senderObject(), (QObject*)&emitter);
+        QCOMPARE(trans->signal(), QByteArray("signalWithNoArg()"));
+
+        QSignalSpy finishedSpy(&machine, SIGNAL(finished()));
+        machine.setInitialState(s0);
+        machine.start();
+        QCoreApplication::processEvents();
+
+        emitter.emitSignalWithNoArg();
+
+        QTRY_COMPARE(finishedSpy.count(), 1);
+
+        trans->setSignal("signalWithIntArg(int)");
+        QCOMPARE(trans->signal(), QByteArray("signalWithIntArg(int)"));
+        machine.start();
+        QCoreApplication::processEvents();
+        emitter.emitSignalWithIntArg(123);
+        QTRY_COMPARE(finishedSpy.count(), 2);
+    }
+    {
+        QStateMachine machine;
+        QState *s0 = new QState(machine.rootState());
+        QFinalState *s1 = new QFinalState(machine.rootState());
+        SignalEmitter emitter;
         TestSignalTransition *trans = new TestSignalTransition(&emitter, SIGNAL(signalWithIntArg(int)), s1);
         s0->addTransition(trans);
 
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 23ead01..3fad366 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -350,6 +350,9 @@ private slots:
     void updateOnDestroyedSignal();
     void toplevelLineEditFocus();
 
+    void focusWidget_task254563();
+    void focusWidget_mixed_widget_hierarchy();
+
 private:
     bool ensureScreenSize(int width, int height);
     QWidget *testWidget;
@@ -8977,5 +8980,37 @@ void tst_QWidget::toplevelLineEditFocus()
     QCOMPARE(QApplication::focusWidget(), &w);
 }
 
+void tst_QWidget::focusWidget_task254563()
+{
+    //having different visibility for widget is important
+    QWidget top;
+    top.show();
+    QWidget container(&top);
+    QWidget *widget = new QWidget(&container);
+    widget->show();
+
+    widget->setFocus(); //set focus (will set the focus widget up to the toplevel to be 'widget')
+    container.setFocus();
+    delete widget; // will call clearFocus but that doesn't help
+    QVERIFY(top.focusWidget() != widget); //dangling pointer
+}
+
+void tst_QWidget::focusWidget_mixed_widget_hierarchy()
+{
+    QWidget top;
+    top.show();
+    QWidget notvisible(&top);
+    QWidget *visible = new QWidget(&notvisible);
+    visible->show();
+
+    visible->setFocus();
+    notvisible.setFocus();
+    notvisible.show();
+    QCOMPARE(top.focusWidget(), visible);
+    QCOMPARE(notvisible.focusWidget(), visible);
+    QCOMPARE(visible->focusWidget(), visible);
+}
+
+
 QTEST_MAIN(tst_QWidget)
 #include "tst_qwidget.moc"
diff --git a/tests/auto/test.pl b/tests/auto/test.pl
index f2a1fe4..9fd5c9d 100755
--- a/tests/auto/test.pl
+++ b/tests/auto/test.pl
@@ -179,7 +179,7 @@ print " Tests started: $totalStarted \n";
 print " Tests executed: $totalExecuted \n";
 print " Tests timed out: $totalTimedOut \n";
 
-# This procedure takes care of handling death children on due time
+# This procedure takes care of handling dead children on due time
 sub handleDeath {
     $buryChildren = 1;
 }
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 937afa9..70289e2 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -9,6 +9,7 @@ SUBDIRS = containers-associative \
 	qpixmap \
 	blendbench \
 	qstringlist \
+        qmatrix4x4 \
 	qobject \
         qrect \
 	qregexp	\
diff --git a/tests/benchmarks/qmatrix4x4/qmatrix4x4.pro b/tests/benchmarks/qmatrix4x4/qmatrix4x4.pro
new file mode 100644
index 0000000..e82d9de
--- /dev/null
+++ b/tests/benchmarks/qmatrix4x4/qmatrix4x4.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_qmatrix4x4
+
+SOURCES += tst_qmatrix4x4.cpp
+
diff --git a/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp b/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp
new file mode 100644
index 0000000..5046b17
--- /dev/null
+++ b/tests/benchmarks/qmatrix4x4/tst_qmatrix4x4.cpp
@@ -0,0 +1,261 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtGui/qmatrix4x4.h>
+
+class tst_QMatrix4x4 : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QMatrix4x4() {}
+    ~tst_QMatrix4x4() {}
+
+private slots:
+    void multiply_data();
+    void multiply();
+
+    void multiplyInPlace_data();
+    void multiplyInPlace();
+
+    void multiplyDirect_data();
+    void multiplyDirect();
+
+    void mapVector3D_data();
+    void mapVector3D();
+
+    void mapVector2D_data();
+    void mapVector2D();
+
+    void mapVectorDirect_data();
+    void mapVectorDirect();
+};
+
+static qreal const generalValues[16] =
+    {1.0f, 2.0f, 3.0f, 4.0f,
+     5.0f, 6.0f, 7.0f, 8.0f,
+     9.0f, 10.0f, 11.0f, 12.0f,
+     13.0f, 14.0f, 15.0f, 16.0f};
+
+void tst_QMatrix4x4::multiply_data()
+{
+    QTest::addColumn<QMatrix4x4>("m1");
+    QTest::addColumn<QMatrix4x4>("m2");
+
+    QTest::newRow("identity * identity")
+        << QMatrix4x4() << QMatrix4x4();
+    QTest::newRow("identity * general")
+        << QMatrix4x4() << QMatrix4x4(generalValues);
+    QTest::newRow("general * identity")
+        << QMatrix4x4(generalValues) << QMatrix4x4();
+    QTest::newRow("general * general")
+        << QMatrix4x4(generalValues) << QMatrix4x4(generalValues);
+}
+
+QMatrix4x4 mresult;
+
+void tst_QMatrix4x4::multiply()
+{
+    QFETCH(QMatrix4x4, m1);
+    QFETCH(QMatrix4x4, m2);
+
+    QMatrix4x4 m3;
+
+    QBENCHMARK {
+        m3 = m1 * m2;
+    }
+
+    // Force the result to be stored so the compiler doesn't
+    // optimize away the contents of the benchmark loop.
+    mresult = m3;
+}
+
+void tst_QMatrix4x4::multiplyInPlace_data()
+{
+    multiply_data();
+}
+
+void tst_QMatrix4x4::multiplyInPlace()
+{
+    QFETCH(QMatrix4x4, m1);
+    QFETCH(QMatrix4x4, m2);
+
+    QMatrix4x4 m3;
+
+    QBENCHMARK {
+        m3 = m1;
+        m3 *= m2;
+    }
+
+    // Force the result to be stored so the compiler doesn't
+    // optimize away the contents of the benchmark loop.
+    mresult = m3;
+}
+
+// Use a direct naive multiplication algorithm.  This is used
+// to compare against the optimized routines to see if they are
+// actually faster than the naive implementation.
+void tst_QMatrix4x4::multiplyDirect_data()
+{
+    multiply_data();
+}
+void tst_QMatrix4x4::multiplyDirect()
+{
+    QFETCH(QMatrix4x4, m1);
+    QFETCH(QMatrix4x4, m2);
+
+    QMatrix4x4 m3;
+
+    const float *m1data = m1.constData();
+    const float *m2data = m2.constData();
+    float *m3data = m3.data();
+
+    QBENCHMARK {
+        for (int row = 0; row < 4; ++row) {
+            for (int col = 0; col < 4; ++col) {
+                m3data[col * 4 + row] = 0.0f;
+                for (int j = 0; j < 4; ++j) {
+                    m3data[col * 4 + row] +=
+                        m1data[j * 4 + row] * m2data[col * 4 + j];
+                }
+            }
+        }
+    }
+}
+
+QVector3D vresult;
+
+void tst_QMatrix4x4::mapVector3D_data()
+{
+    QTest::addColumn<QMatrix4x4>("m1");
+
+    QTest::newRow("identity") << QMatrix4x4();
+    QTest::newRow("general") << QMatrix4x4(generalValues);
+
+    QMatrix4x4 t1;
+    t1.translate(-100.5f, 64.0f, 75.25f);
+    QTest::newRow("translate3D") << t1;
+
+    QMatrix4x4 t2;
+    t2.translate(-100.5f, 64.0f);
+    QTest::newRow("translate2D") << t2;
+
+    QMatrix4x4 s1;
+    s1.scale(-100.5f, 64.0f, 75.25f);
+    QTest::newRow("scale3D") << s1;
+
+    QMatrix4x4 s2;
+    s2.scale(-100.5f, 64.0f);
+    QTest::newRow("scale2D") << s2;
+}
+void tst_QMatrix4x4::mapVector3D()
+{
+    QFETCH(QMatrix4x4, m1);
+
+    QVector3D v(10.5f, -2.0f, 3.0f);
+    QVector3D result;
+
+    m1.inferSpecialType();
+
+    QBENCHMARK {
+        result = m1 * v;
+    }
+
+    // Force the result to be stored so the compiler doesn't
+    // optimize away the contents of the benchmark loop.
+    vresult = result;
+}
+
+QPointF vresult2;
+
+void tst_QMatrix4x4::mapVector2D_data()
+{
+    mapVector3D_data();
+}
+void tst_QMatrix4x4::mapVector2D()
+{
+    QFETCH(QMatrix4x4, m1);
+
+    QPointF v(10.5f, -2.0f);
+    QPointF result;
+
+    m1.inferSpecialType();
+
+    QBENCHMARK {
+        result = m1 * v;
+    }
+
+    // Force the result to be stored so the compiler doesn't
+    // optimize away the contents of the benchmark loop.
+    vresult2 = result;
+}
+
+// Use a direct naive multiplication algorithm.  This is used
+// to compare against the optimized routines to see if they are
+// actually faster than the naive implementation.
+void tst_QMatrix4x4::mapVectorDirect_data()
+{
+    mapVector3D_data();
+}
+void tst_QMatrix4x4::mapVectorDirect()
+{
+    QFETCH(QMatrix4x4, m1);
+
+    const float *m1data = m1.constData();
+    float v[4] = {10.5f, -2.0f, 3.0f, 1.0f};
+    float result[4];
+
+    QBENCHMARK {
+        for (int row = 0; row < 4; ++row) {
+            result[row] = 0.0f;
+            for (int col = 0; col < 4; ++col) {
+                result[row] += m1data[col * 4 + row] * v[col];
+            }
+        }
+        result[0] /= result[3];
+        result[1] /= result[3];
+        result[2] /= result[3];
+    }
+}
+
+QTEST_MAIN(tst_QMatrix4x4)
+
+#include "tst_qmatrix4x4.moc"
diff --git a/tests/benchmarks/qstringbuilder/main.cpp b/tests/benchmarks/qstringbuilder/main.cpp
index 8eb4e78..8b769a6 100644
--- a/tests/benchmarks/qstringbuilder/main.cpp
+++ b/tests/benchmarks/qstringbuilder/main.cpp
@@ -1,17 +1,66 @@
 
-#include "qstringbuilder.h"
+// Select one of the scenarios below
+#define SCENARIO 1
+
+#if SCENARIO == 1
+// this is the "no harm done" version. Only operator% is active,
+// with NO_CAST * defined
+#define P %
+#undef QT_USE_FAST_OPERATOR_PLUS
+#undef QT_USE_FAST_CONCATENATION
+#define QT_NO_CAST_FROM_ASCII
+#define QT_NO_CAST_TO_ASCII
+#endif
+
+
+#if SCENARIO == 2
+// this is the "full" version. Operator+ is replaced by a QStringBuilder
+// based version
+// with NO_CAST * defined
+#define P +
+#define QT_USE_FAST_OPERATOR_PLUS
+#define QT_USE_FAST_CONCATENATION
+#define QT_NO_CAST_FROM_ASCII
+#define QT_NO_CAST_TO_ASCII
+#endif
+
+#if SCENARIO == 3
+// this is the "no harm done" version. Only operator% is active,
+// with NO_CAST * _not_ defined
+#define P %
+#undef QT_USE_FAST_OPERATOR_PLUS
+#undef QT_USE_FAST_CONCATENATION
+#undef QT_NO_CAST_FROM_ASCII
+#undef QT_NO_CAST_TO_ASCII
+#endif
+
+#if SCENARIO == 4
+// this is the "full" version. Operator+ is replaced by a QStringBuilder
+// based version
+// with NO_CAST * _not_ defined
+#define P +
+#define QT_USE_FAST_OPERATOR_PLUS
+#define QT_USE_FAST_CONCATENATION
+#undef QT_NO_CAST_FROM_ASCII
+#undef QT_NO_CAST_TO_ASCII
+#endif
 
-#include <QDebug>
-#include <QString>
+
+#include <qbytearray.h>
+#include <qdebug.h>
+#include <qstring.h>
+#include <qstringbuilder.h>
 
 #include <qtest.h>
 
+#include <string>
 
 #define COMPARE(a, b) QCOMPARE(a, b)
 //#define COMPARE(a, b)
 
 #define SEP(s) qDebug() << "\n\n-------- " s "  ---------";
-#define L(s) QLatin1String(s)
+
+#define LITERAL "some string literal"
 
 class tst_qstringbuilder : public QObject
 {
@@ -19,12 +68,17 @@ class tst_qstringbuilder : public QObject
 
 public:
     tst_qstringbuilder()
-      : l1literal("some string literal"),
-        l1string("some string literal"),
-        ba("some string literal"),
+      : l1literal(LITERAL),
+        l1string(LITERAL),
+        ba(LITERAL),
         string(l1string),
+        stdstring(LITERAL),
         stringref(&string, 2, 10),
-        achar('c')
+        achar('c'),
+        r2(QLatin1String(LITERAL LITERAL)),
+        r3(QLatin1String(LITERAL LITERAL LITERAL)),
+        r4(QLatin1String(LITERAL LITERAL LITERAL LITERAL)),
+        r5(QLatin1String(LITERAL LITERAL LITERAL LITERAL LITERAL))
     {}
 
 
@@ -51,10 +105,10 @@ public:
         int s = 0;
         for (int i = 0; i < N; ++i) {
 #if 0
-            s += QString(l1literal % l1literal).size();
-            s += QString(l1literal % l1literal % l1literal).size();
-            s += QString(l1literal % l1literal % l1literal % l1literal).size();
-            s += QString(l1literal % l1literal % l1literal % l1literal % l1literal).size();
+            s += QString(l1literal P l1literal).size();
+            s += QString(l1literal P l1literal P l1literal).size();
+            s += QString(l1literal P l1literal P l1literal P l1literal).size();
+            s += QString(l1literal P l1literal P l1literal P l1literal P l1literal).size();
 #endif
             s += QString(achar % l1literal % achar).size();
         }
@@ -64,31 +118,42 @@ public:
 private slots:
 
     void separator_0() {
-        qDebug() << "\nIn each block the QStringBuilder based result appear first, "
-            "QStringBased second.\n";
+        qDebug() << "\nIn each block the QStringBuilder based result appear first "
+            "(with a 'b_' prefix), QStringBased second ('q_' prefix), std::string "
+            "last ('s_' prefix)\n";
     }
 
     void separator_1() { SEP("literal + literal  (builder first)"); }
 
     void b_2_l1literal() {
-        QBENCHMARK { r = l1literal % l1literal; }
-        COMPARE(r, QString(l1string + l1string));
+        QBENCHMARK { r = l1literal P l1literal; }
+        COMPARE(r, r2);
     }
-    void s_2_l1string() {
+    #ifndef QT_NO_CAST_FROM_ASCII
+    void b_l1literal_LITERAL() {
+        QBENCHMARK { r = l1literal P LITERAL; }
+        COMPARE(r, r2);
+    }
+    #endif
+    void q_2_l1string() {
         QBENCHMARK { r = l1string + l1string; }
-        COMPARE(r, QString(l1literal % l1literal));
+        COMPARE(r, r2);
     }
 
 
     void separator_2() { SEP("2 strings"); }
 
     void b_2_string() {
-        QBENCHMARK { r = string % string; }
-        COMPARE(r, QString(string + string));
+        QBENCHMARK { r = string P string; }
+        COMPARE(r, r2);
     }
-    void s_2_string() {
+    void q_2_string() {
         QBENCHMARK { r = string + string; }
-        COMPARE(r, QString(string % string));
+        COMPARE(r, r2);
+    }
+    void s_2_string() {
+        QBENCHMARK { stdr = stdstring + stdstring; }
+        COMPARE(stdr, stdstring + stdstring);
     }
 
 
@@ -98,7 +163,7 @@ private slots:
         QBENCHMARK { r = stringref % stringref; }
         COMPARE(r, QString(stringref.toString() + stringref.toString()));
     }
-    void s_2_stringref() {
+    void q_2_stringref() {
         QBENCHMARK { r = stringref.toString() + stringref.toString(); }
         COMPARE(r, QString(stringref % stringref));
     }
@@ -107,69 +172,107 @@ private slots:
     void separator_2b() { SEP("3 strings"); }
 
     void b_3_string() {
-        QBENCHMARK { r = string % string % string; }
-        COMPARE(r, QString(string + string + string));
+        QBENCHMARK { r = string P string P string; }
+        COMPARE(r, r3);
     }
-    void s_3_string() {
+    void q_3_string() {
         QBENCHMARK { r = string + string + string; }
-        COMPARE(r, QString(string % string % string));
+        COMPARE(r, r3);
+    }
+    void s_3_string() {
+        QBENCHMARK { stdr = stdstring + stdstring + stdstring; }
+        COMPARE(stdr, stdstring + stdstring + stdstring);
     }
 
+    void separator_2e() { SEP("4 strings"); }
+
+    void b_4_string() {
+        QBENCHMARK { r = string P string P string P string; }
+        COMPARE(r, r4);
+    }
+    void q_4_string() {
+        QBENCHMARK { r = string + string + string + string; }
+        COMPARE(r, r4);
+    }
+    void s_4_string() {
+        QBENCHMARK { stdr = stdstring + stdstring + stdstring + stdstring; }
+        COMPARE(stdr, stdstring + stdstring + stdstring + stdstring);
+    }
+
+
 
     void separator_2a() { SEP("string + literal  (builder first)"); }
 
     void b_string_l1literal() {
         QBENCHMARK { r = string % l1literal; }
-        COMPARE(r, QString(string + l1string));
+        COMPARE(r, r2);
+    }
+    #ifndef QT_NO_CAST_FROM_ASCII
+    void b_string_LITERAL() {
+        QBENCHMARK { r = string P LITERAL; }
+        COMPARE(r, r2);
+    }
+    void b_LITERAL_string() {
+        QBENCHMARK { r = LITERAL P string; }
+        COMPARE(r, r2);
     }
+    #endif
     void b_string_l1string() {
-        QBENCHMARK { r = string % l1string; }
-        COMPARE(r, QString(string + l1string));
+        QBENCHMARK { r = string P l1string; }
+        COMPARE(r, r2);
     }
-    void s_string_l1literal() {
+    void q_string_l1literal() {
         QBENCHMARK { r = string + l1string; }
-        COMPARE(r, QString(string % l1literal));
+        COMPARE(r, r2);
     }
-    void s_string_l1string() {
+    void q_string_l1string() {
         QBENCHMARK { r = string + l1string; }
-        COMPARE(r, QString(string % l1literal));
+        COMPARE(r, r2);
+    }
+    void s_LITERAL_string() {
+        QBENCHMARK { stdr = LITERAL + stdstring; }
+        COMPARE(stdr, stdstring + stdstring);
     }
 
 
     void separator_3() { SEP("3 literals"); }
 
     void b_3_l1literal() {
-        QBENCHMARK { r = l1literal % l1literal % l1literal; }
-        COMPARE(r, QString(l1string + l1string + l1string));
+        QBENCHMARK { r = l1literal P l1literal P l1literal; }
+        COMPARE(r, r3);
     }
-    void s_3_l1string() {
+    void q_3_l1string() {
         QBENCHMARK { r = l1string + l1string + l1string; }
-        COMPARE(r, QString(l1literal % l1literal % l1literal));
+        COMPARE(r, r3);
+    }
+    void s_3_l1string() {
+        QBENCHMARK { stdr = stdstring + LITERAL + LITERAL; }
+        COMPARE(stdr, stdstring + stdstring + stdstring);
     }
 
 
     void separator_4() { SEP("4 literals"); }
 
     void b_4_l1literal() {
-        QBENCHMARK { r = l1literal % l1literal % l1literal % l1literal; }
-        COMPARE(r, QString(l1string + l1string + l1string + l1string));
+        QBENCHMARK { r = l1literal P l1literal P l1literal P l1literal; }
+        COMPARE(r, r4);
     }
-    void s_4_l1string() {
+    void q_4_l1string() {
         QBENCHMARK { r = l1string + l1string + l1string + l1string; }
-        COMPARE(r, QString(l1literal % l1literal % l1literal % l1literal));
+        COMPARE(r, r4);
     }
 
 
     void separator_5() { SEP("5 literals"); }
 
     void b_5_l1literal() {
-        QBENCHMARK { r = l1literal % l1literal % l1literal % l1literal %l1literal; }
-        COMPARE(r, QString(l1string + l1string + l1string + l1string + l1string));
+        QBENCHMARK { r = l1literal P l1literal P l1literal P l1literal P l1literal; }
+        COMPARE(r, r5);
     }
 
-    void s_5_l1string() {
+    void q_5_l1string() {
         QBENCHMARK { r = l1string + l1string + l1string + l1string + l1string; }
-        COMPARE(r, QString(l1literal % l1literal % l1literal % l1literal % l1literal));
+        COMPARE(r, r5);
     }
 
 
@@ -177,12 +280,17 @@ private slots:
 
     void b_string_4_char() {
         QBENCHMARK { r = string + achar + achar + achar + achar; }
-        COMPARE(r, QString(string % achar % achar % achar % achar));
+        COMPARE(r, QString(string P achar P achar P achar P achar));
     }
 
-    void s_string_4_char() {
+    void q_string_4_char() {
         QBENCHMARK { r = string + achar + achar + achar + achar; }
-        COMPARE(r, QString(string % achar % achar % achar % achar));
+        COMPARE(r, QString(string P achar P achar P achar P achar));
+    }
+
+    void s_string_4_char() {
+        QBENCHMARK { stdr = stdstring + 'c' + 'c' + 'c' + 'c'; }
+        COMPARE(stdr, stdstring + 'c' + 'c' + 'c' + 'c');
     }
 
 
@@ -190,29 +298,35 @@ private slots:
 
     void b_char_string_char() {
         QBENCHMARK { r = achar + string + achar; }
-        COMPARE(r, QString(achar % string % achar));
+        COMPARE(r, QString(achar P string P achar));
     }
 
-    void s_char_string_char() {
+    void q_char_string_char() {
         QBENCHMARK { r = achar + string + achar; }
-        COMPARE(r, QString(achar % string % achar));
+        COMPARE(r, QString(achar P string P achar));
     }
 
+    void s_char_string_char() {
+        QBENCHMARK { stdr = 'c' + stdstring + 'c'; }
+        COMPARE(stdr, 'c' + stdstring + 'c');
+    }
+
+
     void separator_8() { SEP("string.arg"); }
 
     void b_string_arg() {
-        const QString pattern = l1string + QLatin1String("%1") + l1string;
-        QBENCHMARK { r = l1literal % string % l1literal; }
-        COMPARE(r, QString(l1string + string + l1string));
+        const QString pattern = l1string + QString::fromLatin1("%1") + l1string;
+        QBENCHMARK { r = l1literal P string P l1literal; }
+        COMPARE(r, r3);
     }
 
-    void s_string_arg() {
+    void q_string_arg() {
         const QString pattern = l1string + QLatin1String("%1") + l1string;
         QBENCHMARK { r = pattern.arg(string); }
-        COMPARE(r, QString(l1string + string + l1string));
+        COMPARE(r, r3);
     }
 
-    void s_bytearray_arg() {
+    void q_bytearray_arg() {
         QByteArray result;
         QBENCHMARK { result = ba + ba + ba; }
     }
@@ -223,16 +337,16 @@ private slots:
     void b_reserve() {
         QBENCHMARK {
             r.clear();
-            r = string % string % string % string;
+            r = string P string P string P string;
         }
-        COMPARE(r, QString(string + string + string + string));
+        COMPARE(r, r4);
     }
     void b_reserve_lit() {
         QBENCHMARK {
             r.clear();
-            r = string % l1literal % string % string;
+            r = string P l1literal P string P string;
         }
-        COMPARE(r, QString(string + string + string + string));
+        COMPARE(r, r4);
     }
     void s_reserve() {
         QBENCHMARK {
@@ -243,7 +357,7 @@ private slots:
             r += string;
             r += string;
         }
-        COMPARE(r, QString(string + string + string + string));
+        COMPARE(r, r4);
     }
     void s_reserve_lit() {
         QBENCHMARK {
@@ -256,7 +370,7 @@ private slots:
             r += string;
             r += string;
         }
-        COMPARE(r, QString(string + string + string + string));
+        COMPARE(r, r4);
     }
 
 private:
@@ -264,10 +378,14 @@ private:
     const QLatin1String l1string;
     const QByteArray ba;
     const QString string;
+    const std::string stdstring;
     const QStringRef stringref;
     const QLatin1Char achar;
+    const QString r2, r3, r4, r5;
 
+    // short cuts for results
     QString r;
+    std::string stdr;
 };
 
 
@@ -280,12 +398,14 @@ int main(int argc, char *argv[])
     //QString("x") % 2; // Sanity test, should only compile when the 
     // operator%(QString, int) is visible.
 
-    if (argc == 2 && (argv[1] == L("--run-builder") || argv[1] == L("-b"))) {
+    if (argc == 2 && (QLatin1String(argv[1]) == QLatin1String("--run-builder")
+                   || QLatin1String(argv[1]) == QLatin1String("-b"))) {
         tst_qstringbuilder test;
         return test.run_builder();
     }
 
-    if (argc == 2 && (argv[1] == L("--run-traditional") || argv[1] == L("-t"))) {
+    if (argc == 2 && (QLatin1String(argv[1]) == QLatin1String("--run-traditional")
+                   || QLatin1String(argv[1]) == QLatin1String("-t"))) {
         tst_qstringbuilder test;
         return test.run_traditional();
     }
diff --git a/tests/benchmarks/qstringbuilder/qstringbuilder.pro b/tests/benchmarks/qstringbuilder/qstringbuilder.pro
index 02daaaa..79171b4 100644
--- a/tests/benchmarks/qstringbuilder/qstringbuilder.pro
+++ b/tests/benchmarks/qstringbuilder/qstringbuilder.pro
@@ -2,10 +2,6 @@ load(qttest_p4)
 TEMPLATE = app
 TARGET = tst_qstringbuilder
 
-# Uncomment to test compilation of the drop-in
-# replacement operator+()
-#DEFINES += QT_USE_FAST_OPERATOR_PLUS
-
 QMAKE_CXXFLAGS += -g
 QMAKE_CFLAGS += -g
 
diff --git a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
index 2a9d146..3dba45a 100644
--- a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
+++ b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
@@ -29,6 +29,14 @@
 #include <QtCore/QChar>
 #include <QtCore/QString>
 
+#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+#   if !defined(TCHAR)
+#       define TCHAR wchar_t
+#   endif
+#else
+#   include <windows.h>
+#endif
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -87,14 +95,6 @@ QT_BEGIN_NAMESPACE
 #   define CL_NS2(sub,sub2)
 #endif
 
-#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
-#   if !defined(TCHAR)
-#       define TCHAR wchar_t
-#   endif
-#else
-#   include <windows.h>
-#endif
-
 namespace {
     TCHAR* QStringToTChar(const QString &str)
     {
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 8c2405e..9feb90a 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3440,12 +3440,15 @@ void Configure::readLicense()
     dictionary[ "PLATFORM NAME" ]   = (QFile::exists(dictionary["QT_SOURCE_TREE"] + "/src/corelib/kernel/qfunctions_wince.h")
                                       && (dictionary.value("QMAKESPEC").startsWith("wince") || dictionary.value("XQMAKESPEC").startsWith("wince")))
                                         ? "Qt for Windows CE" : "Qt for Windows";
+    dictionary["LICENSE FILE"] = sourcePath;
+
     bool openSource = false;
+    bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL");
     if (dictionary["BUILDNOKIA"] == "yes" || dictionary["BUILDTYPE"] == "commercial") {
         openSource = false;
     } else if (dictionary["BUILDTYPE"] == "opensource") {
         openSource = true;
-    } else {
+    } else if (hasOpenSource) { // No Open Source? Just display the commercial license right away
         forever {
             char accept = '?';
             cout << "Which edition of Qt do you want to use ?" << endl;
@@ -3463,28 +3466,23 @@ void Configure::readLicense()
             }
         }
     }
-    if (openSource) {
-        dictionary["LICENSE FILE"] = sourcePath;
-        if (QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL")) {
-            cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " Open Source Edition." << endl;
-            licenseInfo["LICENSEE"] = "Open Source";
-            dictionary["EDITION"] = "OpenSource";
-            dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE";
-            cout << endl;
-            if (!showLicense(dictionary["LICENSE FILE"])) {
-                cout << "Configuration aborted since license was not accepted";
-                dictionary["DONE"] = "error";
-                return;
-            }
+    if (hasOpenSource && openSource) {
+        cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " Open Source Edition." << endl;
+        licenseInfo["LICENSEE"] = "Open Source";
+        dictionary["EDITION"] = "OpenSource";
+        dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE";
+        cout << endl;
+        if (!showLicense(dictionary["LICENSE FILE"])) {
+            cout << "Configuration aborted since license was not accepted";
+            dictionary["DONE"] = "error";
             return;
         }
-#ifndef COMMERCIAL_VERSION
-    else {
-        cout << endl << "Cannot find the GPL license files!" << endl;
+    } else if (openSource) {
+        cout << endl << "Cannot find the GPL license files! Please download the Open Source version of the library." << endl;
         dictionary["DONE"] = "error";
     }
-#else
-    } else {
+#ifdef COMMERCIAL_VERSION
+    else {
         Tools::checkLicense(dictionary, licenseInfo, firstLicensePath());
         if (dictionary["DONE"] != "error" && dictionary["BUILDNOKIA"] != "yes") {
             // give the user some feedback, and prompt for license acceptance
@@ -3496,7 +3494,12 @@ void Configure::readLicense()
             }
         }
     }
-#endif // COMMERCIAL_VERSION
+#else // !COMMERCIAL_VERSION
+    else {
+        cout << endl << "Cannot build commercial edition from the open source version of the library." << endl;
+        dictionary["DONE"] = "error";
+    }
+#endif
 }
 
 void Configure::reloadCmdLine()
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index 4dae28e..c5aefb1 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -403,6 +403,7 @@ QAction *QAbstractFormBuilder::create(DomAction *ui_action, QObject *parent)
     if (!a)
         return 0;
 
+    m_actions.insert(ui_action->attributeName(), a);
     applyProperties(a, ui_action->elementProperty());
     return a;
 }
@@ -415,7 +416,7 @@ QActionGroup *QAbstractFormBuilder::create(DomActionGroup *ui_action_group, QObj
     QActionGroup *a = createActionGroup(parent, ui_action_group->attributeName());
     if (!a)
         return 0;
-
+    m_actionGroups.insert(ui_action_group->attributeName(), a);
     applyProperties(a, ui_action_group->elementProperty());
 
     foreach (DomAction *ui_action, ui_action_group->elementAction()) {
@@ -1184,8 +1185,6 @@ QAction *QAbstractFormBuilder::createAction(QObject *parent, const QString &name
 {
     QAction *action = new QAction(parent);
     action->setObjectName(name);
-    m_actions.insert(name, action);
-
     return action;
 }
 
@@ -1196,8 +1195,6 @@ QActionGroup *QAbstractFormBuilder::createActionGroup(QObject *parent, const QSt
 {
     QActionGroup *g = new QActionGroup(parent);
     g->setObjectName(name);
-    m_actionGroups.insert(name, g);
-
     return g;
 }
 
diff --git a/tools/designer/src/lib/uilib/formbuilder.cpp b/tools/designer/src/lib/uilib/formbuilder.cpp
index 414eb14..53d1e9d 100644
--- a/tools/designer/src/lib/uilib/formbuilder.cpp
+++ b/tools/designer/src/lib/uilib/formbuilder.cpp
@@ -120,7 +120,10 @@ QFormBuilder::~QFormBuilder()
 */
 QWidget *QFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidget)
 {
-    QFormBuilderExtra::instance(this)->setProcessingLayoutWidget(false);
+    QFormBuilderExtra *fb = QFormBuilderExtra::instance(this);
+    if (!fb->parentWidgetIsSet())
+        fb->setParentWidget(parentWidget);
+    fb->setProcessingLayoutWidget(false);
     if (ui_widget->attributeClass() == QFormBuilderStrings::instance().qWidgetClass && !ui_widget->hasAttributeNative()
             && parentWidget
 #ifndef QT_NO_MAINWINDOW
@@ -145,7 +148,7 @@ QWidget *QFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidget)
             && !qobject_cast<QDockWidget *>(parentWidget)
 #endif
             )
-        QFormBuilderExtra::instance(this)->setProcessingLayoutWidget(true);
+        fb->setProcessingLayoutWidget(true);
     return QAbstractFormBuilder::create(ui_widget, parentWidget);
 }
 
@@ -228,9 +231,6 @@ QWidget *QFormBuilder::createWidget(const QString &widgetName, QWidget *parentWi
     if (qobject_cast<QDialog *>(w))
         w->setParent(parentWidget);
 
-    if (!fb->rootWidget())
-        fb->setRootWidget(w);
-
     return w;
 }
 
@@ -369,9 +369,10 @@ QWidget *QFormBuilder::create(DomUI *ui, QWidget *parentWidget)
 */
 QLayout *QFormBuilder::create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget)
 {
+    QFormBuilderExtra *fb = QFormBuilderExtra::instance(this);
     // Is this a temporary layout widget used to represent QLayout hierarchies in Designer?
     // Set its margins to 0.
-    bool layoutWidget = QFormBuilderExtra::instance(this)->processingLayoutWidget();
+    bool layoutWidget = fb->processingLayoutWidget();
     QLayout *l = QAbstractFormBuilder::create(ui_layout, layout, parentWidget);
     if (layoutWidget) {
         const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
@@ -392,7 +393,7 @@ QLayout *QFormBuilder::create(DomLayout *ui_layout, QLayout *layout, QWidget *pa
             bottom = prop->elementNumber();
 
         l->setContentsMargins(left, top, right, bottom);
-        QFormBuilderExtra::instance(this)->setProcessingLayoutWidget(false);
+        fb->setProcessingLayoutWidget(false);
     }
     return l;
 }
@@ -525,6 +526,7 @@ QList<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const
 /*!
     \internal
 */
+
 void QFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &properties)
 {
     typedef QList<DomProperty*> DomPropertyList;
@@ -542,11 +544,12 @@ void QFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &proper
             continue;
 
         const QString attributeName = (*it)->attributeName();
-        if (o == fb->rootWidget() && attributeName == strings.geometryProperty) {
-            // apply only the size for the rootWidget
-            fb->rootWidget()->resize(qvariant_cast<QRect>(v).size());
+        const bool isWidget = o->isWidgetType();
+        if (isWidget && o->parent() == fb->parentWidget() && attributeName == strings.geometryProperty) {
+            // apply only the size part of a geometry for the root widget
+            static_cast<QWidget*>(o)->resize(qvariant_cast<QRect>(v).size());
         } else if (fb->applyPropertyInternally(o, attributeName, v)) {
-        } else if (!qstrcmp("QFrame", o->metaObject()->className ()) && attributeName == strings.orientationProperty) {
+        } else if (isWidget && !qstrcmp("QFrame", o->metaObject()->className ()) && attributeName == strings.orientationProperty) {
             // ### special-casing for Line (QFrame) -- try to fix me
             o->setProperty("frameShape", v); // v is of QFrame::Shape enum
         } else {
diff --git a/tools/designer/src/lib/uilib/formbuilderextra.cpp b/tools/designer/src/lib/uilib/formbuilderextra.cpp
index cb82967..38fe2ae 100644
--- a/tools/designer/src/lib/uilib/formbuilderextra.cpp
+++ b/tools/designer/src/lib/uilib/formbuilderextra.cpp
@@ -81,7 +81,8 @@ QFormBuilderExtra::~QFormBuilderExtra()
 void QFormBuilderExtra::clear()
 {
     m_buddies.clear();
-    m_rootWidget = 0;
+    m_parentWidget = 0;
+    m_parentWidgetIsSet = false;
 #ifndef QT_FORMBUILDER_NO_SCRIPT
     m_FormScriptRunner.clearErrors();
     m_customWidgetScriptHash.clear();
@@ -136,14 +137,21 @@ bool QFormBuilderExtra::applyBuddy(const QString &buddyName, BuddyMode applyMode
     return false;
 }
 
-const QPointer<QWidget> &QFormBuilderExtra::rootWidget() const
+const QPointer<QWidget> &QFormBuilderExtra::parentWidget() const
 {
-    return m_rootWidget;
+    return m_parentWidget;
 }
 
-void QFormBuilderExtra::setRootWidget(const QPointer<QWidget> &w)
+bool QFormBuilderExtra::parentWidgetIsSet() const
 {
-    m_rootWidget = w;
+    return m_parentWidgetIsSet;
+}
+
+void QFormBuilderExtra::setParentWidget(const QPointer<QWidget> &w)
+{
+    // Parent widget requires special handling of the geometry property.
+    m_parentWidget = w;
+    m_parentWidgetIsSet = true;
 }
 
 #ifndef QT_FORMBUILDER_NO_SCRIPT
diff --git a/tools/designer/src/lib/uilib/formbuilderextra_p.h b/tools/designer/src/lib/uilib/formbuilderextra_p.h
index f357239..9166c48 100644
--- a/tools/designer/src/lib/uilib/formbuilderextra_p.h
+++ b/tools/designer/src/lib/uilib/formbuilderextra_p.h
@@ -101,8 +101,9 @@ public:
     void applyInternalProperties() const;
     static bool applyBuddy(const QString &buddyName, BuddyMode applyMode, QLabel *label);
 
-    const QPointer<QWidget> &rootWidget() const;
-    void setRootWidget(const QPointer<QWidget> &w);
+    const QPointer<QWidget> &parentWidget() const;
+    bool parentWidgetIsSet() const;
+    void setParentWidget(const QPointer<QWidget> &w);
 
 #ifndef QT_FORMBUILDER_NO_SCRIPT
     QFormScriptRunner &formScriptRunner();
@@ -182,7 +183,8 @@ private:
     QResourceBuilder *m_resourceBuilder;
     QTextBuilder *m_textBuilder;
 
-    QPointer<QWidget> m_rootWidget;
+    QPointer<QWidget> m_parentWidget;
+    bool m_parentWidgetIsSet;
 };
 
 void uiLibWarning(const QString &message);
diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitools/quiloader.cpp
index 2a66095..c6c2d80 100644
--- a/tools/designer/src/uitools/quiloader.cpp
+++ b/tools/designer/src/uitools/quiloader.cpp
@@ -613,8 +613,7 @@ void QUiLoaderPrivate::setupWidgetMap() const
     reason, you can subclass the QUiLoader class and reimplement these
     functions to intervene the process of constructing a user interface. For
     example, you might want to have a list of the actions created when loading
-    a form or creating a custom widget. However, in your reimplementation, you
-    must call QUiLoader's original implementation of these functions first.
+    a form or creating a custom widget.
 
     For a complete example using the QUiLoader class, see the
     \l{Calculator Builder Example}.
diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp
index f0ff27e..20b37a0 100644
--- a/tools/qdoc3/codeparser.cpp
+++ b/tools/qdoc3/codeparser.cpp
@@ -47,6 +47,7 @@
 #include "codeparser.h"
 #include "node.h"
 #include "tree.h"
+#include "config.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -67,6 +68,7 @@ QT_BEGIN_NAMESPACE
 #define COMMAND_TITLE                   Doc::alias(QLatin1String("title"))
 
 QList<CodeParser *> CodeParser::parsers;
+bool CodeParser::showInternal = false;
 
 /*!
   The constructor adds this code parser to the static
@@ -87,11 +89,11 @@ CodeParser::~CodeParser()
 }
 
 /*!
-  Initializing a code parser is trivial.
+  Initialize the code parser base class.
  */
-void CodeParser::initializeParser(const Config & /* config */)
+void CodeParser::initializeParser(const Config& config)
 {
-    // nothing.
+    showInternal = config.getBool(QLatin1String(CONFIG_SHOWINTERNAL));
 }
 
 /*!
@@ -217,8 +219,10 @@ void CodeParser::processCommonMetaCommand(const Location &location,
 	node->setStatus(Node::Preliminary);
     }
     else if (command == COMMAND_INTERNAL) {
-	node->setAccess(Node::Private);
-        node->setStatus(Node::Internal);
+        if (!showInternal) {
+            node->setAccess(Node::Private);
+            node->setStatus(Node::Internal);
+        }
     }
     else if (command == COMMAND_REENTRANT) {
 	node->setThreadSafeness(Node::Reentrant);
diff --git a/tools/qdoc3/codeparser.h b/tools/qdoc3/codeparser.h
index 019e806..0152b9c 100644
--- a/tools/qdoc3/codeparser.h
+++ b/tools/qdoc3/codeparser.h
@@ -87,6 +87,7 @@ class CodeParser
 
  private:
     static QList<CodeParser *> parsers;
+    static bool showInternal;
 };
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/config.h b/tools/qdoc3/config.h
index 9443f0d..7eb7048 100644
--- a/tools/qdoc3/config.h
+++ b/tools/qdoc3/config.h
@@ -147,6 +147,7 @@ class Config
 #define CONFIG_QHP                      "qhp"
 #define CONFIG_QUOTINGINFORMATION       "quotinginformation"
 #define CONFIG_SLOW                     "slow"
+#define CONFIG_SHOWINTERNAL             "showinternal"
 #define CONFIG_SOURCEDIRS               "sourcedirs"
 #define CONFIG_SOURCES                  "sources"
 #define CONFIG_SPURIOUS                 "spurious"
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index c2d2d22..007f62a 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1158,16 +1158,14 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
                 QStringList names;
                 names << (*m)->name();
                 if ((*m)->type() == Node::Function) {
-                    const FunctionNode *func =
-                        reinterpret_cast<const FunctionNode *>(*m);
+                    const FunctionNode *func = reinterpret_cast<const FunctionNode *>(*m);
                     if (func->metaness() == FunctionNode::Ctor ||
-                        func->metaness() == FunctionNode::Dtor
-                            || func->overloadNumber() != 1)
+                        func->metaness() == FunctionNode::Dtor ||
+                        func->overloadNumber() != 1)
                         names.clear();
                 }
                 else if ((*m)->type() == Node::Property) {
-                    const PropertyNode *prop =
-                        reinterpret_cast<const PropertyNode *>(*m);
+                    const PropertyNode *prop = reinterpret_cast<const PropertyNode *>(*m);
                     if (!prop->getters().isEmpty() &&
                         !names.contains(prop->getters().first()->name()))
                         names << prop->getters().first()->name();
@@ -1177,14 +1175,13 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
                         names << prop->resetters().first()->name();
                 }
                 else if ((*m)->type() == Node::Enum) {
-                    const EnumNode *enume =
-                        reinterpret_cast<const EnumNode *>(*m);
+                    const EnumNode *enume = reinterpret_cast<const EnumNode*>(*m);
                     if (enume->flagsType())
                         names << enume->flagsType()->name();
 
                     foreach (const QString &enumName,
-                             enume->doc().enumItemNames().toSet()
-                             - enume->doc().omitEnumItemNames().toSet())
+                             enume->doc().enumItemNames().toSet() -
+                             enume->doc().omitEnumItemNames().toSet())
                         names << plainCode(marker->markedUpEnumValue(enumName,
                                                                      enume));
                 }
@@ -2365,7 +2362,7 @@ void HtmlGenerator::generateSectionList(const Section& section,
         }
         if (name_alignment) {
             out() << "<table border=\"0\" cellpadding=\"0\" "
-                  << "cellspacing=\"0\">\n";
+                  << "cellspacing=\"0\" width=\"100%\">\n";
         }
         else {
             if (twoColumn)
@@ -2501,8 +2498,8 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
     static const QString linkTag("link");
     for (int i = 0, n = src.size(); i < n;) {
         if (src.at(i) == charLangle && src.at(i + 1).unicode() == '@') {
-            if (nameAlignment && (i != 0))
-                html += "&nbsp;</td><td class=\"memItemRight\" valign=\"bottom\">";
+            if (nameAlignment) // && (i != 0)) Why was this here?
+                html += "</td><td class=\"memItemRight\" valign=\"bottom\">";
             i += 2;
             if (parseArg(src, linkTag, &i, n, &arg, &par1)) {
                 QString link = linkForNode(
@@ -3314,7 +3311,8 @@ void HtmlGenerator::findAllClasses(const InnerNode *node)
         if ((*c)->access() != Node::Private && (*c)->url().isEmpty()) {
             if ((*c)->type() == Node::Class && !(*c)->doc().isEmpty()) {
                 QString className = (*c)->name();
-                if ((*c)->parent() && (*c)->parent()->type() == Node::Namespace &&
+                if ((*c)->parent() &&
+                    (*c)->parent()->type() == Node::Namespace &&
                     !(*c)->parent()->name().isEmpty())
                     className = (*c)->parent()->name()+"::"+className;
 
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 514d06e..995d037 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -95,6 +95,7 @@ static const struct {
 };
 
 static bool slow = false;
+static bool showInternal = false;
 static QStringList defines;
 static QHash<QString, Tree *> trees;
 
@@ -120,14 +121,16 @@ static void printHelp()
 {
     Location::information(tr("Usage: qdoc [options] file1.qdocconf ...\n"
                               "Options:\n"
-                              "    -help     "
+                              "    -help         "
                               "Display this information and exit\n"
-                              "    -version  "
+                              "    -version      "
                               "Display version of qdoc and exit\n"
-                              "    -D<name>  "
+                              "    -D<name>      "
                               "Define <name> as a macro while parsing sources\n"
-                              "    -slow     "
-                              "Turn on features that slow down qdoc") );
+                              "    -slow         "
+                              "Turn on features that slow down qdoc"
+                              "    -showinternal "
+                              "Include stuff marked internal") );
 }
 
 /*!
@@ -160,6 +163,8 @@ static void processQdocconfFile(const QString &fileName)
 	++i;
     }
     config.setStringList(CONFIG_SLOW, QStringList(slow ? "true" : "false"));
+    config.setStringList(CONFIG_SHOWINTERNAL,
+                         QStringList(showInternal ? "true" : "false"));
 
     /*
       With the default configuration values in place, load
@@ -326,10 +331,11 @@ static void processQdocconfFile(const QString &fileName)
     /*
       Generate the XML tag file, if it was requested.
      */
+
     QString tagFile = config.getString(CONFIG_TAGFILE);
     if (!tagFile.isEmpty())
         tree->generateTagFile(tagFile);
-    
+
     tree->setVersion("");
     Generator::terminate();
     CodeParser::terminate();
@@ -342,7 +348,6 @@ static void processQdocconfFile(const QString &fileName)
 
     foreach (QTranslator *translator, translators)
         delete translator;
-
     delete tree;
 }
 
@@ -426,6 +431,9 @@ int main(int argc, char **argv)
         else if (opt == "-slow") {
             slow = true;
 	}
+        else if (opt == "-showinternal") {
+            showInternal = true;
+        }
         else {
 	    qdocFiles.append(opt);
 	}
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index aef6c5d..e018dc6 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -73,16 +73,16 @@ table td.memItemLeft {
   border-right-width: 1px;
   border-bottom-width: 1px;
   border-left-width: 1px;
-  border-top-color: #66bc29;
-  border-right-color: #66bc29;
-  border-bottom-color: #66bc29;
-  border-left-color: #66bc29;
+  border-top-color: #E0E0E0;
+  border-right-color: #E0E0E0;
+  border-bottom-color: #E0E0E0;
+  border-left-color: #E0E0E0;
   border-top-style: solid;
   border-right-style: none;
   border-bottom-style: none;
   border-left-style: none;
   background-color: #FAFAFA;
-  font-size: 80%;
+  font-size: 100%;
   white-space: nowrap
 }
 table td.memItemRight {
@@ -92,16 +92,16 @@ table td.memItemRight {
   border-right-width: 1px;
   border-bottom-width: 1px;
   border-left-width: 1px;
-  border-top-color: #66bc29;
-  border-right-color: #66bc29;
-  border-bottom-color: #66bc29;
-  border-left-color: #66bc29;
+  border-top-color: #E0E0E0;
+  border-right-color: #E0E0E0;
+  border-bottom-color: #E0E0E0;
+  border-left-color: #E0E0E0;
   border-top-style: solid;
   border-right-style: none;
   border-bottom-style: none;
   border-left-style: none;
   background-color: #FAFAFA;
-  font-size: 80%;
+  font-size: 100%;
 }
 
 table tr.odd {
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit
index 62264ec..730e8eb 100755
--- a/util/webkit/mkdist-webkit
+++ b/util/webkit/mkdist-webkit
@@ -109,6 +109,7 @@ excluded_directories="$excluded_directories WebCore/platform/image-decoders/png"
 excluded_directories="$excluded_directories WebCore/platform/image-decoders/ico"
 excluded_directories="$excluded_directories WebCore/platform/image-decoders/jpeg"
 excluded_directories="$excluded_directories WebCore/platform/image-decoders/xbm"
+excluded_directories="$excluded_directories WebCore/platform/image-decoders/skia"
 
 excluded_directories="$excluded_directories WebCore/plugins/gtk"
 excluded_directories="$excluded_directories WebCore/plugins/chromium"
@@ -120,11 +121,6 @@ excluded_directories="$excluded_directories WebKit/mac"
 excluded_directories="$excluded_directories WebKit/wx"
 excluded_directories="$excluded_directories WebKit/cf"
 
-excluded_directories="$excluded_directories WebCore/svg/graphics/cg"
-excluded_directories="$excluded_directories WebCore/svg/graphics/cairo"
-excluded_directories="$excluded_directories WebCore/svg/graphics/filters/cg"
-excluded_directories="$excluded_directories WebCore/svg/graphics/mac"
-
 excluded_directories="$excluded_directories WebKit/English.lproj WebKit/WebKit.xcodeproj"
 excluded_directories="$excluded_directories WebCore/English.lproj"