Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

91 files changed, 1495 insertions, 1030 deletions

diff --git a/config.tests/mac/defaultarch.test b/config.tests/mac/defaultarch.test
index 4502af7a7..80f244a8b 100755
--- a/config.tests/mac/defaultarch.test
+++ b/config.tests/mac/defaultarch.test
@@ -3,7 +3,7 @@
 COMPILER=$1
 VERBOSE=$2
 WORKDIR=$3
-QT_MAC_DEFUALT_ARCH=
+QT_MAC_DEFAULT_ARCH=
 
 touch defaultarch.c
 
@@ -17,17 +17,17 @@ rm -f defaultarch.c defaultarch.o
 
 # detect our known archs.
 if echo "$FIlE_OUTPUT" | grep '\<i386\>' > /dev/null 2>&1; then
-    QT_MAC_DEFUALT_ARCH=x86 # configure knows it as "x86" not "i386"
+    QT_MAC_DEFAULT_ARCH=x86 # configure knows it as "x86" not "i386"
 fi
 if echo "$FIlE_OUTPUT" | grep '\<x86_64\>' > /dev/null 2>&1; then
-    QT_MAC_DEFUALT_ARCH=x86_64
+    QT_MAC_DEFAULT_ARCH=x86_64
 fi
 if echo "$FIlE_OUTPUT" | grep '\<ppc\>' > /dev/null 2>&1; then
-    QT_MAC_DEFUALT_ARCH=ppc
+    QT_MAC_DEFAULT_ARCH=ppc
 fi
 if echo "$FIlE_OUTPUT" | grep '\<ppc64\>' > /dev/null 2>&1; then
-    QT_MAC_DEFUALT_ARCH=ppc64
+    QT_MAC_DEFAULT_ARCH=ppc64
 fi
 
-[ "$VERBOSE" = "yes" ] && echo "setting QT_MAC_DEFUALT_ARCH to \"$QT_MAC_DEFUALT_ARCH\""
-export QT_MAC_DEFUALT_ARCH
+[ "$VERBOSE" = "yes" ] && echo "setting QT_MAC_DEFAULT_ARCH to \"$QT_MAC_DEFAULT_ARCH\""
+export QT_MAC_DEFAULT_ARCH
diff --git a/configure b/configure
index 843d370d0..095d04083 100755
--- a/configure
+++ b/configure
@@ -5707,17 +5707,23 @@ if [ "$CFG_MAC_DWARF2" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG dwarf2"
 fi
 
-# Set the default arch. Select 32-bit/carbon if nothing else has 
-# been specified on the configure line.
+# Set the default arch.
+# Carbon builds: 32 bit x86/ppc.
+# For "-cocoa" builds on snow leopard : compiler default (64-bit).
+# For "-cocoa" builds on leopard : compiler default (32-bit).
 if [ "$PLATFORM_MAC" = "yes" ]  && [ "$CFG_MAC_ARCHS" == "" ]; then
     source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests"
 
-    if [ "$QT_MAC_DEFUALT_ARCH" == "x86_64" ]; then
-        CFG_MAC_ARCHS=" x86"
-    elif [ "$QT_MAC_DEFUALT_ARCH" == "ppc64" ]; then
-        CFG_MAC_ARCHS=" ppc"
-    else
-        CFG_MAC_ARCHS=" $QT_MAC_DEFUALT_ARCH"
+	if [ "$CFG_MAC_COCOA" != "yes" ]; then
+		if [ "$QT_MAC_DEFAULT_ARCH" == "x86_64" ]; then
+			CFG_MAC_ARCHS=" x86"
+		elif [ "$QT_MAC_DEFAULT_ARCH" == "ppc64" ]; then
+			CFG_MAC_ARCHS=" ppc"
+		else
+			CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH"
+		fi
+	else
+		CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH"
     fi
 
     [ "$OPT_VERBOSE" == "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS."
diff --git a/doc/src/classes/qnamespace.qdoc b/doc/src/classes/qnamespace.qdoc
index 59e0a95ad..a49e079be 100644
--- a/doc/src/classes/qnamespace.qdoc
+++ b/doc/src/classes/qnamespace.qdoc
@@ -2418,6 +2418,30 @@
 */
 
 /*!
+    \enum Qt::InputMethodHint
+
+    \value ImhNone                   No hints.
+    \value ImhHiddenText             Characters should be hidden, as is typically used when entering passwords.
+                                     This is automatically set when setting QLineEdit::echoMode to \c Password.
+    \value ImhNumbersOnly            Only number input is allowed.
+    \value ImhUppercaseOnly          Only upper case letter input is allowed.
+    \value ImhLowercaseOnly          Only lower case letter input is allowed.
+    \value ImhNoAutoUppercase        The input method should not try to automatically switch to upper case
+                                     when a sentence ends.
+    \value ImhPreferNumbers          Numbers are preferred (but not required).
+    \value ImhPreferUppercase        Upper case letters are preferred (but not required).
+    \value ImhPreferLowercase        Lower case letters are preferred (but not required).
+    \value ImhNoPredictiveText       Do not use predictive text (i.e. dictionary lookup) while typing.
+    \value ImhDialableCharactersOnly Only characters suitable for phone dialling are allowed.
+
+    \note If several flags ending with \c Only are ORed together, the resulting character set will
+          consist of the union of the specified sets. For instance specifying \c ImhNumbersOnly and
+          \c ImhUppercaseOnly would yield a set consisting of numbers and uppercase letters.
+
+    \sa QGraphicsItem::inputMethodHints()
+*/
+
+/*!
     \enum Qt::InputMethodQuery
 
     \value ImMicroFocus       The rectangle covering the area of the input cursor in widget coordinates.
diff --git a/doc/src/properties.qdoc b/doc/src/properties.qdoc
index 2d03e9139..d0a9cccba 100644
--- a/doc/src/properties.qdoc
+++ b/doc/src/properties.qdoc
@@ -126,7 +126,7 @@
     value is constant.  For a given object instance, the READ method of a 
     constant property must return the same value every time it is called.  This
     constant value may be different for different instances of the object.  A
-    constant property cannot have a WRTE method or a NOTIFY signal.
+    constant property cannot have a WRITE method or a NOTIFY signal.
 
     \o The presence of the \c FINAL attribute indicates that the property
     will not be overridden by a derived class.  This can be used for performance
diff --git a/examples/gestures/imageviewer/imageviewer.pro b/examples/gestures/imageviewer/imageviewer.pro
index 4c35dcec2..efbca004c 100644
--- a/examples/gestures/imageviewer/imageviewer.pro
+++ b/examples/gestures/imageviewer/imageviewer.pro
@@ -1,12 +1,11 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Sep 11 17:18:17 2008
-######################################################################
-
 TEMPLATE = app
 TARGET =
 DEPENDPATH += .
 INCLUDEPATH += .
 
 # Input
-HEADERS += imagewidget.h
-SOURCES += imagewidget.cpp main.cpp
+HEADERS += imagewidget.h \
+    tapandholdgesture.h
+SOURCES += imagewidget.cpp \
+    tapandholdgesture.cpp \
+    main.cpp
diff --git a/examples/gestures/imageviewer/imagewidget.cpp b/examples/gestures/imageviewer/imagewidget.cpp
index 717bb093a..99889ed4f 100644
--- a/examples/gestures/imageviewer/imagewidget.cpp
+++ b/examples/gestures/imageviewer/imagewidget.cpp
@@ -65,7 +65,7 @@ ImageWidget::ImageWidget(QWidget *parent)
     panGesture = new QPanGesture(this);
     connect(panGesture, SIGNAL(triggered()), this, SLOT(gestureTriggered()));
 
-    tapAndHoldGesture = new QTapAndHoldGesture(this);
+    tapAndHoldGesture = new TapAndHoldGesture(this);
     connect(tapAndHoldGesture, SIGNAL(triggered()), this, SLOT(gestureTriggered()));
 }
 
@@ -100,7 +100,7 @@ void ImageWidget::paintEvent(QPaintEvent*)
         p.setPen(QPen(Qt::gray, 2));
         p.drawEllipse(touchFeedback.position, 5, 5);
         if (touchFeedback.doubleTapped) {
-            p.setPen(QPen(Qt::gray, 2, Qt::DotLine));
+            p.setPen(QPen(Qt::darkGray, 2, Qt::DotLine));
             p.drawEllipse(touchFeedback.position, 15, 15);
         } else if (touchFeedback.tapAndHoldState != 0) {
             QPoint pts[8] = {
@@ -159,40 +159,37 @@ void ImageWidget::gestureTriggered()
     touchFeedback.tapped = false;
     touchFeedback.doubleTapped = false;
 
-    QGesture *g = qobject_cast<QGesture*>(sender());
     if (sender() == panGesture) {
+        QPanGesture *pg = qobject_cast<QPanGesture*>(sender());
         if (zoomedIn) {
-            // usual panning
 #ifndef QT_NO_CURSOR
-            if (g->state() == Qt::GestureStarted)
-                setCursor(Qt::SizeAllCursor);
-            else
-                setCursor(Qt::ArrowCursor);
+            switch (pg->state()) {
+                case Qt::GestureStarted:
+                case Qt::GestureUpdated:
+                    setCursor(Qt::SizeAllCursor);
+                    break;
+                default:
+                    setCursor(Qt::ArrowCursor);
+            }
 #endif
-            const int dx = g->pos().x() - g->lastPos().x();
-            const int dy = g->pos().y() - g->lastPos().y();
-            horizontalOffset += dx;
-            verticalOffset += dy;
+            horizontalOffset += pg->lastOffset().width();
+            verticalOffset += pg->lastOffset().height();
             update();
         } else {
             // only slide gesture should be accepted
-            const QPanGesture *pg = static_cast<const QPanGesture*>(g);
-            if (g->state() == Qt::GestureFinished) {
+            if (pg->state() == Qt::GestureFinished) {
                 touchFeedback.sliding = false;
                 zoomed = rotated = false;
-                if (pg->totalOffset().width() > 0) {
-                    qDebug() << "slide right";
+                if (pg->totalOffset().width() > 0)
                     goNextImage();
-                } else {
-                    qDebug() << "slide left";
+                else
                     goPrevImage();
-                }
                 updateImage();
             }
         }
         feedbackFadeOutTimer.start(500, this);
     } else if (sender() == tapAndHoldGesture) {
-        if (g->state() == Qt::GestureFinished) {
+        if (tapAndHoldGesture->state() == Qt::GestureFinished) {
             qDebug() << "tap and hold detected";
             touchFeedback.reset();
             update();
@@ -201,7 +198,7 @@ void ImageWidget::gestureTriggered()
             menu.addAction("Action 1");
             menu.addAction("Action 2");
             menu.addAction("Action 3");
-            menu.exec(mapToGlobal(g->pos()));
+            menu.exec(mapToGlobal(tapAndHoldGesture->pos()));
         }
         feedbackFadeOutTimer.start(500, this);
     }
diff --git a/examples/gestures/imageviewer/imagewidget.h b/examples/gestures/imageviewer/imagewidget.h
index e12634d6c..d8d5f8de8 100644
--- a/examples/gestures/imageviewer/imagewidget.h
+++ b/examples/gestures/imageviewer/imagewidget.h
@@ -48,6 +48,8 @@
 
 #include <QtGui>
 
+#include "tapandholdgesture.h"
+
 class ImageWidget : public QWidget
 {
     Q_OBJECT
@@ -79,7 +81,7 @@ private:
     void goToImage(int index);
 
     QPanGesture *panGesture;
-    QTapAndHoldGesture *tapAndHoldGesture;
+    TapAndHoldGesture *tapAndHoldGesture;
 
     QString path;
     QStringList files;
diff --git a/examples/gestures/imageviewer/tapandholdgesture.cpp b/examples/gestures/imageviewer/tapandholdgesture.cpp
new file mode 100644
index 000000000..ff5284e45
--- /dev/null
+++ b/examples/gestures/imageviewer/tapandholdgesture.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "tapandholdgesture.h"
+
+#include <QtGui/qevent.h>
+
+/*!
+    \class TapAndHoldGesture
+    \since 4.6
+
+    \brief The TapAndHoldGesture class represents a Tap-and-Hold gesture,
+    providing additional information.
+*/
+
+const int TapAndHoldGesture::iterationCount = 40;
+const int TapAndHoldGesture::iterationTimeout = 50;
+
+/*!
+    Creates a new Tap and Hold gesture handler object and marks it as a child
+    of \a parent.
+
+    On some platforms like Windows there is a system-wide tap and hold gesture
+    that cannot be overriden, hence the gesture might never trigger and default
+    context menu will be shown instead.
+*/
+TapAndHoldGesture::TapAndHoldGesture(QWidget *parent)
+    : QGesture(parent), iteration(0)
+{
+}
+
+/*! \internal */
+bool TapAndHoldGesture::filterEvent(QEvent *event)
+{
+    if (!event->spontaneous())
+        return false;
+    const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
+    switch (event->type()) {
+    case QEvent::TouchBegin: {
+        if (timer.isActive())
+            timer.stop();
+        timer.start(TapAndHoldGesture::iterationTimeout, this);
+        const QPoint p = ev->touchPoints().at(0).pos().toPoint();
+        position = p;
+        break;
+    }
+    case QEvent::TouchUpdate:
+        if (ev->touchPoints().size() == 1) {
+            const QPoint startPos = ev->touchPoints().at(0).startPos().toPoint();
+            const QPoint pos = ev->touchPoints().at(0).pos().toPoint();
+            if ((startPos - pos).manhattanLength() > 15)
+                reset();
+        } else {
+            reset();
+        }
+        break;
+    case QEvent::TouchEnd:
+        reset();
+        break;
+    default:
+        break;
+    }
+    return false;
+}
+
+/*! \internal */
+void TapAndHoldGesture::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() != timer.timerId())
+        return;
+    if (iteration == TapAndHoldGesture::iterationCount) {
+        timer.stop();
+        setState(Qt::GestureFinished);
+        emit triggered();
+    } else {
+        setState(Qt::GestureStarted);
+        emit triggered();
+    }
+    ++iteration;
+}
+
+/*! \internal */
+void TapAndHoldGesture::reset()
+{
+    if (state() != Qt::NoGesture)
+        emit cancelled();
+    setState(Qt::NoGesture);
+    timer.stop();
+    iteration = 0;
+}
+
+/*!
+    \property TapAndHoldGesture::pos
+
+    \brief The position of the gesture.
+*/
+QPoint TapAndHoldGesture::pos() const
+{
+    return position;
+}
diff --git a/examples/gestures/imageviewer/tapandholdgesture.h b/examples/gestures/imageviewer/tapandholdgesture.h
new file mode 100644
index 000000000..e0d50b560
--- /dev/null
+++ b/examples/gestures/imageviewer/tapandholdgesture.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TAPANDHOLDGESTURE_H
+#define TAPANDHOLDGESTURE_H
+
+#include <QtCore/QBasicTimer>
+#include <QtGui/QGesture>
+#include <QtGui/QWidget>
+
+class TapAndHoldGesture : public QGesture
+{
+    Q_OBJECT
+    Q_PROPERTY(QPoint pos READ pos)
+
+public:
+    TapAndHoldGesture(QWidget *parent);
+
+    bool filterEvent(QEvent *event);
+    void reset();
+
+    QPoint pos() const;
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+private:
+    QBasicTimer timer;
+    int iteration;
+    QPoint position;
+    static const int iterationCount;
+    static const int iterationTimeout;
+};
+
+#endif // TAPANDHOLDGESTURE_H
diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h b/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
index 4b0c24c83..a1735d0f3 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h b/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
index 4b0c24c83..a1735d0f3 100644
--- a/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h b/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
index 4b0c24c83..a1735d0f3 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h b/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
index 90eb9552c..b3eefea62 100644
--- a/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
+++ b/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the qmake spec of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 4fc9926ba..d602946d6 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -3204,12 +3204,12 @@ static const char qt_meta_stringdata_QAxBase[] = {
 };
 
 static QMetaObject qaxobject_staticMetaObject = {
-    &QObject::staticMetaObject, qt_meta_stringdata_QAxBase,
-        qt_meta_data_QAxBase, 0
+    { &QObject::staticMetaObject, qt_meta_stringdata_QAxBase,
+        qt_meta_data_QAxBase, 0 }
 };
 static QMetaObject qaxwidget_staticMetaObject = {
-    &QWidget::staticMetaObject, qt_meta_stringdata_QAxBase,
-        qt_meta_data_QAxBase, 0
+    { &QWidget::staticMetaObject, qt_meta_stringdata_QAxBase,
+        qt_meta_data_QAxBase, 0 }
 };
 
 /*!
@@ -3692,6 +3692,8 @@ int QAxBase::qt_metacall(QMetaObject::Call call, int id, void **v)
         case QMetaMethod::Slot:
             id = internalInvoke(call, id, v);
             break;
+        default:
+            break;
         }
         break;
     case QMetaObject::ReadProperty:
@@ -3706,6 +3708,8 @@ int QAxBase::qt_metacall(QMetaObject::Call call, int id, void **v)
     case QMetaObject::QueryPropertyUser:
         id -= mo->propertyCount();
         break;
+    default:
+        break;
     }
     Q_ASSERT(id < 0);
     return id;
@@ -3905,7 +3909,7 @@ bool QAxBase::dynamicCallHelper(const char *name, void *inout, QList<QVariant> &
             else
                 paramType = d->metaobj->paramType(normFunction, i, &out);
 
-            if (!parse && d->useMetaObject && var.type() == QVariant::String || var.type() == QVariant::ByteArray) {
+            if ((!parse && d->useMetaObject && var.type() == QVariant::String) || var.type() == QVariant::ByteArray) {
                 int enumIndex =mo->indexOfEnumerator(paramType);
                 if (enumIndex != -1) {
                     QMetaEnum metaEnum =mo->enumerator(enumIndex);
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index ff6bcb86a..e4c9d4219 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -531,7 +531,7 @@ bool axc_FilterProc(void *m)
 }
 
 QAxClientSite::QAxClientSite(QAxWidget *c)
-: ref(1), widget(c), host(0), eventTranslated(true)
+: eventTranslated(true), ref(1), widget(c), host(0)
 {
     aggregatedObject = widget->createAggregate();
     if (aggregatedObject) {
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index 49aa99cb4..63891c4bb 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -552,7 +552,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
                 int maxColumns = col.count();
                 if (maxColumns) {
                     is2D = true;
-                    SAFEARRAYBOUND rgsabound[2] = {0};
+                    SAFEARRAYBOUND rgsabound[2] = { {0} };
                     rgsabound[0].cElements = count;
                     rgsabound[1].cElements = maxColumns;
                     array = SafeArrayCreate(VT_VARIANT, 2, rgsabound);
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index ced86d2c8..1d274c93e 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -177,17 +177,6 @@ QUnifiedTimer *QUnifiedTimer::instance()
     return inst;
 }
 
-void QUnifiedTimer::updateRecentlyStartedAnimations()
-{
-    if (animationsToStart.isEmpty())
-        return;
-
-    animations += animationsToStart;
-    updateTimer(); //we make sure we start the timer there
-
-    animationsToStart.clear();
-}
-
 void QUnifiedTimer::timerEvent(QTimerEvent *event)
 {
     //this is simply the time we last received a tick
@@ -195,15 +184,16 @@ void QUnifiedTimer::timerEvent(QTimerEvent *event)
     if (time.isValid())
         lastTick = consistentTiming ? oldLastTick + timingInterval : time.elapsed();
 
-    //we transfer the waiting animations into the "really running" state
-    updateRecentlyStartedAnimations();
 
     if (event->timerId() == startStopAnimationTimer.timerId()) {
         startStopAnimationTimer.stop();
+        //we transfer the waiting animations into the "really running" state
+        animations += animationsToStart;
+        animationsToStart.clear();
         if (animations.isEmpty()) {
             animationTimer.stop();
             time = QTime();
-        } else {
+        } else if (!animationTimer.isActive()) {
             animationTimer.start(timingInterval, this);
             lastTick = 0;
             time.start();
@@ -219,27 +209,19 @@ void QUnifiedTimer::timerEvent(QTimerEvent *event)
     }
 }
 
-void QUnifiedTimer::updateTimer()
-{
-    //we delay the call to start and stop for the animation timer so that if you
-    //stop and start animations in batch you don't stop/start the timer too often.
-    if (!startStopAnimationTimer.isActive())
-        startStopAnimationTimer.start(0, this); // we delay the actual start of the animation
-}
-
 void QUnifiedTimer::registerAnimation(QAbstractAnimation *animation)
 {
     if (animations.contains(animation) ||animationsToStart.contains(animation))
         return;
     animationsToStart << animation;
-    updateTimer();
+    startStopAnimationTimer.start(0, this); // we delay the check if we should start/stop the global timer
 }
 
 void QUnifiedTimer::unregisterAnimation(QAbstractAnimation *animation)
 {
     animations.removeAll(animation);
     animationsToStart.removeAll(animation);
-    updateTimer();
+    startStopAnimationTimer.start(0, this); // we delay the check if we should start/stop the global timer
 }
 
 
diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h
index 0d8402e90..b281aa2fe 100644
--- a/src/corelib/animation/qabstractanimation_p.h
+++ b/src/corelib/animation/qabstractanimation_p.h
@@ -135,11 +135,8 @@ public:
 
 protected:
     void timerEvent(QTimerEvent *);
-    void updateTimer();
 
 private:
-    void updateRecentlyStartedAnimations();
-
     QBasicTimer animationTimer, startStopAnimationTimer;
     QTime time;
     int lastTick;
diff --git a/src/corelib/animation/qparallelanimationgroup.cpp b/src/corelib/animation/qparallelanimationgroup.cpp
index 5e4b0d2a7..8aa04a4d4 100644
--- a/src/corelib/animation/qparallelanimationgroup.cpp
+++ b/src/corelib/animation/qparallelanimationgroup.cpp
@@ -214,7 +214,8 @@ void QParallelAnimationGroup::updateState(QAbstractAnimation::State oldState,
         d->connectUncontrolledAnimations();
         for (int i = 0; i < d->animations.size(); ++i) {
             QAbstractAnimation *animation = d->animations.at(i);
-            animation->stop();
+            if (oldState == Stopped)
+                animation->stop();
             animation->setDirection(d->direction);
             animation->start();
         }
diff --git a/src/corelib/arch/qatomic_vxworks.h b/src/corelib/arch/qatomic_vxworks.h
index 573a44dbc..b44121079 100644
--- a/src/corelib/arch/qatomic_vxworks.h
+++ b/src/corelib/arch/qatomic_vxworks.h
@@ -34,7 +34,7 @@
 ** 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.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 8263bae81..18d5a9f80 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -279,7 +279,7 @@ namespace QT_NAMESPACE {}
 #  endif
 #endif
 
-#if defined(Q_OS_MAC64) && !defined(QT_MAC_USE_COCOA)
+#if defined(Q_OS_MAC64) && !defined(QT_MAC_USE_COCOA) && !defined(QT_BUILD_QMAKE)
 #error "You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration."
 #endif
 
@@ -311,11 +311,8 @@ namespace QT_NAMESPACE {}
 #  if !defined(MAC_OS_X_VERSION_10_6)
 #       define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1
 #  endif
-#  if (MAC_OS_X_VERSION_MAX_ALLOWED == MAC_OS_X_VERSION_10_6)
-#    warning "Support for this version of Mac OS X is still preliminary"
-#  endif
 #  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6)
-#    error "This version of Mac OS X is unsupported"
+#    warning "This version of Mac OS X is unsupported"
 #  endif
 #endif
 
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 7770fd6a1..f172d7786 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1406,6 +1406,21 @@ public:
         ImCurrentSelection
     };
 
+    enum InputMethodHint {
+        ImhNone = 0x0,
+        ImhHiddenText = 0x1,
+        ImhNumbersOnly = 0x2,
+        ImhUppercaseOnly = 0x4,
+        ImhLowercaseOnly = 0x8,
+        ImhNoAutoUppercase = 0x10,
+        ImhPreferNumbers = 0x20,
+        ImhPreferUppercase = 0x40,
+        ImhPreferLowercase = 0x80,
+        ImhNoPredictiveText = 0x100,
+        ImhDialableCharactersOnly = 0x200
+    };
+    Q_DECLARE_FLAGS(InputMethodHints, InputMethodHint)
+
     enum ToolButtonStyle {
         ToolButtonIconOnly,
         ToolButtonTextOnly,
@@ -1591,6 +1606,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::ItemFlags)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::MatchFlags)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::TextInteractionFlags)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::TouchPointStates)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::InputMethodHints)
 
 typedef bool (*qInternalCallback)(void **);
 
diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index bc95c6019..5d5d4cc81 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -1884,6 +1884,8 @@ QSize QAbstractItemModel::span(const QModelIndex &) const
 }
 
 /*!
+  \since 4.6
+  
   Sets the model's role names to \a roleNames.
 
   This function is provided to allow mapping of role identifiers to
@@ -1900,6 +1902,8 @@ void QAbstractItemModel::setRoleNames(const QHash<int,QByteArray> &roleNames)
 }
 
 /*!
+  \since 4.6
+
   Returns the model's role names.
 
   \sa setRoleNames()
diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp
index b57d385bc..efa9c6d84 100644
--- a/src/corelib/kernel/qcore_unix.cpp
+++ b/src/corelib/kernel/qcore_unix.cpp
@@ -161,76 +161,3 @@ int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept,
 }
 
 QT_END_NAMESPACE
-
-#ifdef Q_OS_LINUX
-// Don't wait for libc to supply the calls we need
-// Make syscalls directly
-
-# if defined(__GLIBC__) && (__GLIBC__ * 0x100 + __GLIBC_MINOR__) >= 0x0204
-// glibc 2.4 has syscall(...)
-#  include <sys/syscall.h>
-#  include <asm/unistd.h>
-# else
-// no syscall(...)
-static inline int syscall(...) { errno = ENOSYS; return -1;}
-# endif
-
-# ifndef __NR_dup3
-#  if defined(__i386__)
-#   define __NR_dup3        330
-#   define __NR_pipe2       331
-#  elif defined(__x86_64__)
-#   define __NR_dup3        292
-#   define __NR_pipe2       293
-#  elif defined(__ia64__)
-#   define __NR_dup3        1316
-#   define __NR_pipe2       1317
-#  else
-//  set the syscalls to absurd numbers so that they'll cause ENOSYS errors
-#   warning "Please port the pipe2/dup3 code to this platform"
-#   define __NR_dup3        -1
-#   define __NR_pipe2       -1
-#  endif
-# endif
-
-# if !defined(__NR_socketcall) && !defined(__NR_accept4)
-#  if defined(__x86_64__)
-#   define __NR_accept4     288
-#  elif defined(__ia64__)
-//  not assigned yet to IA-64
-#   define __NR_accept4     -1
-#  else
-//  set the syscalls to absurd numbers so that they'll cause ENOSYS errors
-#   warning "Please port the accept4 code to this platform"
-#   define __NR_accept4     -1
-#  endif
-# endif
-
-QT_BEGIN_NAMESPACE
-namespace QtLibcSupplement {
-    int pipe2(int pipes[], int flags)
-    {
-        return syscall(__NR_pipe2, pipes, flags);
-    }
-
-    int dup3(int oldfd, int newfd, int flags)
-    {
-        return syscall(__NR_dup3, oldfd, newfd, flags);
-    }
-
-    int accept4(int s, sockaddr *addr, QT_SOCKLEN_T *addrlen, int flags)
-    {
-# if defined(__NR_socketcall)
-        // This platform uses socketcall() instead of raw syscalls
-        // the SYS_ACCEPT4 number is cross-platform: 18
-        return syscall(__NR_socketcall, 18, &s);
-# else
-        return syscall(__NR_accept4, s, addr, addrlen, flags);
-# endif
-
-        Q_UNUSED(addr); Q_UNUSED(addrlen); Q_UNUSED(flags); // they're actually used
-    }
-}
-QT_END_NAMESPACE
-#endif  // Q_OS_LINUX
-
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index 69ebb050f..3bdd5ece9 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -73,32 +73,16 @@
 
 struct sockaddr;
 
-#if defined(Q_OS_LINUX) && defined(__GLIBC__) && (__GLIBC__ * 0x100 + __GLIBC_MINOR__) >= 0x0204
-// Linux supports thread-safe FD_CLOEXEC
+#if defined(Q_OS_LINUX) && defined(O_CLOEXEC)
 # define QT_UNIX_SUPPORTS_THREADSAFE_CLOEXEC 1
-
-// add defines for the consts for Linux
-# ifndef O_CLOEXEC
-#  define O_CLOEXEC  02000000
-# endif
-# ifndef FD_DUPFD_CLOEXEC
-#  define F_DUPFD_CLOEXEC 1030
-# endif
-# ifndef SOCK_CLOEXEC
-#  define SOCK_CLOEXEC O_CLOEXEC
-# endif
-# ifndef SOCK_NONBLOCK
-#  define SOCK_NONBLOCK O_NONBLOCK
-# endif
-# ifndef MSG_CMSG_CLOEXEC
-#  define MSG_CMSG_CLOEXEC 0x40000000
-# endif
-
 QT_BEGIN_NAMESPACE
 namespace QtLibcSupplement {
-    Q_CORE_EXPORT int accept4(int, sockaddr *, QT_SOCKLEN_T *, int flags);
-    Q_CORE_EXPORT int dup3(int oldfd, int newfd, int flags);
-    Q_CORE_EXPORT int pipe2(int pipes[], int flags);
+    inline int accept4(int, sockaddr *, QT_SOCKLEN_T *, int)
+    { errno = ENOSYS; return -1; }
+    inline int dup3(int, int, int)
+    { errno = ENOSYS; return -1; }
+    inline int pipe2(int [], int )
+    { errno = ENOSYS; return -1; }
 }
 QT_END_NAMESPACE
 using namespace QT_PREPEND_NAMESPACE(QtLibcSupplement);
@@ -190,7 +174,7 @@ static inline int qt_safe_pipe(int pipefd[2], int flags = 0)
 #endif
 
     register int ret;
-#if QT_UNIX_SUPPORTS_THREADSAFE_CLOEXEC
+#if QT_UNIX_SUPPORTS_THREADSAFE_CLOEXEC && defined(O_CLOEXEC)
     // use pipe2
     flags |= O_CLOEXEC;
     ret = ::pipe2(pipefd, flags); // pipe2 is Linux-specific and is documented not to return EINTR
@@ -246,7 +230,7 @@ static inline int qt_safe_dup2(int oldfd, int newfd, int flags = FD_CLOEXEC)
     Q_ASSERT(flags == FD_CLOEXEC || flags == 0);
 
     register int ret;
-#if QT_UNIX_SUPPORTS_THREADSAFE_CLOEXEC
+#if QT_UNIX_SUPPORTS_THREADSAFE_CLOEXEC && defined(O_CLOEXEC)
     // use dup3
     if (flags & FD_CLOEXEC) {
         EINTR_LOOP(ret, ::dup3(oldfd, newfd, O_CLOEXEC));
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index a682fad97..ff00c1cc5 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -269,7 +269,7 @@ QT_BEGIN_NAMESPACE
     \omitvalue FutureCallOut
     \omitvalue CocoaRequestModal
     \omitvalue Signal
-    \omitvalue WinGesture
+    \omitvalue NativeGesture
 */
 
 /*!
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index 1d86f4731..d941286f4 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -276,7 +276,7 @@ public:
         TouchUpdate = 195,
         TouchEnd = 196,
 
-        WinGesture = 197,
+        NativeGesture = 197,                    // Internal for platform gesture support
 
         // 512 reserved for Qt Jambi's MetaCall event
         // 513 reserved for Qt Jambi's DeleteOnMainThread event
diff --git a/src/corelib/kernel/qfunctions_vxworks.cpp b/src/corelib/kernel/qfunctions_vxworks.cpp
index 6d5e7ccb7..def8f4c7c 100644
--- a/src/corelib/kernel/qfunctions_vxworks.cpp
+++ b/src/corelib/kernel/qfunctions_vxworks.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h
index cc989488b..e31d49531 100644
--- a/src/corelib/kernel/qfunctions_vxworks.h
+++ b/src/corelib/kernel/qfunctions_vxworks.h
@@ -34,7 +34,7 @@
 ** 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.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 9ff0bc173..d43c5dd8d 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -1352,6 +1352,8 @@ int QMetaMethod::attributes() const
 }
 
 /*!
+  \since 4.6
+
   Returns this method's index.
 */
 int QMetaMethod::methodIndex() const
@@ -2076,6 +2078,8 @@ int QMetaProperty::userType() const
 }
 
 /*!
+  \since 4.6
+
   Returns this property's index.
 */
 int QMetaProperty::propertyIndex() const
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 7bf209a3b..7e7dcaf84 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -122,8 +122,11 @@ extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *)
     }
 }
 
+QObjectData::~QObjectData() {}
+QDeclarativeData::~QDeclarativeData() {}
+
 QObjectPrivate::QObjectPrivate(int version)
-    : threadData(0), currentSender(0), declarativeData(0), connectionLists(0), senders(0)
+    : threadData(0), connectionLists(0), senders(0), currentSender(0), currentChildBeingDeleted(0), declarativeData(0), objectGuards(0)
 {
     if (version != QObjectPrivateVersion)
         qFatal("Cannot mix incompatible Qt libraries");
@@ -144,7 +147,6 @@ QObjectPrivate::QObjectPrivate(int version)
     inEventHandler = false;
     inThreadChangeEvent = false;
     deleteWatch = 0;
-    objectGuards = 0;
     metaObject = 0;
     hasGuards = false;
 }
@@ -767,6 +769,8 @@ QObject::~QObject()
     }
 
     emit destroyed(this);
+    if (d->declarativeData)
+        d->declarativeData->destroyed(this);
 
     {
         QMutexLocker locker(signalSlotLock(this));
@@ -844,14 +848,6 @@ QObject::~QObject()
 
     d->eventFilters.clear();
 
-    // As declarativeData is in a union with currentChildBeingDeleted, this must
-    // be done (and declarativeData set back to 0) before deleting children.
-    if(d->declarativeData) {
-        QDeclarativeData *dd = d->declarativeData;
-        d->declarativeData = 0;
-        dd->destroyed(this);
-    }
-
     if (!d->children.isEmpty())
         d->deleteChildren();
 
@@ -1859,13 +1855,12 @@ void QObjectPrivate::deleteChildren()
     // don't use qDeleteAll as the destructor of the child might
     // delete siblings
     for (int i = 0; i < children.count(); ++i) {
-        QObject *child = children.at(i);
+        currentChildBeingDeleted = children.at(i);
         children[i] = 0;
-        if (child)
-            child->d_func()->parent = 0;
-        delete child;
+        delete currentChildBeingDeleted;
     }
     children.clear();
+    currentChildBeingDeleted = 0;
     wasDeleted = reallyWasDeleted;
 }
 
@@ -1876,14 +1871,20 @@ void QObjectPrivate::setParent_helper(QObject *o)
         return;
     if (parent) {
         QObjectPrivate *parentD = parent->d_func();
-        const int index = parentD->children.indexOf(q);
-        if (parentD->wasDeleted) {
-            parentD->children[index] = 0;
+        if (parentD->wasDeleted && wasDeleted
+            && parentD->currentChildBeingDeleted == q) {
+            // don't do anything since QObjectPrivate::deleteChildren() already
+            // cleared our entry in parentD->children.
         } else {
-            parentD->children.removeAt(index);
-            if (sendChildEvents && parentD->receiveChildEvents) {
-                QChildEvent e(QEvent::ChildRemoved, q);
-                QCoreApplication::sendEvent(parent, &e);
+            const int index = parentD->children.indexOf(q);
+            if (parentD->wasDeleted) {
+                parentD->children[index] = 0;
+            } else {
+                parentD->children.removeAt(index);
+                if (sendChildEvents && parentD->receiveChildEvents) {
+                    QChildEvent e(QEvent::ChildRemoved, q);
+                    QCoreApplication::sendEvent(parent, &e);
+                }
             }
         }
     }
@@ -3897,19 +3898,12 @@ QDebug operator<<(QDebug dbg, const QObject *o) {
     Synonym for QList<QObject *>.
 */
 
-#ifdef QT_JAMBI_BUILD
-class QDPtrAccessor : public QObject {
-public:
-    QObjectData *d() const { return d_ptr; }
-};
-#endif
-
 void qDeleteInEventHandler(QObject *o)
 {
 #ifdef QT_JAMBI_BUILD
     if (!o)
         return;
-    ((QDPtrAccessor *) o)->d()->inEventHandler = false;
+    QObjectPrivate::get(o)->inEventHandler = false;
 #endif
     delete o;
 }
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0b41c9afa..e58ee6cf8 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -82,15 +82,13 @@ void Q_CORE_EXPORT qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet
 
 extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
 
-inline QObjectData::~QObjectData() {}
-
 enum { QObjectPrivateVersion = QT_VERSION };
 
-class QDeclarativeData 
+class Q_CORE_EXPORT QDeclarativeData
 {
 public:
-    virtual ~QDeclarativeData() {}
-    virtual void destroyed(QObject *) {}
+    virtual ~QDeclarativeData();
+    virtual void destroyed(QObject *) = 0;
 };
 
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData
@@ -98,47 +96,6 @@ class Q_CORE_EXPORT QObjectPrivate : public QObjectData
     Q_DECLARE_PUBLIC(QObject)
 
 public:
-    QObjectPrivate(int version = QObjectPrivateVersion);
-    virtual ~QObjectPrivate();
-
-#ifdef QT3_SUPPORT
-    QList<QObject *> pendingChildInsertedEvents;
-    void sendPendingChildInsertedEvents();
-    void removePendingChildInsertedEvents(QObject *child);
-#else
-    // preserve binary compatibility with code compiled without Qt 3 support
-    QList<QObject *> unused;
-#endif
-
-    // id of the thread that owns the object
-    QThreadData *threadData;
-    void moveToThread_helper();
-    void setThreadData_helper(QThreadData *currentData, QThreadData *targetData);
-    void _q_reregisterTimers(void *pointer);
-
-    struct Sender
-    {
-        QObject *sender;
-        int signal;
-        int ref;
-    };
-    // object currently activating the object
-    Sender *currentSender;
-
-    QDeclarativeData *declarativeData;
-
-    bool isSender(const QObject *receiver, const char *signal) const;
-    QObjectList receiverList(const char *signal) const;
-    QObjectList senderList() const;
-
-    QList<QPointer<QObject> > eventFilters;
-
-    void setParent_helper(QObject *);
-
-    void deleteChildren();
-
-    static void clearGuards(QObject *);
-
     struct ExtraData
     {
 #ifndef QT_NO_USERDATA
@@ -147,12 +104,7 @@ public:
         QList<QByteArray> propertyNames;
         QList<QVariant> propertyValues;
     };
-    ExtraData *extraData;
-    mutable quint32 connectedSignals[2];
-
-    QString objectName;
 
-    // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
     struct Connection
     {
         QObject *sender;
@@ -167,11 +119,34 @@ public:
     };
     typedef QList<Connection *> ConnectionList;
 
-    QObjectConnectionListVector *connectionLists;
+    struct Sender
+    {
+        QObject *sender;
+        int signal;
+        int ref;
+    };
+
+
+    QObjectPrivate(int version = QObjectPrivateVersion);
+    virtual ~QObjectPrivate();
+    void deleteChildren();
+
+    void setParent_helper(QObject *);
+    void moveToThread_helper();
+    void setThreadData_helper(QThreadData *currentData, QThreadData *targetData);
+    void _q_reregisterTimers(void *pointer);
+
+    bool isSender(const QObject *receiver, const char *signal) const;
+    QObjectList receiverList(const char *signal) const;
+    QObjectList senderList() const;
+
     void addConnection(int signal, Connection *c);
     void cleanConnectionLists();
 
-    Connection *senders; //linked list;
+#ifdef QT3_SUPPORT
+    void sendPendingChildInsertedEvents();
+    void removePendingChildInsertedEvents(QObject *child);
+#endif
 
     static Sender *setCurrentSender(QObject *receiver,
                                     Sender *sender);
@@ -180,13 +155,39 @@ public:
                                    Sender *previousSender);
     static int *setDeleteWatch(QObjectPrivate *d, int *newWatch);
     static void resetDeleteWatch(QObjectPrivate *d, int *oldWatch, int deleteWatch);
-
-    int *deleteWatch;
-    QGuard<QObject> *objectGuards;
+    static void clearGuards(QObject *);
 
     static QObjectPrivate *get(QObject *o) {
         return o->d_func();
     }
+
+public:
+    QString objectName;
+    ExtraData *extraData;    // extra data set by the user
+    QThreadData *threadData; // id of the thread that owns the object
+
+    QObjectConnectionListVector *connectionLists;
+
+    Connection *senders;     // linked list of connections connected to this object
+    Sender *currentSender;   // object currently activating the object
+    mutable quint32 connectedSignals[2];   // 64-bit, so doesn't cause padding on 64-bit platforms
+
+#ifdef QT3_SUPPORT
+    QList<QObject *> pendingChildInsertedEvents;
+#else
+    // preserve binary compatibility with code compiled without Qt 3 support
+    // ### why?
+    QList<QObject *> unused;
+#endif
+
+    QList<QPointer<QObject> > eventFilters;
+    QObject *currentChildBeingDeleted;
+
+    // these objects are all used to indicate that a QObject was deleted
+    // plus QPointer, which keeps a separate list
+    QDeclarativeData *declarativeData;
+    QGuard<QObject> *objectGuards;
+    int *deleteWatch;
 };
 
 inline void q_guard_addGuard(QGuard<QObject> *g)
diff --git a/src/corelib/tools/qbytedata_p.h b/src/corelib/tools/qbytedata_p.h
index cc10ea2d2..f3724f682 100644
--- a/src/corelib/tools/qbytedata_p.h
+++ b/src/corelib/tools/qbytedata_p.h
@@ -42,8 +42,18 @@
 #ifndef QBYTEDATA_H
 #define QBYTEDATA_H
 
-#include <qbytearray.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
+#include <qbytearray.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index 2ca612ed1..ef4dfacb4 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -128,7 +128,7 @@
 
     To access the pointer that QWeakPointer is tracking, you
     must first create a QSharedPointer object and verify if the pointer
-    is null or not.
+    is null or not. See QWeakPointer::toStrongRef() for more information.
 
     \sa QSharedPointer
 */
@@ -210,6 +210,8 @@
     If \tt T is a derived type of the template parameter of this
     class, QSharedPointer will perform an automatic cast. Otherwise,
     you will get a compiler error.
+
+    \sa QWeakPointer::toStrongRef()
 */
 
 /*!
@@ -362,6 +364,8 @@
 
     Returns a weak reference object that shares the pointer referenced
     by this object.
+
+    \sa QWeakPointer::QWeakPointer(const QSharedPointer<T> &)
 */
 
 /*!
@@ -478,10 +482,78 @@
 */
 
 /*!
+    \fn T *QWeakPointer::data() const
+    \since 4.6
+
+    Returns the value of the pointer being tracked by this QWeakPointer,
+    \b without ensuring that it cannot get deleted. To have that guarantee,
+    use toStrongRef(), which returns a QSharedPointer object. If this
+    function can determine that the pointer has already been deleted, it
+    returns 0.
+
+    It is ok to obtain the value of the pointer and using that value itself,
+    like for example in debugging statements:
+
+    \code
+        qDebug("Tracking %p", weakref.data());
+    \endcode
+
+    However, dereferencing the pointer is only allowed if you can guarantee
+    by external means that the pointer does not get deleted. For example,
+    if you can be certain that no other thread can delete it, nor the
+    functions that you may call.
+
+    If that is the case, then the following code is valid:
+
+    \code
+        // this pointer cannot be used in another thread
+        // so other threads cannot delete it
+        QWeakPointer<int> weakref = obtainReference();
+
+        Object *obj = weakref.data();
+        if (obj) {
+            // if the pointer wasn't deleted yet, we know it can't get
+            // deleted by our own code here nor the functions we call
+            otherFunction(obj);
+        }
+    \endcode
+
+    Use this function with care.
+
+    \sa isNull(), toStrongRef()
+*/
+
+/*!
     \fn QSharedPointer<T> QWeakPointer::toStrongRef() const
 
     Promotes this weak reference to a strong one and returns a
-    QSharedPointer object holding that reference.
+    QSharedPointer object holding that reference. When promoting to
+    QSharedPointer, this function verifies if the object has been deleted
+    already or not. If it hasn't, this function increases the reference
+    count to the shared object, thus ensuring that it will not get
+    deleted.
+
+    Since this function can fail to obtain a valid strong reference to the
+    shared object, you should always verify if the conversion succeeded,
+    by calling QSharedPointer::isNull() on the returned object.
+
+    For example, the following code promotes a QWeakPointer that was held
+    to a strong reference and, if it succeeded, it prints the value of the
+    integer that was held:
+
+    \code
+        QWeakPointer<int> weakref;
+
+        // ...
+
+        QSharedPointer<int> strong = weakref.toStrongRef();
+        if (strong)
+            qDebug() << "The value is:" << *strong;
+        else
+            qDebug() << "The value has already been deleted";
+    \endcode
+
+    \sa QSharedPointer::QSharedPointer(const QWeakPointer<T> &)
 */
 
 /*!
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 9fa8df4c7..e8e38126a 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -492,6 +492,7 @@ public:
     inline bool isNull() const { return d == 0 || d->strongref == 0 || value == 0; }
     inline operator RestrictedBool() const { return isNull() ? 0 : &QWeakPointer::value; }
     inline bool operator !() const { return isNull(); }
+    inline T *data() const { return d == 0 || d->strongref == 0 ? 0 : value; }
 
     inline QWeakPointer() : d(0), value(0) { }
     inline ~QWeakPointer() { if (d && !d->weakref.deref()) delete d; }
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 8b4e1b1a8..1ec94b644 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -2838,7 +2838,8 @@ void QFileDialogPrivate::_q_goToDirectory(const QString &path)
 }
 
 const char *qt_file_dialog_filter_reg_exp =
-    "^([^()]*)\\(([a-zA-Z0-9_.*? +;#\\-\\[\\]@\\{\\}/!<>\\$%&=^~:\\|]*)\\)$";
+"(\\W|[a-zA-Z0-9 -]*)\\(([a-zA-Z0-9_.*? +;#\\-\\[\\]@\\{\\}/!<>\\$%&=^~:\\|]*)\\)$";
+
 
 // Makes a list of filters from a normal filter string "Image Files (*.png *.jpg)"
 QStringList qt_clean_filter_list(const QString &filter)
diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp
index daaa4ba12..67725922d 100644
--- a/src/gui/egl/qegl_x11.cpp
+++ b/src/gui/egl/qegl_x11.cpp
@@ -39,15 +39,18 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qdebug.h>
+
+#include <private/qt_x11_p.h>
+#include <QtGui/qx11info_x11.h>
+#include <private/qpixmapdata_p.h>
+#include <private/qpixmap_x11_p.h>
+
 #include <QtGui/qpaintdevice.h>
 #include <QtGui/qpixmap.h>
 #include <QtGui/qwidget.h>
-#include <QtCore/qdebug.h>
 #include "qegl_p.h"
 
-#include <QtGui/qx11info_x11.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/embedded/qkbdqnx_qws.cpp b/src/gui/embedded/qkbdqnx_qws.cpp
index 06163c735..089b86817 100644
--- a/src/gui/embedded/qkbdqnx_qws.cpp
+++ b/src/gui/embedded/qkbdqnx_qws.cpp
@@ -6,11 +6,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** 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
diff --git a/src/gui/embedded/qkbdqnx_qws.h b/src/gui/embedded/qkbdqnx_qws.h
index c046c8d81..fa3ae56ae 100644
--- a/src/gui/embedded/qkbdqnx_qws.h
+++ b/src/gui/embedded/qkbdqnx_qws.h
@@ -6,11 +6,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** 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
diff --git a/src/gui/embedded/qmouseqnx_qws.cpp b/src/gui/embedded/qmouseqnx_qws.cpp
index 98f8f0600..59cd5be62 100644
--- a/src/gui/embedded/qmouseqnx_qws.cpp
+++ b/src/gui/embedded/qmouseqnx_qws.cpp
@@ -6,11 +6,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** 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
diff --git a/src/gui/embedded/qmouseqnx_qws.h b/src/gui/embedded/qmouseqnx_qws.h
index a61562e2f..f8cad4ab6 100644
--- a/src/gui/embedded/qmouseqnx_qws.h
+++ b/src/gui/embedded/qmouseqnx_qws.h
@@ -6,11 +6,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** 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
diff --git a/src/gui/embedded/qscreenqnx_qws.cpp b/src/gui/embedded/qscreenqnx_qws.cpp
index 7101bc786..c79ee59c9 100644
--- a/src/gui/embedded/qscreenqnx_qws.cpp
+++ b/src/gui/embedded/qscreenqnx_qws.cpp
@@ -6,11 +6,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** 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
diff --git a/src/gui/embedded/qscreenqnx_qws.h b/src/gui/embedded/qscreenqnx_qws.h
index 837c0613d..30312fe08 100644
--- a/src/gui/embedded/qscreenqnx_qws.h
+++ b/src/gui/embedded/qscreenqnx_qws.h
@@ -6,11 +6,11 @@
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** 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
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index a047e6abc..6a21e99d2 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -6384,7 +6384,7 @@ void QGraphicsItem::inputMethodEvent(QInputMethodEvent *event)
     surrounding text and reconversions. \a query specifies which
     property is queried.
 
-    \sa inputMethodEvent()
+    \sa inputMethodEvent(), QInputMethodEvent, QInputContext
 */
 QVariant QGraphicsItem::inputMethodQuery(Qt::InputMethodQuery query) const
 {
@@ -6400,6 +6400,39 @@ QVariant QGraphicsItem::inputMethodQuery(Qt::InputMethodQuery query) const
 }
 
 /*!
+    Returns the current input method hints of this item.
+
+    Input method hints are only relevant for input items.
+    The hints are used by the input method to indicate how it should operate.
+    For example, if the Qt::ImhNumbersOnly flag is set, the input method may change
+    its visual components to reflect that only numbers can be entered.
+
+    The effect may vary between input method implementations.
+
+    \since 4.6
+
+    \sa setInputMethodHints(), inputMethodQuery(), QInputContext
+*/
+Qt::InputMethodHints QGraphicsItem::inputMethodHints() const
+{
+    Q_D(const QGraphicsItem);
+    return d->imHints;
+}
+
+/*!
+    Sets the current input method hints of this item to \a hints.
+
+    \since 4.6
+
+    \sa inputMethodHints(), inputMethodQuery(), QInputContext
+*/
+void QGraphicsItem::setInputMethodHints(Qt::InputMethodHints hints)
+{
+    Q_D(QGraphicsItem);
+    d->imHints = hints;
+}
+
+/*!
     This virtual function is called by QGraphicsItem to notify custom items
     that some part of the item's state changes. By reimplementing this
     function, your can react to a change, and in some cases, (depending on \a
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index b94fb970a..f142b0f03 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -375,6 +375,9 @@ public:
     QVariant data(int key) const;
     void setData(int key, const QVariant &value);
 
+    Qt::InputMethodHints inputMethodHints() const;
+    void setInputMethodHints(Qt::InputMethodHints hints);
+
     enum {
         Type = 1,
         UserType = 65536
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 5c3622be2..805b55472 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -126,6 +126,7 @@ public:
         depth(0),
         focusProxy(0),
         subFocusItem(0),
+        imHints(Qt::ImhNone),
         acceptedMouseButtons(0x1f),
         visible(1),
         explicitlyHidden(0),
@@ -419,8 +420,9 @@ public:
     int depth;
     QGraphicsItem *focusProxy;
     QGraphicsItem *subFocusItem;
+    Qt::InputMethodHints imHints;
 
-    // Packed 32 bytes
+    // Packed 32 bits
     quint32 acceptedMouseButtons : 5;
     quint32 visible : 1;
     quint32 explicitlyHidden : 1;
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp
index 890aff74a..778cd9451 100644
--- a/src/gui/graphicsview/qgraphicstransform.cpp
+++ b/src/gui/graphicsview/qgraphicstransform.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 8b6b5cb34..94569ec66 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -960,6 +960,7 @@ void QAbstractItemView::reset()
     d->currentIndexSet = false;
     setState(NoState);
     setRootIndex(QModelIndex());
+    d->selectionModel->reset();
 }
 
 /*!
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index aff715ce5..962ce54f0 100644
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -1238,12 +1238,7 @@ bool QItemDelegate::eventFilter(QObject *object, QEvent *event)
             if (QDragManager::self() && QDragManager::self()->object != 0)
                 return false;
 #endif
-            // Opening a modal dialog will start a new eventloop
-            // that will process the deleteLater event.
-            if (QApplication::activeModalWidget()
-                && !QApplication::activeModalWidget()->isAncestorOf(editor)
-                && qobject_cast<QDialog*>(QApplication::activeModalWidget()))
-                return false;
+
             emit commitData(editor);
             emit closeEditor(editor, NoHint);
         }
diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp
index 7ec2afebd..8faf0be42 100644
--- a/src/gui/itemviews/qstyleditemdelegate.cpp
+++ b/src/gui/itemviews/qstyleditemdelegate.cpp
@@ -686,13 +686,7 @@ bool QStyledItemDelegate::eventFilter(QObject *object, QEvent *event)
             if (QDragManager::self() && QDragManager::self()->object != 0)
                 return false;
 #endif
-            // Opening a modal dialog will start a new eventloop
-            // that will process the deleteLater event.
-            QWidget *activeModalWidget = QApplication::activeModalWidget();
-            if (activeModalWidget
-                && !activeModalWidget->isAncestorOf(editor)
-                && qobject_cast<QDialog*>(activeModalWidget))
-                return false;
+
             emit commitData(editor);
             emit closeEditor(editor, NoHint);
         }
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index e210556d8..c24ff49ef 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -4052,7 +4052,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
         touchEvent->setAccepted(eventAccepted);
         break;
     }
-    case QEvent::WinGesture:
+    case QEvent::NativeGesture:
     {
         // only propagate the first gesture event (after the GID_BEGIN)
         QWidget *w = static_cast<QWidget *>(receiver);
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index d5c820c21..2bded5ce9 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -3735,22 +3735,22 @@ bool QETWidget::translateGestureEvent(const MSG &msg)
         alienWidget = 0;
     QWidget *widget = alienWidget ? alienWidget : this;
 
-    QWinGestureEvent event;
+    QNativeGestureEvent event;
     event.sequenceId = gi.dwSequenceID;
     event.position = QPoint(gi.ptsLocation.x, gi.ptsLocation.y);
     if (bResult) {
         switch (gi.dwID) {
         case GID_BEGIN:
-            // we are not interested in this type of event.
+            event.gestureType = QNativeGestureEvent::GestureBegin;
             break;
         case GID_END:
-            event.gestureType = QWinGestureEvent::GestureEnd;
+            event.gestureType = QNativeGestureEvent::GestureEnd;
             break;
         case GID_ZOOM:
-            event.gestureType = QWinGestureEvent::Pinch;
+            event.gestureType = QNativeGestureEvent::Pinch;
             break;
         case GID_PAN:
-            event.gestureType = QWinGestureEvent::Pan;
+            event.gestureType = QNativeGestureEvent::Pan;
             break;
         case GID_ROTATE:
         case GID_TWOFINGERTAP:
@@ -3758,7 +3758,7 @@ bool QETWidget::translateGestureEvent(const MSG &msg)
         default:
             break;
         }
-        if (event.gestureType != QWinGestureEvent::None)
+        if (event.gestureType != QNativeGestureEvent::None)
             qt_sendSpontaneousEvent(widget, &event);
     } else {
         DWORD dwErr = GetLastError();
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index bc3633c5e..0fc36e7e8 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -49,7 +49,6 @@
 #include "qmime.h"
 #include "qdnd_p.h"
 #include "qevent_p.h"
-#include "qgesture.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h
index 67441eaec..92c4fc1c0 100644
--- a/src/gui/kernel/qevent_p.h
+++ b/src/gui/kernel/qevent_p.h
@@ -119,20 +119,30 @@ public:
     qreal pressure;
 };
 
-class QWinGestureEvent : public QEvent
+class QNativeGestureEvent : public QEvent
 {
 public:
     enum Type {
         None,
+        GestureBegin,
         GestureEnd,
         Pan,
         Pinch
     };
 
-    QWinGestureEvent() : QEvent(QEvent::WinGesture), gestureType(None), sequenceId(0) { }
+    QNativeGestureEvent()
+        : QEvent(QEvent::NativeGesture), gestureType(None)
+#ifdef Q_WS_WIN
+        , sequenceId(0)
+#endif
+    {
+    }
+
     Type gestureType;
+#ifdef Q_WS_WIN
     QPoint position;
     ulong sequenceId;
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp
index 1f98013c6..32ac4f8ca 100644
--- a/src/gui/kernel/qgesture.cpp
+++ b/src/gui/kernel/qgesture.cpp
@@ -205,51 +205,6 @@ void QGesture::setState(Qt::GestureState state)
 }
 
 /*!
-    \property QGesture::startPos
-
-    \brief The start position of the gesture (if relevant).
-*/
-QPoint QGesture::startPos() const
-{
-    return d_func()->startPos;
-}
-
-void QGesture::setStartPos(const QPoint &point)
-{
-    d_func()->startPos = point;
-}
-
-/*!
-    \property QGesture::lastPos
-
-    \brief The last recorded position of the gesture (if relevant).
-*/
-QPoint QGesture::lastPos() const
-{
-    return d_func()->lastPos;
-}
-
-void QGesture::setLastPos(const QPoint &point)
-{
-    d_func()->lastPos = point;
-}
-
-/*!
-    \property QGesture::pos
-
-    \brief The current position of the gesture (if relevant).
-*/
-QPoint QGesture::pos() const
-{
-    return d_func()->pos;
-}
-
-void QGesture::setPos(const QPoint &point)
-{
-    d_func()->pos = point;
-}
-
-/*!
     Sets the \a graphicsItem the gesture is filtering events for.
 
     The gesture will install an event filter to the \a graphicsItem and
diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h
index 1cd9caeaa..0735160c8 100644
--- a/src/gui/kernel/qgesture.h
+++ b/src/gui/kernel/qgesture.h
@@ -64,10 +64,6 @@ class Q_GUI_EXPORT QGesture : public QObject
 
     Q_PROPERTY(Qt::GestureState state READ state)
 
-    Q_PROPERTY(QPoint startPos READ startPos WRITE setStartPos)
-    Q_PROPERTY(QPoint lastPos READ lastPos WRITE setLastPos)
-    Q_PROPERTY(QPoint pos READ pos WRITE setPos)
-
 public:
     explicit QGesture(QObject *parent = 0);
     ~QGesture();
@@ -80,19 +76,13 @@ public:
     virtual void reset();
 
     Qt::GestureState state() const;
-    void setState(Qt::GestureState state);
-
-    QPoint startPos() const;
-    void setStartPos(const QPoint &point);
-    QPoint lastPos() const;
-    void setLastPos(const QPoint &point);
-    QPoint pos() const;
-    void setPos(const QPoint &point);
 
 protected:
     QGesture(QGesturePrivate &dd, QObject *parent);
     bool eventFilter(QObject*, QEvent*);
 
+    void setState(Qt::GestureState state);
+
 Q_SIGNALS:
     void started();
     void triggered();
diff --git a/src/gui/kernel/qgesture_p.h b/src/gui/kernel/qgesture_p.h
index 99f572f6b..56eaee741 100644
--- a/src/gui/kernel/qgesture_p.h
+++ b/src/gui/kernel/qgesture_p.h
@@ -73,22 +73,11 @@ public:
     {
     }
 
-    void init(const QPoint &startPos, const QPoint &lastPos,
-              const QPoint &pos)
-    {
-        this->startPos = startPos;
-        this->lastPos = lastPos;
-        this->pos = pos;
-    }
 
     QGraphicsItem *graphicsItem;
     QGraphicsItem *eventFilterProxyGraphicsItem;
 
     Qt::GestureState state;
-
-    QPoint startPos;
-    QPoint lastPos;
-    QPoint pos;
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp
index c8b11c546..475341627 100644
--- a/src/gui/kernel/qstandardgestures.cpp
+++ b/src/gui/kernel/qstandardgestures.cpp
@@ -45,9 +45,14 @@
 #include <qabstractscrollarea.h>
 #include <qscrollbar.h>
 #include <private/qapplication_p.h>
+#include <private/qevent_p.h>
 
 QT_BEGIN_NAMESPACE
 
+#ifdef Q_WS_WIN
+QApplicationPrivate* getQApplicationPrivateInternal();
+#endif
+
 /*!
     \class QPanGesture
     \since 4.6
@@ -68,7 +73,6 @@ QPanGesture::QPanGesture(QWidget *parent)
 {
 #ifdef Q_WS_WIN
     if (parent) {
-        QApplicationPrivate* getQApplicationPrivateInternal();
         QApplicationPrivate *qAppPriv = getQApplicationPrivateInternal();
         qAppPriv->widgetGestures[parent].pan = this;
     }
@@ -93,9 +97,81 @@ bool QPanGesture::event(QEvent *event)
         break;
     }
 #endif
+
+#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
+    Q_D(QPanGesture);
+    if (event->type() == QEvent::Timer) {
+        const QTimerEvent *te = static_cast<QTimerEvent *>(event);
+        if (te->timerId() == d->panFinishedTimer) {
+            killTimer(d->panFinishedTimer);
+            d->panFinishedTimer = 0;
+            d->lastOffset = QSize(0, 0);
+            setState(Qt::GestureFinished);
+            emit triggered();
+            setState(Qt::NoGesture);
+        }
+    }
+#endif
+
     return QObject::event(event);
 }
 
+bool QPanGesture::eventFilter(QObject *receiver, QEvent *event)
+{
+#ifdef Q_WS_WIN
+    if (receiver->isWidgetType() && event->type() == QEvent::NativeGesture) {
+        QNativeGestureEvent *ev = static_cast<QNativeGestureEvent*>(event);
+        QApplicationPrivate *qAppPriv = getQApplicationPrivateInternal();
+        QApplicationPrivate::WidgetStandardGesturesMap::iterator it;
+        it = qAppPriv->widgetGestures.find(static_cast<QWidget*>(receiver));
+        if (it == qAppPriv->widgetGestures.end())
+            return false;
+        QPanGesture *gesture = it.value().pan;
+        if (!gesture)
+            return false;
+        Qt::GestureState nextState = state();
+        switch(ev->gestureType) {
+        case QNativeGestureEvent::GestureBegin:
+            // next we might receive the first gesture update event, so we
+            // prepare for it.
+            setState(Qt::GestureStarted);
+            return false;
+        case QNativeGestureEvent::Pan:
+            nextState = Qt::GestureUpdated;
+            break;
+        case QNativeGestureEvent::GestureEnd:
+            if (state() != QNativeGestureEvent::Pan)
+                return false; // some other gesture has ended
+            setState(Qt::GestureFinished);
+            nextState = Qt::GestureFinished;
+            break;
+        default:
+            return false;
+        }
+        QPanGesturePrivate *d = gesture->d_func();
+        if (state() == Qt::GestureStarted) {
+            d->lastPosition = ev->position;
+            d->lastOffset = d->totalOffset = QSize();
+        } else {
+            d->lastOffset = QSize(ev->position.x() - d->lastPosition.x(),
+                                  ev->position.y() - d->lastPosition.y());
+            d->totalOffset += d->lastOffset;
+        }
+        d->lastPosition = ev->position;
+
+        if (state() == Qt::GestureStarted)
+            emit gesture->started();
+        emit gesture->triggered();
+        if (state() == Qt::GestureFinished)
+            emit gesture->finished();
+        event->accept();
+        gesture->setState(nextState);
+        return true;
+    }
+#endif
+    return QGesture::eventFilter(receiver, event);
+}
+
 /*! \internal */
 bool QPanGesture::filterEvent(QEvent *event)
 {
@@ -104,28 +180,34 @@ bool QPanGesture::filterEvent(QEvent *event)
         return false;
     const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
     if (event->type() == QEvent::TouchBegin) {
-        d->touchPoints = ev->touchPoints();
-        const QPoint p = ev->touchPoints().at(0).pos().toPoint();
-        setStartPos(p);
-        setLastPos(p);
-        setPos(p);
-        return false;
+        QTouchEvent::TouchPoint p = ev->touchPoints().at(0);
+        d->lastPosition = p.pos().toPoint();
+        d->lastOffset = d->totalOffset = QSize();
     } else if (event->type() == QEvent::TouchEnd) {
         if (state() != Qt::NoGesture) {
             setState(Qt::GestureFinished);
-            setLastPos(pos());
-            setPos(ev->touchPoints().at(0).pos().toPoint());
+            if (!ev->touchPoints().isEmpty()) {
+                QTouchEvent::TouchPoint p = ev->touchPoints().at(0);
+                const QPoint pos = p.pos().toPoint();
+                const QPoint lastPos = p.lastPos().toPoint();
+                const QPoint startPos = p.startPos().toPoint();
+                d->lastOffset = QSize(pos.x() - lastPos.x(), pos.y() - lastPos.y());
+                d->totalOffset = QSize(pos.x() - startPos.x(), pos.y() - startPos.y());
+            }
             emit triggered();
             emit finished();
         }
         setState(Qt::NoGesture);
         reset();
     } else if (event->type() == QEvent::TouchUpdate) {
-        d->touchPoints = ev->touchPoints();
-        QPointF pt = d->touchPoints.at(0).pos() - d->touchPoints.at(0).startPos();
-        setLastPos(pos());
-        setPos(ev->touchPoints().at(0).pos().toPoint());
-        if (pt.x() > 10 || pt.y() > 10 || pt.x() < -10 || pt.y() < -10) {
+        QTouchEvent::TouchPoint p = ev->touchPoints().at(0);
+        const QPoint pos = p.pos().toPoint();
+        const QPoint lastPos = p.lastPos().toPoint();
+        const QPoint startPos = p.startPos().toPoint();
+        d->lastOffset = QSize(pos.x() - lastPos.x(), pos.y() - lastPos.y());
+        d->totalOffset = QSize(pos.x() - startPos.x(), pos.y() - startPos.y());
+        if (d->totalOffset.width() > 10  || d->totalOffset.height() > 10 ||
+            d->totalOffset.width() < -10 || d->totalOffset.height() < -10) {
             if (state() == Qt::NoGesture)
                 setState(Qt::GestureStarted);
             else
@@ -133,6 +215,36 @@ bool QPanGesture::filterEvent(QEvent *event)
             emit triggered();
         }
     }
+#ifdef Q_OS_MAC
+    else if (event->type() == QEvent::Wheel) {
+        // On Mac, there is really no native panning gesture. Instead, a two 
+        // finger pan is delivered as mouse wheel events. Otoh, on Windows, you
+        // either get mouse wheel events or pan events. We have decided to make this
+        // the Qt behaviour as well, meaning that on Mac, wheel
+        // events will be masked away when listening for pan events.
+#ifndef QT_MAC_USE_COCOA
+        // In Carbon we receive neither touch-, nor pan gesture events.
+        // So we create pan gestures by converting wheel events. After all, this
+        // is how things are supposed to work on mac in the first place.
+        const QWheelEvent *wev = static_cast<const QWheelEvent*>(event);
+        int offset = wev->delta() / -120;
+        d->lastOffset = wev->orientation() == Qt::Horizontal ? QSize(offset, 0) : QSize(0, offset);
+
+        if (state() == Qt::NoGesture) {
+            setState(Qt::GestureStarted);
+            d->totalOffset = d->lastOffset;
+        } else {
+            setState(Qt::GestureUpdated);
+            d->totalOffset += d->lastOffset;
+        }
+
+        killTimer(d->panFinishedTimer);
+        d->panFinishedTimer = startTimer(200);
+        emit triggered();
+#endif
+        return true;
+    }
+#endif
     return false;
 }
 
@@ -140,7 +252,14 @@ bool QPanGesture::filterEvent(QEvent *event)
 void QPanGesture::reset()
 {
     Q_D(QPanGesture);
-    d->touchPoints.clear();
+    d->lastOffset = d->totalOffset = QSize();
+    d->lastPosition = QPoint();
+#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
+    if (d->panFinishedTimer) {
+        killTimer(d->panFinishedTimer);
+        d->panFinishedTimer = 0;
+    }
+#endif
 }
 
 /*!
@@ -150,8 +269,8 @@ void QPanGesture::reset()
 */
 QSize QPanGesture::totalOffset() const
 {
-    QPoint pt = pos() - startPos();
-    return QSize(pt.x(), pt.y());
+    Q_D(const QPanGesture);
+    return d->totalOffset;
 }
 
 /*!
@@ -162,93 +281,11 @@ QSize QPanGesture::totalOffset() const
 */
 QSize QPanGesture::lastOffset() const
 {
-    QPoint pt = pos() - lastPos();
-    return QSize(pt.x(), pt.y());
-}
-
-/*!
-    \class QTapAndHoldGesture
-    \since 4.6
-
-    \brief The QTapAndHoldGesture class represents a Tap-and-Hold gesture,
-    providing additional information.
-*/
-
-const int QTapAndHoldGesturePrivate::iterationCount = 40;
-const int QTapAndHoldGesturePrivate::iterationTimeout = 50;
-
-/*!
-    Creates a new Tap and Hold gesture handler object and marks it as a child
-    of \a parent.
-
-    On some platforms like Windows there is a system-wide tap and hold gesture
-    that cannot be overriden, hence the gesture might never trigger and default
-    context menu will be shown instead.
-*/
-QTapAndHoldGesture::QTapAndHoldGesture(QWidget *parent)
-    : QGesture(*new QTapAndHoldGesturePrivate, parent)
-{
-}
-
-/*! \internal */
-bool QTapAndHoldGesture::filterEvent(QEvent *event)
-{
-    Q_D(QTapAndHoldGesture);
-    if (!event->spontaneous())
-        return false;
-    const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
-    switch (event->type()) {
-    case QEvent::TouchBegin: {
-        if (d->timer.isActive())
-            d->timer.stop();
-        d->timer.start(QTapAndHoldGesturePrivate::iterationTimeout, this);
-        const QPoint p = ev->touchPoints().at(0).pos().toPoint();
-        setStartPos(p);
-        setLastPos(p);
-        setPos(p);
-        break;
-    }
-    case QEvent::TouchUpdate:
-        if (ev->touchPoints().size() != 1)
-            reset();
-        else if ((startPos() - ev->touchPoints().at(0).pos().toPoint()).manhattanLength() > 15)
-            reset();
-        break;
-    case QEvent::TouchEnd:
-        reset();
-        break;
-    default:
-        break;
-    }
-    return false;
+    Q_D(const QPanGesture);
+    return d->lastOffset;
 }
 
-/*! \internal */
-void QTapAndHoldGesture::timerEvent(QTimerEvent *event)
-{
-    Q_D(QTapAndHoldGesture);
-    if (event->timerId() != d->timer.timerId())
-        return;
-    if (d->iteration == QTapAndHoldGesturePrivate::iterationCount) {
-        d->timer.stop();
-        setState(Qt::GestureFinished);
-        emit triggered();
-    } else {
-        setState(Qt::GestureStarted);
-        emit triggered();
-    }
-    ++d->iteration;
-}
+QT_END_NAMESPACE
 
-/*! \internal */
-void QTapAndHoldGesture::reset()
-{
-    Q_D(QTapAndHoldGesture);
-    if (state() != Qt::NoGesture)
-        emit cancelled();
-    setState(Qt::NoGesture);
-    d->timer.stop();
-    d->iteration = 0;
-}
+#include "moc_qstandardgestures.cpp"
 
-QT_END_NAMESPACE
diff --git a/src/gui/kernel/qstandardgestures.h b/src/gui/kernel/qstandardgestures.h
index 2234702cc..c734fbafe 100644
--- a/src/gui/kernel/qstandardgestures.h
+++ b/src/gui/kernel/qstandardgestures.h
@@ -71,29 +71,13 @@ public:
     QSize totalOffset() const;
     QSize lastOffset() const;
 
-protected:
+private:
     bool event(QEvent *event);
+    bool eventFilter(QObject *receiver, QEvent *event);
 
-private:
     friend class QWidget;
 };
 
-class QTapAndHoldGesturePrivate;
-class Q_GUI_EXPORT QTapAndHoldGesture : public QGesture
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QTapAndHoldGesture)
-
-public:
-    QTapAndHoldGesture(QWidget *parent);
-
-    bool filterEvent(QEvent *event);
-    void reset();
-
-protected:
-    void timerEvent(QTimerEvent *event);
-};
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/gui/kernel/qstandardgestures_p.h b/src/gui/kernel/qstandardgestures_p.h
index bb11c9fb3..0fe24ee89 100644
--- a/src/gui/kernel/qstandardgestures_p.h
+++ b/src/gui/kernel/qstandardgestures_p.h
@@ -60,6 +60,8 @@
 #include "qgesture.h"
 #include "qgesture_p.h"
 
+#include "qstandardgestures.h"
+
 QT_BEGIN_NAMESPACE
 
 class QPanGesturePrivate : public QGesturePrivate
@@ -67,23 +69,20 @@ class QPanGesturePrivate : public QGesturePrivate
     Q_DECLARE_PUBLIC(QPanGesture)
 
 public:
-    QPanGesturePrivate() { }
-
-    QList<QTouchEvent::TouchPoint> touchPoints;
-};
+    QPanGesturePrivate()
+    {
+#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
+        panFinishedTimer = 0;
+#endif
+    }
 
-class QTapAndHoldGesturePrivate : public QGesturePrivate
-{
-    Q_DECLARE_PUBLIC(QTapAndHoldGesture)
-
-public:
-    QTapAndHoldGesturePrivate()
-        : iteration(0) { }
+    QSize totalOffset;
+    QSize lastOffset;
+    QPoint lastPosition;
 
-    QBasicTimer timer;
-    int iteration;
-    static const int iterationCount;
-    static const int iterationTimeout;
+#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
+    int panFinishedTimer;
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 43ac37d17..a827967af 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1375,10 +1375,9 @@ QWidget::~QWidget()
     // set all QPointers for this object to zero
     QObjectPrivate::clearGuards(this);
 
-    if(d->declarativeData) {
-        QDeclarativeData *dd = d->declarativeData;
-        d->declarativeData = 0;
-        dd->destroyed(this);
+    if (d->declarativeData) {
+        d->declarativeData->destroyed(this);
+        d->declarativeData = 0;                 // don't activate again in ~QObject
     }
 
     if (!d->children.isEmpty())
@@ -7940,59 +7939,6 @@ bool QWidget::event(QEvent *event)
         (void) QApplication::sendEvent(this, &mouseEvent);
         break;
     }
-#ifdef Q_WS_WIN
-    case QEvent::WinGesture: {
-        QWinGestureEvent *ev = static_cast<QWinGestureEvent*>(event);
-        QApplicationPrivate *qAppPriv = qApp->d_func();
-        QApplicationPrivate::WidgetStandardGesturesMap::iterator it;
-        it = qAppPriv->widgetGestures.find(this);
-        if (it != qAppPriv->widgetGestures.end()) {
-            Qt::GestureState state = Qt::GestureUpdated;
-            if (qAppPriv->lastGestureId == 0)
-                state = Qt::GestureStarted;
-            QWinGestureEvent::Type type = ev->gestureType;
-            if (ev->gestureType == QWinGestureEvent::GestureEnd) {
-                type = (QWinGestureEvent::Type)qAppPriv->lastGestureId;
-                state = Qt::GestureFinished;
-            }
-
-            QGesture *gesture = 0;
-            switch (type) {
-            case QWinGestureEvent::Pan: {
-                QPanGesture *pan = it.value().pan;
-                gesture = pan;
-                if (state == Qt::GestureStarted) {
-                    gesture->setStartPos(ev->position);
-                    gesture->setLastPos(ev->position);
-                } else {
-                    gesture->setLastPos(gesture->pos());
-                }
-                gesture->setPos(ev->position);
-                break;
-            }
-            case QWinGestureEvent::Pinch:
-                break;
-            default:
-                break;
-            }
-            if (gesture) {
-                gesture->setState(state);
-                if (state == Qt::GestureStarted)
-                    emit gesture->started();
-                emit gesture->triggered();
-                if (state == Qt::GestureFinished)
-                    emit gesture->finished();
-                event->accept();
-            }
-            if (ev->gestureType == QWinGestureEvent::GestureEnd) {
-                qAppPriv->lastGestureId = 0;
-            } else {
-                qAppPriv->lastGestureId = type;
-            }
-        }
-        break;
-    }
-#endif
 #ifndef QT_NO_PROPERTIES
     case QEvent::DynamicPropertyChange: {
         const QByteArray &propName = static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName();
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 9c7a7faa6..8192fb7f0 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1672,7 +1672,7 @@ bool QPainter::begin(QPaintDevice *pd)
 
     if (!d->engine) {
         qWarning("QPainter::begin: Paint device returned engine == 0, type: %d", pd->devType());
-        return true;
+        return false;
     }
 
     // Slip a painter state into the engine before we do any other operations
diff --git a/src/gui/painting/qregion_mac.cpp b/src/gui/painting/qregion_mac.cpp
index 9b0e99fd1..6fe7805b1 100644
--- a/src/gui/painting/qregion_mac.cpp
+++ b/src/gui/painting/qregion_mac.cpp
@@ -173,7 +173,6 @@ RgnHandle QRegion::toQDRgnForUpdate_sys() const
             // detect overflow. Tested for use with HIViewSetNeedsDisplayInRegion
             // in QWidgetPrivate::update_sys().
             enum { HIViewSetNeedsDisplayInRegionOverflow = 10000 }; // empirically determined conservative value
-            qDebug() << qt_r->x() << qt_r->y() << qt_r->right() << qt_r->bottom();
             if (qt_r->right() > HIViewSetNeedsDisplayInRegionOverflow || qt_r->bottom() > HIViewSetNeedsDisplayInRegionOverflow) {
                 qt_mac_dispose_rgn(tmp_rgn);
                 qt_mac_dispose_rgn(rgnHandle);
diff --git a/src/gui/painting/qregion_win.cpp b/src/gui/painting/qregion_win.cpp
index 2d5e76b7c..8708461c6 100644
--- a/src/gui/painting/qregion_win.cpp
+++ b/src/gui/painting/qregion_win.cpp
@@ -57,7 +57,7 @@ HRGN qt_tryCreateRegion(QRegion::RegionType type, int left, int top, int right,
 {
     const int tries = 10;
     for (int i = 0; i < tries; ++i) {
-        HRGN region;
+        HRGN region = 0;
         switch (type) {
         case QRegion::Rectangle:
             region = CreateRectRgn(left, top, right, bottom);
@@ -96,7 +96,7 @@ QRegion qt_region_from_HRGN(HRGN rgn)
 
     QRegion region;
     RECT *r = reinterpret_cast<RECT*>(rd->Buffer);
-    for (int i = 0; i < rd->rdh.nCount; ++i) {
+    for (uint i = 0; i < rd->rdh.nCount; ++i) {
         QRect rect;
         rect.setCoords(r->left, r->top, r->right - 1, r->bottom - 1);
         ++r;
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index a0a3756eb..f4dd87cdb 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -772,7 +772,7 @@ QMatchData QUnsortedModelEngine::filter(const QString& part, const QModelIndex&
 ///////////////////////////////////////////////////////////////////////////////
 QCompleterPrivate::QCompleterPrivate()
 : widget(0), proxy(0), popup(0), cs(Qt::CaseSensitive), role(Qt::EditRole), column(0),
-  sorting(QCompleter::UnsortedModel), wrap(true), maxVisibleItems(7), eatFocusOut(true)
+  maxVisibleItems(7), sorting(QCompleter::UnsortedModel), wrap(true), eatFocusOut(true)
 {
 }
 
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index 106d8f2aa..f68d2875f 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp
index 0e3930461..f0ec8adee 100644
--- a/src/gui/widgets/qlineedit_p.cpp
+++ b/src/gui/widgets/qlineedit_p.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** 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.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 0b85eec67..67bb10a9f 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -228,6 +228,10 @@ void QMenuPrivate::updateActionRects() const
     const int hmargin = style->pixelMetric(QStyle::PM_MenuHMargin, 0, q),
               vmargin = style->pixelMetric(QStyle::PM_MenuVMargin, 0, q),
               icone = style->pixelMetric(QStyle::PM_SmallIconSize, 0, q);
+    const int fw = style->pixelMetric(QStyle::PM_MenuPanelWidth, 0, q);
+
+    const int sfcMargin = style->sizeFromContents(QStyle::CT_Menu, 0, QApplication::globalStrut(), q).width() - QApplication::globalStrut().width();
+    const int min_column_width = q->minimumWidth() - (sfcMargin + leftmargin + rightmargin + 2 * (fw + hmargin));
 
     //for compatability now - will have to refactor this away..
     tabWidth = 0;
@@ -300,7 +304,7 @@ void QMenuPrivate::updateActionRects() const
 
 
         if (!sz.isEmpty()) {
-            max_column_width = qMax(max_column_width, sz.width());
+            max_column_width = qMax(min_column_width, qMax(max_column_width, sz.width()));
             //wrapping
             if (!scroll &&
                y+sz.height()+vmargin > dh - (style->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
@@ -316,7 +320,6 @@ void QMenuPrivate::updateActionRects() const
     max_column_width += tabWidth; //finally add in the tab width
 
     //calculate position
-    const int fw = style->pixelMetric(QStyle::PM_MenuPanelWidth, 0, q);
     const int base_y = vmargin + fw + topmargin +
         (scroll ? scroll->scrollOffset : 0) +
         (tearoff ? style->pixelMetric(QStyle::PM_MenuTearoffHeight, 0, q) : 0);
@@ -1703,9 +1706,7 @@ QSize QMenu::sizeHint() const
 
     QSize s;
     QStyleOption opt(0);
-    opt.rect = rect();
-    opt.palette = palette();
-    opt.state = QStyle::State_None;
+    opt.init(this);
     for (int i = 0; i < d->actionRects.count(); ++i) {
         const QRect &rect = d->actionRects.at(i);
         if (rect.isNull())
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index e80df92c0..c095f5c33 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -2625,12 +2625,12 @@ void QTextEditPrivate::_q_gestureTriggered()
         return;
     QScrollBar *hBar = q->horizontalScrollBar();
     QScrollBar *vBar = q->verticalScrollBar();
-    QPoint delta = g->pos() - (g->lastPos().isNull() ? g->pos() : g->lastPos());
+    QSize delta = g->lastOffset();
     if (!delta.isNull()) {
         if (QApplication::isRightToLeft())
-            delta.rx() *= -1;
-        int newX = hBar->value() - delta.x();
-        int newY = vBar->value() - delta.y();
+            delta.rwidth() *= -1;
+        int newX = hBar->value() - delta.width();
+        int newY = vBar->value() - delta.height();
         hbar->setValue(newX);
         vbar->setValue(newY);
     }
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 75ab837a2..4c5254577 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -87,58 +87,11 @@ QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate()
     delete []channels;
 }
 
-void QHttpNetworkConnectionPrivate::connectSignals(QAbstractSocket *socket)
-{
-    Q_Q(QHttpNetworkConnection);
-
-    QObject::connect(socket, SIGNAL(bytesWritten(qint64)),
-               q, SLOT(_q_bytesWritten(qint64)),
-               Qt::DirectConnection);
-    QObject::connect(socket, SIGNAL(connected()),
-               q, SLOT(_q_connected()),
-               Qt::DirectConnection);
-    QObject::connect(socket, SIGNAL(readyRead()),
-               q, SLOT(_q_readyRead()),
-               Qt::DirectConnection);
-    QObject::connect(socket, SIGNAL(disconnected()),
-               q, SLOT(_q_disconnected()),
-               Qt::DirectConnection);
-    QObject::connect(socket, SIGNAL(error(QAbstractSocket::SocketError)),
-               q, SLOT(_q_error(QAbstractSocket::SocketError)),
-               Qt::DirectConnection);
-#ifndef QT_NO_NETWORKPROXY
-    QObject::connect(socket, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
-               q, SLOT(_q_proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
-               Qt::DirectConnection);
-#endif
-
-#ifndef QT_NO_OPENSSL
-    QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
-    if (sslSocket) {
-        // won't be a sslSocket if encrypt is false
-        QObject::connect(sslSocket, SIGNAL(encrypted()),
-                         q, SLOT(_q_encrypted()),
-                         Qt::DirectConnection);
-        QObject::connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError>&)),
-                         q, SLOT(_q_sslErrors(const QList<QSslError>&)),
-                         Qt::DirectConnection);
-    }
-#endif
-}
-
 void QHttpNetworkConnectionPrivate::init()
 {
-    for (int i = 0; i < channelCount; ++i) {
-#ifndef QT_NO_OPENSSL
-        if (encrypt)
-            channels[i].socket = new QSslSocket;
-        else
-            channels[i].socket = new QTcpSocket;
-#else
-        channels[i].socket = new QTcpSocket;
-#endif
-
-        connectSignals(channels[i].socket);
+    for (int i = 0; i < channelCount; i++) {
+        channels[i].setConnection(this->q_func());
+        channels[i].init();
     }
 }
 
@@ -176,35 +129,6 @@ bool QHttpNetworkConnectionPrivate::isSocketReading(QAbstractSocket *socket) con
     return (i != -1 && (channels[i].state & QHttpNetworkConnectionChannel::ReadingState));
 }
 
-void QHttpNetworkConnectionPrivate::appendUncompressedData(QHttpNetworkReply &reply, QByteArray &qba)
-{
-    reply.d_func()->responseData.append(qba);
-
-    // clear the original! helps with implicit sharing and
-    // avoiding memcpy when the user is reading the data
-    qba.clear();
-}
-
-void QHttpNetworkConnectionPrivate::appendUncompressedData(QHttpNetworkReply &reply, QByteDataBuffer &data)
-{
-    reply.d_func()->responseData.append(data);
-
-    // clear the original! helps with implicit sharing and
-    // avoiding memcpy when the user is reading the data
-    data.clear();
-}
-
-void QHttpNetworkConnectionPrivate::appendCompressedData(QHttpNetworkReply &reply, QByteDataBuffer &data)
-{
-    // Work in progress: Later we will directly use a list of QByteArray or a QRingBuffer
-    // instead of one QByteArray.
-    for(int i = 0; i < data.bufferCount(); i++) {
-        QByteArray &byteData = data[i];
-        reply.d_func()->compressedData.append(byteData.constData(), byteData.size());
-    }
-    data.clear();
-}
-
 qint64 QHttpNetworkConnectionPrivate::uncompressedBytesAvailable(const QHttpNetworkReply &reply) const
 {
     return reply.d_func()->responseData.byteAmount();
@@ -406,7 +330,7 @@ bool QHttpNetworkConnectionPrivate::sendRequest(QAbstractSocket *socket)
         QNonContiguousByteDevice* uploadByteDevice = channels[i].request.uploadByteDevice();
         if (uploadByteDevice) {
             // connect the signals so this function gets called again
-            QObject::connect(uploadByteDevice, SIGNAL(readyRead()), q, SLOT(_q_uploadDataReadyRead()));
+            QObject::connect(uploadByteDevice, SIGNAL(readyRead()), &channels[i], SLOT(_q_uploadDataReadyRead()));
 
             channels[i].bytesTotal = channels[i].request.contentLength();
         } else {
@@ -485,7 +409,7 @@ bool QHttpNetworkConnectionPrivate::sendRequest(QAbstractSocket *socket)
     {
         QNonContiguousByteDevice* uploadByteDevice = channels[i].request.uploadByteDevice();
         if (uploadByteDevice) {
-            QObject::disconnect(uploadByteDevice, SIGNAL(readyRead()), q, SLOT(_q_uploadDataReadyRead()));
+            QObject::disconnect(uploadByteDevice, SIGNAL(readyRead()), &channels[i], SLOT(_q_uploadDataReadyRead()));
         }
         // ensure we try to receive a reply in all cases, even if _q_readyRead_ hat not been called
         // this is needed if the sends an reply before we have finished sending the request. In that
@@ -564,7 +488,7 @@ bool QHttpNetworkConnectionPrivate::expand(QAbstractSocket *socket, QHttpNetwork
         if (ret >= retCheck) {
             if (inflated.size()) {
                 reply->d_func()->totalProgress += inflated.size();
-                appendUncompressedData(*reply, inflated);
+                reply->d_func()->appendUncompressedReplyData(inflated);
                 if (shouldEmitSignals(reply)) {
                     // important: At the point of this readyRead(), inflated must be cleared,
                     // else implicit sharing will trigger memcpy when the user is reading data!
@@ -685,9 +609,9 @@ void QHttpNetworkConnectionPrivate::receiveReply(QAbstractSocket *socket, QHttpN
                 bytes = reply->d_func()->readBody(socket, &byteDatas);
                 if (bytes) {
                     if (reply->d_func()->autoDecompress)
-                        appendCompressedData(*reply, byteDatas);
+                        reply->d_func()->appendCompressedReplyData(byteDatas);
                     else
-                        appendUncompressedData(*reply, byteDatas);
+                        reply->d_func()->appendUncompressedReplyData(byteDatas);
 
                     if (!reply->d_func()->autoDecompress) {
                         reply->d_func()->totalProgress += bytes;
@@ -1004,11 +928,7 @@ void QHttpNetworkConnectionPrivate::unqueueAndSendRequest(QAbstractSocket *socke
 
 void QHttpNetworkConnectionPrivate::closeChannel(int channel)
 {
-    QAbstractSocket *socket = channels[channel].socket;
-    socket->blockSignals(true);
-    socket->close();
-    socket->blockSignals(false);
-    channels[channel].state = QHttpNetworkConnectionChannel::IdleState;
+    channels[channel].close();
 }
 
 void QHttpNetworkConnectionPrivate::resendCurrentRequest(QAbstractSocket *socket)
@@ -1102,53 +1022,6 @@ void QHttpNetworkConnectionPrivate::removeReply(QHttpNetworkReply *reply)
 }
 
 
-//private slots
-void QHttpNetworkConnectionPrivate::_q_readyRead()
-{
-    Q_Q(QHttpNetworkConnection);
-    QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(q->sender());
-    if (!socket)
-        return; // ### error
-    if (isSocketWaiting(socket) || isSocketReading(socket)) {
-        int i = indexOf(socket);
-        channels[i].state = QHttpNetworkConnectionChannel::ReadingState;
-        if (channels[i].reply)
-            receiveReply(socket, channels[i].reply);
-    }
-    // ### error
-}
-
-void QHttpNetworkConnectionPrivate::_q_bytesWritten(qint64 bytes)
-{
-    Q_UNUSED(bytes);
-    Q_Q(QHttpNetworkConnection);
-    QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(q->sender());
-    if (!socket)
-        return; // ### error
-    // bytes have been written to the socket. write even more of them :)
-    if (isSocketWriting(socket))
-        sendRequest(socket);
-    // otherwise we do nothing
-}
-
-void QHttpNetworkConnectionPrivate::_q_disconnected()
-{
-    Q_Q(QHttpNetworkConnection);
-    QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(q->sender());
-    if (!socket)
-        return; // ### error
-    // read the available data before closing
-    int i = indexOf(socket);
-    if (isSocketWaiting(socket) || isSocketReading(socket)) {
-        channels[i].state = QHttpNetworkConnectionChannel::ReadingState;
-        if (channels[i].reply)
-            receiveReply(socket, channels[i].reply);
-    } else if (channels[i].state == QHttpNetworkConnectionChannel::IdleState && channels[i].resendCurrent) {
-        // re-sending request because the socket was in ClosingState
-        QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
-    }
-    channels[i].state = QHttpNetworkConnectionChannel::IdleState;
-}
 
 void QHttpNetworkConnectionPrivate::_q_startNextRequest()
 {
@@ -1188,121 +1061,6 @@ void QHttpNetworkConnectionPrivate::_q_restartAuthPendingRequests()
     }
 }
 
-void QHttpNetworkConnectionPrivate::_q_connected()
-{
-    Q_Q(QHttpNetworkConnection);
-    QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(q->sender());
-    if (!socket)
-        return; // ### error
-
-    // improve performance since we get the request sent by the kernel ASAP
-    socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
-
-    int i = indexOf(socket);
-    // ### FIXME: if the server closes the connection unexpectedly, we shouldn't send the same broken request again!
-    //channels[i].reconnectAttempts = 2;
-    if (!channels[i].pendingEncrypt) {
-        channels[i].state = QHttpNetworkConnectionChannel::IdleState;
-        if (channels[i].reply)
-            sendRequest(socket);
-        else
-            closeChannel(i);
-    }
-}
-
-
-void QHttpNetworkConnectionPrivate::_q_error(QAbstractSocket::SocketError socketError)
-{
-    Q_Q(QHttpNetworkConnection);
-    QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(q->sender());
-    if (!socket)
-        return;
-    bool send2Reply = false;
-    int i = indexOf(socket);
-    QNetworkReply::NetworkError errorCode = QNetworkReply::UnknownNetworkError;
-
-    switch (socketError) {
-    case QAbstractSocket::HostNotFoundError:
-        errorCode = QNetworkReply::HostNotFoundError;
-        break;
-    case QAbstractSocket::ConnectionRefusedError:
-        errorCode = QNetworkReply::ConnectionRefusedError;
-        break;
-    case QAbstractSocket::RemoteHostClosedError:
-        // try to reconnect/resend before sending an error.
-        // while "Reading" the _q_disconnected() will handle this.
-        if (channels[i].state != QHttpNetworkConnectionChannel::IdleState && channels[i].state != QHttpNetworkConnectionChannel::ReadingState) {
-            if (channels[i].reconnectAttempts-- > 0) {
-                resendCurrentRequest(socket);
-                return;
-            } else {
-                send2Reply = true;
-                errorCode = QNetworkReply::RemoteHostClosedError;
-            }
-        } else {
-            return;
-        }
-        break;
-    case QAbstractSocket::SocketTimeoutError:
-        // try to reconnect/resend before sending an error.
-        if (channels[i].state == QHttpNetworkConnectionChannel::WritingState &&  (channels[i].reconnectAttempts-- > 0)) {
-            resendCurrentRequest(socket);
-            return;
-        }
-        send2Reply = true;
-        errorCode = QNetworkReply::TimeoutError;
-        break;
-    case QAbstractSocket::ProxyAuthenticationRequiredError:
-        errorCode = QNetworkReply::ProxyAuthenticationRequiredError;
-        break;
-    case QAbstractSocket::SslHandshakeFailedError:
-        errorCode = QNetworkReply::SslHandshakeFailedError;
-        break;
-    default:
-        // all other errors are treated as NetworkError
-        errorCode = QNetworkReply::UnknownNetworkError;
-        break;
-    }
-    QPointer<QObject> that = q;
-    QString errorString = errorDetail(errorCode, socket);
-    if (send2Reply) {
-        if (channels[i].reply) {
-            channels[i].reply->d_func()->errorString = errorString;
-            // this error matters only to this reply
-            emit channels[i].reply->finishedWithError(errorCode, errorString);
-        }
-        // send the next request
-        QMetaObject::invokeMethod(that, "_q_startNextRequest", Qt::QueuedConnection);
-    } else {
-        // the failure affects all requests.
-        emit q->error(errorCode, errorString);
-    }
-    if (that) //signals make enter the event loop
-        closeChannel(i);
-}
-
-#ifndef QT_NO_NETWORKPROXY
-void QHttpNetworkConnectionPrivate::_q_proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator* auth)
-{
-    Q_Q(QHttpNetworkConnection);
-    emit q->proxyAuthenticationRequired(proxy, auth, q);
-}
-#endif
-
-void QHttpNetworkConnectionPrivate::_q_uploadDataReadyRead()
-{
-    Q_Q(QHttpNetworkConnection);
-    // upload data emitted readyRead()
-    // find out which channel it is for
-    QObject *sender = q->sender();
-
-    for (int i = 0; i < channelCount; ++i) {
-        if (sender == channels[i].request.uploadByteDevice()) {
-            sendRequest(channels[i].socket);
-            break;
-        }
-    }
-}
 
 QHttpNetworkConnection::QHttpNetworkConnection(const QString &hostName, quint16 port, bool encrypt, QObject *parent)
     : QObject(*(new QHttpNetworkConnectionPrivate(hostName, port, encrypt)), parent)
@@ -1397,27 +1155,6 @@ QNetworkProxy QHttpNetworkConnection::transparentProxy() const
 
 // SSL support below
 #ifndef QT_NO_OPENSSL
-void QHttpNetworkConnectionPrivate::_q_encrypted()
-{
-    Q_Q(QHttpNetworkConnection);
-    QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(q->sender());
-    if (!socket)
-        return; // ### error
-    int i = indexOf(socket);
-    channels[i].state = QHttpNetworkConnectionChannel::IdleState;
-    sendRequest(socket);
-}
-
-void QHttpNetworkConnectionPrivate::_q_sslErrors(const QList<QSslError> &errors)
-{
-    Q_Q(QHttpNetworkConnection);
-    QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(q->sender());
-    if (!socket)
-        return;
-    //QNetworkReply::NetworkError errorCode = QNetworkReply::ProtocolFailure;
-    emit q->sslErrors(errors);
-}
-
 QSslConfiguration QHttpNetworkConnectionPrivate::sslConfiguration(const QHttpNetworkReply &reply) const
 {
     if (!encrypt)
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index db6a1406f..d6b0325af 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -138,23 +138,10 @@ private:
     Q_DECLARE_PRIVATE(QHttpNetworkConnection)
     Q_DISABLE_COPY(QHttpNetworkConnection)
     friend class QHttpNetworkReply;
+    friend class QHttpNetworkConnectionChannel;
 
-    Q_PRIVATE_SLOT(d_func(), void _q_bytesWritten(qint64))
-    Q_PRIVATE_SLOT(d_func(), void _q_readyRead())
-    Q_PRIVATE_SLOT(d_func(), void _q_disconnected())
     Q_PRIVATE_SLOT(d_func(), void _q_startNextRequest())
     Q_PRIVATE_SLOT(d_func(), void _q_restartAuthPendingRequests())
-    Q_PRIVATE_SLOT(d_func(), void _q_connected())
-    Q_PRIVATE_SLOT(d_func(), void _q_error(QAbstractSocket::SocketError))
-#ifndef QT_NO_NETWORKPROXY
-    Q_PRIVATE_SLOT(d_func(), void _q_proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*))
-#endif
-    Q_PRIVATE_SLOT(d_func(), void _q_uploadDataReadyRead())
-
-#ifndef QT_NO_OPENSSL
-    Q_PRIVATE_SLOT(d_func(), void _q_encrypted())
-    Q_PRIVATE_SLOT(d_func(), void _q_sslErrors(const QList<QSslError>&))
-#endif
 };
 
 
@@ -169,7 +156,6 @@ public:
     QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt);
     ~QHttpNetworkConnectionPrivate();
     void init();
-    void connectSignals(QAbstractSocket *socket);
 
     enum { ChunkSize = 4096 };
 
@@ -189,18 +175,8 @@ public:
     void copyCredentials(int fromChannel, QAuthenticator *auth, bool isProxy);
 
     // private slots
-    void _q_bytesWritten(qint64 bytes); // proceed sending
-    void _q_readyRead(); // pending data to read
-    void _q_disconnected(); // disconnected from host
     void _q_startNextRequest(); // send the next request from the queue
     void _q_restartAuthPendingRequests(); // send the currently blocked request
-    void _q_connected(); // start sending request
-    void _q_error(QAbstractSocket::SocketError); // error from socket
-#ifndef QT_NO_NETWORKPROXY
-    void _q_proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth); // from transparent proxy
-#endif
-
-    void _q_uploadDataReadyRead();
 
     void createAuthorization(QAbstractSocket *socket, QHttpNetworkRequest &request);
     bool ensureConnection(QAbstractSocket *socket);
@@ -221,10 +197,6 @@ public:
     bool pendingAuthSignal; // there is an incomplete authentication signal
     bool pendingProxyAuthSignal; // there is an incomplete proxy authentication signal
 
-    void appendUncompressedData(QHttpNetworkReply &reply, QByteArray &qba);
-    void appendUncompressedData(QHttpNetworkReply &reply, QByteDataBuffer &data);
-    void appendCompressedData(QHttpNetworkReply &reply, QByteDataBuffer &data);
-
     qint64 uncompressedBytesAvailable(const QHttpNetworkReply &reply) const;
     qint64 uncompressedBytesAvailableNextBlock(const QHttpNetworkReply &reply) const;
     qint64 compressedBytesAvailable(const QHttpNetworkReply &reply) const;
@@ -237,8 +209,6 @@ public:
     inline bool expectContent(QHttpNetworkReply *reply);
 
 #ifndef QT_NO_OPENSSL
-    void _q_encrypted(); // start sending request (https)
-    void _q_sslErrors(const QList<QSslError> &errors); // ssl errors from the socket
     QSslConfiguration sslConfiguration(const QHttpNetworkReply &reply) const;
 #endif
 
@@ -249,6 +219,8 @@ public:
     //The request queues
     QList<HttpMessagePair> highPriorityQueue;
     QList<HttpMessagePair> lowPriorityQueue;
+
+    friend class QHttpNetworkConnectionChannel;
 };
 
 
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index a04b53010..6cd46fdea 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -57,6 +57,220 @@ QT_BEGIN_NAMESPACE
 
 // TODO: Put channel specific stuff here so it does not polute qhttpnetworkconnection.cpp
 
+void QHttpNetworkConnectionChannel::init()
+{
+#ifndef QT_NO_OPENSSL
+    if (connection->d_func()->encrypt)
+        socket = new QSslSocket;
+    else
+        socket = new QTcpSocket;
+#else
+    socket = new QTcpSocket;
+#endif
+
+    QObject::connect(socket, SIGNAL(bytesWritten(qint64)),
+                     this, SLOT(_q_bytesWritten(qint64)),
+                     Qt::DirectConnection);
+    QObject::connect(socket, SIGNAL(connected()),
+                     this, SLOT(_q_connected()),
+                     Qt::DirectConnection);
+    QObject::connect(socket, SIGNAL(readyRead()),
+                     this, SLOT(_q_readyRead()),
+                     Qt::DirectConnection);
+    QObject::connect(socket, SIGNAL(disconnected()),
+                     this, SLOT(_q_disconnected()),
+                     Qt::DirectConnection);
+    QObject::connect(socket, SIGNAL(error(QAbstractSocket::SocketError)),
+                     this, SLOT(_q_error(QAbstractSocket::SocketError)),
+                     Qt::DirectConnection);
+#ifndef QT_NO_NETWORKPROXY
+    QObject::connect(socket, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
+                     this, SLOT(_q_proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
+                     Qt::DirectConnection);
+#endif
+
+#ifndef QT_NO_OPENSSL
+    QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
+    if (sslSocket) {
+        // won't be a sslSocket if encrypt is false
+        QObject::connect(sslSocket, SIGNAL(encrypted()),
+                         this, SLOT(_q_encrypted()),
+                         Qt::DirectConnection);
+        QObject::connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError>&)),
+                         this, SLOT(_q_sslErrors(const QList<QSslError>&)),
+                         Qt::DirectConnection);
+    }
+#endif
+}
+
+
+void QHttpNetworkConnectionChannel::close()
+{
+    socket->blockSignals(true);
+    socket->close();
+    socket->blockSignals(false);
+    state = QHttpNetworkConnectionChannel::IdleState;
+}
+
+
+//private slots
+void QHttpNetworkConnectionChannel::_q_readyRead()
+{
+    if (!socket)
+        return; // ### error
+    if (connection->d_func()->isSocketWaiting(socket) || connection->d_func()->isSocketReading(socket)) {
+        state = QHttpNetworkConnectionChannel::ReadingState;
+        if (reply)
+            connection->d_func()->receiveReply(socket, reply);
+    }
+    // ### error
+}
+
+void QHttpNetworkConnectionChannel::_q_bytesWritten(qint64 bytes)
+{
+    Q_UNUSED(bytes);
+    if (!socket)
+        return; // ### error
+    // bytes have been written to the socket. write even more of them :)
+    if (connection->d_func()->isSocketWriting(socket))
+        connection->d_func()->sendRequest(socket);
+    // otherwise we do nothing
+}
+
+void QHttpNetworkConnectionChannel::_q_disconnected()
+{
+    if (!socket)
+        return; // ### error
+    // read the available data before closing
+    if (connection->d_func()->isSocketWaiting(socket) || connection->d_func()->isSocketReading(socket)) {
+        state = QHttpNetworkConnectionChannel::ReadingState;
+        if (reply)
+            connection->d_func()->receiveReply(socket, reply);
+    } else if (state == QHttpNetworkConnectionChannel::IdleState && resendCurrent) {
+        // re-sending request because the socket was in ClosingState
+        QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+    }
+    state = QHttpNetworkConnectionChannel::IdleState;
+}
+
+
+void QHttpNetworkConnectionChannel::_q_connected()
+{
+    if (!socket)
+        return; // ### error
+
+    // improve performance since we get the request sent by the kernel ASAP
+    socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
+
+    // ### FIXME: if the server closes the connection unexpectedly, we shouldn't send the same broken request again!
+    //channels[i].reconnectAttempts = 2;
+    if (!pendingEncrypt) {
+        state = QHttpNetworkConnectionChannel::IdleState;
+        if (reply)
+            connection->d_func()->sendRequest(socket);
+        else
+            close();
+    }
+}
+
+
+void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socketError)
+{
+    if (!socket)
+        return;
+    bool send2Reply = false;
+    QNetworkReply::NetworkError errorCode = QNetworkReply::UnknownNetworkError;
+
+    switch (socketError) {
+    case QAbstractSocket::HostNotFoundError:
+        errorCode = QNetworkReply::HostNotFoundError;
+        break;
+    case QAbstractSocket::ConnectionRefusedError:
+        errorCode = QNetworkReply::ConnectionRefusedError;
+        break;
+    case QAbstractSocket::RemoteHostClosedError:
+        // try to reconnect/resend before sending an error.
+        // while "Reading" the _q_disconnected() will handle this.
+        if (state != QHttpNetworkConnectionChannel::IdleState && state != QHttpNetworkConnectionChannel::ReadingState) {
+            if (reconnectAttempts-- > 0) {
+                connection->d_func()->resendCurrentRequest(socket);
+                return;
+            } else {
+                send2Reply = true;
+                errorCode = QNetworkReply::RemoteHostClosedError;
+            }
+        } else {
+            return;
+        }
+        break;
+    case QAbstractSocket::SocketTimeoutError:
+        // try to reconnect/resend before sending an error.
+        if (state == QHttpNetworkConnectionChannel::WritingState && (reconnectAttempts-- > 0)) {
+            connection->d_func()->resendCurrentRequest(socket);
+            return;
+        }
+        send2Reply = true;
+        errorCode = QNetworkReply::TimeoutError;
+        break;
+    case QAbstractSocket::ProxyAuthenticationRequiredError:
+        errorCode = QNetworkReply::ProxyAuthenticationRequiredError;
+        break;
+    case QAbstractSocket::SslHandshakeFailedError:
+        errorCode = QNetworkReply::SslHandshakeFailedError;
+        break;
+    default:
+        // all other errors are treated as NetworkError
+        errorCode = QNetworkReply::UnknownNetworkError;
+        break;
+    }
+    QPointer<QObject> that = connection;
+    QString errorString = connection->d_func()->errorDetail(errorCode, socket);
+    if (send2Reply) {
+        if (reply) {
+            reply->d_func()->errorString = errorString;
+            // this error matters only to this reply
+            emit reply->finishedWithError(errorCode, errorString);
+        }
+        // send the next request
+        QMetaObject::invokeMethod(that, "_q_startNextRequest", Qt::QueuedConnection);
+    } else {
+        // the failure affects all requests.
+        emit connection->error(errorCode, errorString);
+    }
+    if (that) //signal emission triggered event loop
+        close();
+}
+
+#ifndef QT_NO_NETWORKPROXY
+void QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator* auth)
+{
+    emit connection->proxyAuthenticationRequired(proxy, auth, connection);
+}
+#endif
+
+void QHttpNetworkConnectionChannel::_q_uploadDataReadyRead()
+{
+    connection->d_func()->sendRequest(socket);
+}
+
+#ifndef QT_NO_OPENSSL
+void QHttpNetworkConnectionChannel::_q_encrypted()
+{
+    if (!socket)
+        return; // ### error
+    state = QHttpNetworkConnectionChannel::IdleState;
+    connection->d_func()->sendRequest(socket);
+}
+
+void QHttpNetworkConnectionChannel::_q_sslErrors(const QList<QSslError> &errors)
+{
+    if (!socket)
+        return;
+    //QNetworkReply::NetworkError errorCode = QNetworkReply::ProtocolFailure;
+    emit connection->sslErrors(errors);
+}
+#endif
+
 QT_END_NAMESPACE
 
 #include "moc_qhttpnetworkconnectionchannel_p.cpp"
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index cbabc6747..013e7a576 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -80,6 +80,7 @@ QT_BEGIN_NAMESPACE
 class QHttpNetworkRequest;
 class QHttpNetworkReply;
 class QByteArray;
+class QHttpNetworkConnection;
 
 class QHttpNetworkConnectionChannel : public QObject {
     Q_OBJECT
@@ -117,7 +118,31 @@ public:
 #ifndef QT_NO_OPENSSL
     , ignoreAllSslErrors(false)
 #endif
+    , connection(0)
     {}
+
+    void setConnection(QHttpNetworkConnection *c) {connection = c;}
+    QHttpNetworkConnection *connection;
+
+    void init();
+    void close();
+
+    protected slots:
+    void _q_bytesWritten(qint64 bytes); // proceed sending
+    void _q_readyRead(); // pending data to read
+    void _q_disconnected(); // disconnected from host
+    void _q_connected(); // start sending request
+    void _q_error(QAbstractSocket::SocketError); // error from socket
+#ifndef QT_NO_NETWORKPROXY
+    void _q_proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth); // from transparent proxy
+#endif
+
+    void _q_uploadDataReadyRead();
+
+#ifndef QT_NO_OPENSSL
+    void _q_encrypted(); // start sending request (https)
+    void _q_sslErrors(const QList<QSslError> &errors); // ssl errors from the socket
+#endif
 };
 
 
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index a62399908..f40f7bf85 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -687,6 +687,36 @@ qint64 QHttpNetworkReplyPrivate::getChunkSize(QIODevice *in, qint64 *chunkSize)
     return bytes;
 }
 
+void QHttpNetworkReplyPrivate::appendUncompressedReplyData(QByteArray &qba)
+{
+    responseData.append(qba);
+
+    // clear the original! helps with implicit sharing and
+    // avoiding memcpy when the user is reading the data
+    qba.clear();
+}
+
+void QHttpNetworkReplyPrivate::appendUncompressedReplyData(QByteDataBuffer &data)
+{
+    responseData.append(data);
+
+    // clear the original! helps with implicit sharing and
+    // avoiding memcpy when the user is reading the data
+    data.clear();
+}
+
+void QHttpNetworkReplyPrivate::appendCompressedReplyData(QByteDataBuffer &data)
+{
+    // Work in progress: Later we will directly use a list of QByteArray or a QRingBuffer
+    // instead of one QByteArray.
+    for(int i = 0; i < data.bufferCount(); i++) {
+        QByteArray &byteData = data[i];
+        compressedData.append(byteData.constData(), byteData.size());
+    }
+    data.clear();
+}
+
+
 // SSL support below
 #ifndef QT_NO_OPENSSL
 
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 575e824b6..fe4979962 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -149,6 +149,7 @@ private:
     Q_DECLARE_PRIVATE(QHttpNetworkReply)
     friend class QHttpNetworkConnection;
     friend class QHttpNetworkConnectionPrivate;
+    friend class QHttpNetworkConnectionChannel;
 };
 
 
@@ -171,6 +172,10 @@ public:
     qint64 readReplyBodyChunked(QIODevice *in, QByteDataBuffer *out);
     qint64 getChunkSize(QIODevice *in, qint64 *chunkSize);
 
+    void appendUncompressedReplyData(QByteArray &qba);
+    void appendUncompressedReplyData(QByteDataBuffer &data);
+    void appendCompressedReplyData(QByteDataBuffer &data);
+
     qint64 bytesAvailable() const;
     bool isChunked();
     bool connectionCloseEnabled();
diff --git a/src/network/socket/qnet_unix_p.h b/src/network/socket/qnet_unix_p.h
index f38c2fcfa..040b3ecde 100644
--- a/src/network/socket/qnet_unix_p.h
+++ b/src/network/socket/qnet_unix_p.h
@@ -85,7 +85,7 @@ static inline int qt_safe_socket(int domain, int type, int protocol, int flags =
     Q_ASSERT((flags & ~O_NONBLOCK) == 0);
 
     register int fd;
-#ifdef SOCK_CLOEXEC
+#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
     int newtype = type | SOCK_CLOEXEC;
     if (flags & O_NONBLOCK)
         newtype |= SOCK_NONBLOCK;
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 48d09cecf..0631df52a 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -4604,7 +4604,7 @@ QGLFormat QGLDrawable::format() const
 
 GLuint QGLDrawable::bindTexture(const QImage &image, GLenum target, GLint format)
 {
-    QGLTexture *texture;
+    QGLTexture *texture = 0;
     if (widget)
         texture = widget->d_func()->glcx->d_func()->bindTexture(image, target, format, true);
     else if (buffer)
@@ -4620,7 +4620,7 @@ GLuint QGLDrawable::bindTexture(const QImage &image, GLenum target, GLint format
 
 GLuint QGLDrawable::bindTexture(const QPixmap &pixmap, GLenum target, GLint format)
 {
-    QGLTexture *texture;
+    QGLTexture *texture = 0;
     if (widget)
         texture = widget->d_func()->glcx->d_func()->bindTexture(pixmap, target, format, true, true);
     else if (buffer)
@@ -4718,6 +4718,7 @@ void QGLShareRegister::removeShare(const QGLContext *context) {
 
     int count = it.value().removeAll(context);
     Q_ASSERT(count == 1);
+    Q_UNUSED(count);
 
     Q_ASSERT(it.value().size() != 0);
     if (it.value().size() == 1)
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index bd6f7b94b..39ef1ef4e 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -85,11 +85,10 @@ public:
 #else
         tc(0),
 #endif
-        preparedQuerys(false), preparedQuerysEnabled(false) {}
+        preparedQuerysEnabled(false) {}
     MYSQL *mysql;
     QTextCodec *tc;
 
-    bool preparedQuerys;
     bool preparedQuerysEnabled;
 };
 
@@ -172,6 +171,7 @@ public:
 #if MYSQL_VERSION_ID >= 40108
         , stmt(0), meta(0), inBinds(0), outBinds(0)
 #endif
+        , preparedQuery(false)
         {
             connect(dp, SIGNAL(destroyed()), this, SLOT(driverDestroyed()));
         }
@@ -209,6 +209,9 @@ public:
     MYSQL_BIND *inBinds;
     MYSQL_BIND *outBinds;
 #endif
+
+    bool preparedQuery;
+
 private Q_SLOTS:
     void driverDestroyed() { driver = NULL; }
 };
@@ -399,7 +402,7 @@ QMYSQLResult::~QMYSQLResult()
 QVariant QMYSQLResult::handle() const
 {
 #if MYSQL_VERSION_ID >= 40108
-    if(d->driver && d->driver->d->preparedQuerys)
+    if(d->preparedQuery)
         return d->meta ? qVariantFromValue(d->meta) : qVariantFromValue(d->stmt);
     else
 #endif
@@ -454,9 +457,6 @@ void QMYSQLResult::cleanup()
     d->row = NULL;
     setAt(-1);
     setActive(false);
-
-    if(d->driver)
-        d->driver->d->preparedQuerys = d->driver->d->preparedQuerysEnabled;
 }
 
 bool QMYSQLResult::fetch(int i)
@@ -474,7 +474,7 @@ bool QMYSQLResult::fetch(int i)
     }
     if (at() == i)
         return true;
-    if (d->driver->d->preparedQuerys) {
+    if (d->preparedQuery) {
 #if MYSQL_VERSION_ID >= 40108
         mysql_stmt_data_seek(d->stmt, i);
 
@@ -507,7 +507,7 @@ bool QMYSQLResult::fetchNext()
 {
     if(!d->driver)
         return false;
-    if (d->driver->d->preparedQuerys) {
+    if (d->preparedQuery) {
 #if MYSQL_VERSION_ID >= 40108
         if (mysql_stmt_fetch(d->stmt))
             return false;
@@ -534,7 +534,7 @@ bool QMYSQLResult::fetchLast()
     }
 
     my_ulonglong numRows;
-    if (d->driver->d->preparedQuerys) {
+    if (d->preparedQuery) {
 #if MYSQL_VERSION_ID >= 40108
         numRows = mysql_stmt_num_rows(d->stmt);
 #else
@@ -574,7 +574,7 @@ QVariant QMYSQLResult::data(int field)
     int fieldLength = 0;
     const QMYSQLResultPrivate::QMyField &f = d->fields.at(field);
     QString val;
-    if (d->driver->d->preparedQuerys) {
+    if (d->preparedQuery) {
         if (f.nullIndicator)
             return QVariant(f.type);
 
@@ -634,7 +634,7 @@ QVariant QMYSQLResult::data(int field)
     case QVariant::ByteArray: {
 
         QByteArray ba;
-        if (d->driver->d->preparedQuerys) {
+        if (d->preparedQuery) {
             ba = QByteArray(f.outField, f.bufLength);
         } else {
             ba = QByteArray(d->row[field], fieldLength);
@@ -651,7 +651,7 @@ QVariant QMYSQLResult::data(int field)
 
 bool QMYSQLResult::isNull(int field)
 {
-   if (d->driver->d->preparedQuerys)
+   if (d->preparedQuery)
        return d->fields.at(field).nullIndicator;
    else
        return d->row[field] == NULL;
@@ -662,11 +662,9 @@ bool QMYSQLResult::reset (const QString& query)
     if (!driver() || !driver()->isOpen() || driver()->isOpenError() || !d->driver)
         return false;
 
-    if(d->driver->d->preparedQuerysEnabled && prepare(query)) {
-        d->driver->d->preparedQuerys = true;
-        return exec();
-    }
-    d->driver->d->preparedQuerys = false;
+    d->preparedQuery = false;
+
+    cleanup();
 
     const QByteArray encQuery(fromUnicode(d->driver->d->tc, query));
     if (mysql_real_query(d->driver->d->mysql, encQuery.data(), encQuery.length())) {
@@ -699,7 +697,7 @@ bool QMYSQLResult::reset (const QString& query)
 int QMYSQLResult::size()
 {
     if (d->driver && isSelect())
-        if (d->driver->d->preparedQuerys)
+        if (d->preparedQuery)
 #if MYSQL_VERSION_ID >= 40108
             return mysql_stmt_num_rows(d->stmt);
 #else
@@ -721,7 +719,7 @@ QVariant QMYSQLResult::lastInsertId() const
     if (!isActive() || !d->driver)
         return QVariant();
 
-    if (d->driver->d->preparedQuerys) {
+    if (d->preparedQuery) {
 #if MYSQL_VERSION_ID >= 40108
         quint64 id = mysql_stmt_insert_id(d->stmt);
         if (id)
@@ -743,7 +741,7 @@ QSqlRecord QMYSQLResult::record() const
         return info;
 
 #if MYSQL_VERSION_ID >= 40108
-    res = d->driver->d->preparedQuerys ? d->meta : d->result;
+    res = d->preparedQuery ? d->meta : d->result;
 #else
     res = d->result;
 #endif
@@ -856,7 +854,7 @@ bool QMYSQLResult::prepare(const QString& query)
         return false;
 #if MYSQL_VERSION_ID >= 40108
     cleanup();
-    if (!d->driver->d->preparedQuerys)
+    if (!d->driver->d->preparedQuerysEnabled)
         return QSqlResult::prepare(query);
 
     int r;
@@ -886,6 +884,7 @@ bool QMYSQLResult::prepare(const QString& query)
     }
 
     setSelect(d->bindInValues());
+    d->preparedQuery = true;
     return true;
 #else
     return false;
@@ -896,7 +895,7 @@ bool QMYSQLResult::exec()
 {
     if (!d->driver)
         return false;
-    if (!d->driver->d->preparedQuerys)
+    if (!d->preparedQuery)
         return QSqlResult::exec();
     if (!d->stmt)
         return false;
@@ -1338,9 +1337,6 @@ QSqlIndex QMYSQLDriver::primaryIndex(const QString& tablename) const
     if (!isOpen())
         return idx;
 
-    prepQ = d->preparedQuerysEnabled;
-    d->preparedQuerysEnabled = false;
-
     QSqlQuery i(createResult());
     QString stmt(QLatin1String("show index from %1;"));
     QSqlRecord fil = record(tablename);
@@ -1353,7 +1349,6 @@ QSqlIndex QMYSQLDriver::primaryIndex(const QString& tablename) const
         }
     }
 
-    d->preparedQuerysEnabled = prepQ;
     return idx;
 }
 
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 7f6f32226..ef3f0f8ff 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -169,6 +169,7 @@ private slots:
     void setParentItem();
     void children();
     void flags();
+    void inputMethodHints();
     void toolTip();
     void visible();
     void explicitlyVisible();
@@ -762,6 +763,18 @@ void tst_QGraphicsItem::flags()
     }
 }
 
+class ImhTester : public QGraphicsItem
+{
+    QRectF boundingRect() const { return QRectF(); }
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {}
+};
+
+void tst_QGraphicsItem::inputMethodHints()
+{
+    ImhTester item;
+    QCOMPARE(item.inputMethodHints(), Qt::ImhNone);
+}
+
 void tst_QGraphicsItem::toolTip()
 {
     QString toolTip = "Qt rocks!";
diff --git a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
index 65dd86f59..6714de3ac 100644
--- a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
@@ -61,6 +61,7 @@
 #include <QAbstractItemDelegate>
 #include <QTextEdit>
 #include <QPlainTextEdit>
+#include <QDialog>
 
 Q_DECLARE_METATYPE(QAbstractItemDelegate::EndEditHint)
 
@@ -230,6 +231,8 @@ private slots:
     void editorEvent();
     void enterKey_data();
     void enterKey();
+
+    void task257859_finalizeEdit();
 };
 
 
@@ -1124,6 +1127,36 @@ void tst_QItemDelegate::enterKey()
     QCOMPARE(editor && editor->hasFocus(), expectedFocus);
 }
 
+void tst_QItemDelegate::task257859_finalizeEdit()
+{
+    QStandardItemModel model;
+    model.appendRow(new QStandardItem());
+
+    QListView view;
+    view.setModel(&model);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    view.setFocus();
+    QTest::qWait(30);
+
+    QModelIndex index = model.index(0, 0);
+    view.edit(index);
+    QTest::qWait(30);
+
+    QList<QWidget*> lineEditors = qFindChildren<QWidget *>(view.viewport());
+    QCOMPARE(lineEditors.count(), 1);
+
+    QPointer<QWidget> editor = lineEditors.at(0);
+    QCOMPARE(editor->hasFocus(), true);
+
+    QDialog dialog;
+    QTimer::singleShot(100, &dialog, SLOT(close()));
+    dialog.exec();
+
+    QTest::qWait(10);
+
+    QVERIFY(!editor);
+}
 
 
 // ### _not_ covered:
diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
index ae64e510e..0541b461f 100644
--- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -1547,7 +1547,7 @@ void tst_QItemSelectionModel::resetModel()
     model.reset();
 
     QVERIFY(view.selectionModel()->selection().isEmpty());
-    QVERIFY(view.selectionModel()->hasSelection());
+    QVERIFY(view.selectionModel()->hasSelection() == false);
 
     view.selectionModel()->select(QItemSelection(model.index(0, 0), model.index(5, 5)), QItemSelectionModel::Select);
 
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index ec9c7b47c..6ba646666 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -96,6 +96,7 @@ private slots:
     void task256918_setFont();
     void menuSizeHint();
     void task258920_mouseBorder();
+    void setFixedWidth();
 protected slots:
     void onActivated(QAction*);
     void onHighlighted(QAction*);
@@ -798,6 +799,17 @@ void tst_QMenu::task258920_mouseBorder()
     QVERIFY(menu.painted);
 }
 
+void tst_QMenu::setFixedWidth()
+{
+    QMenu menu;
+    menu.addAction("action");
+    menu.setFixedWidth(300);
+    //the sizehint should reflect the minimumwidth because the action will try to
+    //get as much space as possible
+    QCOMPARE(menu.sizeHint().width(), menu.minimumWidth());
+}
+
+
 
 QTEST_MAIN(tst_QMenu)
 #include "tst_qmenu.moc"
diff --git a/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
index d7d6b8843..16c58b0d4 100644
--- a/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
+++ b/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
@@ -74,6 +74,7 @@ private slots:
     void loopCount_data();
     void loopCount();
     void autoAdd();
+    void pauseResume();
 };
 
 tst_QParallelAnimationGroup::tst_QParallelAnimationGroup()
@@ -828,5 +829,37 @@ void tst_QParallelAnimationGroup::autoAdd()
     QCOMPARE(group.duration(), 0);
 }
 
+void tst_QParallelAnimationGroup::pauseResume()
+{
+    QParallelAnimationGroup group;
+    TestAnimation2 *anim = new TestAnimation2(250, &group);      // 0, duration = 250;
+    QSignalSpy spy(anim, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)));
+    QCOMPARE(group.duration(), 250);
+    group.start();
+    QTest::qWait(100);
+    QCOMPARE(group.state(), QAnimationGroup::Running);
+    QCOMPARE(anim->state(), QAnimationGroup::Running);
+    QCOMPARE(spy.count(), 1);
+    spy.clear();
+    const int currentTime = group.currentTime();
+    QCOMPARE(anim->currentTime(), currentTime);
+
+    group.pause();
+    QCOMPARE(group.state(), QAnimationGroup::Paused);
+    QCOMPARE(group.currentTime(), currentTime);
+    QCOMPARE(anim->state(), QAnimationGroup::Paused);
+    QCOMPARE(anim->currentTime(), currentTime);
+    QCOMPARE(spy.count(), 1);
+    spy.clear();
+
+    group.resume();
+    QCOMPARE(group.state(), QAnimationGroup::Running);
+    QCOMPARE(group.currentTime(), currentTime);
+    QCOMPARE(anim->state(), QAnimationGroup::Running);
+    QCOMPARE(anim->currentTime(), currentTime);
+    QCOMPARE(spy.count(), 1);
+}
+
+
 QTEST_MAIN(tst_QParallelAnimationGroup)
 #include "tst_qparallelanimationgroup.moc"
diff --git a/tools/assistant/lib/qhelpsearchquerywidget.cpp b/tools/assistant/lib/qhelpsearchquerywidget.cpp
index 00444b18d..110df4f7f 100644
--- a/tools/assistant/lib/qhelpsearchquerywidget.cpp
+++ b/tools/assistant/lib/qhelpsearchquerywidget.cpp
@@ -43,9 +43,12 @@
 
 #include <QtCore/QDebug>
 
+#include <QtCore/QAbstractListModel>
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
+#include <QtCore/QtGlobal>
 
+#include <QtGui/QCompleter>
 #include <QtGui/QLabel>
 #include <QtGui/QLayout>
 #include <QtGui/QLineEdit>
@@ -60,8 +63,46 @@ class QHelpSearchQueryWidgetPrivate : public QObject
     Q_OBJECT
 
 private:
+    struct QueryHistory {
+        explicit QueryHistory() : curQuery(-1) {}
+        QList<QList<QHelpSearchQuery> > queries;
+        int curQuery;
+    };
+
+    class CompleterModel : public QAbstractListModel
+    {
+    public:
+        explicit CompleterModel(QObject *parent)
+          : QAbstractListModel(parent) {}
+
+        int rowCount(const QModelIndex &parent = QModelIndex()) const
+        {
+            return parent.isValid() ? 0 : termList.size();
+        }
+
+        QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const
+        {
+            if (!index.isValid() || index.row() >= termList.count()||
+                (role != Qt::EditRole && role != Qt::DisplayRole))
+                return QVariant();
+            return termList.at(index.row());
+        }
+
+        void addTerm(const QString &term)
+        {
+            if (!termList.contains(term)) {
+                termList.append(term);
+                reset();
+            }
+        }
+
+    private:
+        QStringList termList;
+    };
+
     QHelpSearchQueryWidgetPrivate()
-        : QObject()
+        : QObject(), simpleSearch(true),
+          searchCompleter(new CompleterModel(this), this)
     {
         searchButton = 0;
         advancedSearchWidget = 0;
@@ -136,11 +177,102 @@ private:
         return wordList;
     }
 
+    void saveQuery(const QList<QHelpSearchQuery> &query, QueryHistory &queryHist)
+    {
+        // We only add the query to the list if it is different from the last one.
+        bool insert = false;
+        if (queryHist.queries.empty())
+            insert = true;
+        else {
+            const QList<QHelpSearchQuery> &lastQuery = queryHist.queries.last();
+            if (lastQuery.size() != query.size()) {
+                insert = true;
+            } else {
+                for (int i = 0; i < query.size(); ++i) {
+                    if (query.at(i).fieldName != lastQuery.at(i).fieldName
+                        || query.at(i).wordList != lastQuery.at(i).wordList) {
+                        insert = true;
+                        break;
+                    }
+                }
+            }
+        }
+        if (insert) {
+            queryHist.queries.append(query);
+            foreach (const QHelpSearchQuery &queryPart, query) {
+                static_cast<CompleterModel *>(searchCompleter.model())->
+                        addTerm(queryPart.wordList.join(" "));
+            }
+        }
+    }
+
+    void nextOrPrevQuery(int maxOrMinIndex, int addend,
+                         QToolButton *thisButton, QToolButton *otherButton)
+    {
+        QueryHistory *queryHist;
+        QList<QLineEdit *> lineEdits;
+        if (simpleSearch) {
+            queryHist = &simpleQueries;
+            lineEdits << defaultQuery;
+        } else {
+            queryHist = &complexQueries;
+            lineEdits << allQuery << atLeastQuery << similarQuery
+                    << withoutQuery << exactQuery;
+        }
+        foreach (QLineEdit *lineEdit, lineEdits)
+            lineEdit->clear();
+
+        // Otherwise, the respective button would be disabled.
+        Q_ASSERT(queryHist->curQuery != maxOrMinIndex);
+
+        queryHist->curQuery += addend;
+        const QList<QHelpSearchQuery> &query =
+                queryHist->queries.at(queryHist->curQuery);
+        foreach (const QHelpSearchQuery &queryPart, query) {
+            QLineEdit *lineEdit;
+            switch (queryPart.fieldName) {
+            case QHelpSearchQuery::DEFAULT:
+                lineEdit = defaultQuery;
+                break;
+            case QHelpSearchQuery::ALL:
+                lineEdit = allQuery;
+                break;
+            case QHelpSearchQuery::ATLEAST:
+                lineEdit = atLeastQuery;
+                break;
+            case QHelpSearchQuery::FUZZY:
+                lineEdit = similarQuery;
+                break;
+            case QHelpSearchQuery::WITHOUT:
+                lineEdit = withoutQuery;
+                break;
+            case QHelpSearchQuery::PHRASE:
+                lineEdit = exactQuery;
+                break;
+            default:
+                Q_ASSERT(0);
+            }
+            lineEdit->setText(queryPart.wordList.join(" "));
+        }
+
+        if (queryHist->curQuery == maxOrMinIndex)
+            thisButton->setEnabled(false);
+        otherButton->setEnabled(true);
+    }
+
+    void enableOrDisableToolButtons()
+    {
+        const QueryHistory &queryHist =
+                simpleSearch ? simpleQueries : complexQueries;
+        prevQueryButton->setEnabled(queryHist.curQuery > 0);
+        nextQueryButton->setEnabled(queryHist.curQuery <
+                                    queryHist.queries.size() - 1);
+    }
+
 private slots:
     void showHideAdvancedSearch()
     {
-        bool hidden = advancedSearchWidget->isHidden();
-        if (hidden) {
+        if (simpleSearch) {
             advancedSearchWidget->show();
             showHideAdvancedSearchButton->setText((QLatin1String("-")));
         } else {
@@ -148,12 +280,86 @@ private slots:
             showHideAdvancedSearchButton->setText((QLatin1String("+")));
         }
 
-        defaultQuery->setEnabled(!hidden);
+        simpleSearch = !simpleSearch;
+        defaultQuery->setEnabled(simpleSearch);
+        enableOrDisableToolButtons();
+    }
+
+    void searchRequested()
+    {
+        QList<QHelpSearchQuery> queryList;
+#if !defined(QT_CLUCENE_SUPPORT)
+        queryList.append(QHelSearchQuery(QHelpSearchQuery::DEFAULT,
+                                          QStringList(defaultQuery->text())));
+
+#else
+        if (defaultQuery->isEnabled()) {
+            queryList.append(QHelpSearchQuery(QHelpSearchQuery::DEFAULT,
+                                              buildTermList(escapeString(defaultQuery->text()))));
+        } else {
+            const QRegExp exp(QLatin1String("\\s+"));
+            QStringList lst = similarQuery->text().split(exp, QString::SkipEmptyParts);
+            if (!lst.isEmpty()) {
+                QStringList fuzzy;
+                foreach (const QString term, lst)
+                    fuzzy += buildTermList(escapeString(term));
+                queryList.append(QHelpSearchQuery(QHelpSearchQuery::FUZZY, fuzzy));
+            }
+
+            lst = withoutQuery->text().split(exp, QString::SkipEmptyParts);
+            if (!lst.isEmpty()) {
+                QStringList without;
+                foreach (const QString term, lst)
+                    without.append(escapeString(term));
+                queryList.append(QHelpSearchQuery(QHelpSearchQuery::WITHOUT, without));
+            }
+
+            if (!exactQuery->text().isEmpty()) {
+                QString phrase = exactQuery->text().remove(QLatin1Char('\"'));
+                phrase = escapeString(phrase.simplified());
+                queryList.append(QHelpSearchQuery(QHelpSearchQuery::PHRASE, QStringList(phrase)));
+            }
+
+            lst = allQuery->text().split(exp, QString::SkipEmptyParts);
+            if (!lst.isEmpty()) {
+                QStringList all;
+                foreach (const QString term, lst)
+                    all.append(escapeString(term));
+                queryList.append(QHelpSearchQuery(QHelpSearchQuery::ALL, all));
+            }
+
+            lst = atLeastQuery->text().split(exp, QString::SkipEmptyParts);
+            if (!lst.isEmpty()) {
+                QStringList atLeast;
+                foreach (const QString term, lst)
+                    atLeast += buildTermList(escapeString(term));
+                queryList.append(QHelpSearchQuery(QHelpSearchQuery::ATLEAST, atLeast));
+            }
+        }
+#endif
+        QueryHistory &queryHist = simpleSearch ? simpleQueries : complexQueries;
+        saveQuery(queryList, queryHist);
+        queryHist.curQuery = queryHist.queries.size() - 1;
+        if (queryHist.curQuery > 0)
+            prevQueryButton->setEnabled(true);
+        nextQueryButton->setEnabled(false);
+    }
+
+    void nextQuery()
+    {
+        nextOrPrevQuery((simpleSearch ? simpleQueries : complexQueries).queries.size() - 1,
+                        1, nextQueryButton, prevQueryButton);
+    }
+
+    void prevQuery()
+    {
+        nextOrPrevQuery(0, -1, prevQueryButton, nextQueryButton);
     }
 
 private:
     friend class QHelpSearchQueryWidget;
 
+    bool simpleSearch;
     QPushButton *searchButton;
     QWidget* advancedSearchWidget;
     QToolButton *showHideAdvancedSearchButton;
@@ -163,6 +369,11 @@ private:
     QLineEdit *withoutQuery;
     QLineEdit *allQuery;
     QLineEdit *atLeastQuery;
+    QToolButton *nextQueryButton;
+    QToolButton *prevQueryButton;
+    QueryHistory simpleQueries;
+    QueryHistory complexQueries;
+    QCompleter searchCompleter;
 };
 
 #include "qhelpsearchquerywidget.moc"
@@ -199,13 +410,26 @@ QHelpSearchQueryWidget::QHelpSearchQueryWidget(QWidget *parent)
     QHBoxLayout* hBoxLayout = new QHBoxLayout();
     QLabel *label = new QLabel(tr("Search for:"), this);
     d->defaultQuery = new QLineEdit(this);
+    d->defaultQuery->setCompleter(&d->searchCompleter);
+    d->prevQueryButton = new QToolButton(this);
+    d->prevQueryButton->setArrowType(Qt::LeftArrow);
+    d->prevQueryButton->setToolTip(tr("Previous search"));
+    d->prevQueryButton->setEnabled(false);
+    d->nextQueryButton = new QToolButton(this);
+    d->nextQueryButton->setArrowType(Qt::RightArrow);
+    d->nextQueryButton->setToolTip(tr("Next search"));
+    d->nextQueryButton->setEnabled(false);
     d->searchButton = new QPushButton(tr("Search"), this);
     hBoxLayout->addWidget(label);
     hBoxLayout->addWidget(d->defaultQuery);
+    hBoxLayout->addWidget(d->prevQueryButton);
+    hBoxLayout->addWidget(d->nextQueryButton);
     hBoxLayout->addWidget(d->searchButton);
 
     vLayout->addLayout(hBoxLayout);
 
+    connect(d->prevQueryButton, SIGNAL(clicked()), d, SLOT(prevQuery()));
+    connect(d->nextQueryButton, SIGNAL(clicked()), d, SLOT(nextQuery()));
     connect(d->searchButton, SIGNAL(clicked()), this, SIGNAL(search()));
     connect(d->defaultQuery, SIGNAL(returnPressed()), this, SIGNAL(search()));
 
@@ -236,26 +460,31 @@ QHelpSearchQueryWidget::QHelpSearchQueryWidget(QWidget *parent)
     label = new QLabel(tr("words <B>similar</B> to:"), this);
     gLayout->addWidget(label, 0, 0);
     d->similarQuery = new QLineEdit(this);
+    d->similarQuery->setCompleter(&d->searchCompleter);
     gLayout->addWidget(d->similarQuery, 0, 1);
 
     label = new QLabel(tr("<B>without</B> the words:"), this);
     gLayout->addWidget(label, 1, 0);
     d->withoutQuery = new QLineEdit(this);
+    d->withoutQuery->setCompleter(&d->searchCompleter);
     gLayout->addWidget(d->withoutQuery, 1, 1);
 
     label = new QLabel(tr("with <B>exact phrase</B>:"), this);
     gLayout->addWidget(label, 2, 0);
     d->exactQuery = new QLineEdit(this);
+    d->exactQuery->setCompleter(&d->searchCompleter);
     gLayout->addWidget(d->exactQuery, 2, 1);
 
     label = new QLabel(tr("with <B>all</B> of the words:"), this);
     gLayout->addWidget(label, 3, 0);
     d->allQuery = new QLineEdit(this);
+    d->allQuery->setCompleter(&d->searchCompleter);
     gLayout->addWidget(d->allQuery, 3, 1);
 
     label = new QLabel(tr("with <B>at least one</B> of the words:"), this);
     gLayout->addWidget(label, 4, 0);
     d->atLeastQuery = new QLineEdit(this);
+    d->atLeastQuery->setCompleter(&d->searchCompleter);
     gLayout->addWidget(d->atLeastQuery, 4, 1);
 
     vLayout->addWidget(d->advancedSearchWidget);
@@ -269,6 +498,7 @@ QHelpSearchQueryWidget::QHelpSearchQueryWidget(QWidget *parent)
     connect(d->showHideAdvancedSearchButton, SIGNAL(clicked()),
         d, SLOT(showHideAdvancedSearch()));
 #endif
+    connect(this, SIGNAL(search()), d, SLOT(searchRequested()));
 }
 
 /*!
@@ -285,59 +515,10 @@ QHelpSearchQueryWidget::~QHelpSearchQueryWidget()
 */
 QList<QHelpSearchQuery> QHelpSearchQueryWidget::query() const
 {
-#if !defined(QT_CLUCENE_SUPPORT)
-    QList<QHelpSearchQuery> queryList;
-    queryList.append(QHelpSearchQuery(QHelpSearchQuery::DEFAULT,
-        QStringList(d->defaultQuery->text())));
-
-    return queryList;
-#else
-    QList<QHelpSearchQuery> queryList;
-    if (d->defaultQuery->isEnabled()) {
-        queryList.append(QHelpSearchQuery(QHelpSearchQuery::DEFAULT,
-            d->buildTermList(d->escapeString(d->defaultQuery->text()))));
-    } else {
-        const QRegExp exp(QLatin1String("\\s+"));
-        QStringList lst = d->similarQuery->text().split(exp, QString::SkipEmptyParts);
-        if (!lst.isEmpty()) {
-            QStringList fuzzy;
-            foreach (const QString term, lst)
-                fuzzy += d->buildTermList(d->escapeString(term));
-            queryList.append(QHelpSearchQuery(QHelpSearchQuery::FUZZY, fuzzy));
-        }
-
-        lst = d->withoutQuery->text().split(exp, QString::SkipEmptyParts);
-        if (!lst.isEmpty()) {
-            QStringList without;
-            foreach (const QString term, lst)
-                without.append(d->escapeString(term));
-            queryList.append(QHelpSearchQuery(QHelpSearchQuery::WITHOUT, without));
-        }
-
-        if (!d->exactQuery->text().isEmpty()) {
-            QString phrase = d->exactQuery->text().remove(QLatin1Char('\"'));
-            phrase = d->escapeString(phrase.simplified());
-            queryList.append(QHelpSearchQuery(QHelpSearchQuery::PHRASE, QStringList(phrase)));
-        }
-
-        lst = d->allQuery->text().split(exp, QString::SkipEmptyParts);
-        if (!lst.isEmpty()) {
-            QStringList all;
-            foreach (const QString term, lst)
-                all.append(d->escapeString(term));
-            queryList.append(QHelpSearchQuery(QHelpSearchQuery::ALL, all));
-        }
-
-        lst = d->atLeastQuery->text().split(exp, QString::SkipEmptyParts);
-        if (!lst.isEmpty()) {
-            QStringList atLeast;
-            foreach (const QString term, lst)
-                atLeast += d->buildTermList(d->escapeString(term));
-            queryList.append(QHelpSearchQuery(QHelpSearchQuery::ATLEAST, atLeast));
-        }
-    }
-    return queryList;
-#endif
+    const QHelpSearchQueryWidgetPrivate::QueryHistory &queryHist =
+        d->simpleSearch ? d->simpleQueries : d->complexQueries;
+    return queryHist.queries.isEmpty() ?
+        QList<QHelpSearchQuery>() : queryHist.queries.last();
 }
 
 /*! \reimp
diff --git a/tools/assistant/tools/assistant/main.cpp b/tools/assistant/tools/assistant/main.cpp
index a0a5a0dfa..4af2570d0 100644
--- a/tools/assistant/tools/assistant/main.cpp
+++ b/tools/assistant/tools/assistant/main.cpp
@@ -181,7 +181,21 @@ QString indexFilesFolder(const QString &collectionFile)
 
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
+    // First do a quick search for arguments that imply command-line mode.
+    const char * cmdModeArgs[] = {
+        "-help", "-register", "-unregister", "-remove-search-index"
+    };
+    bool useGui = true;
+    for (int i = 1; i < argc; ++i) {
+        for (size_t j = 0; j < sizeof cmdModeArgs/sizeof *cmdModeArgs; ++j) {
+            if(strcmp(argv[i], cmdModeArgs[j]) == 0) {
+                useGui = false;
+                break;
+            }
+        }
+    }
+
+    QApplication a(argc, argv, useGui);
     a.addLibraryPath(a.applicationDirPath() + QLatin1String("/plugins"));
 
     CmdLineParser cmd;
diff --git a/tools/qdoc3/atom.cpp b/tools/qdoc3/atom.cpp
index a82a7830b..da32735b5 100644
--- a/tools/qdoc3/atom.cpp
+++ b/tools/qdoc3/atom.cpp
@@ -93,6 +93,7 @@ QString Atom::UPPERROMAN_    ("upperroman");
 
   \value AbstractLeft
   \value AbstractRight
+  \value AnnotatedList
   \value AutoLink
   \value BaseName
   \value BriefLeft
@@ -163,6 +164,7 @@ static const struct {
 } atms[] = {
     { "AbstractLeft", Atom::AbstractLeft },
     { "AbstractRight", Atom::AbstractRight },
+    { "AnnotatedList", Atom::AnnotatedList },
     { "AutoLink", Atom::AutoLink },
     { "BaseName", Atom::BaseName },
     { "BriefLeft", Atom::BriefLeft },
diff --git a/tools/qdoc3/atom.h b/tools/qdoc3/atom.h
index 6d5af0a4f..941ac700c 100644
--- a/tools/qdoc3/atom.h
+++ b/tools/qdoc3/atom.h
@@ -58,6 +58,7 @@ class Atom
     enum Type { 
         AbstractLeft, 
         AbstractRight, 
+        AnnotatedList,
         AutoLink,
         BaseName, 
         BriefLeft,
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index 4563f6560..562684b4d 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -1724,6 +1724,9 @@ bool CppCodeParser::matchProperty(InnerNode *parent)
             value = "?";
         }
 
+        /*
+          Task 259071 requires work here. See gui/widgets/qdatetime.h, for example.
+         */
         if (key == "READ")
             tre->addPropertyFunction(property, value, PropertyNode::Getter);
         else if (key == "WRITE")
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index d5aca0e30..e2f3525fe 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -73,20 +73,20 @@ struct Macro
 };
 
 enum {
-    CMD_A, CMD_ABSTRACT, CMD_BADCODE, CMD_BASENAME, CMD_BOLD,
-    CMD_BRIEF, CMD_C, CMD_CAPTION, CMD_CHAPTER, CMD_CODE,
-    CMD_CODELINE, CMD_DOTS, CMD_ELSE, CMD_ENDABSTRACT,
-    CMD_ENDCHAPTER, CMD_ENDCODE, CMD_ENDFOOTNOTE, CMD_ENDIF,
-    CMD_ENDLEGALESE, CMD_ENDLINK, CMD_ENDLIST, CMD_ENDOMIT,
-    CMD_ENDPART, CMD_ENDQUOTATION, CMD_ENDRAW, CMD_ENDSECTION1,
-    CMD_ENDSECTION2, CMD_ENDSECTION3, CMD_ENDSECTION4,
-    CMD_ENDSIDEBAR, CMD_ENDTABLE, CMD_EXPIRE, CMD_FOOTNOTE,
-    CMD_GENERATELIST, CMD_GRANULARITY, CMD_HEADER, CMD_I,
-    CMD_IF, CMD_IMAGE, CMD_INCLUDE, CMD_INLINEIMAGE, CMD_INDEX,
-    CMD_KEYWORD, CMD_L, CMD_LEGALESE, CMD_LINK, CMD_LIST,
-    CMD_META, CMD_NEWCODE, CMD_O, CMD_OLDCODE, CMD_OMIT,
-    CMD_OMITVALUE, CMD_OVERLOAD,
-    CMD_PART, CMD_PRINTLINE, CMD_PRINTTO,
+    CMD_A, CMD_ABSTRACT, CMD_ANNOTATEDLIST, CMD_BADCODE,
+    CMD_BASENAME, CMD_BOLD, CMD_BRIEF, CMD_C, CMD_CAPTION,
+    CMD_CHAPTER, CMD_CODE, CMD_CODELINE, CMD_DOTS, CMD_ELSE,
+    CMD_ENDABSTRACT, CMD_ENDCHAPTER, CMD_ENDCODE,
+    CMD_ENDFOOTNOTE, CMD_ENDIF, CMD_ENDLEGALESE, CMD_ENDLINK,
+    CMD_ENDLIST, CMD_ENDOMIT, CMD_ENDPART, CMD_ENDQUOTATION,
+    CMD_ENDRAW, CMD_ENDSECTION1, CMD_ENDSECTION2,
+    CMD_ENDSECTION3, CMD_ENDSECTION4, CMD_ENDSIDEBAR,
+    CMD_ENDTABLE, CMD_EXPIRE, CMD_FOOTNOTE, CMD_GENERATELIST,
+    CMD_GRANULARITY, CMD_HEADER, CMD_I, CMD_IF, CMD_IMAGE,
+    CMD_INCLUDE, CMD_INLINEIMAGE, CMD_INDEX, CMD_KEYWORD,
+    CMD_L, CMD_LEGALESE, CMD_LINK, CMD_LIST, CMD_META,
+    CMD_NEWCODE, CMD_O, CMD_OLDCODE, CMD_OMIT, CMD_OMITVALUE,
+    CMD_OVERLOAD, CMD_PART, CMD_PRINTLINE, CMD_PRINTTO,
     CMD_PRINTUNTIL, CMD_QUOTATION, CMD_QUOTEFILE,
     CMD_QUOTEFROMFILE, CMD_QUOTEFUNCTION, CMD_RAW, CMD_ROW,
     CMD_SA, CMD_SECTION1, CMD_SECTION2, CMD_SECTION3,
@@ -108,6 +108,7 @@ static struct {
 } cmds[] = {
     { "a", CMD_A, 0 },
     { "abstract", CMD_ABSTRACT, 0 },
+    { "annotatedlist", CMD_ANNOTATEDLIST, 0 },
     { "badcode", CMD_BADCODE, 0 },
     { "basename", CMD_BASENAME, 0 }, // ### don't document for now
     { "bold", CMD_BOLD, 0 },
@@ -723,6 +724,9 @@ void DocParser::parse(const QString& source,
                             paraState = OutsidePara; // ###
                         }
                         break;
+                    case CMD_ANNOTATEDLIST:
+                        append(Atom::AnnotatedList, getArgument());
+                        break;
                     case CMD_GENERATELIST:
                         append(Atom::GeneratedList, getArgument());
                         break;
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 659011473..425c50b12 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -537,6 +537,20 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             out() << formattingRightMap()[atom->string()];
         }
         break;
+    case Atom::AnnotatedList:
+        {
+            const FakeNode *fake = static_cast<const FakeNode *>(relative);
+            if (fake && !fake->groupMembers().isEmpty()) {
+                QList<Node*> values = tre->groups().values(atom->string());
+                QMap<QString, const Node*> nodeMap;
+                for (int i = 0; i < values.size(); ++i) {
+                    const Node* n = values.at(i);
+                    nodeMap.insert(n->name(),n);
+                }
+                generateAnnotatedList(fake, marker, nodeMap);
+            }
+        }
+        break;
     case Atom::GeneratedList:
         if (atom->string() == "annotatedclasses") {
             generateAnnotatedList(relative, marker, nonCompatClasses);
diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp
index e6dd08448..d75af70ee 100644
--- a/tools/qdoc3/tree.cpp
+++ b/tools/qdoc3/tree.cpp
@@ -419,6 +419,8 @@ void Tree::addPropertyFunction(PropertyNode *property,
 }
 
 /*!
+  This function adds the \a node to the \a group. The group
+  can be listed anywhere using the \e{annotated list} command.
  */
 void Tree::addToGroup(Node *node, const QString &group)
 {