28 files changed, 81 insertions, 66 deletions
diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp
index f24b456..72f613a 100644
--- a/src/declarative/debugger/qmldebug.cpp
+++ b/src/declarative/debugger/qmldebug.cpp
@@ -331,7 +331,7 @@ void QmlEngineDebugPrivate::message(const QByteArray &data)
         QVariant value;
         ds >> queryId >> debugId >> name >> value;
 
-        QmlDebugWatch *watch = watched.value(queryId);
+        QmlDebugWatch *watch = watched.value(queryId, 0);
         if (!watch)
             return;
         emit watch->valueChanged(name, value);
@@ -428,13 +428,15 @@ void QmlEngineDebug::removeWatch(QmlDebugWatch *watch)
 {
     Q_D(QmlEngineDebug);
 
-    if (!watch || watch->state() == QmlDebugWatch::Inactive || watch->state() == QmlDebugWatch::Dead)
+    if (!watch || !watch->m_client)
         return;
 
+    watch->m_client = 0;
     watch->setState(QmlDebugWatch::Inactive);
+    
     d->watched.remove(watch->queryId());
 
-    if (d->client->isConnected()) {
+    if (d->client && d->client->isConnected()) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("NO_WATCH") << watch->queryId();
@@ -562,8 +564,6 @@ QmlDebugWatch::QmlDebugWatch(QObject *parent)
 
 QmlDebugWatch::~QmlDebugWatch()
 {
-    if (m_client)
-        m_client->removeWatch(this);
 }
 
 int QmlDebugWatch::queryId() const
diff --git a/src/declarative/debugger/qmldebug_p.h b/src/declarative/debugger/qmldebug_p.h
index 4bc54e8..cd2adf6 100644
--- a/src/declarative/debugger/qmldebug_p.h
+++ b/src/declarative/debugger/qmldebug_p.h
@@ -113,7 +113,7 @@ public:
     State state() const;
 
 Q_SIGNALS:
-    void stateChanged(State);
+    void stateChanged(QmlDebugWatch::State);
     //void objectChanged(int, const QmlDebugObjectReference &);
     //void valueChanged(int, const QVariant &);
 
@@ -170,7 +170,7 @@ public:
 //    bool waitUntilCompleted();
 
 Q_SIGNALS:
-    void stateChanged(State);
+    void stateChanged(QmlDebugQuery::State);
 
 protected:
     QmlDebugQuery(QObject *);
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 41fee96..e5e604b 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -19,7 +19,6 @@ include(3rdparty/3rdparty.pri)
 include(util/util.pri)
 include(graphicsitems/graphicsitems.pri)
 include(qml/qml.pri)
-include(extra/extra.pri)
 include(widgets/widgets.pri)
 include(debugger/debugger.pri)
 
diff --git a/src/declarative/extra/extra.pri b/src/declarative/extra/extra.pri
deleted file mode 100644
index 78272a9..0000000
--- a/src/declarative/extra/extra.pri
+++ /dev/null
@@ -1,23 +0,0 @@
-SOURCES += \
-           extra/qnumberformat.cpp \
-           extra/qmlnumberformatter.cpp \
-           extra/qmldatetimeformatter.cpp \
-           extra/qmlgraphicsanimatedimageitem.cpp \
-           extra/qmlbehavior.cpp \
-           extra/qmlfontloader.cpp
-
-HEADERS += \
-           extra/qnumberformat_p.h \
-           extra/qmlnumberformatter_p.h \
-           extra/qmldatetimeformatter_p.h \
-           extra/qmlgraphicsanimatedimageitem_p.h \
-           extra/qmlgraphicsanimatedimageitem_p_p.h \
-           extra/qmlbehavior_p.h \
-           extra/qmlfontloader_p.h
-
-contains(QT_CONFIG, xmlpatterns) {
-    QT+=xmlpatterns
-    SOURCES += extra/qmlxmllistmodel.cpp
-    HEADERS += extra/qmlxmllistmodel_p.h
-}
-
diff --git a/src/declarative/graphicsitems/graphicsitems.pri b/src/declarative/graphicsitems/graphicsitems.pri
index 3c4e39a..ef10e51 100644
--- a/src/declarative/graphicsitems/graphicsitems.pri
+++ b/src/declarative/graphicsitems/graphicsitems.pri
@@ -14,6 +14,8 @@ HEADERS += \
            graphicsitems/qmlgraphicsimage_p_p.h \
            graphicsitems/qmlgraphicsborderimage_p_p.h \
            graphicsitems/qmlgraphicsimagebase_p_p.h \
+           graphicsitems/qmlgraphicsanimatedimage_p.h \
+           graphicsitems/qmlgraphicsanimatedimage_p_p.h \
            graphicsitems/qmlgraphicsitem.h \
            graphicsitems/qmlgraphicsitem_p.h \
            graphicsitems/qmlgraphicsfocuspanel_p.h \
@@ -55,6 +57,7 @@ SOURCES += \
            graphicsitems/qmlgraphicsimage.cpp \
            graphicsitems/qmlgraphicsborderimage.cpp \
            graphicsitems/qmlgraphicsimagebase.cpp \
+           graphicsitems/qmlgraphicsanimatedimage.cpp \
            graphicsitems/qmlgraphicspainteditem.cpp \
            graphicsitems/qmlgraphicsitem.cpp \
            graphicsitems/qmlgraphicsfocuspanel.cpp \
diff --git a/src/declarative/extra/qmlgraphicsanimatedimageitem.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
index c364684..2405bde 100644
--- a/src/declarative/extra/qmlgraphicsanimatedimageitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
     QMovie::supportedFormats().
 
     \table
-    \row
+    \row 
     \o \image animatedimageitem.gif
     \o
     \qml
@@ -83,6 +83,11 @@ QmlGraphicsAnimatedImageItem::QmlGraphicsAnimatedImageItem(QmlGraphicsItem *pare
 {
 }
 
+QmlGraphicsAnimatedImageItem::QmlGraphicsAnimatedImageItem(QmlGraphicsAnimatedImageItemPrivate &dd, QmlGraphicsItem *parent)
+    : QmlGraphicsImage(dd, parent)
+{
+}
+
 QmlGraphicsAnimatedImageItem::~QmlGraphicsAnimatedImageItem()
 {
     Q_D(QmlGraphicsAnimatedImageItem);
diff --git a/src/declarative/extra/qmlgraphicsanimatedimageitem_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h
index d716114..79daa0f 100644
--- a/src/declarative/extra/qmlgraphicsanimatedimageitem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLGRAPHICSANIMATEDIMAGEITEM_H
-#define QMLGRAPHICSANIMATEDIMAGEITEM_H
+#ifndef QMLGRAPHICSANIMATEDIMAGE_H
+#define QMLGRAPHICSANIMATEDIMAGE_H
 
 #include <private/qmlgraphicsimage_p.h>
 
@@ -51,9 +51,9 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QMovie;
-class QmlGraphicsAnimatedImageItemPrivate;
+class QmlGraphicsAnimatedImagePrivate;
 
-class Q_DECLARATIVE_EXPORT QmlGraphicsAnimatedImageItem : public QmlGraphicsImage
+class Q_DECLARATIVE_EXPORT QmlGraphicsAnimatedImage : public QmlGraphicsImage
 {
     Q_OBJECT
 
@@ -62,8 +62,8 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsAnimatedImageItem : public QmlGraphicsImag
     Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame NOTIFY frameChanged)
     Q_PROPERTY(int frameCount READ frameCount)
 public:
-    QmlGraphicsAnimatedImageItem(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsAnimatedImageItem();
+    QmlGraphicsAnimatedImage(QmlGraphicsItem *parent=0);
+    ~QmlGraphicsAnimatedImage();
 
     bool isPlaying() const;
     void setPlaying(bool play);
@@ -93,13 +93,13 @@ protected:
     void componentComplete();
 
 private:
-    Q_DISABLE_COPY(QmlGraphicsAnimatedImageItem)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsAnimatedImageItem)
+    Q_DISABLE_COPY(QmlGraphicsAnimatedImage)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsAnimatedImage)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QmlGraphicsAnimatedImageItem)
+QML_DECLARE_TYPE(QmlGraphicsAnimatedImage)
 
 QT_END_HEADER
 
diff --git a/src/declarative/extra/qmlgraphicsanimatedimageitem_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h
index 2256b9b..c24afa0 100644
--- a/src/declarative/extra/qmlgraphicsanimatedimageitem_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h
@@ -60,12 +60,12 @@ QT_BEGIN_NAMESPACE
 class QMovie;
 class QNetworkReply;
 
-class QmlGraphicsAnimatedImageItemPrivate : public QmlGraphicsImagePrivate
+class QmlGraphicsAnimatedImagePrivate : public QmlGraphicsImagePrivate
 {
-    Q_DECLARE_PUBLIC(QmlGraphicsAnimatedImageItem)
+    Q_DECLARE_PUBLIC(QmlGraphicsAnimatedImage)
 
 public:
-    QmlGraphicsAnimatedImageItemPrivate()
+    QmlGraphicsAnimatedImagePrivate()
       : playing(true), paused(false), preset_currentframe(0), _movie(0), reply(0)
     {
     }
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index 572aa98..aa5c4cb 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -1329,9 +1329,9 @@ QmlGraphicsKeysAttached *QmlGraphicsKeysAttached::qmlAttachedProperties(QObject
 
     Key handling is available to all Item-based visual elements via the \l {Keys}{Keys}
     attached property.  The \e Keys attached property provides basic handlers such
-    as \l {Keys::onPressed(event)}{onPressed} and \l {Keys::onReleased(event)}{onReleased},
+    as \l {Keys::onPressed}{onPressed} and \l {Keys::onReleased}{onReleased},
     as well as handlers for specific keys, such as
-    \l {Keys::onCancelPressed(event)}{onCancelPressed}.  The example below
+    \l {Keys::onCancelPressed}{onCancelPressed}.  The example below
     assigns \l {qmlfocus}{focus} to the item and handles
     the Left key via the general \e onPressed handler and the Select key via the
     onSelectPressed handler:
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
index 12bf0d8..edcd094 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
@@ -1663,7 +1663,7 @@ void QmlGraphicsListView::keyPressEvent(QKeyEvent *event)
 }
 
 /*!
-    \qmlmethod ListView::incrementCurrentIndex
+    \qmlmethod ListView::incrementCurrentIndex()
 
     Increments the current index.  The current index will wrap
     if keyNavigationWraps is true and it is currently at the end.
@@ -1680,7 +1680,7 @@ void QmlGraphicsListView::incrementCurrentIndex()
 }
 
 /*!
-    \qmlmethod ListView::decrementCurrentIndex
+    \qmlmethod ListView::decrementCurrentIndex()
 
     Decrements the current index.  The current index will wrap
     if keyNavigationWraps is true and it is currently at the beginning.
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
index 2c849c8..b1b1210 100644
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
@@ -49,6 +49,7 @@
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
+#include <QPaintEngine>
 
 QT_BEGIN_NAMESPACE
 
@@ -209,9 +210,24 @@ void QmlGraphicsPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *
 
     ++inpaint;
 
-    const QRect clip = p->clipRegion().boundingRect();
+    const QTransform &x = p->deviceTransform();
+    QTransform xinv = x.inverted();
+    QRegion effectiveClip;
+    QRegion sysClip = p->paintEngine()->systemClip();
+    if (xinv.type() <= QTransform::TxScale && sysClip.numRects() < 5) {
+        // simple transform, region gets no more complicated...
+        effectiveClip = xinv.map(sysClip);
+    } else {
+        // do not make complicated regions...
+        effectiveClip = xinv.mapRect(sysClip.boundingRect());
+    }
+
+    QRegion topaint = p->clipRegion();
+    if (topaint.isEmpty())
+        topaint = effectiveClip;
+    else
+        topaint &= effectiveClip;
 
-    QRegion topaint(clip);
     topaint &= content;
     QRegion uncached(content);
     p->setRenderHints(QPainter::SmoothPixmapTransform, d->smooth);
diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
index 399e1a5..a0b41e8 100644
--- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
@@ -1169,7 +1169,7 @@ void QmlGraphicsParticles::setMotion(QmlGraphicsParticleMotion *motion)
 }
 
 /*!
-    \qmlmethod Particles::burst
+    \qmlmethod Particles::burst(int count, int emissionRate)
 
     Initiates a burst of particles.
 
diff --git a/src/declarative/extra/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp
index 8364d8c..8364d8c 100644
--- a/src/declarative/extra/qmlbehavior.cpp
+++ b/src/declarative/util/qmlbehavior.cpp
diff --git a/src/declarative/extra/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h
index 9f85f84..9f85f84 100644
--- a/src/declarative/extra/qmlbehavior_p.h
+++ b/src/declarative/util/qmlbehavior_p.h
diff --git a/src/declarative/extra/qmldatetimeformatter.cpp b/src/declarative/util/qmldatetimeformatter.cpp
index 983287e..983287e 100644
--- a/src/declarative/extra/qmldatetimeformatter.cpp
+++ b/src/declarative/util/qmldatetimeformatter.cpp
diff --git a/src/declarative/extra/qmldatetimeformatter_p.h b/src/declarative/util/qmldatetimeformatter_p.h
index e350f96..e350f96 100644
--- a/src/declarative/extra/qmldatetimeformatter_p.h
+++ b/src/declarative/util/qmldatetimeformatter_p.h
diff --git a/src/declarative/extra/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
index 36ee1bb..36ee1bb 100644
--- a/src/declarative/extra/qmlfontloader.cpp
+++ b/src/declarative/util/qmlfontloader.cpp
diff --git a/src/declarative/extra/qmlfontloader_p.h b/src/declarative/util/qmlfontloader_p.h
index d02a181..d02a181 100644
--- a/src/declarative/extra/qmlfontloader_p.h
+++ b/src/declarative/util/qmlfontloader_p.h
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 19282eb..9e91147 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -467,7 +467,7 @@ void QmlListModel::remove(int index)
 }
 
 /*!
-    \qmlmethod ListModel::insert(index,dict)
+    \qmlmethod ListModel::insert(int index, jsobject dict)
 
     Adds a new item to the list model at position \a index, with the
     values in \a dict.
@@ -500,7 +500,7 @@ void QmlListModel::insert(int index, const QScriptValue& valuemap)
 }
 
 /*!
-    \qmlmethod ListModel::move(from,to,n)
+    \qmlmethod ListModel::move(int from, int to, int n)
 
     Moves \a n items \a from one position \a to another.
 
@@ -551,7 +551,7 @@ void QmlListModel::move(int from, int to, int n)
 }
 
 /*!
-    \qmlmethod ListModel::append(dict)
+    \qmlmethod ListModel::append(jsobject dict)
 
     Adds a new item to the end of the list model, with the
     values in \a dict.
@@ -578,7 +578,7 @@ void QmlListModel::append(const QScriptValue& valuemap)
 }
 
 /*!
-    \qmlmethod object ListModel::get(index)
+    \qmlmethod object ListModel::get(int index)
 
     Returns the item at \a index in the list model.
 
@@ -620,7 +620,7 @@ QScriptValue QmlListModel::get(int index) const
 }
 
 /*!
-    \qmlmethod ListModel::set(index,dict)
+    \qmlmethod ListModel::set(int index, jsobject dict)
 
     Changes the item at \a index in the list model with the
     values in \a dict. Properties not appearing in \a valuemap
@@ -663,7 +663,7 @@ void QmlListModel::set(int index, const QScriptValue& valuemap)
 }
 
 /*!
-    \qmlmethod ListModel::set(index,property,value)
+    \qmlmethod ListModel::set(int index, string property, variant value)
 
     Changes the \a property of the item at \a index in the list model to \a value.
 
diff --git a/src/declarative/extra/qmlnumberformatter.cpp b/src/declarative/util/qmlnumberformatter.cpp
index 4007d95..b09be5b 100644
--- a/src/declarative/extra/qmlnumberformatter.cpp
+++ b/src/declarative/util/qmlnumberformatter.cpp
@@ -108,7 +108,7 @@ QString QmlNumberFormatter::text() const
 }
 
 /*!
-    \qmlproperty qreal NumberFormatter::number
+    \qmlproperty real NumberFormatter::number
    
     A single point precision number. (Doubles are not yet supported)
 
diff --git a/src/declarative/extra/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h
index 0036cb9..0036cb9 100644
--- a/src/declarative/extra/qmlnumberformatter_p.h
+++ b/src/declarative/util/qmlnumberformatter_p.h
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp
index 4f213a8..3d90b44 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/util/qmlxmllistmodel.cpp
@@ -463,7 +463,7 @@ QHash<int,QVariant> QmlXmlListModel::data(int index, const QList<int> &roles) co
     for (int i = 0; i < roles.size(); ++i) {
         int role = roles.at(i);
         int roleIndex = d->roles.indexOf(role);
-        rv.insert(role, d->data.at(roleIndex).at(index));
+        rv.insert(role, roleIndex == -1 ? QVariant() : d->data.at(roleIndex).at(index));
     }
     return rv;
 }
diff --git a/src/declarative/extra/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h
index 18bf9d2..18bf9d2 100644
--- a/src/declarative/extra/qmlxmllistmodel_p.h
+++ b/src/declarative/util/qmlxmllistmodel_p.h
diff --git a/src/declarative/extra/qnumberformat.cpp b/src/declarative/util/qnumberformat.cpp
index c6a03e9..c6a03e9 100644
--- a/src/declarative/extra/qnumberformat.cpp
+++ b/src/declarative/util/qnumberformat.cpp
diff --git a/src/declarative/extra/qnumberformat_p.h b/src/declarative/util/qnumberformat_p.h
index 1a7b8e4..1a7b8e4 100644
--- a/src/declarative/extra/qnumberformat_p.h
+++ b/src/declarative/util/qnumberformat_p.h
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index f955ef6..4223f4e 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -21,7 +21,12 @@ SOURCES += \
            util/qmltimer.cpp \
            util/qmlbind.cpp \
            util/qmlpropertymap.cpp \
-           util/qmlpixmapcache.cpp
+           util/qmlpixmapcache.cpp \
+           util/qnumberformat.cpp \
+           util/qmlnumberformatter.cpp \
+           util/qmldatetimeformatter.cpp \
+           util/qmlbehavior.cpp \
+           util/qmlfontloader.cpp
 
 HEADERS += \
            util/qmlview.h \
@@ -49,4 +54,15 @@ HEADERS += \
            util/qmltimer_p.h \
            util/qmlbind_p.h \
            util/qmlpropertymap_p.h \
-           util/qmlpixmapcache_p.h
+           util/qmlpixmapcache_p.h \
+           util/qnumberformat_p.h \
+           util/qmlnumberformatter_p.h \
+           util/qmldatetimeformatter_p.h \
+           util/qmlbehavior_p.h \
+           util/qmlfontloader_p.h
+
+contains(QT_CONFIG, xmlpatterns) {
+    QT+=xmlpatterns
+    SOURCES += util/qmlxmllistmodel.cpp
+    HEADERS += util/qmlxmllistmodel_p.h
+}
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index 87585a2..90c0ff2 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -3275,13 +3275,10 @@ void QGraphicsView::paintEvent(QPaintEvent *event)
 
     // Determine the exposed region
     d->exposedRegion = event->region();
-    if (d->exposedRegion.isEmpty())
-        d->exposedRegion = viewport()->rect();
     QRectF exposedSceneRect = mapToScene(d->exposedRegion.boundingRect()).boundingRect();
 
     // Set up the painter
     QPainter painter(viewport());
-    painter.setClipRect(event->rect(), Qt::IntersectClip);
 #ifndef QT_NO_RUBBERBAND
     if (d->rubberBanding && !d->rubberBandRect.isEmpty())
         painter.save();
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index 64c5152..afd3570 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -161,9 +161,11 @@ public Q_SLOTS:
             cond.wakeOne();
         }
 #ifndef QT_NO_THREAD
-        if (!wait(QHOSTINFO_THREAD_WAIT))
+        if (!wait(QHOSTINFO_THREAD_WAIT)) {
             terminate();
-        wait();
+            // Don't wait forever; see QTBUG-5296.
+            wait(QHOSTINFO_THREAD_WAIT);
+        }
 #endif
     }