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

46 files changed, 1168 insertions, 568 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
index 96d0867..f15316b 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
@@ -221,31 +221,31 @@ void QDeclarativeAnchorsPrivate::clearItem(QGraphicsObject *item)
         centerIn = 0;
     if (left.item == item) {
         left.item = 0;
-        usedAnchors &= ~QDeclarativeAnchors::HasLeftAnchor;
+        usedAnchors &= ~QDeclarativeAnchors::LeftAnchor;
     }
     if (right.item == item) {
         right.item = 0;
-        usedAnchors &= ~QDeclarativeAnchors::HasRightAnchor;
+        usedAnchors &= ~QDeclarativeAnchors::RightAnchor;
     }
     if (top.item == item) {
         top.item = 0;
-        usedAnchors &= ~QDeclarativeAnchors::HasTopAnchor;
+        usedAnchors &= ~QDeclarativeAnchors::TopAnchor;
     }
     if (bottom.item == item) {
         bottom.item = 0;
-        usedAnchors &= ~QDeclarativeAnchors::HasBottomAnchor;
+        usedAnchors &= ~QDeclarativeAnchors::BottomAnchor;
     }
     if (vCenter.item == item) {
         vCenter.item = 0;
-        usedAnchors &= ~QDeclarativeAnchors::HasVCenterAnchor;
+        usedAnchors &= ~QDeclarativeAnchors::VCenterAnchor;
     }
     if (hCenter.item == item) {
         hCenter.item = 0;
-        usedAnchors &= ~QDeclarativeAnchors::HasHCenterAnchor;
+        usedAnchors &= ~QDeclarativeAnchors::HCenterAnchor;
     }
     if (baseline.item == item) {
         baseline.item = 0;
-        usedAnchors &= ~QDeclarativeAnchors::HasBaselineAnchor;
+        usedAnchors &= ~QDeclarativeAnchors::BaselineAnchor;
     }
 }
 
@@ -495,13 +495,13 @@ void QDeclarativeAnchorsPrivate::updateVerticalAnchors()
     if (updatingVerticalAnchor < 2) {
         ++updatingVerticalAnchor;
         QGraphicsItemPrivate *itemPrivate = QGraphicsItemPrivate::get(item);
-        if (usedAnchors & QDeclarativeAnchors::HasTopAnchor) {
+        if (usedAnchors & QDeclarativeAnchors::TopAnchor) {
             //Handle stretching
             bool invalid = true;
             int height = 0;
-            if (usedAnchors & QDeclarativeAnchors::HasBottomAnchor) {
+            if (usedAnchors & QDeclarativeAnchors::BottomAnchor) {
                 invalid = calcStretch(top, bottom, topMargin, -bottomMargin, QDeclarativeAnchorLine::Top, height);
-            } else if (usedAnchors & QDeclarativeAnchors::HasVCenterAnchor) {
+            } else if (usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
                 invalid = calcStretch(top, vCenter, topMargin, vCenterOffset, QDeclarativeAnchorLine::Top, height);
                 height *= 2;
             }
@@ -514,9 +514,9 @@ void QDeclarativeAnchorsPrivate::updateVerticalAnchors()
             } else if (top.item->parentItem() == item->parentItem()) {
                 setItemY(position(top.item, top.anchorLine) + topMargin);
             }
-        } else if (usedAnchors & QDeclarativeAnchors::HasBottomAnchor) {
+        } else if (usedAnchors & QDeclarativeAnchors::BottomAnchor) {
             //Handle stretching (top + bottom case is handled above)
-            if (usedAnchors & QDeclarativeAnchors::HasVCenterAnchor) {
+            if (usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
                 int height = 0;
                 bool invalid = calcStretch(vCenter, bottom, vCenterOffset, -bottomMargin,
                                               QDeclarativeAnchorLine::Top, height);
@@ -530,7 +530,7 @@ void QDeclarativeAnchorsPrivate::updateVerticalAnchors()
             } else if (bottom.item->parentItem() == item->parentItem()) {
                 setItemY(position(bottom.item, bottom.anchorLine) - itemPrivate->height() - bottomMargin);
             }
-        } else if (usedAnchors & QDeclarativeAnchors::HasVCenterAnchor) {
+        } else if (usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
             //(stetching handled above)
 
             //Handle vCenter
@@ -540,7 +540,7 @@ void QDeclarativeAnchorsPrivate::updateVerticalAnchors()
             } else if (vCenter.item->parentItem() == item->parentItem()) {
                 setItemY(position(vCenter.item, vCenter.anchorLine) - itemPrivate->height()/2 + vCenterOffset);
             }
-        } else if (usedAnchors & QDeclarativeAnchors::HasBaselineAnchor) {
+        } else if (usedAnchors & QDeclarativeAnchors::BaselineAnchor) {
             //Handle baseline
             if (baseline.item == item->parentItem()) {
                 if (itemPrivate->isDeclarativeItem)
@@ -567,13 +567,13 @@ void QDeclarativeAnchorsPrivate::updateHorizontalAnchors()
     if (updatingHorizontalAnchor < 2) {
         ++updatingHorizontalAnchor;
         QGraphicsItemPrivate *itemPrivate = QGraphicsItemPrivate::get(item);
-        if (usedAnchors & QDeclarativeAnchors::HasLeftAnchor) {
+        if (usedAnchors & QDeclarativeAnchors::LeftAnchor) {
             //Handle stretching
             bool invalid = true;
             int width = 0;
-            if (usedAnchors & QDeclarativeAnchors::HasRightAnchor) {
+            if (usedAnchors & QDeclarativeAnchors::RightAnchor) {
                 invalid = calcStretch(left, right, leftMargin, -rightMargin, QDeclarativeAnchorLine::Left, width);
-            } else if (usedAnchors & QDeclarativeAnchors::HasHCenterAnchor) {
+            } else if (usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
                 invalid = calcStretch(left, hCenter, leftMargin, hCenterOffset, QDeclarativeAnchorLine::Left, width);
                 width *= 2;
             }
@@ -586,9 +586,9 @@ void QDeclarativeAnchorsPrivate::updateHorizontalAnchors()
             } else if (left.item->parentItem() == item->parentItem()) {
                 setItemX(position(left.item, left.anchorLine) + leftMargin);
             }
-        } else if (usedAnchors & QDeclarativeAnchors::HasRightAnchor) {
+        } else if (usedAnchors & QDeclarativeAnchors::RightAnchor) {
             //Handle stretching (left + right case is handled in updateLeftAnchor)
-            if (usedAnchors & QDeclarativeAnchors::HasHCenterAnchor) {
+            if (usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
                 int width = 0;
                 bool invalid = calcStretch(hCenter, right, hCenterOffset, -rightMargin,
                                               QDeclarativeAnchorLine::Left, width);
@@ -602,7 +602,7 @@ void QDeclarativeAnchorsPrivate::updateHorizontalAnchors()
             } else if (right.item->parentItem() == item->parentItem()) {
                 setItemX(position(right.item, right.anchorLine) - itemPrivate->width() - rightMargin);
             }
-        } else if (usedAnchors & QDeclarativeAnchors::HasHCenterAnchor) {
+        } else if (usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
             //Handle hCenter
             if (hCenter.item == item->parentItem()) {
                 setItemX(adjustedPosition(hCenter.item, hCenter.anchorLine) - itemPrivate->width()/2 + hCenterOffset);
@@ -630,10 +630,10 @@ void QDeclarativeAnchors::setTop(const QDeclarativeAnchorLine &edge)
     if (!d->checkVAnchorValid(edge) || d->top == edge)
         return;
 
-    d->usedAnchors |= HasTopAnchor;
+    d->usedAnchors |= TopAnchor;
 
     if (!d->checkVValid()) {
-        d->usedAnchors &= ~HasTopAnchor;
+        d->usedAnchors &= ~TopAnchor;
         return;
     }
 
@@ -647,7 +647,7 @@ void QDeclarativeAnchors::setTop(const QDeclarativeAnchorLine &edge)
 void QDeclarativeAnchors::resetTop()
 {
     Q_D(QDeclarativeAnchors);
-    d->usedAnchors &= ~HasTopAnchor;
+    d->usedAnchors &= ~TopAnchor;
     d->remDepend(d->top.item);
     d->top = QDeclarativeAnchorLine();
     emit topChanged();
@@ -666,10 +666,10 @@ void QDeclarativeAnchors::setBottom(const QDeclarativeAnchorLine &edge)
     if (!d->checkVAnchorValid(edge) || d->bottom == edge)
         return;
 
-    d->usedAnchors |= HasBottomAnchor;
+    d->usedAnchors |= BottomAnchor;
 
     if (!d->checkVValid()) {
-        d->usedAnchors &= ~HasBottomAnchor;
+        d->usedAnchors &= ~BottomAnchor;
         return;
     }
 
@@ -683,7 +683,7 @@ void QDeclarativeAnchors::setBottom(const QDeclarativeAnchorLine &edge)
 void QDeclarativeAnchors::resetBottom()
 {
     Q_D(QDeclarativeAnchors);
-    d->usedAnchors &= ~HasBottomAnchor;
+    d->usedAnchors &= ~BottomAnchor;
     d->remDepend(d->bottom.item);
     d->bottom = QDeclarativeAnchorLine();
     emit bottomChanged();
@@ -702,10 +702,10 @@ void QDeclarativeAnchors::setVerticalCenter(const QDeclarativeAnchorLine &edge)
     if (!d->checkVAnchorValid(edge) || d->vCenter == edge)
         return;
 
-    d->usedAnchors |= HasVCenterAnchor;
+    d->usedAnchors |= VCenterAnchor;
 
     if (!d->checkVValid()) {
-        d->usedAnchors &= ~HasVCenterAnchor;
+        d->usedAnchors &= ~VCenterAnchor;
         return;
     }
 
@@ -719,7 +719,7 @@ void QDeclarativeAnchors::setVerticalCenter(const QDeclarativeAnchorLine &edge)
 void QDeclarativeAnchors::resetVerticalCenter()
 {
     Q_D(QDeclarativeAnchors);
-    d->usedAnchors &= ~HasVCenterAnchor;
+    d->usedAnchors &= ~VCenterAnchor;
     d->remDepend(d->vCenter.item);
     d->vCenter = QDeclarativeAnchorLine();
     emit verticalCenterChanged();
@@ -738,10 +738,10 @@ void QDeclarativeAnchors::setBaseline(const QDeclarativeAnchorLine &edge)
     if (!d->checkVAnchorValid(edge) || d->baseline == edge)
         return;
 
-    d->usedAnchors |= HasBaselineAnchor;
+    d->usedAnchors |= BaselineAnchor;
 
     if (!d->checkVValid()) {
-        d->usedAnchors &= ~HasBaselineAnchor;
+        d->usedAnchors &= ~BaselineAnchor;
         return;
     }
 
@@ -755,7 +755,7 @@ void QDeclarativeAnchors::setBaseline(const QDeclarativeAnchorLine &edge)
 void QDeclarativeAnchors::resetBaseline()
 {
     Q_D(QDeclarativeAnchors);
-    d->usedAnchors &= ~HasBaselineAnchor;
+    d->usedAnchors &= ~BaselineAnchor;
     d->remDepend(d->baseline.item);
     d->baseline = QDeclarativeAnchorLine();
     emit baselineChanged();
@@ -774,10 +774,10 @@ void QDeclarativeAnchors::setLeft(const QDeclarativeAnchorLine &edge)
     if (!d->checkHAnchorValid(edge) || d->left == edge)
         return;
 
-    d->usedAnchors |= HasLeftAnchor;
+    d->usedAnchors |= LeftAnchor;
 
     if (!d->checkHValid()) {
-        d->usedAnchors &= ~HasLeftAnchor;
+        d->usedAnchors &= ~LeftAnchor;
         return;
     }
 
@@ -791,7 +791,7 @@ void QDeclarativeAnchors::setLeft(const QDeclarativeAnchorLine &edge)
 void QDeclarativeAnchors::resetLeft()
 {
     Q_D(QDeclarativeAnchors);
-    d->usedAnchors &= ~HasLeftAnchor;
+    d->usedAnchors &= ~LeftAnchor;
     d->remDepend(d->left.item);
     d->left = QDeclarativeAnchorLine();
     emit leftChanged();
@@ -810,10 +810,10 @@ void QDeclarativeAnchors::setRight(const QDeclarativeAnchorLine &edge)
     if (!d->checkHAnchorValid(edge) || d->right == edge)
         return;
 
-    d->usedAnchors |= HasRightAnchor;
+    d->usedAnchors |= RightAnchor;
 
     if (!d->checkHValid()) {
-        d->usedAnchors &= ~HasRightAnchor;
+        d->usedAnchors &= ~RightAnchor;
         return;
     }
 
@@ -827,7 +827,7 @@ void QDeclarativeAnchors::setRight(const QDeclarativeAnchorLine &edge)
 void QDeclarativeAnchors::resetRight()
 {
     Q_D(QDeclarativeAnchors);
-    d->usedAnchors &= ~HasRightAnchor;
+    d->usedAnchors &= ~RightAnchor;
     d->remDepend(d->right.item);
     d->right = QDeclarativeAnchorLine();
     emit rightChanged();
@@ -846,10 +846,10 @@ void QDeclarativeAnchors::setHorizontalCenter(const QDeclarativeAnchorLine &edge
     if (!d->checkHAnchorValid(edge) || d->hCenter == edge)
         return;
 
-    d->usedAnchors |= HasHCenterAnchor;
+    d->usedAnchors |= HCenterAnchor;
 
     if (!d->checkHValid()) {
-        d->usedAnchors &= ~HasHCenterAnchor;
+        d->usedAnchors &= ~HCenterAnchor;
         return;
     }
 
@@ -863,7 +863,7 @@ void QDeclarativeAnchors::setHorizontalCenter(const QDeclarativeAnchorLine &edge
 void QDeclarativeAnchors::resetHorizontalCenter()
 {
     Q_D(QDeclarativeAnchors);
-    d->usedAnchors &= ~HasHCenterAnchor;
+    d->usedAnchors &= ~HCenterAnchor;
     d->remDepend(d->hCenter.item);
     d->hCenter = QDeclarativeAnchorLine();
     emit horizontalCenterChanged();
@@ -1025,7 +1025,7 @@ void QDeclarativeAnchors::setBaselineOffset(qreal offset)
     emit baselineOffsetChanged();
 }
 
-QDeclarativeAnchors::UsedAnchors QDeclarativeAnchors::usedAnchors() const
+QDeclarativeAnchors::Anchors QDeclarativeAnchors::usedAnchors() const
 {
     Q_D(const QDeclarativeAnchors);
     return d->usedAnchors;
@@ -1033,9 +1033,9 @@ QDeclarativeAnchors::UsedAnchors QDeclarativeAnchors::usedAnchors() const
 
 bool QDeclarativeAnchorsPrivate::checkHValid() const
 {
-    if (usedAnchors & QDeclarativeAnchors::HasLeftAnchor &&
-        usedAnchors & QDeclarativeAnchors::HasRightAnchor &&
-        usedAnchors & QDeclarativeAnchors::HasHCenterAnchor) {
+    if (usedAnchors & QDeclarativeAnchors::LeftAnchor &&
+        usedAnchors & QDeclarativeAnchors::RightAnchor &&
+        usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
         qmlInfo(item) << QDeclarativeAnchors::tr("Cannot specify left, right, and hcenter anchors.");
         return false;
     }
@@ -1064,15 +1064,15 @@ bool QDeclarativeAnchorsPrivate::checkHAnchorValid(QDeclarativeAnchorLine anchor
 
 bool QDeclarativeAnchorsPrivate::checkVValid() const
 {
-    if (usedAnchors & QDeclarativeAnchors::HasTopAnchor &&
-        usedAnchors & QDeclarativeAnchors::HasBottomAnchor &&
-        usedAnchors & QDeclarativeAnchors::HasVCenterAnchor) {
+    if (usedAnchors & QDeclarativeAnchors::TopAnchor &&
+        usedAnchors & QDeclarativeAnchors::BottomAnchor &&
+        usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
         qmlInfo(item) << QDeclarativeAnchors::tr("Cannot specify top, bottom, and vcenter anchors.");
         return false;
-    } else if (usedAnchors & QDeclarativeAnchors::HasBaselineAnchor &&
-               (usedAnchors & QDeclarativeAnchors::HasTopAnchor ||
-                usedAnchors & QDeclarativeAnchors::HasBottomAnchor ||
-                usedAnchors & QDeclarativeAnchors::HasVCenterAnchor)) {
+    } else if (usedAnchors & QDeclarativeAnchors::BaselineAnchor &&
+               (usedAnchors & QDeclarativeAnchors::TopAnchor ||
+                usedAnchors & QDeclarativeAnchors::BottomAnchor ||
+                usedAnchors & QDeclarativeAnchors::VCenterAnchor)) {
         qmlInfo(item) << QDeclarativeAnchors::tr("Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.");
         return false;
     }
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h
index f2e57cc..1bd7608 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanchors_p.h
@@ -83,18 +83,18 @@ public:
     QDeclarativeAnchors(QGraphicsObject *item, QObject *parent=0);
     virtual ~QDeclarativeAnchors();
 
-    enum UsedAnchor { 
-        HasLeftAnchor = 0x01,
-        HasRightAnchor = 0x02,
-        HasTopAnchor = 0x04,
-        HasBottomAnchor = 0x08,
-        HasHCenterAnchor = 0x10,
-        HasVCenterAnchor = 0x20,
-        HasBaselineAnchor = 0x40,
-        Horizontal_Mask = HasLeftAnchor | HasRightAnchor | HasHCenterAnchor,
-        Vertical_Mask = HasTopAnchor | HasBottomAnchor | HasVCenterAnchor | HasBaselineAnchor
+    enum Anchor {
+        LeftAnchor = 0x01,
+        RightAnchor = 0x02,
+        TopAnchor = 0x04,
+        BottomAnchor = 0x08,
+        HCenterAnchor = 0x10,
+        VCenterAnchor = 0x20,
+        BaselineAnchor = 0x40,
+        Horizontal_Mask = LeftAnchor | RightAnchor | HCenterAnchor,
+        Vertical_Mask = TopAnchor | BottomAnchor | VCenterAnchor | BaselineAnchor
     };
-    Q_DECLARE_FLAGS(UsedAnchors, UsedAnchor)
+    Q_DECLARE_FLAGS(Anchors, Anchor)
 
     QDeclarativeAnchorLine left() const;
     void setLeft(const QDeclarativeAnchorLine &edge);
@@ -156,7 +156,7 @@ public:
     void setCenterIn(QGraphicsObject *);
     void resetCenterIn();
 
-    UsedAnchors usedAnchors() const;
+    Anchors usedAnchors() const;
 
     void classBegin();
     void componentComplete();
@@ -188,7 +188,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_widgetGeometryChanged())
     Q_PRIVATE_SLOT(d_func(), void _q_widgetDestroyed(QObject *obj))
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeAnchors::UsedAnchors)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeAnchors::Anchors)
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
index f8489aa..05be6c5 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
@@ -139,7 +139,7 @@ public:
     void centerInChanged();
 
     QGraphicsObject *item;
-    QDeclarativeAnchors::UsedAnchors usedAnchors;
+    QDeclarativeAnchors::Anchors usedAnchors;
 
     QGraphicsObject *fill;
     QGraphicsObject *centerIn;
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index a76d88e..7b9b5e0 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -655,7 +655,7 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent
                     rejectY = true;
             }
             if (!rejectY && stealMouse) {
-                vData.move.setValue(newY);
+                vData.move.setValue(qRound(newY));
                 moved = true;
             }
             if (qAbs(dy) > QApplication::startDragDistance())
@@ -682,7 +682,7 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent
                     rejectX = true;
             }
             if (!rejectX && stealMouse) {
-                hData.move.setValue(newX);
+                hData.move.setValue(qRound(newX));
                 moved = true;
             }
 
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index 98e34a9..57045f1 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -57,10 +57,14 @@ public:
     QDeclarativeFlipablePrivate() : current(QDeclarativeFlipable::Front), front(0), back(0) {}
 
     void updateSceneTransformFromParent();
+    void setBackTransform();
 
     QDeclarativeFlipable::Side current;
     QDeclarativeGuard<QGraphicsObject> front;
     QDeclarativeGuard<QGraphicsObject> back;
+
+    bool wantBackXFlipped;
+    bool wantBackYFlipped;
 };
 
 /*!
@@ -148,6 +152,17 @@ void QDeclarativeFlipable::setBack(QGraphicsObject *back)
     d->back->setParentItem(this);
     if (Front == d->current)
         d->back->setOpacity(0.);
+    connect(back, SIGNAL(widthChanged()),
+            this, SLOT(retransformBack()));
+    connect(back, SIGNAL(heightChanged()),
+            this, SLOT(retransformBack()));
+}
+
+void QDeclarativeFlipable::retransformBack()
+{
+    Q_D(QDeclarativeFlipable);
+    if (d->current == QDeclarativeFlipable::Back && d->back)
+        d->setBackTransform();
 }
 
 /*!
@@ -184,26 +199,20 @@ void QDeclarativeFlipablePrivate::updateSceneTransformFromParent()
     qreal cross = (p1.x() - p2.x()) * (p3.y() - p2.y()) -
                   (p1.y() - p2.y()) * (p3.x() - p2.x());
 
+    wantBackYFlipped = p1.x() >= p2.x();
+    wantBackXFlipped = p2.y() >= p3.y();
+
     QDeclarativeFlipable::Side newSide;
     if (cross > 0) {
-       newSide = QDeclarativeFlipable::Back;
+        newSide = QDeclarativeFlipable::Back;
     } else {
         newSide = QDeclarativeFlipable::Front;
     }
 
     if (newSide != current) {
         current = newSide;
-        if (current == QDeclarativeFlipable::Back && back) {
-            QTransform mat;
-            QGraphicsItemPrivate *dBack = QGraphicsItemPrivate::get(back);
-            mat.translate(dBack->width()/2,dBack->height()/2);
-            if (dBack->width() && p1.x() >= p2.x())
-                mat.rotate(180, Qt::YAxis);
-            if (dBack->height() && p2.y() >= p3.y())
-                mat.rotate(180, Qt::XAxis);
-            mat.translate(-dBack->width()/2,-dBack->height()/2);
-            back->setTransform(mat);
-        }
+        if (current == QDeclarativeFlipable::Back && back)
+            setBackTransform();
         if (front)
             front->setOpacity((current==QDeclarativeFlipable::Front)?1.:0.);
         if (back)
@@ -212,4 +221,20 @@ void QDeclarativeFlipablePrivate::updateSceneTransformFromParent()
     }
 }
 
+/* Depends on the width/height of the back item, and so needs reevaulating
+   if those change.
+*/
+void QDeclarativeFlipablePrivate::setBackTransform()
+{
+    QTransform mat;
+    QGraphicsItemPrivate *dBack = QGraphicsItemPrivate::get(back);
+    mat.translate(dBack->width()/2,dBack->height()/2);
+    if (dBack->width() && wantBackYFlipped)
+        mat.rotate(180, Qt::YAxis);
+    if (dBack->height() && wantBackXFlipped)
+        mat.rotate(180, Qt::XAxis);
+    mat.translate(-dBack->width()/2,-dBack->height()/2);
+    back->setTransform(mat);
+}
+
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable_p.h b/src/declarative/graphicsitems/qdeclarativeflipable_p.h
index 302f083..fd0119b 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflipable_p.h
@@ -81,6 +81,9 @@ public:
 Q_SIGNALS:
     void sideChanged();
 
+private Q_SLOTS:
+    void retransformBack();
+
 private:
     Q_DISABLE_COPY(QDeclarativeFlipable)
     Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeFlipable)
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 23140fa..f6666f2 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -347,6 +347,7 @@ public:
 void QDeclarativeGridViewPrivate::init()
 {
     Q_Q(QDeclarativeGridView);
+    QObject::connect(q, SIGNAL(movementEnded()), q, SLOT(animStopped()));
     q->setFlag(QGraphicsItem::ItemIsFocusScope);
     q->setFlickDirection(QDeclarativeFlickable::VerticalFlick);
     addItemChangeListener(this, Geometry);
@@ -747,18 +748,31 @@ void QDeclarativeGridViewPrivate::fixupPosition()
 void QDeclarativeGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
 {
     Q_Q(QDeclarativeGridView);
+    if ((flow == QDeclarativeGridView::TopToBottom && &data == &vData)
+        || (flow == QDeclarativeGridView::LeftToRight && &data == &hData))
+        return;
+
     int oldDuration = fixupDuration;
     fixupDuration = moveReason == Mouse ? fixupDuration : 0;
 
     if (haveHighlightRange && highlightRange == QDeclarativeGridView::StrictlyEnforceRange) {
-        if (currentItem && currentItem->rowPos() - position() != highlightRangeStart) {
-            qreal pos = currentItem->rowPos() - highlightRangeStart;
+        if (currentItem) {
+            updateHighlight();
+            qreal pos = currentItem->rowPos();
+            qreal viewPos = position();
+            if (viewPos < pos + rowSize() - highlightRangeEnd)
+                viewPos = pos + rowSize() - highlightRangeEnd;
+            if (viewPos > pos - highlightRangeStart)
+                viewPos = pos - highlightRangeStart;
+
             timeline.reset(data.move);
-            if (fixupDuration) {
-                timeline.move(data.move, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration/2);
-            } else {
-                data.move.setValue(-pos);
-                q->viewportMoved();
+            if (viewPos != position()) {
+                if (fixupDuration) {
+                    timeline.move(data.move, -viewPos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration/2);
+                } else {
+                    data.move.setValue(-viewPos);
+                    q->viewportMoved();
+                }
             }
             vTime = timeline.time();
         }
@@ -803,7 +817,7 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
                 maxDistance = qAbs(minExtent - data.move.value());
             }
         }
-        if (snapMode != QDeclarativeGridView::SnapToRow && highlightRange != QDeclarativeGridView::StrictlyEnforceRange)
+        if (snapMode == QDeclarativeGridView::NoSnap && highlightRange != QDeclarativeGridView::StrictlyEnforceRange)
             data.flickTarget = minExtent;
     } else {
         if (data.move.value() > maxExtent) {
@@ -814,7 +828,7 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
                 maxDistance = qAbs(maxExtent - data.move.value());
             }
         }
-        if (snapMode != QDeclarativeGridView::SnapToRow && highlightRange != QDeclarativeGridView::StrictlyEnforceRange)
+        if (snapMode == QDeclarativeGridView::NoSnap && highlightRange != QDeclarativeGridView::StrictlyEnforceRange)
             data.flickTarget = maxExtent;
     }
     if (maxDistance > 0 || overShoot) {
@@ -1510,12 +1524,12 @@ void QDeclarativeGridView::viewportMoved()
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
             // reposition highlight
             qreal pos = d->highlight->rowPos();
-            qreal viewPos = qRound(d->position());
-            if (pos > viewPos + d->highlightRangeEnd - 1 - d->rowSize())
-                pos = viewPos + d->highlightRangeEnd - 1 - d->rowSize();
+            qreal viewPos = d->position();
+            if (pos > viewPos + d->highlightRangeEnd - d->rowSize())
+                pos = viewPos + d->highlightRangeEnd - d->rowSize();
             if (pos < viewPos + d->highlightRangeStart)
                 pos = viewPos + d->highlightRangeStart;
-            d->highlight->setPosition(d->highlight->colPos(), pos);
+            d->highlight->setPosition(d->highlight->colPos(), qRound(pos));
 
             // update current index
             int idx = d->snapIndex();
@@ -1538,8 +1552,10 @@ qreal QDeclarativeGridView::minYExtent() const
     if (d->flow == QDeclarativeGridView::TopToBottom)
         return QDeclarativeFlickable::minYExtent();
     qreal extent = -d->startPosition();
-    if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
+    if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
         extent += d->highlightRangeStart;
+        extent = qMax(extent, -(d->rowPosAt(0) + d->rowSize() - d->highlightRangeEnd));
+    }
     return extent;
 }
 
@@ -1550,8 +1566,9 @@ qreal QDeclarativeGridView::maxYExtent() const
         return QDeclarativeFlickable::maxYExtent();
     qreal extent;
     if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
-        extent = -(d->endPosition() - d->highlightRangeEnd);
-        extent = qMax(extent, -(d->rowPosAt(d->model->count()-1) - d->highlightRangeStart));
+        extent = -(d->rowPosAt(d->model->count()-1) - d->highlightRangeStart);
+        if (d->highlightRangeEnd != d->highlightRangeStart)
+            extent = qMin(extent, -(d->endPosition() - d->highlightRangeEnd + 1));
     } else {
         extent = -(d->endPosition() - height());
     }
@@ -1567,8 +1584,10 @@ qreal QDeclarativeGridView::minXExtent() const
     if (d->flow == QDeclarativeGridView::LeftToRight)
         return QDeclarativeFlickable::minXExtent();
     qreal extent = -d->startPosition();
-    if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
+    if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
         extent += d->highlightRangeStart;
+        extent = qMax(extent, -(d->rowPosAt(0) + d->rowSize() - d->highlightRangeEnd));
+    }
     return extent;
 }
 
@@ -1579,8 +1598,9 @@ qreal QDeclarativeGridView::maxXExtent() const
         return QDeclarativeFlickable::maxXExtent();
     qreal extent;
     if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
-        extent = -(d->endPosition() - d->highlightRangeEnd);
-        extent = qMax(extent, -(d->rowPosAt(d->model->count()-1) - d->highlightRangeStart));
+        extent = -(d->rowPosAt(d->model->count()-1) - d->highlightRangeStart);
+        if (d->highlightRangeEnd != d->highlightRangeStart)
+            extent = qMin(extent, -(d->endPosition() - d->highlightRangeEnd + 1));
     } else {
         extent = -(d->endPosition() - height());
     }
@@ -2250,6 +2270,13 @@ void QDeclarativeGridView::destroyingItem(QDeclarativeItem *item)
     d->unrequestedItems.remove(item);
 }
 
+void QDeclarativeGridView::animStopped()
+{
+    Q_D(QDeclarativeGridView);
+    d->bufferMode = QDeclarativeGridViewPrivate::NoBuffer;
+    if (d->haveHighlightRange && d->highlightRange == QDeclarativeGridView::StrictlyEnforceRange)
+        d->updateHighlight();
+}
 
 void QDeclarativeGridView::refill()
 {
diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h
index 5baa1dd..c06879e 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h
@@ -192,6 +192,7 @@ private Q_SLOTS:
     void destroyRemoved();
     void createdItem(int index, QDeclarativeItem *item);
     void destroyingItem(QDeclarativeItem *item);
+    void animStopped();
 
 private:
     void refill();
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 37c7923..bdd24b6 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -275,17 +275,6 @@ QDeclarativeContents::QDeclarativeContents() : m_x(0), m_y(0), m_width(0), m_hei
 {
 }
 
-/*!
-    \qmlproperty real Item::childrenRect.x
-    \qmlproperty real Item::childrenRect.y
-    \qmlproperty real Item::childrenRect.width
-    \qmlproperty real Item::childrenRect.height
-
-    The childrenRect properties allow an item access to the geometry of its
-    children. This property is useful if you have an item that needs to be
-    sized to fit its children.
-*/
-
 QRectF QDeclarativeContents::rectF() const
 {
     return QRectF(m_x, m_y, m_width, m_height);
@@ -1457,6 +1446,18 @@ QDeclarativeItem *QDeclarativeItem::parentItem() const
 }
 
 /*!
+    \qmlproperty real Item::childrenRect.x
+    \qmlproperty real Item::childrenRect.y
+    \qmlproperty real Item::childrenRect.width
+    \qmlproperty real Item::childrenRect.height
+
+    The childrenRect properties allow an item access to the geometry of its
+    children. This property is useful if you have an item that needs to be
+    sized to fit its children.
+*/
+
+
+/*!
     \qmlproperty list<Item> Item::children
     \qmlproperty list<Object> Item::resources
 
@@ -1594,10 +1595,10 @@ void QDeclarativeItemPrivate::transform_clear(QDeclarativeListProperty<QGraphics
     }
 }
 
-void QDeclarativeItemPrivate::parentProperty(QObject *o, void *rv, QDeclarativeNotifierEndpoint *e) 
+void QDeclarativeItemPrivate::parentProperty(QObject *o, void *rv, QDeclarativeNotifierEndpoint *e)
 {
     QDeclarativeItem *item = static_cast<QDeclarativeItem*>(o);
-    if (e) 
+    if (e)
         e->connect(&item->d_func()->parentNotifier);
     *((QDeclarativeItem **)rv) = item->parentItem();
 }
@@ -2279,6 +2280,23 @@ QScriptValue QDeclarativeItem::mapToItem(const QScriptValue &item, qreal x, qrea
     return sv;
 }
 
+/*!
+    \qmlmethod Item::forceFocus()
+
+    Force the focus on the item.
+    This method sets the focus on the item and makes sure that all the focus scopes higher in the object hierarchy are given focus.
+*/
+void QDeclarativeItem::forceFocus()
+{
+    setFocus(true);
+    QGraphicsItem *parent = parentItem();
+    while (parent) {
+        if (parent->flags() & QGraphicsItem::ItemIsFocusScope)
+            parent->setFocus(Qt::OtherFocusReason);
+        parent = parent->parentItem();
+    }
+}
+
 void QDeclarativeItemPrivate::focusChanged(bool flag)
 {
     Q_Q(QDeclarativeItem);
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h
index 51889f6..da5a36e 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem.h
@@ -157,6 +157,7 @@ public:
 
     Q_INVOKABLE QScriptValue mapFromItem(const QScriptValue &item, qreal x, qreal y) const;
     Q_INVOKABLE QScriptValue mapToItem(const QScriptValue &item, qreal x, qreal y) const;
+    Q_INVOKABLE void forceFocus();
 
     QDeclarativeAnchorLine left() const;
     QDeclarativeAnchorLine right() const;
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 2d01eef..16972a8 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -82,7 +82,10 @@
 
 void QDeclarativeItemModule::defineModule()
 {
-#ifndef QT_NO_MOVIE
+#ifdef QT_NO_MOVIE
+    qmlRegisterTypeNotAvailable("Qt",4,6,"AnimatedImage",
+        qApp->translate("QDeclarativeAnimatedImage","Qt was built without support for QMovie"));
+#else
     qmlRegisterType<QDeclarativeAnimatedImage>("Qt",4,6,"AnimatedImage");
 #endif
     qmlRegisterType<QDeclarativeBorderImage>("Qt",4,6,"BorderImage");
@@ -141,17 +144,20 @@ void QDeclarativeItemModule::defineModule()
     qmlRegisterType<QAction>();
     qmlRegisterType<QDeclarativePen>();
     qmlRegisterType<QDeclarativeFlickableVisibleArea>();
-#ifndef QT_NO_GRAPHICSEFFECT
+#ifdef QT_NO_GRAPHICSEFFECT
+    QString no_graphicseffect = qApp->translate("QGraphicsBlurEffect","Qt was built without support for graphicseffects");
+    qmlRegisterTypeNotAvailable("Qt",4,6,"Blur",no_graphicseffect);
+    qmlRegisterTypeNotAvailable("Qt",4,6,"Colorize",no_graphicseffect);
+    qmlRegisterTypeNotAvailable("Qt",4,6,"DropShadow",no_graphicseffect);
+    qmlRegisterTypeNotAvailable("Qt",4,6,"Opacity",no_graphicseffect);
+#else
     qmlRegisterType<QGraphicsEffect>();
     qmlRegisterType<QGraphicsBlurEffect>("Qt",4,6,"Blur");
     qmlRegisterType<QGraphicsColorizeEffect>("Qt",4,6,"Colorize");
     qmlRegisterType<QGraphicsDropShadowEffect>("Qt",4,6,"DropShadow");
     qmlRegisterType<QGraphicsOpacityEffect>("Qt",4,6,"Opacity");
 #endif
-#ifdef QT_WEBKIT_LIB
-    qmlRegisterType<QDeclarativeWebSettings>();
-#endif
 
-    qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("Qt",4,6,"KeyNavigation");
-    qmlRegisterUncreatableType<QDeclarativeKeysAttached>("Qt",4,6,"Keys");
+    qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("Qt",4,6,"KeyNavigation",QDeclarativeKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
+    qmlRegisterUncreatableType<QDeclarativeKeysAttached>("Qt",4,6,"Keys",QDeclarativeKeysAttached::tr("Keys is only available via attached properties"));
 }
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 672f723..a4ca651 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -271,6 +271,28 @@ public:
         return 0;
     }
 
+    qreal endPositionAt(int modelIndex) const {
+        if (FxListItem *item = visibleItem(modelIndex))
+            return item->endPosition();
+        if (!visibleItems.isEmpty()) {
+            if (modelIndex < visibleIndex) {
+                int count = visibleIndex - modelIndex;
+                return (*visibleItems.constBegin())->position() - (count - 1) * (averageSize + spacing) - spacing - 1;
+            } else {
+                int idx = visibleItems.count() - 1;
+                while (idx >= 0 && visibleItems.at(idx)->index == -1)
+                    --idx;
+                if (idx < 0)
+                    idx = visibleIndex;
+                else
+                    idx = visibleItems.at(idx)->index;
+                int count = modelIndex - idx - 1;
+                return (*(--visibleItems.constEnd()))->endPosition() + count * (averageSize + spacing);
+            }
+        }
+        return 0;
+    }
+
     QString sectionAt(int modelIndex) {
         if (FxListItem *item = visibleItem(modelIndex))
             return item->attached->section();
@@ -396,13 +418,16 @@ public:
     }
 
     void itemGeometryChanged(QDeclarativeItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) {
+        Q_Q(QDeclarativeListView);
         QDeclarativeFlickablePrivate::itemGeometryChanged(item, newGeometry, oldGeometry);
-        if (item != viewport) {
+        if (item != viewport && (!highlight || item != highlight->item)) {
             if ((orient == QDeclarativeListView::Vertical && newGeometry.height() != oldGeometry.height())
                 || (orient == QDeclarativeListView::Horizontal && newGeometry.width() != oldGeometry.width())) {
                 scheduleLayout();
             }
         }
+        if (trackedItem && trackedItem->item == item)
+            q->trackedPositionChanged();
     }
 
     // for debugging only
@@ -567,13 +592,8 @@ void QDeclarativeListViewPrivate::releaseItem(FxListItem *item)
     Q_Q(QDeclarativeListView);
     if (!item || !model)
         return;
-    if (trackedItem == item) {
-        const char *notifier1 = orient == QDeclarativeListView::Vertical ? SIGNAL(yChanged()) : SIGNAL(xChanged());
-        const char *notifier2 = orient == QDeclarativeListView::Vertical ? SIGNAL(heightChanged()) : SIGNAL(widthChanged());
-        QObject::disconnect(trackedItem->item, notifier1, q, SLOT(trackedPositionChanged()));
-        QObject::disconnect(trackedItem->item, notifier2, q, SLOT(trackedPositionChanged()));
+    if (trackedItem == item)
         trackedItem = 0;
-    }
     QDeclarativeItemPrivate *itemPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(item->item));
     itemPrivate->removeItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
     if (model->release(item->item) == 0) {
@@ -770,21 +790,7 @@ void QDeclarativeListViewPrivate::updateTrackedItem()
     FxListItem *item = currentItem;
     if (highlight)
         item = highlight;
-
-    const char *notifier1 = orient == QDeclarativeListView::Vertical ? SIGNAL(yChanged()) : SIGNAL(xChanged());
-    const char *notifier2 = orient == QDeclarativeListView::Vertical ? SIGNAL(heightChanged()) : SIGNAL(widthChanged());
-
-    if (trackedItem && item != trackedItem) {
-        QObject::disconnect(trackedItem->item, notifier1, q, SLOT(trackedPositionChanged()));
-        QObject::disconnect(trackedItem->item, notifier2, q, SLOT(trackedPositionChanged()));
-        trackedItem = 0;
-    }
-
-    if (!trackedItem && item) {
-        trackedItem = item;
-        QObject::connect(trackedItem->item, notifier1, q, SLOT(trackedPositionChanged()));
-        QObject::connect(trackedItem->item, notifier2, q, SLOT(trackedPositionChanged()));
-    }
+    trackedItem = item;
     if (trackedItem)
         q->trackedPositionChanged();
 }
@@ -833,6 +839,8 @@ void QDeclarativeListViewPrivate::createHighlight()
                     highlight->item->setWidth(currentItem->item->width());
                 }
             }
+            QDeclarativeItemPrivate *itemPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(item));
+            itemPrivate->addItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
             const QLatin1String posProp(orient == QDeclarativeListView::Vertical ? "y" : "x");
             highlightPosAnimator = new QSmoothedAnimation(q);
             highlightPosAnimator->target = QDeclarativeProperty(highlight->item, posProp);
@@ -1106,14 +1114,23 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
     fixupDuration = moveReason == Mouse ? fixupDuration : 0;
 
     if (haveHighlightRange && highlightRange == QDeclarativeListView::StrictlyEnforceRange) {
-        if (currentItem && currentItem->position() - position() != highlightRangeStart) {
-            qreal pos = currentItem->position() - highlightRangeStart;
+        if (currentItem) {
+            updateHighlight();
+            qreal pos = currentItem->position();
+            qreal viewPos = position();
+            if (viewPos < pos + currentItem->size() - highlightRangeEnd)
+                viewPos = pos + currentItem->size() - highlightRangeEnd;
+            if (viewPos > pos - highlightRangeStart)
+                viewPos = pos - highlightRangeStart;
+
             timeline.reset(data.move);
-            if (fixupDuration) {
-                timeline.move(data.move, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration/2);
-            } else {
-                data.move.setValue(-pos);
-                q->viewportMoved();
+            if (viewPos != position()) {
+                if (fixupDuration) {
+                    timeline.move(data.move, -viewPos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration/2);
+                } else {
+                    data.move.setValue(-viewPos);
+                    q->viewportMoved();
+                }
             }
             vTime = timeline.time();
         }
@@ -2066,12 +2083,12 @@ void QDeclarativeListView::viewportMoved()
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
             // reposition highlight
             qreal pos = d->highlight->position();
-            qreal viewPos = qRound(d->position());
-            if (pos > viewPos + d->highlightRangeEnd - 1 - d->highlight->size())
-                pos = viewPos + d->highlightRangeEnd - 1 - d->highlight->size();
+            qreal viewPos = d->position();
+            if (pos > viewPos + d->highlightRangeEnd - d->highlight->size())
+                pos = viewPos + d->highlightRangeEnd - d->highlight->size();
             if (pos < viewPos + d->highlightRangeStart)
                 pos = viewPos + d->highlightRangeStart;
-            d->highlight->setPosition(pos);
+            d->highlight->setPosition(qRound(pos));
 
             // update current index
             int idx = d->snapIndex();
@@ -2128,8 +2145,10 @@ qreal QDeclarativeListView::minYExtent() const
         d->minExtent = -d->startPosition();
         if (d->header && d->visibleItems.count())
             d->minExtent += d->header->size();
-        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
+        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
             d->minExtent += d->highlightRangeStart;
+            d->minExtent = qMax(d->minExtent, -(d->endPositionAt(0) - d->highlightRangeEnd + 1));
+        }
         d->minExtentDirty = false;
     }
 
@@ -2143,10 +2162,12 @@ qreal QDeclarativeListView::maxYExtent() const
         return height();
     if (d->maxExtentDirty) {
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
-            d->maxExtent = -(d->endPosition() - d->highlightRangeEnd);
-            d->maxExtent = qMax(d->maxExtent, -(d->positionAt(d->model->count()-1) - d->highlightRangeStart));
-        } else
+            d->maxExtent = -(d->positionAt(d->model->count()-1) - d->highlightRangeStart);
+            if (d->highlightRangeEnd != d->highlightRangeStart)
+                d->maxExtent = qMin(d->maxExtent, -(d->endPosition() - d->highlightRangeEnd + 1));
+        } else {
             d->maxExtent = -(d->endPosition() - height() + 1);
+        }
         if (d->footer)
             d->maxExtent -= d->footer->size();
         qreal minY = minYExtent();
@@ -2166,8 +2187,10 @@ qreal QDeclarativeListView::minXExtent() const
         d->minExtent = -d->startPosition();
         if (d->header)
             d->minExtent += d->header->size();
-        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
+        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
             d->minExtent += d->highlightRangeStart;
+            d->minExtent = qMax(d->minExtent, -(d->endPositionAt(0) - d->highlightRangeEnd + 1));
+        }
         d->minExtentDirty = false;
     }
 
@@ -2181,10 +2204,12 @@ qreal QDeclarativeListView::maxXExtent() const
         return width();
     if (d->maxExtentDirty) {
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) {
-            d->maxExtent = -(d->endPosition() - d->highlightRangeEnd);
-            d->maxExtent = qMax(d->maxExtent, -(d->positionAt(d->model->count()-1) - d->highlightRangeStart));
-        } else
+            d->maxExtent = -(d->positionAt(d->model->count()-1) - d->highlightRangeStart);
+            if (d->highlightRangeEnd != d->highlightRangeStart)
+                d->maxExtent = qMin(d->maxExtent, -(d->endPosition() - d->highlightRangeEnd + 1));
+        } else {
             d->maxExtent = -(d->endPosition() - width() + 1);
+        }
         if (d->footer)
             d->maxExtent -= d->footer->size();
         qreal minX = minXExtent();
@@ -2393,7 +2418,7 @@ void QDeclarativeListView::trackedPositionChanged()
     if (!d->trackedItem || !d->currentItem)
         return;
     if (!isFlicking() && !d->moving && d->moveReason == QDeclarativeListViewPrivate::SetIndex) {
-        const qreal trackedPos = d->trackedItem->position();
+        const qreal trackedPos = qCeil(d->trackedItem->position());
         const qreal viewPos = d->position();
         if (d->haveHighlightRange) {
             if (d->highlightRange == StrictlyEnforceRange) {
@@ -2827,6 +2852,8 @@ void QDeclarativeListView::animStopped()
 {
     Q_D(QDeclarativeListView);
     d->bufferMode = QDeclarativeListViewPrivate::NoBuffer;
+    if (d->haveHighlightRange && d->highlightRange == QDeclarativeListView::StrictlyEnforceRange)
+        d->updateHighlight();
 }
 
 QDeclarativeListViewAttached *QDeclarativeListView::qmlAttachedProperties(QObject *obj)
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 3f257b5..bdd2c87 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -132,12 +132,15 @@ void QDeclarativeLoaderPrivate::initResize()
     \endcode
 
     If the Loader source is changed, any previous items instantiated
-    will be destroyed.  Setting \c source to an empty string
+    will be destroyed.  Setting \c source to an empty string, or setting
+    sourceComponent to \e undefined
     will destroy the currently instantiated items, freeing resources
     and leaving the Loader empty.  For example:
 
     \code
     pageLoader.source = ""
+      or
+    pageLoader.sourceComponent = undefined
     \endcode
 
     unloads "Page1.qml" and frees resources consumed by it.
@@ -271,6 +274,11 @@ void QDeclarativeLoader::setSourceComponent(QDeclarativeComponent *comp)
     }
 }
 
+void QDeclarativeLoader::resetSourceComponent()
+{
+    setSourceComponent(0);
+}
+
 void QDeclarativeLoaderPrivate::_q_sourceLoaded()
 {
     Q_Q(QDeclarativeLoader);
diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p.h
index 65538a8..e9fd8e9 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p.h
@@ -58,7 +58,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeLoader : public QDeclarativeItem
     Q_ENUMS(ResizeMode)
 
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(QDeclarativeComponent *sourceComponent READ sourceComponent WRITE setSourceComponent NOTIFY sourceChanged)
+    Q_PROPERTY(QDeclarativeComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceChanged)
     Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode NOTIFY resizeModeChanged)
     Q_PROPERTY(QGraphicsObject *item READ item NOTIFY itemChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
@@ -73,6 +73,7 @@ public:
 
     QDeclarativeComponent *sourceComponent() const;
     void setSourceComponent(QDeclarativeComponent *);
+    void resetSourceComponent();
 
     enum Status { Null, Ready, Loading, Error };
     Status status() const;
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index bdb4868..126d041 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -50,7 +50,8 @@ QT_BEGIN_NAMESPACE
 static const int PressAndHoldDelay = 800;
 
 QDeclarativeDrag::QDeclarativeDrag(QObject *parent)
-: QObject(parent), _target(0), _axis(XandYAxis), _xmin(0), _xmax(0), _ymin(0), _ymax(0)
+: QObject(parent), _target(0), _axis(XandYAxis), _xmin(0), _xmax(0), _ymin(0), _ymax(0),
+_active(false)
 {
 }
 
@@ -144,6 +145,19 @@ void QDeclarativeDrag::setYmax(qreal m)
     emit maximumYChanged();
 }
 
+bool QDeclarativeDrag::active() const
+{
+    return _active;
+}
+
+void QDeclarativeDrag::setActive(bool drag)
+{
+    if (_active == drag)
+        return;
+    _active = drag;
+    emit activeChanged();
+}
+
 QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
 {
     delete drag;
@@ -389,7 +403,8 @@ void QDeclarativeMouseArea::mousePressEvent(QGraphicsSceneMouseEvent *event)
             d->dragX = drag()->axis() & QDeclarativeDrag::XAxis;
             d->dragY = drag()->axis() & QDeclarativeDrag::YAxis;
         }
-        d->dragged = false;
+        if (d->drag)
+            d->drag->setActive(false);
         setHovered(true);
         d->startScene = event->scenePos();
         // we should only start timer if pressAndHold is connected to.
@@ -438,7 +453,7 @@ void QDeclarativeMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
         qreal dx = qAbs(curLocalPos.x() - startLocalPos.x());
         qreal dy = qAbs(curLocalPos.y() - startLocalPos.y());
         if ((d->dragX && !(dx < dragThreshold)) || (d->dragY && !(dy < dragThreshold)))
-            d->dragged = true;
+            d->drag->setActive(true);
         if (!keepMouseGrab()) {
             if ((!d->dragY && dy < dragThreshold && d->dragX && dx > dragThreshold)
                 || (!d->dragX && dx < dragThreshold && d->dragY && dy > dragThreshold)
@@ -447,7 +462,7 @@ void QDeclarativeMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
             }
         }
 
-        if (d->dragX && d->dragged) {
+        if (d->dragX && d->drag->active()) {
             qreal x = (curLocalPos.x() - startLocalPos.x()) + d->startX;
             if (x < drag()->xmin())
                 x = drag()->xmin();
@@ -455,7 +470,7 @@ void QDeclarativeMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
                 x = drag()->xmax();
             drag()->target()->setX(x);
         }
-        if (d->dragY && d->dragged) {
+        if (d->dragY && d->drag->active()) {
             qreal y = (curLocalPos.y() - startLocalPos.y()) + d->startY;
             if (y < drag()->ymin())
                 y = drag()->ymin();
@@ -481,6 +496,8 @@ void QDeclarativeMouseArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     } else {
         d->saveEvent(event);
         setPressed(false);
+        if (d->drag)
+            d->drag->setActive(false);
         // If we don't accept hover, we need to reset containsMouse.
         if (!acceptHoverEvents())
             setHovered(false);
@@ -547,8 +564,10 @@ bool QDeclarativeMouseArea::sceneEvent(QEvent *event)
             // state
             d->pressed = false;
             setKeepMouseGrab(false);
+            QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, false);
+            emit released(&me);
             emit pressedChanged();
-            //emit hoveredChanged();
+            setHovered(false);
         }
     }
     return rv;
@@ -559,7 +578,8 @@ void QDeclarativeMouseArea::timerEvent(QTimerEvent *event)
     Q_D(QDeclarativeMouseArea);
     if (event->timerId() == d->pressAndHoldTimer.timerId()) {
         d->pressAndHoldTimer.stop();
-        if (d->pressed && d->dragged == false && d->hovered == true) {
+        bool dragged = d->drag && d->drag->active();
+        if (d->pressed && dragged == false && d->hovered == true) {
             d->longPress = true;
             QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
             emit pressAndHold(&me);
@@ -659,7 +679,8 @@ void QDeclarativeMouseArea::setAcceptedButtons(Qt::MouseButtons buttons)
 bool QDeclarativeMouseArea::setPressed(bool p)
 {
     Q_D(QDeclarativeMouseArea);
-    bool isclick = d->pressed == true && p == false && d->dragged == false && d->hovered == true;
+    bool dragged = d->drag && d->drag->active();
+    bool isclick = d->pressed == true && p == false && dragged == false && d->hovered == true;
 
     if (d->pressed != p) {
         d->pressed = p;
@@ -693,6 +714,7 @@ QDeclarativeDrag *QDeclarativeMouseArea::drag()
 
 /*!
     \qmlproperty Item MouseArea::drag.target
+    \qmlproperty bool MouseArea::drag.active
     \qmlproperty Axis MouseArea::drag.axis
     \qmlproperty real MouseArea::drag.minimumX
     \qmlproperty real MouseArea::drag.maximumX
@@ -703,6 +725,7 @@ QDeclarativeDrag *QDeclarativeMouseArea::drag()
 
     \list
     \i \c target specifies the item to drag.
+    \i \c active specifies if the target item is being currently dragged.
     \i \c axis specifies whether dragging can be done horizontally (XAxis), vertically (YAxis), or both (XandYAxis)
     \i the minimum and maximum properties limit how far the target can be dragged along the corresponding axes.
     \endlist
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
index 630840f..4f7df62 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
@@ -61,6 +61,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDrag : public QObject
     Q_PROPERTY(qreal maximumX READ xmax WRITE setXmax NOTIFY maximumXChanged)
     Q_PROPERTY(qreal minimumY READ ymin WRITE setYmin NOTIFY minimumYChanged)
     Q_PROPERTY(qreal maximumY READ ymax WRITE setYmax NOTIFY maximumYChanged)
+    Q_PROPERTY(bool active READ active NOTIFY activeChanged)
     //### consider drag and drop
 
 public:
@@ -84,6 +85,9 @@ public:
     qreal ymax() const;
     void setYmax(qreal);
 
+    bool active() const;
+    void setActive(bool);
+
 Q_SIGNALS:
     void targetChanged();
     void axisChanged();
@@ -91,6 +95,7 @@ Q_SIGNALS:
     void maximumXChanged();
     void minimumYChanged();
     void maximumYChanged();
+    void activeChanged();
 
 private:
     QGraphicsObject *_target;
@@ -99,6 +104,7 @@ private:
     qreal _xmax;
     qreal _ymin;
     qreal _ymax;
+    bool _active;
     Q_DISABLE_COPY(QDeclarativeDrag)
 };
 
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
index 4973957..4e909ff 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
@@ -67,7 +67,8 @@ class QDeclarativeMouseAreaPrivate : public QDeclarativeItemPrivate
 
 public:
     QDeclarativeMouseAreaPrivate()
-      : absorb(true), hovered(false), pressed(false), longPress(false), drag(0)
+      : absorb(true), hovered(false), pressed(false), longPress(false),
+      moved(false), drag(0)
     {
     }
 
@@ -100,7 +101,6 @@ public:
     bool moved : 1;
     bool dragX : 1;
     bool dragY : 1;
-    bool dragged : 1;
     QDeclarativeDrag *drag;
     QPointF startScene;
     qreal startX;
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 207232d..7fa8cc4 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -262,6 +262,7 @@ public:
                 }
                 if (m_roles.count() == 1)
                     m_roleNames.insert("modelData", m_roles.at(0));
+                m_roleNames.insert("hasModelChildren", 0);
             } else if (m_listAccessor) {
                 m_roleNames.insert("modelData", 0);
                 if (m_listAccessor->type() == QDeclarativeListAccessor::Instance) {
@@ -473,11 +474,16 @@ QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId)
         }
     } else if (model->m_abstractItemModel) {
         model->ensureRoles();
-        QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
-        if (it != model->m_roleNames.end()) {
-            roleToProp.insert(*it, propId);
+        if (propName == "hasModelChildren") {
             QModelIndex index = model->m_abstractItemModel->index(data->m_index, 0, model->m_root);
-            return model->m_abstractItemModel->data(index, *it);
+            return model->m_abstractItemModel->hasChildren(index);
+        } else {
+            QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
+            if (it != model->m_roleNames.end()) {
+                roleToProp.insert(*it, propId);
+                QModelIndex index = model->m_abstractItemModel->index(data->m_index, 0, model->m_root);
+                return model->m_abstractItemModel->data(index, *it);
+            }
         }
     }
     Q_ASSERT(!"Can never be reached");
@@ -784,34 +790,13 @@ void QDeclarativeVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
     \qmlproperty QModelIndex VisualDataModel::rootIndex
 
     QAbstractItemModel provides a heirachical tree of data, whereas
-    QML only operates on list data. rootIndex allows the children of
+    QML only operates on list data.  \c rootIndex allows the children of
     any node in a QAbstractItemModel to be provided by this model.
 
     This property only affects models of type QAbstractItemModel.
 
     \code
     // main.cpp
-    Q_DECLARE_METATYPE(QModelIndex)
-
-    class MyModel : public QDirModel
-    {
-        Q_OBJECT
-    public:
-        MyModel(QDeclarativeContext *ctxt) : QDirModel(), context(ctxt) {
-            QHash<int,QByteArray> roles = roleNames();
-            roles.insert(FilePathRole, "path");
-            setRoleNames(roles);
-            context->setContextProperty("myModel", this);
-            context->setContextProperty("myRoot", QVariant::fromValue(index(0,0,QModelIndex())));
-        }
-
-        Q_INVOKABLE void setRoot(const QString &path) {
-            QModelIndex root = index(path);
-            context->setContextProperty("myRoot", QVariant::fromValue(root));
-        }
-
-        QDeclarativeContext *context;
-    };
 
     int main(int argc, char ** argv)
     {
@@ -819,7 +804,8 @@ void QDeclarativeVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
 
         QDeclarativeView view;
 
-        MyModel model(view.rootContext());
+        QDirModel model;
+        view.rootContext()->setContextProperty("myModel", &model);
 
         view.setSource(QUrl("qrc:view.qml"));
         view.show();
@@ -835,18 +821,18 @@ void QDeclarativeVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
     import Qt 4.7
 
     ListView {
+        id: view
         width: 200
         height: 200
         model: VisualDataModel {
             model: myModel
-            rootIndex: myRoot
             delegate: Component {
                 Rectangle {
-                    height: 25; width: 100
-                    Text { text: path }
+                    height: 25; width: 200
+                    Text { text: filePath }
                     MouseArea {
                         anchors.fill: parent;
-                        onClicked: myModel.setRoot(path)
+                        onClicked: if (hasModelChildren) view.model.rootIndex = view.model.modelIndex(index)
                     }
                 }
             }
@@ -854,19 +840,21 @@ void QDeclarativeVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
     }
     \endcode
 
+    \sa modelIndex(), parentModelIndex()
 */
-QModelIndex QDeclarativeVisualDataModel::rootIndex() const
+QVariant QDeclarativeVisualDataModel::rootIndex() const
 {
     Q_D(const QDeclarativeVisualDataModel);
-    return d->m_root;
+    return QVariant::fromValue(d->m_root);
 }
 
-void QDeclarativeVisualDataModel::setRootIndex(const QModelIndex &root)
+void QDeclarativeVisualDataModel::setRootIndex(const QVariant &root)
 {
     Q_D(QDeclarativeVisualDataModel);
-    if (d->m_root != root) {
+    QModelIndex modelIndex = qvariant_cast<QModelIndex>(root);
+    if (d->m_root != modelIndex) {
         int oldCount = d->modelCount();
-        d->m_root = root;
+        d->m_root = modelIndex;
         int newCount = d->modelCount();
         if (d->m_delegate && oldCount)
             emit itemsRemoved(0, oldCount);
@@ -878,6 +866,47 @@ void QDeclarativeVisualDataModel::setRootIndex(const QModelIndex &root)
     }
 }
 
+
+/*!
+    \qmlmethod QModelIndex VisualDataModel::modelIndex(int index)
+
+    QAbstractItemModel provides a heirachical tree of data, whereas
+    QML only operates on list data.  This function assists in using
+    tree models in QML.
+
+    Returns a QModelIndex for the specified index.
+    This value can be assigned to rootIndex.
+
+    \sa rootIndex
+*/
+QVariant QDeclarativeVisualDataModel::modelIndex(int idx) const
+{
+    Q_D(const QDeclarativeVisualDataModel);
+    if (d->m_abstractItemModel)
+        return QVariant::fromValue(d->m_abstractItemModel->index(idx, 0, d->m_root));
+    return QVariant::fromValue(QModelIndex());
+}
+
+/*!
+    \qmlmethod QModelIndex VisualDataModel::parentModelIndex()
+
+    QAbstractItemModel provides a heirachical tree of data, whereas
+    QML only operates on list data.  This function assists in using
+    tree models in QML.
+
+    Returns a QModelIndex for the parent of the current rootIndex.
+    This value can be assigned to rootIndex.
+
+    \sa rootIndex
+*/
+QVariant QDeclarativeVisualDataModel::parentModelIndex() const
+{
+    Q_D(const QDeclarativeVisualDataModel);
+    if (d->m_abstractItemModel)
+        return QVariant::fromValue(d->m_abstractItemModel->parent(d->m_root));
+    return QVariant::fromValue(QModelIndex());
+}
+
 QString QDeclarativeVisualDataModel::part() const
 {
     Q_D(const QDeclarativeVisualDataModel);
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
index d34bcaf..0a9173f 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
@@ -150,7 +150,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeVisualDataModel : public QDeclarativeVisu
     Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate)
     Q_PROPERTY(QString part READ part WRITE setPart)
     Q_PROPERTY(QObject *parts READ parts CONSTANT)
-    Q_PROPERTY(QModelIndex rootIndex READ rootIndex WRITE setRootIndex NOTIFY rootIndexChanged)
+    Q_PROPERTY(QVariant rootIndex READ rootIndex WRITE setRootIndex NOTIFY rootIndexChanged)
     Q_CLASSINFO("DefaultProperty", "delegate")
 public:
     QDeclarativeVisualDataModel();
@@ -163,8 +163,11 @@ public:
     QDeclarativeComponent *delegate() const;
     void setDelegate(QDeclarativeComponent *);
 
-    QModelIndex rootIndex() const;
-    void setRootIndex(const QModelIndex &root);
+    QVariant rootIndex() const;
+    void setRootIndex(const QVariant &root);
+
+    Q_INVOKABLE QVariant modelIndex(int idx) const;
+    Q_INVOKABLE QVariant parentModelIndex() const;
 
     QString part() const;
     void setPart(const QString &);
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index 6e36d4f..d75f0a8 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -100,6 +100,7 @@ int qmlRegisterType()
         qRegisterMetaType<T *>(pointerName.constData()),
         qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
         0, 0,
+        QString(),
 
         0, 0, 0, 0, &T::staticMetaObject,
 
@@ -118,8 +119,10 @@ int qmlRegisterType()
     return QDeclarativePrivate::registerType(type);
 }
 
+int qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message);
+
 template<typename T>
-int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
+int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& reason)
 {
     QByteArray name(T::staticMetaObject.className());
 
@@ -132,6 +135,7 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin
         qRegisterMetaType<T *>(pointerName.constData()),
         qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
         0, 0,
+        reason,
 
         uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
 
@@ -164,6 +168,7 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c
         qRegisterMetaType<T *>(pointerName.constData()),
         qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
         sizeof(T), QDeclarativePrivate::createInto<T>,
+        QString(),
 
         uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
 
@@ -196,6 +201,7 @@ int qmlRegisterExtendedType()
         qRegisterMetaType<T *>(pointerName.constData()),
         qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
         0, 0,
+        QString(),
 
         0, 0, 0, 0, &T::staticMetaObject,
 
@@ -236,6 +242,7 @@ int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor,
         qRegisterMetaType<T *>(pointerName.constData()),
         qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
         sizeof(T), QDeclarativePrivate::createInto<T>,
+        QString(),
 
         uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
 
@@ -276,9 +283,9 @@ int qmlRegisterInterface(const char *typeName)
 
 template<typename T>
 int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, 
-                          const char *qmlName, const char *typeName, QDeclarativeCustomParser *parser)
+                          const char *qmlName, QDeclarativeCustomParser *parser)
 {
-    QByteArray name(typeName);
+    QByteArray name(T::staticMetaObject.className());
 
     QByteArray pointerName(name + '*');
     QByteArray listName("QDeclarativeListProperty<" + name + ">");
@@ -289,6 +296,7 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor,
         qRegisterMetaType<T *>(pointerName.constData()),
         qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
         sizeof(T), QDeclarativePrivate::createInto<T>,
+        QString(),
 
         uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
 
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index d759427..d44e7fb 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -156,6 +156,9 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
             QScriptValue scriptValue = d->scriptValue(0, &isUndefined);
             if (data->property.propertyTypeCategory() == QDeclarativeProperty::List) {
                 value = ep->scriptValueToVariant(scriptValue, qMetaTypeId<QList<QObject *> >());
+            } else if (scriptValue.isNull() && 
+                       data->property.propertyTypeCategory() == QDeclarativeProperty::Object) {
+                value = QVariant::fromValue((QObject *)0);
             } else {
                 value = ep->scriptValueToVariant(scriptValue, data->property.propertyType());
                 if (value.userType() == QMetaType::QObjectStar && !qvariant_cast<QObject*>(value)) {
@@ -168,6 +171,7 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
                 }
             }
 
+
             if (data->error.isValid()) {
 
             } else if (isUndefined && data->property.isResettable()) {
@@ -357,8 +361,10 @@ void QDeclarativeAbstractBinding::removeFromObject()
 
 void QDeclarativeAbstractBinding::clear()
 {
-    if (m_mePtr)
+    if (m_mePtr) {
         *m_mePtr = 0;
+        m_mePtr = 0;
+    }
 }
 
 QString QDeclarativeAbstractBinding::expression() const
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 2614764..10cd886 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -571,8 +571,12 @@ bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine,
         QDeclarativeScriptParser::TypeReference *parserRef = unit->data.referencedTypes().at(ii);
         if (tref.type) {
             ref.type = tref.type;
-            if (!ref.type->isCreatable()) 
-                COMPILE_EXCEPTION(parserRef->refObjects.first(), tr( "Element is not creatable."));
+            if (!ref.type->isCreatable()) {
+                QString err = ref.type->noCreationReason();
+                if (err.isEmpty())
+                    err = tr( "Element is not creatable.");
+                COMPILE_EXCEPTION(parserRef->refObjects.first(), err);
+            }
         } else if (tref.unit) {
             ref.component = tref.unit->toComponent(engine);
 
@@ -864,12 +868,14 @@ bool QDeclarativeCompiler::buildObject(Object *obj, const BindingContext &ctxt)
         defaultProperty->release();
 
     // Compile custom parser parts
-    if (isCustomParser && !customProps.isEmpty()) {
+    if (isCustomParser/* && !customProps.isEmpty()*/) {
         QDeclarativeCustomParser *cp = output->types.at(obj->type).type->customParser();
         cp->clearErrors();
         cp->compiler = this;
+        cp->object = obj;
         obj->custom = cp->compile(customProps);
         cp->compiler = 0;
+        cp->object = 0;
         foreach (QDeclarativeError err, cp->errors()) {
             err.setUrl(output->url);
             exceptions << err;
@@ -1185,6 +1191,13 @@ bool QDeclarativeCompiler::buildComponent(QDeclarativeParser::Object *obj,
         (obj->defaultProperty->values.count() == 1 && !obj->defaultProperty->values.first()->object)))
         COMPILE_EXCEPTION(obj, tr("Invalid component body specification"));
 
+    if (!obj->dynamicProperties.isEmpty())
+        COMPILE_EXCEPTION(obj, tr("Component objects cannot declare new properties."));
+    if (!obj->dynamicSignals.isEmpty())
+        COMPILE_EXCEPTION(obj, tr("Component objects cannot declare new signals."));
+    if (!obj->dynamicSlots.isEmpty())
+        COMPILE_EXCEPTION(obj, tr("Component objects cannot declare new functions."));
+
     Object *root = 0;
     if (obj->defaultProperty && obj->defaultProperty->values.count())
         root = obj->defaultProperty->values.first()->object;
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index 2041e0a..ae4223e 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -208,6 +208,12 @@ QDeclarativeContext::~QDeclarativeContext()
         d->data->destroy();
 }
 
+/*!
+    Returns whether the context is valid.
+
+    To be valid, a context must have a engine, and it's contextObject(), if any, 
+    must not have been deleted.
+*/
 bool QDeclarativeContext::isValid() const
 {
     Q_D(const QDeclarativeContext);
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp
index 1a97315..472a883 100644
--- a/src/declarative/qml/qdeclarativecustomparser.cpp
+++ b/src/declarative/qml/qdeclarativecustomparser.cpp
@@ -89,6 +89,8 @@ using namespace QDeclarativeParser;
     by \a data, which is a block of data previously returned by a call
     to compile().
 
+    Errors should be reported using qmlInfo(object).
+
     The \a object will be an instance of the TypeClass specified by QML_REGISTER_CUSTOM_TYPE.
 */
 
@@ -235,6 +237,24 @@ void QDeclarativeCustomParser::clearErrors()
 }
 
 /*!
+    Reports an error with the given \a description.
+
+    This can only be used during the compile() step. For errors during setCustomData(), use qmlInfo().
+
+    An error is generated referring to the position of the element in the source file.
+*/
+void QDeclarativeCustomParser::error(const QString& description)
+{
+    Q_ASSERT(object);
+    QDeclarativeError error;
+    QString exceptionDescription;
+    error.setLine(object->location.start.line);
+    error.setColumn(object->location.start.column);
+    error.setDescription(description);
+    exceptions << error;
+}
+
+/*!
     Reports an error in parsing \a prop, with the given \a description.
 
     An error is generated referring to the position of \a node in the source file.
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h
index da0358a..0e397c5 100644
--- a/src/declarative/qml/qdeclarativecustomparser_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p.h
@@ -113,7 +113,7 @@ private:
 class Q_DECLARATIVE_EXPORT QDeclarativeCustomParser
 {
 public:
-    QDeclarativeCustomParser() : compiler(0) {}
+    QDeclarativeCustomParser() : compiler(0), object(0) {}
     virtual ~QDeclarativeCustomParser() {}
 
     void clearErrors();
@@ -124,6 +124,7 @@ public:
     QList<QDeclarativeError> errors() const { return exceptions; }
 
 protected:
+    void error(const QString& description);
     void error(const QDeclarativeCustomParserProperty&, const QString& description);
     void error(const QDeclarativeCustomParserNode&, const QString& description);
 
@@ -132,6 +133,7 @@ protected:
 private:
     QList<QDeclarativeError> exceptions;
     QDeclarativeCompiler *compiler;
+    QDeclarativeParser::Object *object;
     friend class QDeclarativeCompiler;
 };
 
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 53d830b..0dd9368 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -2053,7 +2053,8 @@ QStringList QDeclarativeEngine::pluginPathList() const
 
 /*!
   Sets the list of directories where the engine searches for
-  native plugins for imported modules (referenced in the \c qmldir file).
+  native plugins for imported modules (referenced in the \c qmldir file)
+  to \a paths.
 
   By default, the list contains only \c .,  i.e. the engine searches
   in the directory of the \c qmldir file itself.
@@ -2071,6 +2072,8 @@ void QDeclarativeEngine::setPluginPathList(const QStringList &paths)
   Imports the plugin named \a filePath with the \a uri provided.
   Returns true if the plugin was successfully imported; otherwise returns false.
 
+  On failure and if non-null, *\a errorString will be set to a message describing the failure.
+
   The plugin has to be a Qt plugin which implements the QDeclarativeExtensionPlugin interface.
 */
 bool QDeclarativeEngine::importPlugin(const QString &filePath, const QString &uri, QString *errorString)
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index f6560a6..ffed14e 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -80,92 +80,97 @@ QT_BEGIN_NAMESPACE
 
 struct QDeclarativeInfoPrivate
 {
+    QDeclarativeInfoPrivate() : ref (1), object(0) {}
+
+    int ref;
     const QObject *object;
-    QString *buffer;
+    QString buffer;
     QList<QDeclarativeError> errors;
 };
 
-QDeclarativeInfo::QDeclarativeInfo(const QObject *object)
-: QDebug((*(QString **)&d) = new QString)
+QDeclarativeInfo::QDeclarativeInfo(QDeclarativeInfoPrivate *p)
+: QDebug(&p->buffer), d(p)
 {
-    QDeclarativeInfoPrivate *p = new QDeclarativeInfoPrivate;
-    p->buffer = (QString *)d;
-    d = p;
-
-    d->object = object;
     nospace();
 }
 
-QDeclarativeInfo::QDeclarativeInfo(const QObject *object, const QList<QDeclarativeError> &errors)
-: QDebug((*(QString **)&d) = new QString)
+QDeclarativeInfo::QDeclarativeInfo(const QDeclarativeInfo &other)
+: QDebug(other), d(other.d)
 {
-    QDeclarativeInfoPrivate *p = new QDeclarativeInfoPrivate;
-    p->buffer = (QString *)d;
-    d = p;
-
-    d->object = object;
-    d->errors = errors;
-    nospace();
-}
-
-QDeclarativeInfo::QDeclarativeInfo(const QObject *object, const QDeclarativeError &error)
-: QDebug((*(QString **)&d) = new QString)
-{
-    QDeclarativeInfoPrivate *p = new QDeclarativeInfoPrivate;
-    p->buffer = (QString *)d;
-    d = p;
-
-    d->object = object;
-    d->errors << error;
-    nospace();
+    d->ref++;
 }
 
 QDeclarativeInfo::~QDeclarativeInfo()
 {
-    QList<QDeclarativeError> errors = d->errors;
-
-    QDeclarativeEngine *engine = 0;
-
-    if (!d->buffer->isEmpty()) {
-        QDeclarativeError error;
-
-        QObject *object = const_cast<QObject *>(d->object);
-
-        if (object) {
-            engine = qmlEngine(d->object);
-            QString typeName;
-            QDeclarativeType *type = QDeclarativeMetaType::qmlType(object->metaObject());
-            if (type) {
-                typeName = QLatin1String(type->qmlTypeName());
-                int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
-                if (lastSlash != -1)
-                    typeName = typeName.mid(lastSlash+1);
-            } else {
-                typeName = QString::fromUtf8(object->metaObject()->className());
-                int marker = typeName.indexOf(QLatin1String("_QMLTYPE_"));
-                if (marker != -1)
-                    typeName = typeName.left(marker);
+    if (0 == --d->ref) {
+        QList<QDeclarativeError> errors = d->errors;
+
+        QDeclarativeEngine *engine = 0;
+
+        if (!d->buffer.isEmpty()) {
+            QDeclarativeError error;
+
+            QObject *object = const_cast<QObject *>(d->object);
+
+            if (object) {
+                engine = qmlEngine(d->object);
+                QString typeName;
+                QDeclarativeType *type = QDeclarativeMetaType::qmlType(object->metaObject());
+                if (type) {
+                    typeName = QLatin1String(type->qmlTypeName());
+                    int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
+                    if (lastSlash != -1)
+                        typeName = typeName.mid(lastSlash+1);
+                } else {
+                    typeName = QString::fromUtf8(object->metaObject()->className());
+                    int marker = typeName.indexOf(QLatin1String("_QMLTYPE_"));
+                    if (marker != -1)
+                        typeName = typeName.left(marker);
+                }
+
+                d->buffer.prepend(QLatin1String("QML ") + typeName + QLatin1String(": "));
+
+                QDeclarativeData *ddata = QDeclarativeData::get(object, false);
+                if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) {
+                    error.setUrl(ddata->outerContext->url);
+                    error.setLine(ddata->lineNumber);
+                    error.setColumn(ddata->columnNumber);
+                }
             }
 
-            d->buffer->prepend(QLatin1String("QML ") + typeName + QLatin1String(": "));
+            error.setDescription(d->buffer);
 
-            QDeclarativeData *ddata = QDeclarativeData::get(object, false);
-            if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) {
-                error.setUrl(ddata->outerContext->url);
-                error.setLine(ddata->lineNumber);
-                error.setColumn(ddata->columnNumber);
-            }
+            errors.prepend(error);
         }
 
-        error.setDescription(*d->buffer);
+        QDeclarativeEnginePrivate::warning(engine, errors);
 
-        errors.prepend(error);
+        delete d;
     }
+}
 
-    QDeclarativeEnginePrivate::warning(engine, errors);
+QDeclarativeInfo qmlInfo(const QObject *me)
+{
+    QDeclarativeInfoPrivate *d = new QDeclarativeInfoPrivate;
+    d->object = me;
+    return QDeclarativeInfo(d);
+}
 
-    delete d->buffer;
-    delete d;
+QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error)
+{
+    QDeclarativeInfoPrivate *d = new QDeclarativeInfoPrivate;
+    d->object = me;
+    d->errors << error;
+    return QDeclarativeInfo(d);
 }
 
+QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors)
+{
+    QDeclarativeInfoPrivate *d = new QDeclarativeInfoPrivate;
+    d->object = me;
+    d->errors = errors;
+    return QDeclarativeInfo(d);
+}
+
+
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h
index 3d5a111..82f44f2 100644
--- a/src/declarative/qml/qdeclarativeinfo.h
+++ b/src/declarative/qml/qdeclarativeinfo.h
@@ -56,9 +56,7 @@ class QDeclarativeInfoPrivate;
 class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug
 {
 public:
-    QDeclarativeInfo(const QObject *);
-    QDeclarativeInfo(const QObject *, const QDeclarativeError &);
-    QDeclarativeInfo(const QObject *, const QList<QDeclarativeError> &);
+    QDeclarativeInfo(const QDeclarativeInfo &);
     ~QDeclarativeInfo();
 
     inline QDeclarativeInfo &operator<<(QChar t) { QDebug::operator<<(t); return *this; }
@@ -86,23 +84,17 @@ public:
     inline QDeclarativeInfo &operator<<(const QUrl &t) { static_cast<QDebug &>(*this) << t; return *this; }
 
 private:
+    friend QDeclarativeInfo qmlInfo(const QObject *me);
+    friend QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error);
+    friend QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors);
+
+    QDeclarativeInfo(QDeclarativeInfoPrivate *);
     QDeclarativeInfoPrivate *d;
 };
 
-Q_DECLARATIVE_EXPORT inline QDeclarativeInfo qmlInfo(const QObject *me)
-{
-    return QDeclarativeInfo(me);
-}
-
-Q_DECLARATIVE_EXPORT inline QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error)
-{
-    return QDeclarativeInfo(me, error);
-}
-
-Q_DECLARATIVE_EXPORT inline QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors)
-{
-    return QDeclarativeInfo(me, errors);
-}
+Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me);
+Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error);
+Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors);
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index d41bd43..8fee8a7 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -134,6 +134,7 @@ public:
 
     int m_allocationSize;
     void (*m_newFunc)(void *);
+    QString m_noCreationReason;
 
     const QMetaObject *m_baseMetaObject;
     QDeclarativeAttachedPropertiesFunc m_attachedPropertiesFunc;
@@ -186,6 +187,7 @@ QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::Registe
     d->m_listId = type.listId;
     d->m_allocationSize = type.objectSize;
     d->m_newFunc = type.create;
+    d->m_noCreationReason = type.noCreationReason;
     d->m_baseMetaObject = type.metaObject;
     d->m_attachedPropertiesFunc = type.attachedPropertiesFunction;
     d->m_attachedPropertiesType = type.attachedPropertiesMetaObject;
@@ -221,6 +223,76 @@ bool QDeclarativeType::availableInVersion(int vmajor, int vminor) const
     return vmajor > d->m_version_maj || (vmajor == d->m_version_maj && vminor >= d->m_version_min);
 }
 
+static void clone(QMetaObjectBuilder &builder, const QMetaObject *mo, 
+                  const QMetaObject *ignoreStart, const QMetaObject *ignoreEnd)
+{
+    // Clone Q_CLASSINFO
+    for (int ii = mo->classInfoOffset(); ii < mo->classInfoCount(); ++ii) {
+        QMetaClassInfo info = mo->classInfo(ii);
+
+        int otherIndex = ignoreEnd->indexOfClassInfo(info.name());
+        if (otherIndex >= ignoreStart->classInfoOffset() + ignoreStart->classInfoCount()) {
+            // Skip 
+        } else {
+            builder.addClassInfo(info.name(), info.value());
+        }
+    }
+
+    // Clone Q_PROPERTY
+    for (int ii = mo->propertyOffset(); ii < mo->propertyCount(); ++ii) {
+        QMetaProperty property = mo->property(ii);
+
+        int otherIndex = ignoreEnd->indexOfProperty(property.name());
+        if (otherIndex >= ignoreStart->classInfoOffset() + ignoreStart->classInfoCount()) {
+            builder.addProperty(QByteArray("__qml_ignore__") + property.name(), QByteArray("void"));
+            // Skip 
+        } else {
+            builder.addProperty(property);
+        }
+    }
+
+    // Clone Q_METHODS
+    for (int ii = mo->methodOffset(); ii < mo->methodCount(); ++ii) {
+        QMetaMethod method = mo->method(ii);
+
+        // More complex - need to search name
+        QByteArray name = method.signature();
+        int parenIdx = name.indexOf('(');
+        if (parenIdx != -1) name = name.left(parenIdx);
+
+
+        bool found = false;
+
+        for (int ii = ignoreStart->methodOffset() + ignoreStart->methodCount(); 
+             !found && ii < ignoreEnd->methodOffset() + ignoreEnd->methodCount();
+             ++ii) {
+
+            QMetaMethod other = ignoreEnd->method(ii);
+            QByteArray othername = other.signature();
+            int parenIdx = othername.indexOf('(');
+            if (parenIdx != -1) othername = othername.left(parenIdx);
+
+            found = name == othername;
+        }
+
+        QMetaMethodBuilder m = builder.addMethod(method);
+        if (found) // SKIP
+            m.setAccess(QMetaMethod::Private);
+    }
+
+    // Clone Q_ENUMS
+    for (int ii = mo->enumeratorOffset(); ii < mo->enumeratorCount(); ++ii) {
+        QMetaEnum enumerator = mo->enumerator(ii);
+
+        int otherIndex = ignoreEnd->indexOfEnumerator(enumerator.name());
+        if (otherIndex >= ignoreStart->enumeratorOffset() + ignoreStart->enumeratorCount()) {
+            // Skip 
+        } else {
+            builder.addEnumerator(enumerator);
+        }
+    }
+}
+
 void QDeclarativeTypePrivate::init() const
 {
     if (m_isSetup) return;
@@ -245,8 +317,9 @@ void QDeclarativeTypePrivate::init() const
         QDeclarativeType *t = metaTypeData()->metaObjectToType.value(mo);
         if (t) {
             if (t->d->m_extFunc) {
-                QMetaObject *mmo = new QMetaObject;
-                *mmo = *t->d->m_extMetaObject;
+                QMetaObjectBuilder builder;
+                clone(builder, t->d->m_extMetaObject, t->d->m_baseMetaObject, m_baseMetaObject);
+                QMetaObject *mmo = builder.toMetaObject();
                 mmo->d.superdata = m_baseMetaObject;
                 if (!m_metaObjects.isEmpty())
                     m_metaObjects.last().metaObject->d.superdata = mmo;
@@ -318,6 +391,11 @@ QDeclarativeType::CreateFunc QDeclarativeType::createFunction() const
     return d->m_newFunc;
 }
 
+QString QDeclarativeType::noCreationReason() const
+{
+    return d->m_noCreationReason;
+}
+
 int QDeclarativeType::createSize() const
 {
     return d->m_allocationSize;
diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h
index 70b7c90..bf6a700 100644
--- a/src/declarative/qml/qdeclarativemetatype_p.h
+++ b/src/declarative/qml/qdeclarativemetatype_p.h
@@ -123,6 +123,7 @@ public:
 
     bool isCreatable() const;
     bool isExtendedType() const;
+    QString noCreationReason() const;
 
     bool isInterface() const;
     int typeId() const;
diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp
index f5f1a1f..b116129 100644
--- a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp
+++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp
@@ -45,8 +45,8 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QDeclarativeNetworkAccessManagerFactory
-  \since 4.7
-    \brief The QDeclarativeNetworkAccessManagerFactory class provides a factory for QNetworkAccessManager
+    \since 4.7
+    \brief The QDeclarativeNetworkAccessManagerFactory class provides a factory for QNetworkAccessManager for use by a Qt Declarative engine.
 
     QNetworkAccessManager is used for all network access by QML.
     By implementing a factory it is possible to create custom
@@ -82,6 +82,8 @@ QDeclarativeNetworkAccessManagerFactory::~QDeclarativeNetworkAccessManagerFactor
     Implement this method to create a QNetworkAccessManager with \a parent.
     This allows proxies, caching and cookie support to be setup appropriately.
 
+    This method should return a new QNetworkAccessManager each time it is called.
+
     Note: this method may be called by multiple threads, so ensure the
     implementation of this method is reentrant.
 */
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index a194354..bb5c8b7 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -353,7 +353,13 @@ void QDeclarativeObjectScriptClass::setProperty(QObject *obj,
     if (delBinding)
         delBinding->destroy();
 
-    if (value.isUndefined() && lastData->flags & QDeclarativePropertyCache::Data::IsResettable) {
+    if (value.isNull() && lastData->flags & QDeclarativePropertyCache::Data::IsQObjectDerived) {
+        QObject *o = 0;
+        int status = -1;
+        int flags = 0;
+        void *argv[] = { &o, 0, &status, &flags };
+        QMetaObject::metacall(obj, QMetaObject::WriteProperty, lastData->coreIndex, argv);
+    } else if (value.isUndefined() && lastData->flags & QDeclarativePropertyCache::Data::IsResettable) {
         void *a[] = { 0 };
         QMetaObject::metacall(obj, QMetaObject::ResetProperty, lastData->coreIndex, a);
     } else if (value.isUndefined() && lastData->propType == qMetaTypeId<QVariant>()) {
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index 6e240d8..e657dd5 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -184,6 +184,7 @@ namespace QDeclarativePrivate
         int listId;
         int objectSize;
         void (*create)(void *);
+        QString noCreationReason;
 
         const char *uri;
         int versionMajor;
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
index b106d4f..a0ed78f 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
@@ -47,8 +47,10 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QDeclarativePropertyValueSource
-    \brief The QDeclarativePropertyValueSource class is inherited by property value sources such as animations and bindings.
-    \internal
+    \brief The QDeclarativePropertyValueSource class is an interface for property value sources such as animations and bindings.
+
+    See \l{Property Value Sources} for information on writing custom property
+    value sources.
  */
 
 /*!
diff --git a/src/declarative/qml/qdeclarativetypenotavailable.cpp b/src/declarative/qml/qdeclarativetypenotavailable.cpp
new file mode 100644
index 0000000..7a84732
--- /dev/null
+++ b/src/declarative/qml/qdeclarativetypenotavailable.cpp
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativetypenotavailable_p.h"
+
+int qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message)
+{
+    return qmlRegisterUncreatableType<QDeclarativeTypeNotAvailable>(uri,versionMajor,versionMinor,qmlName,message);
+}
+
+QDeclarativeTypeNotAvailable::QDeclarativeTypeNotAvailable() { }
diff --git a/src/declarative/qml/qdeclarativetypenotavailable_p.h b/src/declarative/qml/qdeclarativetypenotavailable_p.h
new file mode 100644
index 0000000..9c1c256
--- /dev/null
+++ b/src/declarative/qml/qdeclarativetypenotavailable_p.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETYPENOTAVAILABLE_H
+#define QDECLARATIVETYPENOTAVAILABLE_H
+
+#include <qdeclarative.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeTypeNotAvailable : public QObject {
+    Q_OBJECT
+public:
+    QDeclarativeTypeNotAvailable();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeTypeNotAvailable)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVETYPENOTAVAILABLE_H
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index c5f6d6a..d4bb8ee 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -59,6 +59,8 @@ int qmlRegisterValueTypeEnums(const char *qmlName)
 
         qRegisterMetaType<T *>(pointerName.constData()), 0, 0, 0,
 
+        QString(),
+
         "Qt", 4, 6, qmlName, &T::staticMetaObject,
 
         0, 0,
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index c48662c..3848593 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -40,6 +40,7 @@ SOURCES += \
     $$PWD/qdeclarativepropertycache.cpp \
     $$PWD/qdeclarativenotifier.cpp \
     $$PWD/qdeclarativeintegercache.cpp \
+    $$PWD/qdeclarativetypenotavailable.cpp \
     $$PWD/qdeclarativetypenamecache.cpp \
     $$PWD/qdeclarativescriptstring.cpp \
     $$PWD/qdeclarativeobjectscriptclass.cpp \
@@ -112,6 +113,7 @@ HEADERS += \
     $$PWD/qdeclarativepropertycache_p.h \
     $$PWD/qdeclarativenotifier_p.h \
     $$PWD/qdeclarativeintegercache_p.h \
+    $$PWD/qdeclarativetypenotavailable_p.h \
     $$PWD/qdeclarativetypenamecache_p.h \
     $$PWD/qdeclarativescriptstring.h \
     $$PWD/qdeclarativeobjectscriptclass_p.h \
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 9c3ee9f..8a6937d 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -159,12 +159,12 @@ public:
     QDeclarativeExpression *rewindExpression;
     QDeclarativeGuard<QDeclarativeExpression> ownedExpression;
 
-    virtual void execute() {
+    virtual void execute(Reason) {
         ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, expression);
     }
 
     virtual bool isReversable() { return true; }
-    virtual void reverse() {
+    virtual void reverse(Reason) {
         ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression);
     }
 
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 78813fa..684f527 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -95,7 +95,7 @@ QString QDeclarativeActionEvent::typeName() const
     return QString();
 }
 
-void QDeclarativeActionEvent::execute()
+void QDeclarativeActionEvent::execute(Reason)
 {
 }
 
@@ -104,7 +104,7 @@ bool QDeclarativeActionEvent::isReversable()
     return false;
 }
 
-void QDeclarativeActionEvent::reverse()
+void QDeclarativeActionEvent::reverse(Reason)
 {
 }
 
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index 472897e..0ba67b0 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -90,9 +90,11 @@ public:
     virtual ~QDeclarativeActionEvent();
     virtual QString typeName() const;
 
-    virtual void execute();
+    enum Reason { ActualChange, FastForward };
+
+    virtual void execute(Reason reason = ActualChange);
     virtual bool isReversable();
-    virtual void reverse();
+    virtual void reverse(Reason reason = ActualChange);
     virtual void saveOriginals() {}
     virtual void copyOriginals(QDeclarativeActionEvent *) {}
 
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index eb6ac7b..0aad498 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -50,6 +50,8 @@
 #include <qdeclarativeguard_p.h>
 #include <qdeclarativenullablevalue_p_p.h>
 #include "private/qdeclarativecontext_p.h"
+#include "private/qdeclarativeproperty_p.h"
+#include "private/qdeclarativebinding_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtGui/qgraphicsitem.h>
@@ -86,7 +88,6 @@ public:
 void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, QDeclarativeItem *stackBefore)
 {
     if (targetParent && target && target->parentItem()) {
-        //### for backwards direction, can we just restore original x, y, scale, rotation
         Q_Q(QDeclarativeParentChange);
         bool ok;
         const QTransform &transform = target->parentItem()->itemTransform(targetParent, &ok);
@@ -123,6 +124,10 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q
         const QPointF &point = transform.map(QPointF(target->x(),target->y()));
         qreal x = point.x();
         qreal y = point.y();
+
+        // setParentItem will update the transformOriginPoint if needed
+        target->setParentItem(targetParent);
+
         if (ok && target->transformOrigin() != QDeclarativeItem::TopLeft) {
             qreal tempxt = target->transformOriginPoint().x();
             qreal tempyt = target->transformOriginPoint().y();
@@ -136,7 +141,6 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q
             y += offset.y();
         }
 
-        target->setParentItem(targetParent);
         if (ok) {
             //qDebug() << x << y << rotation << scale;
             target->setX(x);
@@ -415,7 +419,7 @@ void QDeclarativeParentChange::copyOriginals(QDeclarativeActionEvent *other)
     saveCurrentValues();
 }
 
-void QDeclarativeParentChange::execute()
+void QDeclarativeParentChange::execute(Reason)
 {
     Q_D(QDeclarativeParentChange);
     d->doChange(d->parent);
@@ -426,7 +430,7 @@ bool QDeclarativeParentChange::isReversable()
     return true;
 }
 
-void QDeclarativeParentChange::reverse()
+void QDeclarativeParentChange::reverse(Reason)
 {
     Q_D(QDeclarativeParentChange);
     d->doChange(d->origParent, d->origStackBefore);
@@ -566,7 +570,7 @@ void QDeclarativeStateChangeScript::setName(const QString &n)
     d->name = n;
 }
 
-void QDeclarativeStateChangeScript::execute()
+void QDeclarativeStateChangeScript::execute(Reason)
 {
     Q_D(QDeclarativeStateChangeScript);
     const QString &script = d->script.script();
@@ -601,15 +605,22 @@ QString QDeclarativeStateChangeScript::typeName() const
 
     In the following example we change the top and bottom anchors of an item:
     \qml
-    AnchorChanges {
-        target: content; top: window.top; bottom: window.bottom
+    State {
+        name: "reanchored"
+        AnchorChanges {
+            target: content;
+            anchors.top: window.top;
+            anchors.bottom: window.bottom
+        }
     }
     \endqml
 
     AnchorChanges can be animated using AnchorAnimation.
     \qml
     //animate our anchor changes
-    AnchorAnimation {}
+    Transition {
+        AnchorAnimation {}
+    }
     \endqml
 
     For more information on anchors see \l {anchor-layout}{Anchor Layouts}.
@@ -620,26 +631,25 @@ class QDeclarativeAnchorSetPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QDeclarativeAnchorSet)
 public:
     QDeclarativeAnchorSetPrivate()
-      : usedAnchors(0), fill(0),
+      : usedAnchors(0), resetAnchors(0), fill(0),
         centerIn(0)/*, leftMargin(0), rightMargin(0), topMargin(0), bottomMargin(0),
         margins(0), vCenterOffset(0), hCenterOffset(0), baselineOffset(0)*/
     {
     }
 
-    QDeclarativeAnchors::UsedAnchors usedAnchors;
-    //### change to QDeclarativeAnchors::UsedAnchors resetAnchors
-    QStringList resetList;
+    QDeclarativeAnchors::Anchors usedAnchors;
+    QDeclarativeAnchors::Anchors resetAnchors;
 
     QDeclarativeItem *fill;
     QDeclarativeItem *centerIn;
 
-    QDeclarativeAnchorLine left;
-    QDeclarativeAnchorLine right;
-    QDeclarativeAnchorLine top;
-    QDeclarativeAnchorLine bottom;
-    QDeclarativeAnchorLine vCenter;
-    QDeclarativeAnchorLine hCenter;
-    QDeclarativeAnchorLine baseline;
+    QDeclarativeScriptString leftScript;
+    QDeclarativeScriptString rightScript;
+    QDeclarativeScriptString topScript;
+    QDeclarativeScriptString bottomScript;
+    QDeclarativeScriptString hCenterScript;
+    QDeclarativeScriptString vCenterScript;
+    QDeclarativeScriptString baselineScript;
 
     /*qreal leftMargin;
     qreal rightMargin;
@@ -660,151 +670,165 @@ QDeclarativeAnchorSet::~QDeclarativeAnchorSet()
 {
 }
 
-QDeclarativeAnchorLine QDeclarativeAnchorSet::top() const
+QDeclarativeScriptString QDeclarativeAnchorSet::top() const
 {
     Q_D(const QDeclarativeAnchorSet);
-    return d->top;
+    return d->topScript;
 }
 
-void QDeclarativeAnchorSet::setTop(const QDeclarativeAnchorLine &edge)
+void QDeclarativeAnchorSet::setTop(const QDeclarativeScriptString &edge)
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors |= QDeclarativeAnchors::HasTopAnchor;
-    d->top = edge;
+    d->usedAnchors |= QDeclarativeAnchors::TopAnchor;
+    d->topScript = edge;
+    if (edge.script() == QLatin1String("undefined"))
+        resetTop();
 }
 
 void QDeclarativeAnchorSet::resetTop()
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors &= ~QDeclarativeAnchors::HasTopAnchor;
-    d->top = QDeclarativeAnchorLine();
-    d->resetList << QLatin1String("top");
+    d->usedAnchors &= ~QDeclarativeAnchors::TopAnchor;
+    d->topScript = QDeclarativeScriptString();
+    d->resetAnchors |= QDeclarativeAnchors::TopAnchor;
 }
 
-QDeclarativeAnchorLine QDeclarativeAnchorSet::bottom() const
+QDeclarativeScriptString QDeclarativeAnchorSet::bottom() const
 {
     Q_D(const QDeclarativeAnchorSet);
-    return d->bottom;
+    return d->bottomScript;
 }
 
-void QDeclarativeAnchorSet::setBottom(const QDeclarativeAnchorLine &edge)
+void QDeclarativeAnchorSet::setBottom(const QDeclarativeScriptString &edge)
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors |= QDeclarativeAnchors::HasBottomAnchor;
-    d->bottom = edge;
+    d->usedAnchors |= QDeclarativeAnchors::BottomAnchor;
+    d->bottomScript = edge;
+    if (edge.script() == QLatin1String("undefined"))
+        resetBottom();
 }
 
 void QDeclarativeAnchorSet::resetBottom()
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors &= ~QDeclarativeAnchors::HasBottomAnchor;
-    d->bottom = QDeclarativeAnchorLine();
-    d->resetList << QLatin1String("bottom");
+    d->usedAnchors &= ~QDeclarativeAnchors::BottomAnchor;
+    d->bottomScript = QDeclarativeScriptString();
+    d->resetAnchors |= QDeclarativeAnchors::BottomAnchor;
 }
 
-QDeclarativeAnchorLine QDeclarativeAnchorSet::verticalCenter() const
+QDeclarativeScriptString QDeclarativeAnchorSet::verticalCenter() const
 {
     Q_D(const QDeclarativeAnchorSet);
-    return d->vCenter;
+    return d->vCenterScript;
 }
 
-void QDeclarativeAnchorSet::setVerticalCenter(const QDeclarativeAnchorLine &edge)
+void QDeclarativeAnchorSet::setVerticalCenter(const QDeclarativeScriptString &edge)
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors |= QDeclarativeAnchors::HasVCenterAnchor;
-    d->vCenter = edge;
+    d->usedAnchors |= QDeclarativeAnchors::VCenterAnchor;
+    d->vCenterScript = edge;
+    if (edge.script() == QLatin1String("undefined"))
+        resetVerticalCenter();
 }
 
 void QDeclarativeAnchorSet::resetVerticalCenter()
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors &= ~QDeclarativeAnchors::HasVCenterAnchor;
-    d->vCenter = QDeclarativeAnchorLine();
-    d->resetList << QLatin1String("verticalCenter");
+    d->usedAnchors &= ~QDeclarativeAnchors::VCenterAnchor;
+    d->vCenterScript = QDeclarativeScriptString();
+    d->resetAnchors |= QDeclarativeAnchors::VCenterAnchor;
 }
 
-QDeclarativeAnchorLine QDeclarativeAnchorSet::baseline() const
+QDeclarativeScriptString QDeclarativeAnchorSet::baseline() const
 {
     Q_D(const QDeclarativeAnchorSet);
-    return d->baseline;
+    return d->baselineScript;
 }
 
-void QDeclarativeAnchorSet::setBaseline(const QDeclarativeAnchorLine &edge)
+void QDeclarativeAnchorSet::setBaseline(const QDeclarativeScriptString &edge)
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors |= QDeclarativeAnchors::HasBaselineAnchor;
-    d->baseline = edge;
+    d->usedAnchors |= QDeclarativeAnchors::BaselineAnchor;
+    d->baselineScript = edge;
+    if (edge.script() == QLatin1String("undefined"))
+        resetBaseline();
 }
 
 void QDeclarativeAnchorSet::resetBaseline()
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors &= ~QDeclarativeAnchors::HasBaselineAnchor;
-    d->baseline = QDeclarativeAnchorLine();
-    d->resetList << QLatin1String("baseline");
+    d->usedAnchors &= ~QDeclarativeAnchors::BaselineAnchor;
+    d->baselineScript = QDeclarativeScriptString();
+    d->resetAnchors |= QDeclarativeAnchors::BaselineAnchor;
 }
 
-QDeclarativeAnchorLine QDeclarativeAnchorSet::left() const
+QDeclarativeScriptString QDeclarativeAnchorSet::left() const
 {
     Q_D(const QDeclarativeAnchorSet);
-    return d->left;
+    return d->leftScript;
 }
 
-void QDeclarativeAnchorSet::setLeft(const QDeclarativeAnchorLine &edge)
+void QDeclarativeAnchorSet::setLeft(const QDeclarativeScriptString &edge)
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors |= QDeclarativeAnchors::HasLeftAnchor;
-    d->left = edge;
+    d->usedAnchors |= QDeclarativeAnchors::LeftAnchor;
+    d->leftScript = edge;
+    if (edge.script() == QLatin1String("undefined"))
+        resetLeft();
 }
 
 void QDeclarativeAnchorSet::resetLeft()
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors &= ~QDeclarativeAnchors::HasLeftAnchor;
-    d->left = QDeclarativeAnchorLine();
-    d->resetList << QLatin1String("left");
+    d->usedAnchors &= ~QDeclarativeAnchors::LeftAnchor;
+    d->leftScript = QDeclarativeScriptString();
+    d->resetAnchors |= QDeclarativeAnchors::LeftAnchor;
 }
 
-QDeclarativeAnchorLine QDeclarativeAnchorSet::right() const
+QDeclarativeScriptString QDeclarativeAnchorSet::right() const
 {
     Q_D(const QDeclarativeAnchorSet);
-    return d->right;
+    return d->rightScript;
 }
 
-void QDeclarativeAnchorSet::setRight(const QDeclarativeAnchorLine &edge)
+void QDeclarativeAnchorSet::setRight(const QDeclarativeScriptString &edge)
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors |= QDeclarativeAnchors::HasRightAnchor;
-    d->right = edge;
+    d->usedAnchors |= QDeclarativeAnchors::RightAnchor;
+    d->rightScript = edge;
+    if (edge.script() == QLatin1String("undefined"))
+        resetRight();
 }
 
 void QDeclarativeAnchorSet::resetRight()
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors &= ~QDeclarativeAnchors::HasRightAnchor;
-    d->right = QDeclarativeAnchorLine();
-    d->resetList << QLatin1String("right");
+    d->usedAnchors &= ~QDeclarativeAnchors::RightAnchor;
+    d->rightScript = QDeclarativeScriptString();
+    d->resetAnchors |= QDeclarativeAnchors::RightAnchor;
 }
 
-QDeclarativeAnchorLine QDeclarativeAnchorSet::horizontalCenter() const
+QDeclarativeScriptString QDeclarativeAnchorSet::horizontalCenter() const
 {
     Q_D(const QDeclarativeAnchorSet);
-    return d->hCenter;
+    return d->hCenterScript;
 }
 
-void QDeclarativeAnchorSet::setHorizontalCenter(const QDeclarativeAnchorLine &edge)
+void QDeclarativeAnchorSet::setHorizontalCenter(const QDeclarativeScriptString &edge)
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors |= QDeclarativeAnchors::HasHCenterAnchor;
-    d->hCenter = edge;
+    d->usedAnchors |= QDeclarativeAnchors::HCenterAnchor;
+    d->hCenterScript = edge;
+    if (edge.script() == QLatin1String("undefined"))
+        resetHorizontalCenter();
 }
 
 void QDeclarativeAnchorSet::resetHorizontalCenter()
 {
     Q_D(QDeclarativeAnchorSet);
-    d->usedAnchors &= ~QDeclarativeAnchors::HasHCenterAnchor;
-    d->hCenter = QDeclarativeAnchorLine();
-    d->resetList << QLatin1String("horizontalCenter");
+    d->usedAnchors &= ~QDeclarativeAnchors::HCenterAnchor;
+    d->hCenterScript = QDeclarativeScriptString();
+    d->resetAnchors |= QDeclarativeAnchors::HCenterAnchor;
 }
 
 QDeclarativeItem *QDeclarativeAnchorSet::fill() const
@@ -846,19 +870,35 @@ class QDeclarativeAnchorChangesPrivate : public QObjectPrivate
 {
 public:
     QDeclarativeAnchorChangesPrivate()
-        : target(0), anchorSet(new QDeclarativeAnchorSet) {}
+        : target(0), anchorSet(new QDeclarativeAnchorSet),
+          leftBinding(0), rightBinding(0), hCenterBinding(0),
+          topBinding(0), bottomBinding(0), vCenterBinding(0), baselineBinding(0),
+          origLeftBinding(0), origRightBinding(0), origHCenterBinding(0),
+          origTopBinding(0), origBottomBinding(0), origVCenterBinding(0),
+          origBaselineBinding(0)
+    {
+
+    }
     ~QDeclarativeAnchorChangesPrivate() { delete anchorSet; }
 
     QDeclarativeItem *target;
     QDeclarativeAnchorSet *anchorSet;
 
-    QDeclarativeAnchorLine origLeft;
-    QDeclarativeAnchorLine origRight;
-    QDeclarativeAnchorLine origHCenter;
-    QDeclarativeAnchorLine origTop;
-    QDeclarativeAnchorLine origBottom;
-    QDeclarativeAnchorLine origVCenter;
-    QDeclarativeAnchorLine origBaseline;
+    QDeclarativeBinding *leftBinding;
+    QDeclarativeBinding *rightBinding;
+    QDeclarativeBinding *hCenterBinding;
+    QDeclarativeBinding *topBinding;
+    QDeclarativeBinding *bottomBinding;
+    QDeclarativeBinding *vCenterBinding;
+    QDeclarativeBinding *baselineBinding;
+
+    QDeclarativeAbstractBinding *origLeftBinding;
+    QDeclarativeAbstractBinding *origRightBinding;
+    QDeclarativeAbstractBinding *origHCenterBinding;
+    QDeclarativeAbstractBinding *origTopBinding;
+    QDeclarativeAbstractBinding *origBottomBinding;
+    QDeclarativeAbstractBinding *origVCenterBinding;
+    QDeclarativeAbstractBinding *origBaselineBinding;
 
     QDeclarativeAnchorLine rewindLeft;
     QDeclarativeAnchorLine rewindRight;
@@ -890,6 +930,16 @@ public:
     bool applyOrigBottom;
     bool applyOrigVCenter;
     bool applyOrigBaseline;
+
+    QList<QDeclarativeAbstractBinding*> oldBindings;
+
+    QDeclarativeProperty leftProp;
+    QDeclarativeProperty rightProp;
+    QDeclarativeProperty hCenterProp;
+    QDeclarativeProperty topProp;
+    QDeclarativeProperty bottomProp;
+    QDeclarativeProperty vCenterProp;
+    QDeclarativeProperty baselineProp;
 };
 
 /*!
@@ -908,6 +958,47 @@ QDeclarativeAnchorChanges::~QDeclarativeAnchorChanges()
 
 QDeclarativeAnchorChanges::ActionList QDeclarativeAnchorChanges::actions()
 {
+    Q_D(QDeclarativeAnchorChanges);
+    d->leftBinding = d->rightBinding = d->hCenterBinding = d->topBinding
+                   = d->bottomBinding = d->vCenterBinding = d->baselineBinding = 0;
+
+    d->leftProp = QDeclarativeProperty(d->target, QLatin1String("anchors.left"));
+    d->rightProp = QDeclarativeProperty(d->target, QLatin1String("anchors.right"));
+    d->hCenterProp = QDeclarativeProperty(d->target, QLatin1String("anchors.horizontalCenter"));
+    d->topProp = QDeclarativeProperty(d->target, QLatin1String("anchors.top"));
+    d->bottomProp = QDeclarativeProperty(d->target, QLatin1String("anchors.bottom"));
+    d->vCenterProp = QDeclarativeProperty(d->target, QLatin1String("anchors.verticalCenter"));
+    d->baselineProp = QDeclarativeProperty(d->target, QLatin1String("anchors.baseline"));
+
+    if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::LeftAnchor) {
+        d->leftBinding = new QDeclarativeBinding(d->anchorSet->d_func()->leftScript.script(), d->target, qmlContext(this));
+        d->leftBinding->setTarget(d->leftProp);
+    }
+    if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::RightAnchor) {
+        d->rightBinding = new QDeclarativeBinding(d->anchorSet->d_func()->rightScript.script(), d->target, qmlContext(this));
+        d->rightBinding->setTarget(d->rightProp);
+    }
+    if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
+        d->hCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->hCenterScript.script(), d->target, qmlContext(this));
+        d->hCenterBinding->setTarget(d->hCenterProp);
+    }
+    if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::TopAnchor) {
+        d->topBinding = new QDeclarativeBinding(d->anchorSet->d_func()->topScript.script(), d->target, qmlContext(this));
+        d->topBinding->setTarget(d->topProp);
+    }
+    if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::BottomAnchor) {
+        d->bottomBinding = new QDeclarativeBinding(d->anchorSet->d_func()->bottomScript.script(), d->target, qmlContext(this));
+        d->bottomBinding->setTarget(d->bottomProp);
+    }
+    if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
+        d->vCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->vCenterScript.script(), d->target, qmlContext(this));
+        d->vCenterBinding->setTarget(d->vCenterProp);
+    }
+    if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::BaselineAnchor) {
+        d->baselineBinding = new QDeclarativeBinding(d->anchorSet->d_func()->baselineScript.script(), d->target, qmlContext(this));
+        d->baselineBinding->setTarget(d->baselineProp);
+    }
+
     QDeclarativeAction a;
     a.event = this;
     return ActionList() << a;
@@ -952,59 +1043,104 @@ void QDeclarativeAnchorChanges::setObject(QDeclarativeItem *target)
     \endqml
 */
 
-void QDeclarativeAnchorChanges::execute()
+void QDeclarativeAnchorChanges::execute(Reason reason)
 {
     Q_D(QDeclarativeAnchorChanges);
     if (!d->target)
         return;
 
     //incorporate any needed "reverts"
-    if (d->applyOrigLeft)
-        d->target->anchors()->setLeft(d->origLeft);
-    if (d->applyOrigRight)
-        d->target->anchors()->setRight(d->origRight);
-    if (d->applyOrigHCenter)
-        d->target->anchors()->setHorizontalCenter(d->origHCenter);
-    if (d->applyOrigTop)
-        d->target->anchors()->setTop(d->origTop);
-    if (d->applyOrigBottom)
-        d->target->anchors()->setBottom(d->origBottom);
-    if (d->applyOrigVCenter)
-        d->target->anchors()->setVerticalCenter(d->origVCenter);
-    if (d->applyOrigBaseline)
-        d->target->anchors()->setBaseline(d->origBaseline);
-
-    //reset any anchors that have been specified
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("left")))
+    if (d->applyOrigLeft) {
+        if (!d->origLeftBinding)
+            d->target->anchors()->resetLeft();
+        QDeclarativePropertyPrivate::setBinding(d->leftProp, d->origLeftBinding);
+    }
+    if (d->applyOrigRight) {
+        if (!d->origRightBinding)
+            d->target->anchors()->resetRight();
+        QDeclarativePropertyPrivate::setBinding(d->rightProp, d->origRightBinding);
+    }
+    if (d->applyOrigHCenter) {
+        if (!d->origHCenterBinding)
+            d->target->anchors()->resetHorizontalCenter();
+        QDeclarativePropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding);
+    }
+    if (d->applyOrigTop) {
+        if (!d->origTopBinding)
+            d->target->anchors()->resetTop();
+        QDeclarativePropertyPrivate::setBinding(d->topProp, d->origTopBinding);
+    }
+    if (d->applyOrigBottom) {
+        if (!d->origBottomBinding)
+            d->target->anchors()->resetBottom();
+        QDeclarativePropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding);
+    }
+    if (d->applyOrigVCenter) {
+        if (!d->origVCenterBinding)
+            d->target->anchors()->resetVerticalCenter();
+        QDeclarativePropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding);
+    }
+    if (d->applyOrigBaseline) {
+        if (!d->origBaselineBinding)
+            d->target->anchors()->resetBaseline();
+        QDeclarativePropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding);
+    }
+
+    //destroy old bindings
+    if (reason == ActualChange) {
+        for (int i = 0; i < d->oldBindings.size(); ++i) {
+            QDeclarativeAbstractBinding *binding = d->oldBindings.at(i);
+            if (binding)
+                binding->destroy();
+        }
+        d->oldBindings.clear();
+    }
+
+    //reset any anchors that have been specified as "undefined"
+    if (d->anchorSet->d_func()->resetAnchors & QDeclarativeAnchors::LeftAnchor) {
         d->target->anchors()->resetLeft();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("right")))
+        QDeclarativePropertyPrivate::setBinding(d->leftProp, 0);
+    }
+    if (d->anchorSet->d_func()->resetAnchors & QDeclarativeAnchors::RightAnchor) {
         d->target->anchors()->resetRight();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("horizontalCenter")))
+        QDeclarativePropertyPrivate::setBinding(d->rightProp, 0);
+    }
+    if (d->anchorSet->d_func()->resetAnchors & QDeclarativeAnchors::HCenterAnchor) {
         d->target->anchors()->resetHorizontalCenter();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("top")))
+        QDeclarativePropertyPrivate::setBinding(d->hCenterProp, 0);
+    }
+    if (d->anchorSet->d_func()->resetAnchors & QDeclarativeAnchors::TopAnchor) {
         d->target->anchors()->resetTop();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("bottom")))
+        QDeclarativePropertyPrivate::setBinding(d->topProp, 0);
+    }
+    if (d->anchorSet->d_func()->resetAnchors & QDeclarativeAnchors::BottomAnchor) {
         d->target->anchors()->resetBottom();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("verticalCenter")))
+        QDeclarativePropertyPrivate::setBinding(d->bottomProp, 0);
+    }
+    if (d->anchorSet->d_func()->resetAnchors & QDeclarativeAnchors::VCenterAnchor) {
         d->target->anchors()->resetVerticalCenter();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("baseline")))
+        QDeclarativePropertyPrivate::setBinding(d->vCenterProp, 0);
+    }
+    if (d->anchorSet->d_func()->resetAnchors & QDeclarativeAnchors::BaselineAnchor) {
         d->target->anchors()->resetBaseline();
+        QDeclarativePropertyPrivate::setBinding(d->baselineProp, 0);
+    }
 
     //set any anchors that have been specified
-    if (d->anchorSet->d_func()->left.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setLeft(d->anchorSet->d_func()->left);
-    if (d->anchorSet->d_func()->right.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setRight(d->anchorSet->d_func()->right);
-    if (d->anchorSet->d_func()->hCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setHorizontalCenter(d->anchorSet->d_func()->hCenter);
-    if (d->anchorSet->d_func()->top.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setTop(d->anchorSet->d_func()->top);
-    if (d->anchorSet->d_func()->bottom.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setBottom(d->anchorSet->d_func()->bottom);
-    if (d->anchorSet->d_func()->vCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setVerticalCenter(d->anchorSet->d_func()->vCenter);
-    if (d->anchorSet->d_func()->baseline.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setBaseline(d->anchorSet->d_func()->baseline);
+    if (d->leftBinding)
+        QDeclarativePropertyPrivate::setBinding(d->leftBinding->property(), d->leftBinding);
+    if (d->rightBinding)
+        QDeclarativePropertyPrivate::setBinding(d->rightBinding->property(), d->rightBinding);
+    if (d->hCenterBinding)
+        QDeclarativePropertyPrivate::setBinding(d->hCenterBinding->property(), d->hCenterBinding);
+    if (d->topBinding)
+        QDeclarativePropertyPrivate::setBinding(d->topBinding->property(), d->topBinding);
+    if (d->bottomBinding)
+        QDeclarativePropertyPrivate::setBinding(d->bottomBinding->property(), d->bottomBinding);
+    if (d->vCenterBinding)
+        QDeclarativePropertyPrivate::setBinding(d->vCenterBinding->property(), d->vCenterBinding);
+    if (d->baselineBinding)
+        QDeclarativePropertyPrivate::setBinding(d->baselineBinding->property(), d->baselineBinding);
 }
 
 bool QDeclarativeAnchorChanges::isReversable()
@@ -1012,43 +1148,78 @@ bool QDeclarativeAnchorChanges::isReversable()
     return true;
 }
 
-void QDeclarativeAnchorChanges::reverse()
+void QDeclarativeAnchorChanges::reverse(Reason reason)
 {
     Q_D(QDeclarativeAnchorChanges);
     if (!d->target)
         return;
 
     //reset any anchors set by the state
-    if (d->anchorSet->d_func()->left.anchorLine != QDeclarativeAnchorLine::Invalid)
+    if (d->leftBinding) {
         d->target->anchors()->resetLeft();
-    if (d->anchorSet->d_func()->right.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->leftBinding->property(), 0);
+        if (reason == ActualChange) {
+            d->leftBinding->destroy(); d->leftBinding = 0;
+        }
+    }
+    if (d->rightBinding) {
         d->target->anchors()->resetRight();
-    if (d->anchorSet->d_func()->hCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->rightBinding->property(), 0);
+        if (reason == ActualChange) {
+            d->rightBinding->destroy(); d->rightBinding = 0;
+        }
+    }
+    if (d->hCenterBinding) {
         d->target->anchors()->resetHorizontalCenter();
-    if (d->anchorSet->d_func()->top.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->hCenterBinding->property(), 0);
+        if (reason == ActualChange) {
+            d->hCenterBinding->destroy(); d->hCenterBinding = 0;
+        }
+    }
+    if (d->topBinding) {
         d->target->anchors()->resetTop();
-    if (d->anchorSet->d_func()->bottom.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->topBinding->property(), 0);
+        if (reason == ActualChange) {
+            d->topBinding->destroy(); d->topBinding = 0;
+        }
+    }
+    if (d->bottomBinding) {
         d->target->anchors()->resetBottom();
-    if (d->anchorSet->d_func()->vCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->bottomBinding->property(), 0);
+        if (reason == ActualChange) {
+            d->bottomBinding->destroy(); d->bottomBinding = 0;
+        }
+    }
+    if (d->vCenterBinding) {
         d->target->anchors()->resetVerticalCenter();
-    if (d->anchorSet->d_func()->baseline.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->vCenterBinding->property(), 0);
+        if (reason == ActualChange) {
+            d->vCenterBinding->destroy(); d->vCenterBinding = 0;
+        }
+    }
+    if (d->baselineBinding) {
         d->target->anchors()->resetBaseline();
+        QDeclarativePropertyPrivate::setBinding(d->baselineBinding->property(), 0);
+        if (reason == ActualChange) {
+            d->baselineBinding->destroy(); d->baselineBinding = 0;
+        }
+    }
 
     //restore previous anchors
-    if (d->origLeft.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setLeft(d->origLeft);
-    if (d->origRight.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setRight(d->origRight);
-    if (d->origHCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setHorizontalCenter(d->origHCenter);
-    if (d->origTop.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setTop(d->origTop);
-    if (d->origBottom.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setBottom(d->origBottom);
-    if (d->origVCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setVerticalCenter(d->origVCenter);
-    if (d->origBaseline.anchorLine != QDeclarativeAnchorLine::Invalid)
-        d->target->anchors()->setBaseline(d->origBaseline);
+    if (d->origLeftBinding)
+        QDeclarativePropertyPrivate::setBinding(d->leftProp, d->origLeftBinding);
+    if (d->origRightBinding)
+        QDeclarativePropertyPrivate::setBinding(d->rightProp, d->origRightBinding);
+    if (d->origHCenterBinding)
+        QDeclarativePropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding);
+    if (d->origTopBinding)
+        QDeclarativePropertyPrivate::setBinding(d->topProp, d->origTopBinding);
+    if (d->origBottomBinding)
+        QDeclarativePropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding);
+    if (d->origVCenterBinding)
+        QDeclarativePropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding);
+    if (d->origBaselineBinding)
+        QDeclarativePropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding);
 }
 
 QString QDeclarativeAnchorChanges::typeName() const
@@ -1099,13 +1270,13 @@ void QDeclarativeAnchorChanges::saveOriginals()
     if (!d->target)
         return;
 
-    d->origLeft = d->target->anchors()->left();
-    d->origRight = d->target->anchors()->right();
-    d->origHCenter = d->target->anchors()->horizontalCenter();
-    d->origTop = d->target->anchors()->top();
-    d->origBottom = d->target->anchors()->bottom();
-    d->origVCenter = d->target->anchors()->verticalCenter();
-    d->origBaseline = d->target->anchors()->baseline();
+    d->origLeftBinding = QDeclarativePropertyPrivate::binding(d->leftProp);
+    d->origRightBinding = QDeclarativePropertyPrivate::binding(d->rightProp);
+    d->origHCenterBinding = QDeclarativePropertyPrivate::binding(d->hCenterProp);
+    d->origTopBinding = QDeclarativePropertyPrivate::binding(d->topProp);
+    d->origBottomBinding = QDeclarativePropertyPrivate::binding(d->bottomProp);
+    d->origVCenterBinding = QDeclarativePropertyPrivate::binding(d->vCenterProp);
+    d->origBaselineBinding = QDeclarativePropertyPrivate::binding(d->baselineProp);
 
     d->applyOrigLeft = d->applyOrigRight = d->applyOrigHCenter = d->applyOrigTop
       = d->applyOrigBottom = d->applyOrigVCenter = d->applyOrigBaseline = false;
@@ -1119,35 +1290,29 @@ void QDeclarativeAnchorChanges::copyOriginals(QDeclarativeActionEvent *other)
     QDeclarativeAnchorChanges *ac = static_cast<QDeclarativeAnchorChanges*>(other);
     QDeclarativeAnchorChangesPrivate *acp = ac->d_func();
 
-    //probably also need to revert some things
-    d->applyOrigLeft = (acp->anchorSet->d_func()->left.anchorLine != QDeclarativeAnchorLine::Invalid ||
-        acp->anchorSet->d_func()->resetList.contains(QLatin1String("left")));
-
-    d->applyOrigRight = (acp->anchorSet->d_func()->right.anchorLine != QDeclarativeAnchorLine::Invalid ||
-        acp->anchorSet->d_func()->resetList.contains(QLatin1String("right")));
-
-    d->applyOrigHCenter = (acp->anchorSet->d_func()->hCenter.anchorLine != QDeclarativeAnchorLine::Invalid ||
-        acp->anchorSet->d_func()->resetList.contains(QLatin1String("horizontalCenter")));
-
-    d->applyOrigTop = (acp->anchorSet->d_func()->top.anchorLine != QDeclarativeAnchorLine::Invalid ||
-        acp->anchorSet->d_func()->resetList.contains(QLatin1String("top")));
-
-    d->applyOrigBottom = (acp->anchorSet->d_func()->bottom.anchorLine != QDeclarativeAnchorLine::Invalid ||
-        acp->anchorSet->d_func()->resetList.contains(QLatin1String("bottom")));
+    QDeclarativeAnchors::Anchors combined = acp->anchorSet->d_func()->usedAnchors |
+                                            acp->anchorSet->d_func()->resetAnchors;
 
-    d->applyOrigVCenter = (acp->anchorSet->d_func()->vCenter.anchorLine != QDeclarativeAnchorLine::Invalid ||
-        acp->anchorSet->d_func()->resetList.contains(QLatin1String("verticalCenter")));
-
-    d->applyOrigBaseline = (acp->anchorSet->d_func()->baseline.anchorLine != QDeclarativeAnchorLine::Invalid ||
-        acp->anchorSet->d_func()->resetList.contains(QLatin1String("baseline")));
-
-    d->origLeft = ac->d_func()->origLeft;
-    d->origRight = ac->d_func()->origRight;
-    d->origHCenter = ac->d_func()->origHCenter;
-    d->origTop = ac->d_func()->origTop;
-    d->origBottom = ac->d_func()->origBottom;
-    d->origVCenter = ac->d_func()->origVCenter;
-    d->origBaseline = ac->d_func()->origBaseline;
+    //probably also need to revert some things
+    d->applyOrigLeft = (combined & QDeclarativeAnchors::LeftAnchor);
+    d->applyOrigRight = (combined & QDeclarativeAnchors::RightAnchor);
+    d->applyOrigHCenter = (combined & QDeclarativeAnchors::HCenterAnchor);
+    d->applyOrigTop = (combined & QDeclarativeAnchors::TopAnchor);
+    d->applyOrigBottom = (combined & QDeclarativeAnchors::BottomAnchor);
+    d->applyOrigVCenter = (combined & QDeclarativeAnchors::VCenterAnchor);
+    d->applyOrigBaseline = (combined & QDeclarativeAnchors::BaselineAnchor);
+
+    d->origLeftBinding = acp->origLeftBinding;
+    d->origRightBinding = acp->origRightBinding;
+    d->origHCenterBinding = acp->origHCenterBinding;
+    d->origTopBinding = acp->origTopBinding;
+    d->origBottomBinding = acp->origBottomBinding;
+    d->origVCenterBinding = acp->origVCenterBinding;
+    d->origBaselineBinding = acp->origBaselineBinding;
+
+    d->oldBindings.clear();
+    d->oldBindings << acp->leftBinding << acp->rightBinding << acp->hCenterBinding
+                << acp->topBinding << acp->bottomBinding << acp->baselineBinding;
 
     saveCurrentValues();
 }
@@ -1164,52 +1329,38 @@ void QDeclarativeAnchorChanges::clearBindings()
     d->fromHeight = d->target->height();
 
     //reset any anchors with corresponding reverts
-    if (d->applyOrigLeft)
-        d->target->anchors()->resetLeft();
-    if (d->applyOrigRight)
-        d->target->anchors()->resetRight();
-    if (d->applyOrigHCenter)
-        d->target->anchors()->resetHorizontalCenter();
-    if (d->applyOrigTop)
-        d->target->anchors()->resetTop();
-    if (d->applyOrigBottom)
-        d->target->anchors()->resetBottom();
-    if (d->applyOrigVCenter)
-        d->target->anchors()->resetVerticalCenter();
-    if (d->applyOrigBaseline)
-        d->target->anchors()->resetBaseline();
-
-    //reset any anchors that have been specified
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("left")))
-        d->target->anchors()->resetLeft();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("right")))
-        d->target->anchors()->resetRight();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("horizontalCenter")))
-        d->target->anchors()->resetHorizontalCenter();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("top")))
-        d->target->anchors()->resetTop();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("bottom")))
-        d->target->anchors()->resetBottom();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("verticalCenter")))
-        d->target->anchors()->resetVerticalCenter();
-    if (d->anchorSet->d_func()->resetList .contains(QLatin1String("baseline")))
-        d->target->anchors()->resetBaseline();
-
+    //reset any anchors that have been specified as "undefined"
     //reset any anchors that we'll be setting in the state
-    if (d->anchorSet->d_func()->left.anchorLine != QDeclarativeAnchorLine::Invalid)
+    QDeclarativeAnchors::Anchors combined = d->anchorSet->d_func()->resetAnchors |
+                                            d->anchorSet->d_func()->usedAnchors;
+    if (d->applyOrigLeft || (combined & QDeclarativeAnchors::LeftAnchor)) {
         d->target->anchors()->resetLeft();
-    if (d->anchorSet->d_func()->right.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->leftProp, 0);
+    }
+    if (d->applyOrigRight || (combined & QDeclarativeAnchors::RightAnchor)) {
         d->target->anchors()->resetRight();
-    if (d->anchorSet->d_func()->hCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->rightProp, 0);
+    }
+    if (d->applyOrigHCenter || (combined & QDeclarativeAnchors::HCenterAnchor)) {
         d->target->anchors()->resetHorizontalCenter();
-    if (d->anchorSet->d_func()->top.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->hCenterProp, 0);
+    }
+    if (d->applyOrigTop || (combined & QDeclarativeAnchors::TopAnchor)) {
         d->target->anchors()->resetTop();
-    if (d->anchorSet->d_func()->bottom.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->topProp, 0);
+    }
+    if (d->applyOrigBottom || (combined & QDeclarativeAnchors::BottomAnchor)) {
         d->target->anchors()->resetBottom();
-    if (d->anchorSet->d_func()->vCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->bottomProp, 0);
+    }
+    if (d->applyOrigVCenter || (combined & QDeclarativeAnchors::VCenterAnchor)) {
         d->target->anchors()->resetVerticalCenter();
-    if (d->anchorSet->d_func()->baseline.anchorLine != QDeclarativeAnchorLine::Invalid)
+        QDeclarativePropertyPrivate::setBinding(d->vCenterProp, 0);
+    }
+    if (d->applyOrigBaseline || (combined & QDeclarativeAnchors::BaselineAnchor)) {
         d->target->anchors()->resetBaseline();
+        QDeclarativePropertyPrivate::setBinding(d->baselineProp, 0);
+    }
 }
 
 bool QDeclarativeAnchorChanges::override(QDeclarativeActionEvent*other)
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h
index d49ec63..e22c1e2 100644
--- a/src/declarative/util/qdeclarativestateoperations_p.h
+++ b/src/declarative/util/qdeclarativestateoperations_p.h
@@ -108,9 +108,9 @@ public:
 
     virtual void saveOriginals();
     virtual void copyOriginals(QDeclarativeActionEvent*);
-    virtual void execute();
+    virtual void execute(Reason reason = ActualChange);
     virtual bool isReversable();
-    virtual void reverse();
+    virtual void reverse(Reason reason = ActualChange);
     virtual QString typeName() const;
     virtual bool override(QDeclarativeActionEvent*other);
     virtual void rewind();
@@ -140,7 +140,7 @@ public:
     QString name() const;
     void setName(const QString &);
 
-    virtual void execute();
+    virtual void execute(Reason reason = ActualChange);
 };
 
 class QDeclarativeAnchorChanges;
@@ -149,13 +149,13 @@ class Q_AUTOTEST_EXPORT QDeclarativeAnchorSet : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QDeclarativeAnchorLine left READ left WRITE setLeft RESET resetLeft)
-    Q_PROPERTY(QDeclarativeAnchorLine right READ right WRITE setRight RESET resetRight)
-    Q_PROPERTY(QDeclarativeAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter)
-    Q_PROPERTY(QDeclarativeAnchorLine top READ top WRITE setTop RESET resetTop)
-    Q_PROPERTY(QDeclarativeAnchorLine bottom READ bottom WRITE setBottom RESET resetBottom)
-    Q_PROPERTY(QDeclarativeAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter)
-    Q_PROPERTY(QDeclarativeAnchorLine baseline READ baseline WRITE setBaseline RESET resetBaseline)
+    Q_PROPERTY(QDeclarativeScriptString left READ left WRITE setLeft RESET resetLeft)
+    Q_PROPERTY(QDeclarativeScriptString right READ right WRITE setRight RESET resetRight)
+    Q_PROPERTY(QDeclarativeScriptString horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter)
+    Q_PROPERTY(QDeclarativeScriptString top READ top WRITE setTop RESET resetTop)
+    Q_PROPERTY(QDeclarativeScriptString bottom READ bottom WRITE setBottom RESET resetBottom)
+    Q_PROPERTY(QDeclarativeScriptString verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter)
+    Q_PROPERTY(QDeclarativeScriptString baseline READ baseline WRITE setBaseline RESET resetBaseline)
     //Q_PROPERTY(QDeclarativeItem *fill READ fill WRITE setFill RESET resetFill)
     //Q_PROPERTY(QDeclarativeItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn)
 
@@ -172,32 +172,32 @@ public:
     QDeclarativeAnchorSet(QObject *parent=0);
     virtual ~QDeclarativeAnchorSet();
 
-    QDeclarativeAnchorLine left() const;
-    void setLeft(const QDeclarativeAnchorLine &edge);
+    QDeclarativeScriptString left() const;
+    void setLeft(const QDeclarativeScriptString &edge);
     void resetLeft();
 
-    QDeclarativeAnchorLine right() const;
-    void setRight(const QDeclarativeAnchorLine &edge);
+    QDeclarativeScriptString right() const;
+    void setRight(const QDeclarativeScriptString &edge);
     void resetRight();
 
-    QDeclarativeAnchorLine horizontalCenter() const;
-    void setHorizontalCenter(const QDeclarativeAnchorLine &edge);
+    QDeclarativeScriptString horizontalCenter() const;
+    void setHorizontalCenter(const QDeclarativeScriptString &edge);
     void resetHorizontalCenter();
 
-    QDeclarativeAnchorLine top() const;
-    void setTop(const QDeclarativeAnchorLine &edge);
+    QDeclarativeScriptString top() const;
+    void setTop(const QDeclarativeScriptString &edge);
     void resetTop();
 
-    QDeclarativeAnchorLine bottom() const;
-    void setBottom(const QDeclarativeAnchorLine &edge);
+    QDeclarativeScriptString bottom() const;
+    void setBottom(const QDeclarativeScriptString &edge);
     void resetBottom();
 
-    QDeclarativeAnchorLine verticalCenter() const;
-    void setVerticalCenter(const QDeclarativeAnchorLine &edge);
+    QDeclarativeScriptString verticalCenter() const;
+    void setVerticalCenter(const QDeclarativeScriptString &edge);
     void resetVerticalCenter();
 
-    QDeclarativeAnchorLine baseline() const;
-    void setBaseline(const QDeclarativeAnchorLine &edge);
+    QDeclarativeScriptString baseline() const;
+    void setBaseline(const QDeclarativeScriptString &edge);
     void resetBaseline();
 
     QDeclarativeItem *fill() const;
@@ -232,7 +232,7 @@ public:
     qreal baselineOffset() const;
     void setBaselineOffset(qreal);*/
 
-    QDeclarativeAnchors::UsedAnchors usedAnchors() const;
+    QDeclarativeAnchors::Anchors usedAnchors() const;
 
 /*Q_SIGNALS:
     void leftMarginChanged();
@@ -270,9 +270,9 @@ public:
     QDeclarativeItem *object() const;
     void setObject(QDeclarativeItem *);
 
-    virtual void execute();
+    virtual void execute(Reason reason = ActualChange);
     virtual bool isReversable();
-    virtual void reverse();
+    virtual void reverse(Reason reason = ActualChange);
     virtual QString typeName() const;
     virtual bool override(QDeclarativeActionEvent*other);
     virtual bool changesBindings();
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index bc40377..368d484 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -42,6 +42,7 @@
 #include "private/qdeclarativetransitionmanager_p_p.h"
 
 #include "private/qdeclarativestate_p_p.h"
+#include "private/qdeclarativestate_p.h"
 
 #include <qdeclarativebinding_p.h>
 #include <qdeclarativeglobal_p.h>
@@ -150,9 +151,9 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
                 QDeclarativePropertyPrivate::write(action.property, action.toValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
             } else if (action.event->isReversable()) {
                 if (action.reverseEvent)
-                    action.event->reverse();
+                    action.event->reverse(QDeclarativeActionEvent::FastForward);
                 else
-                    action.event->execute();
+                    action.event->execute(QDeclarativeActionEvent::FastForward);
             }
         }
 
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index b9f1abb..0611093 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -68,6 +68,8 @@
 #include "private/qdeclarativetransitionmanager_p_p.h"
 #include "private/qdeclarativetransition_p.h"
 #include "qdeclarativeview.h"
+#include "qdeclarativeinfo.h"
+#include "private/qdeclarativetypenotavailable_p.h"
 #ifndef QT_NO_XMLPATTERNS
 #include "private/qdeclarativexmllistmodel_p.h"
 #endif
@@ -103,7 +105,12 @@ void QDeclarativeUtilModule::defineModule()
     qmlRegisterType<QDeclarativeTimer>("Qt",4,6,"Timer");
     qmlRegisterType<QDeclarativeTransition>("Qt",4,6,"Transition");
     qmlRegisterType<QDeclarativeVector3dAnimation>("Qt",4,6,"Vector3dAnimation");
-#ifndef QT_NO_XMLPATTERNS
+#ifdef QT_NO_XMLPATTERNS
+    qmlRegisterTypeNotAvailable("Qt",4,6,"XmlListModel",
+        qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns"));
+    qmlRegisterTypeNotAvailable("Qt",4,6,"XmlRole",
+        qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns"));
+#else
     qmlRegisterType<QDeclarativeXmlListModel>("Qt",4,6,"XmlListModel");
     qmlRegisterType<QDeclarativeXmlListModelRole>("Qt",4,6,"XmlRole");
 #endif
@@ -112,12 +119,9 @@ void QDeclarativeUtilModule::defineModule()
     qmlRegisterType<QDeclarativeStateOperation>();
     qmlRegisterType<QDeclarativeAnchorSet>();
 
-    qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,6,"Animation");
+    qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,6,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
 
-    qmlRegisterCustomType<QDeclarativeListModel>("Qt", 4,6, "ListModel", "QDeclarativeListModel",
-                                                 new QDeclarativeListModelParser);
-    qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 6, "PropertyChanges", "QDeclarativePropertyChanges",
-                                                       new QDeclarativePropertyChangesParser);
-    qmlRegisterCustomType<QDeclarativeConnections>("Qt", 4, 6, "Connections", "QDeclarativeConnections",
-                                                   new QDeclarativeConnectionsParser);
+    qmlRegisterCustomType<QDeclarativeListModel>("Qt", 4,6, "ListModel", new QDeclarativeListModelParser);
+    qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 6, "PropertyChanges", new QDeclarativePropertyChangesParser);
+    qmlRegisterCustomType<QDeclarativeConnections>("Qt", 4, 6, "Connections", new QDeclarativeConnectionsParser);
 }
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 5cfa0e8..62d913c 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -599,6 +599,7 @@ void QDeclarativeView::timerEvent(QTimerEvent* e)
     }
 }
 
+/*! \reimp */
 bool QDeclarativeView::eventFilter(QObject *watched, QEvent *e)
 {
     if (watched == d->root && d->resizeMode == SizeViewToRootObject) {