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

100 files changed, 3060 insertions, 2241 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index b43602e..d65095d 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -128,7 +128,7 @@ SOURCES += \
     yarr/RegexJIT.cpp \
     interpreter/RegisterFile.cpp
 
-win32-*: SOURCES += jit/ExecutableAllocatorWin.cpp
+win32-*|wince*: SOURCES += jit/ExecutableAllocatorWin.cpp
 else: SOURCES += jit/ExecutableAllocatorPosix.cpp
 
 # AllInOneFile.cpp helps gcc analize and optimize code
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index fc11815..696a95a 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -137,7 +137,6 @@ QT_BEGIN_NAMESPACE
     \sa currentValue
 */
 
-
 static bool animationValueLessThan(const QVariantAnimation::KeyValue &p1, const QVariantAnimation::KeyValue &p2)
 {
     return p1.first < p2.first;
@@ -178,11 +177,8 @@ template<> Q_INLINE_TEMPLATE QLineF _q_interpolate(const QLineF &f, const QLineF
     return QLineF( _q_interpolate(f.p1(), t.p1(), progress), _q_interpolate(f.p2(), t.p2(), progress));
 }
 
-QVariantAnimationPrivate::QVariantAnimationPrivate() : duration(250), interpolator(&defaultInterpolator),
-                          changedSignalMask(1 << QVariantAnimation::staticMetaObject.indexOfSignal("valueChanged(QVariant)"))
-{
-    //we keep the mask so that we emit valueChanged only when needed (for performance reasons)
-}
+QVariantAnimationPrivate::QVariantAnimationPrivate() : duration(250), interpolator(&defaultInterpolator)
+{ }
 
 void QVariantAnimationPrivate::convertValues(int t)
 {
@@ -278,7 +274,12 @@ void QVariantAnimationPrivate::setCurrentValueForProgress(const qreal progress)
                                    localProgress);
     qSwap(currentValue, ret);
     q->updateCurrentValue(currentValue);
-    if ((connectedSignals[0] & changedSignalMask) && currentValue != ret) {
+    static QBasicAtomicInt changedSignalIndex = Q_BASIC_ATOMIC_INITIALIZER(0);
+    if (!changedSignalIndex) {
+        //we keep the mask so that we emit valueChanged only when needed (for performance reasons)
+        changedSignalIndex.testAndSetRelaxed(0, signalIndex("valueChanged(QVariant)"));
+    }
+    if (isSignalConnected(changedSignalIndex) && currentValue != ret) {
         //the value has changed
         emit q->valueChanged(currentValue);
     }
diff --git a/src/corelib/animation/qvariantanimation_p.h b/src/corelib/animation/qvariantanimation_p.h
index ef57a4c..ce625f1 100644
--- a/src/corelib/animation/qvariantanimation_p.h
+++ b/src/corelib/animation/qvariantanimation_p.h
@@ -93,8 +93,6 @@ public:
 
     QVariantAnimation::Interpolator interpolator;
 
-    const quint32 changedSignalMask;
-
     void setCurrentValueForProgress(const qreal progress);
     void recalculateCurrentInterval(bool force=false);
     void setValueAt(qreal, const QVariant &);
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 4915c39..039e801 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -709,6 +709,7 @@ static void setup()
     (void)new QJisCodec;
     (void)new QSjisCodec;
     (void)new QEucKrCodec;
+    (void)new QCP949Codec;
     (void)new QBig5Codec;
     (void)new QBig5hkscsCodec;
 #  endif // QT_NO_ICONV && !QT_BOOTSTRAPPED
diff --git a/src/corelib/concurrent/qtconcurrentmap.cpp b/src/corelib/concurrent/qtconcurrentmap.cpp
index 3fd044d..243921a 100644
--- a/src/corelib/concurrent/qtconcurrentmap.cpp
+++ b/src/corelib/concurrent/qtconcurrentmap.cpp
@@ -1,4 +1,4 @@
-    /****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 6722418..7dbbc1b 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2026,7 +2026,7 @@ inline void qSwap(T &value1, T &value2)
 template <> inline bool qIsDetached<TYPE>(TYPE &t) { return t.isDetached(); } \
 template <> inline void qSwap<TYPE>(TYPE &value1, TYPE &value2) \
 { \
-    qSwap<TYPE::DataPtr>(value1.data_ptr(), value2.data_ptr()); \
+    qSwap(value1.data_ptr(), value2.data_ptr()); \
 }
 
 /*
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index c8cf6dc..0e654af 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -473,7 +473,7 @@ QT_END_NAMESPACE
 extern const char qt_core_interpreter[] __attribute__((section(".interp")))
     = ELF_INTERPRETER;
 
-extern "C"
+extern "C" void qt_core_boilerplate();
 void qt_core_boilerplate()
 {
     printf("This is the QtCore library version " QT_VERSION_STR "\n"
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 91d41f1..f9a1aca 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -2447,7 +2447,7 @@ QDebug operator<<(QDebug debug, QDir::Filters filters)
     return debug;
 }
 
-QDebug operator<<(QDebug debug, QDir::SortFlags sorting)
+static QDebug operator<<(QDebug debug, QDir::SortFlags sorting)
 {
     if (sorting == QDir::NoSort) {
         debug << "QDir::SortFlags(NoSort)";
diff --git a/src/corelib/kernel/qabstracteventdispatcher_p.h b/src/corelib/kernel/qabstracteventdispatcher_p.h
index 86c9d79..dc69265 100644
--- a/src/corelib/kernel/qabstracteventdispatcher_p.h
+++ b/src/corelib/kernel/qabstracteventdispatcher_p.h
@@ -58,6 +58,8 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_CORE_EXPORT uint qGlobalPostedEventsCount();
+
 class Q_CORE_EXPORT QAbstractEventDispatcherPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QAbstractEventDispatcher)
diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index d6d1bcf..17af60d 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -251,8 +251,9 @@ QPersistentModelIndex::operator const QModelIndex&() const
 
     Returns true if this persistent model index refers to the same location as
     the \a other model index; otherwise returns false.
-    Note that all values in the persistent model index are used when comparing
-    with another model index.
+
+    All values in the persistent model index are used when comparing with
+    another model index.
 */
 
 bool QPersistentModelIndex::operator==(const QModelIndex &other) const
@@ -335,10 +336,10 @@ qint64 QPersistentModelIndex::internalId() const
 }
 
 /*!
-  Returns the parent QModelIndex for this persistent index, or
-  QModelIndex() if it has no parent.
+    Returns the parent QModelIndex for this persistent index, or an invalid
+    QModelIndex if it has no parent.
 
-  \sa child() sibling() model()
+    \sa child() sibling() model()
 */
 QModelIndex QPersistentModelIndex::parent() const
 {
@@ -348,10 +349,10 @@ QModelIndex QPersistentModelIndex::parent() const
 }
 
 /*!
-  Returns the sibling at \a row and \a column or an invalid
-  QModelIndex if there is no sibling at this position.
+    Returns the sibling at \a row and \a column or an invalid QModelIndex if
+    there is no sibling at this position.
 
-  \sa parent() child()
+    \sa parent() child()
 */
 
 QModelIndex QPersistentModelIndex::sibling(int row, int column) const
@@ -362,10 +363,10 @@ QModelIndex QPersistentModelIndex::sibling(int row, int column) const
 }
 
 /*!
-  Returns the child of the model index that is stored in the given
-  \a row and \a column.
+    Returns the child of the model index that is stored in the given \a row
+    and \a column.
 
-  \sa parent() sibling()
+    \sa parent() sibling()
 */
 
 QModelIndex QPersistentModelIndex::child(int row, int column) const
@@ -376,9 +377,10 @@ QModelIndex QPersistentModelIndex::child(int row, int column) const
 }
 
 /*!
-  Returns the data for the given \a role for the item referred to by the index.
+    Returns the data for the given \a role for the item referred to by the
+    index.
 
-  \sa Qt::ItemDataRole, QAbstractItemModel::setData()
+    \sa Qt::ItemDataRole, QAbstractItemModel::setData()
 */
 QVariant QPersistentModelIndex::data(int role) const
 {
@@ -388,9 +390,9 @@ QVariant QPersistentModelIndex::data(int role) const
 }
 
 /*!
-  \since 4.2
+    \since 4.2
 
-  Returns the flags for the item referred to by the index.
+    Returns the flags for the item referred to by the index.
 */
 Qt::ItemFlags QPersistentModelIndex::flags() const
 {
@@ -400,7 +402,7 @@ Qt::ItemFlags QPersistentModelIndex::flags() const
 }
 
 /*!
-  Returns the model that the index belongs to.
+    Returns the model that the index belongs to.
 */
 const QAbstractItemModel *QPersistentModelIndex::model() const
 {
@@ -414,7 +416,9 @@ const QAbstractItemModel *QPersistentModelIndex::model() const
 
     Returns true if this persistent model index is valid; otherwise returns
     false.
-    A valid index belongs to a model, and has non-negative row and column numbers.
+
+    A valid index belongs to a model, and has non-negative row and column
+    numbers.
 
     \sa model(), row(), column()
 */
@@ -760,44 +764,42 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     selection models to locate an item in the model.
 
     New QModelIndex objects are created by the model using the
-    QAbstractItemModel::createIndex() function. An \e invalid model index
-    can be constructed with the QModelIndex constructor. Invalid indexes are
-    often used as parent indexes when referring to top-level items in a model.
+    QAbstractItemModel::createIndex() function. An \e invalid model index can
+    be constructed with the QModelIndex constructor. Invalid indexes are often
+    used as parent indexes when referring to top-level items in a model.
 
     Model indexes refer to items in models, and contain all the information
     required to specify their locations in those models. Each index is located
-    in a given row and column, and may have a parent index; use row(), column(),
-    and parent() to obtain this information. Each top-level item in a model is
-    represented by a model index that does not have a parent index - in this
-    case, parent() will return an invalid model index, equivalent to an index
-    constructed with the zero argument form of the QModelIndex() constructor.
+    in a given row and column, and may have a parent index; use row(),
+    column(), and parent() to obtain this information. Each top-level item in a
+    model is represented by a model index that does not have a parent index -
+    in this case, parent() will return an invalid model index, equivalent to an
+    index constructed with the zero argument form of the QModelIndex()
+    constructor.
 
     To obtain a model index that refers to an existing item in a model, call
-    QAbstractItemModel::index() with the required row and column
-    values, and the model index of the parent. When referring to
-    top-level items in a model, supply QModelIndex() as the parent index.
+    QAbstractItemModel::index() with the required row and column values, and
+    the model index of the parent. When referring to top-level items in a
+    model, supply QModelIndex() as the parent index.
 
     The model() function returns the model that the index references as a
-    QAbstractItemModel.
-    The child() function is used to examine the items held beneath the index
-    in the model.
-    The sibling() function allows you to traverse items in the model on the
-    same level as the index.
+    QAbstractItemModel. The child() function is used to examine items held
+    under the index in the model. The sibling() function allows you to traverse
+    items in the model on the same level as the index.
 
     \note Model indexes should be used immediately and then discarded. You
     should not rely on indexes to remain valid after calling model functions
     that change the structure of the model or delete items. If you need to
     keep a model index over time use a QPersistentModelIndex.
 
-    \sa \link model-view-programming.html Model/View Programming\endlink QPersistentModelIndex QAbstractItemModel
+    \sa {Model/View Programming}, QPersistentModelIndex, QAbstractItemModel
 */
 
 /*!
     \fn QModelIndex::QModelIndex()
 
-    Creates a new empty model index.
-    This type of model index is used to indicate
-    that the position in the model is invalid.
+    Creates a new empty model index. This type of model index is used to
+    indicate that the position in the model is invalid.
 
     \sa isValid() QAbstractItemModel
 */
@@ -860,7 +862,9 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     \fn bool QModelIndex::isValid() const
 
     Returns true if this model index is valid; otherwise returns false.
-    A valid index belongs to a model, and has non-negative row and column numbers.
+
+    A valid index belongs to a model, and has non-negative row and column
+    numbers.
 
     \sa model(), row(), column()
 */
@@ -871,33 +875,34 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     Returns a pointer to the model containing the item that this index
     refers to.
 
-    You receive a const pointer to the model because calls to
-    non-const functions of the model might invalidate the model index
-    - and possibly crash your application.
+    A const pointer to the model is returned because calls to non-const
+    functions of the model might invalidate the model index and possibly
+    crash your application.
 */
 
 /*!
     \fn QModelIndex QModelIndex::sibling(int row, int column) const
 
-    Returns the sibling at \a row and \a column or an invalid
-    QModelIndex if there is no sibling at this position.
+    Returns the sibling at \a row and \a column. If there is no sibling at this
+    position, an invalid QModelIndex is returned.
 
-    \sa parent() child()
+    \sa parent(), child()
 */
 
 /*!
     \fn QModelIndex QModelIndex::child(int row, int column) const
 
-    Returns the child of the model index that is stored in the given
-    \a row and \a column.
+    Returns the child of the model index that is stored in the given \a row and
+    \a column.
 
-    \sa parent() sibling()
+    \sa parent(), sibling()
 */
 
 /*!
     \fn QVariant QModelIndex::data(int role) const
 
-    Returns the data for the given \a role for the item referred to by the index.
+    Returns the data for the given \a role for the item referred to by the
+    index.
 */
 
 /*!
@@ -910,28 +915,29 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
 /*!
     \fn bool QModelIndex::operator==(const QModelIndex &other) const
 
-    Returns true if this model index refers to the same location as
-    the \a other model index; otherwise returns false.
-    Note that all values in the model index are used when comparing
-    with another model index.
+    Returns true if this model index refers to the same location as the
+    \a other model index; otherwise returns false.
+
+    All values in the model index are used when comparing with another model
+    index.
 */
 
 
 /*!
     \fn bool QModelIndex::operator!=(const QModelIndex &other) const
 
-    Returns true if this model index does not refer to the same
-    location as the \a other model index; otherwise returns false.
+    Returns true if this model index does not refer to the same location as
+    the \a other model index; otherwise returns false.
 */
 
 
 /*!
-  \fn QModelIndex QModelIndex::parent() const
+    \fn QModelIndex QModelIndex::parent() const
 
-  Returns the parent of the model index, or QModelIndex() if it has no
-  parent.
+    Returns the parent of the model index, or QModelIndex() if it has no
+    parent.
 
-  \sa child() sibling() model()
+    \sa child(), sibling(), model()
 */
 
 /*!
@@ -960,7 +966,7 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     simple table of rows and columns. Each item has a unique index specified by
     a QModelIndex.
 
-    \img modelindex-no-parent.png
+    \image modelindex-no-parent.png
 
     Every item of data that can be accessed via a model has an associated model
     index. You can obtain this model index using the index() function. Each
@@ -1078,9 +1084,8 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
 
     \sa {Model Classes}, {Model Subclassing Reference}, QModelIndex,
         QAbstractItemView, {Using Drag and Drop with Item Views},
-        {Simple DOM Model Example},
-        {Simple Tree Model Example}, {Editable Tree Model Example},
-        {Fetch More Example}
+        {Simple DOM Model Example}, {Simple Tree Model Example},
+        {Editable Tree Model Example}, {Fetch More Example}
 */
 
 /*!
@@ -1089,8 +1094,9 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     Returns the index of the item in the model specified by the given \a row,
     \a column and \a parent index.
 
-    When reimplementing this function in a subclass, call createIndex() to generate
-    model indexes that other components can use to refer to items in your model.
+    When reimplementing this function in a subclass, call createIndex() to
+    generate model indexes that other components can use to refer to items in
+    your model.
 
     \sa createIndex()
 */
@@ -1099,8 +1105,9 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     \fn bool QAbstractItemModel::insertColumn(int column, const QModelIndex &parent)
 
     Inserts a single column before the given \a column in the child items of
-    the \a parent specified. Returns true if the column is inserted; otherwise
-    returns false.
+    the \a parent specified.
+
+    Returns true if the column is inserted; otherwise returns false.
 
     \sa insertColumns() insertRow() removeColumn()
 */
@@ -1109,8 +1116,9 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     \fn bool QAbstractItemModel::insertRow(int row, const QModelIndex &parent)
 
     Inserts a single row before the given \a row in the child items of the
-    \a parent specified. Returns true if the row is inserted; otherwise
-    returns false.
+    \a parent specified.
+
+    Returns true if the row is inserted; otherwise returns false.
 
     \sa insertRows() insertColumn() removeRow()
 */
@@ -1123,17 +1131,18 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
 /*!
     \fn QModelIndex QAbstractItemModel::parent(const QModelIndex &index) const = 0
 
-    Returns the parent of the model item with the given \a index, or QModelIndex()
-    if it has no parent.
+    Returns the parent of the model item with the given \a index. If the model
+    has no parent, an invalid QModelIndex is returned.
 
     A common convention used in models that expose tree data structures is that
-    only items in the first column have children. For that case, when reimplementing
-    this function in a subclass the column of the returned QModelIndex would be 0.
+    only items in the first column have children. For that case, when
+    reimplementing this function in a subclass the column of the returned
+    QModelIndex would be 0.
 
-    \note When reimplementing this function in a subclass, be careful to avoid
+    When reimplementing this function in a subclass, be careful to avoid
     calling QModelIndex member functions, such as QModelIndex::parent(), since
-    indexes belonging to your model will simply call your implementation, leading
-    to infinite recursion.
+    indexes belonging to your model will simply call your implementation,
+    leading to infinite recursion.
 
     \sa createIndex()
 */
@@ -1141,7 +1150,9 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
 /*!
     \fn bool QAbstractItemModel::removeColumn(int column, const QModelIndex &parent)
 
-    Removes the given \a column from the child items of the \a parent specified.
+    Removes the given \a column from the child items of the \a parent
+    specified.
+
     Returns true if the column is removed; otherwise returns false.
 
     \sa removeColumns(), removeRow(), insertColumn()
@@ -1151,10 +1162,11 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     \fn bool QAbstractItemModel::removeRow(int row, const QModelIndex &parent)
 
     Removes the given \a row from the child items of the \a parent specified.
+
     Returns true if the row is removed; otherwise returns false.
 
-    The removeRow() is a convenience function that calls removeRows().
-    The QAbstractItemModel implementation of removeRows does nothing.
+    This is a convenience function that calls removeRows(). The
+    QAbstractItemModel implementation of removeRows() does nothing.
 
     \sa removeRows(), removeColumn(), insertRow()
 */
@@ -1166,13 +1178,12 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     indicates whether the horizontal or vertical header has changed. The
     sections in the header from the \a first to the \a last need to be updated.
 
-    Note that this signal must be emitted explicitly when
-    reimplementing the setHeaderData() function.
+    When reimplementing the setHeaderData() function, this signal must be
+    emitted explicitly.
 
-    If you are changing the number of columns or rows you don't need
-    to emit this signal, but use the begin/end functions (see the
-    section on subclassing in the QAbstractItemModel class description
-    for details).
+    If you are changing the number of columns or rows you do not need to emit
+    this signal, but use the begin/end functions (refer to the section on
+    subclassing in the QAbstractItemModel class description for details).
 
     \sa headerData(), setHeaderData(), dataChanged()
 */
@@ -1182,8 +1193,8 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     \since 4.2
 
     This signal is emitted just before the layout of a model is changed.
-    Components connected to this signal use it to adapt to changes
-    in the model's layout.
+    Components connected to this signal use it to adapt to changes in the
+    model's layout.
 
     Subclasses should update any persistent model indexes after emitting
     layoutAboutToBeChanged().
@@ -1195,19 +1206,20 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
     \fn void QAbstractItemModel::layoutChanged()
 
     This signal is emitted whenever the layout of items exposed by the model
-    has changed; for example, when the model has been sorted. When this signal is
-    received by a view, it should update the layout of items to reflect this
+    has changed; for example, when the model has been sorted. When this signal
+    is received by a view, it should update the layout of items to reflect this
     change.
 
-    When subclassing QAbstractItemModel or QAbstractProxyModel, ensure that
-    you emit layoutAboutToBeChanged() before changing the order of items or
+    When subclassing QAbstractItemModel or QAbstractProxyModel, ensure that you
+    emit layoutAboutToBeChanged() before changing the order of items or
     altering the structure of the data you expose to views, and emit
     layoutChanged() after changing the layout.
 
-    Subclasses should update any persistent model indexes before
-    emitting layoutChanged().
+    Subclasses should update any persistent model indexes before emitting
+    layoutChanged().
 
-    \sa layoutAboutToBeChanged(), dataChanged(), headerDataChanged(), reset(), changePersistentIndex()
+    \sa layoutAboutToBeChanged(), dataChanged(), headerDataChanged(), reset(),
+        changePersistentIndex()
 */
 
 /*!
@@ -1237,12 +1249,12 @@ QAbstractItemModel::~QAbstractItemModel()
 /*!
     \fn QModelIndex QAbstractItemModel::sibling(int row, int column, const QModelIndex &index) const
 
-    Returns the sibling at \a row and \a column for the item at \a index, or
-    an invalid QModelIndex if there is no sibling at that location.
+    Returns the sibling at \a row and \a column for the item at \a index, or an
+    invalid QModelIndex if there is no sibling at that location.
 
     sibling() is just a convenience function that finds the item's parent, and
-    uses it to retrieve the index of the child item in the specified \a row
-    and \a column.
+    uses it to retrieve the index of the child item in the specified \a row and
+    \a column.
 
     \sa index(), QModelIndex::row(), QModelIndex::column()
 */
@@ -1251,11 +1263,11 @@ QAbstractItemModel::~QAbstractItemModel()
 /*!
     \fn int QAbstractItemModel::rowCount(const QModelIndex &parent) const
 
-    Returns the number of rows under the given \a parent.   When the parent
-    is valid it means that rowCount is returning the number of children of parent.
+    Returns the number of rows under the given \a parent. When the parent is
+    valid it means that rowCount is returning the number of children of parent.
 
-    \bold{Tip:} When implementing a table based model, rowCount() should return 0 when
-    the parent is valid.
+    \note When implementing a table based model, rowCount() should return 0
+    when the parent is valid.
 
     \sa columnCount()
 */
@@ -1265,13 +1277,14 @@ QAbstractItemModel::~QAbstractItemModel()
 
     Returns the number of columns for the children of the given \a parent.
 
-    In most subclasses, the number of columns is independent of the
-    \a parent. For example:
+    In most subclasses, the number of columns is independent of the \a parent.
+
+    For example:
 
     \snippet examples/itemviews/simpledommodel/dommodel.cpp 2
 
-    \bold{Tip:} When implementing a table based model, columnCount() should return 0 when
-    the parent is valid.
+    \note When implementing a table based model, columnCount() should return 0
+    when the parent is valid.
 
     \sa rowCount()
 */
@@ -1298,8 +1311,8 @@ QAbstractItemModel::~QAbstractItemModel()
     model. The new items are those between \a start and \a end
     inclusive, under the given \a parent item.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
-    in the model's dimensions. It can only be emitted by the QAbstractItemModel
+    \note Components connected to this signal use it to adapt to changes in the
+    model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
     \sa insertRows(), beginInsertRows()
@@ -1308,11 +1321,11 @@ QAbstractItemModel::~QAbstractItemModel()
 /*!
     \fn void QAbstractItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted just before rows are inserted into the
-    model. The new items will be positioned between \a start and \a end
-    inclusive, under the given \a parent item.
+    This signal is emitted just before rows are inserted into the model. The
+    new items will be positioned between \a start and \a end inclusive, under
+    the given \a parent item.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
+    \note Components connected to this signal use it to adapt to changes
     in the model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1322,11 +1335,11 @@ QAbstractItemModel::~QAbstractItemModel()
 /*!
     \fn void QAbstractItemModel::rowsRemoved(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted after rows have been removed from the
-    model. The removed items are those between \a start and \a end
-    inclusive, under the given \a parent item.
+    This signal is emitted after rows have been removed from the model. The
+    removed items are those between \a start and \a end inclusive, under the
+    given \a parent item.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
+    \note Components connected to this signal use it to adapt to changes
     in the model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1336,11 +1349,11 @@ QAbstractItemModel::~QAbstractItemModel()
 /*!
     \fn void QAbstractItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted just before rows are removed from the
-    model. The items that will be removed are those between \a start and \a end
-    inclusive, under the given \a parent item.
+    This signal is emitted just before rows are removed from the model. The
+    items that will be removed are those between \a start and \a end inclusive,
+    under the given \a parent item.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
+    \note Components connected to this signal use it to adapt to changes
     in the model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1350,12 +1363,12 @@ QAbstractItemModel::~QAbstractItemModel()
 /*!
     \fn void QAbstractItemModel::columnsInserted(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted after columns have been inserted into the
-    model. The new items are those between \a start and \a end
-    inclusive, under the given \a parent item.
+    This signal is emitted after columns have been inserted into the model. The
+    new items are those between \a start and \a end inclusive, under the given
+    \a parent item.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
-    in the model's dimensions. It can only be emitted by the QAbstractItemModel
+    \note Components connected to this signal use it to adapt to changes in the
+    model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
     \sa insertColumns(), beginInsertColumns()
@@ -1364,12 +1377,12 @@ QAbstractItemModel::~QAbstractItemModel()
 /*!
     \fn void QAbstractItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted just before columns are inserted into the
-    model. The new items will be positioned between \a start and \a end
-    inclusive, under the given \a parent item.
+    This signal is emitted just before columns are inserted into the model. The
+    new items will be positioned between \a start and \a end inclusive, under
+    the given \a parent item.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
-    in the model's dimensions. It can only be emitted by the QAbstractItemModel
+    \note Components connected to this signal use it to adapt to changes in the
+    model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
     \sa insertColumns(), beginInsertColumns()
@@ -1378,12 +1391,12 @@ QAbstractItemModel::~QAbstractItemModel()
 /*!
     \fn void QAbstractItemModel::columnsRemoved(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted after columns have been removed from the
-    model. The removed items are those between \a start and \a end
-    inclusive, under the given \a parent item.
+    This signal is emitted after columns have been removed from the model.
+    The removed items are those between \a start and \a end inclusive,
+    under the given \a parent item.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
-    in the model's dimensions. It can only be emitted by the QAbstractItemModel
+    \note Components connected to this signal use it to adapt to changes in
+    the model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
     \sa removeColumns(), beginRemoveColumns()
@@ -1392,20 +1405,20 @@ QAbstractItemModel::~QAbstractItemModel()
 /*!
     \fn void QAbstractItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted just before columns are removed
-    from the model. The items to be removed are those between \a start and
-    \a end inclusive, under the given \a parent item.
+    This signal is emitted just before columns are removed from the model. The
+    items to be removed are those between \a start and \a end inclusive, under
+    the given \a parent item.
 
-    \bold{Note:} Components connected to this signal use it to adapt to changes
-    in the model's dimensions. It can only be emitted by the QAbstractItemModel
+    \note Components connected to this signal use it to adapt to changes in the
+    model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
     \sa removeColumns(), beginRemoveColumns()
 */
 
 /*!
-  Returns true if the model returns a valid QModelIndex for \a row and
-  \a column with \a parent, otherwise returns false.
+    Returns true if the model returns a valid QModelIndex for \a row and
+    \a column with \a parent, otherwise returns false.
 */
 bool QAbstractItemModel::hasIndex(int row, int column, const QModelIndex &parent) const
 {
@@ -1416,10 +1429,11 @@ bool QAbstractItemModel::hasIndex(int row, int column, const QModelIndex &parent
 
 
 /*!
-  Returns true if \a parent has any children; otherwise returns false.
-  Use rowCount() on the parent to find out the number of children.
+    Returns true if \a parent has any children; otherwise returns false.
 
-  \sa parent() index()
+    Use rowCount() on the parent to find out the number of children.
+
+    \sa parent() index()
 */
 bool QAbstractItemModel::hasChildren(const QModelIndex &parent) const
 {
@@ -1428,11 +1442,11 @@ bool QAbstractItemModel::hasChildren(const QModelIndex &parent) const
 
 
 /*!
-    Returns a map with values for all predefined roles in the model
-    for the item at the given \a index.
+    Returns a map with values for all predefined roles in the model for the
+    item at the given \a index.
 
-    Reimplemented this function if you want to extend the default behavior
-    of this function to include custom roles in the map.
+    Reimplement this function if you want to extend the default behavior of
+    this function to include custom roles in the map.
 
     \sa Qt::ItemDataRole, data()
 */
@@ -1449,14 +1463,14 @@ QMap<int, QVariant> QAbstractItemModel::itemData(const QModelIndex &index) const
 
 /*!
     Sets the \a role data for the item at \a index to \a value.
+
     Returns true if successful; otherwise returns false.
 
-    The dataChanged() signal should be emitted if the data was successfully set.
+    The dataChanged() signal should be emitted if the data was successfully
+    set.
 
-    The base class implementation returns false. This function and
-    data() must be reimplemented for editable models. Note that the
-    dataChanged() signal must be emitted explicitly when
-    reimplementing this function.
+    The base class implementation returns false. This function and data() must
+    be reimplemented for editable models.
 
     \sa Qt::ItemDataRole, data(), itemData()
 */
@@ -1475,15 +1489,16 @@ bool QAbstractItemModel::setData(const QModelIndex &index, const QVariant &value
     by the \a index.
 
     \note If you do not have a value to return, return an \bold invalid
-    QVariant() instead of returning 0.
+    QVariant instead of returning 0.
 
     \sa Qt::ItemDataRole, setData(), headerData()
 */
 
 /*!
     Sets the role data for the item at \a index to the associated value in
-    \a roles, for every Qt::ItemDataRole. Returns true if successful; otherwise
-    returns false.
+    \a roles, for every Qt::ItemDataRole.
+
+    Returns true if successful; otherwise returns false.
 
     Roles that are not in \a roles will not be modified.
 
@@ -1498,8 +1513,8 @@ bool QAbstractItemModel::setItemData(const QModelIndex &index, const QMap<int, Q
 }
 
 /*!
-    Returns a list of MIME types that can be used to describe a list of
-    model indexes.
+    Returns a list of MIME types that can be used to describe a list of model
+    indexes.
 
     \sa mimeData()
 */
@@ -1511,12 +1526,12 @@ QStringList QAbstractItemModel::mimeTypes() const
 }
 
 /*!
-    Returns an object that contains serialized items of data corresponding to the
-    list of \a indexes specified. The formats used to describe the encoded data
-    is obtained from the mimeTypes() function.
+    Returns an object that contains serialized items of data corresponding to
+    the list of \a indexes specified. The formats used to describe the encoded
+    data is obtained from the mimeTypes() function.
 
-    If the list of indexes is empty, or there are no supported MIME types,
-    0 is returned rather than a serialized empty list.
+    If the list of indexes is empty, or there are no supported MIME types, 0 is
+    returned rather than a serialized empty list.
 
     \sa mimeTypes(), dropMimeData()
 */
@@ -1538,22 +1553,23 @@ QMimeData *QAbstractItemModel::mimeData(const QModelIndexList &indexes) const
 
 /*!
     Handles the \a data supplied by a drag and drop operation that ended with
-    the given \a action. Returns true if the data and action can be handled
-    by the model; otherwise returns false.
+    the given \a action.
 
-    Although the specified \a row, \a column and \a parent indicate the location of
-    an item in the model where the operation ended, it is the responsibility of the
-    view to provide a suitable location for where the data should be inserted.
+    Returns true if the data and action can be handled by the model; otherwise
+    returns false.
 
-    For instance, a drop action on an item in a QTreeView can result in new items
-    either being inserted as children of the item specified by \a row, \a column,
-    and \a parent, or as siblings of the item.
+    Although the specified \a row, \a column and \a parent indicate the
+    location of an item in the model where the operation ended, it is the
+    responsibility of the view to provide a suitable location for where the
+    data should be inserted.
 
-    When row and column are -1 it means that it is up to the model to decide
-    where to place the data.  This can occur in a tree when data is dropped
-    on a parent.  Models will usually append the data to the parent in this case.
+    For instance, a drop action on an item in a QTreeView can result in new
+    items either being inserted as children of the item specified by \a row,
+    \a column, and \a parent, or as siblings of the item.
 
-    Returns true if the dropping was successful otherwise false.
+    When row and column are -1 it means that it is up to the model to decide
+    where to place the data. This can occur in a tree when data is dropped on
+    a parent. Models will usually append the data to the parent in this case.
 
     \sa supportedDropActions(), {Using Drag and Drop with Item Views}
 */
@@ -1583,17 +1599,17 @@ bool QAbstractItemModel::dropMimeData(const QMimeData *data, Qt::DropAction acti
 }
 
 /*!
-  \since 4.2
+    \since 4.2
 
-  Returns the drop actions supported by this model.
+    Returns the drop actions supported by this model.
 
-  The default implementation returns Qt::CopyAction. Reimplement this
-  function if you wish to support additional actions. Note that you
-  must also reimplement the dropMimeData() function to handle the
-  additional operations.
+    The default implementation returns Qt::CopyAction. Reimplement this
+    function if you wish to support additional actions. You must also
+    reimplement the dropMimeData() function to handle the additional
+    operations.
 
-  \sa dropMimeData(), Qt::DropActions, {Using Drag and Drop with Item
-  Views}
+    \sa dropMimeData(), Qt::DropActions, {Using Drag and Drop with Item
+    Views}
 */
 Qt::DropActions QAbstractItemModel::supportedDropActions() const
 {
@@ -1601,15 +1617,15 @@ Qt::DropActions QAbstractItemModel::supportedDropActions() const
 }
 
 /*!
-  Returns the actions supported by the data in this model.
+    Returns the actions supported by the data in this model.
 
-  The default implementation returns supportedDropActions() unless
-  specific values have been set with setSupportedDragActions().
+    The default implementation returns supportedDropActions() unless specific
+    values have been set with setSupportedDragActions().
 
-  supportedDragActions() is used by QAbstractItemView::startDrag() as
-  the default values when a drag occurs.
+    supportedDragActions() is used by QAbstractItemView::startDrag() as the
+    default values when a drag occurs.
 
-  \sa Qt::DropActions, {Using Drag and Drop with Item Views}
+    \sa Qt::DropActions, {Using Drag and Drop with Item Views}
 */
 Qt::DropActions QAbstractItemModel::supportedDragActions() const
 {
@@ -1634,25 +1650,28 @@ void QAbstractItemModel::setSupportedDragActions(Qt::DropActions actions)
 }
 
 /*!
-  On models that support this, inserts \a count rows into the model before the
-  given \a row.  The items in the new row will be children of the item
-  represented by the \a parent model index.
+    On models that support this, inserts \a count rows into the model before
+    the given \a row. Items in the new row will be children of the item
+    represented by the \a parent model index.
 
-  If \a row is 0, the rows are prepended to any existing rows in the parent.
-  If \a row is rowCount(), the rows are appended to any existing rows in the
-  parent.
-  If \a parent has no children, a single column with \a count rows is inserted.
+    If \a row is 0, the rows are prepended to any existing rows in the parent.
 
-  Returns true if the rows were successfully inserted; otherwise returns
-  false.
+    If \a row is rowCount(), the rows are appended to any existing rows in the
+    parent.
 
-  The base class implementation does nothing and returns false.
+    If \a parent has no children, a single column with \a count rows is
+    inserted.
 
-  If you implement your own model, you can reimplement this function
-  if you want to support insertions. Alternatively, you can provide
-  you own API for altering the data.
+    Returns true if the rows were successfully inserted; otherwise returns
+    false.
+
+    The base class implementation does nothing and returns false.
 
-  \sa insertColumns(), removeRows(), beginInsertRows(), endInsertRows()
+    If you implement your own model, you can reimplement this function if you
+    want to support insertions. Alternatively, you can provide your own API for
+    altering the data.
+
+    \sa insertColumns(), removeRows(), beginInsertRows(), endInsertRows()
 */
 bool QAbstractItemModel::insertRows(int, int, const QModelIndex &)
 {
@@ -1660,25 +1679,28 @@ bool QAbstractItemModel::insertRows(int, int, const QModelIndex &)
 }
 
 /*!
-  On models that support this, inserts \a count new columns into the model
-  before the given \a column.  The items in each new column will be children
-  of the item represented by the \a parent model index.
+    On models that support this, inserts \a count new columns into the model
+    before the given \a column. The items in each new column will be children
+    of the item represented by the \a parent model index.
+
+    If \a column is 0, the columns are prepended to any existing columns.
+
+    If \a column is columnCount(), the columns are appended to any existing
+    columns.
 
-  If \a column is 0, the columns are prepended to any existing columns.
-  If \a column is columnCount(), the columns are appended to any existing
-  columns.
-  If \a parent has no children, a single row with \a count columns is inserted.
+    If \a parent has no children, a single row with \a count columns is
+    inserted.
 
-  Returns true if the columns were successfully inserted; otherwise returns
-  false.
+    Returns true if the columns were successfully inserted; otherwise returns
+    false.
 
-  The base class implementation does nothing and returns false.
+    The base class implementation does nothing and returns false.
 
-  If you implement your own model, you can reimplement this function
-  if you want to support insertions. Alternatively, you can provide
-  you own API for altering the data.
+    If you implement your own model, you can reimplement this function if you
+    want to support insertions. Alternatively, you can provide your own API for
+    altering the data.
 
-  \sa insertRows(), removeColumns(), beginInsertColumns(), endInsertColumns()
+    \sa insertRows(), removeColumns(), beginInsertColumns(), endInsertColumns()
 */
 bool QAbstractItemModel::insertColumns(int, int, const QModelIndex &)
 {
@@ -1687,16 +1709,19 @@ bool QAbstractItemModel::insertColumns(int, int, const QModelIndex &)
 
 /*!
     On models that support this, removes \a count rows starting with the given
-    \a row under parent \a parent from the model. Returns true if the rows
-    were successfully removed; otherwise returns false.
+    \a row under parent \a parent from the model.
+
+    Returns true if the rows were successfully removed; otherwise returns
+    false.
 
     The base class implementation does nothing and returns false.
 
-    If you implement your own model, you can reimplement this function
-    if you want to support removing. Alternatively, you can provide
-    you own API for altering the data.
+    If you implement your own model, you can reimplement this function if you
+    want to support removing. Alternatively, you can provide your own API for
+    altering the data.
 
-    \sa removeRow(), removeColumns(), insertColumns(), beginRemoveRows(), endRemoveRows()
+    \sa removeRow(), removeColumns(), insertColumns(), beginRemoveRows(),
+        endRemoveRows()
 */
 bool QAbstractItemModel::removeRows(int, int, const QModelIndex &)
 {
@@ -1705,16 +1730,19 @@ bool QAbstractItemModel::removeRows(int, int, const QModelIndex &)
 
 /*!
     On models that support this, removes \a count columns starting with the
-    given \a column under parent \a parent from the model. Returns true if the
-    columns were successfully removed; otherwise returns false.
+    given \a column under parent \a parent from the model.
+
+    Returns true if the columns were successfully removed; otherwise returns
+    false.
 
     The base class implementation does nothing and returns false.
 
-    If you implement your own model, you can reimplement this function
-    if you want to support removing. Alternatively, you can provide
-    you own API for altering the data.
+    If you implement your own model, you can reimplement this function if you
+    want to support removing. Alternatively, you can provide your own API for
+    altering the data.
 
-    \sa removeColumn(), removeRows(), insertColumns(), beginRemoveColumns(), endRemoveColumns()
+    \sa removeColumn(), removeRows(), insertColumns(), beginRemoveColumns(),
+        endRemoveColumns()
 */
 bool QAbstractItemModel::removeColumns(int, int, const QModelIndex &)
 {
@@ -1737,9 +1765,9 @@ void QAbstractItemModel::fetchMore(const QModelIndex &)
 }
 
 /*!
-    Returns true if there is more data available for \a parent; otherwise returns
-    false.
-    
+    Returns true if there is more data available for \a parent; otherwise
+    returns false.
+
     The default implementation always returns false.
 
     If canFetchMore() returns true, QAbstractItemView will call fetchMore().
@@ -1756,9 +1784,9 @@ bool QAbstractItemModel::canFetchMore(const QModelIndex &) const
 /*!
     Returns the item flags for the given \a index.
 
-    The base class implementation returns a combination of flags that
-    enables the item (\c ItemIsEnabled) and allows it to be
-    selected (\c ItemIsSelectable).
+    The base class implementation returns a combination of flags that enables
+    the item (\c ItemIsEnabled) and allows it to be selected
+    (\c ItemIsSelectable).
 
     \sa Qt::ItemFlags
 */
@@ -1784,12 +1812,13 @@ void QAbstractItemModel::sort(int column, Qt::SortOrder order)
 }
 
 /*!
-  Returns a model index for the buddy of the item represented by \a index.
-  When the user wants to edit an item, the view will call this function to
-  check whether another item in the model should be edited instead, and
-  construct a delegate using the model index returned by the buddy item.
+    Returns a model index for the buddy of the item represented by \a index.
+    When the user wants to edit an item, the view will call this function to
+    check whether another item in the model should be edited instead. Then, the
+    view will construct a delegate using the model index returned by the buddy
+    item.
 
-  In the default implementation each item is its own buddy.
+    The default implementation of this function has each item as its own buddy.
 */
 QModelIndex QAbstractItemModel::buddy(const QModelIndex &index) const
 {
@@ -1797,23 +1826,23 @@ QModelIndex QAbstractItemModel::buddy(const QModelIndex &index) const
 }
 
 /*!
-    Returns a list of indexes for the items in the column of the \a
-    start index where the data stored under the given \a role matches
-    the specified \a value. The way the search is performed is defined
-    by the \a flags given. The list that is returned may be empty.
+    Returns a list of indexes for the items in the column of the \a start index
+    where data stored under the given \a role matches the specified \a value.
+    The way the search is performed is defined by the \a flags given. The list
+    that is returned may be empty.
 
-    The search starts from the \a start index, and continues until the
-    number of matching data items equals \a hits, the search reaches
-    the last row, or the search reaches \a start again, depending on
-    whether \c MatchWrap is specified in \a flags. If you want to search
-    for all matching items, use \a hits = -1.
+    The search begins from the \a start index, and continues until the number
+    of matching data items equals \a hits, the search reaches the last row, or
+    the search reaches \a start again - depending on whether \c MatchWrap is
+    specified in \a flags. If you want to search for all matching items, use
+    \a hits = -1.
 
     By default, this function will perform a wrapping, string-based comparison
     on all items, searching for items that begin with the search term specified
     by \a value.
-    
-    \note The default implementation of this function only searches columns,
-    This function can be reimplemented to include other search behavior.
+
+    \note The default implementation of this function only searches columns.
+    Reimplement this function to include a different search behavior.
 */
 QModelIndexList QAbstractItemModel::match(const QModelIndex &start, int role,
                                           const QVariant &value, int hits,
@@ -1888,7 +1917,7 @@ QModelIndexList QAbstractItemModel::match(const QModelIndex &start, int role,
 /*!
     Returns the row and column span of the item represented by \a index.
 
-    Note: span is not used currently, but will be in the future.
+    \note Currently, span is not used.
 */
 
 QSize QAbstractItemModel::span(const QModelIndex &) const
@@ -1897,16 +1926,16 @@ QSize QAbstractItemModel::span(const QModelIndex &) const
 }
 
 /*!
-  \since 4.6
-  
-  Sets the model's role names to \a roleNames.
+    \since 4.6
 
-  This function is provided to allow mapping of role identifiers to
-  role property names in Declarative UI.  This function must be called
-  before the model is used.  Modifying the role names after the model
-  has been set may result in undefined behaviour.
+    Sets the model's role names to \a roleNames.
 
-  \sa roleNames()
+    This function allows mapping of role identifiers to role property names in
+    Declarative UI.  This function must be called before the model is used.
+    Modifying the role names after the model has been set may result in
+    undefined behaviour.
+
+    \sa roleNames()
 */
 void QAbstractItemModel::setRoleNames(const QHash<int,QByteArray> &roleNames)
 {
@@ -1915,11 +1944,11 @@ void QAbstractItemModel::setRoleNames(const QHash<int,QByteArray> &roleNames)
 }
 
 /*!
-  \since 4.6
+    \since 4.6
 
-  Returns the model's role names.
+    Returns the model's role names.
 
-  \sa setRoleNames()
+    \sa setRoleNames()
 */
 const QHash<int,QByteArray> &QAbstractItemModel::roleNames() const
 {
@@ -1928,10 +1957,12 @@ const QHash<int,QByteArray> &QAbstractItemModel::roleNames() const
 }
 
 /*!
-  Called to let the model know that it should submit whatever it has cached
-  to the permanent storage. Typically used for row editing.
+    Lets the model know that it should submit cached information to permanent
+    storage. This function is typically used for row editing.
+
+    Returns true if there is no error; otherwise returns false.
 
-  Returns false on error, otherwise true.
+    \sa revert()
 */
 
 bool QAbstractItemModel::submit()
@@ -1940,8 +1971,10 @@ bool QAbstractItemModel::submit()
 }
 
 /*!
-  Called to let the model know that it should discard whatever it has cached.
-  Typically used for row editing.
+    Lets the model know that it should discard cached information. This
+    function is typically used for row editing.
+
+    \sa submit()
 */
 
 void QAbstractItemModel::revert()
@@ -1950,14 +1983,14 @@ void QAbstractItemModel::revert()
 }
 
 /*!
-  Returns the data for the given \a role and \a section in the header
-  with the specified \a orientation.
+    Returns the data for the given \a role and \a section in the header with
+    the specified \a orientation.
 
-  For horizontal headers, the section number corresponds to the column
-  number of items shown beneath it. For vertical headers, the section
-  number typically to the row number of items shown alongside it.
+    For horizontal headers, the section number corresponds to the column
+    number. Similarly, for vertical headers, the section number corresponds to
+    the row number.
 
-  \sa Qt::ItemDataRole, setHeaderData(), QHeaderView
+    \sa Qt::ItemDataRole, setHeaderData(), QHeaderView
 */
 
 QVariant QAbstractItemModel::headerData(int section, Qt::Orientation orientation, int role) const
@@ -1969,14 +2002,15 @@ QVariant QAbstractItemModel::headerData(int section, Qt::Orientation orientation
 }
 
 /*!
-  Sets the data for the given \a role and \a section in the header with
-  the specified \a orientation to the \a value supplied.
-  Returns true if the header's data was updated; otherwise returns false.
+    Sets the data for the given \a role and \a section in the header with the
+    specified \a orientation to the \a value supplied.
+
+    Returns true if the header's data was updated; otherwise returns false.
 
-  Note that the headerDataChanged() signal must be emitted explicitly
-  when reimplementing this function.
+    When reimplementing this function, the headerDataChanged() signal must be
+    emitted explicitly.
 
-  \sa Qt::ItemDataRole, headerData()
+    \sa Qt::ItemDataRole, headerData()
 */
 
 bool QAbstractItemModel::setHeaderData(int section, Qt::Orientation orientation,
@@ -1992,11 +2026,12 @@ bool QAbstractItemModel::setHeaderData(int section, Qt::Orientation orientation,
 /*!
     \fn QModelIndex QAbstractItemModel::createIndex(int row, int column, void *ptr) const
 
-    Creates a model index for the given \a row and \a column with the internal pointer \a ptr.
+    Creates a model index for the given \a row and \a column with the internal
+    pointer \a ptr.
 
-    Note that when you are using a QSortFilterProxyModel its indexes have their own
-    internal pointer.  It is not advisable to access the internal pointer in the index
-    outside of the model.  Use the data() function instead.
+    When using a QSortFilterProxyModel, its indexes have their own internal
+    pointer. It is not advisable to access this internal pointer outside of the
+    model. Use the data() function instead.
 
     This function provides a consistent interface that model subclasses must
     use to create model indexes.
@@ -2006,7 +2041,8 @@ bool QAbstractItemModel::setHeaderData(int section, Qt::Orientation orientation,
     \fn QModelIndex QAbstractItemModel::createIndex(int row, int column, int id) const
     \obsolete
 
-    Use QModelIndex QAbstractItemModel::createIndex(int row, int column, quint32 id) instead.
+    Use QModelIndex
+    QAbstractItemModel::createIndex(int row, int column, quint32 id) instead.
 */
 
 /*!
@@ -2017,6 +2053,7 @@ bool QAbstractItemModel::setHeaderData(int section, Qt::Orientation orientation,
 
     This function provides a consistent interface that model subclasses must
     use to create model indexes.
+
     \sa QModelIndex::internalId()
 */
 
@@ -2120,34 +2157,41 @@ bool QAbstractItemModel::decodeData(int row, int column, const QModelIndex &pare
 /*!
     Begins a row insertion operation.
 
-    When reimplementing insertRows() in a subclass, you must call this
-    function \e before inserting data into the model's underlying data
-    store.
+    When reimplementing insertRows() in a subclass, you must call this function
+    \e before inserting data into the model's underlying data store.
 
-    The \a parent index corresponds to the parent into which the new
-    rows are inserted; \a first and \a last are the row numbers that the
-    new rows will have after they have been inserted.
+    The \a parent index corresponds to the parent into which the new rows are
+    inserted; \a first and \a last are the row numbers that the new rows will
+    have after they have been inserted.
 
     \table 80%
-    \row \o \inlineimage modelview-begin-insert-rows.png Inserting rows
-    \o Specify the first and last row numbers for the span of rows
-       you want to insert into an item in a model.
-
-    For example, as shown in the diagram, we insert three rows before
-    row 2, so \a first is 2 and \a last is 4:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 0
-    This inserts the three new rows as rows 2, 3, and 4.
     \row
-    \o \inlineimage modelview-begin-append-rows.png Appending rows
-    \o To append rows, insert them after the last row.
-
-    For example, as shown in the diagram, we append two rows to a
-    collection of 4 existing rows (ending in row 3), so \a first is 4
-    and \a last is 5:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 1
-    This appends the two new rows as rows 4 and 5.
+        \o  \inlineimage modelview-begin-insert-rows.png Inserting rows
+        \o  Specify the first and last row numbers for the span of rows you
+            want to insert into an item in a model.
+
+            For example, as shown in the diagram, we insert three rows before
+            row 2, so \a first is 2 and \a last is 4:
+
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 0
+
+            This inserts the three new rows as rows 2, 3, and 4.
+    \row
+        \o  \inlineimage modelview-begin-append-rows.png Appending rows
+        \o  To append rows, insert them after the last row.
+
+            For example, as shown in the diagram, we append two rows to a
+            collection of 4 existing rows (ending in row 3), so \a first is 4
+            and \a last is 5:
+
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 1
+
+            This appends the two new rows as rows 4 and 5.
     \endtable
 
+    \note This function emits the rowsAboutToBeInserted() signal which
+    connected views (or proxies) must handle before the data is inserted.
+    Otherwise, the views may end up in an invalid state.
     \sa endInsertRows()
 */
 void QAbstractItemModel::beginInsertRows(const QModelIndex &parent, int first, int last)
@@ -2163,9 +2207,8 @@ void QAbstractItemModel::beginInsertRows(const QModelIndex &parent, int first, i
 /*!
     Ends a row insertion operation.
 
-    When reimplementing insertRows() in a subclass, you must call this
-    function \e after inserting data into the model's underlying data
-    store.
+    When reimplementing insertRows() in a subclass, you must call this function
+    \e after inserting data into the model's underlying data store.
 
     \sa beginInsertRows()
 */
@@ -2181,23 +2224,28 @@ void QAbstractItemModel::endInsertRows()
     Begins a row removal operation.
 
     When reimplementing removeRows() in a subclass, you must call this
-    function \e before removing data from the model's underlying data
-    store.
+    function \e before removing data from the model's underlying data store.
 
-    The \a parent index corresponds to the parent from which the new
-    rows are removed; \a first and \a last are the row numbers of the
-    rows to be removed.
+    The \a parent index corresponds to the parent from which the new rows are
+    removed; \a first and \a last are the row numbers of the rows to be
+    removed.
 
     \table 80%
-    \row \o \inlineimage modelview-begin-remove-rows.png Removing rows
-    \o Specify the first and last row numbers for the span of rows
-       you want to remove from an item in a model.
+    \row
+        \o  \inlineimage modelview-begin-remove-rows.png Removing rows
+        \o  Specify the first and last row numbers for the span of rows you
+            want to remove from an item in a model.
+
+            For example, as shown in the diagram, we remove the two rows from
+            row 2 to row 3, so \a first is 2 and \a last is 3:
 
-    For example, as shown in the diagram, we remove the two rows from
-    row 2 to row 3, so \a first is 2 and \a last is 3:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 2
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 2
     \endtable
 
+    \note This function emits the rowsAboutToBeRemoved() signal which connected
+    views (or proxies) must handle before the data is removed. Otherwise, the
+    views may end up in an invalid state.
+
     \sa endRemoveRows()
 */
 void QAbstractItemModel::beginRemoveRows(const QModelIndex &parent, int first, int last)
@@ -2213,9 +2261,8 @@ void QAbstractItemModel::beginRemoveRows(const QModelIndex &parent, int first, i
 /*!
     Ends a row removal operation.
 
-    When reimplementing removeRows() in a subclass, you must call this
-    function \e after removing data from the model's underlying data
-    store.
+    When reimplementing removeRows() in a subclass, you must call this function
+    \e after removing data from the model's underlying data store.
 
     \sa beginRemoveRows()
 */
@@ -2231,33 +2278,41 @@ void QAbstractItemModel::endRemoveRows()
     Begins a column insertion operation.
 
     When reimplementing insertColumns() in a subclass, you must call this
-    function \e before inserting data into the model's underlying data
-    store.
+    function \e before inserting data into the model's underlying data store.
 
-    The \a parent index corresponds to the parent into which the new
-    columns are inserted; \a first and \a last are the column numbers of
-    the new columns will have after they have been inserted.
+    The \a parent index corresponds to the parent into which the new columns
+    are inserted; \a first and \a last are the column numbers of the new
+    columns will have after they have been inserted.
 
     \table 80%
-    \row \o \inlineimage modelview-begin-insert-columns.png Inserting columns
-    \o Specify the first and last column numbers for the span of columns
-       you want to insert into an item in a model.
-
-    For example, as shown in the diagram, we insert three columns before
-    column 4, so \a first is 4 and \a last is 6:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 3
-    This inserts the three new columns as columns 4, 5, and 6.
     \row
-    \o \inlineimage modelview-begin-append-columns.png Appending columns
-    \o To append columns, insert them after the last column.
-
-    For example, as shown in the diagram, we append three columns to a
-    collection of six existing columns (ending in column 5), so \a first
-    is 6 and \a last is 8:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 4
-    This appends the two new columns as columns 6, 7, and 8.
+        \o  \inlineimage modelview-begin-insert-columns.png Inserting columns
+        \o  Specify the first and last column numbers for the span of columns
+            you want to insert into an item in a model.
+
+            For example, as shown in the diagram, we insert three columns
+            before column 4, so \a first is 4 and \a last is 6:
+
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 3
+
+            This inserts the three new columns as columns 4, 5, and 6.
+    \row
+        \o  \inlineimage modelview-begin-append-columns.png Appending columns
+        \o  To append columns, insert them after the last column.
+
+            For example, as shown in the diagram, we append three columns to a
+            collection of six existing columns (ending in column 5), so
+            \a first is 6 and \a last is 8:
+
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 4
+
+            This appends the two new columns as columns 6, 7, and 8.
     \endtable
 
+    \note This function emits the columnsAboutToBeInserted() signal which
+    connected views (or proxies) must handle before the data is inserted.
+    Otherwise, the views may end up in an invalid state.
+
     \sa endInsertColumns()
 */
 void QAbstractItemModel::beginInsertColumns(const QModelIndex &parent, int first, int last)
@@ -2291,23 +2346,28 @@ void QAbstractItemModel::endInsertColumns()
     Begins a column removal operation.
 
     When reimplementing removeColumns() in a subclass, you must call this
-    function \e before removing data from the model's underlying data
-    store.
+    function \e before removing data from the model's underlying data store.
 
-    The \a parent index corresponds to the parent from which the new
-    columns are removed; \a first and \a last are the column numbers of
-    the first and last columns to be removed.
+    The \a parent index corresponds to the parent from which the new columns
+    are removed; \a first and \a last are the column numbers of the first and
+    last columns to be removed.
 
     \table 80%
-    \row \o \inlineimage modelview-begin-remove-columns.png Removing columns
-    \o Specify the first and last column numbers for the span of columns
-       you want to remove from an item in a model.
+    \row
+        \o  \inlineimage modelview-begin-remove-columns.png Removing columns
+        \o  Specify the first and last column numbers for the span of columns
+            you want to remove from an item in a model.
+
+            For example, as shown in the diagram, we remove the three columns
+            from column 4 to column 6, so \a first is 4 and \a last is 6:
 
-    For example, as shown in the diagram, we remove the three columns
-    from column 4 to column 6, so \a first is 4 and \a last is 6:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 5
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 5
     \endtable
 
+    \note This function emits the columnsAboutToBeRemoved() signal which
+    connected views (or proxies) must handle before the data is removed.
+    Otherwise, the views may end up in an invalid state.
+
     \sa endRemoveColumns()
 */
 void QAbstractItemModel::beginRemoveColumns(const QModelIndex &parent, int first, int last)
@@ -2324,8 +2384,7 @@ void QAbstractItemModel::beginRemoveColumns(const QModelIndex &parent, int first
     Ends a column removal operation.
 
     When reimplementing removeColumns() in a subclass, you must call this
-    function \e after removing data from the model's underlying data
-    store.
+    function \e after removing data from the model's underlying data store.
 
     \sa beginRemoveColumns()
 */
@@ -2340,11 +2399,11 @@ void QAbstractItemModel::endRemoveColumns()
 /*!
     Resets the model to its original state in any attached views.
 
-    \note The view to which the model is attached to will be reset as well.
+    The view to which the model is attached to will be reset as well.
 
     When a model is reset it means that any previous data reported from the
-    model is now invalid and has to be queried for again. This also means 
-    that the current item and any selected items will become invalid.
+    model is now invalid and has to be queried for again. This also means that
+    the current item and any selected items will become invalid.
 
     When a model radically changes its data it can sometimes be easier to just
     call this function rather than emit dataChanged() to inform other
@@ -2361,13 +2420,13 @@ void QAbstractItemModel::reset()
 }
 
 /*!
-  Changes the QPersistentModelIndex that is equal to the given \a from
-  model index to the given \a to model index.
+    Changes the QPersistentModelIndex that is equal to the given \a from model
+    index to the given \a to model index.
 
-  If no persistent model index equal to the given \a from model index was
-  found, nothing is changed.
+    If no persistent model index equal to the given \a from model index was
+    found, nothing is changed.
 
-  \sa persistentIndexList(), changePersistentIndexList()
+    \sa persistentIndexList(), changePersistentIndexList()
 */
 void QAbstractItemModel::changePersistentIndex(const QModelIndex &from, const QModelIndex &to)
 {
@@ -2388,15 +2447,15 @@ void QAbstractItemModel::changePersistentIndex(const QModelIndex &from, const QM
 }
 
 /*!
-  \since 4.1
+    \since 4.1
 
-  Changes the QPersistentModelIndexes that is equal to the indexes in the given \a from
-  model index list to the given \a to model index list.
+    Changes the QPersistentModelIndexes that is equal to the indexes in the
+    given \a from model index list to the given \a to model index list.
 
-  If no persistent model indexes equal to the indexes in the given \a from model index list
-  was found, nothing is changed.
+    If no persistent model indexes equal to the indexes in the given \a from
+    model index list was found, nothing is changed.
 
-  \sa persistentIndexList(), changePersistentIndex()
+    \sa persistentIndexList(), changePersistentIndex()
 */
 void QAbstractItemModel::changePersistentIndexList(const QModelIndexList &from,
                                                    const QModelIndexList &to)
@@ -2429,9 +2488,9 @@ void QAbstractItemModel::changePersistentIndexList(const QModelIndexList &from,
 }
 
 /*!
-  \since 4.2
+    \since 4.2
 
-  Returns the list of indexes stored as persistent indexes in the model.
+    Returns the list of indexes stored as persistent indexes in the model.
 */
 QModelIndexList QAbstractItemModel::persistentIndexList() const
 {
@@ -2458,10 +2517,10 @@ QModelIndexList QAbstractItemModel::persistentIndexList() const
     but must be subclassed.
 
     Since the model provides a more specialized interface than
-    QAbstractItemModel, it is not suitable for use with tree views, although
-    it can be used to provide data to a QListView. If you need to represent
-    a simple list of items, and only need a model to contain a single column
-    of data, subclassing the QAbstractListModel may be more appropriate.
+    QAbstractItemModel, it is not suitable for use with tree views, although it
+    can be used to provide data to a QListView. If you need to represent a
+    simple list of items, and only need a model to contain a single column of
+    data, subclassing the QAbstractListModel may be more appropriate.
 
     The rowCount() and columnCount() functions return the dimensions of the
     table. To retrieve a model index corresponding to an item in the model, use
@@ -2469,9 +2528,6 @@ QModelIndexList QAbstractItemModel::persistentIndexList() const
 
     \section1 Subclassing
 
-    \bold{Note:} Some general guidelines for subclassing models are
-    available in the \l{Model Subclassing Reference}.
-
     When subclassing QAbstractTableModel, you must implement rowCount(),
     columnCount(), and data(). Default implementations of the index() and
     parent() functions are provided by QAbstractTableModel.
@@ -2502,9 +2558,13 @@ QModelIndexList QAbstractItemModel::persistentIndexList() const
        call endRemoveColumns() \e{immediately afterwards}.
     \endlist
 
-    \sa {Model Classes}, {Model Subclassing Reference}, QAbstractItemModel,
-        QAbstractListModel,
-        {Pixelator Example}
+    \note Some general guidelines for subclassing models are available in the
+    \l{Model Subclassing Reference}.
+
+    \note
+
+    \sa {Model Classes}, QAbstractItemModel, QAbstractListModel,
+    {Pixelator Example}
 */
 
 /*!
@@ -2602,9 +2662,6 @@ bool QAbstractTableModel::hasChildren(const QModelIndex &parent) const
 
     \section1 Subclassing
 
-    \bold{Note:} Some general guidelines for subclassing models are
-    available in the \l{Model Subclassing Reference}.
-
     When subclassing QAbstractListModel, you must provide implementations
     of the rowCount() and data() functions. Well behaved models also provide
     a headerData() implementation.
@@ -2631,6 +2688,9 @@ bool QAbstractTableModel::hasChildren(const QModelIndex &parent) const
        call endRemoveRows() \e{immediately afterwards}.
     \endlist
 
+    \note Some general guidelines for subclassing models are available in the
+    \l{Model Subclassing Reference}.
+
     \sa {Model Classes}, {Model Subclassing Reference}, QAbstractItemView,
         QAbstractTableModel, {Item Views Puzzle Example}
 */
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 2e4d840..3d26160 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -140,63 +140,6 @@ QT_BEGIN_NAMESPACE
     \value Public
 */
 
-// do not touch without touching the moc as well
-enum PropertyFlags  {
-    Invalid = 0x00000000,
-    Readable = 0x00000001,
-    Writable = 0x00000002,
-    Resettable = 0x00000004,
-    EnumOrFlag = 0x00000008,
-    StdCppSet = 0x00000100,
-//     Override = 0x00000200,
-    Constant = 0x00000400,
-    Final = 0x00000800,
-    Designable = 0x00001000,
-    ResolveDesignable = 0x00002000,
-    Scriptable = 0x00004000,
-    ResolveScriptable = 0x00008000,
-    Stored = 0x00010000,
-    ResolveStored = 0x00020000,
-    Editable = 0x00040000,
-    ResolveEditable = 0x00080000,
-    User = 0x00100000,
-    ResolveUser = 0x00200000,
-    Notify = 0x00400000
-};
-
-enum MethodFlags  {
-    AccessPrivate = 0x00,
-    AccessProtected = 0x01,
-    AccessPublic = 0x02,
-    AccessMask = 0x03, //mask
-
-    MethodMethod = 0x00,
-    MethodSignal = 0x04,
-    MethodSlot = 0x08,
-    MethodConstructor = 0x0c,
-    MethodTypeMask = 0x0c,
-
-    MethodCompatibility = 0x10,
-    MethodCloned = 0x20,
-    MethodScriptable = 0x40
-};
-
-enum MetaObjectFlags {
-    DynamicMetaObject = 0x01
-};
-
-struct QMetaObjectPrivate
-{
-    int revision;
-    int className;
-    int classInfoCount, classInfoData;
-    int methodCount, methodData;
-    int propertyCount, propertyData;
-    int enumeratorCount, enumeratorData;
-    int constructorCount, constructorData;
-    int flags;
-};
-
 static inline const QMetaObjectPrivate *priv(const uint* data)
 { return reinterpret_cast<const QMetaObjectPrivate*>(data); }
 
@@ -599,29 +542,46 @@ int QMetaObject::indexOfMethod(const char *method) const
 */
 int QMetaObject::indexOfSignal(const char *signal) const
 {
-    int i = -1;
     const QMetaObject *m = this;
-    while (m && i < 0) {
+    int i = QMetaObjectPrivate::indexOfSignalRelative(&m, signal);
+    if (i >= 0)
+        i += m->methodOffset();
+    return i;
+}
+
+/*! \internal
+    Same as QMetaObject::indexOfSignal, but the result is the local offset to the base object.
+
+    \a baseObject will be adjusted to the enclosing QMetaObject, or 0 if the signal is not found
+*/
+int QMetaObjectPrivate::indexOfSignalRelative(const QMetaObject **baseObject, const char *signal)
+{
+    int i = -1;
+    while (*baseObject) {
+        const QMetaObject *const m = *baseObject;
         for (i = priv(m->d.data)->methodCount-1; i >= 0; --i)
             if ((m->d.data[priv(m->d.data)->methodData + 5*i + 4] & MethodTypeMask) == MethodSignal
                 && strcmp(signal, m->d.stringdata
-                          + m->d.data[priv(m->d.data)->methodData + 5*i]) == 0) {
-                i += m->methodOffset();
+                + m->d.data[priv(m->d.data)->methodData + 5*i]) == 0) {
                 break;
             }
-        m = m->d.superdata;
+        if (i >= 0)
+            break;
+        *baseObject = m->d.superdata;
     }
 #ifndef QT_NO_DEBUG
+    const QMetaObject *m = *baseObject;
     if (i >= 0 && m && m->d.superdata) {
         int conflict = m->d.superdata->indexOfMethod(signal);
         if (conflict >= 0)
             qWarning("QMetaObject::indexOfSignal:%s: Conflict with %s::%s",
-                      m->d.stringdata, m->d.superdata->d.stringdata, signal);
+                     m->d.stringdata, m->d.superdata->d.stringdata, signal);
     }
 #endif
     return i;
 }
 
+
 /*!
     Finds \a slot and returns its index; otherwise returns -1.
 
@@ -2671,4 +2631,20 @@ const char* QMetaClassInfo::value() const
     and \a data.
 */
 
+/*! \internal
+    If the local_method_index is a cloned method, return the index of the original.
+
+    Example: if the index of "destroyed()" is passed, the index of "destroyed(QObject*)" is returned
+ */
+int QMetaObjectPrivate::originalClone(const QMetaObject *mobj, int local_method_index)
+{
+    int handle = get(mobj)->methodData + 5 * local_method_index;
+    while (mobj->d.data[handle + 4] & MethodCloned) {
+        Q_ASSERT(local_method_index > 0);
+        handle -= 5;
+        local_method_index--;
+    }
+    return local_method_index;
+}
+
 QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h
index 66ed55c..d843deb 100644
--- a/src/corelib/kernel/qmetaobject_p.h
+++ b/src/corelib/kernel/qmetaobject_p.h
@@ -54,9 +54,82 @@
 //
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qobjectdefs.h>
 
 QT_BEGIN_NAMESPACE
 
+enum PropertyFlags  {
+    Invalid = 0x00000000,
+    Readable = 0x00000001,
+    Writable = 0x00000002,
+    Resettable = 0x00000004,
+    EnumOrFlag = 0x00000008,
+    StdCppSet = 0x00000100,
+//     Override = 0x00000200,
+    Constant = 0x00000400,
+    Final = 0x00000800,
+    Designable = 0x00001000,
+    ResolveDesignable = 0x00002000,
+    Scriptable = 0x00004000,
+    ResolveScriptable = 0x00008000,
+    Stored = 0x00010000,
+    ResolveStored = 0x00020000,
+    Editable = 0x00040000,
+    ResolveEditable = 0x00080000,
+    User = 0x00100000,
+    ResolveUser = 0x00200000,
+    Notify = 0x00400000
+};
+
+enum MethodFlags  {
+    AccessPrivate = 0x00,
+    AccessProtected = 0x01,
+    AccessPublic = 0x02,
+    AccessMask = 0x03, //mask
+
+    MethodMethod = 0x00,
+    MethodSignal = 0x04,
+    MethodSlot = 0x08,
+    MethodConstructor = 0x0c,
+    MethodTypeMask = 0x0c,
+
+    MethodCompatibility = 0x10,
+    MethodCloned = 0x20,
+    MethodScriptable = 0x40
+};
+
+enum MetaObjectFlags {
+    DynamicMetaObject = 0x01
+};
+
+
+struct QMetaObjectPrivate
+{
+    int revision;
+    int className;
+    int classInfoCount, classInfoData;
+    int methodCount, methodData;
+    int propertyCount, propertyData;
+    int enumeratorCount, enumeratorData;
+    int constructorCount, constructorData; //since revision 2
+    int flags; //since revision 3
+    int signalCount; //since revision 4
+
+    static inline const QMetaObjectPrivate *get(const QMetaObject *metaobject)
+    { return reinterpret_cast<const QMetaObjectPrivate*>(metaobject->d.data); }
+
+    static int indexOfSignalRelative(const QMetaObject **baseObject, const char* name);
+    static int originalClone(const QMetaObject *obj, int local_method_index);
+
+    //defined in qobject.cpp
+    static bool connect(const QObject *sender, int signal_index,
+                        const QObject *receiver, int method_index,
+                        int type = 0, int *types = 0);
+    static bool disconnect(const QObject *sender, int signal_index,
+                           const QObject *receiver, int method_index);
+
+};
+
 #ifndef UTILS_H
 // mirrored in moc's utils.h
 static inline bool is_ident_char(char s)
@@ -202,6 +275,7 @@ static QByteArray normalizeTypeInternal(const char *t, const char *e, bool fixSc
     return result;
 }
 
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 5247290..040efc9 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -41,6 +41,7 @@
 
 #include "qobject.h"
 #include "qobject_p.h"
+#include "qmetaobject_p.h"
 
 #include "qabstracteventdispatcher.h"
 #include "qcoreapplication.h"
@@ -222,12 +223,42 @@ void QObjectPrivate::removePendingChildInsertedEvents(QObject *child)
 #endif
 
 
+/*!\internal
+  For a given metaobject, compute the signal offset, and the method offset (including signals)
+*/
+static void computeOffsets(const QMetaObject *metaobject, int *signalOffset, int *methodOffset)
+{
+    *signalOffset = *methodOffset = 0;
+    const QMetaObject *m = metaobject->d.superdata;
+    while (m) {
+        const QMetaObjectPrivate *d = QMetaObjectPrivate::get(m);
+        *methodOffset += d->methodCount;
+        *signalOffset += (d->revision >= 4) ? d->signalCount : d->methodCount;
+        /*Before Qt 4.6 (revision 4), the signalCount information was not generated by moc.
+           so for compatibility we consider all the method as slot for old moc output*/
+        m = m->d.superdata;
+    }
+}
+
+/*! \internal
+    This vector contains the all connections from an object.
+
+    Each object may have one vector containing the lists of connections for a given signal.
+    The index in the vector correspond to the signal index.
+    The signal index is the one returned by QObjectPrivate::signalIndex (not QMetaObject::indexOfSignal).
+    Negative index means connections to all signals.
+
+    This vector is protected by the object mutex (signalSlotMutexes())
+
+    Each Connection is also part of a 'senders' linked list. The mutex of the receiver must be locked when touching
+    the pointers of this linked list.
+*/
 class QObjectConnectionListVector : public QVector<QObjectPrivate::ConnectionList>
 {
 public:
-    bool orphaned;
-    bool dirty;
-    int inUse;
+    bool orphaned; //the QObject owner of this vector has been destroyed while the vector was inUse
+    bool dirty; //some Connection have been disconnected (their receiver is 0) but not removed from the list yet
+    int inUse; //number of functions that are currently accessing this object or its connections
     QObjectPrivate::ConnectionList allsignals;
 
     QObjectConnectionListVector()
@@ -252,7 +283,7 @@ public:
 bool QObjectPrivate::isSender(const QObject *receiver, const char *signal) const
 {
     Q_Q(const QObject);
-    int signal_index = q->metaObject()->indexOfSignal(signal);
+    int signal_index = signalIndex(signal);
     if (signal_index < 0)
         return false;
     QMutexLocker locker(signalSlotLock(q));
@@ -276,7 +307,7 @@ QObjectList QObjectPrivate::receiverList(const char *signal) const
 {
     Q_Q(const QObject);
     QObjectList returnValue;
-    int signal_index = q->metaObject()->indexOfSignal(signal);
+    int signal_index = signalIndex(signal);
     if (signal_index < 0)
         return returnValue;
     QMutexLocker locker(signalSlotLock(q));
@@ -2465,6 +2496,7 @@ QObject *QObject::sender() const
 
 int QObject::receivers(const char *signal) const
 {
+    Q_D(const QObject);
     int receivers = 0;
     if (signal) {
         QByteArray signal_name = QMetaObject::normalizedSignature(signal);
@@ -2474,8 +2506,7 @@ int QObject::receivers(const char *signal) const
             return 0;
 #endif
         signal++; // skip code
-        const QMetaObject *smeta = this->metaObject();
-        int signal_index = smeta->indexOfSignal(signal);
+        int signal_index = d->signalIndex(signal);
         if (signal_index < 0) {
 #ifndef QT_NO_DEBUG
             err_method_notfound(this, signal-1, "receivers");
@@ -2599,19 +2630,26 @@ bool QObject::connect(const QObject *sender, const char *signal,
     const QMetaObject *smeta = sender->metaObject();
     const char *signal_arg = signal;
     ++signal; //skip code
-    int signal_index = smeta->indexOfSignal(signal);
+    int signal_index = QMetaObjectPrivate::indexOfSignalRelative(&smeta, signal);
     if (signal_index < 0) {
         // check for normalized signatures
         tmp_signal_name = QMetaObject::normalizedSignature(signal - 1);
         signal = tmp_signal_name.constData() + 1;
 
-        signal_index = smeta->indexOfSignal(signal);
+        smeta = sender->metaObject();
+        signal_index = QMetaObjectPrivate::indexOfSignalRelative(&smeta, signal);
+
         if (signal_index < 0) {
             err_method_notfound(sender, signal_arg, "connect");
             err_info_about_objects("connect", sender, receiver);
             return false;
         }
     }
+    signal_index = QMetaObjectPrivate::originalClone(smeta, signal_index);
+    int signalOffset, methodOffset;
+    computeOffsets(smeta, &signalOffset, &methodOffset);
+    int signal_absolute_index = signal_index + methodOffset;
+    signal_index += signalOffset;
 
     QByteArray tmp_method_name;
     int membcode = extract_code(method);
@@ -2660,12 +2698,12 @@ bool QObject::connect(const QObject *sender, const char *signal,
 
     int *types = 0;
     if ((type == Qt::QueuedConnection || type == Qt::BlockingQueuedConnection)
-            && !(types = queuedConnectionTypes(smeta->method(signal_index).parameterTypes())))
+            && !(types = queuedConnectionTypes(smeta->method(signal_absolute_index).parameterTypes())))
         return false;
 
 #ifndef QT_NO_DEBUG
     {
-        QMetaMethod smethod = smeta->method(signal_index);
+        QMetaMethod smethod = smeta->method(signal_absolute_index);
         QMetaMethod rmethod = rmeta->method(method_index);
         if (warnCompat) {
             if(smethod.attributes() & QMetaMethod::Compatibility) {
@@ -2678,7 +2716,7 @@ bool QObject::connect(const QObject *sender, const char *signal,
         }
     }
 #endif
-    if (!QMetaObject::connect(sender, signal_index, receiver, method_index, type, types))
+    if (!QMetaObjectPrivate::connect(sender, signal_index, receiver, method_index, type, types))
         return false;
     const_cast<QObject*>(sender)->connectNotify(signal - 1);
     return true;
@@ -2822,14 +2860,18 @@ bool QObject::disconnect(const QObject *sender, const char *signal,
     do {
         int signal_index = -1;
         if (signal) {
-            signal_index = smeta->indexOfSignal(signal);
-            if (signal_index < smeta->methodOffset())
-                continue;
+            signal_index = QMetaObjectPrivate::indexOfSignalRelative(&smeta, signal);
+            if (signal_index < 0)
+                break;
+            signal_index = QMetaObjectPrivate::originalClone(smeta, signal_index);
+            int signalOffset, methodOffset;
+            computeOffsets(smeta, &signalOffset, &methodOffset);
+            signal_index += signalOffset;
             signal_found = true;
         }
 
         if (!method) {
-            res |= QMetaObject::disconnect(sender, signal_index, receiver, -1);
+            res |= QMetaObjectPrivate::disconnect(sender, signal_index, receiver, -1);
         } else {
             const QMetaObject *rmeta = receiver->metaObject();
             do {
@@ -2839,7 +2881,7 @@ bool QObject::disconnect(const QObject *sender, const char *signal,
                             rmeta = rmeta->superClass();
                 if (method_index < 0)
                     break;
-                res |= QMetaObject::disconnect(sender, signal_index, receiver, method_index);
+                res |= QMetaObjectPrivate::disconnect(sender, signal_index, receiver, method_index);
                 method_found = true;
             } while ((rmeta = rmeta->superClass()));
         }
@@ -2930,16 +2972,31 @@ void QObject::disconnectNotify(const char *)
 }
 
 /*!\internal
+   \a types is a 0-terminated vector of meta types for queued
+   connections.
 
-  \a types is a 0-terminated vector of meta types for queued
-  connections.
-
-  if \a signal_index is -1, then we effectively connect *all* signals
-  from the sender to the receiver's slot
-*/
+   if \a signal_index is -1, then we effectively connect *all* signals
+   from the sender to the receiver's slot
+ */
 bool QMetaObject::connect(const QObject *sender, int signal_index,
                           const QObject *receiver, int method_index, int type, int *types)
 {
+    const QMetaObject *mo = sender->metaObject();
+    while (mo && mo->methodOffset() > signal_index)
+        mo = mo->superClass();
+    int signalOffset, methodOffset;
+    computeOffsets(mo, &signalOffset, &methodOffset);
+    signal_index = QMetaObjectPrivate::originalClone(mo, signal_index - methodOffset) + signalOffset;
+    return QMetaObjectPrivate::connect(sender, signal_index,
+                                       receiver, method_index, type, types);
+}
+
+/*! \internal
+   Same as the QMetaObject::connect, but \a signal_index must be the result of QObjectPrivate::signalIndex
+ */
+bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index,
+                                 const QObject *receiver, int method_index, int type, int *types)
+{
     QObject *s = const_cast<QObject *>(sender);
     QObject *r = const_cast<QObject *>(receiver);
 
@@ -2947,7 +3004,7 @@ bool QMetaObject::connect(const QObject *sender, int signal_index,
                                signalSlotLock(receiver));
 
     if (type & Qt::UniqueConnection) {
-        QObjectConnectionListVector *connectionLists = s->d_func()->connectionLists;
+        QObjectConnectionListVector *connectionLists = QObjectPrivate::get(s)->connectionLists;
         if (connectionLists && connectionLists->count() > signal_index) {
             const QObjectPrivate::Connection *c2 = 
                 (*connectionLists)[signal_index].first;
@@ -2970,29 +3027,29 @@ bool QMetaObject::connect(const QObject *sender, int signal_index,
     c->nextConnectionList = 0;
 
     QT_TRY {
-        s->d_func()->addConnection(signal_index, c);
+        QObjectPrivate::get(s)->addConnection(signal_index, c);
     } QT_CATCH(...) {
         delete c;
         QT_RETHROW;
     }
 
-    c->prev = &r->d_func()->senders;
+    c->prev = &(QObjectPrivate::get(r)->senders);
     c->next = *c->prev;
     *c->prev = c;
     if (c->next)
         c->next->prev = &c->next;
 
+    QObjectPrivate *const sender_d = QObjectPrivate::get(s);
     if (signal_index < 0) {
-        for (uint i = 0; i < (sizeof sender->d_func()->connectedSignals
-                              / sizeof sender->d_func()->connectedSignals[0] ); ++i)
-            sender->d_func()->connectedSignals[i] = ~0u;
-    } else if (signal_index < (int)sizeof sender->d_func()->connectedSignals * 8) {
-        uint n = (signal_index / (8 * sizeof sender->d_func()->connectedSignals[0]));
-        sender->d_func()->connectedSignals[n] |= (1 << (signal_index - n * 8
-                                                        * sizeof sender->d_func()->connectedSignals[0]));
+        for (uint i = 0; i < (sizeof sender_d->connectedSignals
+                              / sizeof sender_d->connectedSignals[0] ); ++i)
+            sender_d->connectedSignals[i] = ~0u;
+    } else if (signal_index < (int)sizeof sender_d->connectedSignals * 8) {
+        uint n = (signal_index / (8 * sizeof sender_d->connectedSignals[0]));
+        sender_d->connectedSignals[n] |= (1 << (signal_index - n * 8
+                                    * sizeof sender_d->connectedSignals[0]));
     }
 
-
     return true;
 }
 
@@ -3002,6 +3059,22 @@ bool QMetaObject::connect(const QObject *sender, int signal_index,
 bool QMetaObject::disconnect(const QObject *sender, int signal_index,
                              const QObject *receiver, int method_index)
 {
+    const QMetaObject *mo = sender->metaObject();
+    while (mo && mo->methodOffset() > signal_index)
+        mo = mo->superClass();
+    int signalOffset, methodOffset;
+    computeOffsets(mo, &signalOffset, &methodOffset);
+    signal_index = QMetaObjectPrivate::originalClone(mo, signal_index - methodOffset) + signalOffset;
+    return QMetaObjectPrivate::disconnect(sender, signal_index,
+                                          receiver, method_index);
+}
+
+/*! \internal
+    Same as the QMetaObject::disconnect, but \a signal_index must be the result of QObjectPrivate::signalIndex
+ */
+bool QMetaObjectPrivate::disconnect(const QObject *sender, int signal_index,
+                             const QObject *receiver, int method_index)
+{
     if (!sender)
         return false;
 
@@ -3012,7 +3085,7 @@ bool QMetaObject::disconnect(const QObject *sender, int signal_index,
     QMutex *receiverMutex = receiver ? signalSlotLock(receiver) : 0;
     QOrderedMutexLocker locker(senderMutex, receiverMutex);
 
-    QObjectConnectionListVector *connectionLists = s->d_func()->connectionLists;
+    QObjectConnectionListVector *connectionLists = QObjectPrivate::get(s)->connectionLists;
     if (!connectionLists)
         return false;
 
@@ -3123,23 +3196,26 @@ void QMetaObject::connectSlotsByName(QObject *o)
             int len = objName.length();
             if (!len || qstrncmp(slot + 3, objName.data(), len) || slot[len+3] != '_')
                 continue;
-            const QMetaObject *smo = co->metaObject();
-            int sigIndex = smo->indexOfMethod(slot + len + 4);
+            int sigIndex = co->d_func()->signalIndex(slot + len + 4);
             if (sigIndex < 0) { // search for compatible signals
+                const QMetaObject *smo = co->metaObject();
                 int slotlen = qstrlen(slot + len + 4) - 1;
                 for (int k = 0; k < co->metaObject()->methodCount(); ++k) {
-                    if (smo->method(k).methodType() != QMetaMethod::Signal)
+                    QMetaMethod method = smo->method(k);
+                    if (method.methodType() != QMetaMethod::Signal)
                         continue;
 
-                    if (!qstrncmp(smo->method(k).signature(), slot + len + 4, slotlen)) {
-                        sigIndex = k;
+                    if (!qstrncmp(method.signature(), slot + len + 4, slotlen)) {
+                        int signalOffset, methodOffset;
+                        computeOffsets(method.enclosingMetaObject(), &signalOffset, &methodOffset);
+                        sigIndex = k + - methodOffset + signalOffset;
                         break;
                     }
                 }
             }
             if (sigIndex < 0)
                 continue;
-            if (QMetaObject::connect(co, sigIndex, o, i)) {
+            if (QMetaObjectPrivate::connect(co, sigIndex, o, i)) {
                 foundIt = true;
                 break;
             }
@@ -3211,15 +3287,43 @@ static void blocking_activate(QObject *sender, int signal, QObjectPrivate::Conne
 }
 
 /*!\internal
+   \obsolete.
+   Used to be called from QMetaObject::activate(QObject *, QMetaObject *, int, int, void **) before Qt 4.6
  */
 void QMetaObject::activate(QObject *sender, int from_signal_index, int to_signal_index, void **argv)
 {
+    Q_UNUSED(to_signal_index);
+    activate(sender, from_signal_index, argv);
+}
+
+/*!\internal
+ */
+void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_signal_index,
+                           void **argv)
+{
+    int signalOffset;
+    int methodOffset;
+    computeOffsets(m, &signalOffset, &methodOffset);
+
+    int signal_index = signalOffset + local_signal_index;
+    if (signal_index < (int)sizeof(sender->d_func()->connectedSignals) * 8
+        && !qt_signal_spy_callback_set.signal_begin_callback
+        && !qt_signal_spy_callback_set.signal_end_callback) {
+        uint n = (signal_index / (8 * sizeof sender->d_func()->connectedSignals[0]));
+        uint m = 1 << (signal_index - n * 8 * sizeof sender->d_func()->connectedSignals[0]);
+        if ((sender->d_func()->connectedSignals[n] & m) == 0)
+            // nothing connected to these signals, and no spy
+            return;
+    }
+
     if (sender->d_func()->blockSig)
         return;
 
+    int signal_absolute_index = methodOffset + local_signal_index;
+
     void *empty_argv[] = { 0 };
     if (qt_signal_spy_callback_set.signal_begin_callback != 0) {
-        qt_signal_spy_callback_set.signal_begin_callback(sender, from_signal_index,
+        qt_signal_spy_callback_set.signal_begin_callback(sender, signal_absolute_index,
                                                          argv ? argv : empty_argv);
     }
 
@@ -3229,26 +3333,20 @@ void QMetaObject::activate(QObject *sender, int from_signal_index, int to_signal
     QObjectConnectionListVector *connectionLists = sender->d_func()->connectionLists;
     if (!connectionLists) {
         if (qt_signal_spy_callback_set.signal_end_callback != 0)
-            qt_signal_spy_callback_set.signal_end_callback(sender, from_signal_index);
+            qt_signal_spy_callback_set.signal_end_callback(sender, signal_absolute_index);
         return;
     }
     ++connectionLists->inUse;
+    if (signal_index >= connectionLists->count()) {
+        signal_index = -2; //for "all signals";
+    }
 
-    // emit signals in the following order: from_signal_index <= signals <= to_signal_index, signal < 0
-    for (int signal = from_signal_index;
-         (signal >= from_signal_index && signal <= to_signal_index) || (signal == -2);
-         (signal == to_signal_index ? signal = -2 : ++signal))
-    {
-        if (signal >= connectionLists->count()) {
-            signal = to_signal_index;
-            continue;
-        }
-        
-        QObjectPrivate::Connection *c = connectionLists->at(signal).first;
+    do {
+        QObjectPrivate::Connection *c = connectionLists->at(signal_index).first;
         if (!c) continue;
         // We need to check against last here to ensure that signals added
         // during the signal emission are not emitted in this emission.
-        QObjectPrivate::Connection *last = connectionLists->at(signal).last;
+        QObjectPrivate::Connection *last = connectionLists->at(signal_index).last;
 
         do {
             if (!c->receiver)
@@ -3262,17 +3360,17 @@ void QMetaObject::activate(QObject *sender, int from_signal_index, int to_signal
                  && (currentThreadData != sender->d_func()->threadData
                      || receiver->d_func()->threadData != sender->d_func()->threadData))
                 || (c->connectionType == Qt::QueuedConnection)) {
-                queued_activate(sender, signal, c, argv);
+                queued_activate(sender, signal_absolute_index, c, argv);
                 continue;
             } else if (c->connectionType == Qt::BlockingQueuedConnection) {
-                blocking_activate(sender, signal, c, argv);
+                blocking_activate(sender, signal_absolute_index, c, argv);
                 continue;
             }
 
             const int method = c->method;
             QObjectPrivate::Sender currentSender;
             currentSender.sender = sender;
-            currentSender.signal = signal < 0 ? from_signal_index : signal;
+            currentSender.signal = signal_absolute_index;
             currentSender.ref = 1;
             QObjectPrivate::Sender *previousSender = 0;
             if (currentThreadData == receiver->d_func()->threadData)
@@ -3316,7 +3414,7 @@ void QMetaObject::activate(QObject *sender, int from_signal_index, int to_signal
 
         if (connectionLists->orphaned)
             break;
-    }
+    } while (signal_index >= 0 && (signal_index = -1)); //start over for -1 (all signal)
 
     --connectionLists->inUse;
     Q_ASSERT(connectionLists->inUse >= 0);
@@ -3330,82 +3428,50 @@ void QMetaObject::activate(QObject *sender, int from_signal_index, int to_signal
     locker.unlock();
 
     if (qt_signal_spy_callback_set.signal_end_callback != 0)
-        qt_signal_spy_callback_set.signal_end_callback(sender, from_signal_index);
-}
+        qt_signal_spy_callback_set.signal_end_callback(sender, signal_absolute_index);
 
+}
 
 /*!\internal
- */
+   Obsolete.  (signal_index comes from indexOfMethod())
+*/
 void QMetaObject::activate(QObject *sender, int signal_index, void **argv)
 {
-    if (signal_index < (int)sizeof(sender->d_func()->connectedSignals) * 8
-        && !qt_signal_spy_callback_set.signal_begin_callback
-        && !qt_signal_spy_callback_set.signal_end_callback) {
-        uint n = (signal_index / (8 * sizeof sender->d_func()->connectedSignals[0]));
-        uint m = 1 << (signal_index - n * 8 * sizeof sender->d_func()->connectedSignals[0]);
-        if ((sender->d_func()->connectedSignals[n] & m) == 0)
-            // nothing connected to these signals, and no spy
-            return;
-    }
-    activate(sender, signal_index, signal_index, argv);
-}
-
-/*!\internal
- */
-void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_signal_index,
-                           void **argv)
-{
-    int signal_index = m->methodOffset() + local_signal_index;
-    if (signal_index < (int)sizeof(sender->d_func()->connectedSignals) * 8
-        && !qt_signal_spy_callback_set.signal_begin_callback
-        && !qt_signal_spy_callback_set.signal_end_callback) {
-        uint n = (signal_index / (8 * sizeof sender->d_func()->connectedSignals[0]));
-        uint m = 1 << (signal_index - n * 8 * sizeof sender->d_func()->connectedSignals[0]);
-        if ((sender->d_func()->connectedSignals[n] & m) == 0)
-            // nothing connected to these signals, and no spy
-            return;
-    }
-    activate(sender, signal_index, signal_index, argv);
+    const QMetaObject *mo = sender->metaObject();
+    while (mo && mo->methodOffset() > signal_index)
+        mo = mo->superClass();
+    activate(sender, mo, signal_index - mo->methodOffset(), argv);
 }
 
 /*!\internal
+   Obsolete, called by moc generated code before Qt 4.6 for cloned signals
+   But since Qt 4.6, all clones are connected to their original
  */
 void QMetaObject::activate(QObject *sender, const QMetaObject *m,
                            int from_local_signal_index, int to_local_signal_index, void **argv)
 {
-    Q_ASSERT(from_local_signal_index <= to_local_signal_index);
-    int offset = m->methodOffset();
-    int from_signal_index = offset + from_local_signal_index;
-    int to_signal_index = offset + to_local_signal_index;
+    Q_UNUSED(to_local_signal_index);
+    Q_ASSERT(from_local_signal_index == QMetaObjectPrivate::originalClone(m, to_local_signal_index));
+    activate(sender, m, from_local_signal_index, argv);
+}
 
-    if (to_signal_index < (int)sizeof(sender->d_func()->connectedSignals) * 8
-        && !qt_signal_spy_callback_set.signal_begin_callback
-        && !qt_signal_spy_callback_set.signal_end_callback) {
+/*! \internal
+    Returns the signal index used in the internal connectionLists vector.
 
-        uint n = (from_signal_index / (8 * sizeof sender->d_func()->connectedSignals[0]));
-        uint m = 1 << (from_signal_index - n * 8 * sizeof sender->d_func()->connectedSignals[0]);
-        uint nt = (to_signal_index / (8 * sizeof sender->d_func()->connectedSignals[0]));
-        uint mt = 1 << (to_signal_index - n * 8 * sizeof sender->d_func()->connectedSignals[0]);
-        bool connected = false;
-        quint32 *connectedSignals = sender->d_func()->connectedSignals;
-        for (uint i = 0; !connected && i < (sizeof sender->d_func()->connectedSignals
-                                            / sizeof sender->d_func()->connectedSignals[0]); ++i) {
-            uint mask = 0;
-            if (i > n)
-                mask = ~0u;
-            else if (i == n)
-                mask = ~(m -1);
-            if (i > nt)
-                mask = 0;
-            else if (i == nt)
-                mask &= (mt << 1) - 1;
-            connected = connectedSignals[i] & mask;
-        }
-        if (!connected)
-            // nothing connected to these signals, and no spy
-            return;
-    }
-    activate(sender, from_signal_index, to_signal_index, argv);
+    It is different from QMetaObject::indexOfSignal():  indexOfSignal is the same as indexOfMethod
+    while QObjectPrivate::signalIndex is smaller because it doesn't give index to slots.
+*/
+int QObjectPrivate::signalIndex(const char *signalName) const
+{
+    Q_Q(const QObject);
+    const QMetaObject *base = q->metaObject();
+    int relative_index = QMetaObjectPrivate::indexOfSignalRelative(&base, signalName);
+    if (relative_index < 0)
+        return relative_index;
+    relative_index = QMetaObjectPrivate::originalClone(base, relative_index);
+    int signalOffset, methodOffset;
+    computeOffsets(base, &signalOffset, &methodOffset);
+    return relative_index + signalOffset;
 }
 
 /*! \internal
@@ -3413,14 +3479,16 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m,
   Returns true if the signal with index \a signal_index from object \a sender is connected.
   Signals with indices above a certain range are always considered connected (see connectedSignals
   in QObjectPrivate). If a signal spy is installed, all signals are considered connected.
+
+  \a signal_index must be the index returned by QObjectPrivate::signalIndex;
 */
-bool QMetaObject::isConnected(QObject *sender, int signal_index) {
-    if (signal_index < (int)sizeof(sender->d_func()->connectedSignals) * 8
+bool QObjectPrivate::isSignalConnected(int signal_index) const {
+    if (signal_index < (int)sizeof(connectedSignals) * 8
         && !qt_signal_spy_callback_set.signal_begin_callback
         && !qt_signal_spy_callback_set.signal_end_callback) {
-        uint n = (signal_index / (8 * sizeof sender->d_func()->connectedSignals[0]));
-        uint m = 1 << (signal_index - n * 8 * sizeof sender->d_func()->connectedSignals[0]);
-        if ((sender->d_func()->connectedSignals[n] & m) == 0)
+        uint n = (signal_index / (8 * sizeof connectedSignals[0]));
+        uint m = 1 << (signal_index - n * 8 * sizeof connectedSignals[0]);
+        if ((connectedSignals[n] & m) == 0)
             // nothing connected to these signals, and no spy
             return false;
     }
@@ -3626,8 +3694,21 @@ void QObject::dumpObjectInfo()
     qDebug("  SIGNALS OUT");
 
     if (d->connectionLists) {
+        int offset = 0;
+        int offsetToNextMetaObject = 0;
         for (int signal_index = 0; signal_index < d->connectionLists->count(); ++signal_index) {
-            const QMetaMethod signal = metaObject()->method(signal_index);
+            if (signal_index >= offsetToNextMetaObject) {
+                const QMetaObject *mo = metaObject();
+                int signalOffset, methodOffset;
+                computeOffsets(mo, &signalOffset, &methodOffset);
+                while (mo && signalOffset > signal_index) {
+                    mo = mo->superClass();
+                    offsetToNextMetaObject = signalOffset;
+                    computeOffsets(mo, &signalOffset, &methodOffset);
+                }
+                offset = offset - signalOffset + methodOffset;
+            }
+            const QMetaMethod signal = metaObject()->method(signal_index + offset);
             qDebug("        signal: %s", signal.signature());
 
             // receivers
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 49d8b63..9721ef8 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -169,6 +169,9 @@ public:
         return o->d_func();
     }
 
+    int signalIndex(const char *signalName) const;
+    bool isSignalConnected(int signalIdx) const;
+
 public:
     QString objectName;
     ExtraData *extraData;    // extra data set by the user
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index befd596..421617a 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -330,12 +330,10 @@ struct Q_CORE_EXPORT QMetaObject
     static void connectSlotsByName(QObject *o);
 
     // internal index-based signal activation
-    static void activate(QObject *sender, int signal_index, void **argv);
-    static void activate(QObject *sender, int from_signal_index, int to_signal_index, void **argv);
+    static void activate(QObject *sender, int signal_index, void **argv);  //obsolete
+    static void activate(QObject *sender, int from_signal_index, int to_signal_index, void **argv); //obsolete
     static void activate(QObject *sender, const QMetaObject *, int local_signal_index, void **argv);
-    static void activate(QObject *sender, const QMetaObject *, int from_local_signal_index, int to_local_signal_index, void **argv);
-
-    static bool isConnected(QObject *sender, int signal_index);
+    static void activate(QObject *sender, const QMetaObject *, int from_local_signal_index, int to_local_signal_index, void **argv); //obsolete
 
     // internal guarded pointers
     static void addGuard(QObject **ptr);
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index d5b2d16..ebd2e30 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2494,7 +2494,7 @@ double QVariant::toDouble(bool *ok) const
 */
 float QVariant::toFloat(bool *ok) const
 {
-    return qNumVariantToHelper<float>(d, handler, ok, d.data.d);
+    return qNumVariantToHelper<float>(d, handler, ok, d.data.f);
 }
 
 /*!
@@ -2511,7 +2511,7 @@ float QVariant::toFloat(bool *ok) const
 */
 qreal QVariant::toReal(bool *ok) const
 {
-    return qNumVariantToHelper<qreal>(d, handler, ok, d.data.d);
+    return qNumVariantToHelper<qreal>(d, handler, ok, d.data.real);
 }
 
 /*!
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 79bd5b8..d6a704e 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -358,6 +358,7 @@ class Q_CORE_EXPORT QVariant
             bool b;
             double d;
             float f;
+            qreal real;
             qlonglong ll;
             qulonglong ull;
             QObject *o;
diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h
index 993c43b..c36899d 100644
--- a/src/corelib/kernel/qvariant_p.h
+++ b/src/corelib/kernel/qvariant_p.h
@@ -57,6 +57,7 @@
 // to a pointer of the input type
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -145,6 +146,8 @@ inline void v_clear(QVariant::Private *d, T* = 0)
 
 }
 
+Q_CORE_EXPORT const QVariant::Handler *qcoreVariantHandler();
+
 QT_END_NAMESPACE
 
 #endif // QVARIANT_P_H
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index 2853b1a..defa7af 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -217,6 +217,8 @@ public:
     static const Handler *handler;
 };
 
+Q_CORE_EXPORT const QStateMachinePrivate::Handler *qcoreStateMachineHandler();
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 8b9d202..ecb0bcb 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -2231,9 +2231,8 @@ QDateTime::QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec)
 */
 
 QDateTime::QDateTime(const QDateTime &other)
-    : d(other.d.data())
+    : d(other.d)
 {
-    d->ref.ref();
 }
 
 /*!
@@ -2250,7 +2249,7 @@ QDateTime::~QDateTime()
 
 QDateTime &QDateTime::operator=(const QDateTime &other)
 {
-    d.assign(other.d.data());
+    d = other.d;
     return *this;
 }
 
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h
index 84d3e83..988d1a2 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/tools/qdatetime.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qstring.h>
 #include <QtCore/qnamespace.h>
-#include <QtCore/qscopedpointer.h>
+#include <QtCore/qsharedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -285,7 +285,7 @@ public:
 private:
     friend class QDateTimePrivate;
     void detach();
-    QScopedSharedPointer<QDateTimePrivate> d;
+    QExplicitlySharedDataPointer<QDateTimePrivate> d;
 
 #ifndef QT_NO_DATASTREAM
     friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QDateTime &);
diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/tools/qdatetime_p.h
index 0284ed1..227e4fb 100644
--- a/src/corelib/tools/qdatetime_p.h
+++ b/src/corelib/tools/qdatetime_p.h
@@ -81,9 +81,9 @@ class QDateTimePrivate
 public:
     enum Spec { LocalUnknown = -1, LocalStandard = 0, LocalDST = 1, UTC = 2, OffsetFromUTC = 3};
 
-    QDateTimePrivate() : ref(1), spec(LocalUnknown), utcOffset(0) {}
+    QDateTimePrivate() : spec(LocalUnknown), utcOffset(0) {}
     QDateTimePrivate(const QDateTimePrivate &other)
-        : ref(1), date(other.date), time(other.time), spec(other.spec), utcOffset(other.utcOffset)
+        : date(other.date), time(other.time), spec(other.spec), utcOffset(other.utcOffset)
     {}
 
     QAtomicInt ref;
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index ed7fe9e..3cec0bf 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -52,6 +52,7 @@
 #include "qstringlist.h"
 #include "qstringmatcher.h"
 #include "qvector.h"
+#include "private/qfunctions_p.h"
 
 #include <limits.h>
 
@@ -832,7 +833,7 @@ struct QRegExpEngineKey
     }
 };
 
-bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key2)
+Q_STATIC_GLOBAL_OPERATOR bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key2)
 {
     return key1.pattern == key2.pattern && key1.patternSyntax == key2.patternSyntax
            && key1.cs == key2.cs;
diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h
index dde6e88..8aace0f 100644
--- a/src/corelib/tools/qshareddata.h
+++ b/src/corelib/tools/qshareddata.h
@@ -69,6 +69,9 @@ private:
 template <class T> class QSharedDataPointer
 {
 public:
+    typedef T Type;
+    typedef T *pointer;
+
     inline void detach() { if (d && d->ref != 1) detach_helper(); }
     inline T &operator*() { detach(); return *d; }
     inline const T &operator*() const { return *d; }
@@ -127,6 +130,7 @@ template <class T> class QExplicitlySharedDataPointer
 {
 public:
     typedef T Type;
+    typedef T *pointer;
 
     inline T &operator*() const { return *d; }
     inline T *operator->() { return d; }
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index bce4c64..90ca34f 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -555,10 +555,12 @@ public:
     inline QWeakPointer() : d(0), value(0) { }
     inline ~QWeakPointer() { if (d && !d->weakref.deref()) delete d; }
 
+#ifndef QT_NO_QOBJECT
     // special constructor that is enabled only if X derives from QObject
     template <class X>
     inline QWeakPointer(X *ptr) : d(ptr ? d->getAndRef(ptr) : 0), value(ptr)
     { }
+#endif
     template <class X>
     inline QWeakPointer &operator=(X *ptr)
     { return *this = QWeakPointer(ptr); }
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index 4eadc75..548d451 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -313,8 +313,8 @@ QXmlStreamEntityResolver *QXmlStreamReader::entityResolver() const
   error handling described.
 
   The \l{QXmlStream Bookmarks Example} illustrates how to use the
-  recursive descent technique with a subclassed stream reader to read
-  an XML bookmark file (XBEL).
+  recursive descent technique to read an XML bookmark file (XBEL) with
+  a stream reader.
 
   \section1 Namespaces
 
@@ -2944,7 +2944,7 @@ QStringRef QXmlStreamReader::documentEncoding() const
   encodings can be enforced using setCodec().
 
   The \l{QXmlStream Bookmarks Example} illustrates how to use a
-  subclassed stream writer to write an XML bookmark file (XBEL) that
+  stream writer to write an XML bookmark file (XBEL) that
   was previously read in by a QXmlStreamReader.
 
 */
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index a676a01..851eaf0 100644
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -707,7 +707,7 @@ QDBusMessage::MessageType QDBusMessage::type() const
     \sa QDBusConnection::send()
 */
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, QDBusMessage::MessageType t)
+static QDebug operator<<(QDebug dbg, QDBusMessage::MessageType t)
 {
     switch (t)
     {
diff --git a/src/gui/dialogs/qfileinfogatherer_p.h b/src/gui/dialogs/qfileinfogatherer_p.h
index cb980d2..bab4a29 100644
--- a/src/gui/dialogs/qfileinfogatherer_p.h
+++ b/src/gui/dialogs/qfileinfogatherer_p.h
@@ -184,7 +184,7 @@ private:
 
     QMutex mutex;
     QWaitCondition condition;
-    bool abort;
+    volatile bool abort;
 
     QStack<QString> path;
     QStack<QStringList> files;
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 4f64c2a..88fac14 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1023,7 +1023,7 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent)
     }
 
     // Resolve depth.
-    resolveDepth(parent ? parent->d_ptr->depth : -1);
+    invalidateDepthRecursively();
     dirtySceneTransform = 1;
 
     // Restore the sub focus chain.
@@ -4413,14 +4413,42 @@ bool QGraphicsItemPrivate::discardUpdateRequest(bool ignoreClipping, bool ignore
 
 /*!
     \internal
+*/
+int QGraphicsItemPrivate::depth() const
+{
+    if (itemDepth == -1)
+        const_cast<QGraphicsItemPrivate *>(this)->resolveDepth();
+
+    return itemDepth;
+}
 
-    Resolves the stacking depth of this object and all its children.
+/*!
+    \internal
 */
-void QGraphicsItemPrivate::resolveDepth(int parentDepth)
+void QGraphicsItemPrivate::invalidateDepthRecursively()
 {
-    depth = parentDepth + 1;
+    if (itemDepth == -1)
+        return;
+
+    itemDepth = -1;
     for (int i = 0; i < children.size(); ++i)
-        children.at(i)->d_ptr->resolveDepth(depth);
+        children.at(i)->d_ptr->invalidateDepthRecursively();
+}
+
+/*!
+    \internal
+
+    Resolves the stacking depth of this object and all its ancestors.
+*/
+void QGraphicsItemPrivate::resolveDepth()
+{
+    if (!parent)
+        itemDepth = 0;
+    else {
+        if (parent->d_ptr->itemDepth == -1)
+            parent->d_ptr->resolveDepth();
+        itemDepth = parent->d_ptr->itemDepth + 1;
+    }
 }
 
 /*!
@@ -5590,8 +5618,8 @@ QGraphicsItem *QGraphicsItem::commonAncestorItem(const QGraphicsItem *other) con
         return const_cast<QGraphicsItem *>(this);
     const QGraphicsItem *thisw = this;
     const QGraphicsItem *otherw = other;
-    int thisDepth = d_ptr->depth;
-    int otherDepth = other->d_ptr->depth;
+    int thisDepth = d_ptr->depth();
+    int otherDepth = other->d_ptr->depth();
     while (thisDepth > otherDepth) {
         thisw = thisw->d_ptr->parent;
         --thisDepth;
@@ -6601,7 +6629,7 @@ void QGraphicsItem::prepareGeometryChange()
         // if someone is connected to the changed signal or the scene has no views.
         // Note that this has to be done *after* markDirty to ensure that
         // _q_processDirtyItems is called before _q_emitUpdated.
-	if ((scenePrivate->connectedSignals[0] & scenePrivate->changedSignalMask)
+	if (scenePrivate->isSignalConnected(scenePrivate->changedSignalIndex)
             || scenePrivate->views.isEmpty()) {
             if (d_ptr->hasTranslateOnlySceneTransform()) {
                 d_ptr->scene->update(boundingRect().translated(d_ptr->sceneTransform.dx(),
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 24326f6..6456ae7 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -123,7 +123,7 @@ public:
         transformData(0),
         index(-1),
         siblingIndex(-1),
-        depth(0),
+        itemDepth(-1),
         focusProxy(0),
         subFocusItem(0),
         imHints(Qt::ImhNone),
@@ -209,7 +209,9 @@ public:
     void setEnabledHelper(bool newEnabled, bool explicitly, bool update = true);
     bool discardUpdateRequest(bool ignoreClipping = false, bool ignoreVisibleBit = false,
                               bool ignoreDirtyBit = false, bool ignoreOpacity = false) const;
-    void resolveDepth(int parentDepth);
+    int depth() const;
+    void invalidateDepthRecursively();
+    void resolveDepth();
     void addChild(QGraphicsItem *child);
     void removeChild(QGraphicsItem *child);
     void setParentItemHelper(QGraphicsItem *parent);
@@ -419,7 +421,7 @@ public:
     QTransform sceneTransform;
     int index;
     int siblingIndex;
-    int depth;
+    int itemDepth;  // Lazily calculated when calling depth().
     QGraphicsItem *focusProxy;
     QList<QGraphicsItem **> focusProxyRefs;
     QGraphicsItem *subFocusItem;
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index a2a92b8..a8db74d 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -265,12 +265,13 @@ static void _q_hoverFromMouseEvent(QGraphicsSceneHoverEvent *hover, const QGraph
     hover->setAccepted(mouseEvent->isAccepted());
 }
 
+int QGraphicsScenePrivate::changedSignalIndex;
+
 /*!
     \internal
 */
 QGraphicsScenePrivate::QGraphicsScenePrivate()
-    : changedSignalMask(0),
-      indexMethod(QGraphicsScene::BspTreeIndex),
+    : indexMethod(QGraphicsScene::BspTreeIndex),
       index(0),
       lastItemCount(0),
       hasSceneRect(false),
@@ -311,7 +312,9 @@ void QGraphicsScenePrivate::init()
     index = new QGraphicsSceneBspTreeIndex(q);
 
     // Keep this index so we can check for connected slots later on.
-    changedSignalMask = (1 << q->metaObject()->indexOfSignal("changed(QList<QRectF>)"));
+    if (!changedSignalIndex) {
+        changedSignalIndex = signalIndex("changed(QList<QRectF>)");
+    }
     qApp->d_func()->scene_list.append(q);
     q->update();
 }
@@ -343,7 +346,7 @@ void QGraphicsScenePrivate::_q_emitUpdated()
     // the optimization that items send updates directly to the views, but it
     // needs to happen in order to keep compatibility with the behavior from
     // Qt 4.4 and backward.
-    if (connectedSignals[0] & changedSignalMask) {
+    if (isSignalConnected(changedSignalIndex)) {
         for (int i = 0; i < views.size(); ++i) {
             QGraphicsView *view = views.at(i);
             if (!view->d_func()->connectedToScene) {
@@ -2894,7 +2897,7 @@ void QGraphicsScene::update(const QRectF &rect)
 
     // Check if anyone's connected; if not, we can send updates directly to
     // the views. Otherwise or if there are no views, use old behavior.
-    bool directUpdates = !(d->connectedSignals[0] & d->changedSignalMask) && !d->views.isEmpty();
+    bool directUpdates = !(d->isSignalConnected(d->changedSignalIndex)) && !d->views.isEmpty();
     if (rect.isNull()) {
         d->updateAll = true;
         d->updatedRects.clear();
@@ -4473,7 +4476,7 @@ void QGraphicsScenePrivate::markDirty(QGraphicsItem *item, const QRectF &rect, b
     if (removingItemFromScene) {
         // Note that this function can be called from the item's destructor, so
         // do NOT call any virtual functions on it within this block.
-        if ((connectedSignals[0] & changedSignalMask) || views.isEmpty()) {
+        if (isSignalConnected(changedSignalIndex) || views.isEmpty()) {
             // This block of code is kept for compatibility. Since 4.5, by default
             // QGraphicsView does not connect the signal and we use the below
             // method of delivering updates.
@@ -4619,7 +4622,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
 
     // Process item.
     if (item->d_ptr->dirty || item->d_ptr->paintedViewBoundingRectsNeedRepaint) {
-        const bool useCompatUpdate = views.isEmpty() || (connectedSignals[0] & changedSignalMask);
+        const bool useCompatUpdate = views.isEmpty() || isSignalConnected(changedSignalIndex);
         const QRectF itemBoundingRect = adjustedItemBoundingRect(item);
 
         if (useCompatUpdate && !itemIsUntransformable && qFuzzyIsNull(item->boundingRegionGranularity())) {
diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h
index 685f534..f1ddb5a 100644
--- a/src/gui/graphicsview/qgraphicsscene_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_p.h
@@ -87,7 +87,7 @@ public:
 
     static QGraphicsScenePrivate *get(QGraphicsScene *q);
 
-    quint32 changedSignalMask;
+    static int changedSignalIndex;
 
     QGraphicsScene::ItemIndexMethod indexMethod;
     QGraphicsSceneIndex *index;
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
index 433d0a8..7483bc1 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
@@ -419,8 +419,8 @@ bool QGraphicsSceneBspTreeIndexPrivate::closestItemFirst_withoutCache(const QGra
 
     // Find common ancestor, and each item's ancestor closest to the common
     // ancestor.
-    int item1Depth = d1->depth;
-    int item2Depth = d2->depth;
+    int item1Depth = d1->depth();
+    int item2Depth = d2->depth();
     const QGraphicsItem *p = item1;
     const QGraphicsItem *t1 = item1;
     while (item1Depth > item2Depth && (p = p->d_ptr->parent)) {
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h
index 8738d65..89d3171 100644
--- a/src/gui/image/qbitmap.h
+++ b/src/gui/image/qbitmap.h
@@ -82,6 +82,8 @@ public:
     QT3_SUPPORT_CONSTRUCTOR QBitmap(const QImage &image) { *this = fromImage(image); }
     QT3_SUPPORT QBitmap &operator=(const QImage &image) { *this = fromImage(image); return *this; }
 #endif
+
+    typedef QExplicitlySharedDataPointer<QPixmapData> DataPtr;
 };
 Q_DECLARE_SHARED(QBitmap)
 
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
index ccf8457..19701b4 100644
--- a/src/gui/image/qbmphandler.cpp
+++ b/src/gui/image/qbmphandler.cpp
@@ -81,14 +81,14 @@ static void swapPixel01(QImage *image)        // 1-bpp: swap 0 and 1 pixels
 
 const int BMP_FILEHDR_SIZE = 14;                // size of BMP_FILEHDR data
 
-QDataStream &operator>>(QDataStream &s, BMP_FILEHDR &bf)
+static QDataStream &operator>>(QDataStream &s, BMP_FILEHDR &bf)
 {                                                // read file header
     s.readRawData(bf.bfType, 2);
     s >> bf.bfSize >> bf.bfReserved1 >> bf.bfReserved2 >> bf.bfOffBits;
     return s;
 }
 
-QDataStream &operator<<(QDataStream &s, const BMP_FILEHDR &bf)
+static QDataStream &operator<<(QDataStream &s, const BMP_FILEHDR &bf)
 {                                                // write file header
     s.writeRawData(bf.bfType, 2);
     s << bf.bfSize << bf.bfReserved1 << bf.bfReserved2 << bf.bfOffBits;
@@ -106,7 +106,7 @@ const int BMP_RLE4 = 2;                                // run-length encoded, 4
 const int BMP_BITFIELDS = 3;                        // RGB values encoded in data as bit-fields
 
 
-QDataStream &operator>>(QDataStream &s, BMP_INFOHDR &bi)
+static QDataStream &operator>>(QDataStream &s, BMP_INFOHDR &bi)
 {
     s >> bi.biSize;
     if (bi.biSize == BMP_WIN || bi.biSize == BMP_OS2) {
@@ -128,7 +128,7 @@ QDataStream &operator>>(QDataStream &s, BMP_INFOHDR &bi)
     return s;
 }
 
-QDataStream &operator<<(QDataStream &s, const BMP_INFOHDR &bi)
+static QDataStream &operator<<(QDataStream &s, const BMP_INFOHDR &bi)
 {
     s << bi.biSize;
     s << bi.biWidth << bi.biHeight;
diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h
index b2944ef..5d5c211 100644
--- a/src/gui/image/qiconloader_p.h
+++ b/src/gui/image/qiconloader_p.h
@@ -85,6 +85,7 @@ struct QIconDirInfo
 class QIconLoaderEngineEntry
  {
 public:
+    virtual ~QIconLoaderEngineEntry() {}
     virtual QPixmap pixmap(const QSize &size,
                            QIcon::Mode mode,
                            QIcon::State state) = 0;
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 1136a97..d821773 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -131,7 +131,6 @@ QPicture::QPicture(int formatVersion)
       d_ptr(new QPicturePrivate)
 {
     Q_D(QPicture);
-    d_ptr->q_ptr = this;
 
     if (formatVersion == 0)
         qWarning("QPicture: invalid format version 0");
@@ -141,8 +140,7 @@ QPicture::QPicture(int formatVersion)
         d->formatMajor = formatVersion;
         d->formatMinor = 0;
         d->formatOk = false;
-    }
-    else {
+    } else {
         d->resetFormat();
     }
 }
@@ -154,9 +152,8 @@ QPicture::QPicture(int formatVersion)
 */
 
 QPicture::QPicture(const QPicture &pic)
-    : QPaintDevice(), d_ptr(pic.d_ptr.data())
+    : QPaintDevice(), d_ptr(pic.d_ptr)
 {
-    d_func()->ref.ref();
 }
 
 /*! \internal */
@@ -164,7 +161,6 @@ QPicture::QPicture(QPicturePrivate &dptr)
     : QPaintDevice(),
       d_ptr(&dptr)
 {
-    d_ptr->q_ptr = this;
 }
 
 /*!
@@ -225,8 +221,7 @@ const char* QPicture::data() const
 
 void QPicture::detach()
 {
-    if (d_func()->ref != 1)
-        detach_helper();
+    d_ptr.detach();
 }
 
 bool QPicture::isDetached() const
@@ -1012,22 +1007,16 @@ int QPicture::metric(PaintDeviceMetric m) const
 /*! \fn bool QPicture::isDetached() const
 \internal
 */
+
+/*! \internal
+### Qt 5 - remove me
+ */
 void QPicture::detach_helper()
 {
-    Q_D(QPicture);
-    QPicturePrivate *x = new QPicturePrivate;
-    int pictsize = size();
-    x->pictb.setData(data(), pictsize);
-    if (d->pictb.isOpen()) {
-        x->pictb.open(d->pictb.openMode());
-        x->pictb.seek(d->pictb.pos());
-    }
-    x->trecs = d->trecs;
-    x->formatOk = d->formatOk;
-    x->formatMinor = d->formatMinor;
-    x->brect = d->brect;
-    x->override_rect = d->override_rect;
-    d_ptr.reset(x);
+    // QExplicitelySharedDataPointer takes care of cloning using
+    // QPicturePrivate's copy constructor. Do not call detach_helper() anymore
+    // and remove in Qt 5, please.
+    Q_ASSERT_X(false, "QPicture::detach_helper()", "Do not call this function");
 }
 
 /*!
@@ -1036,7 +1025,7 @@ void QPicture::detach_helper()
 */
 QPicture& QPicture::operator=(const QPicture &p)
 {
-    d_ptr.assign(p.d_ptr.data());
+    d_ptr = p.d_ptr;
     return *this;
 }
 
@@ -1046,10 +1035,28 @@ QPicture& QPicture::operator=(const QPicture &p)
   Constructs a QPicturePrivate
 */
 QPicturePrivate::QPicturePrivate()
-    : in_memory_only(false),
-      q_ptr(0)
+    : in_memory_only(false)
 {
-    ref = 1;
+}
+
+/*!
+  \internal
+
+  Copy-Constructs a QPicturePrivate. Needed when detaching.
+*/
+QPicturePrivate::QPicturePrivate(const QPicturePrivate &other)
+    : trecs(other.trecs),
+      formatOk(other.formatOk),
+      formatMinor(other.formatMinor),
+      brect(other.brect),
+      override_rect(other.override_rect),
+      in_memory_only(false)
+{
+    pictb.setData(other.pictb.data(), other.pictb.size());
+    if (other.pictb.isOpen()) {
+        pictb.open(other.pictb.openMode());
+        pictb.seek(other.pictb.pos());
+    }
 }
 
 /*!
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index 1e80ab7..6effae7 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -42,8 +42,9 @@
 #ifndef QPICTURE_H
 #define QPICTURE_H
 
-#include <QtGui/qpaintdevice.h>
 #include <QtCore/qstringlist.h>
+#include <QtCore/qsharedpointer.h>
+#include <QtGui/qpaintdevice.h>
 
 QT_BEGIN_HEADER
 
@@ -106,15 +107,15 @@ private:
     bool exec(QPainter *p, QDataStream &ds, int i);
     void detach_helper();
 
-    QScopedSharedPointer<QPicturePrivate> d_ptr;
+    QExplicitlySharedDataPointer<QPicturePrivate> d_ptr;
     friend class QPicturePaintEngine;
     friend class Q3Picture;
     friend class QAlphaPaintEngine;
     friend class QPreviewPaintEngine;
 
 public:
-    typedef QPicturePrivate* DataPtr;
-    inline DataPtr &data_ptr() { return d_ptr.data_ptr(); }
+    typedef QExplicitlySharedDataPointer<QPicturePrivate> DataPtr;
+    inline DataPtr &data_ptr() { return d_ptr; }
 };
 
 Q_DECLARE_SHARED(QPicture)
diff --git a/src/gui/image/qpicture_p.h b/src/gui/image/qpicture_p.h
index f405d7f..0ab181c 100644
--- a/src/gui/image/qpicture_p.h
+++ b/src/gui/image/qpicture_p.h
@@ -71,7 +71,6 @@ extern const char  *qt_mfhdr_tag;
 
 class QPicturePrivate
 {
-    Q_DECLARE_PUBLIC(QPicture)
     friend class QPicturePaintEngine;
     friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &s, const QPicture &r);
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &s, QPicture &r);
@@ -144,6 +143,7 @@ public:
     };
 
     QPicturePrivate();
+    QPicturePrivate(const QPicturePrivate &other);
     QAtomicInt ref;
 
     bool checkFormat();
@@ -162,8 +162,6 @@ public:
     QList<QPixmap> pixmap_list;
     QList<QBrush> brush_list;
     QList<QPen> pen_list;
-
-    QPicture *q_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 79b1f17..7328853 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -120,7 +120,6 @@ void QPixmap::init(int w, int h, int type)
         data = QGraphicsSystem::createDefaultPixmapData(static_cast<QPixmapData::PixelType>(type));
 
     data->resize(w, h);
-    data->ref.ref();
 }
 
 /*!
@@ -222,7 +221,6 @@ QPixmap::QPixmap(const QSize &s, int type)
 QPixmap::QPixmap(QPixmapData *d)
     : QPaintDevice(), data(d)
 {
-    data->ref.ref();
 }
 
 /*!
@@ -261,12 +259,7 @@ QPixmap::QPixmap(const QString& fileName, const char *format, Qt::ImageConversio
     if (!qt_pixmap_thread_test())
         return;
 
-    QT_TRY {
-        load(fileName, format, flags);
-    } QT_CATCH(...) {
-        deref();
-        QT_RETHROW;
-    }
+    load(fileName, format, flags);
 }
 
 /*!
@@ -283,11 +276,9 @@ QPixmap::QPixmap(const QPixmap &pixmap)
         return;
     }
     if (pixmap.paintingActive()) {                // make a deep copy
-        data = 0;
         operator=(pixmap.copy());
     } else {
         data = pixmap.data;
-        data->ref.ref();
     }
 }
 
@@ -314,17 +305,12 @@ QPixmap::QPixmap(const char * const xpm[])
     if (!xpm)
         return;
 
-    QT_TRY {
-        QImage image(xpm);
-        if (!image.isNull()) {
-            if (data->pixelType() == QPixmapData::BitmapType)
-                *this = QBitmap::fromImage(image);
-            else
-                *this = fromImage(image);
-        }
-    } QT_CATCH(...) {
-        deref();
-        QT_RETHROW;
+    QImage image(xpm);
+    if (!image.isNull()) {
+        if (data->pixelType() == QPixmapData::BitmapType)
+            *this = QBitmap::fromImage(image);
+        else
+            *this = fromImage(image);
     }
 }
 #endif
@@ -336,7 +322,6 @@ QPixmap::QPixmap(const char * const xpm[])
 
 QPixmap::~QPixmap()
 {
-    deref();
 }
 
 /*!
@@ -381,7 +366,7 @@ QPixmap QPixmap::copy(const QRect &rect) const
     else
         d = QGraphicsSystem::createDefaultPixmapData(data->pixelType());
 
-    d->copy(data, r);
+    d->copy(data.data(), r);
     return QPixmap(d);
 }
 
@@ -454,8 +439,6 @@ QPixmap &QPixmap::operator=(const QPixmap &pixmap)
     if (pixmap.paintingActive()) {                // make a deep copy
         *this = pixmap.copy();
     } else {
-        pixmap.data->ref.ref();                                // avoid 'x = x'
-        deref();
         data = pixmap.data;
     }
     return *this;
@@ -1362,14 +1345,12 @@ bool QPixmap::isDetached() const
     return data->ref == 1;
 }
 
+/*! \internal
+  ### Qt5 - remove me.
+*/
 void QPixmap::deref()
 {
-    if (data && !data->ref.deref()) { // Destroy image if last ref
-        if (data->is_cached)
-            QImagePixmapCleanupHooks::executePixmapHooks(this);
-        delete data;
-        data = 0;
-    }
+    Q_ASSERT_X(false, "QPixmap::deref()", "Do not call this function anymore!");
 }
 
 /*!
@@ -1928,7 +1909,7 @@ void QPixmap::detach()
 {
     QPixmapData::ClassId id = data->classId();
     if (id == QPixmapData::RasterClass) {
-        QRasterPixmapData *rasterData = static_cast<QRasterPixmapData*>(data);
+        QRasterPixmapData *rasterData = static_cast<QRasterPixmapData*>(data.data());
         rasterData->image.detach();
     }
 
@@ -2038,7 +2019,7 @@ QPixmap QPixmap::fromImage(const QImage &image, Qt::ImageConversionFlags flags)
 */
 QPixmapData* QPixmap::pixmapData() const
 {
-    return data;
+    return data.data();
 }
 
 /*!
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index bce1f5e..961008f 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -46,6 +46,7 @@
 #include <QtGui/qcolor.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qstring.h> // char*->QString conversion
+#include <QtCore/qsharedpointer.h>
 #include <QtGui/qimage.h>
 #include <QtGui/qtransform.h>
 
@@ -227,7 +228,7 @@ public:
 #endif
 
 private:
-    QPixmapData *data;
+    QExplicitlySharedDataPointer<QPixmapData> data;
 
     bool doImageIO(QImageWriter *io, int quality) const;
 
@@ -272,7 +273,7 @@ public:
     QPixmapData* pixmapData() const;
 
 public:
-    typedef QPixmapData * DataPtr;
+    typedef QExplicitlySharedDataPointer<QPixmapData> DataPtr;
     inline DataPtr &data_ptr() { return data; }
 };
 
diff --git a/src/gui/image/qpixmap_qws.cpp b/src/gui/image/qpixmap_qws.cpp
index b106610..e549900 100644
--- a/src/gui/image/qpixmap_qws.cpp
+++ b/src/gui/image/qpixmap_qws.cpp
@@ -112,7 +112,7 @@ QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h)
 QRgb* QPixmap::clut() const
 {
     if (data->classId() == QPixmapData::RasterClass) {
-        const QRasterPixmapData *d = static_cast<const QRasterPixmapData*>(data);
+        const QRasterPixmapData *d = static_cast<const QRasterPixmapData*>(data.data());
         return d->image.colorTable().data();
     }
 
@@ -122,7 +122,7 @@ QRgb* QPixmap::clut() const
 int QPixmap::numCols() const
 {
     if (data->classId() == QPixmapData::RasterClass) {
-        const QRasterPixmapData *d = static_cast<const QRasterPixmapData*>(data);
+        const QRasterPixmapData *d = static_cast<const QRasterPixmapData*>(data.data());
         return d->image.numColors();
     }
 
@@ -132,7 +132,7 @@ int QPixmap::numCols() const
 const uchar* QPixmap::qwsBits() const
 {
     if (data->classId() == QPixmapData::RasterClass) {
-        const QRasterPixmapData *d = static_cast<const QRasterPixmapData*>(data);
+        const QRasterPixmapData *d = static_cast<const QRasterPixmapData*>(data.data());
         return d->image.bits();
     }
 
@@ -142,7 +142,7 @@ const uchar* QPixmap::qwsBits() const
 int QPixmap::qwsBytesPerLine() const
 {
     if (data->classId() == QPixmapData::RasterClass) {
-        const QRasterPixmapData *d = static_cast<const QRasterPixmapData*>(data);
+        const QRasterPixmapData *d = static_cast<const QRasterPixmapData*>(data.data());
         return d->image.bytesPerLine();
     }
 
diff --git a/src/gui/image/qpixmapcache_p.h b/src/gui/image/qpixmapcache_p.h
index cbfc3e8..511c852 100644
--- a/src/gui/image/qpixmapcache_p.h
+++ b/src/gui/image/qpixmapcache_p.h
@@ -82,7 +82,7 @@ public:
     QDetachedPixmap(const QPixmap &pix) : QPixmap(pix)
     {
         if (data && data->classId() == QPixmapData::RasterClass) {
-            QRasterPixmapData *d = static_cast<QRasterPixmapData*>(data);
+            QRasterPixmapData *d = static_cast<QRasterPixmapData*>(data.data());
             if (!d->image.isNull() && d->image.d->paintEngine
                 && !d->image.d->paintEngine->isActive())
             {
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h
index 1c3e422..70890c0 100644
--- a/src/gui/image/qpixmapdata_p.h
+++ b/src/gui/image/qpixmapdata_p.h
@@ -117,6 +117,7 @@ private:
     friend class QGLContextPrivate;
     friend class QX11PixmapData;
     friend class QGLTextureCache; //Needs to check the reference count
+    friend class QExplicitlySharedDataPointer<QPixmapData>;
 
     QAtomicInt ref;
     int detach_no;
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 8f8eae5..0671304 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -3382,11 +3382,7 @@ QPoint QAbstractItemView::dirtyRegionOffset() const
 */
 void QAbstractItemView::startAutoScroll()
 {
-    Q_D(QAbstractItemView);
-    // ### it would be nice to make this into a style hint one day
-    int scrollInterval = (verticalScrollMode() == QAbstractItemView::ScrollPerItem) ? 150 : 50;
-    d->autoScrollTimer.start(scrollInterval, this);
-    d->autoScrollCount = 0;
+    d_func()->startAutoScroll();
 }
 
 /*!
@@ -3394,9 +3390,7 @@ void QAbstractItemView::startAutoScroll()
 */
 void QAbstractItemView::stopAutoScroll()
 {
-    Q_D(QAbstractItemView);
-    d->autoScrollTimer.stop();
-    d->autoScrollCount = 0;
+    d_func()->stopAutoScroll();
 }
 
 /*!
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index 0d55a2e..07edd4a 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -126,6 +126,15 @@ public:
     void doDelayedItemsLayout(int delay = 0);
     void interruptDelayedItemsLayout() const;
 
+    void startAutoScroll()
+    {   // ### it would be nice to make this into a style hint one day
+        int scrollInterval = (verticalScrollMode == QAbstractItemView::ScrollPerItem) ? 150 : 50;
+        autoScrollTimer.start(scrollInterval, q_func());
+        autoScrollCount = 0;
+    }
+    void stopAutoScroll() { autoScrollTimer.stop(); autoScrollCount = 0;}
+
+
     bool dropOn(QDropEvent *event, int *row, int *col, QModelIndex *index);
     bool droppingOnItself(QDropEvent *event, const QModelIndex &index);
 
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp
index e9e365f..3e9db3b 100644
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
@@ -1,4 +1,4 @@
-/***************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -458,15 +458,13 @@ QSize QListView::gridSize() const
 void QListView::setViewMode(ViewMode mode)
 {
     Q_D(QListView);
-    if (d->viewMode == mode)
+    if (d->commonListView && d->viewMode == mode)
         return;
     d->viewMode = mode;
 
+    delete d->commonListView;
     if (mode == ListMode) {
-        delete d->dynamicListView;
-        d->dynamicListView = 0;
-        if (!d->staticListView)
-            d->staticListView = new QStaticListViewBase(this, d);
+        d->commonListView = new QListModeViewBase(this, d);
         if (!(d->modeProperties & QListViewPrivate::Wrap))
             d->setWrapping(false);
         if (!(d->modeProperties & QListViewPrivate::Spacing))
@@ -482,10 +480,7 @@ void QListView::setViewMode(ViewMode mode)
         if (!(d->modeProperties & QListViewPrivate::SelectionRectVisible))
             d->showElasticBand = false;
     } else {
-        delete d->staticListView;
-        d->staticListView = 0;
-        if (!d->dynamicListView)
-            d->dynamicListView = new QDynamicListViewBase(this, d);
+        d->commonListView = new QIconModeViewBase(this, d);
         if (!(d->modeProperties & QListViewPrivate::Wrap))
             d->setWrapping(true);
         if (!(d->modeProperties & QListViewPrivate::Spacing))
@@ -549,24 +544,12 @@ void QListView::setRowHidden(int row, bool hide)
 {
     Q_D(QListView);
     const bool hidden = d->isHidden(row);
-    if (d->viewMode == ListMode) {
-        if (hide && !hidden)
-            d->hiddenRows.append(d->model->index(row, 0));
-        else if (!hide && hidden)
-            d->hiddenRows.remove(d->hiddenRows.indexOf(d->model->index(row, 0)));
-        d->doDelayedItemsLayout();
-    } else {
-        if (hide && !hidden) {
-            d->dynamicListView->removeItem(row);
-            d->hiddenRows.append(d->model->index(row, 0));
-        } else if (!hide && hidden) {
-            d->hiddenRows.remove(d->hiddenRows.indexOf(d->model->index(row, 0)));
-            d->dynamicListView->insertItem(row);
-        }
-        if (d->resizeMode == Adjust)
-            d->doDelayedItemsLayout();
-        d->viewport->update();
-    }
+    if (hide && !hidden)
+        d->commonListView->appendHiddenRow(row);
+    else if (!hide && hidden)
+        d->commonListView->removeHiddenRow(row);
+    d->doDelayedItemsLayout();
+    d->viewport->update();
 }
 
 /*!
@@ -575,7 +558,7 @@ void QListView::setRowHidden(int row, bool hide)
 QRect QListView::visualRect(const QModelIndex &index) const
 {
     Q_D(const QListView);
-    return d->mapToViewport(rectForIndex(index), d->viewMode == QListView::ListMode);
+    return d->mapToViewport(rectForIndex(index));
 }
 
 /*!
@@ -612,69 +595,17 @@ int QListViewPrivate::horizontalScrollToValue(const QModelIndex &index, const QR
     const bool rightOf = q->isRightToLeft()
                          ? rect.right() > area.right()
                          : (rect.right() > area.right()) && (rect.left() > area.left());
-    int horizontalValue = hbar->value();
-
-    // ScrollPerItem
-    if (q->horizontalScrollMode() == QAbstractItemView::ScrollPerItem && viewMode == QListView::ListMode) {
-        const QListViewItem item = indexToListViewItem(index);
-        const QRect rect = q->visualRect(index);
-        horizontalValue = staticListView->horizontalPerItemValue(itemIndex(item),
-                                                                horizontalValue, area.width(),
-                                                                leftOf, rightOf, isWrapping(), hint, rect.width());
-    } else { // ScrollPerPixel
-        if (q->isRightToLeft()) {
-            if (hint == QListView::PositionAtCenter) {
-                horizontalValue += ((area.width() - rect.width()) / 2) - rect.left();
-            } else {
-                if (leftOf)
-                    horizontalValue -= rect.left();
-                else if (rightOf)
-                    horizontalValue += qMin(rect.left(), area.width() - rect.right());
-            }
-       } else {
-            if (hint == QListView::PositionAtCenter) {
-                horizontalValue += rect.left() - ((area.width()- rect.width()) / 2);
-            } else {
-                if (leftOf)
-                    horizontalValue += rect.left();
-                else if (rightOf)
-                    horizontalValue += qMin(rect.left(), rect.right() - area.width());
-            }
-        }
-    }
-    return horizontalValue;
+    return commonListView->horizontalScrollToValue(q->visualIndex(index), hint, leftOf, rightOf, area, rect);
 }
 
 int QListViewPrivate::verticalScrollToValue(const QModelIndex &index, const QRect &rect,
                                             QListView::ScrollHint hint) const
 {
     Q_Q(const QListView);
-
     const QRect area = viewport->rect();
     const bool above = (hint == QListView::EnsureVisible && rect.top() < area.top());
     const bool below = (hint == QListView::EnsureVisible && rect.bottom() > area.bottom());
-
-    int verticalValue = vbar->value();
-
-    // ScrollPerItem
-    if (verticalScrollMode == QAbstractItemView::ScrollPerItem && viewMode == QListView::ListMode) {
-        const QListViewItem item = indexToListViewItem(index);
-        const QRect rect = q->visualRect(index);
-        verticalValue = staticListView->verticalPerItemValue(itemIndex(item),
-                                                             verticalValue, area.height(),
-                                                             above, below, isWrapping(), hint, rect.height());
-
-    } else { // ScrollPerPixel
-        QRect adjusted = rect.adjusted(-spacing(), -spacing(), spacing(), spacing());
-        if (hint == QListView::PositionAtTop || above)
-            verticalValue += adjusted.top();
-        else if (hint == QListView::PositionAtBottom || below)
-            verticalValue += qMin(adjusted.top(), adjusted.bottom() - area.height() + 1);
-        else if (hint == QListView::PositionAtCenter)
-            verticalValue += adjusted.top() - ((area.height() - adjusted.height()) / 2);
-    }
-
-    return verticalValue;
+    return commonListView->verticalScrollToValue(q->visualIndex(index), hint, above, below, area, rect);
 }
 
 void QListViewPrivate::selectAll(QItemSelectionModel::SelectionFlags command)
@@ -766,23 +697,12 @@ void QListView::setRootIndex(const QModelIndex &index)
 
     Scroll the view contents by \a dx and \a dy.
 */
+
 void QListView::scrollContentsBy(int dx, int dy)
 {
     Q_D(QListView);
-
     d->delayedAutoScroll.stop(); // auto scroll was canceled by the user scrolling
-
-    if (d->viewMode == ListMode)
-        d->staticListView->scrollContentsBy(dx, dy);
-    else if (state() == DragSelectingState)
-        d->scrollElasticBandBy(isRightToLeft() ? -dx : dx, dy);
-
-    d->scrollContentsBy(isRightToLeft() ? -dx : dx, dy);
-
-    // update the dragged items
-    if (d->viewMode == IconMode) // ### move to dynamic class
-    if (!d->dynamicListView->draggedItems.isEmpty())
-        d->viewport->update(d->dynamicListView->draggedItemsRect().translated(dx, dy));
+    d->commonListView->scrollContentsBy(dx, dy, d->state == QListView::DragSelectingState);
 }
 
 /*!
@@ -811,9 +731,7 @@ QSize QListView::contentsSize() const
 */
 void QListView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
 {
-    Q_D(QListView);
-    if (d->viewMode == IconMode)
-        d->dynamicListView->dataChanged(topLeft, bottomRight);
+    d_func()->commonListView->dataChanged(topLeft, bottomRight);
     QAbstractItemView::dataChanged(topLeft, bottomRight);
 }
 
@@ -864,7 +782,7 @@ void QListView::mouseMoveEvent(QMouseEvent *e)
         && d->selectionMode != NoSelection) {
         QRect rect(d->pressedPosition, e->pos() + QPoint(horizontalOffset(), verticalOffset()));
         rect = rect.normalized();
-        d->viewport->update(d->mapToViewport(rect.united(d->elasticBand), d->viewMode == QListView::ListMode));
+        d->viewport->update(d->mapToViewport(rect.united(d->elasticBand)));
         d->elasticBand = rect;
     }
 }
@@ -878,7 +796,7 @@ void QListView::mouseReleaseEvent(QMouseEvent *e)
     QAbstractItemView::mouseReleaseEvent(e);
     // #### move this implementation into a dynamic class
     if (d->showElasticBand && d->elasticBand.isValid()) {
-        d->viewport->update(d->mapToViewport(d->elasticBand, d->viewMode == QListView::ListMode));
+        d->viewport->update(d->mapToViewport(d->elasticBand));
         d->elasticBand = QRect();
     }
 }
@@ -935,69 +853,27 @@ void QListView::resizeEvent(QResizeEvent *e)
 */
 void QListView::dragMoveEvent(QDragMoveEvent *e)
 {
-    // ### move implementation to dynamic
-    Q_D(QListView);
-    if (e->source() == this && d->viewMode == IconMode) {
-        // the ignore by default
-        e->ignore();
-        if (d->canDecode(e)) {
-            // get old dragged items rect
-            QRect itemsRect = d->dynamicListView->itemsRect(d->dynamicListView->draggedItems);
-            d->viewport->update(itemsRect.translated(d->dynamicListView->draggedItemsDelta()));
-            // update position
-            d->dynamicListView->draggedItemsPos = e->pos();
-            // get new items rect
-            d->viewport->update(itemsRect.translated(d->dynamicListView->draggedItemsDelta()));
-            // set the item under the cursor to current
-            QModelIndex index;
-            if (d->movement == Snap) {
-                QRect rect(d->dynamicListView->snapToGrid(e->pos() + d->offset()), d->gridSize());
-                const QVector<QModelIndex> intersectVector = d->intersectingSet(rect);
-                index = intersectVector.count() > 0
-                                    ? intersectVector.last() : QModelIndex();
-            } else {
-                index = indexAt(e->pos());
-            }
-            // check if we allow drops here
-            if (e->source() == this && d->dynamicListView->draggedItems.contains(index))
-                e->accept(); // allow changing item position
-            else if (d->model->flags(index) & Qt::ItemIsDropEnabled)
-                e->accept(); // allow dropping on dropenabled items
-            else if (!index.isValid())
-                e->accept(); // allow dropping in empty areas
-        }
-        // do autoscrolling
-        if (d->shouldAutoScroll(e->pos()))
-            startAutoScroll();
-    } else { // not internal
+    if (!d_func()->commonListView->filterDragMoveEvent(e))
         QAbstractItemView::dragMoveEvent(e);
-    }
 }
 
+
 /*!
   \reimp
 */
 void QListView::dragLeaveEvent(QDragLeaveEvent *e)
 {
-    // ### move implementation to dynamic
-    Q_D(QListView);
-    if (d->viewMode == IconMode) {
-        d->viewport->update(d->dynamicListView->draggedItemsRect()); // erase the area
-        d->dynamicListView->draggedItemsPos = QPoint(-1, -1); // don't draw the dragged items
-    }
-    QAbstractItemView::dragLeaveEvent(e);
+    if (!d_func()->commonListView->filterDragLeaveEvent(e))
+        QAbstractItemView::dragLeaveEvent(e);
 }
 
 /*!
   \reimp
 */
-void QListView::dropEvent(QDropEvent *event)
+void QListView::dropEvent(QDropEvent *e)
 {
-    Q_D(QListView);
-    if (event->source() == this && d->viewMode == IconMode)
-        internalDrop(event); // ### move to dynamic
-    else
-        QAbstractItemView::dropEvent(event);
+    if (!d_func()->commonListView->filterDropEvent(e))
+        QAbstractItemView::dropEvent(e);
 }
 
 /*!
@@ -1005,10 +881,7 @@ void QListView::dropEvent(QDropEvent *event)
 */
 void QListView::startDrag(Qt::DropActions supportedActions)
 {
-    Q_D(QListView);
-    if (d->viewMode == IconMode) // ### move to dynamic
-        internalDrag(supportedActions);
-    else
+    if (!d_func()->commonListView->filterStartDrag(supportedActions))
         QAbstractItemView::startDrag(supportedActions);
 }
 
@@ -1020,41 +893,8 @@ void QListView::startDrag(Qt::DropActions supportedActions)
 */
 void QListView::internalDrop(QDropEvent *event)
 {
-    Q_D(QListView);
-    if (d->viewMode == QListView::ListMode)
-        return;
-
-    // ### move to dynamic class
-    QPoint offset(horizontalOffset(), verticalOffset());
-    QPoint end = event->pos() + offset;
-    QPoint start = d->pressedPosition;
-    QPoint delta = (d->movement == Snap ?
-                    d->dynamicListView->snapToGrid(end)
-                    - d->dynamicListView->snapToGrid(start) : end - start);
-    QSize contents = d->contentsSize();
-    QList<QModelIndex> indexes = d->selectionModel->selectedIndexes();
-    for (int i = 0; i < indexes.count(); ++i) {
-        QModelIndex index = indexes.at(i);
-        QRect rect = rectForIndex(index);
-        d->viewport->update(d->mapToViewport(rect, d->viewMode == QListView::ListMode));
-        QPoint dest = rect.topLeft() + delta;
-        if (isRightToLeft())
-            dest.setX(d->flipX(dest.x()) - rect.width());
-        d->dynamicListView->moveItem(index.row(), dest);
-        update(index);
-    }
-    stopAutoScroll();
-    d->dynamicListView->draggedItems.clear();
-    emit indexesMoved(indexes);
-    event->accept(); // we have handled the event
-    // if the size has not grown, we need to check if it has shrinked
-    if (d->dynamicListView
-        && (d->contentsSize().width() <= contents.width()
-            || d->contentsSize().height() <= contents.height())) {
-        d->dynamicListView->updateContentsSize();
-    }
-    if (d->contentsSize() != contents)
-        updateGeometries();
+    // ### Qt5: remove that function
+    Q_UNUSED(event);
 }
 
 /*!
@@ -1065,31 +905,8 @@ void QListView::internalDrop(QDropEvent *event)
 */
 void QListView::internalDrag(Qt::DropActions supportedActions)
 {
-    Q_D(QListView);
-    if (d->viewMode == QListView::ListMode)
-        return;
-
-    // #### move to dynamic class
-
-    // This function does the same thing as in QAbstractItemView::startDrag(),
-    // plus adding viewitems to the draggedItems list.
-    // We need these items to draw the drag items
-    QModelIndexList indexes = d->selectionModel->selectedIndexes();
-    if (indexes.count() > 0 ) {
-        if (d->viewport->acceptDrops()) {
-            QModelIndexList::ConstIterator it = indexes.constBegin();
-            for (; it != indexes.constEnd(); ++it)
-                if (d->model->flags(*it) & Qt::ItemIsDragEnabled
-                    && (*it).column() == d->column)
-                    d->dynamicListView->draggedItems.push_back(*it);
-        }
-        QDrag *drag = new QDrag(this);
-        drag->setMimeData(d->model->mimeData(indexes));
-        Qt::DropAction action = drag->exec(supportedActions, Qt::CopyAction);
-        d->dynamicListView->draggedItems.clear();
-        if (action == Qt::MoveAction)
-            d->clearOrRemove();
-    }
+    // ### Qt5: remove that function
+    Q_UNUSED(supportedActions);
 }
 
 #endif // QT_NO_DRAGANDDROP
@@ -1117,6 +934,7 @@ QStyleOptionViewItem QListView::viewOptions() const
     return option;
 }
 
+
 /*!
   \reimp
 */
@@ -1213,18 +1031,7 @@ void QListView::paintEvent(QPaintEvent *e)
     }
 
 #ifndef QT_NO_DRAGANDDROP
-    // #### move this implementation into a dynamic class
-    if (d->viewMode == IconMode)
-    if (!d->dynamicListView->draggedItems.isEmpty()
-        && d->viewport->rect().contains(d->dynamicListView->draggedItemsPos)) {
-        QPoint delta = d->dynamicListView->draggedItemsDelta();
-        painter.translate(delta.x(), delta.y());
-        d->dynamicListView->drawItems(&painter, d->dynamicListView->draggedItems);
-    }
-    // FIXME: Until the we can provide a proper drop indicator
-    // in IconMode, it makes no sense to show it
-    if (d->viewMode == ListMode)
-        d->paintDropIndicator(&painter);
+    d->commonListView->paintDragDrop(&painter);
 #endif
 
 #ifndef QT_NO_RUBBERBAND
@@ -1263,31 +1070,7 @@ QModelIndex QListView::indexAt(const QPoint &p) const
 */
 int QListView::horizontalOffset() const
 {
-    Q_D(const QListView);
-    // ### split into static and dynamic
-    if (horizontalScrollMode() == QAbstractItemView::ScrollPerItem && d->viewMode == ListMode) {
-        if (d->isWrapping()) {
-            if (d->flow == TopToBottom && !d->staticListView->segmentPositions.isEmpty()) {
-                const int max = d->staticListView->segmentPositions.count() - 1;
-                int currentValue = qBound(0, horizontalScrollBar()->value(), max);
-                int position = d->staticListView->segmentPositions.at(currentValue);
-                int maximumValue = qBound(0, horizontalScrollBar()->maximum(), max);
-                int maximum = d->staticListView->segmentPositions.at(maximumValue);
-                return (isRightToLeft() ? maximum - position : position);
-            }
-            //return 0;
-        } else {
-            if (d->flow == LeftToRight && !d->staticListView->flowPositions.isEmpty()) {
-                int position = d->staticListView->flowPositions.at(horizontalScrollBar()->value());
-                int maximum = d->staticListView->flowPositions.at(horizontalScrollBar()->maximum());
-                return (isRightToLeft() ? maximum - position : position);
-            }
-            //return 0;
-        }
-    }
-    return (isRightToLeft()
-            ? horizontalScrollBar()->maximum() - horizontalScrollBar()->value()
-            : horizontalScrollBar()->value());
+    return d_func()->commonListView->horizontalOffset();
 }
 
 /*!
@@ -1295,30 +1078,7 @@ int QListView::horizontalOffset() const
 */
 int QListView::verticalOffset() const
 {
-    // ## split into static and dynamic
-    Q_D(const QListView);
-    if (verticalScrollMode() == QAbstractItemView::ScrollPerItem && d->viewMode == ListMode) {
-        if (d->isWrapping()) {
-            if (d->flow == LeftToRight && !d->staticListView->segmentPositions.isEmpty()) {
-                int value = verticalScrollBar()->value();
-                if (value >= d->staticListView->segmentPositions.count()) {
-                    //qWarning("QListView: Vertical scroll bar is out of bounds");
-                    return 0;
-                }
-                return d->staticListView->segmentPositions.at(value);
-            }
-        } else {
-            if (d->flow == TopToBottom && !d->staticListView->flowPositions.isEmpty()) {
-                int value = verticalScrollBar()->value();
-                if (value > d->staticListView->flowPositions.count()) {
-                    //qWarning("QListView: Vertical scroll bar is out of bounds");
-                    return 0;
-                }
-                return d->staticListView->flowPositions.at(value) - d->spacing();
-            }
-        }
-    }
-    return verticalScrollBar()->value();
+    return d_func()->commonListView->verticalOffset();
 }
 
 /*!
@@ -1444,15 +1204,7 @@ QModelIndex QListView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
 */
 QRect QListView::rectForIndex(const QModelIndex &index) const
 {
-    Q_D(const QListView);
-    if (!d->isIndexValid(index)
-        || index.parent() != d->root
-        || index.column() != d->column
-        || isIndexHidden(index))
-        return QRect();
-    d->executePostedLayout();
-    QListViewItem item = d->indexToListViewItem(index);
-    return d->viewItemRect(item);
+    return d_func()->rectForIndex(index);
 }
 
 /*!
@@ -1460,8 +1212,8 @@ QRect QListView::rectForIndex(const QModelIndex &index) const
 
     Sets the contents position of the item at \a index in the model to the given
     \a position.
-    If the list view's movement mode is Static, this function will have no
-    effect.
+    If the list view's movement mode is Static or its view mode is ListView,
+    this function will have no effect.
 */
 void QListView::setPositionForIndex(const QPoint &position, const QModelIndex &index)
 {
@@ -1473,15 +1225,7 @@ void QListView::setPositionForIndex(const QPoint &position, const QModelIndex &i
         return;
 
     d->executePostedLayout();
-    if (index.row() >= d->dynamicListView->items.count())
-        return;
-    const QSize oldContents = d->contentsSize();
-    update(index); // update old position
-    d->dynamicListView->moveItem(index.row(), position);
-    update(index); // update new position
-
-    if (d->contentsSize() != oldContents)
-        updateGeometries(); // update the scroll bars
+    d->commonListView->setPositionForIndex(position, index);
 }
 
 /*!
@@ -1717,99 +1461,8 @@ void QListView::updateGeometries()
         QModelIndex index = d->model->index(0, d->column, d->root);
         QStyleOptionViewItemV4 option = d->viewOptionsV4();
         QSize step = d->itemSize(option, index);
-
-        QSize csize = d->contentsSize();
-        QSize vsize = d->viewport->size();
-        QSize max = maximumViewportSize();
-        if (max.width() >= d->contentsSize().width() && max.height() >= d->contentsSize().height())
-            vsize = max;
-
-        // ### reorder the logic
-
-        // ### split into static and dynamic
-
-        const bool vertical = verticalScrollMode() == QAbstractItemView::ScrollPerItem;
-        const bool horizontal = horizontalScrollMode() == QAbstractItemView::ScrollPerItem;
-
-        if (d->flow == TopToBottom) {
-            if (horizontal && d->isWrapping() && d->viewMode == ListMode) {
-                const QVector<int> segmentPositions = d->staticListView->segmentPositions;
-                const int steps = segmentPositions.count() - 1;
-                if (steps > 0) {
-                    int pageSteps = d->staticListView->perItemScrollingPageSteps(vsize.width(),
-                                                                                 csize.width(),
-                                                                                 isWrapping());
-                    horizontalScrollBar()->setSingleStep(1);
-                    horizontalScrollBar()->setPageStep(pageSteps);
-                    horizontalScrollBar()->setRange(0, steps - pageSteps);
-                } else {
-                    horizontalScrollBar()->setRange(0, 0);
-                }
-            } else {
-                horizontalScrollBar()->setSingleStep(step.width() + d->spacing());
-                horizontalScrollBar()->setPageStep(vsize.width());
-                horizontalScrollBar()->setRange(0, d->contentsSize().width() - vsize.width());
-            }
-            if (vertical && !d->isWrapping() && d->viewMode == ListMode) {
-                const QVector<int> flowPositions = d->staticListView->flowPositions;
-                const int steps = flowPositions.count() - 1;
-                if (steps > 0) {
-                    int pageSteps = d->staticListView->perItemScrollingPageSteps(vsize.height(),
-                                                                                 csize.height(),
-                                                                                 isWrapping());
-                    verticalScrollBar()->setSingleStep(1);
-                    verticalScrollBar()->setPageStep(pageSteps);
-                    verticalScrollBar()->setRange(0, steps - pageSteps);
-                } else {
-                    verticalScrollBar()->setRange(0, 0);
-                }
-                // } else if (vertical && d->isWrapping() && d->movement == Static) {
-                // ### wrapped scrolling in flow direction
-            } else {
-                verticalScrollBar()->setSingleStep(step.height() + d->spacing());
-                verticalScrollBar()->setPageStep(vsize.height());
-                verticalScrollBar()->setRange(0, d->contentsSize().height() - vsize.height());
-            }
-        } else { // LeftToRight
-            if (horizontal && !d->isWrapping() && d->viewMode == ListMode) {
-                const QVector<int> flowPositions = d->staticListView->flowPositions;
-                int steps = flowPositions.count() - 1;
-                if (steps > 0) {
-                    int pageSteps = d->staticListView->perItemScrollingPageSteps(vsize.width(),
-                                                                                 csize.width(),
-                                                                                 isWrapping());
-                    horizontalScrollBar()->setSingleStep(1);
-                    horizontalScrollBar()->setPageStep(pageSteps);
-                    horizontalScrollBar()->setRange(0, steps - pageSteps);
-                } else {
-                    horizontalScrollBar()->setRange(0, 0);
-                }
-                // } else if (horizontal && d->isWrapping() && d->movement == Static) {
-                // ### wrapped scrolling in flow direction
-            } else {
-                horizontalScrollBar()->setSingleStep(step.width() + d->spacing());
-                horizontalScrollBar()->setPageStep(vsize.width());
-                horizontalScrollBar()->setRange(0, d->contentsSize().width() - vsize.width());
-            }
-            if (vertical && d->isWrapping() && d->viewMode == ListMode) {
-                const QVector<int> segmentPositions = d->staticListView->segmentPositions;
-                int steps = segmentPositions.count() - 1;
-                if (steps > 0) {
-                    int pageSteps = d->staticListView->perItemScrollingPageSteps(vsize.height(),
-                                                                                 csize.height(),
-                                                                                 isWrapping());
-                    verticalScrollBar()->setSingleStep(1);
-                    verticalScrollBar()->setPageStep(pageSteps);
-                    verticalScrollBar()->setRange(0, steps - pageSteps);
-                } else {
-                    verticalScrollBar()->setRange(0, 0);
-                }
-            } else {
-                verticalScrollBar()->setSingleStep(step.height() + d->spacing());
-                verticalScrollBar()->setPageStep(vsize.height());
-                verticalScrollBar()->setRange(0, d->contentsSize().height() - vsize.height());
-            }
-        }
+        d->commonListView->updateHorizontalScrollBar(step);
+        d->commonListView->updateVerticalScrollBar(step);
     }
 
     QAbstractItemView::updateGeometries();
@@ -1958,14 +1611,14 @@ bool QListView::event(QEvent *e)
 
 QListViewPrivate::QListViewPrivate()
     : QAbstractItemViewPrivate(),
-      dynamicListView(0),
+      commonListView(0),
       wrap(false),
       space(0),
       flow(QListView::TopToBottom),
       movement(QListView::Static),
       resizeMode(QListView::Fixed),
       layoutMode(QListView::SinglePass),
-      viewMode(QListView::IconMode), //this will ensure the first initialization to ListView
+      viewMode(QListView::ListMode),
       modeProperties(0),
       column(0),
       uniformItemSizes(false),
@@ -1976,21 +1629,14 @@ QListViewPrivate::QListViewPrivate()
 
 QListViewPrivate::~QListViewPrivate()
 {
-    if (viewMode == QListView::ListMode)
-        delete staticListView;
-    else
-        delete dynamicListView;
+    delete commonListView;
 }
 
 void QListViewPrivate::clear()
 {
-    // ### split into dynamic and static
     // initialization of data structs
     cachedItemSize = QSize();
-    if (viewMode == QListView::ListMode)
-        staticListView->clear();
-    else
-        dynamicListView->clear();
+    commonListView->clear();
 }
 
 void QListViewPrivate::prepareItemsLayout()
@@ -1999,7 +1645,7 @@ void QListViewPrivate::prepareItemsLayout()
     clear();
 
     //take the size as if there were scrollbar in order to prevent scrollbar to blink
-    layoutBounds = QRect(QPoint(0,0), q->maximumViewportSize());
+    layoutBounds = QRect(QPoint(), q->maximumViewportSize());
 
     int frameAroundContents = 0;
     if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents))
@@ -2017,15 +1663,8 @@ void QListViewPrivate::prepareItemsLayout()
 
     layoutBounds.adjust(0, 0, -verticalMargin, -horizontalMargin);
 
-    int rowCount = model->rowCount(root);
-    int colCount = model->columnCount(root);
-    if (colCount <= 0)
-        rowCount = 0; // no contents
-    if (viewMode == QListView::ListMode) {
-        staticListView->flowPositions.resize(rowCount);
-    } else {
-        dynamicListView->tree.create(qMax(rowCount - hiddenRows.count(), 0));
-    }
+    int rowCount = model->columnCount(root) <= 0 ? 0 : model->rowCount(root);
+    commonListView->setRowCount(rowCount);
 }
 
 /*!
@@ -2033,7 +1672,6 @@ void QListViewPrivate::prepareItemsLayout()
 */
 bool QListViewPrivate::doItemsLayout(int delta)
 {
-    // ### split into static and dynamic
     int max = model->rowCount(root) - 1;
     int first = batchStartRow();
     int last = qMin(first + delta - 1, max);
@@ -2057,9 +1695,7 @@ bool QListViewPrivate::doItemsLayout(int delta)
     info.flow = flow;
     info.max = max;
 
-    if (viewMode == QListView::ListMode)
-        return staticListView->doBatchedItemLayout(info, max);
-    return dynamicListView->doBatchedItemLayout(info, max);
+    return commonListView->doBatchedItemLayout(info, max);
 }
 
 QListViewItem QListViewPrivate::indexToListViewItem(const QModelIndex &index) const
@@ -2067,29 +1703,16 @@ QListViewItem QListViewPrivate::indexToListViewItem(const QModelIndex &index) co
     if (!index.isValid() || isHidden(index.row()))
         return QListViewItem();
 
-    if (viewMode == QListView::ListMode)
-        return staticListView->indexToListViewItem(index);
-    return dynamicListView->indexToListViewItem(index);
+    return commonListView->indexToListViewItem(index);
 }
 
-
-int QListViewPrivate::itemIndex(const QListViewItem &item) const
-{
-    if (viewMode == QListView::ListMode)
-        return staticListView->itemIndex(item);
-    return dynamicListView->itemIndex(item);
-}
-
-QRect QListViewPrivate::mapToViewport(const QRect &rect, bool greedy) const
+QRect QListViewPrivate::mapToViewport(const QRect &rect, bool extend) const
 {
     Q_Q(const QListView);
     if (!rect.isValid())
         return rect;
 
-    QRect result = rect;
-    if (greedy)
-        result = staticListView->mapToViewport(rect);
-
+    QRect result = extend ? commonListView->mapToViewport(rect) : rect;
     int dx = -q->horizontalOffset();
     int dy = -q->verticalOffset();
     result.adjust(dx, dy, dx, dy);
@@ -2177,46 +1800,217 @@ QItemSelection QListViewPrivate::selection(const QRect &rect) const
 }
 
 /*
- * Static ListView Implementation
+ * Common ListView Implementation
 */
 
-int QStaticListViewBase::verticalPerItemValue(int itemIndex, int verticalValue, int areaHeight,
-                                                 bool above, bool below, bool wrap,
-                                                 QListView::ScrollHint hint, int itemHeight) const
+void QCommonListViewBase::appendHiddenRow(int row)
+{
+    dd->hiddenRows.append(dd->model->index(row, 0));
+}
+
+void QCommonListViewBase::removeHiddenRow(int row)
 {
-    int value = qBound(0, verticalValue, flowPositions.count() - 1);
-    if (above)
-        return perItemScrollToValue(itemIndex, value, areaHeight, QListView::PositionAtTop,
-                                    Qt::Vertical,wrap, itemHeight);
-    else if (below)
-        return perItemScrollToValue(itemIndex, value, areaHeight, QListView::PositionAtBottom,
-                                    Qt::Vertical, wrap, itemHeight);
-    else if (hint != QListView::EnsureVisible)
-        return perItemScrollToValue(itemIndex, value, areaHeight, hint, Qt::Vertical, wrap, itemHeight);
-    return value;
+    dd->hiddenRows.remove(dd->hiddenRows.indexOf(dd->model->index(row, 0)));
 }
 
-int QStaticListViewBase::horizontalPerItemValue(int itemIndex, int horizontalValue, int areaWidth,
-                                                   bool leftOf, bool rightOf, bool wrap,
-                                                   QListView::ScrollHint hint, int itemWidth) const
+void QCommonListViewBase::updateHorizontalScrollBar(const QSize &step)
 {
-    int value = qBound(0, horizontalValue, flowPositions.count() - 1);
+    horizontalScrollBar()->setSingleStep(step.width() + spacing());
+    horizontalScrollBar()->setPageStep(viewport()->width());
+    horizontalScrollBar()->setRange(0, contentsSize.width() - viewport()->width());
+}
+
+void QCommonListViewBase::updateVerticalScrollBar(const QSize &step)
+{
+    verticalScrollBar()->setSingleStep(step.height() + spacing());
+    verticalScrollBar()->setPageStep(viewport()->height());
+    verticalScrollBar()->setRange(0, contentsSize.height() - viewport()->height());
+}
+
+void QCommonListViewBase::scrollContentsBy(int dx, int dy, bool /*scrollElasticBand*/)
+{
+    dd->scrollContentsBy(isRightToLeft() ? -dx : dx, dy);
+}
+
+int QCommonListViewBase::verticalScrollToValue(int /*index*/, QListView::ScrollHint hint,
+                                          bool above, bool below, const QRect &area, const QRect &rect) const
+{
+    int verticalValue = verticalScrollBar()->value();
+    QRect adjusted = rect.adjusted(-spacing(), -spacing(), spacing(), spacing());
+    if (hint == QListView::PositionAtTop || above)
+        verticalValue += adjusted.top();
+    else if (hint == QListView::PositionAtBottom || below)
+        verticalValue += qMin(adjusted.top(), adjusted.bottom() - area.height() + 1);
+    else if (hint == QListView::PositionAtCenter)
+        verticalValue += adjusted.top() - ((area.height() - adjusted.height()) / 2);
+    return verticalValue;
+}
+
+int QCommonListViewBase::horizontalOffset() const
+{
+    return (isRightToLeft() ? horizontalScrollBar()->maximum() - horizontalScrollBar()->value() : horizontalScrollBar()->value());
+}
+
+int QCommonListViewBase::horizontalScrollToValue(const int /*index*/, QListView::ScrollHint hint,
+                                            bool leftOf, bool rightOf, const QRect &area, const QRect &rect) const
+{
+    int horizontalValue = horizontalScrollBar()->value();
+    if (isRightToLeft()) {
+        if (hint == QListView::PositionAtCenter) {
+            horizontalValue += ((area.width() - rect.width()) / 2) - rect.left();
+        } else {
+            if (leftOf)
+                horizontalValue -= rect.left();
+            else if (rightOf)
+                horizontalValue += qMin(rect.left(), area.width() - rect.right());
+        }
+    } else {
+        if (hint == QListView::PositionAtCenter) {
+            horizontalValue += rect.left() - ((area.width()- rect.width()) / 2);
+        } else {
+            if (leftOf)
+                horizontalValue += rect.left();
+            else if (rightOf)
+                horizontalValue += qMin(rect.left(), rect.right() - area.width());
+        }
+    }
+    return horizontalValue;
+}
+
+/*
+ * ListMode ListView Implementation
+*/
+
+#ifndef QT_NO_DRAGANDDROP
+void QListModeViewBase::paintDragDrop(QPainter *painter)
+{
+    // FIXME: Until the we can provide a proper drop indicator
+    // in IconMode, it makes no sense to show it
+    dd->paintDropIndicator(painter);
+}
+#endif //QT_NO_DRAGANDDROP
+
+void QListModeViewBase::updateVerticalScrollBar(const QSize &step)
+{
+    if (verticalScrollMode() == QAbstractItemView::ScrollPerItem
+        && ((flow() == QListView::TopToBottom && !isWrapping())
+        || (flow() == QListView::LeftToRight && isWrapping()))) {
+            const int steps = (flow() == QListView::TopToBottom ? flowPositions : segmentPositions).count() - 1;
+            if (steps > 0) {
+                const int pageSteps = perItemScrollingPageSteps(viewport()->height(), contentsSize.height(), isWrapping());
+                verticalScrollBar()->setSingleStep(1);
+                verticalScrollBar()->setPageStep(pageSteps);
+                verticalScrollBar()->setRange(0, steps - pageSteps);
+            } else {
+                verticalScrollBar()->setRange(0, 0);
+            }
+            // } else if (vertical && d->isWrapping() && d->movement == Static) {
+            // ### wrapped scrolling in flow direction
+    } else {
+        QCommonListViewBase::updateVerticalScrollBar(step);
+    }
+}
+
+void QListModeViewBase::updateHorizontalScrollBar(const QSize &step)
+{
+    if (horizontalScrollMode() == QAbstractItemView::ScrollPerItem
+        && ((flow() == QListView::TopToBottom && isWrapping())
+        || (flow() == QListView::LeftToRight && !isWrapping()))) {
+            int steps = (flow() == QListView::TopToBottom ? segmentPositions : flowPositions).count() - 1;
+            if (steps > 0) {
+                const int pageSteps = perItemScrollingPageSteps(viewport()->width(), contentsSize.width(), isWrapping());
+                horizontalScrollBar()->setSingleStep(1);
+                horizontalScrollBar()->setPageStep(pageSteps);
+                horizontalScrollBar()->setRange(0, steps - pageSteps);
+            } else {
+                horizontalScrollBar()->setRange(0, 0);
+            }
+    } else {
+        QCommonListViewBase::updateHorizontalScrollBar(step);
+    }
+}
+
+int QListModeViewBase::verticalScrollToValue(int index, QListView::ScrollHint hint,
+                                          bool above, bool below, const QRect &area, const QRect &rect) const
+{
+    if (verticalScrollMode() == QAbstractItemView::ScrollPerItem) {
+        int value = qBound(0, verticalScrollBar()->value(), flowPositions.count() - 1);
+        if (above)
+            hint = QListView::PositionAtTop;
+        else if (below)
+            hint = QListView::PositionAtBottom;
+        if (hint == QListView::EnsureVisible)
+            return value;
+
+        return perItemScrollToValue(index, value, area.height(), hint, Qt::Vertical, isWrapping(), rect.height());
+    }
+
+    return QCommonListViewBase::verticalScrollToValue(index, hint, above, below, area, rect);
+}
+
+int QListModeViewBase::horizontalOffset() const
+{
+    if (horizontalScrollMode() == QAbstractItemView::ScrollPerItem) {
+        if (isWrapping()) {
+            if (flow() == QListView::TopToBottom && !segmentPositions.isEmpty()) {
+                const int max = segmentPositions.count() - 1;
+                int currentValue = qBound(0, horizontalScrollBar()->value(), max);
+                int position = segmentPositions.at(currentValue);
+                int maximumValue = qBound(0, horizontalScrollBar()->maximum(), max);
+                int maximum = segmentPositions.at(maximumValue);
+                return (isRightToLeft() ? maximum - position : position);
+            }
+        } else if (flow() == QListView::LeftToRight && !flowPositions.isEmpty()) {
+            int position = flowPositions.at(horizontalScrollBar()->value());
+            int maximum = flowPositions.at(horizontalScrollBar()->maximum());
+            return (isRightToLeft() ? maximum - position : position);
+        }
+    }
+    return QCommonListViewBase::horizontalOffset();
+}
+
+int QListModeViewBase::verticalOffset() const
+{
+    if (verticalScrollMode() == QAbstractItemView::ScrollPerItem) {
+        if (isWrapping()) {
+            if (flow() == QListView::LeftToRight && !segmentPositions.isEmpty()) {
+                int value = verticalScrollBar()->value();
+                if (value >= segmentPositions.count())
+                    return 0;
+                return segmentPositions.at(value);
+            }
+        } else if (flow() == QListView::TopToBottom && !flowPositions.isEmpty()) {
+            int value = verticalScrollBar()->value();
+            if (value > flowPositions.count())
+                return 0;
+            return flowPositions.at(value) - spacing();
+        }
+    }
+    return QCommonListViewBase::verticalOffset();
+}
+
+int QListModeViewBase::horizontalScrollToValue(int index, QListView::ScrollHint hint,
+                                            bool leftOf, bool rightOf, const QRect &area, const QRect &rect) const
+{
+    if (horizontalScrollMode() != QAbstractItemView::ScrollPerItem)
+        return QCommonListViewBase::horizontalScrollToValue(index, hint, leftOf, rightOf, area, rect);
+
+    int value = qBound(0, horizontalScrollBar()->value(), flowPositions.count() - 1);
     if (leftOf)
-        return perItemScrollToValue(itemIndex, value, areaWidth, QListView::PositionAtTop,
-                                    Qt::Horizontal, wrap, itemWidth);
+        hint = QListView::PositionAtTop;
     else if (rightOf)
-        return perItemScrollToValue(itemIndex, value, areaWidth, QListView::PositionAtBottom,
-                                    Qt::Horizontal, wrap, itemWidth);
-    else if (hint != QListView::EnsureVisible)
-        return perItemScrollToValue(itemIndex, value, areaWidth, hint, Qt::Horizontal, wrap, itemWidth);
-    return value;
+        hint = QListView::PositionAtBottom;
+    if (hint == QListView::EnsureVisible)
+        return value;
+
+    return perItemScrollToValue(index, value, area.width(), hint, Qt::Horizontal, isWrapping(), rect.width());
 }
 
-void QStaticListViewBase::scrollContentsBy(int &dx, int &dy)
+void QListModeViewBase::scrollContentsBy(int dx, int dy, bool scrollElasticBand)
 {
     // ### reorder this logic
-    const int verticalValue = verticalScrollBarValue();
-    const int horizontalValue = horizontalScrollBarValue();
+    const int verticalValue = verticalScrollBar()->value();
+    const int horizontalValue = horizontalScrollBar()->value();
     const bool vertical = (verticalScrollMode() == QAbstractItemView::ScrollPerItem);
     const bool horizontal = (horizontalScrollMode() == QAbstractItemView::ScrollPerItem);
 
@@ -2255,9 +2049,10 @@ void QStaticListViewBase::scrollContentsBy(int &dx, int &dy)
             dx = previousCoordinate - currentCoordinate;
         }
     }
+    QCommonListViewBase::scrollContentsBy(dx, dy, scrollElasticBand);
 }
 
-bool QStaticListViewBase::doBatchedItemLayout(const QListViewLayoutInfo &info, int max)
+bool QListModeViewBase::doBatchedItemLayout(const QListViewLayoutInfo &info, int max)
 {
     doStaticLayout(info);
     if (batchStartRow > max) { // stop items layout
@@ -2269,7 +2064,7 @@ bool QStaticListViewBase::doBatchedItemLayout(const QListViewLayoutInfo &info, i
     return false; // not done
 }
 
-QListViewItem QStaticListViewBase::indexToListViewItem(const QModelIndex &index) const
+QListViewItem QListModeViewBase::indexToListViewItem(const QModelIndex &index) const
 {
     if (flowPositions.isEmpty()
         || segmentPositions.isEmpty()
@@ -2305,7 +2100,7 @@ QListViewItem QStaticListViewBase::indexToListViewItem(const QModelIndex &index)
     return QListViewItem(QRect(pos, size), index.row());
 }
 
-QPoint QStaticListViewBase::initStaticLayout(const QListViewLayoutInfo &info)
+QPoint QListModeViewBase::initStaticLayout(const QListViewLayoutInfo &info)
 {
     int x, y;
     if (info.first == 0) {
@@ -2340,7 +2135,7 @@ QPoint QStaticListViewBase::initStaticLayout(const QListViewLayoutInfo &info)
 /*!
   \internal
 */
-void QStaticListViewBase::doStaticLayout(const QListViewLayoutInfo &info)
+void QListModeViewBase::doStaticLayout(const QListViewLayoutInfo &info)
 {
     const bool useItemSize = !info.grid.isValid();
     const QPoint topLeft = initStaticLayout(info);
@@ -2443,7 +2238,7 @@ void QStaticListViewBase::doStaticLayout(const QListViewLayoutInfo &info)
   Finds the set of items intersecting with \a area.
   In this function, itemsize is counted from topleft to the start of the next item.
 */
-QVector<QModelIndex> QStaticListViewBase::intersectingStaticSet(const QRect &area) const
+QVector<QModelIndex> QListModeViewBase::intersectingSet(const QRect &area) const
 {
     QVector<QModelIndex> ret;
     int segStartPosition;
@@ -2480,19 +2275,14 @@ QVector<QModelIndex> QStaticListViewBase::intersectingStaticSet(const QRect &are
                 ret += index;
 #if 0 // for debugging
             else
-                qWarning("intersectingStaticSet: row %d was invalid", row);
+                qWarning("intersectingSet: row %d was invalid", row);
 #endif
         }
     }
     return ret;
 }
 
-int QStaticListViewBase::itemIndex(const QListViewItem &item) const
-{
-    return item.indexHint;
-}
-
-QRect QStaticListViewBase::mapToViewport(const QRect &rect) const
+QRect QListModeViewBase::mapToViewport(const QRect &rect) const
 {
     if (isWrapping())
         return rect;
@@ -2510,7 +2300,7 @@ QRect QStaticListViewBase::mapToViewport(const QRect &rect) const
     return result;
 }
 
-int QStaticListViewBase::perItemScrollingPageSteps(int length, int bounds, bool wrap) const
+int QListModeViewBase::perItemScrollingPageSteps(int length, int bounds, bool wrap) const
 {
     const QVector<int> positions = (wrap ? segmentPositions : flowPositions);
     if (positions.isEmpty() || bounds <= length)
@@ -2538,7 +2328,7 @@ int QStaticListViewBase::perItemScrollingPageSteps(int length, int bounds, bool
     return qMax(pageSteps, 1);
 }
 
-int QStaticListViewBase::perItemScrollToValue(int index, int scrollValue, int viewportSize,
+int QListModeViewBase::perItemScrollToValue(int index, int scrollValue, int viewportSize,
                                                  QAbstractItemView::ScrollHint hint,
                                                  Qt::Orientation orientation, bool wrap, int itemExtent) const
 {
@@ -2598,7 +2388,7 @@ int QStaticListViewBase::perItemScrollToValue(int index, int scrollValue, int vi
     return scrollValue;
 }
 
-void QStaticListViewBase::clear()
+void QListModeViewBase::clear()
 {
     flowPositions.clear();
     segmentPositions.clear();
@@ -2610,10 +2400,175 @@ void QStaticListViewBase::clear()
 }
 
 /*
- * Dynamic ListView Implementation
+ * IconMode ListView Implementation
 */
 
-void QDynamicListViewBase::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
+void QIconModeViewBase::setPositionForIndex(const QPoint &position, const QModelIndex &index)
+{
+    if (index.row() >= items.count())
+        return;
+    const QSize oldContents = contentsSize;
+    qq->update(index); // update old position
+    moveItem(index.row(), position);
+    qq->update(index); // update new position
+
+    if (contentsSize != oldContents)
+        dd->viewUpdateGeometries(); // update the scroll bars
+}
+
+void QIconModeViewBase::appendHiddenRow(int row)
+{
+    if (row >= 0 && row < items.count()) //remove item
+        tree.removeLeaf(items.at(row).rect(), row);
+    QCommonListViewBase::appendHiddenRow(row);
+}
+
+void QIconModeViewBase::removeHiddenRow(int row)
+{
+    QCommonListViewBase::appendHiddenRow(row);
+    if (row >= 0 && row < items.count()) //insert item
+        tree.insertLeaf(items.at(row).rect(), row);
+}
+
+#ifndef QT_NO_DRAGANDDROP
+void QIconModeViewBase::paintDragDrop(QPainter *painter)
+{
+    if (!draggedItems.isEmpty() && viewport()->rect().contains(draggedItemsPos)) {
+        //we need to draw the items that arre dragged
+        painter->translate(draggedItemsDelta());
+        QStyleOptionViewItemV4 option = viewOptions();
+        option.state &= ~QStyle::State_MouseOver;
+        QVector<QModelIndex>::const_iterator it = draggedItems.begin();
+        QListViewItem item = indexToListViewItem(*it);
+        for (; it != draggedItems.end(); ++it) {
+            item = indexToListViewItem(*it);
+            option.rect = viewItemRect(item);
+            delegate(*it)->paint(painter, option, *it);
+        }
+    }
+}
+
+bool QIconModeViewBase::filterStartDrag(Qt::DropActions supportedActions)
+{
+    // This function does the same thing as in QAbstractItemView::startDrag(),
+    // plus adding viewitems to the draggedItems list.
+    // We need these items to draw the drag items
+    QModelIndexList indexes = dd->selectionModel->selectedIndexes();
+    if (indexes.count() > 0 ) {
+        if (viewport()->acceptDrops()) {
+            QModelIndexList::ConstIterator it = indexes.constBegin();
+            for (; it != indexes.constEnd(); ++it)
+                if (dd->model->flags(*it) & Qt::ItemIsDragEnabled
+                    && (*it).column() == dd->column)
+                    draggedItems.push_back(*it);
+        }
+        QDrag *drag = new QDrag(qq);
+        drag->setMimeData(dd->model->mimeData(indexes));
+        Qt::DropAction action = drag->exec(supportedActions, Qt::CopyAction);
+        draggedItems.clear();
+        if (action == Qt::MoveAction)
+            dd->clearOrRemove();
+    }
+    return true;
+}
+
+bool QIconModeViewBase::filterDropEvent(QDropEvent *e)
+{
+    if (e->source() != qq)
+        return false;
+
+    const QSize contents = contentsSize;
+    QPoint offset(horizontalOffset(), verticalOffset());
+    QPoint end = e->pos() + offset;
+    QPoint start = dd->pressedPosition;
+    QPoint delta = (dd->movement == QListView::Snap ? snapToGrid(end) - snapToGrid(start) : end - start);
+    QList<QModelIndex> indexes = dd->selectionModel->selectedIndexes();
+    for (int i = 0; i < indexes.count(); ++i) {
+        QModelIndex index = indexes.at(i);
+        QRect rect = dd->rectForIndex(index);
+        viewport()->update(mapToViewport(rect));
+        QPoint dest = rect.topLeft() + delta;
+        if (qq->isRightToLeft())
+            dest.setX(dd->flipX(dest.x()) - rect.width());
+        moveItem(index.row(), dest);
+        qq->update(index);
+    }
+    dd->stopAutoScroll();
+    draggedItems.clear();
+    dd->emitIndexesMoved(indexes);
+    e->accept(); // we have handled the event
+    // if the size has not grown, we need to check if it has shrinked
+    if (contentsSize != contents) {
+        if ((contentsSize.width() <= contents.width()
+            || contentsSize.height() <= contents.height())) {
+                updateContentsSize();
+        }
+        dd->viewUpdateGeometries();
+    }
+    return true;
+}
+
+bool QIconModeViewBase::filterDragLeaveEvent(QDragLeaveEvent *e)
+{
+    viewport()->update(draggedItemsRect()); // erase the area
+    draggedItemsPos = QPoint(-1, -1); // don't draw the dragged items
+    return QCommonListViewBase::filterDragLeaveEvent(e);
+}
+
+bool QIconModeViewBase::filterDragMoveEvent(QDragMoveEvent *e)
+{
+    if (e->source() != qq || !dd->canDecode(e))
+        return false;
+
+    // ignore by default
+    e->ignore();
+    // get old dragged items rect
+    QRect itemsRect = this->itemsRect(draggedItems);
+    viewport()->update(itemsRect.translated(draggedItemsDelta()));
+    // update position
+    draggedItemsPos = e->pos();
+    // get new items rect
+    viewport()->update(itemsRect.translated(draggedItemsDelta()));
+    // set the item under the cursor to current
+    QModelIndex index;
+    if (movement() == QListView::Snap) {
+        QRect rect(snapToGrid(e->pos() + offset()), gridSize());
+        const QVector<QModelIndex> intersectVector = intersectingSet(rect);
+        index = intersectVector.count() > 0 ? intersectVector.last() : QModelIndex();
+    } else {
+        index = qq->indexAt(e->pos());
+    }
+    // check if we allow drops here
+    if (draggedItems.contains(index))
+        e->accept(); // allow changing item position
+    else if (dd->model->flags(index) & Qt::ItemIsDropEnabled)
+        e->accept(); // allow dropping on dropenabled items
+    else if (!index.isValid())
+        e->accept(); // allow dropping in empty areas
+
+    // the event was treated. do autoscrolling
+    if (dd->shouldAutoScroll(e->pos()))
+        dd->startAutoScroll();
+    return true;
+}
+#endif // QT_NO_DRAGANDDROP
+
+void QIconModeViewBase::setRowCount(int rowCount)
+{
+    tree.create(qMax(rowCount - hiddenCount(), 0));
+}
+
+void QIconModeViewBase::scrollContentsBy(int dx, int dy, bool scrollElasticBand)
+{
+    if (scrollElasticBand)
+        dd->scrollElasticBandBy(isRightToLeft() ? -dx : dx, dy);
+
+    QCommonListViewBase::scrollContentsBy(dx, dy, scrollElasticBand);
+    if (!draggedItems.isEmpty())
+        viewport()->update(draggedItemsRect().translated(dx, dy));
+}
+
+void QIconModeViewBase::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
 {
     if (column() >= topLeft.column() && column() <= bottomRight.column())  {
         QStyleOptionViewItemV4 option = viewOptions();
@@ -2623,23 +2578,29 @@ void QDynamicListViewBase::dataChanged(const QModelIndex &topLeft, const QModelI
     }
 }
 
-bool QDynamicListViewBase::doBatchedItemLayout(const QListViewLayoutInfo &info, int max)
+bool QIconModeViewBase::doBatchedItemLayout(const QListViewLayoutInfo &info, int max)
 {
     if (info.last >= items.count()) {
-        createItems(info.last + 1);
+        //first we create the items
+        QStyleOptionViewItemV4 option = viewOptions();
+        for (int row = items.count(); row <= info.last; ++row) {
+            QSize size = itemSize(option, modelIndex(row));
+            QListViewItem item(QRect(0, 0, size.width(), size.height()), row); // default pos
+            items.append(item);
+        }
         doDynamicLayout(info);
     }
     return (batchStartRow > max); // done
 }
 
-QListViewItem QDynamicListViewBase::indexToListViewItem(const QModelIndex &index) const
+QListViewItem QIconModeViewBase::indexToListViewItem(const QModelIndex &index) const
 {
     if (index.isValid() && index.row() < items.count())
         return items.at(index.row());
     return QListViewItem();
 }
 
-void QDynamicListViewBase::initBspTree(const QSize &contents)
+void QIconModeViewBase::initBspTree(const QSize &contents)
 {
     // remove all items from the tree
     int leafCount = tree.leafCount();
@@ -2656,7 +2617,7 @@ void QDynamicListViewBase::initBspTree(const QSize &contents)
     tree.init(QRect(0, 0, contents.width(), contents.height()), type);
 }
 
-QPoint QDynamicListViewBase::initDynamicLayout(const QListViewLayoutInfo &info)
+QPoint QIconModeViewBase::initDynamicLayout(const QListViewLayoutInfo &info)
 {
     int x, y;
     if (info.first == 0) {
@@ -2678,7 +2639,7 @@ QPoint QDynamicListViewBase::initDynamicLayout(const QListViewLayoutInfo &info)
 /*!
   \internal
 */
-void QDynamicListViewBase::doDynamicLayout(const QListViewLayoutInfo &info)
+void QIconModeViewBase::doDynamicLayout(const QListViewLayoutInfo &info)
 {
     const bool useItemSize = !info.grid.isValid();
     const QPoint topLeft = initDynamicLayout(info);
@@ -2712,7 +2673,7 @@ void QDynamicListViewBase::doDynamicLayout(const QListViewLayoutInfo &info)
     if (moved.count() != items.count())
         moved.resize(items.count());
 
-    QRect rect(QPoint(0, 0), topLeft);
+    QRect rect(QPoint(), topLeft);
     QListViewItem *item = 0;
     for (int row = info.first; row <= info.last; ++row) {
         item = &items[row];
@@ -2805,43 +2766,18 @@ void QDynamicListViewBase::doDynamicLayout(const QListViewLayoutInfo &info)
         viewport()->update();
 }
 
-QVector<QModelIndex> QDynamicListViewBase::intersectingDynamicSet(const QRect &area) const
+QVector<QModelIndex> QIconModeViewBase::intersectingSet(const QRect &area) const
 {
-    QDynamicListViewBase *that = const_cast<QDynamicListViewBase*>(this);
+    QIconModeViewBase *that = const_cast<QIconModeViewBase*>(this);
     QBspTree::Data data(static_cast<void*>(that));
     QVector<QModelIndex> res;
     that->interSectingVector = &res;
-    that->tree.climbTree(area, &QDynamicListViewBase::addLeaf, data);
+    that->tree.climbTree(area, &QIconModeViewBase::addLeaf, data);
     that->interSectingVector = 0;
     return res;
 }
 
-void QDynamicListViewBase::createItems(int to)
-{
-    int count = items.count();
-    QSize size;
-    QStyleOptionViewItemV4 option = viewOptions();
-    for (int row = count; row < to; ++row) {
-        size = itemSize(option, modelIndex(row));
-        QListViewItem item(QRect(0, 0, size.width(), size.height()), row); // default pos
-        items.append(item);
-    }
-}
-
-void QDynamicListViewBase::drawItems(QPainter *painter, const QVector<QModelIndex> &indexes) const
-{
-    QStyleOptionViewItemV4 option = viewOptions();
-    option.state &= ~QStyle::State_MouseOver;
-    QVector<QModelIndex>::const_iterator it = indexes.begin();
-    QListViewItem item = indexToListViewItem(*it);
-    for (; it != indexes.end(); ++it) {
-        item = indexToListViewItem(*it);
-        option.rect = viewItemRect(item);
-        delegate(*it)->paint(painter, option, *it);
-    }
-}
-
-QRect QDynamicListViewBase::itemsRect(const QVector<QModelIndex> &indexes) const
+QRect QIconModeViewBase::itemsRect(const QVector<QModelIndex> &indexes) const
 {
     QVector<QModelIndex>::const_iterator it = indexes.begin();
     QListViewItem item = indexToListViewItem(*it);
@@ -2853,7 +2789,7 @@ QRect QDynamicListViewBase::itemsRect(const QVector<QModelIndex> &indexes) const
     return rect;
 }
 
-int QDynamicListViewBase::itemIndex(const QListViewItem &item) const
+int QIconModeViewBase::itemIndex(const QListViewItem &item) const
 {
     if (!item.isValid())
         return -1;
@@ -2889,11 +2825,11 @@ int QDynamicListViewBase::itemIndex(const QListViewItem &item) const
     return -1;
 }
 
-void QDynamicListViewBase::addLeaf(QVector<int> &leaf, const QRect &area,
+void QIconModeViewBase::addLeaf(QVector<int> &leaf, const QRect &area,
                                    uint visited, QBspTree::Data data)
 {
     QListViewItem *vi;
-    QDynamicListViewBase *_this = static_cast<QDynamicListViewBase *>(data.ptr);
+    QIconModeViewBase *_this = static_cast<QIconModeViewBase *>(data.ptr);
     for (int i = 0; i < leaf.count(); ++i) {
         int idx = leaf.at(i);
         if (idx < 0 || idx >= _this->items.count())
@@ -2909,19 +2845,7 @@ void QDynamicListViewBase::addLeaf(QVector<int> &leaf, const QRect &area,
     }
 }
 
-void QDynamicListViewBase::insertItem(int index)
-{
-    if (index >= 0 && index < items.count())
-        tree.insertLeaf(items.at(index).rect(), index);
-}
-
-void QDynamicListViewBase::removeItem(int index)
-{
-    if (index >= 0 && index < items.count())
-        tree.removeLeaf(items.at(index).rect(), index);
-}
-
-void QDynamicListViewBase::moveItem(int index, const QPoint &dest)
+void QIconModeViewBase::moveItem(int index, const QPoint &dest)
 {
     // does not impact on the bintree itself or the contents rect
     QListViewItem *item = &items[index];
@@ -2941,14 +2865,14 @@ void QDynamicListViewBase::moveItem(int index, const QPoint &dest)
     moved.setBit(index, true);
 }
 
-QPoint QDynamicListViewBase::snapToGrid(const QPoint &pos) const
+QPoint QIconModeViewBase::snapToGrid(const QPoint &pos) const
 {
     int x = pos.x() - (pos.x() % gridSize().width());
     int y = pos.y() - (pos.y() % gridSize().height());
     return QPoint(x, y);
 }
 
-QPoint QDynamicListViewBase::draggedItemsDelta() const
+QPoint QIconModeViewBase::draggedItemsDelta() const
 {
     if (movement() == QListView::Snap) {
         QPoint snapdelta = QPoint((offset().x() % gridSize().width()),
@@ -2958,7 +2882,7 @@ QPoint QDynamicListViewBase::draggedItemsDelta() const
     return draggedItemsPos - pressedPosition();
 }
 
-QRect QDynamicListViewBase::draggedItemsRect() const
+QRect QIconModeViewBase::draggedItemsRect() const
 {
     QRect rect = itemsRect(draggedItems);
     rect.translate(draggedItemsDelta());
@@ -2977,7 +2901,7 @@ void QListViewPrivate::scrollElasticBandBy(int dx, int dy)
         elasticBand.moveTop(elasticBand.top() - dy);
 }
 
-void QDynamicListViewBase::clear()
+void QIconModeViewBase::clear()
 {
     tree.destroy();
     items.clear();
@@ -2986,7 +2910,7 @@ void QDynamicListViewBase::clear()
     batchSavedDeltaSeg = 0;
 }
 
-void QDynamicListViewBase::updateContentsSize()
+void QIconModeViewBase::updateContentsSize()
 {
     QRect bounding;
     for (int i = 0; i < items.count(); ++i)
@@ -3039,7 +2963,7 @@ int QListView::visualIndex(const QModelIndex &index) const
     Q_D(const QListView);
     d->executePostedLayout();
     QListViewItem itm = d->indexToListViewItem(index);
-    return d->itemIndex(itm);
+    return d->commonListView->itemIndex(itm);
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/itemviews/qlistview_p.h b/src/gui/itemviews/qlistview_p.h
index 6c8d324..db9eb59 100644
--- a/src/gui/itemviews/qlistview_p.h
+++ b/src/gui/itemviews/qlistview_p.h
@@ -67,8 +67,8 @@ QT_BEGIN_NAMESPACE
 class QListViewItem
 {
     friend class QListViewPrivate;
-    friend class QStaticListViewBase;
-    friend class QDynamicListViewBase;
+    friend class QListModeViewBase;
+    friend class QIconModeViewBase;
 public:
     inline QListViewItem()
         : x(-1), y(-1), w(0), h(0), indexHint(-1), visited(0xffff) {}
@@ -120,8 +120,42 @@ class QListViewPrivate;
 class QCommonListViewBase
 {
 public:
-    inline QCommonListViewBase(QListView *q, QListViewPrivate *d) : dd(d), qq(q) {}
-
+    inline QCommonListViewBase(QListView *q, QListViewPrivate *d) : dd(d), qq(q), batchStartRow(0), batchSavedDeltaSeg(0) {}
+    virtual ~QCommonListViewBase() {}
+
+    //common interface
+    virtual int itemIndex(const QListViewItem &item) const = 0;
+    virtual QListViewItem indexToListViewItem(const QModelIndex &index) const = 0;
+    virtual bool doBatchedItemLayout(const QListViewLayoutInfo &info, int max) = 0;
+    virtual void clear() = 0;
+    virtual void setRowCount(int) = 0;
+    virtual QVector<QModelIndex> intersectingSet(const QRect &area) const = 0;
+
+    virtual int horizontalScrollToValue(int index, QListView::ScrollHint hint,
+        bool leftOf, bool rightOf, const QRect &area, const QRect &rect) const;
+    virtual int verticalScrollToValue(int index, QListView::ScrollHint hint,
+        bool above, bool below, const QRect &area, const QRect &rect) const;
+    virtual void scrollContentsBy(int dx, int dy, bool scrollElasticBand);
+    virtual QRect mapToViewport(const QRect &rect) const {return rect;}
+    virtual int horizontalOffset() const;
+    virtual int verticalOffset() const { return verticalScrollBar()->value(); }
+    virtual void updateHorizontalScrollBar(const QSize &step);
+    virtual void updateVerticalScrollBar(const QSize &step);
+    virtual void dataChanged(const QModelIndex &, const QModelIndex &) { }
+    virtual void appendHiddenRow(int row);
+    virtual void removeHiddenRow(int row);
+    virtual void setPositionForIndex(const QPoint &, const QModelIndex &) { }
+
+#ifndef QT_NO_DRAGANDDROP
+    virtual void paintDragDrop(QPainter *painter) = 0;
+    virtual bool filterDragMoveEvent(QDragMoveEvent *) { return false; }
+    virtual bool filterDragLeaveEvent(QDragLeaveEvent *) { return false; }
+    virtual bool filterDropEvent(QDropEvent *) { return false; }
+    virtual bool filterStartDrag(Qt::DropActions) { return false; }
+#endif
+
+
+    //other inline members
     inline int spacing() const;
     inline bool isWrapping() const;
     inline QSize gridSize() const;
@@ -133,8 +167,8 @@ public:
     inline bool uniformItemSizes() const;
     inline int column() const;
 
-    inline int verticalScrollBarValue() const;
-    inline int horizontalScrollBarValue() const;
+    inline QScrollBar *verticalScrollBar() const;
+    inline QScrollBar *horizontalScrollBar() const;
     inline QListView::ScrollMode verticalScrollMode() const;
     inline QListView::ScrollMode horizontalScrollMode() const;
 
@@ -157,110 +191,107 @@ public:
 
     QListViewPrivate *dd;
     QListView *qq;
+    QSize contentsSize;
+    int batchStartRow;
+    int batchSavedDeltaSeg;
 };
 
-// ### rename to QListModeViewBase
-class QStaticListViewBase : public QCommonListViewBase
+class QListModeViewBase : public QCommonListViewBase
 {
-    friend class QListViewPrivate;
 public:
-    QStaticListViewBase(QListView *q, QListViewPrivate *d) : QCommonListViewBase(q, d),
-        batchStartRow(0), batchSavedDeltaSeg(0), batchSavedPosition(0) {}
+    QListModeViewBase(QListView *q, QListViewPrivate *d) : QCommonListViewBase(q, d) {}
 
     QVector<int> flowPositions;
     QVector<int> segmentPositions;
     QVector<int> segmentStartRows;
     QVector<int> segmentExtents;
 
-    QSize contentsSize;
-
     // used when laying out in batches
-    int batchStartRow;
-    int batchSavedDeltaSeg;
     int batchSavedPosition;
 
+    //reimplementations
+    int itemIndex(const QListViewItem &item) const { return item.indexHint; }
+    QListViewItem indexToListViewItem(const QModelIndex &index) const;
     bool doBatchedItemLayout(const QListViewLayoutInfo &info, int max);
+    void clear();
+    void setRowCount(int rowCount) { flowPositions.resize(rowCount); }
+    QVector<QModelIndex> intersectingSet(const QRect &area) const;
+
+    int horizontalScrollToValue(int index, QListView::ScrollHint hint,
+        bool leftOf, bool rightOf,const QRect &area, const QRect &rect) const;
+    int verticalScrollToValue(int index, QListView::ScrollHint hint,
+        bool above, bool below, const QRect &area, const QRect &rect) const;
+    void scrollContentsBy(int dx, int dy, bool scrollElasticBand);
+    QRect mapToViewport(const QRect &rect) const;
+    int horizontalOffset() const;
+    int verticalOffset() const;
+    void updateHorizontalScrollBar(const QSize &step);
+    void updateVerticalScrollBar(const QSize &step);
+
+#ifndef QT_NO_DRAGANDDROP
+    void paintDragDrop(QPainter *painter);
+#endif
 
+private:
     QPoint initStaticLayout(const QListViewLayoutInfo &info);
     void doStaticLayout(const QListViewLayoutInfo &info);
-    QVector<QModelIndex> intersectingStaticSet(const QRect &area) const;
-
-    int itemIndex(const QListViewItem &item) const;
-
-    int perItemScrollingPageSteps(int length, int bounds, bool wrap) const;
-
     int perItemScrollToValue(int index, int value, int height,
                              QAbstractItemView::ScrollHint hint,
                              Qt::Orientation orientation, bool wrap, int extent) const;
-
-    QRect mapToViewport(const QRect &rect) const;
-
-    QListViewItem indexToListViewItem(const QModelIndex &index) const;
-
-    void scrollContentsBy(int &dx, int &dy);
-
-    int verticalPerItemValue(int itemIndex, int verticalValue, int areaHeight,
-                       bool above, bool below, bool wrap, QListView::ScrollHint hint, int itemHeight) const;
-    int horizontalPerItemValue(int itemIndex, int horizontalValue, int areaWidth,
-                       bool leftOf, bool rightOf, bool wrap, QListView::ScrollHint hint, int itemWidth) const;
-
-    void clear();
+    int perItemScrollingPageSteps(int length, int bounds, bool wrap) const;
 };
 
-// ### rename to QIconModeViewBase
-class QDynamicListViewBase : public QCommonListViewBase
+class QIconModeViewBase : public QCommonListViewBase
 {
-    friend class QListViewPrivate;
 public:
-    QDynamicListViewBase(QListView *q, QListViewPrivate *d) : QCommonListViewBase(q, d),
-        batchStartRow(0), batchSavedDeltaSeg(0), interSectingVector(0) {}
+    QIconModeViewBase(QListView *q, QListViewPrivate *d) : QCommonListViewBase(q, d), interSectingVector(0) {}
 
     QBspTree tree;
     QVector<QListViewItem> items;
     QBitArray moved;
 
-    QSize contentsSize;
-
     QVector<QModelIndex> draggedItems; // indices to the tree.itemVector
     mutable QPoint draggedItemsPos;
 
     // used when laying out in batches
-    int batchStartRow;
-    int batchSavedDeltaSeg;
-    QVector<QModelIndex> *interSectingVector; //used from within intersectingDynamicSet
+    QVector<QModelIndex> *interSectingVector; //used from within intersectingSet
 
-    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+    //reimplementations
+    int itemIndex(const QListViewItem &item) const;
+    QListViewItem indexToListViewItem(const QModelIndex &index) const;
     bool doBatchedItemLayout(const QListViewLayoutInfo &info, int max);
+    void clear();
+    void setRowCount(int rowCount);
+    QVector<QModelIndex> intersectingSet(const QRect &area) const;
+
+    void scrollContentsBy(int dx, int dy, bool scrollElasticBand);
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+    void appendHiddenRow(int row);
+    void removeHiddenRow(int row);
+    void setPositionForIndex(const QPoint &position, const QModelIndex &index);
+
+#ifndef QT_NO_DRAGANDDROP
+    void paintDragDrop(QPainter *painter);
+    bool filterDragMoveEvent(QDragMoveEvent *);
+    bool filterDragLeaveEvent(QDragLeaveEvent *);
+    bool filterDropEvent(QDropEvent *e);
+    bool filterStartDrag(Qt::DropActions);
+#endif
 
+private:
     void initBspTree(const QSize &contents);
     QPoint initDynamicLayout(const QListViewLayoutInfo &info);
     void doDynamicLayout(const QListViewLayoutInfo &info);
-    QVector<QModelIndex> intersectingDynamicSet(const QRect &area) const;
-
     static void addLeaf(QVector<int> &leaf, const QRect &area,
                         uint visited, QBspTree::Data data);
-
-    void insertItem(int index);
-    void removeItem(int index);
-    void moveItem(int index, const QPoint &dest);
-
-    int itemIndex(const QListViewItem &item) const;
-
-    void createItems(int to);
-    void drawItems(QPainter *painter, const QVector<QModelIndex> &indexes) const;
     QRect itemsRect(const QVector<QModelIndex> &indexes) const;
-
-    QPoint draggedItemsDelta() const;
     QRect draggedItemsRect() const;
-
     QPoint snapToGrid(const QPoint &pos) const;
-
-    void scrollElasticBandBy(int dx, int dy);
-
-    QListViewItem indexToListViewItem(const QModelIndex &index) const;
-
-    void clear();
     void updateContentsSize();
+    QPoint draggedItemsDelta() const;
+    void drawItems(QPainter *painter, const QVector<QModelIndex> &indexes) const;
+    void moveItem(int index, const QPoint &dest);
+
 };
 
 class QListViewPrivate: public QAbstractItemViewPrivate
@@ -278,23 +309,13 @@ public:
     inline QVector<QModelIndex> intersectingSet(const QRect &area, bool doLayout = true) const {
         if (doLayout) executePostedLayout();
         QRect a = (q_func()->isRightToLeft() ? flipX(area.normalized()) : area.normalized());
-        return (viewMode == QListView::ListMode)  ? staticListView->intersectingStaticSet(a)
-            : dynamicListView->intersectingDynamicSet(a);
+        return commonListView->intersectingSet(a);
     }
 
-    // ### FIXME:
-    inline void resetBatchStartRow()
-        { if (viewMode == QListView::ListMode) staticListView->batchStartRow = 0;
-              else dynamicListView->batchStartRow = 0; }
-    inline int batchStartRow() const
-        { return (viewMode == QListView::ListMode
-          ? staticListView->batchStartRow : dynamicListView->batchStartRow); }
-    inline QSize contentsSize() const
-        { return (viewMode == QListView::ListMode
-          ? staticListView->contentsSize : dynamicListView->contentsSize); }
-    inline void setContentsSize(int w, int h)
-        { if (viewMode == QListView::ListMode) staticListView->contentsSize = QSize(w, h);
-          else dynamicListView->contentsSize = QSize(w, h); }
+    inline void resetBatchStartRow() { commonListView->batchStartRow = 0; }
+    inline int batchStartRow() const { return commonListView->batchStartRow; }
+    inline QSize contentsSize() const { return commonListView->contentsSize; }
+    inline void setContentsSize(int w, int h) { commonListView->contentsSize = QSize(w, h); }
 
     inline int flipX(int x) const
         { return qMax(viewport->width(), contentsSize().width()) - x; }
@@ -305,12 +326,22 @@ public:
     inline QRect viewItemRect(const QListViewItem &item) const
         { if (q_func()->isRightToLeft()) return flipX(item.rect()); return item.rect(); }
 
-    int itemIndex(const QListViewItem &item) const;
     QListViewItem indexToListViewItem(const QModelIndex &index) const;
     inline QModelIndex listViewItemToIndex(const QListViewItem &item) const
-        { return model->index(itemIndex(item), column, root); }
+        { return model->index(commonListView->itemIndex(item), column, root); }
+
+    QRect rectForIndex(const QModelIndex &index) const
+    {
+        if (!isIndexValid(index) || index.parent() != root || index.column() != column || isHidden(index.row()))
+            return QRect();
+        executePostedLayout();
+        return viewItemRect(indexToListViewItem(index));
+    }
+
+    void viewUpdateGeometries() { q_func()->updateGeometries(); }
 
-    QRect mapToViewport(const QRect &rect, bool greedy = false) const;
+
+    QRect mapToViewport(const QRect &rect, bool extend = true) const;
 
     QModelIndex closestIndex(const QRect &target, const QVector<QModelIndex> &candidates) const;
     QSize itemSize(const QStyleOptionViewItem &option, const QModelIndex &index) const;
@@ -351,10 +382,10 @@ public:
 
     QItemViewPaintPairs draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const;
 
-    union {
-        QDynamicListViewBase *dynamicListView;
-        QStaticListViewBase *staticListView;
-    };
+    void emitIndexesMoved(const QModelIndexList &indexes) { emit q_func()->indexesMoved(indexes); }
+
+
+    QCommonListViewBase *commonListView;
 
     // ### FIXME: see if we can move the members into the dynamic/static classes
 
@@ -412,8 +443,8 @@ inline QPoint QCommonListViewBase::pressedPosition() const { return dd->pressedP
 inline bool QCommonListViewBase::uniformItemSizes() const { return dd->uniformItemSizes; }
 inline int QCommonListViewBase::column() const { return dd->column; }
 
-inline int QCommonListViewBase::verticalScrollBarValue() const { return qq->verticalScrollBar()->value(); }
-inline int QCommonListViewBase::horizontalScrollBarValue() const { return qq->horizontalScrollBar()->value(); }
+inline QScrollBar *QCommonListViewBase::verticalScrollBar() const { return qq->verticalScrollBar(); }
+inline QScrollBar *QCommonListViewBase::horizontalScrollBar() const { return qq->horizontalScrollBar(); }
 inline QListView::ScrollMode QCommonListViewBase::verticalScrollMode() const { return qq->verticalScrollMode(); }
 inline QListView::ScrollMode QCommonListViewBase::horizontalScrollMode() const { return qq->horizontalScrollMode(); }
 
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 38592e0..8e9c3a1 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -104,6 +104,10 @@ extern bool qt_wince_is_pocket_pc();  //qguifunctions_wince.cpp
 
 #include "qdatetime.h"
 
+#ifdef QT_MAC_USE_COCOA
+#include <private/qt_cocoa_helpers_mac_p.h>
+#endif
+
 //#define ALIEN_DEBUG
 
 static void initResources()
@@ -3497,6 +3501,15 @@ void QApplication::changeOverrideCursor(const QCursor &cursor)
     if (qApp->d_func()->cursor_list.isEmpty())
         return;
     qApp->d_func()->cursor_list.removeFirst();
+#ifdef QT_MAC_USE_COCOA
+    // We use native NSCursor stacks in Cocoa. The currentCursor is the
+    // top of this stack. So to avoid flickering of cursor, we have to
+    // change the cusor instead of pop-ing the existing OverrideCursor
+    // and pushing the new one.
+    qApp->d_func()->cursor_list.prepend(cursor);
+    qt_cocoaChangeOverrideCursor(cursor);
+    return;
+#endif
     setOverrideCursor(cursor);
 }
 #endif
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index d942519..0d07a02 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -4572,6 +4572,7 @@ bool QETWidget::translateXinputEvent(const XEvent *ev, QTabletDeviceData *tablet
     int deviceType = QTabletEvent::NoDevice;
     int pointerType = QTabletEvent::UnknownPointer;
     XEvent mouseMotionEvent;
+    XEvent dummy;
     const XDeviceMotionEvent *motion = 0;
     XDeviceButtonEvent *button = 0;
     const XProximityNotifyEvent *proximity = 0;
@@ -4589,7 +4590,6 @@ bool QETWidget::translateXinputEvent(const XEvent *ev, QTabletDeviceData *tablet
         // Do event compression.  Skip over tablet+mouse move events if there are newer ones.
         qt_tablet_motion_data tabletMotionData;
         tabletMotionData.tabletMotionType = tablet->xinput_motion;
-        XEvent dummy;
         while (true) {
             // Find first mouse event since we expect them in pairs inside Qt
             tabletMotionData.error =false;
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 572df70..172d07b 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -197,11 +197,19 @@ static void cleanupCocoaApplicationDelegate()
         }
     }
 
-    // Prevent Cocoa from terminating the application, since this simply
-    // exits the program whithout allowing QApplication::exec() to return.
-    // The call to QApplication::quit() above will instead quit the
-    // application from the Qt side.
-    return NSTerminateCancel;
+    if (qtPrivate->threadData->eventLoops.size() == 0) {
+        // INVARIANT: No event loop is executing. This probably
+        // means that Qt is used as a plugin, or as a part of a native
+        // Cocoa application. In any case it should be fine to 
+        // terminate now:
+        return NSTerminateNow;
+    } else {
+        // Prevent Cocoa from terminating the application, since this simply
+        // exits the program whithout allowing QApplication::exec() to return.
+        // The call to QApplication::quit() above will instead quit the
+        // application from the Qt side.
+        return NSTerminateCancel;
+    }
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 7ac0d89..5a0209d 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -667,7 +667,15 @@ extern "C" {
 
 - (void)mouseMoved:(NSEvent *)theEvent
 {
-    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
+    // We always enable mouse tracking for all QCocoaView-s. In cases where we have
+    // child views, we will receive mouseMoved for both parent & the child (if
+    // mouse is over the child). We need to ignore the parent mouseMoved in such
+    // cases.
+    NSPoint windowPoint = [theEvent locationInWindow];
+    NSView *candidateView = [[[self window] contentView] hitTest:windowPoint];
+    if (candidateView && candidateView == self) {
+        qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
+    }
 }
 
 - (void)mouseDown:(NSEvent *)theEvent
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index a4042c1..8f92fea 100644
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -1073,12 +1073,14 @@ void qt_xdnd_send_leave()
     if (!qt_xdnd_current_target)
         return;
 
+    QDragManager *manager = QDragManager::self();
+
     XClientMessageEvent leave;
     leave.type = ClientMessage;
     leave.window = qt_xdnd_current_target;
     leave.format = 32;
     leave.message_type = ATOM(XdndLeave);
-    leave.data.l[0] = qt_xdnd_dragsource_xid;
+    leave.data.l[0] = manager->dragPrivate()->source->effectiveWinId();
     leave.data.l[1] = 0; // flags
     leave.data.l[2] = 0; // x, y
     leave.data.l[3] = 0; // w, h
@@ -1094,8 +1096,8 @@ void qt_xdnd_send_leave()
     else
         XSendEvent(X11->display, qt_xdnd_current_proxy_target, False,
                     NoEventMask, (XEvent*)&leave);
+
     // reset the drag manager state
-    QDragManager *manager = QDragManager::self();
     manager->willDrop = false;
     if (global_accepted_action != Qt::IgnoreAction)
         manager->emitActionChanged(Qt::IgnoreAction);
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 1cc168f..76d52c7 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -3549,38 +3549,108 @@ QMenubarUpdatedEvent::QMenubarUpdatedEvent(QMenuBar * const menuBar)
     \since 4.6
     \ingroup events
 
-    Touch events occur when pressing, releasing, or moving one or more
-    touch points on a touch device (such as a touch-screen or
-    track-pad). To receive touch events, widgets have to have the
-    Qt::WA_AcceptTouchEvents attribute set and graphics items need to have
-    the \l{QGraphicsItem::setAcceptTouchEvents()}{acceptTouchEvents}
-    attribute set to true.
-
-    All touch events are of type QEvent::TouchBegin,
-    QEvent::TouchUpdate, or QEvent::TouchEnd. The touchPoints()
-    function returns a list of all touch points contained in the event.
-    Information about each touch point can be retrieved using the
-    QTouchEvent::TouchPoint class. The Qt::TouchPointState enum
-    describes the different states that a touch point may have.
-
-    Similar to QMouseEvent, Qt automatically grabs each touch point on
-    the first press inside a widget; the widget will receive all
-    updates for the touch point until it is released. Note that it is
-    possible for a widget to receive events for multiple touch points,
-    and that multiple widgets may be receiving touch events at the same
-    time.
-
-    A touch event contains a special accept flag that indicates
-    whether the receiver wants the event. By default, the event is
-    accepted. You should call ignore() if the touch event is not handled by
-    your widget. A QEvent::TouchBegin event is propagated up the parent widget
-    chain until a widget accepts it with accept(), or an event filter
-    consumes it. If the QEvent::TouchBegin event is neither accepted nor consumed,
-    then mouse events are simulated from the state of the first touch
-    point.
-
-    Reimplement QWidget::event() for widgets and QGraphicsItem::sceneEvent()
-    for items in a graphics view to receive touch events.
+    \section1 Enabling Touch Events
+
+    Touch events occur when pressing, releasing, or moving one or more touch points on a touch
+    device (such as a touch-screen or track-pad). To receive touch events, widgets have to have the
+    Qt::WA_AcceptTouchEvents attribute set and graphics items need to have the
+    \l{QGraphicsItem::setAcceptTouchEvents()}{acceptTouchEvents} attribute set to true.
+
+    Note: when using QAbstractScrollArea based widgets, you should enabled the
+    Qt::WA_AcceptTouchEvents attribute on the scroll area's
+    \l{QAbstractScrollArea::viewport()}{viewport}.
+
+    \section1 Event Delivery and Propagation
+
+    All touch events are of type QEvent::TouchBegin, QEvent::TouchUpdate, or QEvent::TouchEnd.
+    Reimplement QWidget::event() or QAbstractScrollArea::viewportEvent() for widgets and
+    QGraphicsItem::sceneEvent() for items in a graphics view to receive touch events. By default,
+    QWidget::event() translates the first non-primary touch point in a QTouchEvent into a
+    QMouseEvent. This makes it possible to enable touch events on existing widgets that do not
+    normally handle QTouchEvent. See below for information on some special considerations needed
+    when doing this.
+
+    QEvent::TouchBegin is the first touch event sent to a widget. The QEvent::TouchBegin event
+    contains a special accept flag that indicates whether the receiver wants the event. By default,
+    the event is accepted. You should call ignore() if the touch event is not handled by your
+    widget. The QEvent::TouchBegin event is propagated up the parent widget chain until a widget
+    accepts it with accept(), or an event filter consumes it. For QGraphicsItems, the
+    QEvent::TouchBegin event is propagated to items under the mouse (similar to mouse event
+    propagation for QGraphicsItems).
+
+    The QEvent::TouchUpdate and QEvent::TouchEnd events are sent to the widget or item that
+    accepted the QEvent::TouchBegin event. If the QEvent::TouchBegin event is not accepted and not
+    filtered by an event filter, then no further touch events are sent until the next
+    QEvent::TouchBegin.
+
+    The touchPoints() function returns a list of all touch points contained in the event.
+    Information about each touch point can be retrieved using the QTouchEvent::TouchPoint class.
+    The Qt::TouchPointState enum describes the different states that a touch point may have.
+
+    Similar to QMouseEvent, Qt automatically grabs each touch point on the first press inside a
+    widget; the widget will receive all updates for the touch point until it is released. Note that
+    it is possible for a widget to receive events for multiple touch points, and that multiple
+    widgets may be receiving touch events at the same time.
+
+    \section1 Touch Point Grouping
+
+    As mentioned above, it is possible that several widgets can be receiving QTouchEvents at the
+    same time. However, Qt makes sure to never send duplicate QEvent::TouchBegin events to the same
+    widget, which could theoretically happen during propagation if, for example, the user touched 2
+    separate widgets in a QGroupBox and both widgets ignored the QEvent::TouchBegin event.
+
+    To avoid this, Qt will group new touch points together using the following rules:
+
+    \list
+
+    \i When the first touch point is detected, the destination widget is determined firstly by the
+    location on screen first and secondly by the propagation rules.
+
+    \i When additional touch points are detected, Qt first looks to see if there are any active
+    touch points on any ancestor or descendent of the widget under the new touch point. If there
+    are, the new touch point is grouped with the first, and the new touch point will be sent in a
+    single QTouchEvent to the widget that handled the first touch point. (The widget under the new
+    touch point will not receive an event).
+
+    \endlist
+
+    This makes it possible for sibling widgets to handle touch events independently while making
+    sure that the sequence of QTouchEvents is always correct.
+
+    \section1 Mouse Events and the Primary Touch Point
+
+    QTouchEvent delivery is independent from that of QMouseEvent. On some windowing systems, mouse
+    events are also sent for the \l{QTouchEvent::TouchPoint::isPrimary()}{primary touch point}.
+    This means it is possible for your widget to receive both QTouchEvent and QMouseEvent for the
+    same user interaction point. You can use the QTouchEvent::TouchPoint::isPrimary() function to
+    identify the primary touch point.
+
+    Note that on some systems, it is possible to receive touch events without a primary touch
+    point. All this means is that there will be no mouse event generated for the touch points in
+    the QTouchEvent.
+
+    \section1 Caveats
+
+    \list
+
+    \i As mentioned above, enabling touch events means multiple widgets can be receiving touch
+    events simultaneously. Combined with the default QWidget::event() handling for QTouchEvents,
+    this gives you great flexibility in designing multi-touch user interfaces. Be aware of the
+    implications. For example, is is possible that the user is moving a QSlider with one finger and
+    pressing a QPushButton with another. The signals are emitted from these widgets will be
+    interleaved.
+
+    \i Recursion into the event loop using one of the exec() methods (e.g. QDialog::exec() or
+    QMenu::exec()) in a QTouchEvent event handler is not supported. Since there are multiple event
+    recipients, unexpected recursion may cause problems, including but not limited to lost events
+    and unexpected infinite recursion.
+
+    \i QTouchEvents are not affected by a \l{QWidget::grabMouse()}{mouse grab} or an
+    \l{QApplication::activePopupWidget()}{active popup widget}. The behavior of QTouchEvents is
+    undefined when opening a popup or grabbing the mouse while there are multiple active touch
+    points.
+
+    \endlist
 
     \sa QTouchEvent::TouchPoint, Qt::TouchPointState, Qt::WA_AcceptTouchEvents,
     QGraphicsItem::acceptTouchEvents()
@@ -3659,6 +3729,11 @@ QTouchEvent::~QTouchEvent()
     Returns the list of touch points contained in the touch event.
 */
 
+/*! \fn QTouchEvent::DeviceType QTouchEvent::deviceType() const
+
+    Returns the touch device Type, which is of type \l {QTouchEvent::DeviceType} {DeviceType}.
+*/
+
 /*! \fn void QTouchEvent::setWidget(QWidget *widget)
 
     \internal
@@ -3680,6 +3755,14 @@ QTouchEvent::~QTouchEvent()
     Sets the list of touch points for this event.
 */
 
+/*! \fn void QTouchEvent::setDeviceType(DeviceType deviceType)
+
+    \internal
+
+    Sets the device type to \a deviceType, which is of type \l {QTouchEvent::DeviceType}
+    {DeviceType}.
+*/
+
 /*! \class QTouchEvent::TouchPoint
     \brief The QTouchEvent::TouchPoint class provides information about a touch point in a QTouchEvent.
     \since 4.6
@@ -4091,15 +4174,4 @@ QTouchEvent::TouchPoint &QTouchEvent::TouchPoint::operator=(const QTouchEvent::T
     return *this;
 }
 
-/*! \fn QTouchEvent::DeviceType QTouchEvent::deviceType() const
-  Returns the touch device Type, which is of type
-  \l {QTouchEvent::DeviceType} {DeviceType}.
- */
-
-/*! \fn void QTouchEvent::setDeviceType(DeviceType deviceType)
-  Sets the device type to \a deviceType, which is of type
-  \l {QTouchEvent::DeviceType} {DeviceType}. 
- */
-
-
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index 59b9a2d..585a7e1 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -99,11 +99,11 @@ struct QShortcutEntry
     QObject *owner;
 };
 
-#ifndef QT_NO_DEBUG_STREAM
+#if 0 //ndef QT_NO_DEBUG_STREAM
 /*! \internal
     QDebug operator<< for easy debug output of the shortcut entries.
 */
-QDebug &operator<<(QDebug &dbg, const QShortcutEntry *se) {
+static QDebug &operator<<(QDebug &dbg, const QShortcutEntry *se) {
     if (!se)
         return dbg << "QShortcutEntry(0x0)";
     dbg.nospace()
diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp
index 47f3146..10689ba 100644
--- a/src/gui/kernel/qstandardgestures.cpp
+++ b/src/gui/kernel/qstandardgestures.cpp
@@ -172,8 +172,6 @@ bool QPanGesture::eventFilter(QObject *receiver, QEvent *event)
 bool QPanGesture::filterEvent(QEvent *event)
 {
     Q_D(QPanGesture);
-    if (!event->spontaneous())
-        return false;
     const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
     if (event->type() == QEvent::TouchBegin) {
         QTouchEvent::TouchPoint p = ev->touchPoints().at(0);
@@ -329,10 +327,11 @@ bool QPinchGesture::event(QEvent *event)
 
 bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event)
 {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
     Q_D(QPinchGesture);
     if (receiver->isWidgetType() && event->type() == QEvent::NativeGesture) {
         QNativeGestureEvent *ev = static_cast<QNativeGestureEvent*>(event);
+#if defined(Q_WS_WIN)
         QApplicationPrivate *qAppPriv = QApplicationPrivate::instance();
         QApplicationPrivate::WidgetStandardGesturesMap::iterator it;
         it = qAppPriv->widgetGestures.find(static_cast<QWidget*>(receiver));
@@ -340,7 +339,9 @@ bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event)
             return false;
         if (this != it.value().pinch)
             return false;
+#endif
         Qt::GestureState nextState = Qt::NoGesture;
+
         switch(ev->gestureType) {
         case QNativeGestureEvent::GestureBegin:
             // next we might receive the first gesture update event, so we
@@ -349,15 +350,22 @@ bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event)
             d->scaleFactor = d->lastScaleFactor = 1;
             d->rotationAngle = d->lastRotationAngle = 0;
             d->startCenterPoint = d->centerPoint = d->lastCenterPoint = QPoint();
+#if defined(Q_WS_WIN)
             d->initialDistance = 0;
+#endif
             return false;
         case QNativeGestureEvent::Rotate:
             d->lastRotationAngle = d->rotationAngle;
+#if defined(Q_WS_WIN)
             d->rotationAngle = -1 * GID_ROTATE_ANGLE_FROM_ARGUMENT(ev->argument);
+#elif defined(Q_WS_MAC)
+            d->rotationAngle = ev->percentage;
+#endif
             nextState = Qt::GestureUpdated;
             event->accept();
             break;
         case QNativeGestureEvent::Zoom:
+#if defined(Q_WS_WIN)
             if (d->initialDistance != 0) {
                 d->lastScaleFactor = d->scaleFactor;
                 int distance = int(qint64(ev->argument));
@@ -365,6 +373,10 @@ bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event)
             } else {
                 d->initialDistance = int(qint64(ev->argument));
             }
+#elif defined(Q_WS_MAC)
+            d->lastScaleFactor = d->scaleFactor;
+            d->scaleFactor = ev->percentage;
+#endif
             nextState = Qt::GestureUpdated;
             event->accept();
             break;
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 7596802..a9b8970 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -1238,4 +1238,12 @@ void qt_mac_menu_collapseSeparators(void */*NSMenu **/ theMenu, bool collapse)
     }
 }
 
+#ifdef QT_MAC_USE_COCOA
+void qt_cocoaChangeOverrideCursor(const QCursor &cursor)
+{
+    QMacCocoaAutoReleasePool pool;
+    [static_cast<NSCursor *>(qt_mac_nsCursorForQCursor(cursor)) set];
+}
+#endif
+
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
index 24d7096..932abef 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -133,6 +133,7 @@ bool qt_mac_checkForNativeSizeGrip(const QWidget *widget);
 void qt_dispatchTabletProximityEvent(void * /*NSEvent * */ tabletEvent);
 #ifdef QT_MAC_USE_COCOA
 bool qt_dispatchKeyEventWithCocoa(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEvent);
+void qt_cocoaChangeOverrideCursor(const QCursor &cursor);
 #endif
 void qt_mac_menu_collapseSeparators(void * /*NSMenu */ menu, bool collapse);
 bool qt_dispatchKeyEvent(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEvent);
diff --git a/src/gui/kernel/qt_mac.cpp b/src/gui/kernel/qt_mac.cpp
index 642aa5c..bef3449 100644
--- a/src/gui/kernel/qt_mac.cpp
+++ b/src/gui/kernel/qt_mac.cpp
@@ -1,11 +1,11 @@
 /****************************************************************************
- **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of the QtGui module of the Qt Toolkit.
- **
- ** $QT_BEGIN_LICENSE:LGPL$
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
@@ -36,11 +36,8 @@
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
- **
- ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- **
- ****************************************************************************/
+**
+****************************************************************************/
 
 #include <private/qt_mac_p.h>
 #include <private/qpixmap_mac_p.h>
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 3dd2e65..4bd7222 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -1055,7 +1055,7 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
                     handled_event = false;
                     break;
                 }
-                qNGEvent.gestureType = QNativeGestureEvent::Zoom;
+                qNGEvent.gestureType = QNativeGestureEvent::Rotate;
                 qNGEvent.percentage = float(amount);
                 break; }
             case kEventGestureSwipe: {
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index c74368c..3d618fe 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -2064,8 +2064,6 @@ void QWidgetPrivate::winSetupGestures()
     Q_Q(QWidget);
     if (!q)
         return;
-    q->setAttribute(Qt::WA_DontCreateNativeAncestors);
-    q->setAttribute(Qt::WA_NativeWindow);
     if (!q->isVisible())
         return;
     QApplicationPrivate *qAppPriv = QApplicationPrivate::instance();
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 8679e15..72bb164 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -2368,7 +2368,7 @@ void QRasterPaintEngine::drawPixmap(const QPointF &pos, const QPixmap &pixmap)
 #endif
 
     if (pixmap.data->classId() == QPixmapData::RasterClass) {
-        const QImage &image = ((QRasterPixmapData *) pixmap.data)->image;
+        const QImage &image = static_cast<QRasterPixmapData *>(pixmap.data.data())->image;
         if (image.depth() == 1) {
             Q_D(QRasterPaintEngine);
             QRasterPaintEngineState *s = state();
@@ -2406,7 +2406,7 @@ void QRasterPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap, cons
 #endif
 
     if (pixmap.data->classId() == QPixmapData::RasterClass) {
-        const QImage &image = ((QRasterPixmapData *) pixmap.data)->image;
+        const QImage &image = static_cast<QRasterPixmapData *>(pixmap.data.data())->image;
         if (image.depth() == 1) {
             Q_D(QRasterPaintEngine);
             QRasterPaintEngineState *s = state();
@@ -2716,7 +2716,7 @@ void QRasterPaintEngine::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap,
     QImage image;
 
     if (pixmap.data->classId() == QPixmapData::RasterClass) {
-        image = ((QRasterPixmapData *) pixmap.data)->image;
+        image = static_cast<QRasterPixmapData *>(pixmap.data.data())->image;
     } else {
         image = pixmap.toImage();
     }
diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp
index 51f40e3..6a5ea49 100644
--- a/src/gui/styles/gtksymbols.cpp
+++ b/src/gui/styles/gtksymbols.cpp
@@ -642,7 +642,7 @@ GtkStyle* QGtk::gtkStyle(const QString &path)
     return 0;
 }
 
-static void update_toolbar_style(GtkWidget *gtkToolBar, GParamSpec *pspec, gpointer user_data)
+static void update_toolbar_style(GtkWidget *gtkToolBar, GParamSpec *, gpointer)
 {
     GtkToolbarStyle toolbar_style = GTK_TOOLBAR_ICONS;
     g_object_get(gtkToolBar, "toolbar-style", &toolbar_style, NULL);
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 96905d0..3443a64 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -217,7 +217,6 @@ QFontPrivate::QFontPrivate()
       rawMode(false), underline(false), overline(false), strikeOut(false), kerning(true),
       capital(0), letterSpacingIsAbsolute(false), scFont(0)
 {
-    ref = 1;
 #ifdef Q_WS_X11
     if (QX11Info::display())
         screen = QX11Info::appScreen();
@@ -237,7 +236,6 @@ QFontPrivate::QFontPrivate(const QFontPrivate &other)
       letterSpacing(other.letterSpacing), wordSpacing(other.wordSpacing),
       scFont(other.scFont)
 {
-    ref = 1;
 #ifdef Q_WS_WIN
     hdc = other.hdc;
 #endif
@@ -721,11 +719,11 @@ QFont::QFont(const QFont &font, QPaintDevice *pd)
     const int screen = 0;
 #endif
     if (font.d->dpi != dpi || font.d->screen != screen ) {
-        d.reset(new QFontPrivate(*font.d));
+        d = new QFontPrivate(*font.d);
         d->dpi = dpi;
         d->screen = screen;
     } else {
-        d.assign(font.d.data());
+        d = font.d.data();
     }
 #ifdef Q_WS_WIN
     if (pd->devType() == QInternal::Printer && pd->getDC())
@@ -737,9 +735,8 @@ QFont::QFont(const QFont &font, QPaintDevice *pd)
   \internal
 */
 QFont::QFont(QFontPrivate *data)
-    : resolve_mask(QFont::AllPropertiesResolved)
+    : d(data), resolve_mask(QFont::AllPropertiesResolved)
 {
-    d.assign(data);
 }
 
 /*! \internal
@@ -766,9 +763,8 @@ void QFont::detach()
     \sa QApplication::setFont(), QApplication::font()
 */
 QFont::QFont()
-    :resolve_mask(0)
+    : d(QApplication::font().d.data()), resolve_mask(0)
 {
-    d.assign(QApplication::font().d.data());
 }
 
 /*!
@@ -790,10 +786,8 @@ QFont::QFont()
     setStyleHint() QApplication::font()
 */
 QFont::QFont(const QString &family, int pointSize, int weight, bool italic)
+    : d(new QFontPrivate()), resolve_mask(QFont::FamilyResolved)
 {
-    d.reset(new QFontPrivate());
-    resolve_mask = QFont::FamilyResolved;
-
     if (pointSize <= 0) {
 #ifdef Q_OS_SYMBIAN
         pointSize = 7;
@@ -821,9 +815,8 @@ QFont::QFont(const QString &family, int pointSize, int weight, bool italic)
     Constructs a font that is a copy of \a font.
 */
 QFont::QFont(const QFont &font)
+    : d(font.d.data()), resolve_mask(font.resolve_mask)
 {
-    d.assign(font.d.data());
-    resolve_mask = font.resolve_mask;
 }
 
 /*!
@@ -838,7 +831,7 @@ QFont::~QFont()
 */
 QFont &QFont::operator=(const QFont &font)
 {
-    d.assign(font.d.data());
+    d = font.d.data();
     resolve_mask = font.resolve_mask;
     return *this;
 }
@@ -2197,8 +2190,7 @@ QDataStream &operator<<(QDataStream &s, const QFont &font)
 */
 QDataStream &operator>>(QDataStream &s, QFont &font)
 {
-    font.d.assign(0);
-    font.d.reset(new QFontPrivate);
+    font.d = new QFontPrivate;
     font.resolve_mask = QFont::AllPropertiesResolved;
 
     quint8 styleHint, styleStrategy = QFont::PreferDefault, charSet, weight, bits;
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index 10ec062..e91e017 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -44,7 +44,7 @@
 
 #include <QtGui/qwindowdefs.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qscopedpointer.h>
+#include <QtCore/qsharedpointer.h>
 
 #if defined(Q_WS_X11) || defined(Q_WS_QWS)
 typedef struct FT_FaceRec_* FT_Face;
@@ -313,7 +313,7 @@ private:
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QFont &);
 #endif
 
-    QScopedSharedPointer<QFontPrivate> d;
+    QExplicitlySharedDataPointer<QFontPrivate> d;
     uint resolve_mask;
 };
 
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp
index 133d73c..5a9c7e1 100644
--- a/src/gui/widgets/qdatetimeedit.cpp
+++ b/src/gui/widgets/qdatetimeedit.cpp
@@ -1,4 +1,4 @@
-/****************************************************************************)
+/****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 7db800b..15e6791 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -1032,6 +1032,8 @@ void QMainWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget *dockwidget
     Restores the state of \a dockwidget if it is created after the call
     to restoreState(). Returns true if the state was restored; otherwise
     returns false.
+
+    \sa restoreState(), saveState()
 */
 
 bool QMainWindow::restoreDockWidget(QDockWidget *dockwidget)
@@ -1163,6 +1165,11 @@ Qt::DockWidgetArea QMainWindow::dockWidgetArea(QDockWidget *dockwidget) const
     To restore the saved state, pass the return value and \a version
     number to restoreState().
 
+    To save the geometry when the window closes, you can
+    implement a close event like this:
+
+    \snippet doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp 0
+
     \sa restoreState(), QWidget::saveGeometry(), QWidget::restoreGeometry()
 */
 QByteArray QMainWindow::saveState(int version) const
@@ -1182,7 +1189,13 @@ QByteArray QMainWindow::saveState(int version) const
     unchanged, and this function returns \c false; otherwise, the state
     is restored, and this function returns \c true.
 
-    \sa saveState(), QWidget::saveGeometry(), QWidget::restoreGeometry()
+    To restore geometry saved using QSettings, you can use code like
+    this:
+
+    \snippet doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp 1
+
+    \sa saveState(), QWidget::saveGeometry(),
+    QWidget::restoreGeometry(), restoreDockWidget()
 */
 bool QMainWindow::restoreState(const QByteArray &state, int version)
 {
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index bf4109a..7b5a6e2 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -65,19 +65,37 @@
 
 QT_BEGIN_NAMESPACE
 
-const int QHttpNetworkConnectionPrivate::channelCount = 6;
+const int QHttpNetworkConnectionPrivate::defaultChannelCount = 6;
+
+// the maximum amount of requests that might be pipelined into a socket
+// from what was suggested, 3 seems to be OK
+const int QHttpNetworkConnectionPrivate::defaultPipelineLength = 3;
+
 
 QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt)
 : hostName(hostName), port(port), encrypt(encrypt),
+  channelCount(defaultChannelCount),
   pendingAuthSignal(false), pendingProxyAuthSignal(false)
 #ifndef QT_NO_NETWORKPROXY
   , networkProxy(QNetworkProxy::NoProxy)
 #endif
+{
+    channels = new QHttpNetworkConnectionChannel[channelCount];
+}
 
+QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(quint16 channelCount, const QString &hostName, quint16 port, bool encrypt)
+: hostName(hostName), port(port), encrypt(encrypt),
+  channelCount(channelCount),
+  pendingAuthSignal(false), pendingProxyAuthSignal(false)
+#ifndef QT_NO_NETWORKPROXY
+  , networkProxy(QNetworkProxy::NoProxy)
+#endif
 {
     channels = new QHttpNetworkConnectionChannel[channelCount];
 }
 
+
+
 QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate()
 {
     for (int i = 0; i < channelCount; ++i) {
@@ -141,17 +159,6 @@ qint64 QHttpNetworkConnectionPrivate::uncompressedBytesAvailableNextBlock(const
     return reply.d_func()->responseData.sizeNextBlock();
 }
 
-qint64 QHttpNetworkConnectionPrivate::compressedBytesAvailable(const QHttpNetworkReply &reply) const
-{
-    return reply.d_func()->compressedData.size();
-}
-
-void QHttpNetworkConnectionPrivate::eraseData(QHttpNetworkReply *reply)
-{
-    reply->d_func()->compressedData.clear();
-    reply->d_func()->responseData.clear();
-}
-
 void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair)
 {
     QHttpNetworkRequest &request = messagePair.first;
@@ -225,231 +232,8 @@ void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair)
     reply->d_func()->requestIsPrepared = true;
 }
 
-bool QHttpNetworkConnectionPrivate::ensureConnection(QAbstractSocket *socket)
-{
-    // make sure that this socket is in a connected state, if not initiate
-    // connection to the host.
-    if (socket->state() != QAbstractSocket::ConnectedState) {
-        // connect to the host if not already connected.
-        int index = indexOf(socket);
-        // resend this request after we receive the disconnected signal
-        if (socket->state() == QAbstractSocket::ClosingState) {
-            channels[index].resendCurrent = true;
-            return false;
-        }
-        channels[index].state = QHttpNetworkConnectionChannel::ConnectingState;
-        channels[index].pendingEncrypt = encrypt;
-
-        // This workaround is needed since we use QAuthenticator for NTLM authentication. The "phase == Done"
-        // is the usual criteria for emitting authentication signals. The "phase" is set to "Done" when the
-        // last header for Authorization is generated by the QAuthenticator. Basic & Digest logic does not
-        // check the "phase" for generating the Authorization header. NTLM authentication is a two stage
-        // process & needs the "phase". To make sure the QAuthenticator uses the current username/password
-        // the phase is reset to Start.
-        QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(channels[index].authenticator);
-        if (priv && priv->phase == QAuthenticatorPrivate::Done)
-            priv->phase = QAuthenticatorPrivate::Start;
-        priv = QAuthenticatorPrivate::getPrivate(channels[index].proxyAuthenticator);
-        if (priv && priv->phase == QAuthenticatorPrivate::Done)
-            priv->phase = QAuthenticatorPrivate::Start;
-
-        QString connectHost = hostName;
-        qint16 connectPort = port;
-
-#ifndef QT_NO_NETWORKPROXY
-        // HTTPS always use transparent proxy.
-        if (networkProxy.type() != QNetworkProxy::NoProxy && !encrypt) {
-            connectHost = networkProxy.hostName();
-            connectPort = networkProxy.port();
-        }
-#endif
-        if (encrypt) {
-#ifndef QT_NO_OPENSSL
-            QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
-            sslSocket->connectToHostEncrypted(connectHost, connectPort);
-            if (channels[index].ignoreAllSslErrors)
-                sslSocket->ignoreSslErrors();
-            sslSocket->ignoreSslErrors(channels[index].ignoreSslErrorsList);
-#else
-            emitReplyError(socket, channels[index].reply, QNetworkReply::ProtocolUnknownError);
-#endif
-        } else {
-            socket->connectToHost(connectHost, connectPort);
-        }
-        return false;
-    }
-    return true;
-}
-
 
-bool QHttpNetworkConnectionPrivate::sendRequest(QAbstractSocket *socket)
-{
-    Q_Q(QHttpNetworkConnection);
 
-    int i = indexOf(socket);
-    switch (channels[i].state) {
-    case QHttpNetworkConnectionChannel::IdleState: { // write the header
-        if (!ensureConnection(socket)) {
-            // wait for the connection (and encryption) to be done
-            // sendRequest will be called again from either
-            // _q_connected or _q_encrypted
-            return false;
-        }
-        channels[i].written = 0; // excluding the header
-        channels[i].bytesTotal = 0;
-        if (channels[i].reply) {
-            channels[i].reply->d_func()->clear();
-            channels[i].reply->d_func()->connection = q;
-            channels[i].reply->d_func()->autoDecompress = channels[i].request.d->autoDecompress;
-        }
-        channels[i].state = QHttpNetworkConnectionChannel::WritingState;
-        channels[i].pendingEncrypt = false;
-        // if the url contains authentication parameters, use the new ones
-        // both channels will use the new authentication parameters
-        if (!channels[i].request.url().userInfo().isEmpty()) {
-            QUrl url = channels[i].request.url();
-            QAuthenticator &auth = channels[i].authenticator;
-            if (url.userName() != auth.user()
-                || (!url.password().isEmpty() && url.password() != auth.password())) {
-                auth.setUser(url.userName());
-                auth.setPassword(url.password());
-                copyCredentials(i, &auth, false);
-            }
-            // clear the userinfo,  since we use the same request for resending
-            // userinfo in url can conflict with the one in the authenticator
-            url.setUserInfo(QString());
-            channels[i].request.setUrl(url);
-        }
-        createAuthorization(socket, channels[i].request);
-#ifndef QT_NO_NETWORKPROXY
-        QByteArray header = QHttpNetworkRequestPrivate::header(channels[i].request,
-            (networkProxy.type() != QNetworkProxy::NoProxy));
-#else
-        QByteArray header = QHttpNetworkRequestPrivate::header(channels[i].request,
-            false);
-#endif
-        socket->write(header);
-        QNonContiguousByteDevice* uploadByteDevice = channels[i].request.uploadByteDevice();
-        if (uploadByteDevice) {
-            // connect the signals so this function gets called again
-            QObject::connect(uploadByteDevice, SIGNAL(readyRead()), &channels[i], SLOT(_q_uploadDataReadyRead()));
-
-            channels[i].bytesTotal = channels[i].request.contentLength();
-        } else {
-            socket->flush(); // ### Remove this when pipelining is implemented. We want less TCP packets!
-            channels[i].state = QHttpNetworkConnectionChannel::WaitingState;
-            break;
-        }
-        // write the initial chunk together with the headers
-        // fall through
-    }
-    case QHttpNetworkConnectionChannel::WritingState:
-    {
-        // write the data
-        QNonContiguousByteDevice* uploadByteDevice = channels[i].request.uploadByteDevice();
-        if (!uploadByteDevice || channels[i].bytesTotal == channels[i].written) {
-            if (uploadByteDevice)
-                emit channels[i].reply->dataSendProgress(channels[i].written, channels[i].bytesTotal);
-            channels[i].state = QHttpNetworkConnectionChannel::WaitingState; // now wait for response
-            sendRequest(socket);
-            break;
-        }
-
-        // only feed the QTcpSocket buffer when there is less than 32 kB in it
-        const qint64 socketBufferFill = 32*1024;
-        const qint64 socketWriteMaxSize = 16*1024;
-
-
-#ifndef QT_NO_OPENSSL
-        QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
-        // if it is really an ssl socket, check more than just bytesToWrite()
-        while ((socket->bytesToWrite() + (sslSocket ? sslSocket->encryptedBytesToWrite() : 0))
-                <= socketBufferFill && channels[i].bytesTotal != channels[i].written)
-#else
-        while (socket->bytesToWrite() <= socketBufferFill
-               && channels[i].bytesTotal != channels[i].written)
-#endif
-        {
-            // get pointer to upload data
-            qint64 currentReadSize;
-            qint64 desiredReadSize = qMin(socketWriteMaxSize, channels[i].bytesTotal - channels[i].written);
-            const char *readPointer = uploadByteDevice->readPointer(desiredReadSize, currentReadSize);
-
-            if (currentReadSize == -1) {
-                // premature eof happened
-                emitReplyError(socket, channels[i].reply, QNetworkReply::UnknownNetworkError);
-                return false;
-                break;
-            } else if (readPointer == 0 || currentReadSize == 0) {
-                // nothing to read currently, break the loop
-                break;
-            } else {
-                qint64 currentWriteSize = socket->write(readPointer, currentReadSize);
-                if (currentWriteSize == -1 || currentWriteSize != currentReadSize) {
-                    // socket broke down
-                    emitReplyError(socket, channels[i].reply, QNetworkReply::UnknownNetworkError);
-                    return false;
-                } else {
-                    channels[i].written += currentWriteSize;
-                    uploadByteDevice->advanceReadPointer(currentWriteSize);
-
-                    emit channels[i].reply->dataSendProgress(channels[i].written, channels[i].bytesTotal);
-
-                    if (channels[i].written == channels[i].bytesTotal) {
-                        // make sure this function is called once again
-                        channels[i].state = QHttpNetworkConnectionChannel::WaitingState;
-                        sendRequest(socket);
-                        break;
-                    }
-                }
-            }
-        }
-        break;
-    }
-
-    case QHttpNetworkConnectionChannel::WaitingState:
-    {
-        QNonContiguousByteDevice* uploadByteDevice = channels[i].request.uploadByteDevice();
-        if (uploadByteDevice) {
-            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
-        // case receiveReply had been called before but ignored the server reply
-        receiveReply(socket, channels[i].reply);
-        break;
-    }
-    case QHttpNetworkConnectionChannel::ReadingState:
-    case QHttpNetworkConnectionChannel::Wait4AuthState:
-        // ignore _q_bytesWritten in these states
-        // fall through
-    default:
-        break;
-    }
-    return true;
-}
-
-bool QHttpNetworkConnectionPrivate::shouldEmitSignals(QHttpNetworkReply *reply)
-{
-    // for 401 & 407 don't emit the data signals. Content along with these
-    // responses are send only if the authentication fails.
-    return (reply && reply->d_func()->statusCode != 401 && reply->d_func()->statusCode != 407);
-}
-
-bool QHttpNetworkConnectionPrivate::expectContent(QHttpNetworkReply *reply)
-{
-    // check whether we can expect content after the headers (rfc 2616, sec4.4)
-    if (!reply)
-        return false;
-    if ((reply->d_func()->statusCode >= 100 && reply->d_func()->statusCode < 200)
-        || reply->d_func()->statusCode == 204 || reply->d_func()->statusCode == 304)
-        return false;
-    if (reply->d_func()->request.operation() == QHttpNetworkRequest::Head)
-        return !shouldEmitSignals(reply);
-    if (reply->d_func()->contentLength() == 0)
-        return false;
-    return true;
-}
 
 void QHttpNetworkConnectionPrivate::emitReplyError(QAbstractSocket *socket,
                                                    QHttpNetworkReply *reply,
@@ -462,271 +246,13 @@ void QHttpNetworkConnectionPrivate::emitReplyError(QAbstractSocket *socket,
         emit reply->finishedWithError(errorCode, reply->d_func()->errorString);
         int i = indexOf(socket);
         // remove the corrupt data if any
-        eraseData(channels[i].reply);
-        closeChannel(i);
+        reply->d_func()->eraseData();
+        channels[i].close();
         // send the next request
         QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
     }
 }
 
-#ifndef QT_NO_COMPRESS
-bool QHttpNetworkConnectionPrivate::expand(QAbstractSocket *socket, QHttpNetworkReply *reply, bool dataComplete)
-{
-    Q_ASSERT(socket);
-    Q_ASSERT(reply);
-
-    qint64 total = compressedBytesAvailable(*reply);
-    if (total >= CHUNK || dataComplete) {
-        int i = indexOf(socket);
-         // uncompress the data
-        QByteArray content, inflated;
-        content = reply->d_func()->compressedData;
-        reply->d_func()->compressedData.clear();
-
-        int ret = Z_OK;
-        if (content.size())
-            ret = reply->d_func()->gunzipBodyPartially(content, inflated);
-        int retCheck = (dataComplete) ? Z_STREAM_END : Z_OK;
-        if (ret >= retCheck) {
-            if (inflated.size()) {
-                reply->d_func()->totalProgress += inflated.size();
-                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!
-                    emit reply->readyRead();
-                    // make sure that the reply is valid
-                    if (channels[i].reply != reply)
-                        return true;
-                    emit reply->dataReadProgress(reply->d_func()->totalProgress, 0);
-                    // make sure that the reply is valid
-                    if (channels[i].reply != reply)
-                        return true;
-
-                }
-            }
-        } else {
-            emitReplyError(socket, reply, QNetworkReply::ProtocolFailure);
-            return false;
-        }
-    }
-    return true;
-}
-#endif
-
-void QHttpNetworkConnectionPrivate::receiveReply(QAbstractSocket *socket, QHttpNetworkReply *reply)
-{
-    Q_ASSERT(socket);
-
-    Q_Q(QHttpNetworkConnection);
-    qint64 bytes = 0;
-    QAbstractSocket::SocketState state = socket->state();
-    int i = indexOf(socket);
-
-    // connection might be closed to signal the end of data
-    if (state == QAbstractSocket::UnconnectedState) {
-        if (!socket->bytesAvailable()) {
-            if (reply && reply->d_func()->state == QHttpNetworkReplyPrivate::ReadingDataState) {
-                reply->d_func()->state = QHttpNetworkReplyPrivate::AllDoneState;
-                channels[i].state = QHttpNetworkConnectionChannel::IdleState;
-                allDone(socket, reply);
-            } else {
-                // try to reconnect/resend before sending an error.
-                if (channels[i].reconnectAttempts-- > 0) {
-                    resendCurrentRequest(socket);
-                } else if (reply) {
-                    reply->d_func()->errorString = errorDetail(QNetworkReply::RemoteHostClosedError, socket);
-                    emit reply->finishedWithError(QNetworkReply::RemoteHostClosedError, reply->d_func()->errorString);
-                    QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
-                }
-            }
-        }
-    }
-
-    // read loop for the response
-    while (socket->bytesAvailable()) {
-        QHttpNetworkReplyPrivate::ReplyState state = reply ? reply->d_func()->state : QHttpNetworkReplyPrivate::AllDoneState;
-        switch (state) {
-        case QHttpNetworkReplyPrivate::NothingDoneState:
-        case QHttpNetworkReplyPrivate::ReadingStatusState: {
-            qint64 statusBytes = reply->d_func()->readStatus(socket);
-            if (statusBytes == -1) {
-                // error reading the status, close the socket and emit error
-                socket->close();
-                reply->d_func()->errorString = errorDetail(QNetworkReply::ProtocolFailure, socket);
-                emit reply->finishedWithError(QNetworkReply::ProtocolFailure, reply->d_func()->errorString);
-                QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
-                break;
-            }
-            bytes += statusBytes;
-            channels[i].lastStatus = reply->d_func()->statusCode;
-            break;
-        }
-        case QHttpNetworkReplyPrivate::ReadingHeaderState:
-            bytes += reply->d_func()->readHeader(socket);
-            if (reply->d_func()->state == QHttpNetworkReplyPrivate::ReadingDataState) {
-                if (reply->d_func()->isGzipped() && reply->d_func()->autoDecompress) {
-                    // remove the Content-Length from header
-                    reply->d_func()->removeAutoDecompressHeader();
-                } else {
-                    reply->d_func()->autoDecompress = false;
-                }
-                if (reply && reply->d_func()->statusCode == 100) {
-                    reply->d_func()->state = QHttpNetworkReplyPrivate::ReadingStatusState;
-                    break; // ignore
-                }
-                if (shouldEmitSignals(reply))
-                    emit reply->headerChanged();
-                if (!expectContent(reply)) {
-                    reply->d_func()->state = QHttpNetworkReplyPrivate::AllDoneState;
-                    channels[i].state = QHttpNetworkConnectionChannel::IdleState;
-                    allDone(socket, reply);
-                    return;
-                }
-            }
-            break;
-        case QHttpNetworkReplyPrivate::ReadingDataState: {
-            if (!reply->d_func()->isChunked() && !reply->d_func()->autoDecompress
-                && reply->d_func()->bodyLength > 0) {
-                // bulk files like images should fulfill these properties and
-                // we can therefore save on memory copying
-                bytes = reply->d_func()->readBodyFast(socket, &reply->d_func()->responseData);
-                reply->d_func()->totalProgress += bytes;
-                if (shouldEmitSignals(reply)) {
-                    emit reply->readyRead();
-                    // make sure that the reply is valid
-                    if (channels[i].reply != reply)
-                        return;
-                    emit reply->dataReadProgress(reply->d_func()->totalProgress, reply->d_func()->bodyLength);
-                    // make sure that the reply is valid
-                    if (channels[i].reply != reply)
-                        return;
-                }
-            }
-            else
-            {
-                // use the traditional slower reading (for compressed encoding, chunked encoding,
-                // no content-length etc)
-                QByteDataBuffer byteDatas;
-                bytes = reply->d_func()->readBody(socket, &byteDatas);
-                if (bytes) {
-                    if (reply->d_func()->autoDecompress)
-                        reply->d_func()->appendCompressedReplyData(byteDatas);
-                    else
-                        reply->d_func()->appendUncompressedReplyData(byteDatas);
-
-                    if (!reply->d_func()->autoDecompress) {
-                        reply->d_func()->totalProgress += bytes;
-                        if (shouldEmitSignals(reply)) {
-                            // important: At the point of this readyRead(), the byteDatas list must be empty,
-                            // else implicit sharing will trigger memcpy when the user is reading data!
-                            emit reply->readyRead();
-                            // make sure that the reply is valid
-                            if (channels[i].reply != reply)
-                                return;
-                            emit reply->dataReadProgress(reply->d_func()->totalProgress, reply->d_func()->bodyLength);
-                            // make sure that the reply is valid
-                            if (channels[i].reply != reply)
-                                return;
-                        }
-                    }
-#ifndef QT_NO_COMPRESS
-                    else if (!expand(socket, reply, false)) { // expand a chunk if possible
-                        return; // ### expand failed
-                    }
-#endif
-                }
-            }
-            if (reply->d_func()->state == QHttpNetworkReplyPrivate::ReadingDataState)
-                break;
-            // everything done, fall through
-            }
-      case QHttpNetworkReplyPrivate::AllDoneState:
-            channels[i].state = QHttpNetworkConnectionChannel::IdleState;
-            allDone(socket, reply);
-            break;
-        default:
-            break;
-        }
-    }
-}
-
-void QHttpNetworkConnectionPrivate::allDone(QAbstractSocket *socket, QHttpNetworkReply *reply)
-{
-#ifndef QT_NO_COMPRESS
-    // expand the whole data.
-    if (expectContent(reply) && reply->d_func()->autoDecompress && !reply->d_func()->streamEnd)
-        expand(socket, reply, true); // ### if expand returns false, its an error
-#endif
-    // while handling 401 & 407, we might reset the status code, so save this.
-    bool emitFinished = shouldEmitSignals(reply);
-    handleStatus(socket, reply);
-    // ### at this point there should be no more data on the socket
-    // close if server requested
-    int i = indexOf(socket);
-    if (reply->d_func()->connectionCloseEnabled())
-        closeChannel(i);
-    // queue the finished signal, this is required since we might send new requests from
-    // slot connected to it. The socket will not fire readyRead signal, if we are already
-    // in the slot connected to readyRead
-    if (emitFinished)
-        QMetaObject::invokeMethod(reply, "finished", Qt::QueuedConnection);
-    // reset the reconnection attempts after we receive a complete reply.
-    // in case of failures, each channel will attempt two reconnects before emitting error.
-    channels[i].reconnectAttempts = 2;
-}
-
-void QHttpNetworkConnectionPrivate::handleStatus(QAbstractSocket *socket, QHttpNetworkReply *reply)
-{
-    Q_ASSERT(socket);
-    Q_ASSERT(reply);
-
-    Q_Q(QHttpNetworkConnection);
-
-    int statusCode = reply->statusCode();
-    bool resend = false;
-
-    switch (statusCode) {
-    case 401:
-    case 407:
-        if (handleAuthenticateChallenge(socket, reply, (statusCode == 407), resend)) {
-            if (resend) {
-                int i = indexOf(socket);
-
-                QNonContiguousByteDevice* uploadByteDevice = channels[i].request.uploadByteDevice();
-                if (uploadByteDevice) {
-                    if (uploadByteDevice->reset()) {
-                        channels[i].written = 0;
-                    } else {
-                        emitReplyError(socket, reply, QNetworkReply::ContentReSendError);
-                        break;
-                    }
-                }
-
-                eraseData(reply);
-
-                // also use async _q_startNextRequest so we dont break with closed
-                // proxy or server connections..
-                channels[i].resendCurrent = true;
-                QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
-            }
-        } else {
-            int i = indexOf(socket);
-            emit channels[i].reply->headerChanged();
-            emit channels[i].reply->readyRead();
-            QNetworkReply::NetworkError errorCode = (statusCode == 407)
-                ? QNetworkReply::ProxyAuthenticationRequiredError
-                : QNetworkReply::AuthenticationRequiredError;
-            reply->d_func()->errorString = errorDetail(errorCode, socket);
-            emit q->error(errorCode, reply->d_func()->errorString);
-            emit channels[i].reply->finished();
-        }
-        break;
-    default:
-        QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
-    }
-}
-
 void QHttpNetworkConnectionPrivate::copyCredentials(int fromChannel, QAuthenticator *auth, bool isProxy)
 {
     Q_ASSERT(auth);
@@ -749,6 +275,7 @@ void QHttpNetworkConnectionPrivate::copyCredentials(int fromChannel, QAuthentica
 }
 
 
+// handles the authentication for one channel and eventually re-starts the other channels
 bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket *socket, QHttpNetworkReply *reply,
                                                                 bool isProxy, bool &resend)
 {
@@ -788,8 +315,8 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
         if (priv->phase == QAuthenticatorPrivate::Done) {
             if ((isProxy && pendingProxyAuthSignal) ||(!isProxy && pendingAuthSignal)) {
                 // drop the request
-                eraseData(channels[i].reply);
-                closeChannel(i);
+                reply->d_func()->eraseData();
+                channels[i].close();
                 channels[i].lastStatus = 0;
                 channels[i].state =  QHttpNetworkConnectionChannel::Wait4AuthState;
                 return false;
@@ -894,7 +421,24 @@ QHttpNetworkReply* QHttpNetworkConnectionPrivate::queueRequest(const QHttpNetwor
     return reply;
 }
 
-void QHttpNetworkConnectionPrivate::unqueueAndSendRequest(QAbstractSocket *socket)
+void QHttpNetworkConnectionPrivate::requeueRequest(const HttpMessagePair &pair)
+{
+    Q_Q(QHttpNetworkConnection);
+
+    QHttpNetworkRequest request = pair.first;
+    switch (request.priority()) {
+    case QHttpNetworkRequest::HighPriority:
+        highPriorityQueue.prepend(pair);
+        break;
+    case QHttpNetworkRequest::NormalPriority:
+    case QHttpNetworkRequest::LowPriority:
+        lowPriorityQueue.prepend(pair);
+        break;
+    }
+    QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
+}
+
+void QHttpNetworkConnectionPrivate::dequeueAndSendRequest(QAbstractSocket *socket)
 {
     Q_ASSERT(socket);
 
@@ -908,8 +452,9 @@ void QHttpNetworkConnectionPrivate::unqueueAndSendRequest(QAbstractSocket *socke
 
             channels[i].request = messagePair.first;
             channels[i].reply = messagePair.second;
-            sendRequest(socket);
+            // remove before sendRequest! else we might pipeline the same request again
             highPriorityQueue.removeAt(j);
+            channels[i].sendRequest();
             return;
         }
     }
@@ -921,28 +466,113 @@ void QHttpNetworkConnectionPrivate::unqueueAndSendRequest(QAbstractSocket *socke
                 prepareRequest(messagePair);
             channels[i].request = messagePair.first;
             channels[i].reply = messagePair.second;
-            sendRequest(socket);
+            // remove before sendRequest! else we might pipeline the same request again
             lowPriorityQueue.removeAt(j);
+            channels[i].sendRequest();
             return;
         }
     }
 }
 
-void QHttpNetworkConnectionPrivate::closeChannel(int channel)
+// this is called from _q_startNextRequest and when a request has been sent down a socket from the channel
+void QHttpNetworkConnectionPrivate::fillPipeline(QAbstractSocket *socket)
 {
-    channels[channel].close();
+    // return fast if there is nothing to pipeline
+    if (highPriorityQueue.isEmpty() && lowPriorityQueue.isEmpty())
+        return;
+
+    int i = indexOf(socket);
+
+    bool highPriorityQueueProcessingDone = false;
+    bool lowPriorityQueueProcessingDone = false;
+
+    while (!highPriorityQueueProcessingDone && !lowPriorityQueueProcessingDone) {
+        // this loop runs once per request we intend to pipeline in.
+
+        if (channels[i].pipeliningSupported != QHttpNetworkConnectionChannel::PipeliningProbablySupported)
+            return;
+
+        // the current request that is in must already support pipelining
+        if (!channels[i].request.isPipeliningAllowed())
+            return;
+
+        // the current request must be a idempotent (right now we only check GET)
+        if (channels[i].request.operation() != QHttpNetworkRequest::Get)
+            return;
+
+        // check if socket is connected
+        if (socket->state() != QAbstractSocket::ConnectedState)
+            return;
+
+        // check for resendCurrent
+        if (channels[i].resendCurrent)
+            return;
+
+        // we do not like authentication stuff
+        // ### make sure to be OK with this in later releases
+        if (!channels[i].authenticator.isNull() || !channels[i].authenticator.user().isEmpty())
+            return;
+        if (!channels[i].proxyAuthenticator.isNull() || !channels[i].proxyAuthenticator.user().isEmpty())
+            return;
+
+        // check for pipeline length
+        if (channels[i].alreadyPipelinedRequests.length() >= defaultPipelineLength)
+            return;
+
+        // must be in ReadingState or WaitingState
+        if (! (channels[i].state == QHttpNetworkConnectionChannel::WaitingState
+               || channels[i].state == QHttpNetworkConnectionChannel::ReadingState))
+            return;
+
+        highPriorityQueueProcessingDone = fillPipeline(highPriorityQueue, channels[i]);
+        // not finished with highPriorityQueue? then loop again
+        if (!highPriorityQueueProcessingDone)
+            continue;
+        // highPriorityQueue was processed, now deal with the lowPriorityQueue
+        lowPriorityQueueProcessingDone = fillPipeline(lowPriorityQueue, channels[i]);
+    }
 }
 
-void QHttpNetworkConnectionPrivate::resendCurrentRequest(QAbstractSocket *socket)
+// returns true when the processing of a queue has been done
+bool QHttpNetworkConnectionPrivate::fillPipeline(QList<HttpMessagePair> &queue, QHttpNetworkConnectionChannel &channel)
 {
-    Q_Q(QHttpNetworkConnection);
-    Q_ASSERT(socket);
-    int i = indexOf(socket);
-    closeChannel(i);
-    channels[i].resendCurrent = true;
-    QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
+    if (queue.isEmpty())
+        return true;
+
+    for (int i = 0; i < queue.length(); i++) {
+        HttpMessagePair messagePair = queue.at(i);
+        const QHttpNetworkRequest &request = messagePair.first;
+
+        // we currently do not support pipelining if HTTP authentication is used
+        if (!request.url().userInfo().isEmpty())
+            continue;
+
+        // take only GET requests
+        if (request.operation() != QHttpNetworkRequest::Get)
+            continue;
+
+        if (!request.isPipeliningAllowed())
+            continue;
+
+        // remove it from the queue
+        queue.takeAt(i);
+        // we modify the queue we iterate over here, but since we return from the function
+        // afterwards this is fine.
+
+        // actually send it
+        if (!messagePair.second->d_func()->requestIsPrepared)
+            prepareRequest(messagePair);
+        channel.pipelineInto(messagePair);
+
+        // return false because we processed something and need to process again
+        return false;
+    }
+
+    // return true, the queue has been processed and not changed
+    return true;
 }
 
+
 QString QHttpNetworkConnectionPrivate::errorDetail(QNetworkReply::NetworkError errorCode, QAbstractSocket* socket)
 {
     Q_ASSERT(socket);
@@ -994,7 +624,7 @@ void QHttpNetworkConnectionPrivate::removeReply(QHttpNetworkReply *reply)
         if (channels[i].reply == reply) {
             channels[i].reply = 0;
             if (reply->d_func()->connectionCloseEnabled())
-                closeChannel(i);
+                channels[i].close();
             QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
             return;
         }
@@ -1033,7 +663,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
             channels[i].resendCurrent = false;
             channels[i].state = QHttpNetworkConnectionChannel::IdleState;
             if (channels[i].reply)
-                sendRequest(channels[i].socket);
+                channels[i].sendRequest();
         }
     }
     QAbstractSocket *socket = 0;
@@ -1045,20 +675,33 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
             break;
         }
     }
-    if (!socket)
-        return; // this will be called after finishing current request.
-    unqueueAndSendRequest(socket);
+
+    // this socket is free,
+    if (socket)
+        dequeueAndSendRequest(socket);
+
+    // try to push more into all sockets
+    // ### FIXME we should move this to the beginning of the function
+    // as soon as QtWebkit is properly using the pipelining
+    // (e.g. not for XMLHttpRequest or the first page load)
+    // ### FIXME we should also divide the requests more even
+    // on the connected sockets
+    //tryToFillPipeline(socket);
+    // return fast if there is nothing to pipeline
+    if (highPriorityQueue.isEmpty() && lowPriorityQueue.isEmpty())
+        return;
+    for (int j = 0; j < channelCount; j++)
+        fillPipeline(channels[j].socket);
 }
 
 void QHttpNetworkConnectionPrivate::_q_restartAuthPendingRequests()
 {
     // send the request using the idle socket
     for (int i = 0 ; i < channelCount; ++i) {
-        QAbstractSocket *socket = channels[i].socket;
         if (channels[i].state ==  QHttpNetworkConnectionChannel::Wait4AuthState) {
             channels[i].state = QHttpNetworkConnectionChannel::IdleState;
             if (channels[i].reply)
-                sendRequest(socket);
+                channels[i].sendRequest();
         }
     }
 }
@@ -1071,6 +714,13 @@ QHttpNetworkConnection::QHttpNetworkConnection(const QString &hostName, quint16
     d->init();
 }
 
+QHttpNetworkConnection::QHttpNetworkConnection(quint16 connectionCount, const QString &hostName, quint16 port, bool encrypt, QObject *parent)
+     : QObject(*(new QHttpNetworkConnectionPrivate(connectionCount, hostName, port, encrypt)), parent)
+{
+    Q_D(QHttpNetworkConnection);
+    d->init();
+}
+
 QHttpNetworkConnection::~QHttpNetworkConnection()
 {
 }
@@ -1217,6 +867,19 @@ void QHttpNetworkConnection::ignoreSslErrors(const QList<QSslError> &errors, int
 
 #endif //QT_NO_OPENSSL
 
+#ifndef QT_NO_NETWORKPROXY
+// only called from QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired, not
+// from QHttpNetworkConnectionChannel::handleAuthenticationChallenge
+// e.g. it is for SOCKS proxies which require authentication.
+void QHttpNetworkConnectionPrivate::emitProxyAuthenticationRequired(const QHttpNetworkConnectionChannel *chan, const QNetworkProxy &proxy, QAuthenticator* auth)
+{
+    Q_Q(QHttpNetworkConnection);
+    emit q->proxyAuthenticationRequired(proxy, auth, q);
+    int i = indexOf(chan->socket);
+    copyCredentials(i, auth, true);
+}
+#endif
+
 
 QT_END_NAMESPACE
 
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 3a40e43..9d2c13f 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -89,6 +89,7 @@ class Q_AUTOTEST_EXPORT QHttpNetworkConnection : public QObject
 public:
 
     QHttpNetworkConnection(const QString &hostName, quint16 port = 80, bool encrypt = false, QObject *parent = 0);
+    QHttpNetworkConnection(quint16 channelCount, const QString &hostName, quint16 port = 80, bool encrypt = false, QObject *parent = 0);
     ~QHttpNetworkConnection();
 
     //The hostname to which this is connected to.
@@ -153,7 +154,11 @@ class QHttpNetworkConnectionPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QHttpNetworkConnection)
 public:
+    static const int defaultChannelCount;
+    static const int defaultPipelineLength;
+
     QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt);
+    QHttpNetworkConnectionPrivate(quint16 channelCount, const QString &hostName, quint16 port, bool encrypt);
     ~QHttpNetworkConnectionPrivate();
     void init();
 
@@ -166,12 +171,13 @@ public:
     bool isSocketReading(QAbstractSocket *socket) const;
 
     QHttpNetworkReply *queueRequest(const QHttpNetworkRequest &request);
-    void unqueueAndSendRequest(QAbstractSocket *socket);
+    void requeueRequest(const HttpMessagePair &pair); // e.g. after pipeline broke
+    void dequeueAndSendRequest(QAbstractSocket *socket);
     void prepareRequest(HttpMessagePair &request);
-    bool sendRequest(QAbstractSocket *socket);
-    void receiveReply(QAbstractSocket *socket, QHttpNetworkReply *reply);
-    void resendCurrentRequest(QAbstractSocket *socket);
-    void closeChannel(int channel);
+
+    void fillPipeline(QAbstractSocket *socket);
+    bool fillPipeline(QList<HttpMessagePair> &queue, QHttpNetworkConnectionChannel &channel);
+
     void copyCredentials(int fromChannel, QAuthenticator *auth, bool isProxy);
 
     // private slots
@@ -179,9 +185,9 @@ public:
     void _q_restartAuthPendingRequests(); // send the currently blocked request
 
     void createAuthorization(QAbstractSocket *socket, QHttpNetworkRequest &request);
-    bool ensureConnection(QAbstractSocket *socket);
+
     QString errorDetail(QNetworkReply::NetworkError errorCode, QAbstractSocket *socket);
-    void eraseData(QHttpNetworkReply *reply);
+
 #ifndef QT_NO_COMPRESS
     bool expand(QAbstractSocket *socket, QHttpNetworkReply *reply, bool dataComplete);
 #endif
@@ -191,7 +197,7 @@ public:
     quint16 port;
     bool encrypt;
 
-    static const int channelCount;
+    const int channelCount;
     QHttpNetworkConnectionChannel *channels; // parallel connections to the server
 
     bool pendingAuthSignal; // there is an incomplete authentication signal
@@ -199,14 +205,11 @@ public:
 
     qint64 uncompressedBytesAvailable(const QHttpNetworkReply &reply) const;
     qint64 uncompressedBytesAvailableNextBlock(const QHttpNetworkReply &reply) const;
-    qint64 compressedBytesAvailable(const QHttpNetworkReply &reply) const;
+
 
     void emitReplyError(QAbstractSocket *socket, QHttpNetworkReply *reply, QNetworkReply::NetworkError errorCode);
     bool handleAuthenticateChallenge(QAbstractSocket *socket, QHttpNetworkReply *reply, bool isProxy, bool &resend);
-    void allDone(QAbstractSocket *socket, QHttpNetworkReply *reply);
-    void handleStatus(QAbstractSocket *socket, QHttpNetworkReply *reply);
-    inline bool shouldEmitSignals(QHttpNetworkReply *reply);
-    inline bool expectContent(QHttpNetworkReply *reply);
+
 
 #ifndef QT_NO_OPENSSL
     QSslConfiguration sslConfiguration(const QHttpNetworkReply &reply) const;
@@ -214,6 +217,7 @@ public:
 
 #ifndef QT_NO_NETWORKPROXY
     QNetworkProxy networkProxy;
+    void emitProxyAuthenticationRequired(const QHttpNetworkConnectionChannel *chan, const QNetworkProxy &proxy, QAuthenticator* auth);
 #endif
 
     //The request queues
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 5ffab76..9d78c55 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -41,6 +41,7 @@
 
 #include "qhttpnetworkconnection_p.h"
 #include "qhttpnetworkconnectionchannel_p.h"
+#include "private/qnoncontiguousbytedevice_p.h"
 
 #include <qpair.h>
 #include <qdebug.h>
@@ -113,61 +114,646 @@ void QHttpNetworkConnectionChannel::close()
 }
 
 
+bool QHttpNetworkConnectionChannel::sendRequest()
+{
+    switch (state) {
+    case QHttpNetworkConnectionChannel::IdleState: { // write the header
+        if (!ensureConnection()) {
+            // wait for the connection (and encryption) to be done
+            // sendRequest will be called again from either
+            // _q_connected or _q_encrypted
+            return false;
+        }
+        written = 0; // excluding the header
+        bytesTotal = 0;
+        if (reply) {
+            reply->d_func()->clear();
+            reply->d_func()->connection = connection;
+            reply->d_func()->autoDecompress = request.d->autoDecompress;
+            reply->d_func()->pipeliningUsed = false;
+        }
+        state = QHttpNetworkConnectionChannel::WritingState;
+        pendingEncrypt = false;
+        // if the url contains authentication parameters, use the new ones
+        // both channels will use the new authentication parameters
+        if (!request.url().userInfo().isEmpty()) {
+            QUrl url = request.url();
+            QAuthenticator &auth = authenticator;
+            if (url.userName() != auth.user()
+                || (!url.password().isEmpty() && url.password() != auth.password())) {
+                auth.setUser(url.userName());
+                auth.setPassword(url.password());
+                connection->d_func()->copyCredentials(connection->d_func()->indexOf(socket), &auth, false);
+            }
+            // clear the userinfo,  since we use the same request for resending
+            // userinfo in url can conflict with the one in the authenticator
+            url.setUserInfo(QString());
+            request.setUrl(url);
+        }
+        connection->d_func()->createAuthorization(socket, request);
+#ifndef QT_NO_NETWORKPROXY
+        QByteArray header = QHttpNetworkRequestPrivate::header(request,
+            (connection->d_func()->networkProxy.type() != QNetworkProxy::NoProxy));
+#else
+        QByteArray header = QHttpNetworkRequestPrivate::header(request, false);
+#endif
+        socket->write(header);
+        QNonContiguousByteDevice* uploadByteDevice = request.uploadByteDevice();
+        if (uploadByteDevice) {
+            // connect the signals so this function gets called again
+            QObject::connect(uploadByteDevice, SIGNAL(readyRead()),this, SLOT(_q_uploadDataReadyRead()));
+
+            bytesTotal = request.contentLength();
+        } else {
+            state = QHttpNetworkConnectionChannel::WaitingState;
+            sendRequest();
+            break;
+        }
+        // write the initial chunk together with the headers
+        // fall through
+    }
+    case QHttpNetworkConnectionChannel::WritingState:
+    {
+        // write the data
+        QNonContiguousByteDevice* uploadByteDevice = request.uploadByteDevice();
+        if (!uploadByteDevice || bytesTotal == written) {
+            if (uploadByteDevice)
+                emit reply->dataSendProgress(written, bytesTotal);
+            state = QHttpNetworkConnectionChannel::WaitingState; // now wait for response
+            sendRequest();
+            break;
+        }
+
+        // only feed the QTcpSocket buffer when there is less than 32 kB in it
+        const qint64 socketBufferFill = 32*1024;
+        const qint64 socketWriteMaxSize = 16*1024;
+
+
+#ifndef QT_NO_OPENSSL
+        QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
+        // if it is really an ssl socket, check more than just bytesToWrite()
+        while ((socket->bytesToWrite() + (sslSocket ? sslSocket->encryptedBytesToWrite() : 0))
+                <= socketBufferFill && bytesTotal != written)
+#else
+        while (socket->bytesToWrite() <= socketBufferFill
+               && bytesTotal != written)
+#endif
+        {
+            // get pointer to upload data
+            qint64 currentReadSize;
+            qint64 desiredReadSize = qMin(socketWriteMaxSize, bytesTotal - written);
+            const char *readPointer = uploadByteDevice->readPointer(desiredReadSize, currentReadSize);
+
+            if (currentReadSize == -1) {
+                // premature eof happened
+                connection->d_func()->emitReplyError(socket, reply, QNetworkReply::UnknownNetworkError);
+                return false;
+                break;
+            } else if (readPointer == 0 || currentReadSize == 0) {
+                // nothing to read currently, break the loop
+                break;
+            } else {
+                qint64 currentWriteSize = socket->write(readPointer, currentReadSize);
+                if (currentWriteSize == -1 || currentWriteSize != currentReadSize) {
+                    // socket broke down
+                    connection->d_func()->emitReplyError(socket, reply, QNetworkReply::UnknownNetworkError);
+                    return false;
+                } else {
+                    written += currentWriteSize;
+                    uploadByteDevice->advanceReadPointer(currentWriteSize);
+
+                    emit reply->dataSendProgress(written, bytesTotal);
+
+                    if (written == bytesTotal) {
+                        // make sure this function is called once again
+                        state = QHttpNetworkConnectionChannel::WaitingState;
+                        sendRequest();
+                        break;
+                    }
+                }
+            }
+        }
+        break;
+    }
+
+    case QHttpNetworkConnectionChannel::WaitingState:
+    {
+        QNonContiguousByteDevice* uploadByteDevice = request.uploadByteDevice();
+        if (uploadByteDevice) {
+            QObject::disconnect(uploadByteDevice, SIGNAL(readyRead()), this, SLOT(_q_uploadDataReadyRead()));
+        }
+
+        // HTTP pipelining
+        connection->d_func()->fillPipeline(socket);
+        socket->flush();
+
+        // 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
+        // case receiveReply had been called before but ignored the server reply
+        receiveReply();
+        break;
+    }
+    case QHttpNetworkConnectionChannel::ReadingState:
+    case QHttpNetworkConnectionChannel::Wait4AuthState:
+        // ignore _q_bytesWritten in these states
+        // fall through
+    default:
+        break;
+    }
+    return true;
+}
+
+
+void QHttpNetworkConnectionChannel::receiveReply()
+{
+    Q_ASSERT(socket);
+
+    qint64 bytes = 0;
+    QAbstractSocket::SocketState socketState = socket->state();
+
+    // connection might be closed to signal the end of data
+    if (socketState == QAbstractSocket::UnconnectedState) {
+        if (!socket->bytesAvailable()) {
+            if (reply && reply->d_func()->state == QHttpNetworkReplyPrivate::ReadingDataState) {
+                reply->d_func()->state = QHttpNetworkReplyPrivate::AllDoneState;
+                this->state = QHttpNetworkConnectionChannel::IdleState;
+                allDone();
+            } else {
+                // try to reconnect/resend before sending an error.
+                if (reconnectAttempts-- > 0) {
+                    closeAndResendCurrentRequest();
+                } else if (reply) {
+                    reply->d_func()->errorString = connection->d_func()->errorDetail(QNetworkReply::RemoteHostClosedError, socket);
+                    emit reply->finishedWithError(QNetworkReply::RemoteHostClosedError, reply->d_func()->errorString);
+                    QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+                }
+            }
+        }
+    }
+
+    // read loop for the response
+    while (socket->bytesAvailable()) {
+        QHttpNetworkReplyPrivate::ReplyState state = reply ? reply->d_func()->state : QHttpNetworkReplyPrivate::AllDoneState;
+        switch (state) {
+        case QHttpNetworkReplyPrivate::NothingDoneState:
+        case QHttpNetworkReplyPrivate::ReadingStatusState: {
+            eatWhitespace();
+            qint64 statusBytes = reply->d_func()->readStatus(socket);
+            if (statusBytes == -1 && reconnectAttempts <= 0) {
+                // too many errors reading/receiving/parsing the status, close the socket and emit error
+                close();
+                reply->d_func()->errorString = connection->d_func()->errorDetail(QNetworkReply::ProtocolFailure, socket);
+                emit reply->finishedWithError(QNetworkReply::ProtocolFailure, reply->d_func()->errorString);
+                QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+                break;
+            } else if (statusBytes == -1) {
+                reconnectAttempts--;
+                reply->d_func()->clear();
+                closeAndResendCurrentRequest();
+                break;
+            }
+            bytes += statusBytes;
+            lastStatus = reply->d_func()->statusCode;
+            break;
+        }
+        case QHttpNetworkReplyPrivate::ReadingHeaderState:
+            bytes += reply->d_func()->readHeader(socket);
+            if (reply->d_func()->state == QHttpNetworkReplyPrivate::ReadingDataState) {
+                if (reply->d_func()->isGzipped() && reply->d_func()->autoDecompress) {
+                    // remove the Content-Length from header
+                    reply->d_func()->removeAutoDecompressHeader();
+                } else {
+                    reply->d_func()->autoDecompress = false;
+                }
+                if (reply && reply->d_func()->statusCode == 100) {
+                    reply->d_func()->state = QHttpNetworkReplyPrivate::ReadingStatusState;
+                    break; // ignore
+                }
+                if (reply->d_func()->shouldEmitSignals())
+                    emit reply->headerChanged();
+                if (!reply->d_func()->expectContent()) {
+                    reply->d_func()->state = QHttpNetworkReplyPrivate::AllDoneState;
+                    this->state = QHttpNetworkConnectionChannel::IdleState;
+                    allDone();
+                    return;
+                }
+            }
+            break;
+        case QHttpNetworkReplyPrivate::ReadingDataState: {
+            if (!reply->d_func()->isChunked() && !reply->d_func()->autoDecompress
+                && reply->d_func()->bodyLength > 0) {
+                // bulk files like images should fulfill these properties and
+                // we can therefore save on memory copying
+                bytes = reply->d_func()->readBodyFast(socket, &reply->d_func()->responseData);
+                reply->d_func()->totalProgress += bytes;
+                if (reply->d_func()->shouldEmitSignals()) {
+                    QPointer<QHttpNetworkReply> replyPointer = reply;
+                    emit reply->readyRead();
+                    // make sure that the reply is valid
+                    if (replyPointer.isNull())
+                        return;
+                    emit reply->dataReadProgress(reply->d_func()->totalProgress, reply->d_func()->bodyLength);
+                    // make sure that the reply is valid
+                    if (replyPointer.isNull())
+                        return;
+                }
+            }
+            else
+            {
+                // use the traditional slower reading (for compressed encoding, chunked encoding,
+                // no content-length etc)
+                QByteDataBuffer byteDatas;
+                bytes = reply->d_func()->readBody(socket, &byteDatas);
+                if (bytes) {
+                    if (reply->d_func()->autoDecompress)
+                        reply->d_func()->appendCompressedReplyData(byteDatas);
+                    else
+                        reply->d_func()->appendUncompressedReplyData(byteDatas);
+
+                    if (!reply->d_func()->autoDecompress) {
+                        reply->d_func()->totalProgress += bytes;
+                        if (reply->d_func()->shouldEmitSignals()) {
+                            QPointer<QHttpNetworkReply> replyPointer = reply;
+                            // important: At the point of this readyRead(), the byteDatas list must be empty,
+                            // else implicit sharing will trigger memcpy when the user is reading data!
+                            emit reply->readyRead();
+                            // make sure that the reply is valid
+                            if (replyPointer.isNull())
+                                return;
+                            emit reply->dataReadProgress(reply->d_func()->totalProgress, reply->d_func()->bodyLength);
+                            // make sure that the reply is valid
+                           if (replyPointer.isNull())
+                                return;
+                        }
+                    }
+#ifndef QT_NO_COMPRESS
+                    else if (!expand(false)) { // expand a chunk if possible
+                        return; // ### expand failed
+                    }
+#endif
+                }
+            }
+            if (reply->d_func()->state == QHttpNetworkReplyPrivate::ReadingDataState)
+                break;
+            // everything done, fall through
+            }
+      case QHttpNetworkReplyPrivate::AllDoneState:
+            this->state = QHttpNetworkConnectionChannel::IdleState;
+            allDone();
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+bool QHttpNetworkConnectionChannel::ensureConnection()
+{
+    // make sure that this socket is in a connected state, if not initiate
+    // connection to the host.
+    if (socket->state() != QAbstractSocket::ConnectedState) {
+        // connect to the host if not already connected.
+        // resend this request after we receive the disconnected signal
+        if (socket->state() == QAbstractSocket::ClosingState) {
+            resendCurrent = true;
+            return false;
+        }
+        state = QHttpNetworkConnectionChannel::ConnectingState;
+        pendingEncrypt = connection->d_func()->encrypt;
+
+        // reset state
+        pipeliningSupported = PipeliningSupportUnknown;
+
+        // This workaround is needed since we use QAuthenticator for NTLM authentication. The "phase == Done"
+        // is the usual criteria for emitting authentication signals. The "phase" is set to "Done" when the
+        // last header for Authorization is generated by the QAuthenticator. Basic & Digest logic does not
+        // check the "phase" for generating the Authorization header. NTLM authentication is a two stage
+        // process & needs the "phase". To make sure the QAuthenticator uses the current username/password
+        // the phase is reset to Start.
+        QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(authenticator);
+        if (priv && priv->phase == QAuthenticatorPrivate::Done)
+            priv->phase = QAuthenticatorPrivate::Start;
+        priv = QAuthenticatorPrivate::getPrivate(proxyAuthenticator);
+        if (priv && priv->phase == QAuthenticatorPrivate::Done)
+            priv->phase = QAuthenticatorPrivate::Start;
+
+        QString connectHost = connection->d_func()->hostName;
+        qint16 connectPort = connection->d_func()->port;
+
+#ifndef QT_NO_NETWORKPROXY
+        // HTTPS always use transparent proxy.
+        if (connection->d_func()->networkProxy.type() != QNetworkProxy::NoProxy && !connection->d_func()->encrypt) {
+            connectHost = connection->d_func()->networkProxy.hostName();
+            connectPort = connection->d_func()->networkProxy.port();
+        }
+#endif
+        if (connection->d_func()->encrypt) {
+#ifndef QT_NO_OPENSSL
+            QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
+            sslSocket->connectToHostEncrypted(connectHost, connectPort);
+            if (ignoreAllSslErrors)
+                sslSocket->ignoreSslErrors();
+            sslSocket->ignoreSslErrors(ignoreSslErrorsList);
+#else
+            connection->d_func()->emitReplyError(socket, reply, QNetworkReply::ProtocolUnknownError);
+#endif
+        } else {
+            socket->connectToHost(connectHost, connectPort);
+        }
+        return false;
+    }
+    return true;
+}
+
+
+#ifndef QT_NO_COMPRESS
+bool QHttpNetworkConnectionChannel::expand(bool dataComplete)
+{
+    Q_ASSERT(socket);
+    Q_ASSERT(reply);
+
+    qint64 total = reply->d_func()->compressedData.size();
+    if (total >= CHUNK || dataComplete) {
+         // uncompress the data
+        QByteArray content, inflated;
+        content = reply->d_func()->compressedData;
+        reply->d_func()->compressedData.clear();
+
+        int ret = Z_OK;
+        if (content.size())
+            ret = reply->d_func()->gunzipBodyPartially(content, inflated);
+        int retCheck = (dataComplete) ? Z_STREAM_END : Z_OK;
+        if (ret >= retCheck) {
+            if (inflated.size()) {
+                reply->d_func()->totalProgress += inflated.size();
+                reply->d_func()->appendUncompressedReplyData(inflated);
+                if (reply->d_func()->shouldEmitSignals()) {
+                    QPointer<QHttpNetworkReply> replyPointer = reply;
+                    // important: At the point of this readyRead(), inflated must be cleared,
+                    // else implicit sharing will trigger memcpy when the user is reading data!
+                    emit reply->readyRead();
+                    // make sure that the reply is valid
+                    if (replyPointer.isNull())
+                        return true;
+                    emit reply->dataReadProgress(reply->d_func()->totalProgress, 0);
+                    // make sure that the reply is valid
+                    if (replyPointer.isNull())
+                        return true;
+
+                }
+            }
+        } else {
+            connection->d_func()->emitReplyError(socket, reply, QNetworkReply::ProtocolFailure);
+            return false;
+        }
+    }
+    return true;
+}
+#endif
+
+
+void QHttpNetworkConnectionChannel::allDone()
+{
+#ifndef QT_NO_COMPRESS
+    // expand the whole data.
+    if (reply->d_func()->expectContent() && reply->d_func()->autoDecompress && !reply->d_func()->streamEnd)
+        expand(true); // ### if expand returns false, its an error
+#endif
+    // while handling 401 & 407, we might reset the status code, so save this.
+    bool emitFinished = reply->d_func()->shouldEmitSignals();
+    handleStatus();
+    // ### at this point there should be no more data on the socket
+    // close if server requested
+    if (reply->d_func()->connectionCloseEnabled())
+        close();
+    // queue the finished signal, this is required since we might send new requests from
+    // slot connected to it. The socket will not fire readyRead signal, if we are already
+    // in the slot connected to readyRead
+    if (emitFinished)
+        QMetaObject::invokeMethod(reply, "finished", Qt::QueuedConnection);
+    // reset the reconnection attempts after we receive a complete reply.
+    // in case of failures, each channel will attempt two reconnects before emitting error.
+    reconnectAttempts = 2;
+
+    detectPipeliningSupport();
+
+    // move next from pipeline to current request
+    if (!alreadyPipelinedRequests.isEmpty()) {
+        if (resendCurrent || reply->d_func()->connectionCloseEnabled() || socket->state() != QAbstractSocket::ConnectedState) {
+            // move the pipelined ones back to the main queue
+            requeueCurrentlyPipelinedRequests();
+        } else {
+            // there were requests pipelined in and we can continue
+            HttpMessagePair messagePair = alreadyPipelinedRequests.takeFirst();
+
+            request = messagePair.first;
+            reply = messagePair.second;
+            state = QHttpNetworkConnectionChannel::ReadingState;
+            resendCurrent = false;
+
+            written = 0; // message body, excluding the header, irrelevant here
+            bytesTotal = 0; // message body total, excluding the header, irrelevant here
+
+            // pipeline even more
+            connection->d_func()->fillPipeline(socket);
+
+            // continue reading
+            receiveReply();
+        }
+    } else if (alreadyPipelinedRequests.isEmpty() && socket->bytesAvailable() > 0) {
+        eatWhitespace();
+        // this is weird. we had nothing pipelined but still bytes available. better close it.
+        if (socket->bytesAvailable() > 0)
+            close();
+        QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+    } else if (alreadyPipelinedRequests.isEmpty()) {
+        QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+    }
+}
+
+void QHttpNetworkConnectionChannel::detectPipeliningSupport()
+{
+    // detect HTTP Pipelining support
+    QByteArray serverHeaderField = reply->headerField("Server");
+    if (
+            // check for broken servers in server reply header
+            // this is adapted from http://mxr.mozilla.org/firefox/ident?i=SupportsPipelining
+            (!serverHeaderField.contains("Microsoft-IIS/4."))
+            && (!serverHeaderField.contains("Microsoft-IIS/5."))
+            && (!serverHeaderField.contains("Netscape-Enterprise/3."))
+            // check for HTTP/1.1
+            && (reply->d_func()->majorVersion == 1 && reply->d_func()->minorVersion == 1)
+            // check for not having connection close
+            && (!reply->d_func()->connectionCloseEnabled())
+            // check if it is still connected
+            && (socket->state() == QAbstractSocket::ConnectedState)
+            ) {
+        pipeliningSupported = QHttpNetworkConnectionChannel::PipeliningProbablySupported;
+    } else {
+        pipeliningSupported = QHttpNetworkConnectionChannel::PipeliningSupportUnknown;
+    }
+}
+
+// called when the connection broke and we need to queue some pipelined requests again
+void QHttpNetworkConnectionChannel::requeueCurrentlyPipelinedRequests()
+{
+    for (int i = 0; i < alreadyPipelinedRequests.length(); i++)
+        connection->d_func()->requeueRequest(alreadyPipelinedRequests.at(i));
+    alreadyPipelinedRequests.clear();
+
+    close();
+    QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+}
+
+void QHttpNetworkConnectionChannel::eatWhitespace()
+{
+    char c;
+    while (socket->bytesAvailable()) {
+        if (socket->peek(&c, 1) != 1)
+            return;
+
+        // read all whitespace and line endings
+        if (c == 11 || c == '\n' || c == '\r' || c == ' ' || c == 31) {
+            socket->read(&c, 1);
+            continue;
+        } else {
+            break;
+        }
+    }
+}
+
+void QHttpNetworkConnectionChannel::handleStatus()
+{
+    Q_ASSERT(socket);
+    Q_ASSERT(reply);
+
+    int statusCode = reply->statusCode();
+    bool resend = false;
+
+    switch (statusCode) {
+    case 401: // auth required
+    case 407: // proxy auth required
+        if (connection->d_func()->handleAuthenticateChallenge(socket, reply, (statusCode == 407), resend)) {
+            if (resend) {
+                QNonContiguousByteDevice* uploadByteDevice = request.uploadByteDevice();
+                if (uploadByteDevice) {
+                    if (uploadByteDevice->reset()) {
+                        written = 0;
+                    } else {
+                        connection->d_func()->emitReplyError(socket, reply, QNetworkReply::ContentReSendError);
+                        break;
+                    }
+                }
+
+                reply->d_func()->eraseData();
+
+                if (alreadyPipelinedRequests.isEmpty()) {
+                    // this does a re-send without closing the connection
+                    resendCurrent = true;
+                    QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+                } else {
+                    // we had requests pipelined.. better close the connection in closeAndResendCurrentRequest
+                    closeAndResendCurrentRequest();
+                    QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+                }
+            }
+        } else {
+            emit reply->headerChanged();
+            emit reply->readyRead();
+            QNetworkReply::NetworkError errorCode = (statusCode == 407)
+                ? QNetworkReply::ProxyAuthenticationRequiredError
+                : QNetworkReply::AuthenticationRequiredError;
+            reply->d_func()->errorString = connection->d_func()->errorDetail(errorCode, socket);
+            emit connection->error(errorCode, reply->d_func()->errorString);
+            emit reply->finished();
+        }
+        break;
+    default:
+        QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+    }
+}
+
+void  QHttpNetworkConnectionChannel::pipelineInto(HttpMessagePair &pair)
+{
+    // this is only called for simple GET
+
+    QHttpNetworkRequest &request = pair.first;
+    QHttpNetworkReply *reply = pair.second;
+    if (reply) {
+        reply->d_func()->clear();
+        reply->d_func()->connection = connection;
+        reply->d_func()->autoDecompress = request.d->autoDecompress;
+        reply->d_func()->pipeliningUsed = true;
+    }
+
+#ifndef QT_NO_NETWORKPROXY
+    QByteArray header = QHttpNetworkRequestPrivate::header(request,
+                                                           (connection->d_func()->networkProxy.type() != QNetworkProxy::NoProxy));
+#else
+    QByteArray header = QHttpNetworkRequestPrivate::header(request, false);
+#endif
+    socket->write(header);
+
+    alreadyPipelinedRequests.append(pair);
+}
+
+void QHttpNetworkConnectionChannel::closeAndResendCurrentRequest()
+{
+    requeueCurrentlyPipelinedRequests();
+    close();
+    resendCurrent = true;
+    QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+}
+
 //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);
+            receiveReply();
     }
-    // ### 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);
+        sendRequest();
     // 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);
+            receiveReply();
     } 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;
+
+    requeueCurrentlyPipelinedRequests();
 }
 
 
 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);
 
+    pipeliningSupported = QHttpNetworkConnectionChannel::PipeliningSupportUnknown;
+
     // ### 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);
+            sendRequest();
         else
             close();
     }
@@ -193,7 +779,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
         // while "Reading" the _q_disconnected() will handle this.
         if (state != QHttpNetworkConnectionChannel::IdleState && state != QHttpNetworkConnectionChannel::ReadingState) {
             if (reconnectAttempts-- > 0) {
-                connection->d_func()->resendCurrentRequest(socket);
+                closeAndResendCurrentRequest();
                 return;
             } else {
                 send2Reply = true;
@@ -206,7 +792,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
     case QAbstractSocket::SocketTimeoutError:
         // try to reconnect/resend before sending an error.
         if (state == QHttpNetworkConnectionChannel::WritingState && (reconnectAttempts-- > 0)) {
-            connection->d_func()->resendCurrentRequest(socket);
+            closeAndResendCurrentRequest();
             return;
         }
         send2Reply = true;
@@ -244,13 +830,13 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
 #ifndef QT_NO_NETWORKPROXY
 void QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator* auth)
 {
-    emit connection->proxyAuthenticationRequired(proxy, auth, connection);
+    connection->d_func()->emitProxyAuthenticationRequired(this, proxy, auth);
 }
 #endif
 
 void QHttpNetworkConnectionChannel::_q_uploadDataReadyRead()
 {
-    connection->d_func()->sendRequest(socket);
+    sendRequest();
 }
 
 #ifndef QT_NO_OPENSSL
@@ -259,7 +845,7 @@ void QHttpNetworkConnectionChannel::_q_encrypted()
     if (!socket)
         return; // ### error
     state = QHttpNetworkConnectionChannel::IdleState;
-    connection->d_func()->sendRequest(socket);
+    sendRequest();
 }
 
 void QHttpNetworkConnectionChannel::_q_sslErrors(const QList<QSslError> &errors)
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index f937669..220b72c 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -82,10 +82,14 @@ class QHttpNetworkReply;
 class QByteArray;
 class QHttpNetworkConnection;
 
+#ifndef HttpMessagePair
+typedef QPair<QHttpNetworkRequest, QHttpNetworkReply*> HttpMessagePair;
+#endif
+
 class QHttpNetworkConnectionChannel : public QObject {
     Q_OBJECT
 public:
-        enum ChannelState {
+    enum ChannelState {
         IdleState = 0,          // ready to send request
         ConnectingState = 1,    // connecting to host
         WritingState = 2,       // writing the data
@@ -112,12 +116,24 @@ public:
     bool ignoreAllSslErrors;
     QList<QSslError> ignoreSslErrorsList;
 #endif
+
+    // HTTP pipelining -> http://en.wikipedia.org/wiki/Http_pipelining
+    enum PipeliningSupport {
+        PipeliningSupportUnknown, // default for a new connection
+        PipeliningProbablySupported, // after having received a server response that indicates support
+        PipeliningNotSupported // currently not used
+    };
+    PipeliningSupport pipeliningSupported;
+    QList<HttpMessagePair> alreadyPipelinedRequests;
+
+
     QHttpNetworkConnectionChannel() : socket(0), state(IdleState), reply(0), written(0), bytesTotal(0), resendCurrent(false),
     lastStatus(0), pendingEncrypt(false), reconnectAttempts(2),
     authMehtod(QAuthenticatorPrivate::None), proxyAuthMehtod(QAuthenticatorPrivate::None)
 #ifndef QT_NO_OPENSSL
     , ignoreAllSslErrors(false)
 #endif
+    , pipeliningSupported(PipeliningSupportUnknown)
     , connection(0)
     {}
 
@@ -127,6 +143,23 @@ public:
     void init();
     void close();
 
+    bool sendRequest();
+    void receiveReply();
+
+    bool ensureConnection();
+
+    bool expand(bool dataComplete);
+    void allDone(); // reply header + body have been read
+    void handleStatus(); // called from allDone()
+
+    void pipelineInto(HttpMessagePair &pair);
+    void requeueCurrentlyPipelinedRequests();
+    void detectPipeliningSupport();
+
+    void closeAndResendCurrentRequest();
+
+    void eatWhitespace();
+
     protected slots:
     void _q_bytesWritten(qint64 bytes); // proceed sending
     void _q_readyRead(); // pending data to read
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index 9dbc11d..ba429fd 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -187,6 +187,10 @@ bool QHttpNetworkReply::isFinished() const
     return d_func()->state == QHttpNetworkReplyPrivate::AllDoneState;
 }
 
+bool QHttpNetworkReply::isPipeliningUsed() const
+{
+    return d_func()->pipeliningUsed;
+}
 
 
 QHttpNetworkReplyPrivate::QHttpNetworkReplyPrivate(const QUrl &newUrl)
@@ -195,6 +199,7 @@ QHttpNetworkReplyPrivate::QHttpNetworkReplyPrivate(const QUrl &newUrl)
       chunkedTransferEncoding(0),
       currentChunkSize(0), currentChunkRead(0), connection(0), initInflate(false),
       autoDecompress(false), responseData(), requestIsPrepared(false)
+      ,pipeliningUsed(false)
 {
 }
 
@@ -418,20 +423,26 @@ qint64 QHttpNetworkReplyPrivate::readStatus(QAbstractSocket *socket)
             }
             bool ok = parseStatus(fragment);
             state = ReadingHeaderState;
-            fragment.clear(); // next fragment
-
-            if (!ok)
+            fragment.clear();
+            if (!ok) {
                 return -1;
+            }
             break;
         } else {
             c = 0;
-            bytes += socket->read(&c, 1);
+            int haveRead = socket->read(&c, 1);
+            if (haveRead == -1)
+                return -1;
+            bytes += haveRead;
             fragment.append(c);
         }
 
         // is this a valid reply?
         if (fragment.length() >= 5 && !fragment.startsWith("HTTP/"))
+        {
+            fragment.clear();
             return -1;
+        }
 
     }
 
@@ -566,7 +577,6 @@ qint64 QHttpNetworkReplyPrivate::readBodyFast(QAbstractSocket *socket, QByteData
 
     if (contentRead + haveRead == bodyLength) {
         state = AllDoneState;
-        socket->readAll(); // Read the rest to clean (CRLF) ### will break pipelining
     }
 
     contentRead += haveRead;
@@ -586,8 +596,6 @@ qint64 QHttpNetworkReplyPrivate::readBody(QAbstractSocket *socket, QByteDataBuff
     } else {
         bytes += readReplyBodyRaw(socket, out, socket->bytesAvailable());
     }
-    if (state == AllDoneState)
-        socket->readAll(); // Read the rest to clean (CRLF) ### will break pipelining
     contentRead += bytes;
     return bytes;
 }
@@ -715,6 +723,33 @@ void QHttpNetworkReplyPrivate::appendCompressedReplyData(QByteDataBuffer &data)
 }
 
 
+bool QHttpNetworkReplyPrivate::shouldEmitSignals()
+{
+    // for 401 & 407 don't emit the data signals. Content along with these
+    // responses are send only if the authentication fails.
+    return (statusCode != 401 && statusCode != 407);
+}
+
+bool QHttpNetworkReplyPrivate::expectContent()
+{
+    // check whether we can expect content after the headers (rfc 2616, sec4.4)
+    if ((statusCode >= 100 && statusCode < 200)
+        || statusCode == 204 || statusCode == 304)
+        return false;
+    if (request.operation() == QHttpNetworkRequest::Head)
+        return !shouldEmitSignals();
+    if (contentLength() == 0)
+        return false;
+    return true;
+}
+
+void QHttpNetworkReplyPrivate::eraseData()
+{
+    compressedData.clear();
+    responseData.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 5aee067..8d4d724 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -128,6 +128,8 @@ public:
 
     bool isFinished() const;
 
+    bool isPipeliningUsed() const;
+
 #ifndef QT_NO_OPENSSL
     QSslConfiguration sslConfiguration() const;
     void setSslConfiguration(const QSslConfiguration &config);
@@ -177,6 +179,10 @@ public:
     void appendUncompressedReplyData(QByteDataBuffer &data);
     void appendCompressedReplyData(QByteDataBuffer &data);
 
+    bool shouldEmitSignals();
+    bool expectContent();
+    void eraseData();
+
     qint64 bytesAvailable() const;
     bool isChunked();
     bool connectionCloseEnabled();
@@ -219,6 +225,8 @@ public:
     QByteDataBuffer responseData; // uncompressed body
     QByteArray compressedData; // compressed body (temporary)
     bool requestIsPrepared;
+
+    bool pipeliningUsed;
 };
 
 
diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp
index 693e1f4..8b2c4e9 100644
--- a/src/network/access/qhttpnetworkrequest.cpp
+++ b/src/network/access/qhttpnetworkrequest.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(QHttpNetworkRequest::Operation op,
         QHttpNetworkRequest::Priority pri, const QUrl &newUrl)
     : QHttpNetworkHeaderPrivate(newUrl), operation(op), priority(pri), uploadByteDevice(0),
-      autoDecompress(false)
+      autoDecompress(false), pipeliningAllowed(false)
 {
 }
 
@@ -60,6 +60,7 @@ QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(const QHttpNetworkRequest
     priority = other.priority;
     uploadByteDevice = other.uploadByteDevice;
     autoDecompress = other.autoDecompress;
+    pipeliningAllowed = other.pipeliningAllowed;
 }
 
 QHttpNetworkRequestPrivate::~QHttpNetworkRequestPrivate()
@@ -239,6 +240,16 @@ void QHttpNetworkRequest::setPriority(Priority priority)
     d->priority = priority;
 }
 
+bool QHttpNetworkRequest::isPipeliningAllowed() const
+{
+    return d->pipeliningAllowed;
+}
+
+void QHttpNetworkRequest::setPipeliningAllowed(bool b)
+{
+    d->pipeliningAllowed = b;
+}
+
 void QHttpNetworkRequest::setUploadByteDevice(QNonContiguousByteDevice *bd)
 {
     d->uploadByteDevice = bd;
diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h
index ffacb14..2468be9 100644
--- a/src/network/access/qhttpnetworkrequest_p.h
+++ b/src/network/access/qhttpnetworkrequest_p.h
@@ -106,6 +106,9 @@ public:
     Priority priority() const;
     void setPriority(Priority priority);
 
+    bool isPipeliningAllowed() const;
+    void setPipeliningAllowed(bool b);
+
     void setUploadByteDevice(QNonContiguousByteDevice *bd);
     QNonContiguousByteDevice* uploadByteDevice() const;
 
@@ -113,6 +116,7 @@ private:
     QSharedDataPointer<QHttpNetworkRequestPrivate> d;
     friend class QHttpNetworkRequestPrivate;
     friend class QHttpNetworkConnectionPrivate;
+    friend class QHttpNetworkConnectionChannel;
 };
 
 class QHttpNetworkRequestPrivate : public QHttpNetworkHeaderPrivate
@@ -132,6 +136,7 @@ public:
     QHttpNetworkRequest::Priority priority;
     mutable QNonContiguousByteDevice* uploadByteDevice;
     bool autoDecompress;
+    bool pipeliningAllowed;
 };
 
 
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 0ca00fe..30f16da 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -516,6 +516,9 @@ void QNetworkAccessHttpBackend::postRequest()
         return;    // no need to send the request! :)
     }
 
+    if (request().attribute(QNetworkRequest::HttpPipeliningAllowedAttribute).toBool() == true)
+        httpRequest.setPipeliningAllowed(true);
+
     httpReply = http->sendRequest(httpRequest);
     httpReply->setParent(this);
 #ifndef QT_NO_OPENSSL
@@ -718,6 +721,8 @@ void QNetworkAccessHttpBackend::checkForRedirect(const int statusCode)
 
 void QNetworkAccessHttpBackend::replyHeaderChanged()
 {
+    setAttribute(QNetworkRequest::HttpPipeliningWasUsedAttribute, httpReply->isPipeliningUsed());
+
     // reconstruct the HTTP header
     QList<QPair<QByteArray, QByteArray> > headerMap = httpReply->header();
     QList<QPair<QByteArray, QByteArray> >::ConstIterator it = headerMap.constBegin(),
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index fb86e6a..70f8de6 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -804,7 +804,13 @@ void QNetworkAccessManagerPrivate::proxyAuthenticationRequired(QNetworkAccessBac
                                                                QAuthenticator *authenticator)
 {
     Q_Q(QNetworkAccessManager);
-
+    // ### FIXME Tracking of successful authentications
+    // This code is a bit broken right now for SOCKS authentication
+    // first request: proxyAuthenticationRequired gets emitted, credentials gets saved
+    // second request: (proxy != backend->reply->lastProxyAuthentication) does not evaluate to true,
+    //      proxyAuthenticationRequired gets emitted again
+    // possible solution: some tracking inside the authenticator
+    //      or a new function proxyAuthenticationSucceeded(true|false)
     if (proxy != backend->reply->lastProxyAuthentication) {
         QNetworkAuthenticationCredential *cred = fetchCachedCredentials(proxy);
         if (cred) {
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 9f6f224..691423f 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -167,6 +167,16 @@ QT_BEGIN_NAMESPACE
         When using this flag with sequential upload data, the ContentLengthHeader
         header must be set.
 
+     \value HttpPipeliningAllowedAttribute
+        Requests only, type: QVariant::Bool (default: false)
+        Indicates whether the QNetworkAccessManager code is
+        allowed to use HTTP pipelining with this request.
+
+     \value HttpPipeliningWasUsedAttribute
+        Replies only, type: QVariant::Bool
+        Indicates whether the HTTP pipelining was used for receiving
+        this reply.
+
     \value User
         Special type. Additional information can be passed in
         QVariants with types ranging from User to UserMax. The default
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index aaeed48..2c26038 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -76,6 +76,8 @@ public:
         CacheSaveControlAttribute,
         SourceIsFromCacheAttribute,
         DoNotBufferUploadDataAttribute,
+        HttpPipeliningAllowedAttribute,
+        HttpPipeliningWasUsedAttribute,
 
         User = 1000,
         UserMax = 32767
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index c8def4a..44e6b3a 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -163,16 +163,13 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver,
     QWindowsSockInit bust; // makes sure WSAStartup was callled
 #endif
 
-    // Support for IDNA
-    QString lookup = QString::fromLatin1(QUrl::toAce(name));
-
     QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
     result.data()->autoDelete = false;
     QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
                      receiver, member);
     int id = result.data()->lookupId = theIdCounter.fetchAndAddRelaxed(1);
 
-    if (lookup.isEmpty()) {
+    if (name.isEmpty()) {
         QHostInfo info(id);
         info.setError(QHostInfo::HostNotFound);
         info.setErrorString(QObject::tr("No host name given"));
@@ -183,7 +180,7 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver,
     }
 
     QHostInfoAgent *agent = theAgent();
-    agent->addHostName(lookup, result.take());
+    agent->addHostName(name, result.take());
 
 #if !defined QT_NO_THREAD
     if (!agent->isRunning())
@@ -227,13 +224,7 @@ QHostInfo QHostInfo::fromName(const QString &name)
     qDebug("QHostInfo::fromName(\"%s\")",name.toLatin1().constData());
 #endif
 
-    if (!name.isEmpty())
-        return QHostInfoAgent::fromName(QLatin1String(QUrl::toAce(name)));
-
-    QHostInfo retval;
-    retval.d->err = HostNotFound;
-    retval.d->errorStr = QObject::tr("No host name given");
-    return retval;
+    return QHostInfoAgent::fromName(name);
 }
 
 /*!
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index 39ea72c..2f96f1b 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -122,7 +122,6 @@ static void resolveLibrary()
 QHostInfo QHostInfoAgent::fromName(const QString &hostName)
 {
     QHostInfo results;
-    results.setHostName(hostName);
 
 #if defined(QHOSTINFO_DEBUG)
     qDebug("QHostInfoAgent::fromName(%s) looking up...",
@@ -192,6 +191,22 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
 #endif
     }
 
+    // IDN support
+    QByteArray aceHostname;
+    if (results.hostName().isEmpty()) {
+        // it's a hostname resolution
+        aceHostname = QUrl::toAce(hostName);
+        results.setHostName(hostName);
+        if (aceHostname.isEmpty()) {
+            results.setError(QHostInfo::HostNotFound);
+            results.setErrorString(hostName.isEmpty() ? QObject::tr("No host name given") : QObject::tr("Invalid hostname"));
+            return results;
+        }
+    } else {
+        // it's an IP reverse resolution
+        aceHostname = results.hostName().toLatin1();
+    }
+
 #if !defined (QT_NO_GETADDRINFO)
     // Call getaddrinfo, and place all IPv4 addresses at the start and
     // the IPv6 addresses at the end of the address list in results.
@@ -203,12 +218,12 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
     hints.ai_flags = Q_ADDRCONFIG;
 #endif
 
-    int result = getaddrinfo(hostName.toLatin1().constData(), 0, &hints, &res);
+    int result = getaddrinfo(aceHostname.constData(), 0, &hints, &res);
 # ifdef Q_ADDRCONFIG
     if (result == EAI_BADFLAGS) {
         // if the lookup failed with AI_ADDRCONFIG set, try again without it
         hints.ai_flags = 0;
-        result = getaddrinfo(hostName.toLatin1().constData(), 0, &hints, &res);
+        result = getaddrinfo(aceHostname.constData(), 0, &hints, &res);
     }
 # endif
 
@@ -262,7 +277,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
     // use one QHostInfoAgent, but if more agents are introduced, locking
     // must be provided.
     QMutexLocker locker(::getHostByNameMutex());
-    hostent *result = gethostbyname(hostName.toLatin1().constData());
+    hostent *result = gethostbyname(aceHostname.constData());
     if (result) {
         if (result->h_addrtype == AF_INET) {
             QList<QHostAddress> addresses;
diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp
index 93dc720..c5dc2d2 100644
--- a/src/network/kernel/qhostinfo_win.cpp
+++ b/src/network/kernel/qhostinfo_win.cpp
@@ -52,6 +52,7 @@
 #include <qlibrary.h>
 #include <qtimer.h>
 #include <qmutex.h>
+#include <qurl.h>
 #include <private/qmutexpool_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -129,7 +130,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
     }
 
     QHostInfo results;
-    results.setHostName(hostName);
 
 #if defined(QHOSTINFO_DEBUG)
     qDebug("QHostInfoAgent::fromName(%p): looking up \"%s\" (IPv6 support is %s)",
@@ -178,12 +178,28 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
         }
     }
 
+    // IDN support
+    QByteArray aceHostname;
+    if (results.hostName().isEmpty()) {
+        // it's a hostname resolution
+        aceHostname = QUrl::toAce(hostName);
+        results.setHostName(hostName);
+        if (aceHostname.isEmpty()) {
+            results.setError(QHostInfo::HostNotFound);
+            results.setErrorString(hostName.isEmpty() ? QObject::tr("No host name given") : QObject::tr("Invalid hostname"));
+            return results;
+        }
+    } else {
+        // it's an IP reverse resolution
+        aceHostname = results.hostName().toLatin1();
+    }
+
     if (local_getaddrinfo && local_freeaddrinfo) {
         // Call getaddrinfo, and place all IPv4 addresses at the start
         // and the IPv6 addresses at the end of the address list in
         // results.
         qt_addrinfo *res;
-        int err = local_getaddrinfo(hostName.toLatin1().constData(), 0, 0, &res);
+        int err = local_getaddrinfo(aceHostname.constData(), 0, 0, &res);
         if (err == 0) {
             QList<QHostAddress> addresses;
             for (qt_addrinfo *p = res; p != 0; p = p->ai_next) {
@@ -218,7 +234,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
         }
     } else {
         // Fall back to gethostbyname, which only supports IPv4.
-        hostent *ent = gethostbyname(hostName.toLatin1().constData());
+        hostent *ent = gethostbyname(aceHostname.constData());
         if (ent) {
             char **p;
             QList<QHostAddress> addresses;
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 2ea6d9f..a09b8c43 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -159,9 +159,8 @@ QSslCertificate::QSslCertificate(const QByteArray &data, QSsl::EncodingFormat fo
 /*!
     Constructs an identical copy of \a other.
 */
-QSslCertificate::QSslCertificate(const QSslCertificate &other) : d(other.d.data())
+QSslCertificate::QSslCertificate(const QSslCertificate &other) : d(other.d)
 {
-    d->ref.ref();
 }
 
 /*!
@@ -177,7 +176,7 @@ QSslCertificate::~QSslCertificate()
 */
 QSslCertificate &QSslCertificate::operator=(const QSslCertificate &other)
 {
-    d.assign(other.d.data());
+    d = other.d;
     return *this;
 }
 
@@ -243,7 +242,7 @@ void QSslCertificate::clear()
 {
     if (isNull())
         return;
-    d.reset(new QSslCertificatePrivate);
+    d = new QSslCertificatePrivate;
 }
 
 /*!
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index a62412e..d664434 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -47,6 +47,7 @@
 #include <QtCore/qbytearray.h>
 #include <QtCore/qcryptographichash.h>
 #include <QtCore/qregexp.h>
+#include <QtCore/qsharedpointer.h>
 #include <QtNetwork/qssl.h>
 
 typedef struct x509_st X509; // ### check if this works
@@ -118,7 +119,7 @@ public:
     Qt::HANDLE handle() const;
 
 private:
-    QScopedSharedPointer<QSslCertificatePrivate> d;
+    QExplicitlySharedDataPointer<QSslCertificatePrivate> d;
     friend class QSslCertificatePrivate;
     friend class QSslSocketBackendPrivate;
 };
diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
index bae5ad8..0a5bc54 100644
--- a/src/network/ssl/qsslcertificate_p.h
+++ b/src/network/ssl/qsslcertificate_p.h
@@ -71,7 +71,6 @@ public:
         : null(true), x509(0)
     {
         QSslSocketPrivate::ensureInitialized();
-        ref = 1;
     }
 
     ~QSslCertificatePrivate()
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp
index 474e5ee..fceeb84 100644
--- a/src/network/ssl/qsslkey.cpp
+++ b/src/network/ssl/qsslkey.cpp
@@ -269,9 +269,8 @@ QSslKey::QSslKey(QIODevice *device, QSsl::KeyAlgorithm algorithm, QSsl::Encoding
 /*!
     Constructs an identical copy of \a other.
 */
-QSslKey::QSslKey(const QSslKey &other) : d(other.d.data())
+QSslKey::QSslKey(const QSslKey &other) : d(other.d)
 {
-    d->ref.ref();
 }
 
 /*!
@@ -289,7 +288,7 @@ QSslKey::~QSslKey()
 */
 QSslKey &QSslKey::operator=(const QSslKey &other)
 {
-    d.assign(other.d.data());
+    d = other.d;
     return *this;
 }
 
@@ -310,13 +309,7 @@ bool QSslKey::isNull() const
 */
 void QSslKey::clear()
 {
-    d.reset(new QSslKeyPrivate);
-
-    //### old code: is this really correct???
-    //if (!d->ref.deref()) {
-    //    delete d;
-    //    d = new QSslKeyPrivate;
-    //}
+    d = new QSslKeyPrivate;
 }
 
 /*!
diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h
index 5132dae..d5a85b3 100644
--- a/src/network/ssl/qsslkey.h
+++ b/src/network/ssl/qsslkey.h
@@ -45,7 +45,7 @@
 
 #include <QtCore/qnamespace.h>
 #include <QtCore/qbytearray.h>
-#include <QtCore/qscopedpointer.h>
+#include <QtCore/qsharedpointer.h>
 #include <QtNetwork/qssl.h>
 
 QT_BEGIN_HEADER
@@ -59,7 +59,7 @@ QT_MODULE(Network)
 template <typename A, typename B> struct QPair;
 
 class QIODevice;
-    
+
 class QSslKeyPrivate;
 class Q_NETWORK_EXPORT QSslKey
 {
@@ -93,7 +93,7 @@ public:
     inline bool operator!=(const QSslKey &key) const { return !operator==(key); }
 
 private:
-    QScopedSharedPointer<QSslKeyPrivate> d;
+    QExplicitlySharedDataPointer<QSslKeyPrivate> d;
     friend class QSslCertificate;
 };
 
diff --git a/src/network/ssl/qsslkey_p.h b/src/network/ssl/qsslkey_p.h
index fe7f198..df5d7b2 100644
--- a/src/network/ssl/qsslkey_p.h
+++ b/src/network/ssl/qsslkey_p.h
@@ -69,7 +69,6 @@ public:
         , dsa(0)
     {
         clear();
-        ref = 1;
     }
 
     inline ~QSslKeyPrivate()
@@ -91,6 +90,9 @@ public:
     DSA *dsa;
 
     QAtomicInt ref;
+
+private:
+    Q_DISABLE_COPY(QSslKeyPrivate)
 };
 
 QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 5906467..c3f2de1 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -246,6 +246,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
 
 #ifdef QT_OPENGL_ES_2
     QDataBuffer<uchar> buffer(4*oldWidth*oldHeight);
+    buffer.resize(4*oldWidth*oldHeight);
     glReadPixels(0, 0, oldWidth, oldHeight, GL_RGBA, GL_UNSIGNED_BYTE, buffer.data());
 
     // do an in-place conversion from GL_RGBA to GL_ALPHA
diff --git a/src/script/qscriptcontextinfo.cpp b/src/script/qscriptcontextinfo.cpp
index 6467360..e145394 100644
--- a/src/script/qscriptcontextinfo.cpp
+++ b/src/script/qscriptcontextinfo.cpp
@@ -207,9 +207,8 @@ QScriptContextInfo::QScriptContextInfo(const QScriptContext *context)
     : d_ptr(0)
 {
     if (context) {
-        d_ptr.data_ptr() = new QScriptContextInfoPrivate(context);
+        d_ptr = new QScriptContextInfoPrivate(context);
         d_ptr->q_ptr = this;
-        d_ptr->ref.ref();
     }
 }
 
@@ -217,10 +216,8 @@ QScriptContextInfo::QScriptContextInfo(const QScriptContext *context)
   Constructs a new QScriptContextInfo from the \a other info.
 */
 QScriptContextInfo::QScriptContextInfo(const QScriptContextInfo &other)
-    : d_ptr(other.d_ptr.data())
+    : d_ptr(other.d_ptr)
 {
-    if (d_ptr)
-        d_ptr->ref.ref();
 }
 
 /*!
@@ -246,7 +243,7 @@ QScriptContextInfo::~QScriptContextInfo()
 */
 QScriptContextInfo &QScriptContextInfo::operator=(const QScriptContextInfo &other)
 {
-    d_ptr.assign(other.d_ptr.data());
+    d_ptr = other.d_ptr;
     return *this;
 }
 
@@ -497,8 +494,7 @@ QDataStream &operator<<(QDataStream &out, const QScriptContextInfo &info)
 Q_SCRIPT_EXPORT QDataStream &operator>>(QDataStream &in, QScriptContextInfo &info)
 {
     if (!info.d_ptr) {
-        info.d_ptr.data_ptr() = new QScriptContextInfoPrivate();
-        info.d_ptr->ref.ref();
+        info.d_ptr = new QScriptContextInfoPrivate();
     }
 
     in >> info.d_ptr->scriptId;
diff --git a/src/script/qscriptcontextinfo.h b/src/script/qscriptcontextinfo.h
index 433a308..9cc64ff 100644
--- a/src/script/qscriptcontextinfo.h
+++ b/src/script/qscriptcontextinfo.h
@@ -48,7 +48,7 @@
 
 #include <QtCore/qlist.h>
 #include <QtCore/qstringlist.h>
-#include <QtCore/qscopedpointer.h>
+#include <QtCore/qsharedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -105,7 +105,7 @@ public:
     bool operator!=(const QScriptContextInfo &other) const;
 
 private:
-    QScopedSharedPointer<QScriptContextInfoPrivate> d_ptr;
+    QExplicitlySharedDataPointer<QScriptContextInfoPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptContextInfo)
 };
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp
index 07fed70..c8e19dd 100644
--- a/src/script/qscriptengine.cpp
+++ b/src/script/qscriptengine.cpp
@@ -1774,10 +1774,8 @@ QScriptValue QScriptEngine::objectById(qint64 id) const
   Constructs a new QScriptSyntaxCheckResult from the \a other result.
 */
 QScriptSyntaxCheckResult::QScriptSyntaxCheckResult(const QScriptSyntaxCheckResult &other)
-    : d_ptr(other.d_ptr.data())
+    : d_ptr(other.d_ptr)
 {
-    if (d_ptr)
-        d_ptr->ref.ref();
 }
 
 /*!
@@ -1786,8 +1784,6 @@ QScriptSyntaxCheckResult::QScriptSyntaxCheckResult(const QScriptSyntaxCheckResul
 QScriptSyntaxCheckResult::QScriptSyntaxCheckResult(QScriptSyntaxCheckResultPrivate *d)
     : d_ptr(d)
 {
-    if (d_ptr)
-        d_ptr->ref.ref();
 }
 
 /*!
@@ -1856,7 +1852,7 @@ QString QScriptSyntaxCheckResult::errorMessage() const
 */
 QScriptSyntaxCheckResult &QScriptSyntaxCheckResult::operator=(const QScriptSyntaxCheckResult &other)
 {
-    d_ptr.assign(other.d_ptr.data());
+    d_ptr = other.d_ptr;
     return *this;
 }
 
diff --git a/src/script/qscriptengine.h b/src/script/qscriptengine.h
index 3cdedd9..62d67ff 100644
--- a/src/script/qscriptengine.h
+++ b/src/script/qscriptengine.h
@@ -47,7 +47,7 @@
 #ifndef QT_NO_SCRIPT
 
 #include <QtCore/qvariant.h>
-#include <QtCore/qscopedpointer.h>
+#include <QtCore/qsharedpointer.h>
 
 #ifndef QT_NO_QOBJECT
 #include <QtCore/qobject.h>
@@ -115,7 +115,7 @@ public:
 private:
     QScriptSyntaxCheckResult();
     QScriptSyntaxCheckResult(QScriptSyntaxCheckResultPrivate *d);
-    QScopedSharedPointer<QScriptSyntaxCheckResultPrivate> d_ptr;
+    QExplicitlySharedDataPointer<QScriptSyntaxCheckResultPrivate> d_ptr;
 
     Q_DECLARE_PRIVATE(QScriptSyntaxCheckResult)
     friend class QScriptEnginePrivate;
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 2936c3f..4d482f0 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -920,7 +920,8 @@ void QSvgPaintEngine::drawImage(const QRectF &r, const QImage &image,
     stream() << "x=\""<<r.x()<<"\" "
                 "y=\""<<r.y()<<"\" "
                 "width=\""<<r.width()<<"\" "
-                "height=\""<<r.height()<<"\" ";
+                "height=\""<<r.height()<<"\" "
+                "preserveAspectRatio=\"none\" ";
 
     QByteArray data;
     QBuffer buffer(&data);
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index a79e4a0..adfe468 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -2012,6 +2012,14 @@ static bool parseAimateMotionNode(QSvgNode *parent,
     return true;
 }
 
+static void parseNumberTriplet(QVector<qreal> &values, const QChar *&s)
+{
+    QVector<qreal> list = parseNumbersList(s);
+    values << list;
+    for (int i = 3 - list.size(); i > 0; --i)
+        values.append(0.0);
+}
+
 static bool parseAnimateTransformNode(QSvgNode *parent,
                                       const QXmlStreamAttributes &attributes,
                                       QSvgHandler *handler)
@@ -2025,28 +2033,47 @@ static bool parseAnimateTransformNode(QSvgNode *parent,
     QString fillStr    = attributes.value(QLatin1String("fill")).toString();
     QString fromStr    = attributes.value(QLatin1String("from")).toString();
     QString toStr      = attributes.value(QLatin1String("to")).toString();
+    QString byStr      = attributes.value(QLatin1String("by")).toString();
+    QString addtv      = attributes.value(QLatin1String("additive")).toString();
+
+    QSvgAnimateTransform::Additive additive = QSvgAnimateTransform::Replace;
+    if (addtv == QLatin1String("sum"))
+        additive = QSvgAnimateTransform::Sum;
 
     QVector<qreal> vals;
     if (values.isEmpty()) {
-        const QChar *s = fromStr.constData();
-        QVector<qreal> lst = parseNumbersList(s);
-        while (lst.count() < 3)
-            lst.append(0.0);
-        vals << lst;
-
-        s = toStr.constData();
-        lst = parseNumbersList(s);
-        while (lst.count() < 3)
-            lst.append(0.0);
-        vals << lst;
+        const QChar *s;
+        if (fromStr.isEmpty()) {
+            if (!byStr.isEmpty()) {
+                // By-animation.
+                additive = QSvgAnimateTransform::Sum;
+                vals.append(0.0);
+                vals.append(0.0);
+                vals.append(0.0);
+                parseNumberTriplet(vals, s = byStr.constData());
+            } else {
+                // To-animation not defined.
+                return false;
+            }
+        } else {
+            if (!toStr.isEmpty()) {
+                // From-to-animation.
+                parseNumberTriplet(vals, s = fromStr.constData());
+                parseNumberTriplet(vals, s = toStr.constData());
+            } else if (!byStr.isEmpty()) {
+                // From-by-animation.
+                parseNumberTriplet(vals, s = fromStr.constData());
+                parseNumberTriplet(vals, s = byStr.constData());
+                for (int i = vals.size() - 3; i < vals.size(); ++i)
+                    vals[i] += vals[i - 3];
+            } else {
+                return false;
+            }
+        }
     } else {
         const QChar *s = values.constData();
         while (s && *s != QLatin1Char(0)) {
-            QVector<qreal> tmpVals = parseNumbersList(s);
-            while (tmpVals.count() < 3)
-                tmpVals.append(0.0);
-
-            vals << tmpVals;
+            parseNumberTriplet(vals, s);
             if (*s == QLatin1Char(0))
                 break;
             ++s;
@@ -2088,7 +2115,7 @@ static bool parseAnimateTransformNode(QSvgNode *parent,
     }
 
     QSvgAnimateTransform *anim = new QSvgAnimateTransform(begin, end, 0);
-    anim->setArgs(type, vals);
+    anim->setArgs(type, additive, vals);
     anim->setFreeze(fillStr == QLatin1String("freeze"));
     anim->setRepeatCount(
             (repeatStr == QLatin1String("indefinite"))? -1 :
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index 1ecf870..e1a7049 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -509,10 +509,25 @@ void QSvgStyle::apply(QPainter *p, const QRectF &rect, QSvgNode *node, QSvgExtra
     //animated transforms have to be applied
     //_after_ the original object transformations
     if (!animateTransforms.isEmpty()) {
-        QList<QSvgRefCounter<QSvgAnimateTransform> >::const_iterator itr;
-        for (itr = animateTransforms.constBegin(); itr != animateTransforms.constEnd();
-             ++itr) {
-            (*itr)->apply(p, rect, node, states);
+        qreal totalTimeElapsed = node->document()->currentElapsed();
+        // Find the last animateTransform with additive="replace", since this will override all
+        // previous animateTransforms.
+        QList<QSvgRefCounter<QSvgAnimateTransform> >::const_iterator itr = animateTransforms.constEnd();
+        do {
+            --itr;
+            if ((*itr)->animActive(totalTimeElapsed)
+                && (*itr)->additiveType() == QSvgAnimateTransform::Replace) {
+                // An animateTransform with additive="replace" will replace the transform attribute.
+                if (transform)
+                    transform->revert(p, states);
+                break;
+            }
+        } while (itr != animateTransforms.constBegin());
+
+        // Apply the animateTransforms after and including the last one with additive="replace".
+        for (; itr != animateTransforms.constEnd(); ++itr) {
+            if ((*itr)->animActive(totalTimeElapsed))
+                (*itr)->apply(p, rect, node, states);
         }
     }
 
@@ -558,13 +573,15 @@ void QSvgStyle::revert(QPainter *p, QSvgExtraStates &states)
     //animated transforms need to be reverted _before_
     //the native transforms
     if (!animateTransforms.isEmpty()) {
-        QList<QSvgRefCounter<QSvgAnimateTransform> >::const_iterator itr;
-        itr = animateTransforms.constBegin();
-        //only need to rever the first one because that
-        //one has the original world matrix for the primitve
-        if (itr != animateTransforms.constEnd()) {
-            (*itr)->revert(p, states);
+        QList<QSvgRefCounter<QSvgAnimateTransform> >::const_iterator itr = animateTransforms.constBegin();
+        for (; itr != animateTransforms.constEnd(); ++itr) {
+            if ((*itr)->transformApplied()) {
+                (*itr)->revert(p, states);
+                break;
+            }
         }
+        for (; itr != animateTransforms.constEnd(); ++itr)
+            (*itr)->clearTransformApplied();
     }
 
     if (transform) {
@@ -587,15 +604,16 @@ void QSvgStyle::revert(QPainter *p, QSvgExtraStates &states)
 QSvgAnimateTransform::QSvgAnimateTransform(int startMs, int endMs, int byMs )
     : QSvgStyleProperty(),
       m_from(startMs), m_to(endMs), m_by(byMs),
-      m_type(Empty), m_count(0), m_finished(false)
+      m_type(Empty), m_count(0), m_finished(false), m_additive(Replace), m_transformApplied(false)
 {
     m_totalRunningTime = m_to - m_from;
 }
 
-void QSvgAnimateTransform::setArgs(TransformType type, const QVector<qreal> &args)
+void QSvgAnimateTransform::setArgs(TransformType type, Additive additive, const QVector<qreal> &args)
 {
     m_type = type;
     m_args = args;
+    m_additive = additive;
     Q_ASSERT(!(args.count()%3));
     m_count = args.count() / 3;
 }
@@ -604,15 +622,14 @@ void QSvgAnimateTransform::apply(QPainter *p, const QRectF &, QSvgNode *node, QS
 {
     m_oldWorldTransform = p->worldTransform();
     resolveMatrix(node);
-    if (!m_finished || m_freeze)
-        p->setWorldTransform(m_transform, true);
+    p->setWorldTransform(m_transform, true);
+    m_transformApplied = true;
 }
 
 void QSvgAnimateTransform::revert(QPainter *p, QSvgExtraStates &)
 {
-    if (!m_finished || m_freeze) {
-        p->setWorldTransform(m_oldWorldTransform, false /* don't combine */);
-    }
+    p->setWorldTransform(m_oldWorldTransform, false /* don't combine */);
+    m_transformApplied = false;
 }
 
 void QSvgAnimateTransform::resolveMatrix(QSvgNode *node)
@@ -622,11 +639,14 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node)
     if (totalTimeElapsed < m_from || m_finished)
         return;
 
-    qreal animationFrame = (totalTimeElapsed - m_from) / m_to;
+    qreal animationFrame = 0;
+    if (m_totalRunningTime != 0) {
+        animationFrame = (totalTimeElapsed - m_from) / m_totalRunningTime;
 
-    if (m_repeatCount >= 0 && m_repeatCount < animationFrame) {
-        m_finished = true;
-        animationFrame = m_repeatCount;
+        if (m_repeatCount >= 0 && m_repeatCount < animationFrame) {
+            m_finished = true;
+            animationFrame = m_repeatCount;
+        }
     }
 
     qreal percentOfAnimation = animationFrame;
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index c18a265..056b73b 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -250,7 +250,7 @@ public:
     {
         return m_style;
     }
-	
+
     void setGradientId(const QString &Id)
     {
         m_gradientId = Id;
@@ -529,20 +529,56 @@ public:
         SkewX,
         SkewY
     };
+    enum Additive
+    {
+        Sum,
+        Replace
+    };
 public:
     QSvgAnimateTransform(int startMs, int endMs, int by = 0);
-    void setArgs(TransformType type, const QVector<qreal> &args);
+    void setArgs(TransformType type, Additive additive, const QVector<qreal> &args);
     void setFreeze(bool freeze);
     void setRepeatCount(qreal repeatCount);
     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     virtual void revert(QPainter *p, QSvgExtraStates &states);
     virtual Type type() const;
+    QSvgAnimateTransform::Additive additiveType() const
+    {
+        return m_additive;
+    }
+
+    bool animActive(qreal totalTimeElapsed)
+    {
+        if (totalTimeElapsed < m_from)
+            return false;
+        if (m_freeze || m_repeatCount < 0) // fill="freeze" or repeat="indefinite"
+            return true;
+        if (m_totalRunningTime == 0)
+            return false;
+        qreal animationFrame = (totalTimeElapsed - m_from) / m_totalRunningTime;
+        if (animationFrame > m_repeatCount)
+            return false;
+        return true;
+    }
+
+    bool transformApplied() const
+    {
+        return m_transformApplied;
+    }
+
+    // Call this instead of revert if you know that revert is unnecessary.
+    void clearTransformApplied()
+    {
+        m_transformApplied = false;
+    }
+
 protected:
     void resolveMatrix(QSvgNode *node);
 private:
     qreal m_from, m_to, m_by;
     qreal m_totalRunningTime;
     TransformType m_type;
+    Additive m_additive;
     QVector<qreal> m_args;
     int m_count;
     QTransform m_transform;
@@ -550,6 +586,7 @@ private:
     bool m_finished;
     bool m_freeze;
     qreal m_repeatCount;
+    bool m_transformApplied;
 };
 
 
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index f19c94b..cc6fa88 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -45,44 +45,9 @@
 #include <QtCore/qmetatype.h>
 #include <stdio.h>
 
-QT_BEGIN_NAMESPACE
+#include <private/qmetaobject_p.h> //for the flags.
 
-// if the flags change, you MUST to change it in qmetaobject.cpp too
-enum PropertyFlags  {
-    Invalid = 0x00000000,
-    Readable = 0x00000001,
-    Writable = 0x00000002,
-    Resettable = 0x00000004,
-    EnumOrFlag = 0x00000008,
-    StdCppSet = 0x00000100,
-//     Override = 0x00000200,
-    Constant = 0x00000400,
-    Final = 0x00000800,
-    Designable = 0x00001000,
-    ResolveDesignable = 0x00002000,
-    Scriptable = 0x00004000,
-    ResolveScriptable = 0x00008000,
-    Stored = 0x00010000,
-    ResolveStored = 0x00020000,
-    Editable = 0x00040000,
-    ResolveEditable = 0x00080000,
-    User = 0x00100000,
-    ResolveUser = 0x00200000,
-    Notify = 0x00400000
-};
-
-enum MethodFlags {
-    AccessPrivate = 0x00,
-    AccessProtected = 0x01,
-    AccessPublic = 0x02,
-    MethodMethod = 0x00,
-    MethodSignal = 0x04,
-    MethodSlot = 0x08,
-    MethodConstructor = 0x0c,
-    MethodCompatibility = 0x10,
-    MethodCloned = 0x20,
-    MethodScriptable = 0x40
-};
+QT_BEGIN_NAMESPACE
 
 uint qvariant_nameToType(const char* name)
 {
@@ -205,10 +170,10 @@ void Generator::generateCode()
     QByteArray qualifiedClassNameIdentifier = cdef->qualified;
     qualifiedClassNameIdentifier.replace(':', '_');
 
-    int index = 13;
+    int index = 14;
     fprintf(out, "static const uint qt_meta_data_%s[] = {\n", qualifiedClassNameIdentifier.constData());
     fprintf(out, "\n // content:\n");
-    fprintf(out, "    %4d,       // revision\n", 3);
+    fprintf(out, "    %4d,       // revision\n", 4);
     fprintf(out, "    %4d,       // classname\n", strreg(cdef->qualified));
     fprintf(out, "    %4d, %4d, // classinfo\n", cdef->classInfoList.count(), cdef->classInfoList.count() ? index : 0);
     index += cdef->classInfoList.count() * 2;
@@ -229,6 +194,7 @@ void Generator::generateCode()
             isConstructible ? index : 0);
 
     fprintf(out, "    %4d,       // flags\n", 0);
+    fprintf(out, "    %4d,       // signalCount\n", cdef->signalList.count());
 
 
 //
@@ -1016,14 +982,7 @@ void Generator::generateSignal(FunctionDef *def,int index)
         else
             fprintf(out, ", const_cast<void*>(reinterpret_cast<const void*>(&_t%d))", i);
     fprintf(out, " };\n");
-    int n = 0;
-    for (i = 0; i < def->arguments.count(); ++i)
-        if (def->arguments.at(i).isDefault)
-            ++n;
-    if (n)
-        fprintf(out, "    QMetaObject::activate(%s, &staticMetaObject, %d, %d, _a);\n", thisPtr.constData(), index, index + n);
-    else
-        fprintf(out, "    QMetaObject::activate(%s, &staticMetaObject, %d, _a);\n", thisPtr.constData(), index);
+    fprintf(out, "    QMetaObject::activate(%s, &staticMetaObject, %d, _a);\n", thisPtr.constData(), index);
     if (def->normalizedType.size())
         fprintf(out, "    return _t0;\n");
     fprintf(out, "}\n");
diff --git a/src/xmlpatterns/parser/createTokenLookup.sh b/src/xmlpatterns/parser/createTokenLookup.sh
index a4e1eff..f84ee72 100755
--- a/src/xmlpatterns/parser/createTokenLookup.sh
+++ b/src/xmlpatterns/parser/createTokenLookup.sh
@@ -1,5 +1,50 @@
+#!/bin/sh
 outFile="qtokenlookup.cpp"
 
+license=`cat <<EOF
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtXmlPatterns module of the Qt Toolkit.
+**
+** \\$QT_BEGIN_LICENSE:LGPL\\$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** \\$QT_END_LICENSE\\$
+**
+****************************************************************************/
+EOF`
+echo "$license" > $outFile
+
 # Watch out, the --output option is not supported in the
 # gperf version that apt-get pulls in on Mac OS X.
-gperf TokenLookup.gperf > $outFile
+gperf TokenLookup.gperf >> $outFile
diff --git a/src/xmlpatterns/parser/qtokenlookup.cpp b/src/xmlpatterns/parser/qtokenlookup.cpp
index 6e9c343..6bd1121 100644
--- a/src/xmlpatterns/parser/qtokenlookup.cpp
+++ b/src/xmlpatterns/parser/qtokenlookup.cpp
@@ -1,4 +1,44 @@
-/* C++ code produced by gperf version 3.0.2 */
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtXmlPatterns module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+/* C++ code produced by gperf version 3.0.3 */
 /* Command-line: gperf TokenLookup.gperf  */
 /* Computed positions: -k'1,3,$' */
 
@@ -29,7 +69,7 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-#line 80 "TokenLookup.gperf"
+#line 107 "TokenLookup.gperf"
 
 
 QT_BEGIN_NAMESPACE
@@ -37,7 +77,7 @@ QT_BEGIN_NAMESPACE
 namespace QPatternist
 {
 
-#line 74 "TokenLookup.gperf"
+#line 101 "TokenLookup.gperf"
 struct TokenMap
 {
     const char *name;
@@ -120,255 +160,255 @@ TokenLookup::value (register const char *str, register unsigned int len)
   static const struct TokenMap wordlist[] =
     {
       {"",ERROR}, {"",ERROR},
-#line 125 "TokenLookup.gperf"
+#line 152 "TokenLookup.gperf"
       {"eq",                       EQ},
       {"",ERROR},
-#line 103 "TokenLookup.gperf"
+#line 130 "TokenLookup.gperf"
       {"by",                       BY},
-#line 126 "TokenLookup.gperf"
+#line 153 "TokenLookup.gperf"
       {"every",                    EVERY},
       {"",ERROR},
-#line 96 "TokenLookup.gperf"
+#line 123 "TokenLookup.gperf"
       {"as",                       AS},
       {"",ERROR},
-#line 121 "TokenLookup.gperf"
+#line 148 "TokenLookup.gperf"
       {"else",                     ELSE},
-#line 190 "TokenLookup.gperf"
+#line 217 "TokenLookup.gperf"
       {"where",                    WHERE},
-#line 177 "TokenLookup.gperf"
+#line 204 "TokenLookup.gperf"
       {"stable",                   STABLE},
-#line 99 "TokenLookup.gperf"
+#line 126 "TokenLookup.gperf"
       {"at",                       AT},
       {"",ERROR},
-#line 104 "TokenLookup.gperf"
+#line 131 "TokenLookup.gperf"
       {"case",                     CASE},
       {"",ERROR},
-#line 102 "TokenLookup.gperf"
+#line 129 "TokenLookup.gperf"
       {"boundary-space",           BOUNDARY_SPACE},
-#line 120 "TokenLookup.gperf"
+#line 147 "TokenLookup.gperf"
       {"element",                  ELEMENT},
-#line 105 "TokenLookup.gperf"
+#line 132 "TokenLookup.gperf"
       {"castable",                 CASTABLE},
-#line 100 "TokenLookup.gperf"
+#line 127 "TokenLookup.gperf"
       {"attribute",                ATTRIBUTE},
       {"",ERROR},
-#line 127 "TokenLookup.gperf"
+#line 154 "TokenLookup.gperf"
       {"except",                   EXCEPT},
-#line 134 "TokenLookup.gperf"
+#line 161 "TokenLookup.gperf"
       {"ge",                       GE},
       {"",ERROR},
-#line 106 "TokenLookup.gperf"
+#line 133 "TokenLookup.gperf"
       {"cast",                     CAST},
-#line 183 "TokenLookup.gperf"
+#line 210 "TokenLookup.gperf"
       {"treat",                    TREAT},
-#line 191 "TokenLookup.gperf"
+#line 218 "TokenLookup.gperf"
       {"xquery",                   XQUERY},
-#line 154 "TokenLookup.gperf"
+#line 181 "TokenLookup.gperf"
       {"ne",                       NE},
       {"",ERROR},
-#line 171 "TokenLookup.gperf"
+#line 198 "TokenLookup.gperf"
       {"satisfies",                SATISFIES},
       {"",ERROR}, {"",ERROR},
-#line 136 "TokenLookup.gperf"
+#line 163 "TokenLookup.gperf"
       {"gt",                       GT},
-#line 124 "TokenLookup.gperf"
+#line 151 "TokenLookup.gperf"
       {"encoding",                 ENCODING},
-#line 97 "TokenLookup.gperf"
+#line 124 "TokenLookup.gperf"
       {"ascending",                ASCENDING},
       {"",ERROR},
-#line 98 "TokenLookup.gperf"
+#line 125 "TokenLookup.gperf"
       {"assign",                   ASSIGN},
-#line 112 "TokenLookup.gperf"
+#line 139 "TokenLookup.gperf"
       {"declare",                  DECLARE},
-#line 135 "TokenLookup.gperf"
+#line 162 "TokenLookup.gperf"
       {"greatest",                 GREATEST},
-#line 181 "TokenLookup.gperf"
+#line 208 "TokenLookup.gperf"
       {"then",                     THEN},
       {"",ERROR},
-#line 94 "TokenLookup.gperf"
+#line 121 "TokenLookup.gperf"
       {"ancestor-or-self",         ANCESTOR_OR_SELF},
-#line 148 "TokenLookup.gperf"
+#line 175 "TokenLookup.gperf"
       {"le",                       LE},
-#line 119 "TokenLookup.gperf"
+#line 146 "TokenLookup.gperf"
       {"document-node",            DOCUMENT_NODE},
-#line 180 "TokenLookup.gperf"
+#line 207 "TokenLookup.gperf"
       {"text",                     TEXT},
       {"",ERROR},
-#line 174 "TokenLookup.gperf"
+#line 201 "TokenLookup.gperf"
       {"schema",                   SCHEMA},
       {"",ERROR},
-#line 118 "TokenLookup.gperf"
+#line 145 "TokenLookup.gperf"
       {"document",                 DOCUMENT},
       {"",ERROR},
-#line 114 "TokenLookup.gperf"
+#line 141 "TokenLookup.gperf"
       {"descendant",               DESCENDANT},
       {"",ERROR},
-#line 150 "TokenLookup.gperf"
+#line 177 "TokenLookup.gperf"
       {"lt",                       LT},
-#line 95 "TokenLookup.gperf"
+#line 122 "TokenLookup.gperf"
       {"and",                      AND},
-#line 155 "TokenLookup.gperf"
+#line 182 "TokenLookup.gperf"
       {"node",                     NODE},
-#line 147 "TokenLookup.gperf"
+#line 174 "TokenLookup.gperf"
       {"least",                    LEAST},
-#line 172 "TokenLookup.gperf"
+#line 199 "TokenLookup.gperf"
       {"schema-attribute",         SCHEMA_ATTRIBUTE},
       {"",ERROR},
-#line 128 "TokenLookup.gperf"
+#line 155 "TokenLookup.gperf"
       {"external",                 EXTERNAL},
       {"",ERROR},
-#line 116 "TokenLookup.gperf"
+#line 143 "TokenLookup.gperf"
       {"descending",               DESCENDING},
-#line 157 "TokenLookup.gperf"
+#line 184 "TokenLookup.gperf"
       {"no-preserve",              NO_PRESERVE},
-#line 113 "TokenLookup.gperf"
+#line 140 "TokenLookup.gperf"
       {"default",                  DEFAULT},
-#line 149 "TokenLookup.gperf"
+#line 176 "TokenLookup.gperf"
       {"let",                      LET},
-#line 173 "TokenLookup.gperf"
+#line 200 "TokenLookup.gperf"
       {"schema-element",           SCHEMA_ELEMENT},
       {"",ERROR}, {"",ERROR},
-#line 110 "TokenLookup.gperf"
+#line 137 "TokenLookup.gperf"
       {"construction",             CONSTRUCTION},
-#line 115 "TokenLookup.gperf"
+#line 142 "TokenLookup.gperf"
       {"descendant-or-self",       DESCENDANT_OR_SELF},
-#line 175 "TokenLookup.gperf"
+#line 202 "TokenLookup.gperf"
       {"self",                     SELF},
-#line 156 "TokenLookup.gperf"
+#line 183 "TokenLookup.gperf"
       {"no-inherit",               NO_INHERIT},
       {"",ERROR},
-#line 131 "TokenLookup.gperf"
+#line 158 "TokenLookup.gperf"
       {"follows",                  FOLLOWS},
-#line 93 "TokenLookup.gperf"
+#line 120 "TokenLookup.gperf"
       {"ancestor",                 ANCESTOR},
       {"",ERROR}, {"",ERROR}, {"",ERROR},
-#line 182 "TokenLookup.gperf"
+#line 209 "TokenLookup.gperf"
       {"to",                       TO},
-#line 133 "TokenLookup.gperf"
+#line 160 "TokenLookup.gperf"
       {"function",                 FUNCTION},
-#line 108 "TokenLookup.gperf"
+#line 135 "TokenLookup.gperf"
       {"collation",                COLLATION},
       {"",ERROR},
-#line 178 "TokenLookup.gperf"
+#line 205 "TokenLookup.gperf"
       {"strict",                   STRICT},
       {"",ERROR},
-#line 146 "TokenLookup.gperf"
+#line 173 "TokenLookup.gperf"
       {"lax",                      LAX},
       {"",ERROR},
-#line 122 "TokenLookup.gperf"
+#line 149 "TokenLookup.gperf"
       {"empty",                    EMPTY},
       {"",ERROR},
-#line 158 "TokenLookup.gperf"
+#line 185 "TokenLookup.gperf"
       {"of",                       OF},
-#line 168 "TokenLookup.gperf"
+#line 195 "TokenLookup.gperf"
       {"preserve",                 PRESERVE},
-#line 129 "TokenLookup.gperf"
+#line 156 "TokenLookup.gperf"
       {"following",                FOLLOWING},
       {"",ERROR}, {"",ERROR},
-#line 144 "TokenLookup.gperf"
+#line 171 "TokenLookup.gperf"
       {"is",                       IS},
-#line 165 "TokenLookup.gperf"
+#line 192 "TokenLookup.gperf"
       {"precedes",                 PRECEDES},
-#line 123 "TokenLookup.gperf"
+#line 150 "TokenLookup.gperf"
       {"empty-sequence",           EMPTY_SEQUENCE},
       {"",ERROR}, {"",ERROR},
-#line 130 "TokenLookup.gperf"
+#line 157 "TokenLookup.gperf"
       {"following-sibling",        FOLLOWING_SIBLING},
-#line 142 "TokenLookup.gperf"
+#line 169 "TokenLookup.gperf"
       {"instance",                 INSTANCE},
-#line 186 "TokenLookup.gperf"
+#line 213 "TokenLookup.gperf"
       {"unordered",                UNORDERED},
-#line 101 "TokenLookup.gperf"
+#line 128 "TokenLookup.gperf"
       {"base-uri",                 BASEURI},
-#line 170 "TokenLookup.gperf"
+#line 197 "TokenLookup.gperf"
       {"return",                   RETURN},
       {"",ERROR},
-#line 187 "TokenLookup.gperf"
+#line 214 "TokenLookup.gperf"
       {"validate",                 VALIDATE},
       {"",ERROR},
-#line 111 "TokenLookup.gperf"
+#line 138 "TokenLookup.gperf"
       {"copy-namespaces",          COPY_NAMESPACES},
-#line 159 "TokenLookup.gperf"
+#line 186 "TokenLookup.gperf"
       {"option",                   OPTION},
-#line 138 "TokenLookup.gperf"
+#line 165 "TokenLookup.gperf"
       {"if",                       IF},
       {"",ERROR},
-#line 166 "TokenLookup.gperf"
+#line 193 "TokenLookup.gperf"
       {"preceding",                PRECEDING},
       {"",ERROR}, {"",ERROR},
-#line 141 "TokenLookup.gperf"
+#line 168 "TokenLookup.gperf"
       {"in",                       IN},
       {"",ERROR},
-#line 143 "TokenLookup.gperf"
+#line 170 "TokenLookup.gperf"
       {"intersect",                INTERSECT},
-#line 185 "TokenLookup.gperf"
+#line 212 "TokenLookup.gperf"
       {"union",                    UNION},
       {"",ERROR},
-#line 167 "TokenLookup.gperf"
+#line 194 "TokenLookup.gperf"
       {"preceding-sibling",        PRECEDING_SIBLING},
-#line 161 "TokenLookup.gperf"
+#line 188 "TokenLookup.gperf"
       {"ordering",                 ORDERING},
-#line 176 "TokenLookup.gperf"
+#line 203 "TokenLookup.gperf"
       {"some",                     SOME},
-#line 107 "TokenLookup.gperf"
+#line 134 "TokenLookup.gperf"
       {"child",                    CHILD},
       {"",ERROR},
-#line 160 "TokenLookup.gperf"
+#line 187 "TokenLookup.gperf"
       {"ordered",                  ORDERED},
-#line 188 "TokenLookup.gperf"
+#line 215 "TokenLookup.gperf"
       {"variable",                 VARIABLE},
       {"",ERROR}, {"",ERROR}, {"",ERROR},
-#line 163 "TokenLookup.gperf"
+#line 190 "TokenLookup.gperf"
       {"or",                       OR},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
-#line 109 "TokenLookup.gperf"
+#line 136 "TokenLookup.gperf"
       {"comment",                  COMMENT},
       {"",ERROR}, {"",ERROR},
-#line 184 "TokenLookup.gperf"
+#line 211 "TokenLookup.gperf"
       {"typeswitch",               TYPESWITCH},
       {"",ERROR},
-#line 140 "TokenLookup.gperf"
+#line 167 "TokenLookup.gperf"
       {"inherit",                  INHERIT},
-#line 117 "TokenLookup.gperf"
+#line 144 "TokenLookup.gperf"
       {"div",                      DIV},
       {"",ERROR}, {"",ERROR},
-#line 152 "TokenLookup.gperf"
+#line 179 "TokenLookup.gperf"
       {"module",                   MODULE},
       {"",ERROR},
-#line 132 "TokenLookup.gperf"
+#line 159 "TokenLookup.gperf"
       {"for",                      FOR},
-#line 153 "TokenLookup.gperf"
+#line 180 "TokenLookup.gperf"
       {"namespace",                NAMESPACE},
       {"",ERROR}, {"",ERROR},
-#line 189 "TokenLookup.gperf"
+#line 216 "TokenLookup.gperf"
       {"version",                  VERSION},
       {"",ERROR}, {"",ERROR},
-#line 179 "TokenLookup.gperf"
+#line 206 "TokenLookup.gperf"
       {"strip",                    STRIP},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
-#line 162 "TokenLookup.gperf"
+#line 189 "TokenLookup.gperf"
       {"order",                    ORDER},
-#line 164 "TokenLookup.gperf"
+#line 191 "TokenLookup.gperf"
       {"parent",                   PARENT},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR}, {"",ERROR},
-#line 151 "TokenLookup.gperf"
+#line 178 "TokenLookup.gperf"
       {"mod",                      MOD},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR},
-#line 139 "TokenLookup.gperf"
+#line 166 "TokenLookup.gperf"
       {"import",                   IMPORT},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR}, {"",ERROR},
-#line 169 "TokenLookup.gperf"
+#line 196 "TokenLookup.gperf"
       {"processing-instruction",   PROCESSING_INSTRUCTION},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR}, {"",ERROR},
-#line 145 "TokenLookup.gperf"
+#line 172 "TokenLookup.gperf"
       {"item",                     ITEM},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
@@ -378,7 +418,7 @@ TokenLookup::value (register const char *str, register unsigned int len)
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR}, {"",ERROR}, {"",ERROR}, {"",ERROR},
       {"",ERROR},
-#line 137 "TokenLookup.gperf"
+#line 164 "TokenLookup.gperf"
       {"idiv",                     IDIV}
     };
 
@@ -396,7 +436,7 @@ TokenLookup::value (register const char *str, register unsigned int len)
     }
   return 0;
 }
-#line 192 "TokenLookup.gperf"
+#line 219 "TokenLookup.gperf"
 
 
 } /* Close the QPatternist namespace. */