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

150 files changed, 3102 insertions, 2732 deletions

diff --git a/src/declarative/3rdparty/qlistmodelinterface.h b/src/declarative/3rdparty/qlistmodelinterface.h
index 19284ca..44c4a24 100644
--- a/src/declarative/3rdparty/qlistmodelinterface.h
+++ b/src/declarative/3rdparty/qlistmodelinterface.h
@@ -42,9 +42,9 @@
 #ifndef QLISTMODELINTERFACE_H
 #define QLISTMODELINTERFACE_H
 
-#include <QHash>
-#include <QVariant>
-#include <qfxglobal.h>
+#include <QtCore/QHash>
+#include <QtCore/QVariant>
+#include <QtDeclarative/qfxglobal.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/canvas/qsimplecanvas.cpp b/src/declarative/canvas/qsimplecanvas.cpp
index e1dd0e8..cd50945 100644
--- a/src/declarative/canvas/qsimplecanvas.cpp
+++ b/src/declarative/canvas/qsimplecanvas.cpp
@@ -621,8 +621,10 @@ QSimpleCanvas::~QSimpleCanvas()
 void QSimpleCanvasPrivate::paint(QPainter &p)
 {
 #if defined(QFX_RENDER_QPAINTER)
-    if (!isSetup)
+    if (!isSetup) {
+        ++paintVersion;
         root->d_func()->setupPainting(0, q->rect());
+    }
 
     lrpTimer.start();
 
@@ -920,6 +922,7 @@ bool QSimpleCanvas::event(QEvent *e)
         unsigned int zero = 0;
         d->root->d_func()->setupPainting(0, rect(), &zero);
 #else
+        ++d->paintVersion;
         d->root->d_func()->setupPainting(0, rect());
 #endif
 
diff --git a/src/declarative/canvas/qsimplecanvas.h b/src/declarative/canvas/qsimplecanvas.h
index d57ada4..880fae0 100644
--- a/src/declarative/canvas/qsimplecanvas.h
+++ b/src/declarative/canvas/qsimplecanvas.h
@@ -42,7 +42,7 @@
 #ifndef QSIMPLECANVAS_H
 #define QSIMPLECANVAS_H
 
-#include <qfxglobal.h>
+#include <QtDeclarative/qfxglobal.h>
 
 #ifdef QFX_RENDER_OPENGL
 #include <QtGui/qmatrix4x4.h>
diff --git a/src/declarative/canvas/qsimplecanvas_p.h b/src/declarative/canvas/qsimplecanvas_p.h
index 7bc7330..9c3408e 100644
--- a/src/declarative/canvas/qsimplecanvas_p.h
+++ b/src/declarative/canvas/qsimplecanvas_p.h
@@ -112,6 +112,7 @@ public:
 #if defined(QFX_RENDER_OPENGL)
       ,egl(q, this), basicShadersInstance(0)
 #endif
+      , paintVersion(1)
     {
     }
 
@@ -190,6 +191,7 @@ public:
     void release(QGLFramebufferObject *);
     void paintGL();
 #endif
+    int paintVersion;
 };
 
 #endif
diff --git a/src/declarative/canvas/qsimplecanvas_software.cpp b/src/declarative/canvas/qsimplecanvas_software.cpp
index 194024d..dd5e201 100644
--- a/src/declarative/canvas/qsimplecanvas_software.cpp
+++ b/src/declarative/canvas/qsimplecanvas_software.cpp
@@ -41,6 +41,7 @@
 
 #include "qsimplecanvas.h"
 #include "qsimplecanvasitem_p.h"
+#include "qsimplecanvas_p.h"
 
 
 QT_BEGIN_NAMESPACE
@@ -48,57 +49,87 @@ QRect QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &bounding
 {
     Q_Q(QSimpleCanvasItem);
 
-    QRectF boundingRectActive = q->boundingRect();
-    QRect rv = 
-        data()->transformActive.mapRect(boundingRectActive).toAlignedRect() & bounding;
+    bool hasContents = options & QSimpleCanvasItem::HasContents;
+
+    QRect rv;
+
+    if (hasContents || q->clip()) {
+        QRectF boundingRectActive = q->boundingRect();
+        rv = data()->transformActive.mapRect(boundingRectActive).toAlignedRect() & bounding;
+    } 
+
+    data()->doNotPaint = rv.isEmpty();
+    data()->doNotPaintChildren = data()->doNotPaint && q->clip();
     QRect myBounding = bounding;
     if (q->clip())
         myBounding &= rv;
 
-    for (int ii = 0; ii < children.count(); ++ii) {
-        QSimpleCanvasItem *child = children.at(ii);
-
-        qreal visible = child->visible();
-        child->d_func()->data()->activeOpacity = data()->activeOpacity;
-        if (visible != 1)
-            child->d_func()->data()->activeOpacity *= visible;
-
-        if (child->d_func()->data()->activeOpacity != 0) {
-            // Calculate child's transform
-            qreal x = child->x();
-            qreal y = child->y();
-            qreal scale = child->scale();
-            QSimpleCanvasItem::Flip flip = child->flip();
-
-            QSimpleCanvas::Matrix &am = child->d_func()->data()->transformActive;
-            am = data()->transformActive;
-            if (x != 0 || y != 0)
-                am.translate(x, y);
-            if (scale != 1) {
-                QPointF to = child->d_func()->transformOrigin();
-                if (to.x() != 0. || to.y() != 0.)
-                    am.translate(to.x(), to.y());
-                am.scale(scale, scale);
-                if (to.x() != 0. || to.y() != 0.)
-                    am.translate(-to.x(), -to.y());
-            }
-
-            if (child->d_func()->data()->transformUser)
-                am = *child->d_func()->data()->transformUser * am;
+    if (!data()->doNotPaintChildren) {
+       for (int ii = 0; ii < children.count(); ++ii) {
+           QSimpleCanvasItem *child = children.at(ii);
+    
+           int childVersion = version;
+           if (!child->d_func()->data()->transformValid)
+               childVersion = canvas->d->paintVersion;
+
+           bool recalcNeeded = 
+               (childVersion > child->d_func()->data()->transformVersion);
+
+           if (recalcNeeded) {
+               qreal visible = child->visible();
+               child->d_func()->data()->activeOpacity = data()->activeOpacity;
+               if (visible != 1)
+                   child->d_func()->data()->activeOpacity *= visible;
+           }
+
+           if (child->d_func()->data()->activeOpacity != 0) {
+               if (recalcNeeded) {
+                   // Calculate child's transform
+                   qreal x = child->x();
+                   qreal y = child->y();
+                   qreal scale = child->scale();
+                   QSimpleCanvasItem::Flip flip = child->flip();
+        
+                   QSimpleCanvas::Matrix &am = 
+                       child->d_func()->data()->transformActive;
+                   am = data()->transformActive;
+                   if (x != 0 || y != 0)
+                       am.translate(x, y);
+                   if (scale != 1) {
+                       QPointF to = child->d_func()->transformOrigin();
+                       if (to.x() != 0. || to.y() != 0.)
+                           am.translate(to.x(), to.y());
+                       am.scale(scale, scale);
+                       if (to.x() != 0. || to.y() != 0.)
+                           am.translate(-to.x(), -to.y());
+                   }
+        
+                   if (child->d_func()->data()->transformUser)
+                       am = *child->d_func()->data()->transformUser * am;
+        
+                   if (flip) {
+                       QRectF br = child->boundingRect();
+                       am.translate(br.width() / 2., br.height() / 2);
+                       am.scale((flip & QSimpleCanvasItem::HorizontalFlip)?-1:1,
+                               (flip & QSimpleCanvasItem::VerticalFlip)?-1:1);
+                       am.translate(-br.width() / 2., -br.height() / 2);
+                   }
+                   child->d_func()->data()->transformValid = true;
+                   child->d_func()->data()->transformVersion = childVersion;
+               } 
+               rv |= child->d_func()->setupPainting(child->d_func()->data()->transformVersion, myBounding);
+           }
+       }
+    } 
 
-            if (flip) {
-                QRectF br = child->boundingRect();
-                am.translate(br.width() / 2., br.height() / 2);
-                am.scale((flip & QSimpleCanvasItem::HorizontalFlip)?-1:1,
-                        (flip & QSimpleCanvasItem::VerticalFlip)?-1:1);
-                am.translate(-br.width() / 2., -br.height() / 2);
-            }
-            child->d_func()->data()->transformValid = true;
-            rv |= child->d_func()->setupPainting(version, myBounding);
+    data()->lastPaintRect = rv;
+    if (!data()->doNotPaintChildren) {
+        if (!bounding.intersects(rv)) {
+            data()->doNotPaintChildren = true;
+            data()->doNotPaint = true;
         }
     }
-
-    data()->lastPaintRect = rv;
+            
     return rv;
 }
 
@@ -153,22 +184,28 @@ void QSimpleCanvasItemPrivate::paint(QPainter &p)
     zOrderChildren();
 
     int upto = 0;
-    for (upto = 0; upto < children.count(); ++upto) {
-        QSimpleCanvasItem *c = children.at(upto);
-        if (c->z() < 0) {
-            paintChild(p, c);
-        } else {
-            break;
+    if (!data()->doNotPaintChildren) {
+        for (upto = 0; upto < children.count(); ++upto) {
+            QSimpleCanvasItem *c = children.at(upto);
+            if (c->z() < 0) {
+                paintChild(p, c);
+            } else {
+                break;
+            }
         }
     }
 
-    p.setWorldTransform(data()->transformActive);
-    q->paintContents(p);
-
-    for (; upto < children.count(); ++upto) {
-        QSimpleCanvasItem *c = children.at(upto);
-        paintChild(p, c);
-    }
+    if (!data()->doNotPaint) {
+        p.setWorldTransform(data()->transformActive);
+        q->paintContents(p);
+    } 
+
+    if (!data()->doNotPaintChildren) {
+        for (; upto < children.count(); ++upto) {
+            QSimpleCanvasItem *c = children.at(upto);
+	    paintChild(p, c);
+	}
+    } 
 
     if (clip) 
         p.restore();
diff --git a/src/declarative/canvas/qsimplecanvasfilter.h b/src/declarative/canvas/qsimplecanvasfilter.h
index cb75ddf..d05dc7e 100644
--- a/src/declarative/canvas/qsimplecanvasfilter.h
+++ b/src/declarative/canvas/qsimplecanvasfilter.h
@@ -43,9 +43,9 @@
 #define QSIMPLECANVASFILTER_H
 
 #include <QtCore/qobject.h>
-#include <qfxglobal.h>
-#include <qsimplecanvasitem.h>
-#include <qsimplecanvas.h>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qsimplecanvasitem.h>
+#include <QtDeclarative/qsimplecanvas.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/canvas/qsimplecanvasitem.cpp b/src/declarative/canvas/qsimplecanvasitem.cpp
index 12c725c..3666b82 100644
--- a/src/declarative/canvas/qsimplecanvasitem.cpp
+++ b/src/declarative/canvas/qsimplecanvasitem.cpp
@@ -50,8 +50,9 @@
 QT_BEGIN_NAMESPACE
 QSimpleCanvasItemData::QSimpleCanvasItemData()
 : buttons(Qt::NoButton), flip(QSimpleCanvasItem::NoFlip), 
-  dirty(false), transformValid(true), x(0), y(0), z(0), visible(1), 
-  transformUser(0), activeOpacity(1)
+  dirty(false), transformValid(true), doNotPaint(false), 
+  doNotPaintChildren(false), x(0), y(0), z(0), visible(1),
+  transformUser(0), transformVersion(0), activeOpacity(1)
 {
 }
 
@@ -180,10 +181,18 @@ void QSimpleCanvasItem::childrenChanged()
 {
 }
 
+void QSimpleCanvasItem::setPaintMargin(qreal margin)
+{
+    Q_D(QSimpleCanvasItem);
+    if (margin < d->paintmargin)
+        update(); // schedule repaint of old boundingRect
+    d->paintmargin = margin;
+}
+
 QRectF QSimpleCanvasItem::boundingRect() const
 {
     Q_D(const QSimpleCanvasItem);
-    return QRectF(0., 0., d->width, d->height);
+    return QRectF(-d->paintmargin, -d->paintmargin, d->width+d->paintmargin*2, d->height+d->paintmargin*2);
 }
 
 void QSimpleCanvasItem::paintContents(QPainter &)
@@ -934,8 +943,6 @@ QRectF QSimpleCanvasItem::mapToScene(const QRectF &r) const
     }
 }
 
-int QSimpleCanvasItemPrivate::nextTransformVersion = 1;
-
 void QSimpleCanvasItemPrivate::freshenTransforms() const
 {
     if (freshenNeeded()) 
@@ -1506,11 +1513,8 @@ void QSimpleCanvasItemPrivate::convertToGraphicsItem(QGraphicsItem *parent)
 
     q->setClipType(clip);
 
-    for (int ii = 0; ii < children.count(); ++ii) {
+    for (int ii = 0; ii < children.count(); ++ii) 
         static_cast<QSimpleCanvasItemPrivate*>(children.at(ii)->d_ptr)->convertToGraphicsItem(graphicsItem);
-        if (children.at(ii)->z() == 0)
-            children.at(ii)->setZ(ii);
-    }
 }
 
 /*!
diff --git a/src/declarative/canvas/qsimplecanvasitem.h b/src/declarative/canvas/qsimplecanvasitem.h
index cab8492..cf23fc6 100644
--- a/src/declarative/canvas/qsimplecanvasitem.h
+++ b/src/declarative/canvas/qsimplecanvasitem.h
@@ -47,13 +47,13 @@
 #include <QtDeclarative/qsimplecanvas.h>
 #include <QtCore/qobject.h>
 #include <QtGui/qgraphicsitem.h>
-class QPainter;
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+class QPainter;
 class QRect;
 class QSimpleCanvas;
 class QMouseEvent;
@@ -183,6 +183,7 @@ public:
     };
 
 
+    void setPaintMargin(qreal margin);
     QRectF boundingRect() const;
     virtual void paintContents(QPainter &);
     virtual void paintGLContents(GLPainter &);
diff --git a/src/declarative/canvas/qsimplecanvasitem_p.h b/src/declarative/canvas/qsimplecanvasitem_p.h
index cfe0bba..f0b44e0 100644
--- a/src/declarative/canvas/qsimplecanvasitem_p.h
+++ b/src/declarative/canvas/qsimplecanvasitem_p.h
@@ -92,6 +92,8 @@ public:
     QSimpleCanvasItem::Flip flip:2;
     bool dirty:1;
     bool transformValid:1;
+    bool doNotPaint:1;
+    bool doNotPaintChildren:1;
 
     qreal x;
     qreal y;
@@ -100,6 +102,7 @@ public:
 
     QSimpleCanvas::Matrix *transformUser;
     QSimpleCanvas::Matrix transformActive;
+    int transformVersion;
 
     float activeOpacity;
 
@@ -139,7 +142,7 @@ public:
       focusable(false), wantsActiveFocusPanelPendingCanvas(false),
       hasBeenActiveFocusPanel(false),
       hasFocus(false), hasActiveFocus(false), needsZOrder(false), 
-      widthValid(false), heightValid(false), width(0), height(0), scale(1), 
+      widthValid(false), heightValid(false), width(0), height(0), paintmargin(0), scale(1), 
       graphicsItem(0), data_ptr(0)
     {
     }
@@ -173,6 +176,7 @@ public:
 
     qreal width;
     qreal height;
+    qreal paintmargin;
     qreal scale;
 
     QSimpleGraphicsItem *graphicsItem;
@@ -236,7 +240,6 @@ public:
 #endif
 
     void zOrderChildren();
-    static int nextTransformVersion;
     bool freshenNeeded() const;
     void doFreshenTransforms() const;
 
diff --git a/src/declarative/extra/qfxintegermodel.h b/src/declarative/extra/qfxintegermodel.h
index 3a48a56..2f5c756 100644
--- a/src/declarative/extra/qfxintegermodel.h
+++ b/src/declarative/extra/qfxintegermodel.h
@@ -42,9 +42,9 @@
 #ifndef QFXINTMODEL_H
 #define QFXINTMODEL_H
 
-#include <QObject>
-#include "qml.h"
-#include <qlistmodelinterface.h>
+#include <QtCore/QObject>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qlistmodelinterface.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/extra/qmlnumberformatter.h b/src/declarative/extra/qmlnumberformatter.h
index e053be5..cdd6b58 100644
--- a/src/declarative/extra/qmlnumberformatter.h
+++ b/src/declarative/extra/qmlnumberformatter.h
@@ -42,8 +42,8 @@
 #ifndef QMLNUMBERFORMATTER_H
 #define QMLNUMBERFORMATTER_H
 
-#include <qml.h>
-#include "qnumberformat.h"
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qnumberformat.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/extra/qmlsqlconnection.h b/src/declarative/extra/qmlsqlconnection.h
index 2cc5774..0fff1b0 100644
--- a/src/declarative/extra/qmlsqlconnection.h
+++ b/src/declarative/extra/qmlsqlconnection.h
@@ -42,8 +42,8 @@
 #ifndef QMLSQLCONNECTION_H
 #define QMLSQLCONNECTION_H
 
-#include <qml.h>
-#include <QSqlDatabase>
+#include <QtDeclarative/qml.h>
+#include <QtSql/QSqlDatabase>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/extra/qmlsqlquery.h b/src/declarative/extra/qmlsqlquery.h
index 984483c..3fff127 100644
--- a/src/declarative/extra/qmlsqlquery.h
+++ b/src/declarative/extra/qmlsqlquery.h
@@ -42,8 +42,8 @@
 #ifndef QMLSQLQUERYMODEL_H
 #define QMLSQLQUERYMODEL_H
 
-#include <qml.h>
-#include <QListModelInterface>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/QListModelInterface>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h
index 1fbe923..f837040 100644
--- a/src/declarative/extra/qmlxmllistmodel.h
+++ b/src/declarative/extra/qmlxmllistmodel.h
@@ -42,8 +42,8 @@
 #ifndef QMLXMLLISTMODEL_H
 #define QMLXMLLISTMODEL_H
 
-#include <qml.h>
-#include <QListModelInterface>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/QListModelInterface>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/extra/qnumberformat.h b/src/declarative/extra/qnumberformat.h
index 6ee333c..75224ec 100644
--- a/src/declarative/extra/qnumberformat.h
+++ b/src/declarative/extra/qnumberformat.h
@@ -42,9 +42,9 @@
 #ifndef NUMBERFORMAT_H
 #define NUMBERFORMAT_H 
 
-#include "qml.h"
-#include <QtGui>
-
+#include <QtDeclarative/qml.h>
+#include <QtCore/QLocale>
+#include <QtCore/QTime>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp
index 53d0187..235511f 100644
--- a/src/declarative/fx/qfxanchors.cpp
+++ b/src/declarative/fx/qfxanchors.cpp
@@ -41,6 +41,7 @@
 
 #include "qfxanchors_p.h"
 #include "qfxitem.h"
+#include "qfxitem_p.h"
 #include <QDebug>
 #include <QtDeclarative/qmlinfo.h>
 #include <QtDeclarative/qmlbindablevalue.h>
@@ -132,22 +133,175 @@ static qreal adjustedPosition(QFxItem *item, QFxAnchorLine::AnchorLine anchorLin
 QFxAnchors::QFxAnchors(QObject *parent)
   : QObject(*new QFxAnchorsPrivate(), parent)
 {
-
 }
 
-void QFxAnchors::fillChanged()
+QFxAnchors::~QFxAnchors()
 {
     Q_D(QFxAnchors);
-    if (!d->fill)
+    d->remDepend(d->fill);
+    d->remDepend(d->centeredIn);
+    d->remDepend(d->left.item);
+    d->remDepend(d->right.item);
+    d->remDepend(d->top.item);
+    d->remDepend(d->bottom.item);
+    d->remDepend(d->vCenter.item);
+    d->remDepend(d->hCenter.item);
+}
+
+void QFxAnchorsPrivate::fillChanged()
+{
+    if (!fill || !isItemComplete())
+        return;
+
+    if (fill == item->itemParent()) {                         //child-parent
+        setItemPos(QPointF(leftMargin, topMargin));
+    } else if (fill->itemParent() == item->itemParent()) {   //siblings
+        setItemPos(QPointF(fill->x()+leftMargin, fill->y()+topMargin));
+    }
+    setItemWidth(fill->width()-leftMargin-rightMargin);
+    setItemHeight(fill->height()-topMargin-bottomMargin);
+}
+
+void QFxAnchorsPrivate::centeredInChanged()
+{
+    if (!centeredIn || fill || !isItemComplete())
         return;
 
-    if (d->fill == d->item->itemParent()) {                         //child-parent
-        d->item->setPos(QPointF(leftMargin(), topMargin()));
-    } else if (d->fill->itemParent() == d->item->itemParent()) {   //siblings
-        d->item->setPos(QPointF(d->fill->x()+leftMargin(), d->fill->y()+topMargin()));
+    if (centeredIn == item->itemParent()) {
+        QPointF p((item->itemParent()->width() - item->width()) / 2.,
+                  (item->itemParent()->height() - item->height()) / 2.);
+        setItemPos(p);
+
+    } else if (centeredIn->itemParent() == item->itemParent()) {
+
+        QPointF p(centeredIn->x() + (centeredIn->width() - item->width()) / 2.,
+                  centeredIn->y() + (centeredIn->height() - item->height()) / 2.);
+        setItemPos(p);
+    }
+}
+
+void QFxAnchorsPrivate::clearItem(QFxItem *item)
+{
+    if (fill == item) 
+        fill = 0;
+    if (centeredIn == item)
+        centeredIn = 0;
+    if (left.item == item) {
+        left.item = 0;
+        usedAnchors &= ~QFxAnchors::HasLeftAnchor;
+    }
+    if (right.item == item) {
+        right.item = 0;
+        usedAnchors &= ~QFxAnchors::HasRightAnchor;
+    }
+    if (top.item == item) {
+        top.item = 0;
+        usedAnchors &= ~QFxAnchors::HasTopAnchor;
+    }
+    if (bottom.item == item) {
+        bottom.item = 0;
+        usedAnchors &= ~QFxAnchors::HasBottomAnchor;
+    }
+    if (vCenter.item == item) {
+        vCenter.item = 0;
+        usedAnchors &= ~QFxAnchors::HasVCenterAnchor;
+    }
+    if (hCenter.item == item) {
+        hCenter.item = 0;
+        usedAnchors &= ~QFxAnchors::HasHCenterAnchor;
+    }
+}
+
+void QFxAnchorsPrivate::addDepend(QFxItem *item)
+{
+    Q_Q(QFxAnchors);
+    if (!item)
+        return;
+    QFxItemPrivate *p = 
+        static_cast<QFxItemPrivate *>(QObjectPrivate::get(item));
+    p->dependantAnchors.append(q);
+}
+
+void QFxAnchorsPrivate::remDepend(QFxItem *item)
+{
+    Q_Q(QFxAnchors);
+    if (!item)
+        return;
+    QFxItemPrivate *p = 
+        static_cast<QFxItemPrivate *>(QObjectPrivate::get(item));
+    p->dependantAnchors.removeAll(q);
+}
+
+bool QFxAnchorsPrivate::isItemComplete() const
+{
+    return item->isComponentComplete();
+}
+
+void QFxAnchorsPrivate::setItemHeight(qreal v)
+{
+    updatingMe = true;
+    item->setHeight(v);
+    updatingMe = false;
+}
+
+void QFxAnchorsPrivate::setItemWidth(qreal v)
+{
+    updatingMe = true;
+    item->setWidth(v);
+    updatingMe = false;
+}
+
+void QFxAnchorsPrivate::setItemX(qreal v)
+{
+    updatingMe = true;
+    item->setX(v);
+    updatingMe = false;
+}
+
+void QFxAnchorsPrivate::setItemY(qreal v)
+{
+    updatingMe = true;
+    item->setY(v);
+    updatingMe = false;
+}
+
+void QFxAnchorsPrivate::setItemPos(const QPointF &v)
+{
+    updatingMe = true;
+    item->setPos(v);
+    updatingMe = false;
+}
+
+void QFxAnchorsPrivate::updateMe()
+{
+    if (updatingMe) {
+        updatingMe = false;
+        return;
     }
-    d->item->setWidth(d->fill->width()-leftMargin()-rightMargin());
-    d->item->setHeight(d->fill->height()-topMargin()-bottomMargin());
+
+    fillChanged();
+    centeredInChanged();
+    updateHorizontalAnchors();
+    updateVerticalAnchors();
+}
+
+void QFxAnchorsPrivate::updateOnComplete()
+{
+    fillChanged();
+    centeredInChanged();
+    updateHorizontalAnchors();
+    updateVerticalAnchors();
+}
+
+void QFxAnchorsPrivate::update(QFxItem *, const QRectF &newG, const QRectF &oldG)
+{
+    fillChanged();
+    centeredInChanged();
+
+    if (newG.x() != oldG.x() || newG.width() != oldG.width())
+        updateHorizontalAnchors();
+    if (newG.y() != oldG.y() || newG.height() != oldG.height())
+        updateVerticalAnchors();
 }
 
 /*!
@@ -166,37 +320,11 @@ QFxItem *QFxAnchors::fill() const
 void QFxAnchors::setFill(QFxItem *f)
 {
     Q_D(QFxAnchors);
-    if (d->fill) {
-        QObject::disconnect(d->fill, SIGNAL(leftChanged()), this, SLOT(fillChanged()));
-        QObject::disconnect(d->fill, SIGNAL(topChanged()), this, SLOT(fillChanged()));
-        QObject::disconnect(d->fill, SIGNAL(widthChanged()), this, SLOT(fillChanged()));
-        QObject::disconnect(d->fill, SIGNAL(heightChanged()), this, SLOT(fillChanged()));
-        QObject::disconnect(this, SIGNAL(leftMarginChanged()), this, SLOT(fillChanged()));
-        QObject::disconnect(this, SIGNAL(topMarginChanged()), this, SLOT(fillChanged()));
-        QObject::disconnect(this, SIGNAL(rightMarginChanged()), this, SLOT(fillChanged()));
-        QObject::disconnect(this, SIGNAL(bottomMarginChanged()), this, SLOT(fillChanged()));
-    }
-
+    d->remDepend(d->fill);
     d->fill = f;
+    d->addDepend(d->fill);
 
-    if (d->fill) {
-        if (d->fill == d->item->itemParent()) {    //child-parent
-            QObject::connect(d->fill, SIGNAL(widthChanged()), this, SLOT(fillChanged()));
-            QObject::connect(d->fill, SIGNAL(heightChanged()), this, SLOT(fillChanged()));
-        } else if (f->itemParent() == d->item->itemParent()) {   //siblings
-            QObject::connect(d->fill, SIGNAL(leftChanged()), this, SLOT(fillChanged()));
-            QObject::connect(d->fill, SIGNAL(topChanged()), this, SLOT(fillChanged()));
-            QObject::connect(d->fill, SIGNAL(widthChanged()), this, SLOT(fillChanged()));
-            QObject::connect(d->fill, SIGNAL(heightChanged()), this, SLOT(fillChanged()));
-        } else {
-            qmlInfo(d->item) << "Can't anchor to an item that isn't a parent or sibling.";
-        }
-    }
-    QObject::connect(this, SIGNAL(leftMarginChanged()), this, SLOT(fillChanged()));
-    QObject::connect(this, SIGNAL(topMarginChanged()), this, SLOT(fillChanged()));
-    QObject::connect(this, SIGNAL(rightMarginChanged()), this, SLOT(fillChanged()));
-    QObject::connect(this, SIGNAL(bottomMarginChanged()), this, SLOT(fillChanged()));
-    fillChanged();  //### can/should we defer until component completion?
+    d->fillChanged();  
 }
 
 /*!
@@ -223,163 +351,12 @@ void QFxAnchors::setCenteredIn(QFxItem* c)
         qmlInfo(d->item) << "Can't anchor to an item that isn't a parent or sibling.";
         return;
     }
-    d->centeredIn = c;
-    setHorizontalCenter(c->horizontalCenter());
-    setVerticalCenter(c->verticalCenter());
-}
-
-void QFxAnchorsPrivate::connectVHelper(const QFxAnchorLine &edge)
-{
-    //### should we do disconnects first? (will it be called more than once?)
-    Q_Q(QFxAnchors);
-    if (edge.item == item->itemParent()) {    //child-parent
-        switch(edge.anchorLine) {
-        case QFxAnchorLine::Bottom:
-        case QFxAnchorLine::VCenter:
-            QObject::connect(edge.item, SIGNAL(heightChanged()), q, SLOT(updateVerticalAnchors()));
-            break;
-        case QFxAnchorLine::Top: //no connection needed
-        default:
-            break;
-        }
-    } else if (edge.item->itemParent() == item->itemParent()) {   //siblings
-        switch(edge.anchorLine) {
-        case QFxAnchorLine::Top:
-            QObject::connect(edge.item, SIGNAL(topChanged()), q, SLOT(updateVerticalAnchors()));
-            break;
-        case QFxAnchorLine::Bottom:
-            QObject::connect(edge.item, SIGNAL(bottomChanged()), q, SLOT(updateVerticalAnchors()));
-            break;
-        case QFxAnchorLine::VCenter:
-            QObject::connect(edge.item, SIGNAL(vcenterChanged()), q, SLOT(updateVerticalAnchors()));
-            break;
-        default:
-            break;
-        }
-    } else {
-        qmlInfo(item) << "Can't anchor to an item that isn't a parent or sibling.";
-    }
-}
-
-void QFxAnchors::connectVAnchors()
-{
-    Q_D(QFxAnchors);
-    if (!d->checkVValid())
-        return;
-
-    if (d->usedAnchors & HasTopAnchor) {
-        //Handle stretching connections (if we have multiple horizontal anchors)
-        QFxAnchorLine *edge = 0;
-        if (d->usedAnchors & HasBottomAnchor) {
-            edge = &d->bottom;
-            connect(this, SIGNAL(bottomMarginChanged()), this, SLOT(updateVerticalAnchors()));
-        } else if (d->usedAnchors & HasVCenterAnchor) {
-            edge = &d->vCenter;
-            connect(this, SIGNAL(verticalCenterOffsetChanged()), this, SLOT(updateVerticalAnchors()));
-        }
-        if (edge) {
-            //we need to stretch
-            d->connectVHelper(*edge);
-        }
-
-        //Handle top
-        d->connectVHelper(d->top);
-        connect(this, SIGNAL(topMarginChanged()), this, SLOT(updateVerticalAnchors()));
-        updateVerticalAnchors();
-    } else if (d->usedAnchors & HasBottomAnchor) {
-        //Handle stretching connections (if we have multiple horizontal anchors)
-        if (d->usedAnchors & HasVCenterAnchor) {
-            d->connectVHelper(d->vCenter);
-            connect(this, SIGNAL(verticalCenterOffsetChanged()), this, SLOT(updateVerticalAnchors()));
-        }
-
-        //Handle bottom
-        d->connectVHelper(d->bottom);
-        connect(this, SIGNAL(bottomMarginChanged()), this, SLOT(updateVerticalAnchors()));
-        updateVerticalAnchors();
-    } else if (d->usedAnchors & HasVCenterAnchor) {
-        //Handle vCenter
-        d->connectVHelper(d->vCenter);
-        connect(this, SIGNAL(verticalCenterOffsetChanged()), this, SLOT(updateVerticalAnchors()));
-        updateVerticalAnchors();
-    }
-}
-
-void QFxAnchorsPrivate::connectHHelper(const QFxAnchorLine &edge)
-{
-    //### should we do disconnects first? (will it be called more than once?)
-    Q_Q(QFxAnchors);
-    if (edge.item == item->itemParent()) {    //child-parent
-        switch(edge.anchorLine) {
-        case QFxAnchorLine::Right:
-        case QFxAnchorLine::HCenter:
-            QObject::connect(edge.item, SIGNAL(widthChanged()), q, SLOT(updateHorizontalAnchors()));
-            break;
-        case QFxAnchorLine::Left: //no connection needed
-        default:
-            break;
-        }
-    } else if (edge.item->itemParent() == item->itemParent()) {   //siblings
-        switch(edge.anchorLine) {
-        case QFxAnchorLine::Left:
-            QObject::connect(edge.item, SIGNAL(leftChanged()), q, SLOT(updateHorizontalAnchors()));
-            break;
-        case QFxAnchorLine::Right:
-            QObject::connect(edge.item, SIGNAL(rightChanged()), q, SLOT(updateHorizontalAnchors()));
-            break;
-        case QFxAnchorLine::HCenter:
-            QObject::connect(edge.item, SIGNAL(hcenterChanged()), q, SLOT(updateHorizontalAnchors()));
-            break;
-        default:
-            break;
-        }
-    } else {
-        qmlInfo(item) << "Can't anchor to an item that isn't a parent or sibling.";
-    }
-}
-
-void QFxAnchors::connectHAnchors()
-{
-    Q_D(QFxAnchors);
-    if (!d->checkHValid())
-        return;
-
-    if (d->usedAnchors & HasLeftAnchor) {
-        //Handle stretching connections (if we have multiple horizontal anchors)
-        QFxAnchorLine *edge = 0;
-        if (d->usedAnchors & HasRightAnchor) {
-            edge = &d->right;
-            connect(this, SIGNAL(rightMarginChanged()), this, SLOT(updateHorizontalAnchors()));
-        } else if (d->usedAnchors & HasHCenterAnchor) {
-            edge = &d->hCenter;
-            connect(this, SIGNAL(horizontalCenterOffsetChanged()), this, SLOT(updateHorizontalAnchors()));
-        }
-        if (edge) {
-            //we need to stretch
-            d->connectHHelper(*edge);
-        }
 
-        //Handle left
-        d->connectHHelper(d->left);
-        connect(this, SIGNAL(leftMarginChanged()), this, SLOT(updateHorizontalAnchors()));
-        updateHorizontalAnchors();
-    } else if (d->usedAnchors & HasRightAnchor) {
-        //Handle stretching connections (if we have multiple horizontal anchors)
-        if (d->usedAnchors & HasHCenterAnchor) {
-            d->connectHHelper(d->hCenter);
-            connect(this, SIGNAL(horizontalCenterOffsetChanged()), this, SLOT(updateHorizontalAnchors()));
-        }
+    d->remDepend(d->centeredIn);
+    d->centeredIn = c;
+    d->addDepend(d->centeredIn);
 
-        //Handle right
-        d->connectHHelper(d->right);
-        connect(this, SIGNAL(rightMarginChanged()), this, SLOT(updateHorizontalAnchors()));
-        updateHorizontalAnchors();
-    } else if (d->usedAnchors & HasHCenterAnchor) {
-        //Handle hCenter
-        d->connectHHelper(d->hCenter);
-        connect(this, SIGNAL(horizontalCenterOffsetChanged()), this, SLOT(updateHorizontalAnchors()));
-        updateHorizontalAnchors();
-    }
+    d->centeredInChanged();
 }
 
 bool QFxAnchorsPrivate::calcStretch(const QFxAnchorLine &edge1,
@@ -411,168 +388,124 @@ bool QFxAnchorsPrivate::calcStretch(const QFxAnchorLine &edge1,
     return invalid;
 }
 
-void QFxAnchors::updateVerticalAnchors()
+void QFxAnchorsPrivate::updateVerticalAnchors()
 {
-    Q_D(QFxAnchors);
-    if (!d->updatingVerticalAnchor) {
-        d->updatingVerticalAnchor = true;
-        if (d->usedAnchors & HasTopAnchor) {
+    if (fill || centeredIn || !isItemComplete())
+        return;
+
+    if (!updatingVerticalAnchor) {
+        updatingVerticalAnchor = true;
+        if (usedAnchors & QFxAnchors::HasTopAnchor) {
             //Handle stretching
             bool invalid = true;
             int height = 0;
-            if (d->usedAnchors & HasBottomAnchor) {
-                invalid = d->calcStretch(d->top, d->bottom, d->topMargin, -d->bottomMargin, QFxAnchorLine::Top, height);
-            } else if (d->usedAnchors & HasVCenterAnchor) {
-                invalid = d->calcStretch(d->top, d->vCenter, d->topMargin, d->vCenterOffset, QFxAnchorLine::Top, height);
+            if (usedAnchors & QFxAnchors::HasBottomAnchor) {
+                invalid = calcStretch(top, bottom, topMargin, -bottomMargin, QFxAnchorLine::Top, height);
+            } else if (usedAnchors & QFxAnchors::HasVCenterAnchor) {
+                invalid = calcStretch(top, vCenter, topMargin, vCenterOffset, QFxAnchorLine::Top, height);
                 height *= 2;
             }
             if (!invalid)
-                d->item->setHeight(height);
+                setItemHeight(height);
 
             //Handle top
-            if (d->top.item == d->item->itemParent()) {
-                d->item->setY(adjustedPosition(d->top.item, d->top.anchorLine) + d->topMargin);
-            } else if (d->top.item->itemParent() == d->item->itemParent()) {
-                d->item->setY(position(d->top.item, d->top.anchorLine) + d->topMargin);
+            if (top.item == item->itemParent()) {
+                setItemY(adjustedPosition(top.item, top.anchorLine) + topMargin);
+            } else if (top.item->itemParent() == item->itemParent()) {
+                setItemY(position(top.item, top.anchorLine) + topMargin);
             }
-        } else if (d->usedAnchors & HasBottomAnchor) {
+        } else if (usedAnchors & QFxAnchors::HasBottomAnchor) {
             //Handle stretching (top + bottom case is handled above)
-            if (d->usedAnchors & HasVCenterAnchor) {
+            if (usedAnchors & QFxAnchors::HasVCenterAnchor) {
                 int height = 0;
-                bool invalid = d->calcStretch(d->vCenter, d->bottom, d->vCenterOffset, -d->bottomMargin,
+                bool invalid = calcStretch(vCenter, bottom, vCenterOffset, -bottomMargin,
                                               QFxAnchorLine::Top, height);
                 if (!invalid)
-                    d->item->setHeight(height*2);
+                    setItemHeight(height*2);
             }
 
             //Handle bottom
-            if (d->bottom.item == d->item->itemParent()) {
-                d->item->setY(adjustedPosition(d->bottom.item, d->bottom.anchorLine) - d->item->height() - d->bottomMargin);
-            } else if (d->bottom.item->itemParent() == d->item->itemParent()) {
-                d->item->setY(position(d->bottom.item, d->bottom.anchorLine) - d->item->height() - d->bottomMargin);
+            if (bottom.item == item->itemParent()) {
+                setItemY(adjustedPosition(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
+            } else if (bottom.item->itemParent() == item->itemParent()) {
+                setItemY(position(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
             }
 
 
-        } else if (d->usedAnchors & HasVCenterAnchor) {
+        } else if (usedAnchors & QFxAnchors::HasVCenterAnchor) {
             //(stetching handled above)
 
             //Handle vCenter
-            if (d->vCenter.item == d->item->itemParent()) {
-                d->item->setY(adjustedPosition(d->vCenter.item, d->vCenter.anchorLine)
-                              - d->item->height()/2 + d->vCenterOffset);
-            } else if (d->vCenter.item->itemParent() == d->item->itemParent()) {
-                d->item->setY(position(d->vCenter.item, d->vCenter.anchorLine) - d->item->height()/2 + d->vCenterOffset);
+            if (vCenter.item == item->itemParent()) {
+                setItemY(adjustedPosition(vCenter.item, vCenter.anchorLine)
+                              - item->height()/2 + vCenterOffset);
+            } else if (vCenter.item->itemParent() == item->itemParent()) {
+                setItemY(position(vCenter.item, vCenter.anchorLine) - item->height()/2 + vCenterOffset);
             }
         }
-        d->updatingVerticalAnchor = false;
+        updatingVerticalAnchor = false;
     } else {
-        qmlInfo(d->item) << "Anchor loop detected on vertical anchor.";
+        // ### Make this certain :)
+        qmlInfo(item) << "Possible anchor loop detected on vertical anchor.";
     }
 }
 
-void QFxAnchors::updateHorizontalAnchors()
+void QFxAnchorsPrivate::updateHorizontalAnchors()
 {
-    Q_D(QFxAnchors);
-    if (!d->updatingHorizontalAnchor) {
-        d->updatingHorizontalAnchor = true;
+    if (fill || centeredIn || !isItemComplete())
+        return;
 
-        //alternate implementation (needs performance testing)
-        /*switch(d->usedAnchors & QFxAnchors::Horizontal_Mask) {
-        case 0x03:              //(HasLeftAnchor | HasRightAnchor)
-        {
-            int width = 0;
-            if (!d->calcStretch(d->left, d->right, d->leftMargin, -d->rightMargin, QFxAnchorLine::Left, width))
-                d->item->setWidth(width);
-            //fall though
-        }
-        case 0x11:              //(HasLeftAnchor | HasHCenterAnchor)
-        {
-            if (d->usedAnchors & HasHCenterAnchor) {
-                int width = 0;
-                if (!d->calcStretch(d->left, d->hCenter, d->leftMargin, d->hCenterOffset, QFxAnchorLine::Left, width))
-                    d->item->setWidth(width*2);
-            }
-            //fall though
-        }
-        case HasLeftAnchor:
-            if (d->left.item == d->item->itemParent()) {
-                d->item->setX(adjustedPosition(d->left.item, d->left.anchorLine) + d->leftMargin);
-            } else if (d->left.item->itemParent() == d->item->itemParent()) {
-                d->item->setX(position(d->left.item, d->left.anchorLine) + d->leftMargin);
-            }
-            break;
-        case 0x12:              //(HasRightAnchor | HasHCenterAnchor)
-        {
-            int width = 0;
-            if (!d->calcStretch(d->hCenter, d->right, d->hCenterOffset, -d->rightMargin, QFxAnchorLine::Left, width))
-                d->item->setWidth(width*2);
-            //fall though
-        }
-        case HasRightAnchor:
-            if (d->right.item == d->item->itemParent()) {
-                d->item->setX(adjustedPosition(d->right.item, d->right.anchorLine) - d->item->width() - d->rightMargin);
-            } else if (d->right.item->itemParent() == d->item->itemParent()) {
-                d->item->setX(position(d->right.item, d->right.anchorLine) - d->item->width() - d->rightMargin);
-            }
-            break;
-        case HasHCenterAnchor:
-            if (d->hCenter.item == d->item->itemParent()) {
-                d->item->setX(adjustedPosition(d->hCenter.item, d->hCenter.anchorLine) - d->item->width()/2 + d->hCenterOffset);
-            } else if (d->hCenter.item->itemParent() == d->item->itemParent()) {
-                d->item->setX(position(d->hCenter.item, d->hCenter.anchorLine) - d->item->width()/2 + d->hCenterOffset);
-            }
-            break;
-        default:
-            break;
-        }*/
+    if (!updatingHorizontalAnchor) {
+        updatingHorizontalAnchor = true;
 
-        if (d->usedAnchors & HasLeftAnchor) {
+        if (usedAnchors & QFxAnchors::HasLeftAnchor) {
             //Handle stretching
             bool invalid = true;
             int width = 0;
-            if (d->usedAnchors & HasRightAnchor) {
-                invalid = d->calcStretch(d->left, d->right, d->leftMargin, -d->rightMargin, QFxAnchorLine::Left, width);
-            } else if (d->usedAnchors & HasHCenterAnchor) {
-                invalid = d->calcStretch(d->left, d->hCenter, d->leftMargin, d->hCenterOffset, QFxAnchorLine::Left, width);
+            if (usedAnchors & QFxAnchors::HasRightAnchor) {
+                invalid = calcStretch(left, right, leftMargin, -rightMargin, QFxAnchorLine::Left, width);
+            } else if (usedAnchors & QFxAnchors::HasHCenterAnchor) {
+                invalid = calcStretch(left, hCenter, leftMargin, hCenterOffset, QFxAnchorLine::Left, width);
                 width *= 2;
             }
             if (!invalid)
-                d->item->setWidth(width);
+                setItemWidth(width);
 
             //Handle left
-            if (d->left.item == d->item->itemParent()) {
-                d->item->setX(adjustedPosition(d->left.item, d->left.anchorLine) + d->leftMargin);
-            } else if (d->left.item->itemParent() == d->item->itemParent()) {
-                d->item->setX(position(d->left.item, d->left.anchorLine) + d->leftMargin);
+            if (left.item == item->itemParent()) {
+                setItemX(adjustedPosition(left.item, left.anchorLine) + leftMargin);
+            } else if (left.item->itemParent() == item->itemParent()) {
+                setItemX(position(left.item, left.anchorLine) + leftMargin);
             }
-        } else if (d->usedAnchors & HasRightAnchor) {
+        } else if (usedAnchors & QFxAnchors::HasRightAnchor) {
             //Handle stretching (left + right case is handled in updateLeftAnchor)
-            if (d->usedAnchors & HasHCenterAnchor) {
+            if (usedAnchors & QFxAnchors::HasHCenterAnchor) {
                 int width = 0;
-                bool invalid = d->calcStretch(d->hCenter, d->right, d->hCenterOffset, -d->rightMargin,
+                bool invalid = calcStretch(hCenter, right, hCenterOffset, -rightMargin,
                                               QFxAnchorLine::Left, width);
                 if (!invalid)
-                    d->item->setWidth(width*2);
+                    setItemWidth(width*2);
             }
 
             //Handle right
-            if (d->right.item == d->item->itemParent()) {
-                d->item->setX(adjustedPosition(d->right.item, d->right.anchorLine) - d->item->width() - d->rightMargin);
-            } else if (d->right.item->itemParent() == d->item->itemParent()) {
-                d->item->setX(position(d->right.item, d->right.anchorLine) - d->item->width() - d->rightMargin);
+            if (right.item == item->itemParent()) {
+                setItemX(adjustedPosition(right.item, right.anchorLine) - item->width() - rightMargin);
+            } else if (right.item->itemParent() == item->itemParent()) {
+                setItemX(position(right.item, right.anchorLine) - item->width() - rightMargin);
             }
-        } else if (d->usedAnchors & HasHCenterAnchor) {
+        } else if (usedAnchors & QFxAnchors::HasHCenterAnchor) {
             //Handle hCenter
-            if (d->hCenter.item == d->item->itemParent()) {
-                d->item->setX(adjustedPosition(d->hCenter.item, d->hCenter.anchorLine) - d->item->width()/2 + d->hCenterOffset);
-            } else if (d->hCenter.item->itemParent() == d->item->itemParent()) {
-                d->item->setX(position(d->hCenter.item, d->hCenter.anchorLine) - d->item->width()/2 + d->hCenterOffset);
+            if (hCenter.item == item->itemParent()) {
+                setItemX(adjustedPosition(hCenter.item, hCenter.anchorLine) - item->width()/2 + hCenterOffset);
+            } else if (hCenter.item->itemParent() == item->itemParent()) {
+                setItemX(position(hCenter.item, hCenter.anchorLine) - item->width()/2 + hCenterOffset);
             }
         }
 
-        d->updatingHorizontalAnchor = false;
+        updatingHorizontalAnchor = false;
     } else {
-        qmlInfo(d->item) << "Anchor loop detected on horizontal anchor.";
+        // ### Make this certain :)
+        qmlInfo(item) << "Possible anchor loop detected on horizontal anchor.";
     }
 }
 
@@ -588,29 +521,22 @@ void QFxAnchors::setTop(const QFxAnchorLine &edge)
     if (!d->checkVAnchorValid(edge))
         return;
 
-    d->usedAnchors |= HasTopAnchor;
+    if (edge.item)
+        d->usedAnchors |= HasTopAnchor;
+    else
+        d->usedAnchors &= ~HasTopAnchor;
 
     d->checkVValid();
 
+    d->remDepend(d->top.item);
     d->top = edge;
+    d->addDepend(d->top.item);
+    d->updateVerticalAnchors();
 }
 
 void QFxAnchors::resetTop()
 {
-    Q_D(QFxAnchors);
-
-    //update flags
-    d->usedAnchors &= ~HasTopAnchor;
-
-    //clear binding
-    QmlMetaProperty prop(this, "top");
-    prop.binding()->clearExpression();
-
-    //disconnect signal/slot connections as needed
-    disconnect(this, SIGNAL(topMarginChanged()), this, SLOT(updateVerticalAnchors()));
-    disconnect(d->top.item, 0, this, 0);
-
-    updateVerticalAnchors();
+    setTop(QFxAnchorLine());
 }
 
 QFxAnchorLine QFxAnchors::bottom() const
@@ -625,29 +551,22 @@ void QFxAnchors::setBottom(const QFxAnchorLine &edge)
     if (!d->checkVAnchorValid(edge))
         return;
 
-    d->usedAnchors |= HasBottomAnchor;
+    if (edge.item)
+        d->usedAnchors |= HasBottomAnchor;
+    else
+        d->usedAnchors &= ~HasBottomAnchor;
 
     d->checkVValid();
 
+    d->remDepend(d->bottom.item);
     d->bottom = edge;
+    d->addDepend(d->bottom.item);
+    d->updateVerticalAnchors();
 }
 
 void QFxAnchors::resetBottom()
 {
-    Q_D(QFxAnchors);
-
-    //update flags
-    d->usedAnchors &= ~HasBottomAnchor;
-
-    //clear binding
-    QmlMetaProperty prop(this, "bottom");
-    prop.binding()->clearExpression();
-
-    //disconnect signal/slot connections as needed
-    disconnect(this, SIGNAL(bottomMarginChanged()), this, SLOT(updateVerticalAnchors()));
-    disconnect(d->bottom.item, 0, this, 0);
-
-    updateVerticalAnchors();
+    setBottom(QFxAnchorLine());
 }
 
 QFxAnchorLine QFxAnchors::verticalCenter() const
@@ -662,29 +581,22 @@ void QFxAnchors::setVerticalCenter(const QFxAnchorLine &edge)
     if (!d->checkVAnchorValid(edge))
         return;
 
-    d->usedAnchors |= HasVCenterAnchor;
+    if (edge.item)
+        d->usedAnchors |= HasVCenterAnchor;
+    else
+        d->usedAnchors &= ~HasVCenterAnchor;
 
     d->checkVValid();
 
+    d->remDepend(d->vCenter.item);
     d->vCenter = edge;
+    d->addDepend(d->vCenter.item);
+    d->updateVerticalAnchors();
 }
 
 void QFxAnchors::resetVerticalCenter()
 {
-    Q_D(QFxAnchors);
-
-    //update flags
-    d->usedAnchors &= ~HasVCenterAnchor;
-
-    //clear binding
-    QmlMetaProperty prop(this, "verticalCenter");
-    prop.binding()->clearExpression();
-
-    //disconnect signal/slot connections as needed
-    disconnect(this, SIGNAL(verticalCenterOffsetChanged()), this, SLOT(updateVerticalAnchors()));
-    disconnect(d->vCenter.item, 0, this, 0);
-
-    updateVerticalAnchors();
+    setVerticalCenter(QFxAnchorLine());
 }
 
 QFxAnchorLine QFxAnchors::left() const
@@ -699,29 +611,22 @@ void QFxAnchors::setLeft(const QFxAnchorLine &edge)
     if (!d->checkHAnchorValid(edge))
         return;
 
-    d->usedAnchors |= HasLeftAnchor;
+    if (edge.item)
+        d->usedAnchors |= HasLeftAnchor;
+    else
+        d->usedAnchors &= ~HasLeftAnchor;
 
     d->checkHValid();
 
+    d->remDepend(d->left.item);
     d->left = edge;
+    d->addDepend(d->left.item);
+    d->updateHorizontalAnchors();
 }
 
 void QFxAnchors::resetLeft()
 {
-    Q_D(QFxAnchors);
-
-    //update flags
-    d->usedAnchors &= ~HasLeftAnchor;
-
-    //clear binding
-    QmlMetaProperty prop(this, "left");
-    prop.binding()->clearExpression();
-
-    //disconnect signal/slot connections as needed
-    disconnect(this, SIGNAL(leftMarginChanged()), this, SLOT(updateHorizontalAnchors()));
-    disconnect(d->left.item, 0, this, 0);
-
-    updateHorizontalAnchors();
+    setLeft(QFxAnchorLine());
 }
 
 QFxAnchorLine QFxAnchors::right() const
@@ -736,29 +641,23 @@ void QFxAnchors::setRight(const QFxAnchorLine &edge)
     if (!d->checkHAnchorValid(edge))
         return;
 
-    d->usedAnchors |= HasRightAnchor;
+    if (edge.item)
+        d->usedAnchors |= HasRightAnchor;
+    else
+        d->usedAnchors &= ~HasRightAnchor;
 
     d->checkHValid();
 
+    d->remDepend(d->right.item);
     d->right = edge;
+    d->addDepend(d->right.item);
+
+    d->updateHorizontalAnchors();
 }
 
 void QFxAnchors::resetRight()
 {
-    Q_D(QFxAnchors);
-
-    //update flags
-    d->usedAnchors &= ~HasRightAnchor;
-
-    //clear binding
-    QmlMetaProperty prop(this, "right");
-    prop.binding()->clearExpression();
-
-    //disconnect signal/slot connections as needed
-    disconnect(this, SIGNAL(rightMarginChanged()), this, SLOT(updateHorizontalAnchors()));
-    disconnect(d->right.item, 0, this, 0);
-
-    updateHorizontalAnchors();
+    setRight(QFxAnchorLine());
 }
 
 QFxAnchorLine QFxAnchors::horizontalCenter() const
@@ -773,29 +672,22 @@ void QFxAnchors::setHorizontalCenter(const QFxAnchorLine &edge)
     if (!d->checkHAnchorValid(edge))
         return;
 
-    d->usedAnchors |= HasHCenterAnchor;
+    if (edge.item)
+        d->usedAnchors |= HasHCenterAnchor;
+    else
+        d->usedAnchors &= ~HasHCenterAnchor;
 
     d->checkHValid();
 
+    d->remDepend(d->hCenter.item);
     d->hCenter = edge;
+    d->addDepend(d->hCenter.item);
+    d->updateHorizontalAnchors();
 }
 
 void QFxAnchors::resetHorizontalCenter()
 {
-    Q_D(QFxAnchors);
-
-    //update flags
-    d->usedAnchors &= ~HasHCenterAnchor;
-
-    //clear binding
-    QmlMetaProperty prop(this, "horizontalCenter");
-    prop.binding()->clearExpression();
-
-    //disconnect signal/slot connections as needed
-    disconnect(this, SIGNAL(horizontalCenterOffsetChanged()), this, SLOT(updateHorizontalAnchors()));
-    disconnect(d->hCenter.item, 0, this, 0);
-
-    updateHorizontalAnchors();
+    setHorizontalCenter(QFxAnchorLine());
 }
 
 int QFxAnchors::leftMargin() const
@@ -888,50 +780,6 @@ void QFxAnchors::setVerticalCenterOffset(int offset)
     emit verticalCenterOffsetChanged();
 }
 
-#if 0
-/*!
-    \property QFxAnchors::baseline
-    \brief what the baseline of the item should be anchored to (aligned with).
-
-    The baseline of a Text item is the imaginary line on which the text sits. Controls containing
-    text usually set their baseline to the baseline of their text.
-
-    For non-text items, a default baseline offset of two-thirds of the item's height is used
-    to determine the baseline.
-*/
-int QFxAnchors::baseline() const
-{
-    return d->item->baseline();
-}
-
-void QFxAnchors::setBaseline(int baseline)
-{
-    d->usedAnchors |= HasBaselineAnchor;
-
-    if (d->usedAnchors & HasTopAnchor && d->usedAnchors & HasBottomAnchor) {
-        qmlInfo(d->item) << "Can't specify top, bottom, and baseline anchors";
-        return;
-    }
-
-    if (d->usedAnchors & HasTopAnchor) {
-        int hoffset = baseline - d->item->baseline();
-        d->item->setHeight(d->item->height() + hoffset);
-    } else {
-        if (d->usedAnchors & HasBottomAnchor) {
-            int hoffset = d->item->baseline() - baseline;
-            d->item->setHeight(d->item->height() + hoffset);
-        }
-
-        int boffset = d->item->baseline() - d->item->top();
-        QFxItem *parentItem = d->item->itemParent();
-        if (parentItem)
-            d->item->setY(baseline - boffset - parentItem->top());
-        else
-            d->item->setY(baseline - boffset);
-    }
-}
-#endif
-
 QFxAnchors::UsedAnchors QFxAnchors::usedAnchors() const
 {
     Q_D(const QFxAnchors);
diff --git a/src/declarative/fx/qfxanchors.h b/src/declarative/fx/qfxanchors.h
index 5a8cc1a..9d776ab 100644
--- a/src/declarative/fx/qfxanchors.h
+++ b/src/declarative/fx/qfxanchors.h
@@ -42,9 +42,9 @@
 #ifndef QFXANCHORS_H
 #define QFXANCHORS_H
 
-#include <qfxglobal.h>
-#include <QObject>
-#include <qml.h>
+#include <QtCore/QObject>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qml.h>
 
 
 QT_BEGIN_HEADER
@@ -80,6 +80,7 @@ public:
 
 Q_DECLARE_METATYPE(QFxAnchorLine);
 
+class QFxAnchorsPrivate;
 class Q_DECLARATIVE_EXPORT QFxAnchors : public QObject
 {
     Q_OBJECT
@@ -101,6 +102,7 @@ class Q_DECLARATIVE_EXPORT QFxAnchors : public QObject
 
 public:
     QFxAnchors(QObject *parent=0);
+    virtual ~QFxAnchors();
 
     enum UsedAnchor { 
         HasLeftAnchor = 0x01,
@@ -167,9 +169,6 @@ public:
 
     void setItem(QFxItem *item);
 
-    void connectHAnchors();
-    void connectVAnchors();
-
 Q_SIGNALS:
     void leftMarginChanged();
     void rightMarginChanged();
@@ -178,13 +177,8 @@ Q_SIGNALS:
     void verticalCenterOffsetChanged();
     void horizontalCenterOffsetChanged();
 
-private Q_SLOTS:
-    void fillChanged();
-    void updateHorizontalAnchors();
-    void updateVerticalAnchors();
-
 private:
-    //### should item be a friend? (and make some of the public methods private or protected)
+    friend class QFxItem;
     Q_DISABLE_COPY(QFxAnchors)
     Q_DECLARE_PRIVATE(QFxAnchors)
 };
diff --git a/src/declarative/fx/qfxanchors_p.h b/src/declarative/fx/qfxanchors_p.h
index 82c2086..b90380a 100644
--- a/src/declarative/fx/qfxanchors_p.h
+++ b/src/declarative/fx/qfxanchors_p.h
@@ -63,9 +63,10 @@ class QFxAnchorsPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QFxAnchors)
 public:
     QFxAnchorsPrivate()
-      : item(0), usedAnchors(0), fill(0), centeredIn(0), leftMargin(0), rightMargin(0),
-        topMargin(0), bottomMargin(0), vCenterOffset(0), hCenterOffset(0),
-        updatingHorizontalAnchor(false), updatingVerticalAnchor(false)
+      : updatingMe(false), updatingHorizontalAnchor(false), 
+        updatingVerticalAnchor(false), item(0), usedAnchors(0), fill(0), 
+        centeredIn(0), leftMargin(0), rightMargin(0), topMargin(0), 
+        bottomMargin(0), vCenterOffset(0), hCenterOffset(0)
     {
     }
 
@@ -73,14 +74,37 @@ public:
     {
     }
 
+    void clearItem(QFxItem *);
+
+    void addDepend(QFxItem *);
+    void remDepend(QFxItem *);
+    bool isItemComplete() const;
+
+    bool updatingMe:1;
+    bool updatingHorizontalAnchor:1;
+    bool updatingVerticalAnchor:1;
+
+    void setItemHeight(qreal);
+    void setItemWidth(qreal);
+    void setItemX(qreal);
+    void setItemY(qreal);
+    void setItemPos(const QPointF &);
+
+    void updateOnComplete();
+    void updateMe();
+    void update(QFxItem *, const QRectF &, const QRectF &);
+
     bool checkHValid() const;
     bool checkVValid() const;
     bool checkHAnchorValid(QFxAnchorLine anchor) const;
     bool checkVAnchorValid(QFxAnchorLine anchor) const;
-    void connectHHelper(const QFxAnchorLine &anchorLine);
-    void connectVHelper(const QFxAnchorLine &anchorLine);
     bool calcStretch(const QFxAnchorLine &edge1, const QFxAnchorLine &edge2, int offset1, int offset2, QFxAnchorLine::AnchorLine line, int &stretch);
 
+    void updateHorizontalAnchors();
+    void updateVerticalAnchors();
+    void fillChanged();
+    void centeredInChanged();
+
     QFxItem *item;
     QFxAnchors::UsedAnchors usedAnchors;
 
@@ -101,8 +125,6 @@ public:
     int vCenterOffset;
     int hCenterOffset;
 
-    bool updatingHorizontalAnchor;
-    bool updatingVerticalAnchor;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxanimatedimageitem.h b/src/declarative/fx/qfxanimatedimageitem.h
index 121fe62..a332c8b 100644
--- a/src/declarative/fx/qfxanimatedimageitem.h
+++ b/src/declarative/fx/qfxanimatedimageitem.h
@@ -42,7 +42,7 @@
 #ifndef QFXANIMATEDIMAGEITEM_H
 #define QFXANIMATEDIMAGEITEM_H
 
-#include <qfximage.h>
+#include <QtDeclarative/qfximage.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxblendedimage.h b/src/declarative/fx/qfxblendedimage.h
index 5cc0238..2fdf15b 100644
--- a/src/declarative/fx/qfxblendedimage.h
+++ b/src/declarative/fx/qfxblendedimage.h
@@ -42,7 +42,7 @@
 #ifndef QFXBLENDEDIMAGE_H
 #define QFXBLENDEDIMAGE_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 #if defined(QFX_RENDER_OPENGL2)
 #include <gltexture.h>
 #endif
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QFxBlendedImage : public QFxItem
+class Q_DECLARATIVE_EXPORT QFxBlendedImage : public QFxItem
 {
     Q_OBJECT
 
diff --git a/src/declarative/fx/qfxblurfilter.h b/src/declarative/fx/qfxblurfilter.h
index 7a2b5b9..576debf 100644
--- a/src/declarative/fx/qfxblurfilter.h
+++ b/src/declarative/fx/qfxblurfilter.h
@@ -42,8 +42,8 @@
 #ifndef QFXBLURFILTER_H
 #define QFXBLURFILTER_H
 
-#include <qsimplecanvasfilter.h>
-#include <qml.h>
+#include <QtDeclarative/qsimplecanvasfilter.h>
+#include <QtDeclarative/qml.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxcomponentinstance.h b/src/declarative/fx/qfxcomponentinstance.h
index 64af355..9f84043 100644
--- a/src/declarative/fx/qfxcomponentinstance.h
+++ b/src/declarative/fx/qfxcomponentinstance.h
@@ -42,7 +42,7 @@
 #ifndef QFXCOMPONENTINSTANCE_H
 #define QFXCOMPONENTINSTANCE_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxcontentwrapper.h b/src/declarative/fx/qfxcontentwrapper.h
index 5d5a7e1..0b7253e 100644
--- a/src/declarative/fx/qfxcontentwrapper.h
+++ b/src/declarative/fx/qfxcontentwrapper.h
@@ -42,7 +42,7 @@
 #ifndef QFXCONTENTWRAPPER_H
 #define QFXCONTENTWRAPPER_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxevents_p.h b/src/declarative/fx/qfxevents_p.h
index 30717ef..bcd9f2d 100644
--- a/src/declarative/fx/qfxevents_p.h
+++ b/src/declarative/fx/qfxevents_p.h
@@ -42,8 +42,8 @@
 #ifndef QFXEVENTS_P_H
 #define QFXEVENTS_P_H
 
-#include <qfxglobal.h>
-#include <qml.h>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qml.h>
 #include <QtCore/qobject.h>
 #include <QtGui/qevent.h>
 
diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qfxflickable.h
index c5a0593..3857017 100644
--- a/src/declarative/fx/qfxflickable.h
+++ b/src/declarative/fx/qfxflickable.h
@@ -42,7 +42,7 @@
 #ifndef QFXFLICKABLE_H
 #define QFXFLICKABLE_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp
index 24ae428..edcc7cb 100644
--- a/src/declarative/fx/qfxflipable.cpp
+++ b/src/declarative/fx/qfxflipable.cpp
@@ -169,7 +169,6 @@ void QFxFlipable::setBack(QFxItem *back)
     children()->append(d->back);
     if (Front == d->current)
         d->back->setOpacity(0.);
-    d->setBackTransform();
 }
 
 /*!
@@ -203,8 +202,6 @@ void QFxFlipablePrivate::_q_updateAxis()
     axisRotation.axis()->setEndX(axis->endX());
     axisRotation.axis()->setEndY(axis->endY());
     axisRotation.axis()->setEndZ(axis->endZ());
-
-    setBackTransform();
 }
 
 void QFxFlipablePrivate::setBackTransform()
@@ -273,8 +270,10 @@ void QFxFlipable::setRotation(qreal angle)
         d->current = newSide;
         if (d->front)
             d->front->setOpacity((d->current==Front)?1.:0.);
-        if (d->back)
+        if (d->back) {
+            d->setBackTransform();
             d->back->setOpacity((d->current==Back)?1.:0.);
+        }
         emit sideChanged();
     }
 }
diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h
index ef1832e..62b62a5 100644
--- a/src/declarative/fx/qfxflipable.h
+++ b/src/declarative/fx/qfxflipable.h
@@ -42,12 +42,12 @@
 #ifndef QFXFLIPABLE_H
 #define QFXFLIPABLE_H
 
-#include <QObject>
-#include <QTransform>
+#include <QtCore/QObject>
+#include <QtGui/QTransform>
 #if defined(QFX_RENDER_OPENGL)
 #include <QtGui/qmatrix4x4.h>
 #endif
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfxfocuspanel.h b/src/declarative/fx/qfxfocuspanel.h
index 38f7a15..cec12a1 100644
--- a/src/declarative/fx/qfxfocuspanel.h
+++ b/src/declarative/fx/qfxfocuspanel.h
@@ -42,7 +42,7 @@
 #ifndef QFXFOCUSPANEL_H
 #define QFXFOCUSPANEL_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxfocusrealm.h b/src/declarative/fx/qfxfocusrealm.h
index 6c35405..fdf1525 100644
--- a/src/declarative/fx/qfxfocusrealm.h
+++ b/src/declarative/fx/qfxfocusrealm.h
@@ -42,7 +42,7 @@
 #ifndef QFXFOCUSREALM_H
 #define QFXFOCUSREALM_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h
index 90bf1ce..99c7cff 100644
--- a/src/declarative/fx/qfxgridview.h
+++ b/src/declarative/fx/qfxgridview.h
@@ -42,7 +42,7 @@
 #ifndef QFXGRIDVIEW_H
 #define QFXGRIDVIEW_H
 
-#include <qfxflickable.h>
+#include <QtDeclarative/qfxflickable.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfxhighlightfilter.h b/src/declarative/fx/qfxhighlightfilter.h
index 218f4e1..92a3dc7 100644
--- a/src/declarative/fx/qfxhighlightfilter.h
+++ b/src/declarative/fx/qfxhighlightfilter.h
@@ -42,8 +42,8 @@
 #ifndef QFXHIGHLIGHTFILTER_H
 #define QFXHIGHLIGHTFILTER_H
 
-#include <qsimplecanvasfilter.h>
-#include <qml.h>
+#include <QtDeclarative/qsimplecanvasfilter.h>
+#include <QtDeclarative/qml.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp
index 9d7a36a..4197a80 100644
--- a/src/declarative/fx/qfximage.cpp
+++ b/src/declarative/fx/qfximage.cpp
@@ -361,49 +361,57 @@ void QFxImage::paintContents(QPainter &p)
             p.drawImage(0, 0, pix);
         }
     } else {
-        const int sgl = d->_scaleGrid->left();
-        const int sgr = d->_scaleGrid->right();
-        const int sgt = d->_scaleGrid->top();
-        const int sgb = d->_scaleGrid->bottom();
-        const int xSide = qMin(sgl + sgr, int(width()));
-        const int ySide = qMin(sgt + sgb, int(height()));
+        int sgl = d->_scaleGrid->left();
+        int sgr = d->_scaleGrid->right();
+        int sgt = d->_scaleGrid->top();
+        int sgb = d->_scaleGrid->bottom();
+
+        int w = width();
+        int h = height();
+        if (sgt + sgb > h)
+            sgt = sgb = h/2;
+        if (sgl + sgr > w)
+            sgl = sgr = w/2;
+
+        const int xSide = sgl + sgr;
+        const int ySide = sgt + sgb;
 
         // Upper left
         if (sgt && sgl)
             p.drawImage(QRect(0, 0, sgl, sgt), pix, QRect(0, 0, sgl, sgt));
         // Upper middle
         if (pix.width() - xSide && sgt)
-            p.drawImage(QRect(sgl, 0, width() - xSide, sgt), pix,
+            p.drawImage(QRect(sgl, 0, w - xSide, sgt), pix,
                         QRect(sgl, 0, pix.width() - xSide, sgt));
         // Upper right
         if (sgt && pix.width() - sgr) 
-            p.drawImage(QPoint(width()-sgr, 0), pix,
+            p.drawImage(QPoint(w-sgr, 0), pix,
                         QRect(pix.width()-sgr, 0, sgr, sgt));
         // Middle left
         if (sgl && pix.height() - ySide)
-            p.drawImage(QRect(0, sgt, sgl, height() - ySide), pix,
+            p.drawImage(QRect(0, sgt, sgl, h - ySide), pix,
                         QRect(0, sgt, sgl, pix.height() - ySide));
 
         // Middle
         if (pix.width() - xSide && pix.height() - ySide)
-            p.drawImage(QRect(sgl, sgt, width() - xSide, height() - ySide), 
+            p.drawImage(QRect(sgl, sgt, w - xSide, h - ySide),
                         pix, 
                         QRect(sgl, sgt, pix.width() - xSide, pix.height() - ySide));
         // Middle right
         if (sgr && pix.height() - ySide)
-            p.drawImage(QRect(width()-sgr, sgt, sgr, height() - ySide), pix,
+            p.drawImage(QRect(w-sgr, sgt, sgr, h - ySide), pix,
                         QRect(pix.width()-sgr, sgt, sgr, pix.height() - ySide));
         // Lower left 
         if (sgl && sgr)
-            p.drawImage(QPoint(0, height() - sgb), pix,
+            p.drawImage(QPoint(0, h - sgb), pix,
                         QRect(0, pix.height() - sgb, sgl, sgb));
         // Lower Middle
         if (pix.width() - xSide && sgb)
-            p.drawImage(QRect(sgl, height() - sgb, width() - xSide, sgb), pix,
+            p.drawImage(QRect(sgl, h - sgb, w - xSide, sgb), pix,
                         QRect(sgl, pix.height() - sgb, pix.width() - xSide, sgb));
         // Lower Right
         if (sgr && sgb)
-            p.drawImage(QPoint(width()-sgr, height() - sgb), pix,
+            p.drawImage(QPoint(w-sgr, h - sgb), pix,
                         QRect(pix.width()-sgr, pix.height() - sgb, sgr, sgb));
     }
 
diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h
index dc13a97..1436551 100644
--- a/src/declarative/fx/qfximage.h
+++ b/src/declarative/fx/qfximage.h
@@ -42,7 +42,7 @@
 #ifndef QFXIMAGE_H
 #define QFXIMAGE_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 #include <QtNetwork/qnetworkreply.h>
 
 
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index b737615..3cbcd6a 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -52,6 +52,7 @@
 #include "qmlengine.h"
 #include "qmlstate.h"
 #include "qlistmodelinterface.h"
+#include "qfxanchors_p.h"
 
 #include "qfxtransform.h"
 #include "qfxscalegrid.h"
@@ -434,6 +435,14 @@ void QFxItem::doUpdate()
 QFxItem::~QFxItem()
 {
     Q_D(QFxItem);
+    for (int ii = 0; ii < d->dependantAnchors.count(); ++ii) {
+        QFxAnchors *anchor = d->dependantAnchors.at(ii);
+        anchor->d_func()->clearItem(this);
+    }
+    for (int ii = 0; ii < d->dependantAnchors.count(); ++ii) {
+        QFxAnchors *anchor = d->dependantAnchors.at(ii);
+        anchor->d_func()->updateOnComplete();
+    }
     delete d->_anchorLines; d->_anchorLines = 0;
 }
 
@@ -1062,85 +1071,30 @@ void QFxItem::geometryChanged(const QRectF &newGeometry,
                               const QRectF &oldGeometry)
 {
     Q_D(QFxItem);
-    if (newGeometry.width() != oldGeometry.width()) {
-        int xoffset = oldGeometry.width() - newGeometry.width();
-        d->handleWidthChange(xoffset);
-    }
 
-    if (newGeometry.height() != oldGeometry.height()) {
-        int yoffset = oldGeometry.height() - newGeometry.height();
-        d->handleHeightChange(yoffset);
-    }
+    if (d->_anchors)
+        d->_anchors->d_func()->updateMe();
 
-    if (newGeometry.x() != oldGeometry.x()) {
-        emit leftChanged();
-        emit hcenterChanged();
-        emit rightChanged();
+    if (newGeometry.size() != oldGeometry.size()) {
+        if (rotation() && transformOrigin() != QFxItem::TopLeft)
+            setRotation(rotation());
+        if (scale() && transformOrigin() != QFxItem::TopLeft)
+            setScale(scale());
     }
 
-    if (newGeometry.y() != oldGeometry.y()) {
+    if (newGeometry.x() != oldGeometry.x()) 
+        emit leftChanged();
+    if (newGeometry.width() != oldGeometry.width())
+        emit widthChanged();
+    if (newGeometry.y() != oldGeometry.y()) 
         emit topChanged();
-        emit vcenterChanged();
-        emit bottomChanged();
-    }
-}
-
-void QFxItemPrivate::handleWidthChange(int xoffset)
-{
-    Q_Q(QFxItem);
-    if (!_anchors) {
-        emit q->hcenterChanged();
-        emit q->rightChanged();
-    } else {
-        QFxAnchors::UsedAnchors used = anchors()->usedAnchors();
-        if (used & QFxAnchors::HasHCenterAnchor) {
-            q->setX(q->x() + xoffset/2);
-            emit q->rightChanged();
-        } else if ((used & QFxAnchors::HasRightAnchor) && !(used & QFxAnchors::HasLeftAnchor)) {
-            q->setX(q->x() + xoffset);
-            emit q->hcenterChanged();
-        } else {
-            emit q->hcenterChanged();
-            emit q->rightChanged();
-        }
-    }
-    if (q->rotation() && q->transformOrigin() != QFxItem::TopLeft)
-        q->setRotation(q->rotation());
-    if (q->scale() && q->transformOrigin() != QFxItem::TopLeft)
-        q->setScale(q->scale());
-    emit q->widthChanged();
-}
+    if (newGeometry.height() != oldGeometry.height())
+        emit heightChanged();
 
-void QFxItemPrivate::handleHeightChange(int yoffset)
-{
-    Q_Q(QFxItem);
-    if (!_anchors) {
-        emit q->vcenterChanged();
-        emit q->bottomChanged();
-        emit q->baselineChanged();
-    } else {
-        QFxAnchors::UsedAnchors used = anchors()->usedAnchors();
-        if (used & QFxAnchors::HasBaselineAnchor) {
-            q->setY(q->y() + yoffset - q->baselineOffset());
-            emit q->bottomChanged();
-            emit q->vcenterChanged();
-        } else if (used & QFxAnchors::HasVCenterAnchor) {
-            q->setY(q->y() + yoffset/2);
-            emit q->bottomChanged();
-        } else if ((used & QFxAnchors::HasBottomAnchor) && !(used & QFxAnchors::HasTopAnchor)) {
-            q->setY(q->y() + yoffset);
-            emit q->vcenterChanged();
-        } else {
-            emit q->vcenterChanged();
-            emit q->bottomChanged();
-            emit q->baselineChanged();
-        }
+    for(int ii = 0; ii < d->dependantAnchors.count(); ++ii) {
+        QFxAnchors *anchor = d->dependantAnchors.at(ii);
+        anchor->d_func()->update(this, newGeometry, oldGeometry);
     }
-    if (q->rotation() && q->transformOrigin() != QFxItem::TopLeft)
-        q->setRotation(q->rotation());
-    if (q->scale() && q->transformOrigin() != QFxItem::TopLeft)
-        q->setScale(q->scale());
-    emit q->heightChanged();
 }
 
 /*!
@@ -1483,7 +1437,6 @@ void QFxItem::setBaselineOffset(int offset)
 
     d->_baselineOffset = offset;
     emit baselineOffsetChanged();
-    emit baselineChanged();
 }
 
 /*!
@@ -2075,10 +2028,8 @@ void QFxItem::componentComplete()
     d->_componentComplete = true;
     if (d->_stateGroup)
         d->_stateGroup->componentComplete();
-    if (d->_anchors) {
-        d->anchors()->connectHAnchors();
-        d->anchors()->connectVAnchors();
-    }
+    if (d->_anchors) 
+        d->anchors()->d_func()->updateOnComplete();
     if (!d->_transform.isEmpty())
         updateTransform();
 }
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index 549c9c2..d34a9fb 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -42,9 +42,9 @@
 #ifndef QFXITEM_H
 #define QFXITEM_H
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtScript/qscriptvalue.h>
-#include <QList>
+#include <QtCore/QList>
 #include <QtDeclarative/qfxanchors.h>
 #include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
@@ -213,14 +213,9 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void leftChanged();
-    void rightChanged();
     void widthChanged();
     void heightChanged();
     void topChanged();
-    void bottomChanged();
-    void hcenterChanged();
-    void vcenterChanged();
-    void baselineChanged();
     void baselineOffsetChanged();
     void stateChanged(const QString &);
     void focusChanged();
diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h
index f2da3ba..85ce171 100644
--- a/src/declarative/fx/qfxitem_p.h
+++ b/src/declarative/fx/qfxitem_p.h
@@ -53,11 +53,11 @@
 // We mean it.
 //
 
-#include "qfxitem.h"
+#include <QtDeclarative/qfxitem.h>
 #include <private/qsimplecanvasitem_p.h>
 #include <private/qmlnullablevalue_p.h>
-#include <qml.h>
-#include <qmlcontext.h>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qmlcontext.h>
 #include <QtCore/qlist.h>
 
 QT_BEGIN_NAMESPACE
@@ -129,6 +129,7 @@ public:
         }
         return _anchors;
     }
+    QList<QFxAnchors *> dependantAnchors;
     QFxAnchors *_anchors;
     QFxContents *_contents;
     QFxItem *qmlItem;
@@ -171,9 +172,6 @@ public:
 
     QmlStateGroup *states();
     QmlStateGroup *_stateGroup;
-
-    void handleWidthChange(int xoffset);
-    void handleHeightChange(int xoffset);
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxkeyactions.h b/src/declarative/fx/qfxkeyactions.h
index 7ad323a..a5aec2e 100644
--- a/src/declarative/fx/qfxkeyactions.h
+++ b/src/declarative/fx/qfxkeyactions.h
@@ -42,10 +42,10 @@
 #ifndef QFXKEYACTIONS_H
 #define QFXKEYACTIONS_H
 
-#include <qfxglobal.h>
-#include <QObject>
-#include <qml.h>
-#include <qfxitem.h>
+#include <QtCore/QObject>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qfxitem.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxkeyproxy.h b/src/declarative/fx/qfxkeyproxy.h
index ae5fce4..6cf0c0d 100644
--- a/src/declarative/fx/qfxkeyproxy.h
+++ b/src/declarative/fx/qfxkeyproxy.h
@@ -42,7 +42,7 @@
 #ifndef QFXKEYPROXY_H
 #define QFXKEYPROXY_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfxlayouts.h b/src/declarative/fx/qfxlayouts.h
index acfc0c4..35e41d8 100644
--- a/src/declarative/fx/qfxlayouts.h
+++ b/src/declarative/fx/qfxlayouts.h
@@ -42,10 +42,10 @@
 #ifndef QFXLAYOUTS_H
 #define QFXLAYOUTS_H
 
-#include <qfxitem.h>
-#include <QObject>
-#include <QString>
-#include <qmlstate.h>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlstate.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxlayouts_p.h b/src/declarative/fx/qfxlayouts_p.h
index 859482f..77b0ea1 100644
--- a/src/declarative/fx/qfxlayouts_p.h
+++ b/src/declarative/fx/qfxlayouts_p.h
@@ -53,11 +53,11 @@
 // We mean it.
 //
 
-#include "qfxlayouts.h"
-#include "qfxitem_p.h"
-#include <QObject>
-#include <QString>
-#include <qmlstate.h>
+#include <private/qfxitem_p.h>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtDeclarative/qfxlayouts.h>
+#include <QtDeclarative/qmlstate.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h
index 42f7773..87a851b 100644
--- a/src/declarative/fx/qfxlistview.h
+++ b/src/declarative/fx/qfxlistview.h
@@ -42,7 +42,7 @@
 #ifndef QFXLISTVIEW_H
 #define QFXLISTVIEW_H
 
-#include <qfxflickable.h>
+#include <QtDeclarative/qfxflickable.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxmouseregion.h b/src/declarative/fx/qfxmouseregion.h
index 2ba4a50..1d1ec93 100644
--- a/src/declarative/fx/qfxmouseregion.h
+++ b/src/declarative/fx/qfxmouseregion.h
@@ -42,7 +42,7 @@
 #ifndef QFXMOUSEREGION_H
 #define QFXMOUSEREGION_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfxpainteditem.h b/src/declarative/fx/qfxpainteditem.h
index 015a035..6cd21e6 100644
--- a/src/declarative/fx/qfxpainteditem.h
+++ b/src/declarative/fx/qfxpainteditem.h
@@ -42,8 +42,8 @@
 #ifndef QFXIMAGEITEM_H
 #define QFXIMAGEITEM_H
 
-#include <qfxglobal.h>
-#include <qfxitem.h>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qfxitem.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxpainteditem_p.h b/src/declarative/fx/qfxpainteditem_p.h
index b0432ac..5d5da6b 100644
--- a/src/declarative/fx/qfxpainteditem_p.h
+++ b/src/declarative/fx/qfxpainteditem_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qfxitem_p.h"
-#include <qsimplecanvas.h>
+#include <private/qfxitem_p.h>
+#include <QtDeclarative/qsimplecanvas.h>
 
 #if defined(QFX_RENDER_OPENGL)
 #include "gltexture.h"
diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp
index 1aaf256..67c1208 100644
--- a/src/declarative/fx/qfxparticles.cpp
+++ b/src/declarative/fx/qfxparticles.cpp
@@ -340,6 +340,32 @@ void QFxParticleMotionWander::destroy(QFxParticle &p)
 }
 
 //---------------------------------------------------------------------------
+class QFxParticlesPainter : public QFxItem
+{
+public:
+    QFxParticlesPainter(QFxParticlesPrivate *p, QFxItem* parent)
+        : QFxItem(parent), d(p)
+    {
+        setOptions(HasContents);
+        maxX = minX = maxY = minY = 0;
+    }
+
+#if defined(QFX_RENDER_QPAINTER)
+    void paintContents(QPainter &p);
+#elif defined(QFX_RENDER_OPENGL2)
+    void paintGLContents(GLPainter &);
+#endif
+
+    void updateSize();
+
+    qreal maxX;
+    qreal minX;
+    qreal maxY;
+    qreal minY;
+    QFxParticlesPrivate* d;
+};
+
+//---------------------------------------------------------------------------
 class QFxParticlesPrivate : public QFxItemPrivate
 {
     Q_DECLARE_PUBLIC(QFxParticles)
@@ -359,7 +385,12 @@ public:
     {
     }
 
-    void init() {}
+    void init()
+    {
+        Q_Q(QFxParticles);
+        paintItem = new QFxParticlesPainter(this, q);
+    }
+
     void tick(int time);
     void createParticle(int time);
     void updateOpacity(QFxParticle &p, int age);
@@ -383,6 +414,7 @@ public:
     int streamDelay;
     bool emitting;
     QFxParticleMotion *motion;
+    QFxParticlesPainter *paintItem;
 
     QList<QFxParticle> particles;
     QTickAnimationProxy<QFxParticlesPrivate, &QFxParticlesPrivate::tick> clock;
@@ -1040,28 +1072,76 @@ QString QFxParticles::propertyInfo() const
     return d->url.toString();
 }
 
+void QFxParticlesPainter::updateSize(){
+    setX(-500);
+    setY(-500);
+    setWidth(1000);
+    setHeight(1000);
+    return ;
+    const int parentX = parent()->x();
+    const int parentY = parent()->y();
+    //Have to use statistical approach to needed size as arbitrary particle
+    //motions make it impossible to calculate.
+    //max/min vars stored to give a never shrinking rect
+    for (int i = 0; i < d->particles.count(); ++i) {
+        const QFxParticle &particle = d->particles.at(i);
+        if(particle.x > maxX)
+            maxX = particle.x;
+        if(particle.x < minX)
+            minX = particle.x;
+        if(particle.y > maxY)
+            maxY = particle.y;
+        if(particle.y < minY)
+            minY = particle.y;
+    }
+
+    int myWidth = (int)(maxX-minX+0.5)+d->image.width();
+    int myX = (int)(minX - parentX);
+    int myHeight = (int)(maxY-minY+0.5)+d->image.height();
+    int myY = (int)(minY - parentY);
+    setWidth(myWidth);
+    setHeight(myHeight);
+    setX(myX);
+    setY(myY);
+}
+
 #if defined(QFX_RENDER_QPAINTER) 
 void QFxParticles::paintContents(QPainter &p)
 {
-    Q_D(QFxParticles);
+    Q_UNUSED(p);
+    //painting is done by the ParticlesPainter, so it can have the right size
+}
+
+void QFxParticlesPainter::paintContents(QPainter &p)
+{
     if (d->image.isNull())
         return;
 
-    const int myX = x();
-    const int myY = y();
+    updateSize();
+    const int myX = x() + parent()->x();
+    const int myY = y() + parent()->y();
+
     for (int i = 0; i < d->particles.count(); ++i) {
         const QFxParticle &particle = d->particles.at(i);
         p.setOpacity(particle.opacity);
-        p.drawImage(particle.x-myX, particle.y-myY, d->image);
+        p.drawImage(particle.x - myX, particle.y - myY, d->image);
     }
+    update();//Should I need this? (GV does)
 }
 #elif defined(QFX_RENDER_OPENGL2)
-void QFxParticles::paintGLContents(GLPainter &p)
+void QFxParticles::paintGLContents(GLPainter &)
 {
-    Q_D(QFxParticles);
+    //painting is done by the ParticlesPainter, so it can have the right size
+}
+
+void QFxParticlesPainter::paintGLContents(GLPainter &p)
+{
+
     if (d->image.isNull())
         return;
 
+    updateSize();
+
     if (d->texDirty && !d->image.isNull()) {
         d->tex.setImage(d->image);
         d->tex.setHorizontalWrap(GLTexture::Repeat);
@@ -1075,8 +1155,8 @@ void QFxParticles::paintGLContents(GLPainter &p)
 
     glBindTexture(GL_TEXTURE_2D, d->tex.texture());
 
-    const int myX = (int)x();
-    const int myY = (int)y();
+    const int myX = (int)(x() + parent()->x());
+    const int myY = (int)(y() + parent()->y());
     float widthV = d->image.width();
     float heightV = d->image.height();
     for (int i = 0; i < d->particles.count(); ++i) {
diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h
index 0696e60..31a00fb 100644
--- a/src/declarative/fx/qfxparticles.h
+++ b/src/declarative/fx/qfxparticles.h
@@ -42,7 +42,7 @@
 #ifndef QFXPARTICLES_H
 #define QFXPARTICLES_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 #if defined(QFX_RENDER_OPENGL)
 #include "gltexture.h"
@@ -56,7 +56,7 @@ QT_MODULE(Declarative)
 
 class QFxParticle;
 class QFxParticles;
-class QFxParticleMotion : public QObject
+class Q_DECLARATIVE_EXPORT QFxParticleMotion : public QObject
 {
     Q_OBJECT
 public:
@@ -68,7 +68,7 @@ public:
 };
 QML_DECLARE_TYPE(QFxParticleMotion);
 
-class QFxParticleMotionLinear : public QFxParticleMotion
+class Q_DECLARATIVE_EXPORT QFxParticleMotionLinear : public QFxParticleMotion
 {
     Q_OBJECT
 public:
@@ -79,7 +79,7 @@ public:
 };
 QML_DECLARE_TYPE(QFxParticleMotionLinear);
 
-class QFxParticleMotionGravity : public QFxParticleMotion
+class Q_DECLARATIVE_EXPORT QFxParticleMotionGravity : public QFxParticleMotion
 {
     Q_OBJECT
 
@@ -108,7 +108,7 @@ private:
 };
 QML_DECLARE_TYPE(QFxParticleMotionGravity);
 
-class QFxParticleMotionWander : public QFxParticleMotion
+class Q_DECLARATIVE_EXPORT QFxParticleMotionWander : public QFxParticleMotion
 {
     Q_OBJECT
 public:
diff --git a/src/declarative/fx/qfxpath.h b/src/declarative/fx/qfxpath.h
index c594793..10cf252 100644
--- a/src/declarative/fx/qfxpath.h
+++ b/src/declarative/fx/qfxpath.h
@@ -42,10 +42,10 @@
 #ifndef QFXPATH_H
 #define QFXPATH_H
 
-#include <QObject>
-#include <QPainterPath>
-#include <qml.h>
-#include <qfxitem.h>
+#include <QtCore/QObject>
+#include <QtGui/QPainterPath>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qfxitem.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxpathview.h b/src/declarative/fx/qfxpathview.h
index 04804b7..33db566 100644
--- a/src/declarative/fx/qfxpathview.h
+++ b/src/declarative/fx/qfxpathview.h
@@ -42,8 +42,8 @@
 #ifndef QFXPATHVIEW_H
 #define QFXPATHVIEW_H
 
-#include <qfxitem.h>
-#include <qfxpath.h>
+#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qfxpath.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfxpixmap.h b/src/declarative/fx/qfxpixmap.h
index 297dba7..fd56ee4 100644
--- a/src/declarative/fx/qfxpixmap.h
+++ b/src/declarative/fx/qfxpixmap.h
@@ -42,10 +42,10 @@
 #ifndef QFXPIXMAP_H
 #define QFXPIXMAP_H
 
-#include <QString>
-#include <qsimplecanvas.h>
-#include <qfxglobal.h>
-#include <QPixmap>
+#include <QtCore/QString>
+#include <QtGui/QPixmap>
+#include <QtDeclarative/qsimplecanvas.h>
+#include <QtDeclarative/qfxglobal.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp
index dafd8a2..f1cbb58 100644
--- a/src/declarative/fx/qfxrect.cpp
+++ b/src/declarative/fx/qfxrect.cpp
@@ -52,6 +52,11 @@ QML_DEFINE_TYPE(QFxPen,Pen);
     \ingroup group_utility
     \brief The QFxPen class provides a pen used for drawing rect borders on a QFxView.
 
+    By default, the pen is invalid and nothing is drawn. You must either set a color (then the default
+    width is 0) or a width (then the default color is black).
+
+    A width of 0 is a single-pixel line on the border of the item being painted.
+
     Example:
     \qml
     Rect { pen.width: 2; pen.color: "red" ... }
@@ -61,8 +66,9 @@ QML_DEFINE_TYPE(QFxPen,Pen);
 /*! \property QFxPen::width
     \brief the width of the pen.
 
-    The default width is 1. If the width is less than 1 the pen is considered invalid
-    and won't be used.
+    A width of 0 is a single-pixel line on the border of the item being painted.
+
+    If the width is less than 0 the pen is considered invalid and won't be used.
 */
 
 /*!
@@ -86,8 +92,28 @@ QML_DEFINE_TYPE(QFxPen,Pen);
 void QFxPen::setColor(const QColor &c)
 {
     _color = c;
-    emit updated();
     _valid = _color.alpha() ? true : false;
+    emit updated();
+}
+
+/*!
+    \property QFxPen::width
+    \brief the width of the pen.
+
+    \qml
+    // rect with green border using hexidecimal notation
+    Rect { pen.width: 4 }
+    \endqml
+
+    A width of 0 creates a thin line. For no line, use a negative width or a transparent color.
+
+    Odd pen widths generally lead to half-pixel painting.
+*/
+void QFxPen::setWidth(int w)
+{
+    _width = w;
+    _valid = (_width < 0) ? false : true;
+    emit updated();
 }
 
 
@@ -167,6 +193,8 @@ void QFxRect::doUpdate()
     Q_D(QFxRect);
     d->_rectTexture.clear();
 #endif
+    const int pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0;
+    setPaintMargin((pw+1)/2);
     update();
 }
 
@@ -372,14 +400,19 @@ void QFxRect::generateRoundedRect()
 {
     Q_D(QFxRect);
     if (d->_rectImage.isNull()) {
-        d->_rectImage = QImage(d->_radius*2 + 1, d->_radius*2 + 1, QImage::Format_ARGB32_Premultiplied);
+        const int pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0;
+        d->_rectImage = QImage(d->_radius*2 + 1 + pw*2, d->_radius*2 + 1 + pw*2, QImage::Format_ARGB32_Premultiplied);
         d->_rectImage.fill(0);
         QPainter p(&(d->_rectImage));
-        QPen pn(QColor(pen()->color()), pen()->width());
         p.setRenderHint(QPainter::Antialiasing);
-        p.setPen(pn);
+        if (d->_pen && d->_pen->isValid()) {
+            QPen pn(QColor(pen()->color()), pen()->width());
+            p.setPen(pn);
+        } else {
+            p.setPen(Qt::NoPen);
+        }
         p.setBrush(d->_color);
-        p.drawRoundedRect(0, 0, d->_rectImage.width(), d->_rectImage.height(), d->_radius, d->_radius);
+        p.drawRoundedRect((pw+1)/2, (pw+1)/2, d->_rectImage.width()-(pw+1)/2*2, d->_rectImage.height()-(pw+1)/2*2, d->_radius, d->_radius);
     }
 }
 
@@ -387,14 +420,19 @@ void QFxRect::generateBorderedRect()
 {
     Q_D(QFxRect);
     if (d->_rectImage.isNull()) {
-        d->_rectImage = QImage(d->pen()->width()*2 + 1, d->pen()->width()*2 + 1, QImage::Format_ARGB32_Premultiplied);
+        const int pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0;
+        d->_rectImage = QImage(d->pen()->width()*2 + 1 + pw*2, d->pen()->width()*2 + 1 + pw*2, QImage::Format_ARGB32_Premultiplied);
         d->_rectImage.fill(0);
         QPainter p(&(d->_rectImage));
-        QPen pn(QColor(pen()->color()), pen()->width());
         p.setRenderHint(QPainter::Antialiasing);
-        p.setPen(pn);
+        if (d->_pen && d->_pen->isValid()) {
+            QPen pn(QColor(pen()->color()), pen()->width());
+            p.setPen(pn);
+        } else {
+            p.setPen(Qt::NoPen);
+        }
         p.setBrush(d->_color);
-        p.drawRect(0, 0, d->_rectImage.width(), d->_rectImage.height());
+        p.drawRect(qreal(pw+1)/2, qreal(pw+1)/2, d->_rectImage.width()-(pw+1)/2*2, d->_rectImage.height()-(pw+1)/2*2);
     }
 }
 #elif defined(QFX_RENDER_OPENGL)
@@ -402,14 +440,19 @@ void QFxRect::generateRoundedRect()
 {
     Q_D(QFxRect);
     if (d->_rectTexture.isNull()) {
-        QImage roundRect(int(d->_radius*2 + 1), int(d->_radius*2 + 1), QImage::Format_ARGB32);
+        const int pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0;
+        QImage roundRect(d->_radius*2 + 4 + pw*2, d->_radius*2 + 4 + pw*2, QImage::Format_ARGB32_Premultiplied);
         roundRect.fill(0);
         QPainter p(&roundRect);
-        QPen pn(QColor(pen()->color()), pen()->width());
         p.setRenderHint(QPainter::Antialiasing);
-        p.setPen(pn);
+        if (d->_pen && d->_pen->isValid()) {
+            QPen pn(QColor(pen()->color()), pen()->width());
+            p.setPen(pn);
+        } else {
+            p.setPen(Qt::NoPen);
+        }
         p.setBrush(d->_color);
-        p.drawRoundedRect(0, 0, roundRect.width(), roundRect.height(), d->_radius, d->_radius);
+        p.drawRoundedRect((pw+1)/2, (pw+1)/2, roundRect.width()-(pw+1)/2*2, roundRect.height()-(pw+1)/2*2, d->_radius, d->_radius);
         d->_rectTexture.setImage(roundRect);
     }
 }
@@ -418,14 +461,19 @@ void QFxRect::generateBorderedRect()
 {
     Q_D(QFxRect);
     if (d->_rectTexture.isNull()) {
-        QImage borderedRect(d->pen()->width()*2 + 1, d->pen()->width()*2 + 1, QImage::Format_ARGB32_Premultiplied);
+        const int pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0;
+        QImage borderedRect(pw*2 + 4, pw*2 + 4, QImage::Format_ARGB32_Premultiplied);
         borderedRect.fill(0);
         QPainter p(&(borderedRect));
-        QPen pn(QColor(pen()->color()), pen()->width());
         p.setRenderHint(QPainter::Antialiasing);
-        p.setPen(pn);
+        if (d->_pen && d->_pen->isValid()) {
+            QPen pn(QColor(pen()->color()), pen()->width());
+            p.setPen(pn);
+        } else {
+            p.setPen(Qt::NoPen);
+        }
         p.setBrush(d->_color);
-        p.drawRect(0, 0, borderedRect.width(), borderedRect.height());
+        p.drawRect(qreal(pw+1)/2, qreal(pw+1)/2, borderedRect.width()-(pw+1)/2*2, borderedRect.height()-(pw+1)/2*2);
         d->_rectTexture.setImage(borderedRect);
     }
 }
@@ -458,9 +506,13 @@ void QFxRect::drawRect(QPainter &p)
         // XXX This path is still slower than the image path
         // Image path won't work for gradients though
         p.save();
-        QPen pn(QColor(pen()->color()), pen()->width());
         p.setRenderHint(QPainter::Antialiasing);
-        p.setPen(pn);
+        if (d->_pen && d->_pen->isValid()) {
+            QPen pn(QColor(pen()->color()), pen()->width());
+            p.setPen(pn);
+        } else {
+            p.setPen(Qt::NoPen);
+        }
         if (d->_gradcolor.isValid()){
             QLinearGradient grad(0, 0, 0, height());
             grad.setColorAt(0, d->_color);
@@ -476,55 +528,72 @@ void QFxRect::drawRect(QPainter &p)
         p.restore();
     } else {
         int offset = 0;
+        const int pw = d->_pen && d->_pen->isValid() ? (d->_pen->width()+1)/2*2 : 0;
+
         if (d->_radius > 0) {
             generateRoundedRect();
             //### implicit conversion to int
-            offset = d->_radius;
+            offset = int(d->_radius+0.5+pw);
         } else {
             generateBorderedRect();
-            offset = d->pen()->width();
+            offset = pw;
         }
 
         //basically same code as QFxImage uses to paint sci images
-        int xSide = qMin(offset * 2, int(width()));
-        int ySide = qMin(offset * 2, int(height()));;
+        int w = width()+pw;
+        int h = height()+pw;
+        int xOffset = offset;
+        int xSide = xOffset * 2;
+        bool xMiddles=true;
+        if (xSide > w) {
+            xMiddles=false;
+            xOffset = w/2 + 1;
+            xSide = xOffset * 2;
+        }
+        int yOffset = offset;
+        int ySide = yOffset * 2;
+        bool yMiddles=true;
+        if (ySide > h) {
+            yMiddles = false;
+            yOffset = h/2 + 1;
+            ySide = yOffset * 2;
+        }
 
         // Upper left
-        p.drawImage(QRect(0, 0, offset, offset), d->_rectImage, QRect(0, 0, offset, offset));
+        p.drawImage(QRect(-pw/2, -pw/2, xOffset, yOffset), d->_rectImage, QRect(0, 0, xOffset, yOffset));
 
         // Upper middle
-        if (d->_rectImage.width() - xSide)
-            p.drawImage(QRect(offset, 0, width() - xSide, offset), d->_rectImage,
-                                  QRect(offset, 0, d->_rectImage.width() - xSide, offset));
+        if (xMiddles)
+            p.drawImage(QRect(xOffset-pw/2, -pw/2, width() - xSide + pw, yOffset), d->_rectImage,
+                                  QRect(d->_rectImage.width()/2, 0, 1, yOffset));
         // Upper right
-        if (d->_rectImage.width() - offset) {
-            p.drawImage(QPoint(width()-offset, 0), d->_rectImage,
-                                  QRect(d->_rectImage.width()-offset, 0, offset, offset));
-        }
+        p.drawImage(QPoint(width()-xOffset+pw/2, -pw/2), d->_rectImage,
+                              QRect(d->_rectImage.width()-xOffset, 0, xOffset, yOffset));
         // Middle left
-        if (d->_rectImage.height() - ySide)
-            p.drawImage(QRect(0, offset, offset, height() - ySide), d->_rectImage,
-                                  QRect(0, offset, offset, d->_rectImage.height() - ySide));
+        if (yMiddles)
+            p.drawImage(QRect(-pw/2, yOffset-pw/2, xOffset, height() - ySide + pw), d->_rectImage,
+                                  QRect(0, d->_rectImage.height()/2, xOffset, 1));
 
         // Middle
-        if (d->_rectImage.width() - xSide && d->_rectImage.height() - ySide)
-            p.drawImage(QRect(offset, offset, width() - xSide, height() - ySide), d->_rectImage,
-                                QRect(offset, offset, d->_rectImage.width() - xSide, d->_rectImage.height() - ySide));
-        // Midlle right
-        if (d->_rectImage.height() - ySide)
-            p.drawImage(QRect(width()-offset, offset, offset, height() - ySide), d->_rectImage,
-                                QRect(d->_rectImage.width()-offset, offset, offset, d->_rectImage.height() - ySide));
+        if (xMiddles && yMiddles)
+            // XXX paint errors in animation example
+            //p.fillRect(xOffset-pw/2, yOffset-pw/2, width() - xSide + pw, height() - ySide + pw, d->getColor());
+            p.drawImage(QRect(xOffset-pw/2, yOffset-pw/2, width() - xSide + pw, height() - ySide + pw), d->_rectImage,
+                                QRect(d->_rectImage.width()/2, d->_rectImage.height()/2, 1, 1));
+        // Middle right
+        if (yMiddles)
+            p.drawImage(QRect(width()-xOffset+pw/2, yOffset-pw/2, xOffset, height() - ySide + pw), d->_rectImage,
+                                QRect(d->_rectImage.width()-xOffset, d->_rectImage.height()/2, xOffset, 1));
         // Lower left 
-        p.drawImage(QPoint(0, height() - offset), d->_rectImage, QRect(0, d->_rectImage.height() - offset, offset, offset));
+        p.drawImage(QPoint(-pw/2, height() - yOffset + pw/2), d->_rectImage, QRect(0, d->_rectImage.height() - yOffset, xOffset, yOffset));
 
         // Lower Middle
-        if (d->_rectImage.width() - xSide)
-            p.drawImage(QRect(offset, height() - offset, width() - xSide, offset), d->_rectImage,
-                                QRect(offset, d->_rectImage.height() - offset, d->_rectImage.width() - xSide, offset));
+        if (xMiddles)
+            p.drawImage(QRect(xOffset-pw/2, height() - yOffset +pw/2, width() - xSide + pw, yOffset), d->_rectImage,
+                                QRect(d->_rectImage.width()/2, d->_rectImage.height() - yOffset, 1, yOffset));
         // Lower Right
-        if (d->_rectImage.width() - offset)
-            p.drawImage(QPoint(width()-offset, height() - offset), d->_rectImage,
-                            QRect(d->_rectImage.width()-offset, d->_rectImage.height() - offset, offset, offset));
+        p.drawImage(QPoint(width()-xOffset+pw/2, height() - yOffset+pw/2), d->_rectImage,
+                        QRect(d->_rectImage.width()-xOffset, d->_rectImage.height() - yOffset, xOffset, yOffset));
     }
 }
 #endif
@@ -586,53 +655,60 @@ void QFxRect::paintGLContents(GLPainter &p)
         }
     } else {
         qreal offset = 0;
+        qreal pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0.0;
+
         if (d->_radius > 0) {
             generateRoundedRect();
-            offset = d->_radius;
+            offset = d->_radius + pw+1.5;
         } else {
             generateBorderedRect();
-            offset = d->pen()->width();
+            offset = pw+1.5;
         }
 
         QGLShaderProgram *shader = p.useTextureShader();
 
-        float imgWidth = d->_rectTexture.width();
-        float imgHeight = d->_rectTexture.height();
-        if (!imgWidth || !imgHeight)
+        float texWidth = d->_rectTexture.width();
+        float texHeight = d->_rectTexture.height();
+        if (!texWidth || !texHeight)
             return;
 
-        float widthV = width();
-        float heightV = height();
+        float widthV = qreal(width())+pw/2;
+        float heightV = qreal(height())+pw/2;
 
-        float texleft = 0;
-        float texright = 1;
-        float textop = 1;
-        float texbottom = 0;
-        float imgleft = 0;
-        float imgright = widthV;
-        float imgtop = 0;
-        float imgbottom = heightV;
+        float xOffset = offset;
+        bool xMiddles = true;
+        if (xOffset*2 > width()+pw) {
+            xMiddles = false;
+            xOffset = (width()+pw)/2;
+        }
+        float yOffset = offset;
+        bool yMiddles = true;
+        if (yOffset*2 > height()+pw) {
+            yMiddles = false;
+            yOffset = (height()+pw)/2;
+        }
 
-        texleft = float(offset) / imgWidth;
-        imgleft = offset;
-        texright = 1. - float(offset) / imgWidth;
-        imgright = widthV - offset;
-        textop = 1. - float(offset) / imgHeight;
-        imgtop = offset;
-        texbottom = float(offset) / imgHeight;
-        imgbottom = heightV - offset;
+        float texleft = xOffset / texWidth;
+        float imgleft = xOffset-pw/2;
+        float texright = (texWidth-xOffset) / texWidth;
+        float imgright = widthV - xOffset;
+
+        float textop = yOffset / texHeight;
+        float imgtop = yOffset-pw/2;
+        float texbottom = (texHeight-yOffset) / texHeight;
+        float imgbottom = heightV - yOffset;
 
         //Bug 231768: Inappropriate interpolation was occuring on 3x3 textures
         if (offset==1)
             texleft=texright=textop=texbottom=0.5;
 
-        float vert1[] = { 0, 0, 
-                          0, imgtop,
-                          imgleft, 0, 
+        float vert1[] = { -pw/2, -pw/2, 
+                          -pw/2, imgtop,
+                          imgleft, -pw/2, 
                           imgleft, imgtop,
-                          imgright, 0,
+                          imgright, -pw/2,
                           imgright, imgtop,
-                          widthV, 0,
+                          widthV, -pw/2,
                           widthV, imgtop };
         float tex1[] = { 0, 0, 
                          0, textop,
@@ -642,8 +718,8 @@ void QFxRect::paintGLContents(GLPainter &p)
                          texright, textop,
                          1, 0,
                          1, textop };
-        float vert2[] = { 0, imgtop,
-                          0, imgbottom,
+        float vert2[] = { -pw/2, imgtop,
+                          -pw/2, imgbottom,
                           imgleft, imgtop,
                           imgleft, imgbottom,
                           imgright, imgtop,
@@ -658,31 +734,33 @@ void QFxRect::paintGLContents(GLPainter &p)
                          texright, texbottom,
                          1, textop,
                          1, texbottom };
-        float vert3[] = { 0, imgbottom,
-                          0, heightV,
-                          imgleft, imgbottom,
+        float vert3[] = { -pw/2, heightV,
+                          -pw/2, imgbottom,
                           imgleft, heightV,
-                          imgright, imgbottom,
+                          imgleft, imgbottom,
                           imgright, heightV,
-                          widthV, imgbottom,
-                          widthV, heightV };
-        float tex3[] = { 0, texbottom,
-                         0, 0,
+                          imgright, imgbottom,
+                          widthV, heightV,
+                          widthV, imgbottom };
+        float tex3[] = { 0, 1,
+                         0, texbottom,
+                         texleft, 1,
                          texleft, texbottom,
-                         texleft, 0,
+                         texright, 1,
                          texright, texbottom,
-                         texright, 0,
-                         1, texbottom,
-                         1, 0 };
+                         1, 1,
+                         1, texbottom };
 
         glBindTexture(GL_TEXTURE_2D, d->_rectTexture.texture());
 
         shader->setAttributeArray(SingleTextureShader::Vertices, vert1, 2);
         shader->setAttributeArray(SingleTextureShader::TextureCoords, tex1, 2);
         glDrawArrays(GL_TRIANGLE_STRIP, 0, 8);
-        shader->setAttributeArray(SingleTextureShader::Vertices, vert2, 2);
-        shader->setAttributeArray(SingleTextureShader::TextureCoords, tex2, 2);
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, 8);
+        if (yMiddles) {
+            shader->setAttributeArray(SingleTextureShader::Vertices, vert2, 2);
+            shader->setAttributeArray(SingleTextureShader::TextureCoords, tex2, 2);
+            glDrawArrays(GL_TRIANGLE_STRIP, 0, 8);
+        }
         shader->setAttributeArray(SingleTextureShader::Vertices, vert3, 2);
         shader->setAttributeArray(SingleTextureShader::TextureCoords, tex3, 2);
         glDrawArrays(GL_TRIANGLE_STRIP, 0, 8);
@@ -761,9 +839,9 @@ void QFxRect::paintGLContents(GLPainter &p)
             glColor4f(1, 1, 1, p.activeOpacity);
         }
 
-        float imgWidth = d->_rectTexture.width();
-        float imgHeight = d->_rectTexture.height();
-        if (!imgWidth || !imgHeight)
+        float texWidth = d->_rectTexture.width();
+        float texHeight = d->_rectTexture.height();
+        if (!texWidth || !texHeight)
             return;
 
         float widthV = width();
@@ -778,13 +856,13 @@ void QFxRect::paintGLContents(GLPainter &p)
         float imgtop = 0;
         float imgbottom = heightV;
 
-        texleft = float(offset) / imgWidth;
+        texleft = float(offset) / texWidth;
         imgleft = offset;
-        texright = 1. - float(offset) / imgWidth;
+        texright = 1. - float(offset) / texWidth;
         imgright = widthV - offset;
-        textop = 1. - float(offset) / imgHeight;
+        textop = 1. - float(offset) / texHeight;
         imgtop = offset;
-        texbottom = float(offset) / imgHeight;
+        texbottom = float(offset) / texHeight;
         imgbottom = heightV - offset;
 
         float vert1[] = { 0, 0, 
diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h
index 42e7b2f..420ec44 100644
--- a/src/declarative/fx/qfxrect.h
+++ b/src/declarative/fx/qfxrect.h
@@ -42,7 +42,7 @@
 #ifndef QFXRECT_H
 #define QFXRECT_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 
 QT_BEGIN_HEADER
@@ -58,11 +58,11 @@ class Q_DECLARATIVE_EXPORT QFxPen : public QObject
     Q_PROPERTY(QColor color READ color WRITE setColor)
 public:
     QFxPen(QObject *parent=0)
-        : QObject(parent), _width(1), _color("#000000"), _valid(false)
+        : QObject(parent), _width(0), _color("#000000"), _valid(false)
     {}
 
     int width() const { return _width; }
-    void setWidth(int w) { _width = w; emit updated(); _valid = (_width < 1) ? false : true; }
+    void setWidth(int w);
 
     QColor color() const { return _color; }
     void setColor(const QColor &c);
diff --git a/src/declarative/fx/qfxreflectionfilter.h b/src/declarative/fx/qfxreflectionfilter.h
index b0cc7b2..383e12f 100644
--- a/src/declarative/fx/qfxreflectionfilter.h
+++ b/src/declarative/fx/qfxreflectionfilter.h
@@ -42,8 +42,8 @@
 #ifndef QFXREFLECTIONFILTER_H
 #define QFXREFLECTIONFILTER_H
 
-#include <qsimplecanvasfilter.h>
-#include <qml.h>
+#include <QtDeclarative/qsimplecanvasfilter.h>
+#include <QtDeclarative/qml.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxrepeater.h b/src/declarative/fx/qfxrepeater.h
index 8efd281..362242b 100644
--- a/src/declarative/fx/qfxrepeater.h
+++ b/src/declarative/fx/qfxrepeater.h
@@ -42,7 +42,7 @@
 #ifndef QFXREPEATER_H
 #define QFXREPEATER_H
 
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxscalegrid.h b/src/declarative/fx/qfxscalegrid.h
index 9010ce7..d0f735f 100644
--- a/src/declarative/fx/qfxscalegrid.h
+++ b/src/declarative/fx/qfxscalegrid.h
@@ -42,13 +42,13 @@
 #ifndef QFXSCALEGRID_H
 #define QFXSCALEGRID_H
 
-#include <qfxglobal.h>
-#include <QImage>
-#include <QString>
-#include <QObject>
-#include <qsimplecanvas.h>
-#include <qfxpixmap.h>
-#include <qml.h>
+#include <QtCore/QString>
+#include <QtCore/QObject>
+#include <QtGui/QImage>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qsimplecanvas.h>
+#include <QtDeclarative/qfxpixmap.h>
+#include <QtDeclarative/qml.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxshadowfilter.h b/src/declarative/fx/qfxshadowfilter.h
index 9ba3b7b..fc54e01 100644
--- a/src/declarative/fx/qfxshadowfilter.h
+++ b/src/declarative/fx/qfxshadowfilter.h
@@ -42,8 +42,8 @@
 #ifndef QFXSHADOWFILTER_H
 #define QFXSHADOWFILTER_H
 
-#include <qsimplecanvasfilter.h>
-#include <qml.h>
+#include <QtDeclarative/qsimplecanvasfilter.h>
+#include <QtDeclarative/qml.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp
index a43219d..e84255d 100644
--- a/src/declarative/fx/qfxtext.cpp
+++ b/src/declarative/fx/qfxtext.cpp
@@ -458,10 +458,11 @@ void QFxTextPrivate::updateSize()
                 singleline = !tmp.contains(QChar::LineSeparator);
                 if (singleline && elideMode != Qt::ElideNone && q->widthValid())
                     tmp = fm.elidedText(tmp,elideMode,q->width()); // XXX still worth layout...?
-                QTextLayout layout;
+                layout.clearLayout();
                 layout.setFont(f);
                 layout.setText(tmp);
                 size = setupTextLayout(&layout);
+                cachedLayoutSize = size;
             }
         if (richText) {
             singleline = false; // richtext can't elide or be optimized for single-line case
@@ -608,18 +609,11 @@ QImage QFxTextPrivate::wrappedTextImage(bool drawStyle)
     //do layout
     Q_Q(const QFxText);
     QFont f; if (_font) f = _font->font();
-    QString tmp = text;
-    if (singleline && elideMode != Qt::ElideNone && q->widthValid()) {
-        QFontMetrics fm(f);
-        tmp = fm.elidedText(tmp,elideMode,q->width()); // XXX still worth layout...?
-    }
-    tmp.replace(QLatin1Char('\n'), QChar::LineSeparator);
-    QTextLayout textLayout(tmp, f);
-    QSize size = setupTextLayout(&textLayout);
+    QSize size = cachedLayoutSize;
 
     int x = 0;
-    for (int i = 0; i < textLayout.lineCount(); ++i) {
-        QTextLine line = textLayout.lineAt(i);
+    for (int i = 0; i < layout.lineCount(); ++i) {
+        QTextLine line = layout.lineAt(i);
         if (hAlign == QFxText::AlignLeft) {
             x = 0;
         } else if (hAlign == QFxText::AlignRight) {
@@ -640,7 +634,7 @@ QImage QFxTextPrivate::wrappedTextImage(bool drawStyle)
     else 
         p.setPen(color);
     p.setFont(f);
-    textLayout.draw(&p, QPointF(0, 0));
+    layout.draw(&p, QPointF(0, 0));
     return img;
 }
 
@@ -749,7 +743,16 @@ void QFxText::paintContents(QPainter &p)
         break;
     }
 
+    bool needClip = !clip() && (d->imgCache.width() > width() || 
+                                d->imgCache.height() > height());
+
+    if (needClip) {
+        p.save();
+        p.setClipRect(boundingRect());
+    }
     p.drawImage(x, y, d->imgCache);
+    if (needClip)
+        p.restore();
 }
 
 #elif defined(QFX_RENDER_OPENGL2)
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h
index 0de884b..ee9082b 100644
--- a/src/declarative/fx/qfxtext.h
+++ b/src/declarative/fx/qfxtext.h
@@ -42,8 +42,8 @@
 #ifndef QFXTEXT_H
 #define QFXTEXT_H
 
-#include <qfxitem.h>
-#include <qmlfont.h>
+#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlfont.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxtext_p.h b/src/declarative/fx/qfxtext_p.h
index 4296891..8bb3142 100644
--- a/src/declarative/fx/qfxtext_p.h
+++ b/src/declarative/fx/qfxtext_p.h
@@ -56,6 +56,7 @@
 #include "qfxitem.h"
 #include "qfxitem_p.h"
 #include "qml.h"
+#include <QtGui/qtextlayout.h>
 
 #if defined(QFX_RENDER_OPENGL)
 #include "gltexture.h"
@@ -72,7 +73,9 @@ class QFxTextPrivate : public QFxItemPrivate
     Q_DECLARE_PUBLIC(QFxText)
 public:
     QFxTextPrivate()
-      : _font(0), color((QRgb)0), style(QFxText::Normal), imgDirty(true), hAlign(QFxText::AlignLeft), vAlign(QFxText::AlignTop), elideMode(Qt::ElideNone), dirty(false), wrap(false), richText(false), singleline(false), control(0), doc(0)
+      : _font(0), color((QRgb)0), style(QFxText::Normal), imgDirty(true),
+        hAlign(QFxText::AlignLeft), vAlign(QFxText::AlignTop), elideMode(Qt::ElideNone),
+        dirty(false), wrap(false), richText(false), singleline(false), control(0), doc(0)
     {
     }
 
@@ -126,6 +129,8 @@ public:
     bool singleline;
     QTextControl *control;
     QTextDocument *doc;
+    QTextLayout layout;
+    QSize cachedLayoutSize;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index 35b1173..8667c9e 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -662,7 +662,6 @@ void QFxTextEdit::keyReleaseEvent(QKeyEvent *event)
 */
 void QFxTextEdit::focusChanged(bool hasFocus)
 {
-    Q_D(QFxTextEdit);
     setCursorVisible(hasFocus);
 }
 
@@ -675,29 +674,6 @@ void QFxTextEdit::selectAll()
     d->control->selectAll();
 }
 
-static QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *e)
-{
-    QEvent::Type t;
-    switch(e->type()) {
-    default:
-    case QEvent::GraphicsSceneMousePress:
-        t = QEvent::MouseButtonPress;
-        break;
-    case QEvent::GraphicsSceneMouseRelease:
-        t = QEvent::MouseButtonRelease;
-        break;
-    case QEvent::GraphicsSceneMouseMove:
-        t = QEvent::MouseMove;
-        break;
-    case QGraphicsSceneEvent::GraphicsSceneMouseDoubleClick:
-        t = QEvent::MouseButtonDblClick;
-        break;
-    }
-
-    QMouseEvent *me = new QMouseEvent(t, e->pos().toPoint(), e->button(), e->buttons(), 0);
-    return me;
-}
-
 /*!
 \overload
 Handles the given mouse \a event.
@@ -707,10 +683,7 @@ void QFxTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
     Q_D(QFxTextEdit);
     if (d->focusOnPress)
         setFocus(true);
-    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
-    d->control->processEvent(me, QPointF(0, 0));
-    event->setAccepted(me->isAccepted());
-    delete me;
+    d->control->processEvent(event, QPointF(0, 0));
     if (!event->isAccepted())
         QFxPaintedItem::mousePressEvent(event);
 }
@@ -722,10 +695,7 @@ Handles the given mouse \a event.
 void QFxTextEdit::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QFxTextEdit);
-    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
-    d->control->processEvent(me, QPointF(0, 0));
-    event->setAccepted(me->isAccepted());
-    delete me;
+    d->control->processEvent(event, QPointF(0, 0));
     if (!event->isAccepted())
         QFxPaintedItem::mousePressEvent(event);
 }
@@ -737,10 +707,7 @@ Handles the given mouse \a event.
 void QFxTextEdit::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QFxTextEdit);
-    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
-    d->control->processEvent(me, QPointF(0, 0));
-    event->setAccepted(me->isAccepted());
-    delete me;
+    d->control->processEvent(event, QPointF(0, 0));
     if (!event->isAccepted())
         QFxPaintedItem::mousePressEvent(event);
 }
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index 0aaa17b..f702101 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -42,8 +42,8 @@
 #ifndef QFXTEXTEDIT_H
 #define QFXTEXTEDIT_H
 
-#include <qfxtext.h>
-#include <qfxpainteditem.h>
+#include <QtDeclarative/qfxtext.h>
+#include <QtDeclarative/qfxpainteditem.h>
 
 #include <QtGui/qtextdocument.h>
 #include <QtGui/qtextoption.h>
diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp
index 7b76367..d99af27 100644
--- a/src/declarative/fx/qfxtransform.cpp
+++ b/src/declarative/fx/qfxtransform.cpp
@@ -179,6 +179,20 @@ void QFxAxis::setEndZ(qreal z)
     emit updated();
 }
 
+/*!
+    \qmlclass Rotation
+    \brief A Rotation object provides a way to rotate an Item around a point.
+
+    The following example rotates a Rect around its interior point 25, 25:
+    \qml
+    Rect {
+        width: 100; height: 100
+        color: "blue"
+        transform: Rotation { originX: 25; originY: 25; angle: 45}
+    }
+    \endqml
+*/
+
 QFxRotation::QFxRotation(QObject *parent)
 : QFxTransform(parent), _originX(0), _originY(0), _angle(0), _dirty(true)
 {
@@ -188,6 +202,12 @@ QFxRotation::~QFxRotation()
 {
 }
 
+/*!
+    \qmlproperty real Rotation::originX
+    \qmlproperty real Rotation::originY
+
+    The point to rotate around.
+*/
 qreal QFxRotation::originX() const
 {
     return _originX;
@@ -210,6 +230,11 @@ void QFxRotation::setOriginY(qreal oy)
     update();
 }
 
+/*!
+    \qmlproperty real Rotation::angle
+
+    The angle, in degrees, to rotate.
+*/
 qreal QFxRotation::angle() const
 {
     return _angle;
@@ -217,8 +242,11 @@ qreal QFxRotation::angle() const
 
 void QFxRotation::setAngle(qreal angle)
 {
+    if (_angle == angle)
+        return;
     _angle = angle;
     update();
+    emit angleChanged();
 }
 
 bool QFxRotation::isIdentity() const
@@ -244,7 +272,9 @@ QMatrix4x4 QFxRotation::transform() const
     if (_dirty) {
         _transform = QMatrix4x4();
         _dirty = false;
-        _transform.rotate(_angle, _originX, _originY);
+        _transform.translate(_originX, _originY);
+        _transform.rotate(_angle, 0, 0, 1);
+        _transform.translate(-_originX, -_originY);
     }
     return _transform;
 }
diff --git a/src/declarative/fx/qfxtransform.h b/src/declarative/fx/qfxtransform.h
index a3a1a83..31374df 100644
--- a/src/declarative/fx/qfxtransform.h
+++ b/src/declarative/fx/qfxtransform.h
@@ -42,12 +42,12 @@
 #ifndef QFXTRANSFORM_H
 #define QFXTRANSFORM_H
 
-#include <QObject>
-#include <QTransform>
+#include <QtCore/QObject>
+#include <QtGui/QTransform>
 #if defined(QFX_RENDER_OPENGL)
 #include <QtGui/qmatrix4x4.h>
 #endif
-#include <qfxitem.h>
+#include <QtDeclarative/qfxitem.h>
 
 QT_BEGIN_HEADER
 
@@ -115,7 +115,7 @@ class Q_DECLARATIVE_EXPORT QFxRotation : public QFxTransform
 
     Q_PROPERTY(qreal originX READ originX WRITE setOriginX)
     Q_PROPERTY(qreal originY READ originY WRITE setOriginY)
-    Q_PROPERTY(qreal angle READ angle WRITE setAngle)
+    Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged())
 public:
     QFxRotation(QObject *parent=0);
     ~QFxRotation();
@@ -132,6 +132,9 @@ public:
     virtual bool isIdentity() const;
     virtual QSimpleCanvas::Matrix transform() const;
 
+Q_SIGNALS:
+    void angleChanged();
+
 private Q_SLOTS:
     void update();
 private:
diff --git a/src/declarative/fx/qfxvisualitemmodel.h b/src/declarative/fx/qfxvisualitemmodel.h
index 7156d70..622065c 100644
--- a/src/declarative/fx/qfxvisualitemmodel.h
+++ b/src/declarative/fx/qfxvisualitemmodel.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qabstractitemmodel.h>
-#include <qml.h>
+#include <QtDeclarative/qml.h>
 
 
 QT_BEGIN_HEADER
@@ -62,7 +62,7 @@ class QFxItem;
 class QmlComponent;
 class QmlPackage;
 class QFxVisualItemModelPrivate;
-class QFxVisualItemModel : public QObject
+class Q_DECLARATIVE_EXPORT QFxVisualItemModel : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QFxVisualItemModel)
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index afd5b0f..6a3dad5 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -42,12 +42,12 @@
 #ifndef QFXWEBVIEW_H
 #define QFXWEBVIEW_H
 
-#include <QAction>
-#include <QUrl>
-#include <qfxglobal.h>
-#include <qfxpainteditem.h>
+#include <QtGui/QAction>
+#include <QtCore/QUrl>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qfxpainteditem.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
-#include <QWebPage>
+#include <QtWebKit/QWebPage>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxwidgetcontainer.h b/src/declarative/fx/qfxwidgetcontainer.h
index 65e4352..3b1f016 100644
--- a/src/declarative/fx/qfxwidgetcontainer.h
+++ b/src/declarative/fx/qfxwidgetcontainer.h
@@ -48,6 +48,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Declarative)
+
 class QGraphicsWidget;
 
 class Q_DECLARATIVE_EXPORT QFxWidgetContainer : public QFxItem
diff --git a/src/declarative/opengl/glheaders.h b/src/declarative/opengl/glheaders.h
index f0f6a55..fd1da18 100644
--- a/src/declarative/opengl/glheaders.h
+++ b/src/declarative/opengl/glheaders.h
@@ -42,7 +42,7 @@
 #ifndef _GLHEADERS_H_
 #define _GLHEADERS_H_
 
-#include <qfxglobal.h>
+#include <QtDeclarative/qfxglobal.h>
 #define GL_GLEXT_PROTOTYPES 1
 #include <QtOpenGL/qgl.h>
 
diff --git a/src/declarative/opengl/glsave.h b/src/declarative/opengl/glsave.h
index cca3d3c..8256162 100644
--- a/src/declarative/opengl/glsave.h
+++ b/src/declarative/opengl/glsave.h
@@ -42,9 +42,9 @@
 #ifndef _GLSAVE_H_
 #define _GLSAVE_H_
 
-#include <qglobal.h>
-#include <qfxglobal.h>
-#include <QRect>
+#include <QtCore/qglobal.h>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtCore/QRect>
 #include "glheaders.h"
 
 
diff --git a/src/declarative/opengl/gltexture.h b/src/declarative/opengl/gltexture.h
index f920b60..8704498 100644
--- a/src/declarative/opengl/gltexture.h
+++ b/src/declarative/opengl/gltexture.h
@@ -42,10 +42,10 @@
 #ifndef _GLTEXTURE_H_
 #define _GLTEXTURE_H_
 
-#include <qfxglobal.h>
+#include <QtDeclarative/qfxglobal.h>
 
-#include <QRect>
-#include <QPoint>
+#include <QtCore/QRect>
+#include <QtCore/QPoint>
 #include "glheaders.h"
 
 
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g
index 48e8244..155630b 100644
--- a/src/declarative/qml/parser/javascript.g
+++ b/src/declarative/qml/parser/javascript.g
@@ -46,7 +46,7 @@
 %decl           javascriptparser_p.h
 %impl           javascriptparser.cpp
 %expect         2
-%expect-rr      1
+%expect-rr      2
 
 %token T_AND "&"                T_AND_AND "&&"              T_AND_EQ "&="
 %token T_BREAK "break"          T_CASE "case"               T_CATCH "catch"
@@ -207,86 +207,71 @@
 
 #include "javascriptgrammar_p.h"
 #include "javascriptast_p.h"
+#include "javascriptengine_p.h"
+
 #include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE
 
 class QString;
-class JavaScriptEnginePrivate;
-class JavaScriptNameIdImpl;
 
-class JavaScriptParser: protected $table
+namespace JavaScript {
+
+class Engine;
+class NameId;
+
+class Parser: protected $table
 {
 public:
     union Value {
       int ival;
       double dval;
-      JavaScriptNameIdImpl *sval;
-      JavaScript::AST::ArgumentList *ArgumentList;
-      JavaScript::AST::CaseBlock *CaseBlock;
-      JavaScript::AST::CaseClause *CaseClause;
-      JavaScript::AST::CaseClauses *CaseClauses;
-      JavaScript::AST::Catch *Catch;
-      JavaScript::AST::DefaultClause *DefaultClause;
-      JavaScript::AST::ElementList *ElementList;
-      JavaScript::AST::Elision *Elision;
-      JavaScript::AST::ExpressionNode *Expression;
-      JavaScript::AST::Finally *Finally;
-      JavaScript::AST::FormalParameterList *FormalParameterList;
-      JavaScript::AST::FunctionBody *FunctionBody;
-      JavaScript::AST::FunctionDeclaration *FunctionDeclaration;
-      JavaScript::AST::Node *Node;
-      JavaScript::AST::PropertyName *PropertyName;
-      JavaScript::AST::PropertyNameAndValueList *PropertyNameAndValueList;
-      JavaScript::AST::SourceElement *SourceElement;
-      JavaScript::AST::SourceElements *SourceElements;
-      JavaScript::AST::Statement *Statement;
-      JavaScript::AST::StatementList *StatementList;
-      JavaScript::AST::Block *Block;
-      JavaScript::AST::VariableDeclaration *VariableDeclaration;
-      JavaScript::AST::VariableDeclarationList *VariableDeclarationList;
-
-      JavaScript::AST::UiProgram *UiProgram;
-      JavaScript::AST::UiImportList *UiImportList;
-      JavaScript::AST::UiImport *UiImport;
-      JavaScript::AST::UiPublicMember *UiPublicMember;
-      JavaScript::AST::UiObjectDefinition *UiObjectDefinition;
-      JavaScript::AST::UiObjectInitializer *UiObjectInitializer;
-      JavaScript::AST::UiObjectBinding *UiObjectBinding;
-      JavaScript::AST::UiScriptBinding *UiScriptBinding;
-      JavaScript::AST::UiArrayBinding *UiArrayBinding;
-      JavaScript::AST::UiObjectMember *UiObjectMember;
-      JavaScript::AST::UiObjectMemberList *UiObjectMemberList;
-      JavaScript::AST::UiQualifiedId *UiQualifiedId;
-    };
-
-    struct DiagnosticMessage {
-        enum Kind { Warning, Error };
-
-        DiagnosticMessage()
-            : kind(Error) {}
-
-        DiagnosticMessage(Kind kind, const JavaScript::AST::SourceLocation &loc, const QString &message)
-            : kind(kind), loc(loc), message(message) {}
-
-        bool isWarning() const
-        { return kind == Warning; }
-
-        bool isError() const
-        { return kind == Error; }
-
-        Kind kind;
-        JavaScript::AST::SourceLocation loc;
-        QString message;
+      NameId *sval;
+      AST::ArgumentList *ArgumentList;
+      AST::CaseBlock *CaseBlock;
+      AST::CaseClause *CaseClause;
+      AST::CaseClauses *CaseClauses;
+      AST::Catch *Catch;
+      AST::DefaultClause *DefaultClause;
+      AST::ElementList *ElementList;
+      AST::Elision *Elision;
+      AST::ExpressionNode *Expression;
+      AST::Finally *Finally;
+      AST::FormalParameterList *FormalParameterList;
+      AST::FunctionBody *FunctionBody;
+      AST::FunctionDeclaration *FunctionDeclaration;
+      AST::Node *Node;
+      AST::PropertyName *PropertyName;
+      AST::PropertyNameAndValueList *PropertyNameAndValueList;
+      AST::SourceElement *SourceElement;
+      AST::SourceElements *SourceElements;
+      AST::Statement *Statement;
+      AST::StatementList *StatementList;
+      AST::Block *Block;
+      AST::VariableDeclaration *VariableDeclaration;
+      AST::VariableDeclarationList *VariableDeclarationList;
+
+      AST::UiProgram *UiProgram;
+      AST::UiImportList *UiImportList;
+      AST::UiImport *UiImport;
+      AST::UiPublicMember *UiPublicMember;
+      AST::UiObjectDefinition *UiObjectDefinition;
+      AST::UiObjectInitializer *UiObjectInitializer;
+      AST::UiObjectBinding *UiObjectBinding;
+      AST::UiScriptBinding *UiScriptBinding;
+      AST::UiArrayBinding *UiArrayBinding;
+      AST::UiObjectMember *UiObjectMember;
+      AST::UiObjectMemberList *UiObjectMemberList;
+      AST::UiQualifiedId *UiQualifiedId;
     };
 
 public:
-    JavaScriptParser();
-    ~JavaScriptParser();
+    Parser(Engine *engine);
+    ~Parser();
 
-    bool parse(JavaScriptEnginePrivate *driver);
+    bool parse();
 
-    JavaScript::AST::UiProgram *ast()
+    AST::UiProgram *ast()
     { return program; }
 
     QList<DiagnosticMessage> diagnosticMessages() const
@@ -317,17 +302,20 @@ protected:
     inline Value &sym(int index)
     { return sym_stack [tos + index - 1]; }
 
-    inline JavaScript::AST::SourceLocation &loc(int index)
+    inline AST::SourceLocation &loc(int index)
     { return location_stack [tos + index - 1]; }
 
+    AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
+
 protected:
+    Engine *driver;
     int tos;
     int stack_size;
     Value *sym_stack;
     int *state_stack;
-    JavaScript::AST::SourceLocation *location_stack;
+    AST::SourceLocation *location_stack;
 
-    JavaScript::AST::UiProgram *program;
+    AST::UiProgram *program;
 
     // error recovery
     enum { TOKEN_BUFFER_SIZE = 3 };
@@ -335,12 +323,12 @@ protected:
     struct SavedToken {
        int token;
        double dval;
-       JavaScript::AST::SourceLocation loc;
+       AST::SourceLocation loc;
     };
 
     double yylval;
-    JavaScript::AST::SourceLocation yylloc;
-    JavaScript::AST::SourceLocation yyprevlloc;
+    AST::SourceLocation yylloc;
+    AST::SourceLocation yyprevlloc;
 
     SavedToken token_buffer[TOKEN_BUFFER_SIZE];
     SavedToken *first_token;
@@ -349,12 +337,16 @@ protected:
     QList<DiagnosticMessage> diagnostic_messages;
 };
 
+} // end of namespace JavaScript
+
+
 :/
 
 
 /.
 
 #include "javascriptparser_p.h"
+#include <QVarLengthArray>
 
 //
 // This file is automatically generated from javascript.g.
@@ -365,7 +357,7 @@ using namespace JavaScript;
 
 QT_BEGIN_NAMESPACE
 
-void JavaScriptParser::reallocateStack()
+void Parser::reallocateStack()
 {
     if (! stack_size)
         stack_size = 128;
@@ -377,7 +369,7 @@ void JavaScriptParser::reallocateStack()
     location_stack = reinterpret_cast<AST::SourceLocation*> (qRealloc(location_stack, stack_size * sizeof(AST::SourceLocation)));
 }
 
-inline static bool automatic(JavaScriptEnginePrivate *driver, int token)
+inline static bool automatic(Engine *driver, int token)
 {
     return token == $table::T_RBRACE
         || token == 0
@@ -385,7 +377,8 @@ inline static bool automatic(JavaScriptEnginePrivate *driver, int token)
 }
 
 
-JavaScriptParser::JavaScriptParser():
+Parser::Parser(Engine *engine):
+    driver(engine),
     tos(0),
     stack_size(0),
     sym_stack(0),
@@ -396,7 +389,7 @@ JavaScriptParser::JavaScriptParser():
 {
 }
 
-JavaScriptParser::~JavaScriptParser()
+Parser::~Parser()
 {
     if (stack_size) {
         qFree(sym_stack);
@@ -415,7 +408,35 @@ static inline AST::SourceLocation location(Lexer *lexer)
     return loc;
 }
 
-bool JavaScriptParser::parse(JavaScriptEnginePrivate *driver)
+AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
+{
+    QVarLengthArray<NameId *, 4> nameIds;
+    QVarLengthArray<AST::SourceLocation, 4> locations;
+
+    AST::ExpressionNode *it = expr;
+    while (AST::FieldMemberExpression *m = AST::cast<AST::FieldMemberExpression *>(it)) {
+        nameIds.append(m->name);
+        locations.append(m->identifierToken);
+        it = m->base;
+    }
+
+    if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(it)) {
+        AST::UiQualifiedId *q = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), idExpr->name);
+        q->identifierToken = idExpr->identifierToken;
+
+        AST::UiQualifiedId *currentId = q;
+        for (int i = nameIds.size() - 1; i != -1; --i) {
+            currentId = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), currentId, nameIds[i]);
+            currentId->identifierToken = locations[i];
+        }
+
+        return currentId->finish();
+    }
+
+    return 0;
+}
+
+bool Parser::parse()
 {
     Lexer *lexer = driver->lexer();
     bool hadErrors = false;
@@ -475,7 +496,7 @@ UiProgram: UiImportListOpt UiRootMember ;
 case $rule_number: {
   program = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
         sym(2).UiObjectMemberList->finish());
-  sym(1).UiProgram = program;    
+  sym(1).UiProgram = program;
 } break;
 ./
 
@@ -580,23 +601,11 @@ case $rule_number: {
 }   break;
 ./
 
-UiObjectMember: UiQualifiedId T_COLON T_IDENTIFIER UiObjectInitializer ;
+UiObjectDefinition: UiQualifiedId UiObjectInitializer ;
 /.
 case $rule_number: {
-    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
-        sym(3).sval, sym(4).UiObjectInitializer);
-    node->colonToken = loc(2);
-    node->identifierToken = loc(3);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectDefinition: T_IDENTIFIER UiObjectInitializer ;
-/.
-case $rule_number: {
-    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).sval,
+    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
         sym(2).UiObjectInitializer);
-    node->identifierToken = loc(1);
     sym(1).Node = node;
 }   break;
 ./
@@ -634,11 +643,46 @@ case $rule_number: {
 } break;
 ./
 
-UiObjectMember: UiQualifiedId T_COLON UiMultilineStringStatement ;
-/.  case $rule_number: ./
-UiObjectMember: UiQualifiedId T_COLON Statement ;
+
+UiObjectMember: UiQualifiedId T_COLON Expression UiObjectInitializer ;
 /.
 case $rule_number: {
+  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+  } else {
+    sym(1).Node = 0;
+
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(2),
+      QLatin1String("Expected a type name after token `:'")));
+
+    return false; // ### recover
+  }
+} break;
+./
+
+UiObjectMember: UiQualifiedId T_COLON Block ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON EmptyStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON ExpressionStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON DebuggerStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON UiMultilineStringStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if statement in a binding?
+/.case $rule_number:./
+
+/.
+{
     AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
         sym(3).Statement);
     node->colonToken = loc(2);
@@ -648,7 +692,7 @@ case $rule_number: {
 
 UiPropertyType: T_VAR ;
 /.
-case $rule_number: 
+case $rule_number:
 ./
 UiPropertyType: T_RESERVED_WORD ;
 /.
@@ -663,7 +707,7 @@ UiPropertyType: T_IDENTIFIER ;
 UiObjectMember: T_SIGNAL T_IDENTIFIER ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (JavaScriptNameIdImpl *)0, sym(2).sval);
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -779,25 +823,6 @@ case $rule_number: {
 }
 ./
 
-UiQualifiedId: JsIdentifier ;
-/.
-case $rule_number: {
-    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
-    node->identifierToken = loc(1);
-    sym(1).Node = node;
-}   break;
-./
-
-UiQualifiedId: UiQualifiedId T_DOT JsIdentifier ;
-/.
-case $rule_number: {
-    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
-    node->identifierToken = loc(3);
-    sym(1).Node = node;
-}   break;
-./
-
-
 --------------------------------------------------------------------------------------------------------
 -- Expressions
 --------------------------------------------------------------------------------------------------------
@@ -899,10 +924,20 @@ case $rule_number: {
 } break;
 ./
 
-PrimaryExpression: T_LBRACKET ElisionOpt T_RBRACKET ;
+PrimaryExpression: T_LBRACKET T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->rbracketToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET Elision T_RBRACKET ;
 /.
 case $rule_number: {
-  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision);
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
@@ -919,10 +954,23 @@ case $rule_number: {
 } break;
 ./
 
-PrimaryExpression: T_LBRACKET ElementList T_COMMA ElisionOpt T_RBRACKET ;
+PrimaryExpression: T_LBRACKET ElementList T_COMMA T_RBRACKET ;
 /.
 case $rule_number: {
-  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision);
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->commaToken = loc(3);
+  node->rbracketToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET ElementList T_COMMA Elision T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    sym(4).Elision->finish());
   node->lbracketToken = loc(1);
   node->commaToken = loc(3);
   node->rbracketToken = loc(5);
@@ -973,51 +1021,73 @@ case $rule_number: {
 } break;
 ./
 
-ElementList: ElisionOpt AssignmentExpression ;
+UiQualifiedId: JsIdentifier ;
+/.
+case $rule_number: {
+    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
+    node->identifierToken = loc(1);
+    sym(1).Node = node;
+}   break;
+./
+
+UiQualifiedId: UiQualifiedId T_DOT JsIdentifier ;
 /.
 case $rule_number: {
-  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision, sym(2).Expression);
+    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
+    node->identifierToken = loc(3);
+    sym(1).Node = node;
+}   break;
+./
+
+ElementList: AssignmentExpression ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
 } break;
 ./
 
-ElementList: ElementList T_COMMA ElisionOpt AssignmentExpression ;
+ElementList: Elision AssignmentExpression ;
 /.
 case $rule_number: {
-  AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision, sym(4).Expression);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
 } break;
 ./
 
-Elision: T_COMMA ;
+ElementList: ElementList T_COMMA AssignmentExpression ;
 /.
 case $rule_number: {
-  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
-  node->commaToken = loc(1);
+  AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList,
+    (AST::Elision *) 0, sym(3).Expression);
+  node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 ./
 
-Elision: Elision T_COMMA ;
+ElementList: ElementList T_COMMA Elision AssignmentExpression ;
 /.
 case $rule_number: {
-  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
+  AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(),
+    sym(4).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 ./
 
-ElisionOpt: %prec SHIFT_THERE ;
+Elision: T_COMMA ;
 /.
 case $rule_number: {
-  sym(1).Node = 0;
+  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
+  node->commaToken = loc(1);
+  sym(1).Node = node;
 } break;
 ./
 
-ElisionOpt: Elision ;
+Elision: Elision T_COMMA ;
 /.
 case $rule_number: {
-  sym(1).Elision = sym(1).Elision->finish ();
+  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
 } break;
 ./
 
@@ -1038,7 +1108,7 @@ case $rule_number: {
       sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
   node->commaToken = loc(2);
   node->colonToken = loc(4);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 ./
 
@@ -1047,7 +1117,7 @@ PropertyName: T_IDENTIFIER %prec REDUCE_HERE ;
 case $rule_number: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 ./
 
@@ -1059,7 +1129,7 @@ PropertyName: T_PROPERTY ;
 case $rule_number: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
   node->propertyNameToken = loc(1);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 ./
 
@@ -1068,7 +1138,7 @@ PropertyName: T_STRING_LITERAL ;
 case $rule_number: {
   AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 ./
 
@@ -1077,7 +1147,7 @@ PropertyName: T_NUMERIC_LITERAL ;
 case $rule_number: {
   AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
   node->propertyNameToken = loc(1);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 ./
 
@@ -1086,7 +1156,7 @@ PropertyName: ReservedIdentifier ;
 case $rule_number: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 ./
 
diff --git a/src/declarative/qml/parser/javascriptast.cpp b/src/declarative/qml/parser/javascriptast.cpp
index 8a10650..083dd28 100644
--- a/src/declarative/qml/parser/javascriptast.cpp
+++ b/src/declarative/qml/parser/javascriptast.cpp
@@ -813,6 +813,7 @@ void UiPublicMember::accept0(Visitor *visitor)
 void UiObjectDefinition::accept0(Visitor *visitor)
 {
     if (visitor->visit(this)) {
+        acceptChild(qualifiedTypeNameId, visitor);
         acceptChild(initializer, visitor);
     }
 
@@ -833,6 +834,7 @@ void UiObjectBinding::accept0(Visitor *visitor)
 {
     if (visitor->visit(this)) {
         acceptChild(qualifiedId, visitor);
+        acceptChild(qualifiedTypeNameId, visitor);
         acceptChild(initializer, visitor);
     }
 
diff --git a/src/declarative/qml/parser/javascriptast_p.h b/src/declarative/qml/parser/javascriptast_p.h
index cd47e42..134f3cc 100644
--- a/src/declarative/qml/parser/javascriptast_p.h
+++ b/src/declarative/qml/parser/javascriptast_p.h
@@ -53,18 +53,15 @@
 // We mean it.
 //
 
-#include <QtCore/QString>
-
-
-
 #include "javascriptastvisitor_p.h"
+#include <QtCore/QString>
 
 QT_BEGIN_NAMESPACE
 
 #define JAVASCRIPT_DECLARE_AST_NODE(name) \
   enum { K = Kind_##name };
 
-class JavaScriptNameIdImpl;
+class NameId;
 
 namespace QSOperator // ### rename
 {
@@ -120,27 +117,6 @@ _T1 cast(_T2 *ast)
     return 0;
 }
 
-class SourceLocation
-{
-public:
-    SourceLocation(quint32 offset = 0, quint32 length = 0)
-        : offset(offset), length(length),
-          startLine(0), startColumn(0)
-    { }
-
-    bool isValid() const { return length != 0; }
-
-    quint32 begin() const { return offset; }
-    quint32 end() const { return offset + length; }
-
-// attributes
-    // ### encode
-    quint32 offset;
-    quint32 length;
-    quint32 startLine;
-    quint32 startColumn;
-};
-
 class Node
 {
 public:
@@ -339,7 +315,7 @@ class IdentifierExpression: public ExpressionNode
 public:
     JAVASCRIPT_DECLARE_AST_NODE(IdentifierExpression)
 
-    IdentifierExpression(JavaScriptNameIdImpl *n):
+    IdentifierExpression(NameId *n):
         name (n) { kind = K; }
 
     virtual ~IdentifierExpression() {}
@@ -353,7 +329,7 @@ public:
     { return identifierToken; }
 
 // attributes
-    JavaScriptNameIdImpl *name;
+    NameId *name;
     SourceLocation identifierToken;
 };
 
@@ -444,7 +420,7 @@ class StringLiteral: public ExpressionNode
 public:
     JAVASCRIPT_DECLARE_AST_NODE(StringLiteral)
 
-    StringLiteral(JavaScriptNameIdImpl *v):
+    StringLiteral(NameId *v):
         value (v) { kind = K; }
 
     virtual ~StringLiteral() {}
@@ -458,7 +434,7 @@ public:
     { return literalToken; }
 
 // attributes:
-    JavaScriptNameIdImpl *value;
+    NameId *value;
     SourceLocation literalToken;
 };
 
@@ -467,7 +443,7 @@ class RegExpLiteral: public ExpressionNode
 public:
     JAVASCRIPT_DECLARE_AST_NODE(RegExpLiteral)
 
-    RegExpLiteral(JavaScriptNameIdImpl *p, int f):
+    RegExpLiteral(NameId *p, int f):
         pattern (p), flags (f) { kind = K; }
 
     virtual ~RegExpLiteral() {}
@@ -481,7 +457,7 @@ public:
     { return literalToken; }
 
 // attributes:
-    JavaScriptNameIdImpl *pattern;
+    NameId *pattern;
     int flags;
     SourceLocation literalToken;
 };
@@ -667,7 +643,7 @@ class IdentifierPropertyName: public PropertyName
 public:
     JAVASCRIPT_DECLARE_AST_NODE(IdentifierPropertyName)
 
-    IdentifierPropertyName(JavaScriptNameIdImpl *n):
+    IdentifierPropertyName(NameId *n):
         id (n) { kind = K; }
 
     virtual ~IdentifierPropertyName() {}
@@ -675,7 +651,7 @@ public:
     virtual void accept0(Visitor *visitor);
 
 // attributes
-    JavaScriptNameIdImpl *id;
+    NameId *id;
 };
 
 class StringLiteralPropertyName: public PropertyName
@@ -683,14 +659,14 @@ class StringLiteralPropertyName: public PropertyName
 public:
     JAVASCRIPT_DECLARE_AST_NODE(StringLiteralPropertyName)
 
-    StringLiteralPropertyName(JavaScriptNameIdImpl *n):
+    StringLiteralPropertyName(NameId *n):
         id (n) { kind = K; }
     virtual ~StringLiteralPropertyName() {}
 
     virtual void accept0(Visitor *visitor);
 
 // attributes
-    JavaScriptNameIdImpl *id;
+    NameId *id;
 };
 
 class NumericLiteralPropertyName: public PropertyName
@@ -739,7 +715,7 @@ class FieldMemberExpression: public ExpressionNode
 public:
     JAVASCRIPT_DECLARE_AST_NODE(FieldMemberExpression)
 
-    FieldMemberExpression(ExpressionNode *b, JavaScriptNameIdImpl *n):
+    FieldMemberExpression(ExpressionNode *b, NameId *n):
         base (b), name (n)
         { kind = K; }
 
@@ -755,7 +731,7 @@ public:
 
     // attributes
     ExpressionNode *base;
-    JavaScriptNameIdImpl *name;
+    NameId *name;
     SourceLocation dotToken;
     SourceLocation identifierToken;
 };
@@ -1288,7 +1264,7 @@ class VariableDeclaration: public Node
 public:
     JAVASCRIPT_DECLARE_AST_NODE(VariableDeclaration)
 
-    VariableDeclaration(JavaScriptNameIdImpl *n, ExpressionNode *e):
+    VariableDeclaration(NameId *n, ExpressionNode *e):
         name (n), expression (e), readOnly(false)
         { kind = K; }
 
@@ -1297,7 +1273,7 @@ public:
     virtual void accept0(Visitor *visitor);
 
 // attributes
-    JavaScriptNameIdImpl *name;
+    NameId *name;
     ExpressionNode *expression;
     bool readOnly;
     SourceLocation identifierToken;
@@ -1602,7 +1578,7 @@ class ContinueStatement: public Statement
 public:
     JAVASCRIPT_DECLARE_AST_NODE(ContinueStatement)
 
-    ContinueStatement(JavaScriptNameIdImpl *l = 0):
+    ContinueStatement(NameId *l = 0):
         label (l) { kind = K; }
 
     virtual ~ContinueStatement() {}
@@ -1616,7 +1592,7 @@ public:
     { return semicolonToken; }
 
 // attributes
-    JavaScriptNameIdImpl *label;
+    NameId *label;
     SourceLocation continueToken;
     SourceLocation identifierToken;
     SourceLocation semicolonToken;
@@ -1627,7 +1603,7 @@ class BreakStatement: public Statement
 public:
     JAVASCRIPT_DECLARE_AST_NODE(BreakStatement)
 
-    BreakStatement(JavaScriptNameIdImpl *l = 0):
+    BreakStatement(NameId *l = 0):
         label (l) { kind = K; }
 
     virtual ~BreakStatement() {}
@@ -1641,7 +1617,7 @@ public:
     { return semicolonToken; }
 
     // attributes
-    JavaScriptNameIdImpl *label;
+    NameId *label;
     SourceLocation breakToken;
     SourceLocation identifierToken;
     SourceLocation semicolonToken;
@@ -1823,7 +1799,7 @@ class LabelledStatement: public Statement
 public:
     JAVASCRIPT_DECLARE_AST_NODE(LabelledStatement)
 
-    LabelledStatement(JavaScriptNameIdImpl *l, Statement *stmt):
+    LabelledStatement(NameId *l, Statement *stmt):
         label (l), statement (stmt)
         { kind = K; }
 
@@ -1838,7 +1814,7 @@ public:
     { return statement->lastSourceLocation(); }
 
 // attributes
-    JavaScriptNameIdImpl *label;
+    NameId *label;
     Statement *statement;
     SourceLocation identifierToken;
     SourceLocation colonToken;
@@ -1873,7 +1849,7 @@ class Catch: public Node
 public:
     JAVASCRIPT_DECLARE_AST_NODE(Catch)
 
-    Catch(JavaScriptNameIdImpl *n, Block *stmt):
+    Catch(NameId *n, Block *stmt):
         name (n), statement (stmt)
         { kind = K; }
 
@@ -1882,7 +1858,7 @@ public:
     virtual void accept0(Visitor *visitor);
 
 // attributes
-    JavaScriptNameIdImpl *name;
+    NameId *name;
     Block *statement;
     SourceLocation catchToken;
     SourceLocation lparenToken;
@@ -1954,7 +1930,7 @@ class FunctionExpression: public ExpressionNode
 public:
     JAVASCRIPT_DECLARE_AST_NODE(FunctionExpression)
 
-    FunctionExpression(JavaScriptNameIdImpl *n, FormalParameterList *f, FunctionBody *b):
+    FunctionExpression(NameId *n, FormalParameterList *f, FunctionBody *b):
         name (n), formals (f), body (b)
         { kind = K; }
 
@@ -1969,7 +1945,7 @@ public:
     { return rbraceToken; }
 
 // attributes
-    JavaScriptNameIdImpl *name;
+    NameId *name;
     FormalParameterList *formals;
     FunctionBody *body;
     SourceLocation functionToken;
@@ -1985,7 +1961,7 @@ class FunctionDeclaration: public FunctionExpression
 public:
     JAVASCRIPT_DECLARE_AST_NODE(FunctionDeclaration)
 
-    FunctionDeclaration(JavaScriptNameIdImpl *n, FormalParameterList *f, FunctionBody *b):
+    FunctionDeclaration(NameId *n, FormalParameterList *f, FunctionBody *b):
         FunctionExpression(n, f, b)
         { kind = K; }
 
@@ -1999,11 +1975,11 @@ class FormalParameterList: public Node
 public:
     JAVASCRIPT_DECLARE_AST_NODE(FormalParameterList)
 
-    FormalParameterList(JavaScriptNameIdImpl *n):
+    FormalParameterList(NameId *n):
         name (n), next (this)
         { kind = K; }
 
-    FormalParameterList(FormalParameterList *previous, JavaScriptNameIdImpl *n):
+    FormalParameterList(FormalParameterList *previous, NameId *n):
         name (n)
     {
         kind = K;
@@ -2023,7 +1999,7 @@ public:
     }
 
 // attributes
-    JavaScriptNameIdImpl *name;
+    NameId *name;
     FormalParameterList *next;
     SourceLocation commaToken;
     SourceLocation identifierToken;
@@ -2185,11 +2161,11 @@ class UiQualifiedId: public Node
 public:
     JAVASCRIPT_DECLARE_AST_NODE(UiQualifiedId)
 
-    UiQualifiedId(JavaScriptNameIdImpl *name)
+    UiQualifiedId(NameId *name)
         : next(this), name(name)
     { kind = K; }
 
-    UiQualifiedId(UiQualifiedId *previous, JavaScriptNameIdImpl *name)
+    UiQualifiedId(UiQualifiedId *previous, NameId *name)
         : name(name)
     {
         kind = K;
@@ -2210,7 +2186,7 @@ public:
 
 // attributes
     UiQualifiedId *next;
-    JavaScriptNameIdImpl *name;
+    NameId *name;
     SourceLocation identifierToken;
 };
 
@@ -2219,14 +2195,14 @@ class UiImport: public Node
 public:
     JAVASCRIPT_DECLARE_AST_NODE(UiImport)
 
-    UiImport(JavaScriptNameIdImpl *fileName)
+    UiImport(NameId *fileName)
         : fileName(fileName)
     { kind = K; }
 
     virtual void accept0(Visitor *visitor);
 
 // attributes
-    JavaScriptNameIdImpl *fileName;
+    NameId *fileName;
     SourceLocation importToken;
     SourceLocation fileNameToken;
     SourceLocation semicolonToken;
@@ -2324,13 +2300,13 @@ class UiPublicMember: public UiObjectMember
 public:
     JAVASCRIPT_DECLARE_AST_NODE(UiPublicMember)
 
-    UiPublicMember(JavaScriptNameIdImpl *memberType,
-                   JavaScriptNameIdImpl *name)
+    UiPublicMember(NameId *memberType,
+                   NameId *name)
         : type(Property), memberType(memberType), name(name), expression(0), isDefaultMember(false)
     { kind = K; }
 
-    UiPublicMember(JavaScriptNameIdImpl *memberType,
-                   JavaScriptNameIdImpl *name,
+    UiPublicMember(NameId *memberType,
+                   NameId *name,
                    ExpressionNode *expression)
         : type(Property), memberType(memberType), name(name), expression(expression), isDefaultMember(false)
     { kind = K; }
@@ -2352,8 +2328,8 @@ public:
 
 // attributes
     enum { Signal, Property } type;
-    JavaScriptNameIdImpl *memberType;
-    JavaScriptNameIdImpl *name;
+    NameId *memberType;
+    NameId *name;
     ExpressionNode *expression;
     bool isDefaultMember;
     SourceLocation defaultToken;
@@ -2369,28 +2345,22 @@ class UiObjectDefinition: public UiObjectMember
 public:
     JAVASCRIPT_DECLARE_AST_NODE(UiObjectDefinition)
 
-    UiObjectDefinition(JavaScriptNameIdImpl *name,
+    UiObjectDefinition(UiQualifiedId *qualifiedTypeNameId,
                        UiObjectInitializer *initializer)
-        : name(name), initializer(initializer)
+        : qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer)
     { kind = K; }
 
     virtual SourceLocation firstSourceLocation() const
-    { return identifierToken; }
+    { return qualifiedTypeNameId->identifierToken; }
 
     virtual SourceLocation lastSourceLocation() const
-    {
-      if (initializer)
-	return initializer->rbraceToken;
-
-      return identifierToken;
-    }
+    { return initializer->rbraceToken; }
 
     virtual void accept0(Visitor *visitor);
 
 // attributes
-    JavaScriptNameIdImpl *name;
+    UiQualifiedId *qualifiedTypeNameId;
     UiObjectInitializer *initializer;
-    SourceLocation identifierToken;
 };
 
 class UiSourceElement: public UiObjectMember
@@ -2435,10 +2405,10 @@ public:
     JAVASCRIPT_DECLARE_AST_NODE(UiObjectBinding)
 
     UiObjectBinding(UiQualifiedId *qualifiedId,
-                    JavaScriptNameIdImpl *name,
+                    UiQualifiedId *qualifiedTypeNameId,
                     UiObjectInitializer *initializer)
         : qualifiedId(qualifiedId),
-          name(name),
+          qualifiedTypeNameId(qualifiedTypeNameId),
           initializer(initializer)
     { kind = K; }
 
@@ -2452,10 +2422,9 @@ public:
 
 // attributes
     UiQualifiedId *qualifiedId;
-    JavaScriptNameIdImpl *name;
+    UiQualifiedId *qualifiedTypeNameId;
     UiObjectInitializer *initializer;
     SourceLocation colonToken;
-    SourceLocation identifierToken;
 };
 
 class UiScriptBinding: public UiObjectMember
diff --git a/src/declarative/qml/parser/javascriptastfwd_p.h b/src/declarative/qml/parser/javascriptastfwd_p.h
index 858e393..822a2d7 100644
--- a/src/declarative/qml/parser/javascriptastfwd_p.h
+++ b/src/declarative/qml/parser/javascriptastfwd_p.h
@@ -59,7 +59,26 @@ QT_BEGIN_NAMESPACE
 
 namespace JavaScript { namespace AST {
 
-class SourceLocation;
+class SourceLocation
+{
+public:
+    SourceLocation(quint32 offset = 0, quint32 length = 0)
+        : offset(offset), length(length),
+          startLine(0), startColumn(0)
+    { }
+
+    bool isValid() const { return length != 0; }
+
+    quint32 begin() const { return offset; }
+    quint32 end() const { return offset + length; }
+
+// attributes
+    // ### encode
+    quint32 offset;
+    quint32 length;
+    quint32 startLine;
+    quint32 startColumn;
+};
 
 class Visitor;
 class Node;
diff --git a/src/declarative/qml/parser/javascriptengine_p.cpp b/src/declarative/qml/parser/javascriptengine_p.cpp
index ca15b75..d893a90 100644
--- a/src/declarative/qml/parser/javascriptengine_p.cpp
+++ b/src/declarative/qml/parser/javascriptengine_p.cpp
@@ -29,7 +29,6 @@
 
 #include "javascriptengine_p.h"
 #include "javascriptnodepool_p.h"
-#include "javascriptvalue.h"
 #include <qnumeric.h>
 #include <QHash>
 
@@ -37,7 +36,10 @@ QT_BEGIN_NAMESPACE
 
 namespace JavaScript {
 
-QString numberToString(qjsreal value)
+uint qHash(const JavaScript::NameId &id)
+{ return qHash(id.asString()); }
+
+QString numberToString(double value)
 { return QString::number(value); }
 
 int Ecma::RegExp::flagFromChar(const QChar &ch)
@@ -67,9 +69,10 @@ QString Ecma::RegExp::flagsToString(int flags)
     return result;
 }
 
-NodePool::NodePool(const QString &fileName, JavaScriptEnginePrivate *engine)
+NodePool::NodePool(const QString &fileName, Engine *engine)
     : m_fileName(fileName), m_engine(engine)
 {
+    m_engine->setNodePool(this);
 }
 
 NodePool::~NodePool()
@@ -93,12 +96,12 @@ static int toDigit(char c)
     return -1;
 }
 
-qjsreal integerFromString(const char *buf, int size, int radix)
+double integerFromString(const char *buf, int size, int radix)
 {
     if (size == 0)
         return qSNaN();
 
-    qjsreal sign = 1.0;
+    double sign = 1.0;
     int i = 0;
     if (buf[0] == '+') {
         ++i;
@@ -130,7 +133,7 @@ qjsreal integerFromString(const char *buf, int size, int radix)
         if ((d == -1) || (d >= radix))
             break;
     }
-    qjsreal result;
+    double result;
     if (j == i) {
         if (!qstrcmp(buf, "Infinity"))
             result = qInf();
@@ -138,7 +141,7 @@ qjsreal integerFromString(const char *buf, int size, int radix)
             result = qSNaN();
     } else {
         result = 0;
-        qjsreal multiplier = 1;
+        double multiplier = 1;
         for (--i ; i >= j; --i, multiplier *= radix)
             result += toDigit(buf[i]) * multiplier;
     }
@@ -146,12 +149,43 @@ qjsreal integerFromString(const char *buf, int size, int radix)
     return result;
 }
 
-qjsreal integerFromString(const QString &str, int radix)
+double integerFromString(const QString &str, int radix)
 {
     QByteArray ba = str.trimmed().toUtf8();
     return integerFromString(ba.constData(), ba.size(), radix);
 }
 
+
+Engine::Engine()
+    : _lexer(0), _nodePool(0)
+{ }
+
+Engine::~Engine()
+{ }
+
+QSet<NameId> Engine::literals() const
+{ return _literals; }
+
+NameId *Engine::intern(const QChar *u, int s)
+{ return const_cast<NameId *>(&*_literals.insert(NameId(u, s))); }
+
+QString Engine::toString(NameId *id)
+{ return id->asString(); }
+
+Lexer *Engine::lexer() const
+{ return _lexer; }
+
+void Engine::setLexer(Lexer *lexer)
+{ _lexer = lexer; }
+
+NodePool *Engine::nodePool() const
+{ return _nodePool; }
+
+void Engine::setNodePool(NodePool *nodePool)
+{ _nodePool = nodePool; }
+
+
+
 } // end of namespace JavaScript
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/parser/javascriptengine_p.h b/src/declarative/qml/parser/javascriptengine_p.h
index 1e6e568..3bd924a 100644
--- a/src/declarative/qml/parser/javascriptengine_p.h
+++ b/src/declarative/qml/parser/javascriptengine_p.h
@@ -30,23 +30,50 @@
 #ifndef JAVASCRIPTENGINE_P_H
 #define JAVASCRIPTENGINE_P_H
 
-#include "javascriptvalue.h"
 #include <QString>
 #include <QSet>
 
+#include "javascriptastfwd_p.h"
+
 QT_BEGIN_NAMESPACE
 
 namespace JavaScript {
+class NameId
+{
+    QString _text;
 
-class Node;
-class Lexer;
-class NodePool;
+public:
+    NameId(const QChar *u, int s)
+        : _text(u, s)
+    { }
 
-namespace AST {
+    const QString asString() const
+    { return _text; }
 
-class Node;
+    bool operator == (const NameId &other) const
+    { return _text == other._text; }
 
-} // end of namespace AST
+    bool operator != (const NameId &other) const
+    { return _text != other._text; }
+
+    bool operator < (const NameId &other) const
+    { return _text < other._text; }
+};
+
+uint qHash(const JavaScript::NameId &id);
+
+} // end of namespace JavaScript
+
+#if defined(Q_CC_MSVC) && _MSC_VER <= 1300
+//this ensures that code outside JavaScript can use the hash function
+//it also a workaround for some compilers
+inline uint qHash(const JavaScript::NameId &nameId) { return JavaScript::qHash(nameId); }
+#endif
+
+namespace JavaScript {
+
+class Lexer;
+class NodePool;
 
 namespace Ecma {
 
@@ -66,79 +93,53 @@ public:
 
 } // end of namespace Ecma
 
-} // end of namespace JavaScript
-
-
-
-class JavaScriptNameIdImpl
+class DiagnosticMessage
 {
-    QString _text;
-
 public:
-    JavaScriptNameIdImpl(const QChar *u, int s)
-        : _text(u, s)
-    { }
+    enum Kind { Warning, Error };
 
-    const QString asString() const
-    { return _text; }
+    DiagnosticMessage()
+        : kind(Error) {}
 
-    bool operator == (const JavaScriptNameIdImpl &other) const
-    { return _text == other._text; }
+    DiagnosticMessage(Kind kind, const AST::SourceLocation &loc, const QString &message)
+        : kind(kind), loc(loc), message(message) {}
 
-    bool operator != (const JavaScriptNameIdImpl &other) const
-    { return _text != other._text; }
+    bool isWarning() const
+    { return kind == Warning; }
 
-    bool operator < (const JavaScriptNameIdImpl &other) const
-    { return _text < other._text; }
-};
+    bool isError() const
+    { return kind == Error; }
 
-inline uint qHash(const JavaScriptNameIdImpl &id)
-{ return qHash(id.asString()); }
+    Kind kind;
+    AST::SourceLocation loc;
+    QString message;
+};
 
-class JavaScriptEnginePrivate
+class Engine
 {
-    JavaScript::Lexer *_lexer;
-    JavaScript::NodePool *_nodePool;
-    JavaScript::AST::Node *_ast;
-    QSet<JavaScriptNameIdImpl> _literals;
+    Lexer *_lexer;
+    NodePool *_nodePool;
+    QSet<NameId> _literals;
 
 public:
-    JavaScriptEnginePrivate()
-        : _lexer(0), _nodePool(0), _ast(0)
-    { }
-
-    QSet<JavaScriptNameIdImpl> literals() const
-    { return _literals; }
+    Engine();
+    ~Engine();
 
-    JavaScriptNameIdImpl *intern(const QChar *u, int s)
-    { return const_cast<JavaScriptNameIdImpl *>(&*_literals.insert(JavaScriptNameIdImpl(u, s))); }
+    QSet<NameId> literals() const;
 
-    static QString toString(JavaScriptNameIdImpl *id)
-    { return id->asString(); }
+    NameId *intern(const QChar *u, int s);
 
-    JavaScript::Lexer *lexer() const
-    { return _lexer; }
+    static QString toString(NameId *id);
 
-    void setLexer(JavaScript::Lexer *lexer)
-    { _lexer = lexer; }
+    Lexer *lexer() const;
+    void setLexer(Lexer *lexer);
 
-    JavaScript::NodePool *nodePool() const
-    { return _nodePool; }
-
-    void setNodePool(JavaScript::NodePool *nodePool)
-    { _nodePool = nodePool; }
-
-    JavaScript::AST::Node *ast() const
-    { return _ast; }
-
-    JavaScript::AST::Node *changeAbstractSyntaxTree(JavaScript::AST::Node *node)
-    {
-        JavaScript::AST::Node *previousAST = _ast;
-        _ast = node;
-        return previousAST;
-    }
+    NodePool *nodePool() const;
+    void setNodePool(NodePool *nodePool);
 };
 
+} // end of namespace JavaScript
+
 QT_END_NAMESPACE
 
 #endif // JAVASCRIPTENGINE_P_H
diff --git a/src/declarative/qml/parser/javascriptgrammar.cpp b/src/declarative/qml/parser/javascriptgrammar.cpp
index abe3f1c..a879bfe 100644
--- a/src/declarative/qml/parser/javascriptgrammar.cpp
+++ b/src/declarative/qml/parser/javascriptgrammar.cpp
@@ -56,527 +56,585 @@ const char *const JavaScriptGrammar::spell [] = {
 
 const int JavaScriptGrammar::lhs [] = {
   91, 92, 92, 95, 95, 96, 96, 94, 93, 98, 
-  98, 100, 100, 101, 101, 99, 97, 99, 99, 103, 
-  104, 104, 99, 99, 106, 106, 106, 99, 99, 99, 
-  99, 99, 99, 99, 99, 99, 99, 99, 102, 102, 
-  110, 110, 110, 102, 102, 111, 111, 111, 111, 111, 
-  111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 
-  113, 113, 117, 117, 112, 112, 115, 115, 118, 118, 
-  118, 118, 118, 118, 119, 119, 119, 119, 119, 119, 
-  119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 
-  119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 
-  119, 119, 119, 119, 119, 120, 120, 121, 121, 121, 
-  121, 121, 124, 124, 125, 125, 125, 125, 123, 123, 
-  126, 126, 127, 127, 128, 128, 128, 129, 129, 129, 
-  129, 129, 129, 129, 129, 129, 129, 130, 130, 130, 
-  130, 131, 131, 131, 132, 132, 132, 132, 133, 133, 
-  133, 133, 133, 133, 133, 134, 134, 134, 134, 134, 
-  134, 135, 135, 135, 135, 135, 136, 136, 136, 136, 
-  136, 137, 137, 138, 138, 139, 139, 140, 140, 141, 
+  98, 100, 100, 101, 101, 97, 99, 99, 103, 104, 
+  104, 99, 99, 99, 99, 99, 99, 99, 111, 111, 
+  111, 99, 99, 99, 99, 99, 99, 99, 99, 99, 
+  99, 99, 102, 102, 114, 114, 114, 115, 115, 115, 
+  115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 
+  115, 115, 115, 115, 102, 102, 117, 117, 117, 117, 
+  116, 116, 119, 119, 121, 121, 121, 121, 121, 121, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 123, 123, 124, 124, 124, 124, 124, 127, 127, 
+  128, 128, 128, 128, 126, 126, 129, 129, 130, 130, 
+  131, 131, 131, 132, 132, 132, 132, 132, 132, 132, 
+  132, 132, 132, 133, 133, 133, 133, 134, 134, 134, 
+  135, 135, 135, 135, 136, 136, 136, 136, 136, 136, 
+  136, 137, 137, 137, 137, 137, 137, 138, 138, 138, 
+  138, 138, 139, 139, 139, 139, 139, 140, 140, 141, 
   141, 142, 142, 143, 143, 144, 144, 145, 145, 146, 
-  146, 147, 147, 148, 148, 116, 116, 149, 149, 150, 
-  150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 
-  150, 107, 107, 151, 151, 152, 152, 153, 153, 105, 
-  105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
-  105, 105, 105, 105, 154, 169, 169, 168, 168, 109, 
-  109, 170, 170, 171, 171, 173, 173, 172, 174, 177, 
-  175, 175, 178, 176, 176, 155, 156, 156, 157, 157, 
-  158, 158, 158, 158, 158, 158, 158, 159, 159, 159, 
-  159, 160, 160, 160, 160, 161, 161, 162, 164, 179, 
-  179, 182, 182, 180, 180, 183, 181, 163, 163, 163, 
-  165, 165, 166, 166, 166, 184, 185, 167, 167, 108, 
-  122, 189, 189, 186, 186, 187, 187, 190, 191, 191, 
-  192, 192, 188, 188, 114, 114, 193};
+  146, 147, 147, 148, 148, 149, 149, 150, 150, 151, 
+  151, 120, 120, 152, 152, 153, 153, 153, 153, 153, 
+  153, 153, 153, 153, 153, 153, 153, 105, 105, 154, 
+  154, 155, 155, 156, 156, 157, 157, 157, 157, 157, 
+  157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 
+  106, 168, 168, 167, 167, 113, 113, 169, 169, 170, 
+  170, 172, 172, 171, 173, 176, 174, 174, 177, 175, 
+  175, 107, 108, 108, 110, 110, 158, 158, 158, 158, 
+  158, 158, 158, 159, 159, 159, 159, 160, 160, 160, 
+  160, 161, 161, 162, 164, 178, 178, 181, 181, 179, 
+  179, 182, 180, 163, 163, 163, 165, 165, 166, 166, 
+  166, 183, 184, 109, 109, 112, 125, 188, 188, 185, 
+  185, 186, 186, 189, 190, 190, 191, 191, 187, 187, 
+  118, 118, 192};
 
 const int JavaScriptGrammar:: rhs[] = {
   2, 1, 1, 1, 2, 3, 3, 0, 1, 1, 
-  2, 1, 3, 2, 3, 4, 2, 1, 5, 1, 
-  2, 2, 3, 3, 1, 1, 1, 2, 4, 4, 
-  5, 5, 6, 6, 7, 7, 1, 1, 1, 1, 
-  1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 3, 3, 5, 3, 4, 3, 
-  2, 4, 1, 2, 0, 1, 3, 5, 1, 1, 
+  2, 1, 3, 2, 3, 2, 1, 5, 1, 2, 
+  2, 4, 3, 3, 3, 3, 3, 3, 1, 1, 
+  1, 2, 4, 4, 5, 5, 6, 6, 7, 7, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 2, 3, 3, 4, 
+  5, 3, 4, 3, 1, 3, 1, 2, 3, 4, 
+  1, 2, 3, 5, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 
-  3, 5, 1, 2, 4, 4, 4, 3, 0, 1, 
-  1, 3, 1, 1, 1, 2, 2, 1, 2, 2, 
-  2, 2, 2, 2, 2, 2, 2, 1, 3, 3, 
-  3, 1, 3, 3, 1, 3, 3, 3, 1, 3, 
-  3, 3, 3, 3, 3, 1, 3, 3, 3, 3, 
-  3, 1, 3, 3, 3, 3, 1, 3, 3, 3, 
-  3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 
-  3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 
-  3, 1, 5, 1, 5, 1, 3, 1, 3, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 3, 0, 1, 1, 3, 0, 1, 1, 
+  1, 1, 1, 1, 1, 4, 3, 5, 1, 2, 
+  4, 4, 4, 3, 0, 1, 1, 3, 1, 1, 
+  1, 2, 2, 1, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 1, 3, 3, 3, 1, 3, 3, 
+  1, 3, 3, 3, 1, 3, 3, 3, 3, 3, 
+  3, 1, 3, 3, 3, 3, 3, 1, 3, 3, 
+  3, 3, 1, 3, 3, 3, 3, 1, 3, 1, 
+  3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 
+  3, 1, 3, 1, 3, 1, 3, 1, 5, 1, 
+  5, 1, 3, 1, 3, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 3, 0, 
+  1, 1, 3, 0, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 3, 1, 2, 0, 1, 3, 
-  3, 1, 1, 1, 3, 1, 3, 2, 2, 2, 
-  0, 1, 2, 0, 1, 1, 2, 2, 7, 5, 
-  7, 7, 5, 9, 10, 7, 8, 2, 2, 3, 
-  3, 2, 2, 3, 3, 3, 3, 5, 5, 3, 
-  5, 1, 2, 0, 1, 4, 3, 3, 3, 3, 
-  3, 3, 3, 3, 4, 5, 2, 2, 2, 8, 
-  8, 1, 3, 0, 1, 0, 1, 1, 1, 2, 
-  1, 1, 0, 1, 0, 1, 2};
+  3, 1, 2, 0, 1, 3, 3, 1, 1, 1, 
+  3, 1, 3, 2, 2, 2, 0, 1, 2, 0, 
+  1, 1, 2, 2, 7, 5, 7, 7, 5, 9, 
+  10, 7, 8, 2, 2, 3, 3, 2, 2, 3, 
+  3, 3, 3, 5, 5, 3, 5, 1, 2, 0, 
+  1, 4, 3, 3, 3, 3, 3, 3, 3, 3, 
+  4, 5, 2, 2, 2, 8, 8, 1, 3, 0, 
+  1, 0, 1, 1, 1, 2, 1, 1, 0, 1, 
+  0, 1, 2};
 
 const int JavaScriptGrammar::action_default [] = {
   8, 2, 0, 4, 3, 0, 0, 0, 6, 7, 
-  5, 0, 9, 1, 0, 17, 37, 44, 242, 0, 
-  0, 41, 42, 14, 39, 40, 43, 243, 18, 10, 
-  0, 0, 0, 38, 0, 27, 26, 25, 0, 0, 
-  31, 0, 32, 145, 212, 176, 184, 180, 124, 196, 
-  172, 0, 109, 47, 125, 188, 192, 113, 142, 123, 
-  128, 108, 162, 149, 0, 53, 54, 50, 313, 41, 
-  315, 65, 0, 0, 0, 0, 0, 48, 51, 0, 
-  0, 42, 43, 52, 46, 0, 49, 0, 0, 138, 
-  0, 0, 125, 144, 127, 126, 0, 0, 0, 140, 
-  141, 139, 143, 0, 173, 0, 0, 0, 0, 163, 
-  0, 0, 0, 0, 0, 0, 153, 0, 0, 0, 
-  147, 148, 146, 151, 155, 154, 152, 150, 165, 164, 
-  166, 0, 181, 0, 177, 0, 0, 119, 106, 118, 
-  107, 75, 76, 77, 102, 78, 103, 79, 80, 81, 
-  82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 
-  104, 92, 93, 94, 95, 96, 97, 98, 99, 100, 
-  101, 105, 0, 0, 117, 213, 120, 0, 121, 0, 
-  122, 116, 35, 36, 0, 209, 202, 200, 207, 208, 
-  206, 205, 211, 204, 203, 201, 210, 197, 0, 185, 
-  0, 0, 189, 0, 0, 193, 0, 0, 119, 111, 
-  0, 110, 0, 115, 129, 0, 314, 304, 305, 0, 
-  302, 0, 303, 0, 306, 220, 227, 226, 234, 222, 
-  0, 223, 307, 0, 312, 224, 225, 230, 228, 309, 
-  308, 311, 231, 0, 0, 0, 0, 0, 313, 41, 
-  0, 315, 42, 214, 256, 43, 0, 0, 0, 0, 
-  0, 232, 233, 221, 229, 257, 258, 301, 310, 0, 
-  272, 273, 274, 275, 0, 268, 269, 270, 271, 298, 
-  299, 0, 0, 0, 0, 0, 261, 262, 218, 216, 
-  178, 186, 182, 198, 174, 219, 0, 125, 190, 194, 
-  167, 156, 0, 0, 175, 0, 0, 0, 0, 168, 
-  0, 0, 0, 0, 0, 160, 158, 161, 159, 157, 
-  170, 169, 171, 0, 183, 0, 179, 0, 217, 125, 
-  0, 199, 214, 215, 0, 214, 0, 0, 264, 0, 
-  0, 0, 266, 0, 187, 0, 0, 191, 0, 0, 
-  195, 254, 0, 246, 255, 249, 0, 253, 0, 214, 
-  247, 0, 214, 0, 0, 265, 0, 0, 0, 267, 
-  314, 304, 0, 0, 306, 0, 300, 0, 290, 0, 
-  0, 0, 260, 0, 259, 0, 316, 0, 74, 236, 
-  239, 0, 75, 242, 78, 103, 80, 81, 50, 85, 
-  86, 41, 87, 90, 48, 51, 42, 214, 43, 52, 
-  93, 46, 95, 49, 97, 98, 243, 100, 101, 105, 
-  0, 67, 0, 0, 69, 73, 71, 59, 70, 72, 
-  0, 68, 58, 237, 235, 113, 114, 119, 0, 112, 
-  0, 289, 0, 276, 277, 0, 288, 0, 0, 0, 
-  279, 284, 282, 285, 0, 0, 283, 284, 0, 280, 
-  0, 281, 238, 287, 0, 238, 286, 0, 291, 292, 
-  0, 238, 293, 294, 0, 0, 295, 0, 0, 0, 
-  296, 297, 131, 130, 0, 0, 0, 263, 0, 0, 
-  0, 278, 0, 66, 0, 63, 65, 56, 0, 62, 
-  57, 64, 61, 55, 0, 60, 135, 133, 137, 134, 
-  132, 136, 0, 0, 0, 29, 0, 30, 0, 33, 
-  34, 28, 15, 11, 0, 0, 24, 41, 65, 20, 
-  0, 23, 16, 0, 12, 0, 19, 13, 21, 22, 
-  45, 251, 244, 0, 252, 248, 0, 250, 240, 0, 
-  241, 245, 317};
+  5, 65, 45, 46, 43, 44, 47, 9, 0, 1, 
+  0, 0, 16, 66, 41, 248, 0, 0, 46, 14, 
+  47, 249, 17, 10, 0, 0, 0, 42, 0, 31, 
+  30, 29, 0, 0, 35, 0, 36, 151, 218, 182, 
+  190, 186, 130, 202, 178, 0, 115, 49, 131, 194, 
+  198, 119, 148, 129, 134, 114, 168, 155, 0, 55, 
+  56, 52, 319, 321, 0, 0, 0, 0, 0, 0, 
+  50, 53, 0, 0, 54, 48, 0, 51, 0, 0, 
+  144, 0, 0, 131, 150, 133, 132, 0, 0, 0, 
+  146, 147, 145, 149, 0, 179, 0, 0, 0, 0, 
+  169, 0, 0, 0, 0, 0, 0, 159, 0, 0, 
+  0, 153, 154, 152, 157, 161, 160, 158, 156, 171, 
+  170, 172, 0, 187, 0, 183, 0, 0, 125, 112, 
+  124, 113, 81, 82, 83, 108, 84, 109, 85, 86, 
+  87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 
+  97, 110, 98, 99, 100, 101, 102, 103, 104, 105, 
+  106, 107, 111, 0, 0, 123, 219, 126, 0, 127, 
+  0, 128, 122, 39, 40, 0, 215, 208, 206, 213, 
+  214, 212, 211, 217, 210, 209, 207, 216, 203, 0, 
+  191, 0, 0, 195, 0, 0, 199, 0, 0, 125, 
+  117, 0, 116, 0, 121, 135, 0, 320, 310, 311, 
+  0, 308, 0, 309, 0, 312, 226, 233, 232, 240, 
+  228, 0, 229, 313, 0, 318, 230, 231, 236, 234, 
+  315, 314, 317, 237, 0, 0, 0, 0, 0, 319, 
+  45, 0, 321, 46, 220, 262, 47, 0, 0, 0, 
+  0, 0, 238, 239, 227, 235, 263, 264, 307, 316, 
+  0, 278, 279, 280, 281, 0, 274, 275, 276, 277, 
+  304, 305, 0, 0, 0, 0, 0, 267, 268, 224, 
+  222, 184, 192, 188, 204, 180, 225, 0, 131, 196, 
+  200, 173, 162, 0, 0, 181, 0, 0, 0, 0, 
+  174, 0, 0, 0, 0, 0, 166, 164, 167, 165, 
+  163, 176, 175, 177, 0, 189, 0, 185, 0, 223, 
+  131, 0, 205, 220, 221, 0, 220, 0, 0, 270, 
+  0, 0, 0, 272, 0, 193, 0, 0, 197, 0, 
+  0, 201, 260, 0, 252, 261, 255, 0, 259, 0, 
+  220, 253, 0, 220, 0, 0, 271, 0, 0, 0, 
+  273, 320, 310, 0, 0, 312, 0, 306, 0, 296, 
+  0, 0, 0, 266, 0, 265, 0, 322, 0, 80, 
+  242, 245, 0, 81, 248, 84, 109, 86, 87, 52, 
+  91, 92, 45, 93, 96, 50, 53, 46, 220, 47, 
+  54, 99, 48, 101, 51, 103, 104, 249, 106, 107, 
+  111, 0, 73, 0, 0, 75, 79, 77, 63, 76, 
+  78, 0, 74, 62, 243, 241, 119, 120, 125, 0, 
+  118, 0, 295, 0, 282, 283, 0, 294, 0, 0, 
+  0, 285, 290, 288, 291, 0, 0, 289, 290, 0, 
+  286, 0, 287, 244, 293, 0, 244, 292, 0, 297, 
+  298, 0, 244, 299, 300, 0, 0, 301, 0, 0, 
+  0, 302, 303, 137, 136, 0, 0, 0, 269, 0, 
+  0, 0, 284, 67, 0, 0, 71, 57, 0, 59, 
+  69, 0, 60, 70, 72, 61, 68, 58, 0, 64, 
+  141, 139, 143, 140, 138, 142, 0, 0, 0, 33, 
+  0, 34, 0, 37, 38, 32, 15, 11, 0, 23, 
+  26, 24, 0, 25, 28, 244, 0, 19, 0, 27, 
+  22, 81, 248, 84, 109, 86, 87, 52, 91, 92, 
+  45, 93, 96, 50, 53, 46, 220, 47, 54, 99, 
+  48, 101, 51, 103, 104, 249, 106, 107, 111, 49, 
+  0, 12, 0, 18, 13, 20, 21, 257, 250, 0, 
+  258, 254, 0, 256, 246, 0, 247, 251, 323};
 
 const int JavaScriptGrammar::goto_default [] = {
-  6, 5, 13, 1, 4, 3, 28, 30, 29, 533, 
-  15, 31, 530, 531, 389, 513, 230, 234, 263, 53, 
-  61, 494, 492, 387, 386, 44, 493, 385, 388, 139, 
-  57, 52, 177, 59, 48, 176, 54, 60, 89, 58, 
-  43, 63, 62, 300, 50, 294, 45, 290, 47, 292, 
-  46, 291, 55, 298, 56, 299, 49, 293, 289, 330, 
-  442, 295, 296, 225, 229, 231, 235, 236, 227, 226, 
-  238, 264, 237, 242, 261, 262, 228, 391, 390, 32, 
-  543, 542, 352, 353, 545, 355, 544, 354, 450, 454, 
-  457, 453, 452, 472, 473, 219, 233, 215, 218, 232, 
-  240, 239, 0};
+  6, 5, 19, 1, 4, 3, 32, 34, 33, 570, 
+  22, 18, 538, 539, 231, 226, 230, 232, 229, 236, 
+  517, 235, 264, 57, 65, 495, 494, 388, 387, 48, 
+  386, 389, 140, 61, 56, 178, 63, 52, 177, 58, 
+  64, 90, 62, 47, 67, 66, 301, 54, 295, 49, 
+  291, 51, 293, 50, 292, 59, 299, 60, 300, 53, 
+  294, 290, 331, 443, 296, 297, 390, 237, 228, 227, 
+  239, 265, 238, 243, 262, 263, 392, 391, 36, 579, 
+  578, 353, 354, 581, 356, 580, 355, 451, 455, 458, 
+  454, 453, 473, 474, 220, 234, 216, 219, 233, 241, 
+  240, 0};
 
 const int JavaScriptGrammar::action_index [] = {
-  -23, -91, 10, -91, -19, 50, 77, 56, -91, -91, 
-  -91, 67, -91, -91, 383, -91, -91, -91, -91, -4, 
-  213, 20, 186, -91, -91, -91, -18, -91, -91, -91, 
-  370, 129, 203, -91, 204, -91, -91, -91, -17, 192, 
-  -91, 693, -91, 87, -91, 42, 9, -20, 191, -91, 
-  310, 140, -91, -91, 534, 17, 114, 160, 125, -91, 
-  -91, -91, 344, 162, 693, -91, -91, -91, 157, -91, 
-  1191, 34, 693, 693, 693, 613, 693, -91, -91, 693, 
-  693, -91, -91, -91, -91, 693, -91, 693, 693, -91, 
-  693, 693, 119, 227, -91, -91, 693, 693, 693, -91, 
-  -91, -91, 193, 693, 310, 693, 693, 693, 693, 446, 
-  693, 693, 693, 693, 693, 693, 237, 693, 693, 693, 
-  88, 106, 107, 237, 237, 166, 237, 237, 354, 372, 
-  334, 693, -11, 693, 19, 1104, 693, 693, -91, -91, 
+  8, -91, 14, -91, -15, 296, 67, 94, -91, -91, 
+  -91, -91, -91, -91, -91, -91, -91, -91, 109, -91, 
+  184, 408, -91, -91, -91, -91, 45, 125, 170, -91, 
+  46, -91, -91, -91, 429, 171, 130, -91, 120, -91, 
+  -91, -91, -19, 169, -91, 733, -91, 72, -91, 22, 
+  -26, -59, 173, -91, 278, 174, -91, -91, 574, 51, 
+  112, 183, 177, -91, -91, -91, 412, 214, 733, -91, 
+  -91, -91, 161, 1566, 980, 733, 733, 733, 653, 733, 
+  -91, -91, 733, 733, -91, -91, 733, -91, 733, 733, 
+  -91, 733, 733, 98, 235, -91, -91, 733, 733, 733, 
+  -91, -91, -91, 230, 733, 276, 733, 733, 733, 733, 
+  396, 733, 733, 733, 733, 733, 733, 288, 733, 733, 
+  733, 88, 87, 74, 288, 288, 288, 218, 221, 486, 
+  372, 362, 733, 4, 733, 76, 1479, 733, 733, -91, 
   -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, 
   -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, 
   -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, 
-  -91, -91, 98, 693, -91, -91, 0, -43, -91, 693, 
-  -91, -91, -91, -91, 693, -91, -91, -91, -91, -91, 
-  -91, -91, -91, -91, -91, -91, -91, -91, 693, 6, 
-  693, 693, -2, 82, 693, -91, 1104, 693, 693, -91, 
-  96, -91, 8, -91, -91, 61, -91, 147, 80, 33, 
-  -91, 154, -91, 63, 1452, -91, -91, -91, -91, -91, 
-  169, -91, -91, 23, -91, -91, -91, -91, -91, -91, 
-  1452, -91, -91, 285, 287, 68, 1365, 55, 112, 79, 
-  46, 1626, 66, 693, -91, 65, 47, 693, 52, 58, 
-  59, -91, -91, -91, -91, -91, -91, -91, -91, 64, 
-  -91, -91, -91, -91, 73, -91, -91, -91, -91, -91, 
-  -91, -5, 45, 693, 137, 81, -91, -91, 1017, -91, 
-  69, 28, 14, -91, 240, 76, 53, 476, 171, 120, 
-  308, 237, 180, 693, 264, 693, 693, 693, 693, 298, 
-  693, 693, 693, 693, 693, 230, 237, 237, 237, 237, 
-  288, 268, 378, 693, -68, 693, 12, 693, -91, 445, 
-  693, -91, 693, 7, -47, 693, -44, 1365, -91, 693, 
-  100, 1365, -91, 693, -25, 693, 693, 22, 15, 693, 
-  -91, -8, 108, -13, -91, -91, 693, -91, 178, 693, 
-  -91, -60, 693, -58, 1365, -91, 693, 99, 1365, -91, 
-  -33, 199, -53, -27, 1452, -26, -91, 1365, -91, 693, 
-  95, 1365, 32, 1365, -91, 43, 41, 4, -91, -91, 
-  1365, 5, 232, 54, 275, 70, 693, 1365, 49, 27, 
-  252, 48, 30, 613, 40, 39, -91, 777, -91, 25, 
-  -1, 26, 693, 24, -3, 693, 21, 693, 1, 2, 
-  693, -91, 1278, 37, -91, -91, -91, -91, -91, -91, 
-  693, -91, -91, -91, -91, 156, -91, 693, -21, -91, 
-  1365, -91, 60, -91, -91, 1365, -91, 693, 102, 3, 
-  -91, 29, -91, 35, 101, 693, -91, 36, 38, -91, 
-  -30, -91, 1365, -91, 94, 1365, -91, 176, -91, -91, 
-  143, 1365, 44, -91, 16, -6, -91, 207, -9, -29, 
-  -91, -91, -91, -91, 693, 90, 1365, -91, 693, 91, 
-  1365, -91, 111, 13, 857, -91, 18, -91, 937, -91, 
-  -91, -91, -91, -91, 105, -91, -91, -91, -91, -91, 
-  -91, -91, -33, -24, 215, -91, 693, -91, 187, -91, 
-  -91, -91, -91, -91, 1539, 174, -91, 133, 104, -91, 
-  62, -91, -91, 97, -91, 51, -91, -91, -91, -91, 
-  -91, 57, -91, 173, -91, -91, 693, -91, -91, 151, 
-  -91, -91, -91, 
+  -91, -91, -91, 102, 733, -91, -91, 60, 3, -91, 
+  733, -91, -91, -91, -91, 733, -91, -91, -91, -91, 
+  -91, -91, -91, -91, -91, -91, -91, -91, -91, 733, 
+  -6, 733, 733, 30, 32, 733, -91, 1479, 733, 733, 
+  -91, 107, -91, -14, -91, -91, 69, -91, 191, 49, 
+  18, -91, 233, -91, 47, 1827, -91, -91, -91, -91, 
+  -91, 204, -91, -91, 39, -91, -91, -91, -91, -91, 
+  -91, 1827, -91, -91, 322, 281, 103, 1740, 50, 203, 
+  77, 40, 2001, 53, 733, -91, 52, 29, 733, 25, 
+  28, 35, -91, -91, -91, -91, -91, -91, -91, -91, 
+  113, -91, -91, -91, -91, 106, -91, -91, -91, -91, 
+  -91, -91, 15, 68, 733, 135, 119, -91, -91, 897, 
+  -91, 82, 58, 17, -91, 261, 84, 42, 494, 91, 
+  79, 304, 288, 208, 733, 245, 733, 733, 733, 733, 
+  418, 733, 733, 733, 733, 733, 288, 288, 288, 288, 
+  288, 343, 336, 279, 733, -57, 733, 19, 733, -91, 
+  574, 733, -91, 733, -7, -30, 733, -60, 1740, -91, 
+  733, 111, 1740, -91, 733, 2, 733, 733, 43, 37, 
+  733, -91, 34, 118, 23, -91, -91, 733, -91, 238, 
+  733, -91, -5, 733, -17, 1740, -91, 733, 133, 1740, 
+  -91, -9, 194, -32, -8, 1827, -25, -91, 1740, -91, 
+  733, 100, 1740, 21, 1740, -91, 31, 26, -20, -91, 
+  -91, 1740, -38, 283, 41, 291, 85, 733, 1740, -1, 
+  -34, 252, 54, -27, 653, 9, 5, -91, 817, -91, 
+  6, -21, 7, 733, 11, -28, 733, 1, 733, -33, 
+  -10, 733, -91, 1653, 33, -91, -91, -91, -91, -91, 
+  -91, 733, -91, -91, -91, -91, 172, -91, 733, -24, 
+  -91, 1740, -91, 73, -91, -91, 1740, -91, 733, 93, 
+  0, -91, 24, -91, 36, 122, 733, -91, 44, 48, 
+  -91, -3, -91, 1740, -91, 110, 1740, -91, 192, -91, 
+  -91, 124, 1740, 27, -91, -12, -29, -91, 155, -53, 
+  -22, -91, -91, -91, -91, 733, 123, 1740, -91, 733, 
+  92, 1740, -91, -91, 105, 1229, -91, -91, 1146, -91, 
+  -91, 1063, -91, -91, -91, -91, -91, -91, 90, -91, 
+  -91, -91, -91, -91, -91, -91, 71, 70, 222, -91, 
+  733, -91, 164, -91, -91, -91, -91, -91, 1392, -91, 
+  -91, -91, 268, -91, -91, 1914, 1312, -91, 75, -91, 
+  -91, 350, 55, 303, 108, 733, 1740, 59, 38, 242, 
+  62, 40, 527, 63, 81, -91, 817, -91, 138, 29, 
+  65, 733, 78, 56, 733, 80, 733, 61, 66, 57, 
+  101, -91, 347, -91, -91, -91, -91, 64, -91, 140, 
+  -91, -91, 733, -91, -91, 144, -91, -91, -91, 
 
-  -103, -103, -103, -103, 15, 16, -103, -103, -103, -103, 
-  -103, -103, -103, -103, 208, -103, -103, -103, -103, -103, 
-  -1, -103, -103, -103, -103, -103, -103, -103, -103, -103, 
-  237, -103, 26, -103, 31, -103, -103, -103, -103, -103, 
-  -103, 28, -103, -103, -103, -103, -103, -103, -103, -103, 
-  -103, -103, -103, -103, -46, -103, -103, -103, -103, -103, 
-  -103, -103, -103, -103, 98, -103, -103, -103, 7, -103, 
-  -103, -103, -10, 118, 111, 67, 112, -103, -103, 119, 
-  123, -103, -103, -103, -103, 124, -103, 115, 97, -103, 
-  32, 106, -103, -103, -103, -103, 128, 171, 101, -103, 
-  -103, -103, -103, 156, -103, 157, 159, 81, 131, -103, 
-  127, 136, 145, 139, 102, 91, -103, 59, 50, 72, 
-  -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, 
-  -103, 70, -103, 80, -103, 85, 61, 51, -103, -103, 
-  -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, 
-  -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, 
-  -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, 
-  -103, -103, -103, 54, -103, -103, -103, -103, -103, -24, 
-  -103, -103, -103, -103, -23, -103, -103, -103, -103, -103, 
-  -103, -103, -103, -103, -103, -103, -103, -103, 134, -103, 
-  138, 17, -103, -103, 23, -103, 255, -4, 73, -103, 
-  -103, -103, -103, -103, -103, -103, -103, 11, -103, -103, 
-  -103, 8, -103, -103, 9, -103, -103, -103, -103, -103, 
-  -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, 
-  77, -103, -103, 10, 2, -103, 5, -103, -3, -103, 
-  -103, -103, -103, 19, -103, -103, -103, 27, -31, -103, 
-  -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, 
-  -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, 
-  -103, -103, -103, -5, -103, -103, -103, -103, 105, -103, 
-  -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, 
-  -103, -103, 34, 205, -103, 193, 169, 181, 201, -103, 
-  147, 66, 78, 79, 89, -103, -103, -103, -103, -103, 
-  -103, -103, -103, 202, -103, 192, -103, 212, -103, -103, 
-  182, -103, 68, -103, -103, 62, -103, 56, -103, 33, 
-  -103, 55, -103, 170, -103, 161, 162, -103, -103, 172, 
-  -103, -103, -103, -103, -103, -103, 211, -103, 69, 71, 
-  -103, -103, 64, -103, 60, -103, 41, -103, 42, -103, 
-  -103, 74, -103, -103, 75, -103, -103, 38, -103, 35, 
-  -103, 36, -103, 44, -103, -103, -103, -103, -103, -103, 
-  52, -103, 45, -103, 43, -103, 65, 46, -103, -103, 
-  40, -103, -103, 146, -103, -103, -103, 49, -103, -103, 
-  -103, -103, 47, -103, -22, 149, -103, 153, -103, -103, 
-  30, -103, 48, -103, -103, -103, -103, -103, -103, -103, 
-  29, -103, -103, -103, -103, -103, -103, 133, -103, -103, 
-  53, -103, -103, -103, -103, 58, -103, 57, -103, -103, 
-  -103, -103, -103, -56, -103, -6, -103, -82, -103, -103, 
-  -103, -103, -77, -103, -103, -68, -103, -103, -103, -103, 
-  -103, -103, -90, -103, -103, -58, -103, -11, -103, -60, 
-  -103, -103, -103, -103, 21, -103, 25, -103, 22, -103, 
-  20, -103, -103, -103, 6, -103, 12, -103, 3, -103, 
-  -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, 
-  -103, -103, -103, -103, -103, -103, 24, -103, -103, -103, 
-  -103, -103, -103, -103, 1, -2, -103, 4, 104, -103, 
-  -103, -103, -103, -103, -103, 18, -103, -103, -103, -103, 
-  -103, -103, -103, -103, -103, -103, 0, -103, -103, 63, 
-  -103, -103, -103};
+  -102, -102, -102, -102, 19, 103, -102, -102, -102, -102, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -4, 249, -102, -102, -102, -102, -102, -7, -102, -102, 
+  -102, -102, -102, -102, 257, -102, -13, -102, -11, -102, 
+  -102, -102, -102, -102, -102, -3, -102, -102, -102, -102, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -44, -102, 
+  -102, -102, -102, -102, -102, -102, -102, -102, 141, -102, 
+  -102, -102, -8, -102, 0, 16, 116, 122, 129, 119, 
+  -102, -102, 90, 64, -102, -102, 94, -102, 91, 86, 
+  -102, 71, 79, -102, -102, -102, -102, 159, 81, 76, 
+  -102, -102, -102, -102, 98, -102, 67, 63, 47, 163, 
+  -102, 160, 115, 104, 105, 127, 133, -102, 151, 144, 
+  130, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -102, -102, 145, -102, 152, -102, 162, 31, 21, -102, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -102, -102, -102, -102, 23, -102, -102, -102, -102, -102, 
+  29, -102, -102, -102, -102, 34, -102, -102, -102, -102, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -102, 89, 
+  -102, 68, 36, -102, -102, 42, -102, 235, 46, 49, 
+  -102, -102, -102, -102, -102, -102, -102, -102, 33, -102, 
+  -102, -102, 26, -102, -102, -18, -102, -102, -102, -102, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -102, 53, -102, -102, 8, 20, -102, -5, -102, 32, 
+  -102, -102, -102, -102, 39, -102, -102, -102, 37, 73, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -102, -102, -102, -102, 40, -102, -102, -102, -102, 97, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -102, -102, -102, 41, 213, -102, 186, 199, 203, 209, 
+  -102, 50, 51, 38, 57, 60, -102, -102, -102, -102, 
+  -102, -102, -102, -102, 212, -102, 174, -102, 166, -102, 
+  -102, 168, -102, 125, -102, -102, 61, -102, 1, -102, 
+  45, -102, -9, -102, 172, -102, 184, 176, -102, -102, 
+  170, -102, -102, -102, -102, -102, -102, 215, -102, 124, 
+  132, -102, -102, 178, -102, -29, -102, 25, -102, 2, 
+  -102, -102, 62, -102, -102, 102, -102, -102, -28, -102, 
+  22, -102, -31, -102, -33, -102, -102, -102, -102, -102, 
+  -102, -34, -102, 17, -102, 18, -102, 111, -20, -102, 
+  -102, 24, -102, -102, 153, -102, -102, -102, 30, -102, 
+  -102, -102, -102, 28, -102, 73, 140, -102, 205, -102, 
+  -102, 5, -102, 44, -102, -102, -102, -102, -102, -102, 
+  -102, 43, -102, -102, -102, -102, -102, -102, 135, -102, 
+  -102, 7, -102, -102, -102, -102, 4, -102, 55, -102, 
+  -102, -102, -102, -102, -25, -102, 48, -102, 9, -102, 
+  -102, -102, -102, -69, -102, -102, -70, -102, -102, -102, 
+  -102, -102, -102, -92, -102, -102, -12, -102, -10, -102, 
+  -1, -102, -102, -102, -102, 11, -102, -40, -102, 14, 
+  -102, -39, -102, -102, -102, -17, -102, -102, 54, -102, 
+  -102, -24, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  3, -102, -102, -102, -102, -102, -102, -102, 267, -102, 
+  -102, -102, 12, -102, -102, -102, 301, -102, -102, -102, 
+  -102, -19, -102, -15, -102, 59, -64, -102, -102, -2, 
+  -102, -102, 142, -102, -102, -102, -14, -102, -102, -102, 
+  -102, 6, -102, 73, 52, -102, 75, -102, -102, -102, 
+  -102, -102, 128, -102, -102, -102, -102, -102, -102, -102, 
+  -102, -102, -6, -102, -102, 58, -102, -102, -102};
 
 const int JavaScriptGrammar::action_info [] = {
-  198, 362, 364, 371, 471, 514, 374, 373, 179, 356, 
-  325, 521, 39, 303, 335, 173, 337, 181, 366, 198, 
-  103, 501, 349, 323, 343, 461, 495, 471, -99, 376, 
-  471, -96, -72, -94, 455, 447, 451, 484, 488, 439, 
-  455, 455, 495, 103, 430, 462, -73, -91, 383, 422, 
-  420, 479, 477, 14, 131, -69, -83, 131, 133, 432, 
-  434, -102, 34, 288, 475, 2, 379, 133, 213, 2, 
-  303, 282, 445, 440, 546, 7, 323, 552, 267, 11, 
-  11, 283, 379, 447, 327, 471, 377, 0, 221, 204, 
-  0, 288, 325, 223, 484, 488, 224, 217, 173, 173, 
-  14, 465, 173, 173, 173, 535, 173, 173, 173, 0, 
-  173, 458, 495, 173, 332, 0, 358, 9, 8, 496, 
-  0, 444, 443, 539, 538, 273, 272, 90, 90, 280, 
-  279, 280, 279, 11, 278, 277, 524, 96, 91, 91, 
-  377, 69, 287, 286, 525, 173, 90, 90, 173, 474, 
-  486, 490, 211, 536, 174, 381, 459, 91, 91, 368, 
-  341, 94, 449, 475, 200, 505, 14, 497, 201, 359, 
-  345, 206, 95, 343, 346, 206, 69, 173, 81, 82, 
-  69, 549, 97, 69, 173, 0, 69, 117, 98, 118, 
-  207, 117, 437, 118, 207, 173, 208, 285, 0, 41, 
-  119, 183, 182, 69, 119, 96, 135, 69, 0, 69, 
-  0, 0, 0, 81, 82, 35, 0, 81, 82, 0, 
-  81, 82, 516, 81, 82, 136, 0, 137, 69, 0, 
-  266, 265, 69, 35, 550, 548, 69, 469, 468, 96, 
-  81, 82, 69, 0, 81, 82, 81, 82, 520, 519, 
-  97, 0, 0, 42, 40, 117, 98, 118, 305, 306, 
-  37, 69, 117, 0, 118, 81, 82, 0, 119, 81, 
-  82, 36, 0, 81, 82, 119, 517, 515, 37, 81, 
-  82, 69, 305, 306, 97, 307, 308, 0, -313, 36, 
-  98, 310, 311, 271, 270, 0, 0, 0, 81, 82, 
-  312, 0, 0, 313, 69, 314, 0, 0, 0, 307, 
-  308, 310, 311, 0, 69, 0, 69, 0, 81, 82, 
-  312, 310, 311, 313, 0, 314, 0, 0, 105, 106, 
-  312, 310, 311, 313, 0, 314, 276, 275, 0, 0, 
-  312, 81, 82, 313, 0, 314, 271, 270, 276, 275, 
-  0, 81, 82, 81, 82, 107, 108, 110, 111, 0, 
-  0, 0, 0, 0, 0, 112, 113, 110, 111, 114, 
-  0, 115, 0, 0, 0, 112, 113, 110, 111, 114, 
-  19, 115, 0, 0, 0, 112, 113, 0, 0, 114, 
-  0, 115, 20, 19, 0, 110, 111, 0, 0, 21, 
-  0, 310, 311, 112, 113, 20, 0, 114, 0, 115, 
-  312, 0, 21, 313, 0, 314, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 522, 0, 0, 0, 25, 
-  0, 0, 0, 0, 0, 0, 22, 26, 23, 0, 
-  0, 0, 25, 0, 27, 0, 0, 0, 185, 22, 
-  26, 0, 0, 18, 0, 24, 0, 27, 186, 0, 
-  0, 0, 187, 0, 0, 0, 18, 0, 24, 110, 
-  111, 188, 0, 189, 0, 0, 0, 112, 113, 185, 
-  0, 114, 0, 115, 190, 0, 191, 94, 0, 186, 
-  0, 0, 0, 187, 192, 0, 0, 193, 95, 0, 
-  0, 0, 188, 194, 189, 0, 0, 339, 0, 195, 
-  0, 0, 0, 0, 0, 190, 0, 191, 94, 0, 
-  0, 0, 0, 0, 196, 192, 0, 0, 193, 95, 
-  0, 0, 0, 0, 194, 0, 0, 185, 0, 0, 
-  195, 0, 0, 0, 0, 0, 0, 186, 0, 0, 
-  0, 187, 0, 0, 0, 196, 0, 0, 0, 0, 
-  188, 0, 189, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 190, 0, 191, 94, 0, 0, 0, 
-  0, 0, 0, 192, 0, 0, 193, 95, 0, 0, 
-  0, 0, 194, 0, 0, 0, 0, 0, 195, 0, 
+  338, 174, 289, 485, 472, 472, -89, 480, -105, 380, 
+  43, 472, -79, -78, -100, 448, -97, 435, -102, 134, 
+  304, 326, 132, 104, 478, 375, 489, 372, 374, 456, 
+  377, 336, 199, 452, 423, 433, 440, 384, 421, 205, 
+  431, 456, 132, 365, 350, 344, 214, 476, -108, 456, 
+  324, 357, 462, 199, 367, 463, 363, 222, 472, 446, 
+  441, -75, -108, 182, 485, 448, -89, 588, 180, -75, 
+  -97, 489, -100, 2, 289, 525, 380, 104, 224, 7, 
+  225, 582, 134, 304, 378, -102, 289, -105, -79, 472, 
+  -65, 283, 328, 344, 268, 326, 2, 485, 174, 518, 
+  174, 174, 489, 333, 284, 218, 324, 372, 174, 572, 
+  174, 38, 91, 498, 91, 174, 0, 466, 174, 174, 
+  0, 0, 0, 92, 20, 92, 359, 91, 91, 346, 
+  475, 174, 459, 347, 445, 444, 576, 575, 92, 92, 
+  95, 174, 21, 174, 476, -78, 281, 280, 585, 39, 
+  509, 96, 491, 450, 12, 9, 8, 573, 175, 12, 
+  382, 499, 201, 212, 281, 280, 202, 279, 278, 281, 
+  280, 342, 174, 12, 274, 273, 45, 460, 528, 360, 
+  288, 287, 174, 487, 12, 0, 20, 207, 136, 97, 
+  12, 13, 16, 369, 41, 286, 13, 16, 207, 39, 
+  174, 586, 584, 0, 21, 40, 208, 137, 438, 138, 
+  13, 16, 174, 12, 0, 0, 0, 208, 0, 209, 
+  12, 13, 16, 12, 0, 524, 523, 13, 16, 520, 
+  46, 44, 12, 0, 98, 184, 183, 12, 0, 118, 
+  99, 119, 97, 118, 41, 119, 118, 97, 119, 0, 
+  13, 16, 120, 470, 469, 40, 120, 13, 16, 120, 
+  13, 16, 12, 306, 307, 267, 266, 12, 0, 13, 
+  16, 12, 0, 0, 13, 16, 174, 0, -319, 306, 
+  307, 12, 0, 521, 519, 0, 0, 98, -319, 0, 
+  308, 309, 98, 99, 106, 107, 106, 107, 99, 13, 
+  16, 21, 311, 312, 13, 16, 308, 309, 13, 16, 
+  12, 313, 12, 118, 314, 119, 315, 0, 13, 16, 
+  12, 108, 109, 108, 109, 12, 120, 311, 312, 267, 
+  266, 0, 12, 0, 0, 0, 313, 0, 0, 314, 
+  0, 315, 277, 276, 272, 271, 0, 13, 16, 13, 
+  16, 12, 277, 276, 0, 15, 0, 13, 16, 311, 
+  312, 0, 13, 16, 277, 276, 311, 312, 313, 13, 
+  16, 314, 0, 315, 0, 313, 12, 0, 314, 12, 
+  315, 14, 0, 272, 271, 111, 112, 0, 13, 16, 
+  0, 0, 0, 113, 114, 111, 112, 115, 0, 116, 
+  0, 0, 0, 113, 114, 0, 15, 115, 0, 116, 
+  0, 272, 271, 13, 16, 0, 13, 16, 26, 111, 
+  112, 0, 0, 0, 0, 0, 0, 113, 114, 0, 
+  27, 115, 14, 116, 0, 111, 112, 12, 0, 26, 
+  0, 311, 312, 113, 114, 0, 0, 115, 0, 116, 
+  313, 27, 0, 314, 0, 315, 0, 0, 12, 0, 
+  0, 0, 0, 29, 0, 0, 0, 15, 0, 0, 
+  0, 0, 0, 0, 28, 30, 0, 0, 0, 0, 
+  0, 0, 31, 0, 526, 0, 0, 0, 15, 0, 
+  0, 25, 0, 14, 0, 28, 30, 186, 0, 0, 
+  0, 0, 0, 31, 0, 0, 0, 187, 0, 111, 
+  112, 188, 25, 0, 14, 0, 0, 113, 114, 0, 
+  189, 115, 190, 116, 0, 340, 0, 0, 0, 0, 
+  0, 0, 0, 191, 0, 192, 95, 0, 0, 69, 
+  70, 0, 0, 193, 0, 0, 194, 96, 0, 72, 
+  0, 0, 195, 0, 0, 0, 12, 0, 196, 0, 
+  73, 74, 0, 75, 0, 0, 0, 0, 0, 0, 
+  78, 0, 0, 197, 81, 0, 0, 186, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 187, 0, 0, 
+  0, 188, 84, 13, 16, 0, 85, 0, 0, 0, 
+  189, 0, 190, 0, 0, 0, 0, 80, 87, 71, 
+  0, 0, 0, 191, 0, 192, 95, 0, 0, 0, 
+  0, 0, 0, 193, 0, 0, 194, 96, 0, 0, 
+  0, 0, 195, 0, 0, 0, 0, 0, 196, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 196, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 65, 66, 0, 0, 0, 
-  0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 
-  0, 0, 69, 0, 0, 0, 70, 71, 0, 72, 
-  0, 0, 0, 0, 0, 0, 75, 0, 0, 0, 
-  78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 83, 81, 
-  82, 0, 84, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 77, 86, 67, 0, 0, 0, 0, 
-  0, 0, 0, 0, 64, 65, 66, 0, 0, 0, 
-  0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 
-  0, 0, 69, 0, 0, 0, 70, 71, 0, 72, 
-  0, 0, 0, 73, 0, 74, 75, 76, 0, 0, 
-  78, 0, 0, 0, 79, 0, 80, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 83, 81, 
-  82, 0, 84, 0, 85, 0, 87, 0, 88, 0, 
-  0, 0, 0, 77, 86, 67, 0, 0, 0, 0, 
-  0, 0, 0, 0, -92, 0, 0, 0, 64, 65, 
-  66, 0, 0, 0, 0, 0, 0, 0, 0, 68, 
-  0, 0, 0, 0, 0, 0, 69, 0, 0, 0, 
-  70, 71, 0, 72, 0, 0, 0, 73, 0, 74, 
-  75, 76, 0, 0, 78, 0, 0, 0, 79, 0, 
-  80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 83, 81, 82, 0, 84, 0, 85, 0, 
-  87, 0, 88, 0, 0, 0, 0, 77, 86, 67, 
-  0, 0, 0, 0, 0, 0, 0, 0, 64, 65, 
-  66, 0, 0, 0, 0, 0, 0, 0, 0, 68, 
-  0, 0, 0, 0, 0, 0, 69, 0, 0, 0, 
-  70, 71, 0, 72, 0, 0, 0, 73, 0, 74, 
-  75, 76, 0, 0, 78, 0, 0, 0, 79, 0, 
-  80, 0, 0, 503, 0, 0, 0, 0, 0, 0, 
-  0, 0, 83, 81, 82, 0, 84, 0, 85, 0, 
-  87, 0, 88, 0, 0, 0, 0, 77, 86, 67, 
-  0, 0, 0, 0, 0, 0, 0, 0, 64, 65, 
-  66, 0, 0, 0, 0, 0, 0, 0, 0, 68, 
-  0, 0, 0, 0, 0, 0, 69, 0, 0, 0, 
-  70, 71, 0, 72, 0, 0, 0, 73, 0, 74, 
-  75, 76, 0, 0, 78, 0, 0, 0, 79, 0, 
-  80, 0, 0, 500, 0, 0, 0, 0, 0, 0, 
-  0, 0, 83, 81, 82, 0, 84, 0, 85, 0, 
-  87, 0, 88, 0, 0, 0, 0, 77, 86, 67, 
-  0, 0, 0, 0, 0, 0, 0, 0, 64, 65, 
-  66, 0, 0, 0, 0, 0, 0, 0, 0, 68, 
-  0, 0, 0, 0, 0, 0, 69, 0, 0, 0, 
-  70, 71, 0, 72, 0, 0, 0, 73, 0, 74, 
-  75, 76, 0, 0, 78, 0, 0, 0, 79, 0, 
-  80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 83, 81, 82, 0, 84, 0, 85, 0, 
-  87, 302, 88, 0, 0, 0, 0, 77, 86, 67, 
-  0, 0, 0, 0, 0, 0, 0, 0, 141, 142, 
-  143, 0, 0, 145, 147, 148, 0, 0, 149, 0, 
-  150, 0, 0, 0, 152, 153, 154, 0, 0, 0, 
-  0, 0, 0, 69, 155, 156, 157, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 158, 0, 0, 
+  0, 0, 0, 197, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 69, 70, 0, 0, 0, 
+  0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 
+  0, 0, 12, 0, 0, 0, 73, 74, 0, 75, 
+  0, 0, 0, 0, 0, 0, 78, 0, 0, 0, 
+  81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 84, 13, 
+  16, 0, 85, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 80, 87, 71, 0, 0, 0, 0, 
+  0, 0, 0, 0, 68, 69, 70, 0, 0, 0, 
+  0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 
+  0, 0, 12, 0, 0, 0, 73, 74, 0, 75, 
+  0, 0, 0, 76, 0, 77, 78, 79, 0, 0, 
+  81, 0, 0, 0, 82, 0, 83, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 84, 13, 
+  16, 0, 85, 0, 86, 0, 88, 0, 89, 0, 
+  0, 0, 0, 80, 87, 71, 0, 0, 0, 0, 
+  0, 0, 0, 0, -98, 0, 0, 0, 68, 69, 
+  70, 0, 0, 0, 0, 0, 0, 0, 0, 72, 
+  0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 
+  73, 74, 0, 75, 0, 0, 0, 76, 0, 77, 
+  78, 79, 0, 0, 81, 0, 0, 0, 82, 0, 
+  83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 84, 13, 16, 0, 85, 0, 86, 0, 
+  88, 0, 89, 0, 0, 0, 0, 80, 87, 71, 
+  0, 0, 0, 0, 0, 0, 0, 0, 68, 69, 
+  70, 0, 0, 0, 0, 0, 0, 0, 0, 72, 
+  0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 
+  73, 74, 0, 75, 0, 0, 0, 76, 0, 77, 
+  78, 79, 0, 0, 81, 0, 0, 0, 82, 0, 
+  83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 84, 13, 16, 0, 85, 0, 86, 0, 
+  88, 303, 89, 0, 0, 0, 0, 80, 87, 71, 
+  0, 0, 0, 0, 0, 0, 0, 0, 496, 0, 
+  0, 68, 69, 70, 0, 0, 0, 0, 0, 0, 
+  0, 0, 72, 0, 0, 0, 0, 0, 0, 12, 
+  0, 0, 0, 73, 74, 0, 75, 0, 0, 0, 
+  76, 0, 77, 78, 79, 0, 0, 81, 0, 0, 
+  0, 82, 0, 83, 0, 0, 497, 0, 0, 0, 
+  0, 0, 0, 0, 0, 84, 13, 16, 0, 85, 
+  0, 86, 0, 88, 0, 89, 0, 0, 0, 0, 
+  80, 87, 71, 0, 0, 0, 0, 0, 0, 0, 
+  0, 504, 0, 0, 68, 69, 70, 0, 0, 0, 
+  0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 
+  0, 0, 12, 0, 0, 0, 73, 74, 0, 75, 
+  0, 0, 0, 76, 0, 77, 78, 79, 0, 0, 
+  81, 0, 0, 0, 82, 0, 83, 0, 0, 505, 
+  0, 0, 0, 0, 0, 0, 0, 0, 84, 13, 
+  16, 0, 85, 0, 86, 0, 88, 0, 89, 0, 
+  0, 0, 0, 80, 87, 71, 0, 0, 0, 0, 
+  0, 0, 0, 0, 496, 0, 0, 68, 69, 70, 
+  0, 0, 0, 0, 0, 0, 0, 0, 72, 0, 
+  0, 0, 0, 0, 0, 12, 0, 0, 0, 73, 
+  74, 0, 75, 0, 0, 0, 76, 0, 77, 78, 
+  79, 0, 0, 81, 0, 0, 0, 82, 0, 83, 
+  0, 0, 502, 0, 0, 0, 0, 0, 0, 0, 
+  0, 84, 13, 16, 0, 85, 0, 86, 0, 88, 
+  0, 89, 0, 0, 0, 0, 80, 87, 71, 0, 
+  0, 0, 0, 0, 0, 0, 0, 504, 0, 0, 
+  68, 69, 70, 0, 0, 0, 0, 0, 0, 0, 
+  0, 72, 0, 0, 0, 0, 0, 0, 12, 0, 
+  0, 0, 73, 74, 0, 75, 0, 0, 0, 76, 
+  0, 77, 78, 79, 0, 0, 81, 0, 0, 0, 
+  82, 0, 83, 0, 0, 507, 0, 0, 0, 0, 
+  0, 0, 0, 0, 84, 13, 16, 0, 85, 0, 
+  86, 0, 88, 0, 89, 0, 0, 0, 0, 80, 
+  87, 71, 0, 0, 0, 0, 0, 0, 0, 0, 
+  496, 0, 0, 68, 69, 70, 0, 0, 0, 0, 
+  0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 
+  0, 12, 0, 0, 0, 73, 74, 0, 75, 0, 
+  0, 0, 76, 0, 77, 78, 79, 0, 0, 81, 
+  0, 0, 0, 82, 0, 83, 0, 0, 497, 0, 
+  0, 15, 0, 0, 0, 0, 0, 84, 13, 16, 
+  0, 85, 0, 86, 0, 88, 0, 89, 0, 0, 
+  0, 0, 80, 87, 71, 0, 0, 14, 0, 0, 
+  0, 0, 0, 68, 69, 70, 0, 0, 0, 0, 
+  0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 
+  0, 12, 251, 0, 0, 535, 536, 0, 75, 0, 
+  0, 0, 76, 0, 77, 78, 79, 0, 0, 81, 
+  0, 0, 0, 82, 0, 83, 0, 0, 0, 0, 
+  0, 0, 0, 255, 0, 0, 0, 84, 13, 16, 
+  0, 85, 0, 86, 0, 88, 0, 89, 0, 0, 
+  0, 0, 80, 87, 71, 0, 246, 0, 537, 0, 
+  0, 0, 0, 142, 143, 144, 0, 0, 146, 148, 
+  149, 0, 0, 150, 0, 151, 0, 0, 0, 153, 
+  154, 155, 0, 0, 0, 0, 0, 0, 12, 156, 
+  157, 158, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 159, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 162, 0, 
+  0, 0, 0, 0, 0, 13, 16, 163, 164, 165, 
+  0, 167, 168, 169, 170, 171, 172, 0, 0, 160, 
+  166, 152, 145, 147, 161, 0, 0, 0, 0, 0, 
+  142, 143, 144, 0, 0, 146, 148, 149, 0, 0, 
+  150, 0, 151, 0, 0, 0, 153, 154, 155, 0, 
+  0, 0, 0, 0, 0, 425, 156, 157, 158, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 159, 
+  0, 0, 0, 426, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 162, 0, 0, 0, 0, 
+  0, 430, 427, 429, 163, 164, 165, 0, 167, 168, 
+  169, 170, 171, 172, 0, 0, 160, 166, 152, 145, 
+  147, 161, 0, 0, 0, 0, 0, 142, 143, 144, 
+  0, 0, 146, 148, 149, 0, 0, 150, 0, 151, 
+  0, 0, 0, 153, 154, 155, 0, 0, 0, 0, 
+  0, 0, 425, 156, 157, 158, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 159, 0, 0, 0, 
+  426, 0, 0, 0, 0, 0, 0, 0, 428, 0, 
+  0, 0, 162, 0, 0, 0, 0, 0, 430, 427, 
+  429, 163, 164, 165, 0, 167, 168, 169, 170, 171, 
+  172, 0, 0, 160, 166, 152, 145, 147, 161, 0, 
+  0, 0, 0, 0, 244, 0, 0, 0, 0, 245, 
+  0, 68, 69, 70, 247, 0, 0, 0, 0, 0, 
+  0, 248, 72, 0, 0, 0, 0, 0, 0, 250, 
+  251, 0, 0, 252, 74, 0, 75, 0, 0, 0, 
+  76, 0, 77, 78, 79, 0, 0, 81, 0, 0, 
+  0, 82, 0, 83, 0, 0, 0, 0, 0, 254, 
+  0, 255, 0, 0, 0, 84, 253, 256, 257, 85, 
+  258, 86, 259, 88, 31, 89, 260, 261, 0, 0, 
+  80, 87, 71, 25, 246, 0, 0, 0, 0, 0, 
+  0, 244, 0, 0, 0, 0, 245, 0, 68, 69, 
+  70, 247, 0, 0, 0, 0, 0, 0, 248, 249, 
+  0, 0, 0, 0, 0, 0, 250, 251, 0, 0, 
+  252, 74, 0, 75, 0, 0, 0, 76, 0, 77, 
+  78, 79, 0, 0, 81, 0, 0, 0, 82, 0, 
+  83, 0, 0, 0, 0, 0, 254, 0, 255, 0, 
+  0, 0, 84, 253, 256, 257, 85, 258, 86, 259, 
+  88, 31, 89, 260, 261, 0, 0, 80, 87, 71, 
+  25, 246, 0, 0, 0, 0, 0, 0, 541, 143, 
+  144, 0, 0, 543, 148, 545, 69, 70, 546, 0, 
+  151, 0, 0, 0, 153, 548, 549, 0, 0, 0, 
+  0, 0, 0, 550, 551, 157, 158, 252, 74, 0, 
+  75, 0, 0, 0, 76, 0, 77, 552, 79, 0, 
+  0, 554, 0, 0, 0, 82, 0, 83, 0, 0, 
+  0, 0, 0, 556, 0, 255, 0, 0, 0, 558, 
+  555, 557, 559, 560, 561, 86, 563, 564, 565, 566, 
+  567, 568, 0, 0, 553, 562, 547, 542, 544, 161, 
+  0, 0, 0, 0, 0, 393, 143, 144, 0, 0, 
+  395, 148, 397, 69, 70, 398, 0, 151, 0, 0, 
+  0, 153, 400, 401, 0, 0, 0, 0, 0, 0, 
+  402, 403, 157, 158, 252, 74, 0, 75, 0, 0, 
+  0, 76, 0, 77, 404, 79, 0, 0, 406, 0, 
+  0, 0, 82, 0, 83, 0, -244, 0, 0, 0, 
+  408, 0, 255, 0, 0, 0, 410, 407, 409, 411, 
+  412, 413, 86, 415, 416, 417, 418, 419, 420, 0, 
+  0, 405, 414, 399, 394, 396, 161, 0, 0, 0, 
+  0, 0, 
+
+  334, 477, 282, 482, 270, 503, 467, 464, 275, 42, 
+  577, 55, 506, 479, 481, 217, 516, 522, 185, 23, 
+  468, 217, 540, 583, 10, 486, 488, 492, 490, 493, 
+  508, 270, 434, 385, 422, 383, 381, 366, 379, 368, 
+  270, 275, 468, 275, 334, 173, 282, 217, 242, 223, 
+  179, 468, 176, 334, 285, 371, 221, 343, 181, 341, 
+  211, 282, 465, 198, 352, 204, 457, 339, 370, 449, 
+  447, 206, 432, 442, 424, 334, 0, 93, 179, 501, 
+  0, 577, 318, 500, 213, 221, 93, 0, 471, 93, 
+  93, 93, 130, 483, 316, 317, 93, 461, 93, 93, 
+  215, 319, 93, 93, 320, 514, 93, 93, 129, 17, 
+  93, 0, 110, 94, 93, 93, 484, 102, 93, 242, 
+  93, 103, 101, 203, 337, 93, 11, 484, 93, 93, 
+  93, 513, 483, 93, 574, 515, 298, 93, 587, 334, 
+  0, 302, 200, 93, 93, 105, 334, 352, 125, 126, 
+  93, 11, 215, 269, 93, 93, 373, 510, 93, 124, 
+  512, 93, 436, 511, 179, 437, 93, 0, 242, 93, 
+  439, 127, 93, 123, 0, 436, 0, 128, 437, 93, 
+  93, 483, 215, 93, 93, 139, 436, 122, 335, 437, 
+  93, 93, 334, 141, 121, 362, 133, 376, 93, 93, 
+  100, 135, 93, 0, 117, 330, 361, 330, 131, 330, 
+  302, 93, 302, 93, 302, 330, 302, 0, 302, 0, 
+  302, 0, 0, 93, 327, 93, 345, 329, 302, 332, 
+  302, 351, 310, 0, 0, 0, 0, 349, 93, 0, 
+  348, 364, 93, 302, 93, 321, 484, 302, 93, 322, 
+  0, 93, 93, 302, 330, 323, 302, 302, 139, 302, 
+  35, 305, 0, 0, 325, 527, 141, 210, 35, 0, 
+  24, 37, 11, 0, 0, 0, 358, 0, 24, 37, 
+  11, 532, 529, 531, 533, 530, 534, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 161, 0, 0, 0, 0, 0, 0, 
-  81, 82, 162, 163, 164, 0, 166, 167, 168, 169, 
-  170, 171, 0, 0, 159, 165, 151, 144, 146, 160, 
-  0, 0, 0, 0, 0, 141, 142, 143, 0, 0, 
-  145, 147, 148, 0, 0, 149, 0, 150, 0, 0, 
-  0, 152, 153, 154, 0, 0, 0, 0, 0, 0, 
-  424, 155, 156, 157, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 158, 0, 0, 0, 425, 0, 
+  0, 0, 0, 0, 0, 0, 0, 571, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  161, 0, 0, 0, 0, 0, 429, 426, 428, 162, 
-  163, 164, 0, 166, 167, 168, 169, 170, 171, 0, 
-  0, 159, 165, 151, 144, 146, 160, 0, 0, 0, 
-  0, 0, 141, 142, 143, 0, 0, 145, 147, 148, 
-  0, 0, 149, 0, 150, 0, 0, 0, 152, 153, 
-  154, 0, 0, 0, 0, 0, 0, 424, 155, 156, 
-  157, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 158, 0, 0, 0, 425, 0, 0, 0, 0, 
-  0, 0, 0, 427, 0, 0, 0, 161, 0, 0, 
-  0, 0, 0, 429, 426, 428, 162, 163, 164, 0, 
-  166, 167, 168, 169, 170, 171, 0, 0, 159, 165, 
-  151, 144, 146, 160, 0, 0, 0, 0, 0, 243, 
-  0, 0, 0, 0, 244, 0, 64, 65, 66, 246, 
-  0, 0, 0, 0, 0, 0, 247, 68, 0, 0, 
-  0, 0, 0, 0, 249, 250, 0, 0, 251, 71, 
-  0, 72, 0, 0, 0, 73, 0, 74, 75, 76, 
-  0, 0, 78, 0, 0, 0, 79, 0, 80, 0, 
-  0, 0, 0, 0, 253, 0, 254, 0, 0, 0, 
-  83, 252, 255, 256, 84, 257, 85, 258, 87, 27, 
-  88, 259, 260, 0, 0, 77, 86, 67, 18, 245, 
-  0, 0, 0, 0, 0, 0, 243, 0, 0, 0, 
-  0, 244, 0, 64, 65, 66, 246, 0, 0, 0, 
-  0, 0, 0, 247, 248, 0, 0, 0, 0, 0, 
-  0, 249, 250, 0, 0, 251, 71, 0, 72, 0, 
-  0, 0, 73, 0, 74, 75, 76, 0, 0, 78, 
-  0, 0, 0, 79, 0, 80, 0, 0, 0, 0, 
-  0, 253, 0, 254, 0, 0, 0, 83, 252, 255, 
-  256, 84, 257, 85, 258, 87, 27, 88, 259, 260, 
-  0, 0, 77, 86, 67, 18, 245, 0, 0, 0, 
-  0, 0, 0, 243, 0, 0, 0, 0, 244, 0, 
-  64, 65, 66, 246, 0, 0, 0, 0, 0, 0, 
-  247, 68, 0, 0, 0, 0, 0, 0, 527, 250, 
-  0, 0, 251, 528, 0, 72, 0, 0, 0, 73, 
-  0, 74, 75, 76, 0, 0, 78, 0, 0, 0, 
-  79, 0, 80, 0, 0, 0, 0, 0, 253, 0, 
-  254, 0, 0, 0, 83, 252, 255, 256, 84, 257, 
-  85, 258, 87, 27, 88, 259, 260, 0, 0, 77, 
-  86, 67, 18, 245, 0, 529, 0, 0, 0, 0, 
-  392, 142, 143, 0, 0, 394, 147, 396, 65, 66, 
-  397, 0, 150, 0, 0, 0, 152, 399, 400, 0, 
-  0, 0, 0, 0, 0, 401, 402, 156, 157, 251, 
-  71, 0, 72, 0, 0, 0, 73, 0, 74, 403, 
-  76, 0, 0, 405, 0, 0, 0, 79, 0, 80, 
-  0, -238, 0, 0, 0, 407, 0, 254, 0, 0, 
-  0, 409, 406, 408, 410, 411, 412, 85, 414, 415, 
-  416, 417, 418, 419, 0, 0, 404, 413, 398, 393, 
-  395, 160, 0, 0, 0, 0, 0, 
-
-  463, 180, 197, 480, 476, 481, 504, 460, 478, 466, 
-  464, 284, 210, 184, 532, 526, 370, 540, 512, 281, 
-  10, 274, 12, 241, 537, 547, 216, 222, 499, 269, 
-  220, 502, 470, 498, 491, 333, 456, 485, 489, 487, 
-  518, 470, 203, 467, 51, 541, 38, 0, 205, 340, 
-  382, 380, 378, 351, 431, 421, 369, 367, 384, 216, 
-  281, 0, 274, 467, 269, 333, 433, 441, 92, 342, 
-  338, 93, 446, 448, 365, 423, 178, 172, 333, 175, 
-  333, 0, 541, 0, 333, 0, 92, 333, 351, 241, 
-  121, 241, 0, 220, 0, 92, 0, 435, 178, 120, 
-  436, 92, 92, 214, 138, 212, 92, 316, 92, 0, 
-  534, 0, 122, 140, 92, 92, 92, 92, 132, 317, 
-  318, 0, 336, 129, 363, 92, 134, 92, 334, 0, 
-  319, 361, 127, 92, 92, 483, 214, 92, 92, 101, 
-  0, 297, 92, 126, 551, 102, 301, 92, 92, 507, 
-  508, 92, 360, 482, 92, 92, 506, 509, 178, 92, 
-  92, 510, 511, 92, 92, 438, 99, 92, 116, 372, 
-  92, 375, 92, 130, 92, 92, 435, 123, 268, 436, 
-  125, 92, 0, 92, 199, 92, 124, 482, 315, 92, 
-  202, 483, 92, 92, 0, 92, 0, 92, 329, 109, 
-  104, 128, 301, 301, 0, 92, 92, 92, 329, 100, 
-  301, 301, 320, 301, 347, 0, 0, 92, 329, 0, 
-  348, 344, 301, 301, 321, 16, 33, 17, 92, 92, 
-  350, 0, 0, 301, 301, 0, 309, 92, 92, 326, 
-  331, 92, 301, 301, 322, 523, 301, 329, 329, 0, 
-  304, 324, 301, 301, 16, 33, 17, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 357, 
-  328, 0, 0, 0, 138, 0, 0, 0, 0, 0, 
-  0, 0, 0, 140, 209, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 569, 0, 0, 0, 0, 0, 
+  493, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0};
+  0, 0, 0};
 
 const int JavaScriptGrammar::action_check [] = {
-  2, 61, 60, 36, 33, 29, 33, 60, 8, 17, 
-  78, 29, 29, 1, 61, 8, 60, 60, 31, 2, 
-  1, 8, 7, 48, 2, 55, 8, 33, 7, 55, 
-  33, 7, 7, 7, 5, 36, 33, 36, 36, 60, 
-  5, 5, 8, 1, 7, 7, 7, 7, 16, 8, 
-  7, 60, 36, 33, 48, 7, 7, 48, 78, 55, 
-  55, 7, 66, 36, 20, 88, 36, 78, 60, 88, 
-  1, 76, 7, 7, 17, 65, 48, 0, 55, 29, 
-  29, 36, 36, 36, 8, 33, 7, -1, 8, 7, 
-  -1, 36, 78, 60, 36, 36, 33, 36, 8, 8, 
-  33, 7, 8, 8, 8, 8, 8, 8, 8, -1, 
-  8, 10, 8, 8, 61, -1, 8, 61, 62, 8, 
-  -1, 61, 62, 61, 62, 61, 62, 40, 40, 61, 
-  62, 61, 62, 29, 61, 62, 7, 12, 51, 51, 
-  7, 29, 61, 62, 15, 8, 40, 40, 8, 6, 
-  60, 60, 56, 56, 56, 60, 55, 51, 51, 60, 
-  60, 42, 60, 20, 50, 60, 33, 56, 54, 61, 
-  50, 15, 53, 2, 54, 15, 29, 8, 66, 67, 
-  29, 8, 57, 29, 8, -1, 29, 25, 63, 27, 
-  34, 25, 36, 27, 34, 8, 36, 60, -1, 7, 
-  38, 61, 62, 29, 38, 12, 15, 29, -1, 29, 
-  -1, -1, -1, 66, 67, 29, -1, 66, 67, -1, 
-  66, 67, 7, 66, 67, 34, -1, 36, 29, -1, 
-  61, 62, 29, 29, 61, 62, 29, 61, 62, 12, 
-  66, 67, 29, -1, 66, 67, 66, 67, 61, 62, 
-  57, -1, -1, 61, 62, 25, 63, 27, 18, 19, 
-  74, 29, 25, -1, 27, 66, 67, -1, 38, 66, 
-  67, 85, -1, 66, 67, 38, 61, 62, 74, 66, 
-  67, 29, 18, 19, 57, 45, 46, -1, 36, 85, 
-  63, 23, 24, 61, 62, -1, -1, -1, 66, 67, 
-  32, -1, -1, 35, 29, 37, -1, -1, -1, 45, 
-  46, 23, 24, -1, 29, -1, 29, -1, 66, 67, 
-  32, 23, 24, 35, -1, 37, -1, -1, 18, 19, 
-  32, 23, 24, 35, -1, 37, 61, 62, -1, -1, 
-  32, 66, 67, 35, -1, 37, 61, 62, 61, 62, 
-  -1, 66, 67, 66, 67, 45, 46, 23, 24, -1, 
-  -1, -1, -1, -1, -1, 31, 32, 23, 24, 35, 
-  -1, 37, -1, -1, -1, 31, 32, 23, 24, 35, 
-  10, 37, -1, -1, -1, 31, 32, -1, -1, 35, 
-  -1, 37, 22, 10, -1, 23, 24, -1, -1, 29, 
-  -1, 23, 24, 31, 32, 22, -1, 35, -1, 37, 
-  32, -1, 29, 35, -1, 37, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 55, -1, -1, -1, 59, 
-  -1, -1, -1, -1, -1, -1, 66, 67, 55, -1, 
-  -1, -1, 59, -1, 74, -1, -1, -1, 3, 66, 
-  67, -1, -1, 83, -1, 85, -1, 74, 13, -1, 
-  -1, -1, 17, -1, -1, -1, 83, -1, 85, 23, 
-  24, 26, -1, 28, -1, -1, -1, 31, 32, 3, 
-  -1, 35, -1, 37, 39, -1, 41, 42, -1, 13, 
-  -1, -1, -1, 17, 49, -1, -1, 52, 53, -1, 
-  -1, -1, 26, 58, 28, -1, -1, 31, -1, 64, 
-  -1, -1, -1, -1, -1, 39, -1, 41, 42, -1, 
-  -1, -1, -1, -1, 79, 49, -1, -1, 52, 53, 
-  -1, -1, -1, -1, 58, -1, -1, 3, -1, -1, 
-  64, -1, -1, -1, -1, -1, -1, 13, -1, -1, 
-  -1, 17, -1, -1, -1, 79, -1, -1, -1, -1, 
-  26, -1, 28, -1, -1, -1, -1, -1, -1, -1, 
+  60, 8, 36, 36, 33, 33, 7, 60, 7, 36, 
+  29, 33, 7, 7, 7, 36, 7, 55, 7, 78, 
+  1, 78, 48, 1, 36, 33, 36, 36, 60, 5, 
+  55, 61, 2, 33, 8, 55, 60, 16, 7, 7, 
+  7, 5, 48, 60, 7, 2, 60, 20, 7, 5, 
+  48, 17, 55, 2, 31, 7, 61, 8, 33, 7, 
+  7, 7, 7, 60, 36, 36, 7, 0, 8, 7, 
+  7, 36, 7, 88, 36, 29, 36, 1, 60, 65, 
+  33, 17, 78, 1, 7, 7, 36, 7, 7, 33, 
+  33, 76, 8, 2, 55, 78, 88, 36, 8, 29, 
+  8, 8, 36, 61, 36, 36, 48, 36, 8, 8, 
+  8, 66, 40, 8, 40, 8, -1, 7, 8, 8, 
+  -1, -1, -1, 51, 15, 51, 8, 40, 40, 50, 
+  6, 8, 10, 54, 61, 62, 61, 62, 51, 51, 
+  42, 8, 33, 8, 20, 7, 61, 62, 8, 29, 
+  60, 53, 60, 60, 29, 61, 62, 56, 56, 29, 
+  60, 56, 50, 56, 61, 62, 54, 61, 62, 61, 
+  62, 60, 8, 29, 61, 62, 7, 55, 7, 61, 
+  61, 62, 8, 60, 29, -1, 15, 15, 15, 12, 
+  29, 66, 67, 60, 74, 60, 66, 67, 15, 29, 
+  8, 61, 62, -1, 33, 85, 34, 34, 36, 36, 
+  66, 67, 8, 29, -1, -1, -1, 34, -1, 36, 
+  29, 66, 67, 29, -1, 61, 62, 66, 67, 7, 
+  61, 62, 29, -1, 57, 61, 62, 29, -1, 25, 
+  63, 27, 12, 25, 74, 27, 25, 12, 27, -1, 
+  66, 67, 38, 61, 62, 85, 38, 66, 67, 38, 
+  66, 67, 29, 18, 19, 61, 62, 29, -1, 66, 
+  67, 29, -1, -1, 66, 67, 8, -1, 36, 18, 
+  19, 29, -1, 61, 62, -1, -1, 57, 36, -1, 
+  45, 46, 57, 63, 18, 19, 18, 19, 63, 66, 
+  67, 33, 23, 24, 66, 67, 45, 46, 66, 67, 
+  29, 32, 29, 25, 35, 27, 37, -1, 66, 67, 
+  29, 45, 46, 45, 46, 29, 38, 23, 24, 61, 
+  62, -1, 29, -1, -1, -1, 32, -1, -1, 35, 
+  -1, 37, 61, 62, 61, 62, -1, 66, 67, 66, 
+  67, 29, 61, 62, -1, 59, -1, 66, 67, 23, 
+  24, -1, 66, 67, 61, 62, 23, 24, 32, 66, 
+  67, 35, -1, 37, -1, 32, 29, -1, 35, 29, 
+  37, 85, -1, 61, 62, 23, 24, -1, 66, 67, 
+  -1, -1, -1, 31, 32, 23, 24, 35, -1, 37, 
+  -1, -1, -1, 31, 32, -1, 59, 35, -1, 37, 
+  -1, 61, 62, 66, 67, -1, 66, 67, 10, 23, 
+  24, -1, -1, -1, -1, -1, -1, 31, 32, -1, 
+  22, 35, 85, 37, -1, 23, 24, 29, -1, 10, 
+  -1, 23, 24, 31, 32, -1, -1, 35, -1, 37, 
+  32, 22, -1, 35, -1, 37, -1, -1, 29, -1, 
+  -1, -1, -1, 55, -1, -1, -1, 59, -1, -1, 
+  -1, -1, -1, -1, 66, 67, -1, -1, -1, -1, 
+  -1, -1, 74, -1, 55, -1, -1, -1, 59, -1, 
+  -1, 83, -1, 85, -1, 66, 67, 3, -1, -1, 
+  -1, -1, -1, 74, -1, -1, -1, 13, -1, 23, 
+  24, 17, 83, -1, 85, -1, -1, 31, 32, -1, 
+  26, 35, 28, 37, -1, 31, -1, -1, -1, -1, 
+  -1, -1, -1, 39, -1, 41, 42, -1, -1, 12, 
+  13, -1, -1, 49, -1, -1, 52, 53, -1, 22, 
+  -1, -1, 58, -1, -1, -1, 29, -1, 64, -1, 
+  33, 34, -1, 36, -1, -1, -1, -1, -1, -1, 
+  43, -1, -1, 79, 47, -1, -1, 3, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, 
+  -1, 17, 65, 66, 67, -1, 69, -1, -1, -1, 
+  26, -1, 28, -1, -1, -1, -1, 80, 81, 82, 
   -1, -1, -1, 39, -1, 41, 42, -1, -1, -1, 
   -1, -1, -1, 49, -1, -1, 52, 53, -1, -1, 
   -1, -1, 58, -1, -1, -1, -1, -1, 64, -1, 
@@ -611,122 +669,161 @@ const int JavaScriptGrammar::action_check [] = {
   -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
   33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
   43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
-  53, -1, -1, 56, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, 
-  73, -1, 75, -1, -1, -1, -1, 80, 81, 82, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, 
-  13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
-  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
-  33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
-  43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
-  53, -1, -1, 56, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, 
-  73, -1, 75, -1, -1, -1, -1, 80, 81, 82, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, 
-  13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
-  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
-  33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
-  43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
   53, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, 
   73, 74, 75, -1, -1, -1, -1, 80, 81, 82, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, 
-  6, -1, -1, 9, 10, 11, -1, -1, 14, -1, 
-  16, -1, -1, -1, 20, 21, 22, -1, -1, -1, 
-  -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 59, -1, -1, -1, -1, -1, -1, 
-  66, 67, 68, 69, 70, -1, 72, 73, 74, 75, 
-  76, 77, -1, -1, 80, 81, 82, 83, 84, 85, 
-  -1, -1, -1, -1, -1, 4, 5, 6, -1, -1, 
-  9, 10, 11, -1, -1, 14, -1, 16, -1, -1, 
-  -1, 20, 21, 22, -1, -1, -1, -1, -1, -1, 
-  29, 30, 31, 32, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 43, -1, -1, -1, 47, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  59, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
-  69, 70, -1, 72, 73, 74, 75, 76, 77, -1, 
-  -1, 80, 81, 82, 83, 84, 85, -1, -1, -1, 
-  -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 
-  -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 
-  22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
-  32, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
-  -1, -1, -1, 55, -1, -1, -1, 59, -1, -1, 
-  -1, -1, -1, 65, 66, 67, 68, 69, 70, -1, 
-  72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 
-  82, 83, 84, 85, -1, -1, -1, -1, -1, 4, 
-  -1, -1, -1, -1, 9, -1, 11, 12, 13, 14, 
-  -1, -1, -1, -1, -1, -1, 21, 22, -1, -1, 
-  -1, -1, -1, -1, 29, 30, -1, -1, 33, 34, 
-  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
-  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
-  -1, -1, -1, -1, 59, -1, 61, -1, -1, -1, 
-  65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 
-  75, 76, 77, -1, -1, 80, 81, 82, 83, 84, 
-  -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, 
-  -1, 9, -1, 11, 12, 13, 14, -1, -1, -1, 
-  -1, -1, -1, 21, 22, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, 
+  -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, 
+  -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 
+  40, -1, 42, 43, 44, -1, -1, 47, -1, -1, 
+  -1, 51, -1, 53, -1, -1, 56, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, 
+  -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, 
+  80, 81, 82, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 8, -1, -1, 11, 12, 13, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, 
+  -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, 
+  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
+  47, -1, -1, -1, 51, -1, 53, -1, -1, 56, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 
+  67, -1, 69, -1, 71, -1, 73, -1, 75, -1, 
+  -1, -1, -1, 80, 81, 82, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 8, -1, -1, 11, 12, 13, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
+  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
+  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
+  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
+  -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, 
+  -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, 
+  11, 12, 13, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
+  -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, 
+  -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 
+  51, -1, 53, -1, -1, 56, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, 
+  71, -1, 73, -1, 75, -1, -1, -1, -1, 80, 
+  81, 82, -1, -1, -1, -1, -1, -1, -1, -1, 
+  8, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
+  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
+  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
+  -1, -1, -1, 51, -1, 53, -1, -1, 56, -1, 
+  -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, 
+  -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, 
+  -1, -1, 80, 81, 82, -1, -1, 85, -1, -1, 
+  -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
   -1, 29, 30, -1, -1, 33, 34, -1, 36, -1, 
   -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
   -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
-  -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 
-  68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 
-  -1, -1, 80, 81, 82, 83, 84, -1, -1, -1, 
-  -1, -1, -1, 4, -1, -1, -1, -1, 9, -1, 
-  11, 12, 13, 14, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 61, -1, -1, -1, 65, 66, 67, 
+  -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, 
+  -1, -1, 80, 81, 82, -1, 84, -1, 86, -1, 
+  -1, -1, -1, 4, 5, 6, -1, -1, 9, 10, 
+  11, -1, -1, 14, -1, 16, -1, -1, -1, 20, 
   21, 22, -1, -1, -1, -1, -1, -1, 29, 30, 
-  -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, 
-  -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 
-  51, -1, 53, -1, -1, -1, -1, -1, 59, -1, 
-  61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 
-  71, 72, 73, 74, 75, 76, 77, -1, -1, 80, 
-  81, 82, 83, 84, -1, 86, -1, -1, -1, -1, 
-  4, 5, 6, -1, -1, 9, 10, 11, 12, 13, 
+  31, 32, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 43, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 59, -1, 
+  -1, -1, -1, -1, -1, 66, 67, 68, 69, 70, 
+  -1, 72, 73, 74, 75, 76, 77, -1, -1, 80, 
+  81, 82, 83, 84, 85, -1, -1, -1, -1, -1, 
+  4, 5, 6, -1, -1, 9, 10, 11, -1, -1, 
   14, -1, 16, -1, -1, -1, 20, 21, 22, -1, 
-  -1, -1, -1, -1, -1, 29, 30, 31, 32, 33, 
-  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
-  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
-  -1, 55, -1, -1, -1, 59, -1, 61, -1, -1, 
-  -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 
+  -1, -1, -1, -1, -1, 29, 30, 31, 32, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, 
+  -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 59, -1, -1, -1, -1, 
+  -1, 65, 66, 67, 68, 69, 70, -1, 72, 73, 
   74, 75, 76, 77, -1, -1, 80, 81, 82, 83, 
-  84, 85, -1, -1, -1, -1, -1, 
+  84, 85, -1, -1, -1, -1, -1, 4, 5, 6, 
+  -1, -1, 9, 10, 11, -1, -1, 14, -1, 16, 
+  -1, -1, -1, 20, 21, 22, -1, -1, -1, -1, 
+  -1, -1, 29, 30, 31, 32, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 43, -1, -1, -1, 
+  47, -1, -1, -1, -1, -1, -1, -1, 55, -1, 
+  -1, -1, 59, -1, -1, -1, -1, -1, 65, 66, 
+  67, 68, 69, 70, -1, 72, 73, 74, 75, 76, 
+  77, -1, -1, 80, 81, 82, 83, 84, 85, -1, 
+  -1, -1, -1, -1, 4, -1, -1, -1, -1, 9, 
+  -1, 11, 12, 13, 14, -1, -1, -1, -1, -1, 
+  -1, 21, 22, -1, -1, -1, -1, -1, -1, 29, 
+  30, -1, -1, 33, 34, -1, 36, -1, -1, -1, 
+  40, -1, 42, 43, 44, -1, -1, 47, -1, -1, 
+  -1, 51, -1, 53, -1, -1, -1, -1, -1, 59, 
+  -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 
+  70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 
+  80, 81, 82, 83, 84, -1, -1, -1, -1, -1, 
+  -1, 4, -1, -1, -1, -1, 9, -1, 11, 12, 
+  13, 14, -1, -1, -1, -1, -1, -1, 21, 22, 
+  -1, -1, -1, -1, -1, -1, 29, 30, -1, -1, 
+  33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
+  43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
+  53, -1, -1, -1, -1, -1, 59, -1, 61, -1, 
+  -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 
+  73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 
+  83, 84, -1, -1, -1, -1, -1, -1, 4, 5, 
+  6, -1, -1, 9, 10, 11, 12, 13, 14, -1, 
+  16, -1, -1, -1, 20, 21, 22, -1, -1, -1, 
+  -1, -1, -1, 29, 30, 31, 32, 33, 34, -1, 
+  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
+  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
+  -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 
+  66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 
+  76, 77, -1, -1, 80, 81, 82, 83, 84, 85, 
+  -1, -1, -1, -1, -1, 4, 5, 6, -1, -1, 
+  9, 10, 11, 12, 13, 14, -1, 16, -1, -1, 
+  -1, 20, 21, 22, -1, -1, -1, -1, -1, -1, 
+  29, 30, 31, 32, 33, 34, -1, 36, -1, -1, 
+  -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, 
+  -1, -1, 51, -1, 53, -1, 55, -1, -1, -1, 
+  59, -1, 61, -1, -1, -1, 65, 66, 67, 68, 
+  69, 70, 71, 72, 73, 74, 75, 76, 77, -1, 
+  -1, 80, 81, 82, 83, 84, 85, -1, -1, -1, 
+  -1, -1, 
 
-  77, 25, 25, 63, 94, 63, 16, 89, 19, 77, 
-  16, 16, 16, 59, 10, 14, 19, 19, 19, 14, 
-  5, 19, 6, 14, 6, 25, 19, 19, 25, 19, 
-  19, 25, 63, 21, 14, 16, 92, 16, 16, 14, 
-  16, 63, 25, 16, 16, 19, 15, -1, 25, 16, 
-  14, 16, 14, 19, 25, 25, 14, 16, 14, 19, 
-  14, -1, 19, 16, 19, 16, 14, 14, 36, 14, 
-  14, 39, 14, 16, 14, 27, 25, 16, 16, 25, 
-  16, -1, 19, -1, 16, -1, 36, 16, 19, 14, 
-  40, 14, -1, 19, -1, 36, -1, 30, 25, 40, 
-  33, 36, 36, 38, 19, 32, 36, 41, 36, -1, 
-  6, -1, 40, 28, 36, 36, 36, 36, 48, 41, 
-  41, -1, 60, 42, 60, 36, 46, 36, 60, -1, 
-  41, 60, 41, 36, 36, 38, 38, 36, 36, 38, 
-  -1, 36, 36, 41, 81, 39, 41, 36, 36, 38, 
-  38, 36, 83, 38, 36, 36, 38, 38, 25, 36, 
-  36, 38, 38, 36, 36, 32, 38, 36, 41, 95, 
-  36, 96, 36, 42, 36, 36, 30, 41, 101, 33, 
-  41, 36, -1, 36, 50, 36, 41, 38, 41, 36, 
-  52, 38, 36, 36, -1, 36, -1, 36, 36, 42, 
-  44, 42, 41, 41, -1, 36, 36, 36, 36, 38, 
-  41, 41, 43, 41, 53, -1, -1, 36, 36, -1, 
-  58, 51, 41, 41, 43, 17, 18, 19, 36, 36, 
-  58, -1, -1, 41, 41, -1, 43, 36, 36, 47, 
-  58, 36, 41, 41, 43, 8, 41, 36, 36, -1, 
-  45, 49, 41, 41, 17, 18, 19, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 58, 
-  58, -1, -1, -1, 19, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 28, 29, -1, -1, -1, -1, -1, 
+  14, 93, 66, 15, 23, 29, 76, 76, 23, 20, 
+  23, 14, 29, 23, 15, 23, 23, 14, 62, 23, 
+  14, 23, 10, 29, 5, 14, 66, 66, 14, 29, 
+  14, 23, 66, 66, 29, 66, 14, 66, 66, 14, 
+  23, 23, 14, 23, 14, 14, 66, 23, 66, 23, 
+  29, 14, 29, 14, 14, 23, 23, 66, 29, 14, 
+  14, 66, 14, 29, 23, 29, 91, 66, 66, 14, 
+  66, 29, 29, 66, 30, 14, -1, 39, 29, 25, 
+  -1, 23, 44, 29, 35, 23, 39, -1, 15, 39, 
+  39, 39, 45, 41, 44, 44, 39, 88, 39, 39, 
+  41, 44, 39, 39, 44, 41, 39, 39, 45, 6, 
+  39, -1, 45, 42, 39, 39, 41, 41, 39, 66, 
+  39, 42, 41, 55, 63, 39, 23, 41, 39, 39, 
+  39, 41, 41, 39, 6, 41, 39, 39, 80, 14, 
+  -1, 44, 53, 39, 39, 47, 14, 23, 44, 44, 
+  39, 23, 41, 100, 39, 39, 94, 41, 39, 44, 
+  41, 39, 33, 41, 29, 36, 39, -1, 66, 39, 
+  35, 44, 39, 43, -1, 33, -1, 44, 36, 39, 
+  39, 41, 41, 39, 39, 23, 33, 43, 63, 36, 
+  39, 39, 14, 31, 43, 63, 51, 95, 39, 39, 
+  41, 49, 39, -1, 44, 39, 82, 39, 45, 39, 
+  44, 39, 44, 39, 44, 39, 44, -1, 44, -1, 
+  44, -1, -1, 39, 50, 39, 54, 61, 44, 61, 
+  44, 61, 46, -1, -1, -1, -1, 61, 39, -1, 
+  56, 63, 39, 44, 39, 46, 41, 44, 39, 46, 
+  -1, 39, 39, 44, 39, 46, 44, 44, 23, 44, 
+  11, 48, -1, -1, 52, 8, 31, 32, 11, -1, 
+  21, 22, 23, -1, -1, -1, 61, -1, 21, 22, 
+  23, 14, 15, 16, 17, 18, 19, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 6, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 23, -1, -1, -1, -1, -1, 
+  29, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1};
+  -1, -1, -1};
 
diff --git a/src/declarative/qml/parser/javascriptgrammar_p.h b/src/declarative/qml/parser/javascriptgrammar_p.h
index 70c9766..830f533 100644
--- a/src/declarative/qml/parser/javascriptgrammar_p.h
+++ b/src/declarative/qml/parser/javascriptgrammar_p.h
@@ -150,15 +150,15 @@ public:
     T_XOR = 78,
     T_XOR_EQ = 79,
 
-    ACCEPT_STATE = 552,
-    RULE_COUNT = 317,
-    STATE_COUNT = 553,
+    ACCEPT_STATE = 588,
+    RULE_COUNT = 323,
+    STATE_COUNT = 589,
     TERMINAL_COUNT = 91,
-    NON_TERMINAL_COUNT = 103,
+    NON_TERMINAL_COUNT = 102,
 
-    GOTO_INDEX_OFFSET = 553,
-    GOTO_INFO_OFFSET = 1717,
-    GOTO_CHECK_OFFSET = 1717
+    GOTO_INDEX_OFFSET = 589,
+    GOTO_INFO_OFFSET = 2092,
+    GOTO_CHECK_OFFSET = 2092
   };
 
   static const char  *const spell [];
diff --git a/src/declarative/qml/parser/javascriptlexer.cpp b/src/declarative/qml/parser/javascriptlexer.cpp
index c0a4b63..7455b87 100644
--- a/src/declarative/qml/parser/javascriptlexer.cpp
+++ b/src/declarative/qml/parser/javascriptlexer.cpp
@@ -44,13 +44,6 @@
 #endif
 
 #include "javascriptengine_p.h"
-
-
-
-
-
-
-
 #include "javascriptlexer_p.h"
 #include "javascriptgrammar_p.h"
 
@@ -73,10 +66,12 @@ extern double qstrtod(const char *s00, char const **se, bool *ok);
     while (0)
 
 namespace JavaScript {
-extern qjsreal integerFromString(const char *buf, int size, int radix);
+extern double integerFromString(const char *buf, int size, int radix);
 }
 
-JavaScript::Lexer::Lexer(JavaScriptEnginePrivate *eng)
+using namespace JavaScript;
+
+Lexer::Lexer(Engine *eng)
     : driver(eng),
       yylineno(0),
       done(false),
@@ -101,6 +96,7 @@ JavaScript::Lexer::Lexer(JavaScriptEnginePrivate *eng)
       parenthesesCount(0),
       prohibitAutomaticSemicolon(false)
 {
+    driver->setLexer(this);
     // allocate space for read buffers
     buffer8 = new char[size8];
     buffer16 = new QChar[size16];
@@ -109,13 +105,13 @@ JavaScript::Lexer::Lexer(JavaScriptEnginePrivate *eng)
 
 }
 
-JavaScript::Lexer::~Lexer()
+Lexer::~Lexer()
 {
     delete [] buffer8;
     delete [] buffer16;
 }
 
-void JavaScript::Lexer::setCode(const QString &c, int lineno)
+void Lexer::setCode(const QString &c, int lineno)
 {
     errmsg = QString();
     yylineno = lineno;
@@ -135,7 +131,7 @@ void JavaScript::Lexer::setCode(const QString &c, int lineno)
     next3 = (length > 3) ? code[3].unicode() : 0;
 }
 
-void JavaScript::Lexer::shift(uint p)
+void Lexer::shift(uint p)
 {
     while (p--) {
         ++pos;
@@ -147,13 +143,13 @@ void JavaScript::Lexer::shift(uint p)
     }
 }
 
-void JavaScript::Lexer::setDone(State s)
+void Lexer::setDone(State s)
 {
     state = s;
     done = true;
 }
 
-int JavaScript::Lexer::findReservedWord(const QChar *c, int size) const
+int Lexer::findReservedWord(const QChar *c, int size) const
 {
     switch (size) {
     case 2: {
@@ -454,7 +450,7 @@ int JavaScript::Lexer::findReservedWord(const QChar *c, int size) const
     return -1;
 }
 
-int JavaScript::Lexer::lex()
+int Lexer::lex()
 {
     int token = 0;
     state = Start;
@@ -772,10 +768,10 @@ int JavaScript::Lexer::lex()
     if (state == Number) {
         dval = qstrtod(buffer8, 0, 0);
     } else if (state == Hex) { // scan hex numbers
-        dval = JavaScript::integerFromString(buffer8, pos8, 16);
+        dval = integerFromString(buffer8, pos8, 16);
         state = Number;
     } else if (state == Octal) {   // scan octal number
-        dval = JavaScript::integerFromString(buffer8, pos8, 8);
+        dval = integerFromString(buffer8, pos8, 8);
         state = Number;
     }
 
@@ -843,18 +839,18 @@ int JavaScript::Lexer::lex()
     }
 }
 
-bool JavaScript::Lexer::isWhiteSpace() const
+bool Lexer::isWhiteSpace() const
 {
     return (current == ' ' || current == '\t' ||
              current == 0x0b || current == 0x0c);
 }
 
-bool JavaScript::Lexer::isLineTerminator() const
+bool Lexer::isLineTerminator() const
 {
     return (current == '\n' || current == '\r');
 }
 
-bool JavaScript::Lexer::isIdentLetter(ushort c)
+bool Lexer::isIdentLetter(ushort c)
 {
     /* TODO: allow other legitimate unicode chars */
     return ((c >= 'a' && c <= 'z')
@@ -863,24 +859,24 @@ bool JavaScript::Lexer::isIdentLetter(ushort c)
             || c == '_');
 }
 
-bool JavaScript::Lexer::isDecimalDigit(ushort c)
+bool Lexer::isDecimalDigit(ushort c)
 {
     return (c >= '0' && c <= '9');
 }
 
-bool JavaScript::Lexer::isHexDigit(ushort c) const
+bool Lexer::isHexDigit(ushort c) const
 {
     return ((c >= '0' && c <= '9')
             || (c >= 'a' && c <= 'f')
             || (c >= 'A' && c <= 'F'));
 }
 
-bool JavaScript::Lexer::isOctalDigit(ushort c) const
+bool Lexer::isOctalDigit(ushort c) const
 {
     return (c >= '0' && c <= '7');
 }
 
-int JavaScript::Lexer::matchPunctuator(ushort c1, ushort c2,
+int Lexer::matchPunctuator(ushort c1, ushort c2,
                             ushort c3, ushort c4)
 {
     if (c1 == '>' && c2 == '>' && c3 == '>' && c4 == '=') {
@@ -987,7 +983,7 @@ int JavaScript::Lexer::matchPunctuator(ushort c1, ushort c2,
     }
 }
 
-ushort JavaScript::Lexer::singleEscape(ushort c) const
+ushort Lexer::singleEscape(ushort c) const
 {
     switch(c) {
     case 'b':
@@ -1013,13 +1009,13 @@ ushort JavaScript::Lexer::singleEscape(ushort c) const
     }
 }
 
-ushort JavaScript::Lexer::convertOctal(ushort c1, ushort c2,
+ushort Lexer::convertOctal(ushort c1, ushort c2,
                             ushort c3) const
 {
     return ((c1 - '0') * 64 + (c2 - '0') * 8 + c3 - '0');
 }
 
-unsigned char JavaScript::Lexer::convertHex(ushort c)
+unsigned char Lexer::convertHex(ushort c)
 {
     if (c >= '0' && c <= '9')
         return (c - '0');
@@ -1029,19 +1025,19 @@ unsigned char JavaScript::Lexer::convertHex(ushort c)
         return (c - 'A' + 10);
 }
 
-unsigned char JavaScript::Lexer::convertHex(ushort c1, ushort c2)
+unsigned char Lexer::convertHex(ushort c1, ushort c2)
 {
     return ((convertHex(c1) << 4) + convertHex(c2));
 }
 
-QChar JavaScript::Lexer::convertUnicode(ushort c1, ushort c2,
+QChar Lexer::convertUnicode(ushort c1, ushort c2,
                              ushort c3, ushort c4)
 {
     return QChar((convertHex(c3) << 4) + convertHex(c4),
                   (convertHex(c1) << 4) + convertHex(c2));
 }
 
-void JavaScript::Lexer::record8(ushort c)
+void Lexer::record8(ushort c)
 {
     Q_ASSERT(c <= 0xff);
 
@@ -1057,7 +1053,7 @@ void JavaScript::Lexer::record8(ushort c)
     buffer8[pos8++] = (char) c;
 }
 
-void JavaScript::Lexer::record16(QChar c)
+void Lexer::record16(QChar c)
 {
     // enlarge buffer if full
     if (pos16 >= size16 - 1) {
@@ -1071,14 +1067,14 @@ void JavaScript::Lexer::record16(QChar c)
     buffer16[pos16++] = c;
 }
 
-void JavaScript::Lexer::recordStartPos()
+void Lexer::recordStartPos()
 {
     startpos = pos;
     startlineno = yylineno;
     startcolumn = yycolumn;
 }
 
-bool JavaScript::Lexer::scanRegExp(RegExpBodyPrefix prefix)
+bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
 {
     pos16 = 0;
     bool lastWasEscape = false;
@@ -1110,7 +1106,7 @@ bool JavaScript::Lexer::scanRegExp(RegExpBodyPrefix prefix)
 
     flags = 0;
     while (isIdentLetter(current)) {
-        int flag = JavaScript::Ecma::RegExp::flagFromChar(current);
+        int flag = Ecma::RegExp::flagFromChar(current);
         if (flag == 0) {
             errmsg = QString::fromLatin1("Invalid regular expression flag '%0'")
                      .arg(QChar(current));
@@ -1124,7 +1120,7 @@ bool JavaScript::Lexer::scanRegExp(RegExpBodyPrefix prefix)
     return true;
 }
 
-void JavaScript::Lexer::syncProhibitAutomaticSemicolon()
+void Lexer::syncProhibitAutomaticSemicolon()
 {
     if (parenthesesState == BalancedParentheses) {
         // we have seen something like "if (foo)", which means we should
diff --git a/src/declarative/qml/parser/javascriptlexer_p.h b/src/declarative/qml/parser/javascriptlexer_p.h
index e71c10c..092609c 100644
--- a/src/declarative/qml/parser/javascriptlexer_p.h
+++ b/src/declarative/qml/parser/javascriptlexer_p.h
@@ -59,15 +59,15 @@
 
 QT_BEGIN_NAMESPACE
 
-class JavaScriptEnginePrivate;
-class JavaScriptNameIdImpl;
-
 namespace JavaScript {
 
+class Engine;
+class NameId;
+
 class Lexer
 {
 public:
-    Lexer(JavaScriptEnginePrivate *eng);
+    Lexer(Engine *eng);
     ~Lexer();
 
     void setCode(const QString &c, int lineno);
@@ -136,7 +136,7 @@ public:
 
     bool scanRegExp(RegExpBodyPrefix prefix = NoPrefix);
 
-    JavaScriptNameIdImpl *pattern;
+    NameId *pattern;
     int flags;
 
     State lexerState() const
@@ -155,7 +155,7 @@ public:
         { err = NoError; }
 
 private:
-    JavaScriptEnginePrivate *driver;
+    Engine *driver;
     int yylineno;
     bool done;
     char *buffer8;
@@ -194,7 +194,7 @@ public:
 
     inline int ival() const { return qsyylval.ival; }
     inline double dval() const { return qsyylval.dval; }
-    inline JavaScriptNameIdImpl *ustr() const { return qsyylval.ustr; }
+    inline NameId *ustr() const { return qsyylval.ustr; }
 
     const QChar *characterBuffer() const { return buffer16; }
     int characterCount() const { return pos16; }
@@ -219,7 +219,7 @@ private:
     union {
         int ival;
         double dval;
-        JavaScriptNameIdImpl *ustr;
+        NameId *ustr;
     } qsyylval;
 
     // current and following unicode characters
diff --git a/src/declarative/qml/parser/javascriptnodepool_p.h b/src/declarative/qml/parser/javascriptnodepool_p.h
index 3f59123..cb56fbb 100644
--- a/src/declarative/qml/parser/javascriptnodepool_p.h
+++ b/src/declarative/qml/parser/javascriptnodepool_p.h
@@ -60,8 +60,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class JavaScriptEnginePrivate;
-
 namespace JavaScript {
 
 namespace AST {
@@ -70,6 +68,7 @@ class Node;
 
 class Code;
 class CompilationUnit;
+class Engine;
 
 template <typename NodeType>
 inline NodeType *makeAstNode(MemoryPool *storage)
@@ -109,13 +108,13 @@ inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2, Arg3 arg
 class NodePool : public MemoryPool
 {
 public:
-    NodePool(const QString &fileName, JavaScriptEnginePrivate *engine);
+    NodePool(const QString &fileName, Engine *engine);
     virtual ~NodePool();
 
     Code *createCompiledCode(AST::Node *node, CompilationUnit &compilation);
 
     inline QString fileName() const { return m_fileName; }
-    inline JavaScriptEnginePrivate *engine() const { return m_engine; }
+    inline Engine *engine() const { return m_engine; }
 #ifndef J_SCRIPT_NO_EVENT_NOTIFY
     inline qint64 id() const { return m_id; }
 #endif
@@ -123,7 +122,7 @@ public:
 private:
     QHash<AST::Node*, Code*> m_codeCache;
     QString m_fileName;
-    JavaScriptEnginePrivate *m_engine;
+    Engine *m_engine;
 #ifndef J_SCRIPT_NO_EVENT_NOTIFY
     qint64 m_id;
 #endif
diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp
index ed791c8..7ff438e 100644
--- a/src/declarative/qml/parser/javascriptparser.cpp
+++ b/src/declarative/qml/parser/javascriptparser.cpp
@@ -53,6 +53,7 @@
 
 
 #include "javascriptparser_p.h"
+#include <QVarLengthArray>
 
 //
 // This file is automatically generated from javascript.g.
@@ -63,7 +64,7 @@ using namespace JavaScript;
 
 QT_BEGIN_NAMESPACE
 
-void JavaScriptParser::reallocateStack()
+void Parser::reallocateStack()
 {
     if (! stack_size)
         stack_size = 128;
@@ -75,7 +76,7 @@ void JavaScriptParser::reallocateStack()
     location_stack = reinterpret_cast<AST::SourceLocation*> (qRealloc(location_stack, stack_size * sizeof(AST::SourceLocation)));
 }
 
-inline static bool automatic(JavaScriptEnginePrivate *driver, int token)
+inline static bool automatic(Engine *driver, int token)
 {
     return token == JavaScriptGrammar::T_RBRACE
         || token == 0
@@ -83,7 +84,8 @@ inline static bool automatic(JavaScriptEnginePrivate *driver, int token)
 }
 
 
-JavaScriptParser::JavaScriptParser():
+Parser::Parser(Engine *engine):
+    driver(engine),
     tos(0),
     stack_size(0),
     sym_stack(0),
@@ -94,7 +96,7 @@ JavaScriptParser::JavaScriptParser():
 {
 }
 
-JavaScriptParser::~JavaScriptParser()
+Parser::~Parser()
 {
     if (stack_size) {
         qFree(sym_stack);
@@ -113,7 +115,35 @@ static inline AST::SourceLocation location(Lexer *lexer)
     return loc;
 }
 
-bool JavaScriptParser::parse(JavaScriptEnginePrivate *driver)
+AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
+{
+    QVarLengthArray<NameId *, 4> nameIds;
+    QVarLengthArray<AST::SourceLocation, 4> locations;
+
+    AST::ExpressionNode *it = expr;
+    while (AST::FieldMemberExpression *m = AST::cast<AST::FieldMemberExpression *>(it)) {
+        nameIds.append(m->name);
+        locations.append(m->identifierToken);
+        it = m->base;
+    }
+
+    if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(it)) {
+        AST::UiQualifiedId *q = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), idExpr->name);
+        q->identifierToken = idExpr->identifierToken;
+
+        AST::UiQualifiedId *currentId = q;
+        for (int i = nameIds.size() - 1; i != -1; --i) {
+            currentId = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), currentId, nameIds[i]);
+            currentId->identifierToken = locations[i];
+        }
+
+        return currentId->finish();
+    }
+
+    return 0;
+}
+
+bool Parser::parse()
 {
     Lexer *lexer = driver->lexer();
     bool hadErrors = false;
@@ -166,7 +196,7 @@ bool JavaScriptParser::parse(JavaScriptEnginePrivate *driver)
 case 0: {
   program = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
         sym(2).UiObjectMemberList->finish());
-  sym(1).UiProgram = program;    
+  sym(1).UiProgram = program;
 } break;
 
 case 2: {
@@ -233,21 +263,12 @@ case 14: {
 }   break;
 
 case 15: {
-    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
-        sym(3).sval, sym(4).UiObjectInitializer);
-    node->colonToken = loc(2);
-    node->identifierToken = loc(3);
-    sym(1).Node = node;
-}   break;
-
-case 16: {
-    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).sval,
+    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
         sym(2).UiObjectInitializer);
-    node->identifierToken = loc(1);
     sym(1).Node = node;
 }   break;
 
-case 18: {
+case 17: {
     AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
         sym(4).UiObjectMemberList->finish());
     node->colonToken = loc(2);
@@ -256,34 +277,50 @@ case 18: {
     sym(1).Node = node;
 }   break;
 
-case 19: {
+case 18: {
   AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 21: {
+case 20: {
   AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
-  case 22: 
-case 23: {
+
+case 21: {
+  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+  } else {
+    sym(1).Node = 0;
+
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(2),
+      QLatin1String("Expected a type name after token `:'")));
+
+    return false; // ### recover
+  }
+} break;
+case 22:case 23:case 24:case 25:case 26:case 27:
+{
     AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
         sym(3).Statement);
     node->colonToken = loc(2);
     sym(1).Node = node;
 }   break;
 
-case 24: 
+case 28:
 
-case 25: {
+case 29: {
     sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
     break;
 }
 
-case 27: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (JavaScriptNameIdImpl *)0, sym(2).sval);
+case 31: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -291,7 +328,7 @@ case 27: {
     sym(1).Node = node;
 }   break;
 
-case 29: {
+case 33: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -300,7 +337,7 @@ case 29: {
     sym(1).Node = node;
 }   break;
 
-case 31: {
+case 35: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
@@ -311,7 +348,7 @@ case 31: {
     sym(1).Node = node;
 }   break;
 
-case 33: {
+case 37: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
         sym(5).Expression);
     node->propertyToken = loc(1);
@@ -322,7 +359,7 @@ case 33: {
     sym(1).Node = node;
 }   break;
 
-case 35: {
+case 39: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
         sym(6).Expression);
     node->isDefaultMember = true;
@@ -335,88 +372,76 @@ case 35: {
     sym(1).Node = node;
 }   break;
 
-case 36: {
+case 40: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
 
-case 37: {
+case 41: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
-case 38: 
-case 39:
+case 42: 
+case 43:
 {
     AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
     node->identifierToken = loc(1);
     sym(1).Node = node;
 }   break;
 
-case 41: {
+case 45: {
     QString s = QLatin1String(JavaScriptGrammar::spell[T_PROPERTY]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 42: {
+case 46: {
     QString s = QLatin1String(JavaScriptGrammar::spell[T_SIGNAL]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 43: {
-    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
-    node->identifierToken = loc(1);
-    sym(1).Node = node;
-}   break;
-
-case 44: {
-    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
-    node->identifierToken = loc(3);
-    sym(1).Node = node;
-}   break;
-
-case 45: {
+case 47: {
   AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
   node->thisToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 46: {
+case 48: {
   AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 47: {
+case 49: {
   AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
   node->nullToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 48: {
+case 50: {
   AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
   node->trueToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 49: {
+case 51: {
   AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
   node->falseToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 50: {
+case 52: {
   AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 51: {
+case 53: {
   AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 52: {
+case 54: {
   bool rx = lexer->scanRegExp(Lexer::NoPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -427,7 +452,7 @@ case 52: {
   sym(1).Node = node;
 } break;
 
-case 53: {
+case 55: {
   bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -438,29 +463,46 @@ case 53: {
   sym(1).Node = node;
 } break;
 
-case 54: {
-  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision);
+case 56: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->rbracketToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 57: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 55: {
+case 58: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 56: {
-  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision);
+case 59: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->commaToken = loc(3);
+  node->rbracketToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 60: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    sym(4).Elision->finish());
   node->lbracketToken = loc(1);
   node->commaToken = loc(3);
   node->rbracketToken = loc(5);
   sym(1).Node = node;
 } break;
 
-case 57: {
+case 61: {
   AST::ObjectLiteral *node = 0;
   if (sym(2).Node)
     node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -472,7 +514,7 @@ case 57: {
   sym(1).Node = node;
 } break;
 
-case 58: {
+case 62: {
   AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
     sym(2).PropertyNameAndValueList->finish ());
   node->lbraceToken = loc(1);
@@ -480,100 +522,104 @@ case 58: {
   sym(1).Node = node;
 } break;
 
-case 59: {
+case 63: {
   AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
   node->lparenToken = loc(1);
   node->rparenToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 60: {
-  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision, sym(2).Expression);
+case 64: {
+    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
+    node->identifierToken = loc(1);
+    sym(1).Node = node;
+}   break;
+
+case 65: {
+    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
+    node->identifierToken = loc(3);
+    sym(1).Node = node;
+}   break;
+
+case 66: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
 } break;
 
-case 61: {
-  AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision, sym(4).Expression);
+case 67: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
+} break;
+
+case 68: {
+  AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList,
+    (AST::Elision *) 0, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 62: {
+case 69: {
+  AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(),
+    sym(4).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 70: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
   node->commaToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 63: {
+case 71: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 64: {
-  sym(1).Node = 0;
-} break;
-
-case 65: {
-  sym(1).Elision = sym(1).Elision->finish ();
-} break;
-
-case 66: {
+case 72: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyName, sym(3).Expression);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 67: {
+case 73: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
   node->commaToken = loc(2);
   node->colonToken = loc(4);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 
-case 68: {
+case 74: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
-case 69:
-case 70: {
+case 75:
+case 76: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
   node->propertyNameToken = loc(1);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 
-case 71: {
+case 77: {
   AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 
-case 72: {
+case 78: {
   AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
   node->propertyNameToken = loc(1);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 
-case 73: {
+case 79: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
-  sym(1).Node = node;  
+  sym(1).Node = node;
 } break;
 
-case 74:
-
-case 75:
-
-case 76:
-
-case 77:
-
-case 78:
-
-case 79:
-
 case 80:
 
 case 81:
@@ -623,25 +669,37 @@ case 102:
 case 103:
 
 case 104:
+
+case 105:
+
+case 106:
+
+case 107:
+
+case 108:
+
+case 109:
+
+case 110:
 {
   sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
 } break;
 
-case 109: {
+case 115: {
   AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 110: {
+case 116: {
   AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 111: {
+case 117: {
   AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
   node->newToken = loc(1);
   node->lparenToken = loc(3);
@@ -649,384 +707,384 @@ case 111: {
   sym(1).Node = node;
 } break;
 
-case 113: {
+case 119: {
   AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
   node->newToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 114: {
+case 120: {
   AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 115: {
+case 121: {
   AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 116: {
+case 122: {
   AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 117: {
+case 123: {
   AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 118: {
+case 124: {
   sym(1).Node = 0;
 } break;
 
-case 119: {
+case 125: {
   sym(1).Node = sym(1).ArgumentList->finish();
 } break;
 
-case 120: {
+case 126: {
   sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
 } break;
 
-case 121: {
+case 127: {
   AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 125: {
+case 131: {
   AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
   node->incrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 126: {
+case 132: {
   AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
   node->decrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 128: {
+case 134: {
   AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
   node->deleteToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 129: {
+case 135: {
   AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
   node->voidToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 130: {
+case 136: {
   AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
   node->typeofToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 131: {
+case 137: {
   AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
   node->incrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 132: {
+case 138: {
   AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
   node->decrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 133: {
+case 139: {
   AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
   node->plusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 134: {
+case 140: {
   AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
   node->minusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 135: {
+case 141: {
   AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
   node->tildeToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 136: {
+case 142: {
   AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
   node->notToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 138: {
+case 144: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Mul, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 139: {
+case 145: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Div, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 140: {
+case 146: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Mod, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 142: {
+case 148: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Add, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 143: {
+case 149: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Sub, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 145: {
+case 151: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::LShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 146: {
+case 152: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::RShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 147: {
+case 153: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::URShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 149: {
+case 155: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 150: {
+case 156: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 151: {
+case 157: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 152: {
+case 158: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 153: {
+case 159: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 154: {
+case 160: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::In, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 156: {
+case 162: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 157: {
+case 163: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 158: {
+case 164: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 159: {
+case 165: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
    QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 160: {
+case 166: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 162: {
+case 168: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Equal, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 163: {
+case 169: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::NotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 164: {
+case 170: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::StrictEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 165: {
+case 171: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 167: {
+case 173: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Equal, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 168: {
+case 174: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::NotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 169: {
+case 175: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::StrictEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 170: {
+case 176: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 172: {
+case 178: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::BitAnd, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 174: {
+case 180: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::BitAnd, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 176: {
+case 182: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::BitXor, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 178: {
+case 184: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::BitXor, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 180: {
+case 186: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::BitOr, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 182: {
+case 188: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::BitOr, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 184: {
+case 190: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::And, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 186: {
+case 192: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::And, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 188: {
+case 194: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Or, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 190: {
+case 196: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Or, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 192: {
+case 198: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1034,7 +1092,7 @@ case 192: {
   sym(1).Node = node;
 } break;
 
-case 194: {
+case 200: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1042,112 +1100,112 @@ case 194: {
   sym(1).Node = node;
 } break;
 
-case 196: {
+case 202: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     sym(2).ival, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 198: {
+case 204: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     sym(2).ival, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 199: {
+case 205: {
   sym(1).ival = QSOperator::Assign;
 } break;
 
-case 200: {
+case 206: {
   sym(1).ival = QSOperator::InplaceMul;
 } break;
 
-case 201: {
+case 207: {
   sym(1).ival = QSOperator::InplaceDiv;
 } break;
 
-case 202: {
+case 208: {
   sym(1).ival = QSOperator::InplaceMod;
 } break;
 
-case 203: {
+case 209: {
   sym(1).ival = QSOperator::InplaceAdd;
 } break;
 
-case 204: {
+case 210: {
   sym(1).ival = QSOperator::InplaceSub;
 } break;
 
-case 205: {
+case 211: {
   sym(1).ival = QSOperator::InplaceLeftShift;
 } break;
 
-case 206: {
+case 212: {
   sym(1).ival = QSOperator::InplaceRightShift;
 } break;
 
-case 207: {
+case 213: {
   sym(1).ival = QSOperator::InplaceURightShift;
 } break;
 
-case 208: {
+case 214: {
   sym(1).ival = QSOperator::InplaceAnd;
 } break;
 
-case 209: {
+case 215: {
   sym(1).ival = QSOperator::InplaceXor;
 } break;
 
-case 210: {
+case 216: {
   sym(1).ival = QSOperator::InplaceOr;
 } break;
 
-case 212: {
+case 218: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 213: {
+case 219: {
   sym(1).Node = 0;
 } break;
 
-case 216: {
+case 222: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 217: {
+case 223: {
   sym(1).Node = 0;
 } break;
 
-case 234: {
+case 240: {
   AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 235: {
+case 241: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 236: {
+case 242: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
 } break;
 
-case 237: {
+case 243: {
   sym(1).Node = 0;
 } break;
 
-case 238: {
+case 244: {
   sym(1).Node = sym(1).StatementList->finish ();
 } break;
 
-case 240: {
+case 246: {
   AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
      sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
   node->declarationKindToken = loc(1);
@@ -1155,76 +1213,76 @@ case 240: {
   sym(1).Node = node;
 } break;
 
-case 241: {
+case 247: {
   sym(1).ival = T_CONST;
 } break;
 
-case 242: {
+case 248: {
   sym(1).ival = T_VAR;
 } break;
 
-case 243: {
+case 249: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 244: {
+case 250: {
   AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
     sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 245: {
+case 251: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 246: {
+case 252: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
 } break;
 
-case 247: {
+case 253: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 248: {
+case 254: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 249: {
+case 255: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 250: {
+case 256: {
   sym(1).Node = 0;
 } break;
 
-case 252: {
+case 258: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 253: {
+case 259: {
   sym(1).Node = 0;
 } break;
 
-case 255: {
+case 261: {
   AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
   node->semicolonToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 257: {
+case 263: {
   AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 258: {
+case 264: {
   AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1233,7 +1291,7 @@ case 258: {
   sym(1).Node = node;
 } break;
 
-case 259: {
+case 265: {
   AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1241,7 +1299,7 @@ case 259: {
   sym(1).Node = node;
 } break;
 
-case 261: {
+case 267: {
   AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
   node->doToken = loc(1);
   node->whileToken = loc(3);
@@ -1251,7 +1309,7 @@ case 261: {
   sym(1).Node = node;
 } break;
 
-case 262: {
+case 268: {
   AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->whileToken = loc(1);
   node->lparenToken = loc(2);
@@ -1259,7 +1317,7 @@ case 262: {
   sym(1).Node = node;
 } break;
 
-case 263: {
+case 269: {
   AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Expression, sym(9).Statement);
   node->forToken = loc(1);
@@ -1270,7 +1328,7 @@ case 263: {
   sym(1).Node = node;
 } break;
 
-case 264: {
+case 270: {
   AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
      sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
      sym(8).Expression, sym(10).Statement);
@@ -1283,7 +1341,7 @@ case 264: {
   sym(1).Node = node;
 } break;
 
-case 265: {
+case 271: {
   AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Statement);
   node->forToken = loc(1);
@@ -1293,7 +1351,7 @@ case 265: {
   sym(1).Node = node;
 } break;
 
-case 266: {
+case 272: {
   AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
     sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
   node->forToken = loc(1);
@@ -1304,14 +1362,14 @@ case 266: {
   sym(1).Node = node;
 } break;
 
-case 268: {
+case 274: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
   node->continueToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 270: {
+case 276: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
   node->continueToken = loc(1);
   node->identifierToken = loc(2);
@@ -1319,14 +1377,14 @@ case 270: {
   sym(1).Node = node;
 } break;
 
-case 272: {
+case 278: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
   node->breakToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 274: {
+case 280: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
   node->breakToken = loc(1);
   node->identifierToken = loc(2);
@@ -1334,14 +1392,14 @@ case 274: {
   sym(1).Node = node;
 } break;
 
-case 276: {
+case 282: {
   AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
   node->returnToken = loc(1);
   node->semicolonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 277: {
+case 283: {
   AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->withToken = loc(1);
   node->lparenToken = loc(2);
@@ -1349,7 +1407,7 @@ case 277: {
   sym(1).Node = node;
 } break;
 
-case 278: {
+case 284: {
   AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
   node->switchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1357,90 +1415,90 @@ case 278: {
   sym(1).Node = node;
 } break;
 
-case 279: {
+case 285: {
   AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 280: {
+case 286: {
   AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(5);
   sym(1).Node = node;
 } break;
 
-case 281: {
+case 287: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
 } break;
 
-case 282: {
+case 288: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
 } break;
 
-case 283: {
+case 289: {
   sym(1).Node = 0;
 } break;
 
-case 284: {
+case 290: {
   sym(1).Node = sym(1).CaseClauses->finish ();
 } break;
 
-case 285: {
+case 291: {
   AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList);
   node->caseToken = loc(1);
   node->colonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 286: {
+case 292: {
   AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
   node->defaultToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
-case 287:
-case 288: {
+case 293:
+case 294: {
   AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement);
   node->identifierToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 289: {
+case 295: {
   AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement);
   node->identifierToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 291: {
+case 297: {
   AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
   node->throwToken = loc(1);
   node->semicolonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 292: {
+case 298: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 293: {
+case 299: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 294: {
+case 300: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 295: {
+case 301: {
   AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
   node->catchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1449,20 +1507,20 @@ case 295: {
   sym(1).Node = node;
 } break;
 
-case 296: {
+case 302: {
   AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
   node->finallyToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 298: {
+case 304: {
   AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
   node->debuggerToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 299: {
+case 305: {
   AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
   node->functionToken = loc(1);
   node->identifierToken = loc(2);
@@ -1473,7 +1531,7 @@ case 299: {
   sym(1).Node = node;
 } break;
 
-case 300: {
+case 306: {
   AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
   node->functionToken = loc(1);
   if (sym(2).sval)
@@ -1485,56 +1543,56 @@ case 300: {
   sym(1).Node = node;
 } break;
 
-case 301: {
+case 307: {
   AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 302: {
+case 308: {
   AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval);
   node->commaToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 303: {
+case 309: {
   sym(1).Node = 0;
 } break;
 
-case 304: {
+case 310: {
   sym(1).Node = sym(1).FormalParameterList->finish ();
 } break;
 
-case 305: {
+case 311: {
   sym(1).Node = 0;
 } break;
 
-case 307: {
+case 313: {
   sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
 } break;
 
-case 308: {
+case 314: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
 } break;
 
-case 309: {
+case 315: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
 } break;
 
-case 310: {
+case 316: {
   sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 311: {
+case 317: {
   sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
 } break;
 
-case 312: {
+case 318: {
   sym(1).sval = 0;
 } break;
 
-case 314: {
+case 320: {
   sym(1).Node = 0;
 } break;
 
diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h
index 5e68fe7..2ae4c34 100644
--- a/src/declarative/qml/parser/javascriptparser_p.h
+++ b/src/declarative/qml/parser/javascriptparser_p.h
@@ -62,86 +62,71 @@
 
 #include "javascriptgrammar_p.h"
 #include "javascriptast_p.h"
+#include "javascriptengine_p.h"
+
 #include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE
 
 class QString;
-class JavaScriptEnginePrivate;
-class JavaScriptNameIdImpl;
 
-class JavaScriptParser: protected JavaScriptGrammar
+namespace JavaScript {
+
+class Engine;
+class NameId;
+
+class Parser: protected JavaScriptGrammar
 {
 public:
     union Value {
       int ival;
       double dval;
-      JavaScriptNameIdImpl *sval;
-      JavaScript::AST::ArgumentList *ArgumentList;
-      JavaScript::AST::CaseBlock *CaseBlock;
-      JavaScript::AST::CaseClause *CaseClause;
-      JavaScript::AST::CaseClauses *CaseClauses;
-      JavaScript::AST::Catch *Catch;
-      JavaScript::AST::DefaultClause *DefaultClause;
-      JavaScript::AST::ElementList *ElementList;
-      JavaScript::AST::Elision *Elision;
-      JavaScript::AST::ExpressionNode *Expression;
-      JavaScript::AST::Finally *Finally;
-      JavaScript::AST::FormalParameterList *FormalParameterList;
-      JavaScript::AST::FunctionBody *FunctionBody;
-      JavaScript::AST::FunctionDeclaration *FunctionDeclaration;
-      JavaScript::AST::Node *Node;
-      JavaScript::AST::PropertyName *PropertyName;
-      JavaScript::AST::PropertyNameAndValueList *PropertyNameAndValueList;
-      JavaScript::AST::SourceElement *SourceElement;
-      JavaScript::AST::SourceElements *SourceElements;
-      JavaScript::AST::Statement *Statement;
-      JavaScript::AST::StatementList *StatementList;
-      JavaScript::AST::Block *Block;
-      JavaScript::AST::VariableDeclaration *VariableDeclaration;
-      JavaScript::AST::VariableDeclarationList *VariableDeclarationList;
-
-      JavaScript::AST::UiProgram *UiProgram;
-      JavaScript::AST::UiImportList *UiImportList;
-      JavaScript::AST::UiImport *UiImport;
-      JavaScript::AST::UiPublicMember *UiPublicMember;
-      JavaScript::AST::UiObjectDefinition *UiObjectDefinition;
-      JavaScript::AST::UiObjectInitializer *UiObjectInitializer;
-      JavaScript::AST::UiObjectBinding *UiObjectBinding;
-      JavaScript::AST::UiScriptBinding *UiScriptBinding;
-      JavaScript::AST::UiArrayBinding *UiArrayBinding;
-      JavaScript::AST::UiObjectMember *UiObjectMember;
-      JavaScript::AST::UiObjectMemberList *UiObjectMemberList;
-      JavaScript::AST::UiQualifiedId *UiQualifiedId;
-    };
-
-    struct DiagnosticMessage {
-        enum Kind { Warning, Error };
-
-        DiagnosticMessage()
-            : kind(Error) {}
-
-        DiagnosticMessage(Kind kind, const JavaScript::AST::SourceLocation &loc, const QString &message)
-            : kind(kind), loc(loc), message(message) {}
-
-        bool isWarning() const
-        { return kind == Warning; }
-
-        bool isError() const
-        { return kind == Error; }
-
-        Kind kind;
-        JavaScript::AST::SourceLocation loc;
-        QString message;
+      NameId *sval;
+      AST::ArgumentList *ArgumentList;
+      AST::CaseBlock *CaseBlock;
+      AST::CaseClause *CaseClause;
+      AST::CaseClauses *CaseClauses;
+      AST::Catch *Catch;
+      AST::DefaultClause *DefaultClause;
+      AST::ElementList *ElementList;
+      AST::Elision *Elision;
+      AST::ExpressionNode *Expression;
+      AST::Finally *Finally;
+      AST::FormalParameterList *FormalParameterList;
+      AST::FunctionBody *FunctionBody;
+      AST::FunctionDeclaration *FunctionDeclaration;
+      AST::Node *Node;
+      AST::PropertyName *PropertyName;
+      AST::PropertyNameAndValueList *PropertyNameAndValueList;
+      AST::SourceElement *SourceElement;
+      AST::SourceElements *SourceElements;
+      AST::Statement *Statement;
+      AST::StatementList *StatementList;
+      AST::Block *Block;
+      AST::VariableDeclaration *VariableDeclaration;
+      AST::VariableDeclarationList *VariableDeclarationList;
+
+      AST::UiProgram *UiProgram;
+      AST::UiImportList *UiImportList;
+      AST::UiImport *UiImport;
+      AST::UiPublicMember *UiPublicMember;
+      AST::UiObjectDefinition *UiObjectDefinition;
+      AST::UiObjectInitializer *UiObjectInitializer;
+      AST::UiObjectBinding *UiObjectBinding;
+      AST::UiScriptBinding *UiScriptBinding;
+      AST::UiArrayBinding *UiArrayBinding;
+      AST::UiObjectMember *UiObjectMember;
+      AST::UiObjectMemberList *UiObjectMemberList;
+      AST::UiQualifiedId *UiQualifiedId;
     };
 
 public:
-    JavaScriptParser();
-    ~JavaScriptParser();
+    Parser(Engine *engine);
+    ~Parser();
 
-    bool parse(JavaScriptEnginePrivate *driver);
+    bool parse();
 
-    JavaScript::AST::UiProgram *ast()
+    AST::UiProgram *ast()
     { return program; }
 
     QList<DiagnosticMessage> diagnosticMessages() const
@@ -172,17 +157,20 @@ protected:
     inline Value &sym(int index)
     { return sym_stack [tos + index - 1]; }
 
-    inline JavaScript::AST::SourceLocation &loc(int index)
+    inline AST::SourceLocation &loc(int index)
     { return location_stack [tos + index - 1]; }
 
+    AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
+
 protected:
+    Engine *driver;
     int tos;
     int stack_size;
     Value *sym_stack;
     int *state_stack;
-    JavaScript::AST::SourceLocation *location_stack;
+    AST::SourceLocation *location_stack;
 
-    JavaScript::AST::UiProgram *program;
+    AST::UiProgram *program;
 
     // error recovery
     enum { TOKEN_BUFFER_SIZE = 3 };
@@ -190,12 +178,12 @@ protected:
     struct SavedToken {
        int token;
        double dval;
-       JavaScript::AST::SourceLocation loc;
+       AST::SourceLocation loc;
     };
 
     double yylval;
-    JavaScript::AST::SourceLocation yylloc;
-    JavaScript::AST::SourceLocation yyprevlloc;
+    AST::SourceLocation yylloc;
+    AST::SourceLocation yyprevlloc;
 
     SavedToken token_buffer[TOKEN_BUFFER_SIZE];
     SavedToken *first_token;
@@ -204,10 +192,13 @@ protected:
     QList<DiagnosticMessage> diagnostic_messages;
 };
 
+} // end of namespace JavaScript
+
+
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 52
+#define J_SCRIPT_REGEXPLITERAL_RULE1 54
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 53
+#define J_SCRIPT_REGEXPLITERAL_RULE2 55
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/qml/parser/javascriptprettypretty.cpp b/src/declarative/qml/parser/javascriptprettypretty.cpp
index 6e632b7..0342b39 100644
--- a/src/declarative/qml/parser/javascriptprettypretty.cpp
+++ b/src/declarative/qml/parser/javascriptprettypretty.cpp
@@ -57,7 +57,7 @@
 QT_BEGIN_NAMESPACE
 
 namespace JavaScript {
-QString numberToString(qjsreal value);
+QString numberToString(double value);
 }
 
 using namespace JavaScript;
@@ -182,7 +182,7 @@ void PrettyPretty::endVisit(AST::ThisExpression *node)
 
 bool PrettyPretty::visit(AST::IdentifierExpression *node)
 {
-    out << JavaScriptEnginePrivate::toString(node->name);
+    out << Engine::toString(node->name);
     return true;
 }
 
@@ -229,7 +229,7 @@ void PrettyPretty::endVisit(AST::FalseLiteral *node)
 
 bool PrettyPretty::visit(AST::StringLiteral *node)
 {
-    QString lit = JavaScriptEnginePrivate::toString(node->value);
+    QString lit = Engine::toString(node->value);
     lit.replace(QLatin1String("\\"), QLatin1String("\\\\"));
     out << "\"" << lit << "\"";
     return false;
@@ -253,7 +253,7 @@ void PrettyPretty::endVisit(AST::NumericLiteral *node)
 
 bool PrettyPretty::visit(AST::RegExpLiteral *node)
 {
-    out << "/" << JavaScriptEnginePrivate::toString(node->pattern) << "/";
+    out << "/" << Engine::toString(node->pattern) << "/";
     if (node->flags)
         out << JavaScript::Ecma::RegExp::flagsToString(node->flags);
 
@@ -348,7 +348,7 @@ void PrettyPretty::endVisit(AST::PropertyNameAndValueList *node)
 
 bool PrettyPretty::visit(AST::IdentifierPropertyName *node)
 {
-    out << JavaScriptEnginePrivate::toString(node->id);
+    out << Engine::toString(node->id);
     return false;
 }
 
@@ -359,7 +359,7 @@ void PrettyPretty::endVisit(AST::IdentifierPropertyName *node)
 
 bool PrettyPretty::visit(AST::StringLiteralPropertyName *node)
 {
-    QString lit = JavaScriptEnginePrivate::toString(node->id);
+    QString lit = Engine::toString(node->id);
     lit.replace(QLatin1String("\\"), QLatin1String("\\\\"));
     out << lit;
     return false;
@@ -398,7 +398,7 @@ void PrettyPretty::endVisit(AST::ArrayMemberExpression *node)
 bool PrettyPretty::visit(AST::FieldMemberExpression *node)
 {
     accept(node->base);
-    out << "." << JavaScriptEnginePrivate::toString(node->name);
+    out << "." << Engine::toString(node->name);
     return false;
 }
 
@@ -803,7 +803,7 @@ void PrettyPretty::endVisit(AST::VariableStatement *node)
 
 bool PrettyPretty::visit(AST::VariableDeclaration *node)
 {
-    out << JavaScriptEnginePrivate::toString(node->name);
+    out << Engine::toString(node->name);
     if (node->expression) {
         out << " = ";
         accept(node->expression);
@@ -959,7 +959,7 @@ bool PrettyPretty::visit(AST::ContinueStatement *node)
 {
     out << "continue";
     if (node->label) {
-        out << " " << JavaScriptEnginePrivate::toString(node->label);
+        out << " " << Engine::toString(node->label);
     }
     out << ";";
     return false;
@@ -974,7 +974,7 @@ bool PrettyPretty::visit(AST::BreakStatement *node)
 {
     out << "break";
     if (node->label) {
-        out << " " << JavaScriptEnginePrivate::toString(node->label);
+        out << " " << Engine::toString(node->label);
     }
     out << ";";
     return false;
@@ -1095,7 +1095,7 @@ void PrettyPretty::endVisit(AST::DefaultClause *node)
 
 bool PrettyPretty::visit(AST::LabelledStatement *node)
 {
-    out << JavaScriptEnginePrivate::toString(node->label) << ": ";
+    out << Engine::toString(node->label) << ": ";
     return true;
 }
 
@@ -1123,7 +1123,7 @@ bool PrettyPretty::visit(AST::TryStatement *node)
     out << "try ";
     acceptAsBlock(node->statement);
     if (node->catchExpression) {
-        out << " catch (" << JavaScriptEnginePrivate::toString(node->catchExpression->name) << ") ";
+        out << " catch (" << Engine::toString(node->catchExpression->name) << ") ";
         acceptAsBlock(node->catchExpression->statement);
     }
     if (node->finallyExpression) {
@@ -1166,13 +1166,13 @@ bool PrettyPretty::visit(AST::FunctionDeclaration *node)
     out << "function";
 
     if (node->name)
-        out << " " << JavaScriptEnginePrivate::toString(node->name);
+        out << " " << Engine::toString(node->name);
 
     // the arguments
     out << "(";
     for (AST::FormalParameterList *it = node->formals; it; it = it->next) {
         if (it->name)
-            out << JavaScriptEnginePrivate::toString(it->name);
+            out << Engine::toString(it->name);
 
         if (it->next)
             out << ", ";
@@ -1205,13 +1205,13 @@ bool PrettyPretty::visit(AST::FunctionExpression *node)
     out << "function";
 
     if (node->name)
-        out << " " << JavaScriptEnginePrivate::toString(node->name);
+        out << " " << Engine::toString(node->name);
 
     // the arguments
     out << "(";
     for (AST::FormalParameterList *it = node->formals; it; it = it->next) {
         if (it->name)
-            out << JavaScriptEnginePrivate::toString(it->name);
+            out << Engine::toString(it->name);
 
         if (it->next)
             out << ", ";
diff --git a/src/declarative/qml/parser/javascriptvalue.h b/src/declarative/qml/parser/javascriptvalue.h
deleted file mode 100644
index c68b817..0000000
--- a/src/declarative/qml/parser/javascriptvalue.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef JAVASCRIPTVALUE_H
-#define JAVASCRIPTVALUE_H
-
-typedef double qjsreal;
-
-#endif // JAVASCRIPTVALUE_H
diff --git a/src/declarative/qml/parser/parser.pri b/src/declarative/qml/parser/parser.pri
index 130aeaf..b4d226a 100644
--- a/src/declarative/qml/parser/parser.pri
+++ b/src/declarative/qml/parser/parser.pri
@@ -8,8 +8,7 @@ HEADERS += $$PWD/javascriptast_p.h \
            $$PWD/javascriptmemorypool_p.h \
            $$PWD/javascriptnodepool_p.h \
            $$PWD/javascriptparser_p.h \
-           $$PWD/javascriptprettypretty_p.h \
-           $$PWD/javascriptvalue.h \
+           $$PWD/javascriptprettypretty_p.h
 
 SOURCES += $$PWD/javascriptast.cpp \
            $$PWD/javascriptastvisitor.cpp \
diff --git a/src/declarative/qml/qmlbindablevalue.h b/src/declarative/qml/qmlbindablevalue.h
index c4ef64a..7831177 100644
--- a/src/declarative/qml/qmlbindablevalue.h
+++ b/src/declarative/qml/qmlbindablevalue.h
@@ -42,10 +42,10 @@
 #ifndef QMLBINDABLEVALUE_H
 #define QMLBINDABLEVALUE_H
 
-#include <QObject>
-#include <qfxglobal.h>
-#include <qml.h>
-#include <qmlpropertyvaluesource.h>
+#include <QtCore/QObject>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qmlpropertyvaluesource.h>
 #include <QtDeclarative/qmlexpression.h>
 
 
diff --git a/src/declarative/qml/qmlbindablevalue_p.h b/src/declarative/qml/qmlbindablevalue_p.h
index d9af0ef..9973bdc 100644
--- a/src/declarative/qml/qmlbindablevalue_p.h
+++ b/src/declarative/qml/qmlbindablevalue_p.h
@@ -43,8 +43,8 @@
 #define QMLBINDABLEVALUE_P_H
 
 #include <private/qobject_p.h>
-#include <qmlbindablevalue.h>
-#include <qmlmetaproperty.h>
+#include <QtDeclarative/qmlbindablevalue.h>
+#include <QtDeclarative/qmlmetaproperty.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlboundsignal_p.h b/src/declarative/qml/qmlboundsignal_p.h
index e84f0c1..2c05770 100644
--- a/src/declarative/qml/qmlboundsignal_p.h
+++ b/src/declarative/qml/qmlboundsignal_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLBOUNDSIGNAL_P_H
 #define QMLBOUNDSIGNAL_P_H
 
-#include <qmlexpression.h>
+#include <QtDeclarative/qmlexpression.h>
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlcompiledcomponent_p.h b/src/declarative/qml/qmlcompiledcomponent_p.h
index c5e1226..2201423 100644
--- a/src/declarative/qml/qmlcompiledcomponent_p.h
+++ b/src/declarative/qml/qmlcompiledcomponent_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLCOMPILEDCOMPONENT_P_H
 #define QMLCOMPILEDCOMPONENT_P_H
 
-#include <qml.h>
+#include <QtDeclarative/qml.h>
 #include <private/qmlinstruction_p.h>
 #include <private/qmlcompiler_p.h>
 #include <private/qmlrefcount_p.h>
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index b205efb..8990732 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -1050,8 +1050,9 @@ bool QmlCompiler::compileListProperty(QmlParser::Property *prop,
                     COMPILE_EXCEPTION("Can only assign one binding to lists");
 
                 assignedBinding = true;
-                compileBinding(v->value.asScript(), prop, ctxt, 
-                               obj->metaObject(), v->location.start.line);
+                COMPILE_CHECK(compileBinding(v->value.asScript(), prop, ctxt, 
+                                             obj->metaObject(), 
+                                             v->location.start.line));
                 v->type = Value::PropertyBinding;
             } else {
                 COMPILE_EXCEPTION("Cannot assign primitives to lists");
@@ -1204,8 +1205,9 @@ bool QmlCompiler::compilePropertyLiteralAssignment(QmlParser::Property *prop,
 {
     if (v->value.isScript()) {
 
-        compileBinding(v->value.asScript(), prop, ctxt, obj->metaObject(), 
-                       v->location.start.line);
+        COMPILE_CHECK(compileBinding(v->value.asScript(), prop, ctxt, 
+                                     obj->metaObject(), 
+                                     v->location.start.line));
 
         v->type = Value::PropertyBinding;
 
@@ -1214,37 +1216,24 @@ bool QmlCompiler::compilePropertyLiteralAssignment(QmlParser::Property *prop,
         QmlInstruction assign;
         assign.line = v->location.start.line;
 
-        bool doassign = true;
         if (prop->index != -1) {
             QString value = v->primitive();
             StoreInstructionResult r = 
                 generateStoreInstruction(*output, assign, obj->metaObject()->property(prop->index), prop->index, -1, &value);
 
             if (r == Ok) {
-                doassign = false;
             } else if (r == InvalidData) {
                 //### we are restricted to a rather generic message here. If we can find a way to move
                 //    the exception into generateStoreInstruction we could potentially have better messages.
                 //    (the problem is that both compile and run exceptions can be generated, though)
                 COMPILE_EXCEPTION2(v, "Cannot assign value" << v->primitive() << "to property" << obj->metaObject()->property(prop->index).name());
-                doassign = false;
             } else if (r == ReadOnly) {
                 COMPILE_EXCEPTION2(v, "Cannot assign value" << v->primitive() << "to the read-only property" << obj->metaObject()->property(prop->index).name());
             } else {
-                doassign = true;
+                COMPILE_EXCEPTION2(prop, "Cannot assign value to property" << obj->metaObject()->property(prop->index).name() << "of unknown type");
             }
-        }
-
-        if (doassign) {
-            assign.type = QmlInstruction::AssignConstant;
-            if (prop->isDefault) {
-                assign.assignConstant.property = -1;
-            } else {
-                assign.assignConstant.property = 
-                    output->indexForByteArray(prop->name);
-            }
-            assign.assignConstant.constant = 
-                output->indexForString(v->primitive());
+        } else {
+            COMPILE_EXCEPTION2(prop, "Cannot assign value to non-existant property" << prop->name);
         }
 
         output->bytecode << assign;
@@ -1342,7 +1331,7 @@ bool QmlCompiler::compileDynamicMeta(QmlParser::Object *obj)
     return true;
 }
 
-void QmlCompiler::compileBinding(const QString &bind, QmlParser::Property *prop,
+bool QmlCompiler::compileBinding(const QString &bind, QmlParser::Property *prop,
                                  int ctxt, const QMetaObject *mo, qint64 line)
 {
     QmlBasicScript bs;
@@ -1355,10 +1344,12 @@ void QmlCompiler::compileBinding(const QString &bind, QmlParser::Property *prop,
         bref = output->indexForString(bind);
     }
 
-    QmlInstruction assign;
-    assign.assignBinding.context = ctxt;
-    assign.line = line;
     if (prop->index != -1) {
+
+        QmlInstruction assign;
+        assign.assignBinding.context = ctxt;
+        assign.line = line;
+
         if (bs.isValid()) 
             assign.type = QmlInstruction::StoreCompiledBinding;
         else
@@ -1368,20 +1359,18 @@ void QmlCompiler::compileBinding(const QString &bind, QmlParser::Property *prop,
         assign.assignBinding.value = bref;
         assign.assignBinding.category = QmlMetaProperty::Unknown;
         if (mo) {
-            //XXX we should generate an exception if the property is read-only
+            // ### we should generate an exception if the property is read-only
             QMetaProperty mp = mo->property(assign.assignBinding.property);
             assign.assignBinding.category = QmlMetaProperty::propertyCategory(mp);
         } 
+
+        output->bytecode << assign;
+
     } else {
-        if (bs.isValid())
-            assign.type = QmlInstruction::AssignCompiledBinding;
-        else
-            assign.type = QmlInstruction::AssignBinding;
-        assign.assignBinding.property = output->indexForByteArray(prop->name);
-        assign.assignBinding.value = bref;
-        assign.assignBinding.category = QmlMetaProperty::Unknown;
+        COMPILE_EXCEPTION2(prop, "Cannot assign binding to non-existant property" << prop->name);
     }
-    output->bytecode << assign;
+
+    return true;
 }
 
 int QmlCompiler::optimizeExpressions(int start, int end, int patch)
@@ -1414,9 +1403,7 @@ int QmlCompiler::optimizeExpressions(int start, int end, int patch)
             continue;
         }
         
-        if (instr.type == QmlInstruction::AssignBinding ||
-            instr.type == QmlInstruction::AssignCompiledBinding ||
-            instr.type == QmlInstruction::StoreBinding ||
+        if (instr.type == QmlInstruction::StoreBinding ||
             instr.type == QmlInstruction::StoreCompiledBinding) {
             ++bindingsCount;
         } else if (instr.type == QmlInstruction::TryBeginObject ||
diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h
index 64400c5..bc04cfa 100644
--- a/src/declarative/qml/qmlcompiler_p.h
+++ b/src/declarative/qml/qmlcompiler_p.h
@@ -44,8 +44,8 @@
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qset.h>
-#include <qml.h>
-#include <qmlerror.h>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qmlerror.h>
 #include <private/qmlinstruction_p.h>
 #include <private/qmlcompositetypemanager_p.h>
 #include <private/qmlparser_p.h>
@@ -164,7 +164,7 @@ private:
                                           int ctxt);
 
     bool compileDynamicMeta(QmlParser::Object *obj);
-    void compileBinding(const QString &, QmlParser::Property *prop,
+    bool compileBinding(const QString &, QmlParser::Property *prop,
                         int ctxt, const QMetaObject *, qint64);
 
     int optimizeExpressions(int start, int end, int patch = -1);
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h
index 4de47c6..254d9ba 100644
--- a/src/declarative/qml/qmlcomponent_p.h
+++ b/src/declarative/qml/qmlcomponent_p.h
@@ -42,21 +42,21 @@
 #ifndef QMLCOMPONENT_P_H
 #define QMLCOMPONENT_P_H
 
-#include <QString>
-#include <QStringList>
-#include <QList>
-#include "private/qobject_p.h"
-#include "private/qmlengine_p.h"
-#include "private/qmlcompositetypemanager_p.h"
-#include <qmlerror.h>
-#include "qmlcomponent.h"
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QList>
+#include <private/qobject_p.h>
+#include <private/qmlengine_p.h>
+#include <private/qmlcompositetypemanager_p.h>
+#include <QtDeclarative/qmlerror.h>
+#include <QtDeclarative/qmlcomponent.h>
+#include <QtDeclarative/qml.h>
+
+QT_BEGIN_NAMESPACE
+
 class QmlComponent;
 class QmlEngine;
 class QmlCompiledComponent;
-#include "qml.h"
-
-
-QT_BEGIN_NAMESPACE
 
 class QmlComponentPrivate : public QObjectPrivate
 {
diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h
index f03b2cb..9312819 100644
--- a/src/declarative/qml/qmlcompositetypemanager_p.h
+++ b/src/declarative/qml/qmlcompositetypemanager_p.h
@@ -42,10 +42,10 @@
 #ifndef QMLCOMPOSITETYPEMANAGER_P_H
 #define QMLCOMPOSITETYPEMANAGER_P_H
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 #include <private/qmlscriptparser_p.h>
 #include <private/qmlrefcount_p.h>
-#include <qmlerror.h>
+#include <QtDeclarative/qmlerror.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index fa36eb1..ea72ebf 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -149,7 +149,7 @@ void QmlContextPrivate::addDefaultObject(QObject *object, Priority priority)
     QmlContext context(engine.rootContext());
     context.setContextProperty("myModel", modelData);
 
-    QmlComponent component("ListView { model=myModel }");
+    QmlComponent component(&engine, "ListView { model=myModel }");
     component.create(&context);
     \endcode
 
@@ -176,7 +176,7 @@ void QmlContextPrivate::addDefaultObject(QObject *object, Priority priority)
     QmlContext context(engine.rootContext());
     context.addDefaultObject(&myDataSet);
 
-    QmlComponent component("ListView { model=myModel }");
+    QmlComponent component(&engine, "ListView { model=myModel }");
     component.create(&context);
     \endcode
 
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index 6f1e486..4d88fc2 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -42,11 +42,11 @@
 #ifndef QMLCONTEXT_P_H
 #define QMLCONTEXT_P_H
 
-#include <qmlcontext.h>
+#include <QtDeclarative/qmlcontext.h>
 #include <private/qobject_p.h>
 #include <private/qmldeclarativedata_p.h>
-#include <qhash.h>
-#include <qscriptvalue.h>
+#include <QtCore/qhash.h>
+#include <QtScript/qscriptvalue.h>
 #include <QtCore/qset.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlcustomparser.cpp b/src/declarative/qml/qmlcustomparser.cpp
index e864df9..a60f783 100644
--- a/src/declarative/qml/qmlcustomparser.cpp
+++ b/src/declarative/qml/qmlcustomparser.cpp
@@ -120,6 +120,7 @@ QmlCustomParserNodePrivate::fromObject(QmlParser::Object *root)
     return rootNode;
 }
 
+#include <QtCore/qdebug.h>
 QmlCustomParserProperty 
 QmlCustomParserNodePrivate::fromProperty(QmlParser::Property *p)
 {
@@ -127,20 +128,23 @@ QmlCustomParserNodePrivate::fromProperty(QmlParser::Property *p)
     prop.d->name = p->name;
     prop.d->isList = (p->values.count() > 1);
 
-    for(int ii = 0; ii < p->values.count(); ++ii) {
-        Value *v = p->values.at(ii);
+    if (p->value) {
+        QmlCustomParserNode node = fromObject(p->value);
+        QList<QmlCustomParserProperty> props = node.properties();
+        for (int ii = 0; ii < props.count(); ++ii)
+            prop.d->values << QVariant::fromValue(props.at(ii));
+    } else {
+        for(int ii = 0; ii < p->values.count(); ++ii) {
+            Value *v = p->values.at(ii);
+
+            if(v->object) {
+                QmlCustomParserNode node = fromObject(v->object);
+                prop.d->values << QVariant::fromValue(node);
+            } else {
+                prop.d->values << QVariant::fromValue(v->value);
+            }
 
-        // We skip fetched properties for now
-        if(v->object && v->object->type == -1)
-            continue;
-
-        if(v->object) {
-            QmlCustomParserNode node = fromObject(v->object);
-            prop.d->values << QVariant::fromValue(node);
-        } else {
-            prop.d->values << QVariant::fromValue(v->primitive());
         }
-
     }
 
     return prop;
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
index e4e6089..fd780d6 100644
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ b/src/declarative/qml/qmlcustomparser_p.h
@@ -65,6 +65,8 @@ public:
     QByteArray name() const;
 
     bool isList() const;
+    // Will be one of QmlParser::Variant, QmlCustomParserProperty or 
+    // QmlCustomParserNode
     QList<QVariant> assignedValues() const;
 
 private:
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 673520e..9871fcb 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -477,12 +477,7 @@ QmlDomObjectPrivate::properties(QmlParser::Property *property) const
             iter->second.prepend(name);
 
     } else {
-
-        // We don't display "id" sets as a property in the dom
-        if (property->values.count() != 1 || 
-           property->values.at(0)->type != QmlParser::Value::Id)
-            rv << qMakePair(property, property->name);
-
+        rv << qMakePair(property, property->name);
     }
 
     return rv;
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 227aeb0..c0ea463 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -193,6 +193,7 @@ void QmlEnginePrivate::clear(SimpleList<QmlParserStatus> &pss)
 
 void QmlEnginePrivate::init()
 {
+    scriptEngine.installTranslatorFunctions();
     contextClass = new QmlContextScriptClass(q);
     objectClass = new QmlObjectScriptClass(q);
     rootContext = new QmlContext(q);
@@ -424,8 +425,8 @@ bool QmlEnginePrivate::loadCache(QmlBasicScriptNodeCache &cache, const QString &
     
     \code
     QmlEngine engine;
-    QmlComponent component("Text { text: \"Hello world!\" }");
-    QFxItem *item = qobject_cast<QFxItem *>(component.create(&engine));
+    QmlComponent component(&engine, "Text { text: \"Hello world!\" }");
+    QFxItem *item = qobject_cast<QFxItem *>(component.create());
 
     //add item to view, etc
     ...
@@ -614,6 +615,35 @@ QUrl QmlEngine::componentUrl(const QUrl& src, const QUrl& baseUrl) const
 }
 
 /*!
+  Returns the list of base urls the engine browses to find sub-components.
+
+  The search path consists of the base of the \a url, and, in the case of local files,
+  the directories imported using the "import" statement in \a qml.
+  */
+QList<QUrl> QmlEngine::componentSearchPath(const QByteArray &qml, const QUrl &url) const
+{
+    QList<QUrl> searchPath;
+
+    searchPath << url.resolved(QUrl(QLatin1String(".")));
+
+    if (QFileInfo(url.toLocalFile()).exists()) {
+        QmlScriptParser parser;
+        if (parser.parse(qml, url)) {
+            for (int i = 0; i < parser.imports().size(); ++i) {
+                QUrl importUrl = QUrl(parser.imports().at(i).uri);
+                if (importUrl.isRelative()) {
+                    searchPath << url.resolved(importUrl);
+                } else {
+                    searchPath << importUrl;
+                }
+            }
+        }
+    }
+
+    return searchPath;
+}
+
+/*!
     Sets the common QNetworkAccessManager, \a network, used by all QML elements instantiated
     by this engine.
 
@@ -781,17 +811,17 @@ QmlEngine *QmlEngine::activeEngine()
 
 
 QmlExpressionPrivate::QmlExpressionPrivate(QmlExpression *b)
-: q(b), ctxt(0), sseData(0), proxy(0), me(0), trackChange(false), id(0), log(0)
+: q(b), ctxt(0), sseData(0), proxy(0), me(0), trackChange(false), line(-1), id(0), log(0)
 {
 }
 
 QmlExpressionPrivate::QmlExpressionPrivate(QmlExpression *b, void *expr, QmlRefCount *rc)
-: q(b), ctxt(0), sse((const char *)expr, rc), sseData(0), proxy(0), me(0), trackChange(true), id(0), log(0)
+: q(b), ctxt(0), sse((const char *)expr, rc), sseData(0), proxy(0), me(0), trackChange(true), line(-1), id(0), log(0)
 {
 }
 
 QmlExpressionPrivate::QmlExpressionPrivate(QmlExpression *b, const QString &expr, bool ssecompile)
-: q(b), ctxt(0), expression(expr), sseData(0), proxy(0), me(0), trackChange(true), id(0), log(0)
+: q(b), ctxt(0), expression(expr), sseData(0), proxy(0), me(0), trackChange(true), line(-1), id(0), log(0)
 {
     if (ssecompile) {
 #ifdef Q_ENABLE_PERFORMANCE_LOG
@@ -996,7 +1026,7 @@ QVariant QmlExpression::value()
         for (int i = context()->d_func()->scopeChain.size() - 1; i > -1; --i) {
             scriptEngine->currentContext()->pushScope(context()->d_func()->scopeChain.at(i));
         }
-        QScriptValue svalue = scriptEngine->evaluate(expression());
+        QScriptValue svalue = scriptEngine->evaluate(expression(), d->fileName, d->line);
         if (scriptEngine->hasUncaughtException()) {
             if (scriptEngine->uncaughtException().isError()){
                 QScriptValue exception = scriptEngine->uncaughtException();
@@ -1027,9 +1057,7 @@ QVariant QmlExpression::value()
                 }
                 rv = QVariant::fromValue(list);
             }
-        } /*else if (svalue.isVariant()) {
-            rv = svalue.toVariant();
-        }*/ else if (svalue.isObject()) {
+        } else if (svalue.isObject()) {
             QScriptValue objValue = svalue.data();
             if (objValue.isValid())
                 rv = objValue.toVariant();
@@ -1153,6 +1181,16 @@ void QmlExpression::setTrackChange(bool trackChange)
 }
 
 /*!
+    Set the location of this expression to \a line of \a fileName. This information
+    is used by the script engine.
+*/
+void QmlExpression::setSourceLocation(const QString &fileName, int line)
+{
+    d->fileName = fileName;
+    d->line = line;
+}
+
+/*!
     Returns the expression's scope object, if provided, otherwise 0.
 
     In addition to data provided by the expression's QmlContext, the scope 
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index fde84d4..9382389 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -78,6 +78,8 @@ public:
     QMap<QString,QString> nameSpacePaths() const;
     QUrl componentUrl(const QUrl& src, const QUrl& baseUrl) const;
 
+    QList<QUrl> componentSearchPath(const QByteArray &qml, const QUrl &url) const;
+
     void setNetworkAccessManager(QNetworkAccessManager *);
     QNetworkAccessManager *networkAccessManager() const;
 
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 7578fdf..0dc4736 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -42,9 +42,9 @@
 #ifndef QMLENGINE_P_H
 #define QMLENGINE_P_H
 
-#include <QScriptClass>
-#include <QScriptValue>
-#include <QScriptString>
+#include <QtScript/QScriptClass>
+#include <QtScript/QScriptValue>
+#include <QtScript/QScriptString>
 #include <QtCore/qstring.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
@@ -52,11 +52,11 @@
 #include <private/qobject_p.h>
 #include <private/qmlclassfactory_p.h>
 #include <private/qmlcompositetypemanager_p.h>
-#include <qml.h>
-#include <qmlbasicscript.h>
-#include <qmlcontext.h>
-#include <qmlengine.h>
-#include <qmlexpression.h>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qmlbasicscript.h>
+#include <QtDeclarative/qmlcontext.h>
+#include <QtDeclarative/qmlengine.h>
+#include <QtDeclarative/qmlexpression.h>
 #include <QtScript/qscriptengine.h>
 
 QT_BEGIN_NAMESPACE
@@ -277,6 +277,8 @@ public:
     BindExpressionProxy *proxy;
     QObject *me;
     bool trackChange;
+    QString fileName;
+    int line;
 
     quint32 id;
 
diff --git a/src/declarative/qml/qmlexpression.h b/src/declarative/qml/qmlexpression.h
index 2c6b1ad..ea3b093 100644
--- a/src/declarative/qml/qmlexpression.h
+++ b/src/declarative/qml/qmlexpression.h
@@ -78,6 +78,8 @@ public:
     bool trackChange() const;
     void setTrackChange(bool);
 
+    void setSourceLocation(const QString &fileName, int line);
+
     QObject *scopeObject() const;
 
     quint32 id() const;
diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp
index 6b49359..923d36f 100644
--- a/src/declarative/qml/qmlinstruction.cpp
+++ b/src/declarative/qml/qmlinstruction.cpp
@@ -124,18 +124,9 @@ void QmlCompiledComponent::dump(QmlInstruction *instr, int idx)
     case QmlInstruction::StoreSignal:
         qWarning() << idx << "\t" << line << "\t" << "STORE_SIGNAL\t\t" << instr->storeSignal.signalIndex << "\t" << instr->storeSignal.value << "\t\t" << primitives.at(instr->storeSignal.value);
         break;
-    case QmlInstruction::AssignConstant:
-        qWarning() << idx << "\t" << line << "\t" << "ASSIGN_CONSTANT\t" << instr->assignConstant.property << "\t" << instr->assignConstant.constant << "\t\t" << datas.at(instr->assignConstant.property) << primitives.at(instr->assignConstant.constant);
-        break;
     case QmlInstruction::AssignSignalObject:
         qWarning() << idx << "\t" << line << "\t" << "ASSIGN_SIGNAL_OBJECT\t" << instr->assignSignalObject.signal << "\t\t\t" << datas.at(instr->assignSignalObject.signal);
         break;
-    case QmlInstruction::AssignBinding:
-        qWarning() << idx << "\t" << line << "\t" << "ASSIGN_BINDING\t\t" << instr->assignBinding.property << "\t" << instr->assignBinding.value << "\t\t" << instr->assignBinding.context << datas.at(instr->assignBinding.property) << primitives.at(instr->assignBinding.value);
-        break;
-    case QmlInstruction::AssignCompiledBinding:
-        qWarning() << idx << "\t" << line << "\t" << "ASSIGN_COMPILED_BINDING\t" << instr->assignBinding.property << "\t" << instr->assignBinding.value << "\t\t" << instr->assignBinding.context << datas.at(instr->assignBinding.property);
-        break;
     case QmlInstruction::AssignValueSource:
         qWarning() << idx << "\t" << line << "\t" << "ASSIGN_VALUE_SOURCE\t" << instr->assignValueSource.property << "\t\t\t" << datas.at(instr->assignValueSource.property);
         break;
diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h
index f06f0e6..a21ccee 100644
--- a/src/declarative/qml/qmlinstruction_p.h
+++ b/src/declarative/qml/qmlinstruction_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLINSTRUCTION_P_H
 #define QMLINSTRUCTION_P_H
 
-#include <qfxglobal.h>
+#include <QtDeclarative/qfxglobal.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -110,14 +110,9 @@ public:
         //
         // Unresolved single assignment
         //
-        //    AssignConstant - Store a value in a property.  Will resolve into
-        //                     a Store* instruction.
-        AssignConstant,           /* assignConstant */
         AssignSignalObject,       /* assignSignalObject */
         AssignCustomType,          /* assignCustomType */
 
-        AssignBinding,            /* assignBinding */
-        AssignCompiledBinding,    /* assignBinding */
         AssignValueSource,        /* assignValueSource */
         StoreBinding,             /* assignBinding */
         StoreCompiledBinding,     /* assignBinding */
@@ -187,10 +182,6 @@ public:
         } setId;
         struct {
             int property;
-            int constant;
-        } assignConstant;
-        struct {
-            int property;
             int castValue;
         } assignObject;
         struct {
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 59d6b38..e3e9ff5 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -100,9 +100,16 @@ QmlMetaProperty::~QmlMetaProperty()
     delete d; d = 0;
 }
 
-// ### not thread safe
-static QHash<const QMetaObject *, QMetaPropertyEx> qmlCacheDefProp;
+struct CachedPropertyData {
+    CachedPropertyData(const QString &n, int pt, int ci)
+    : name(n), propType(pt), coreIdx(ci) {}
+    QString name;
+    int propType;
+    int coreIdx;
+};
 
+// ### not thread safe
+static QHash<const QMetaObject *, CachedPropertyData> qmlCacheDefProp;
 
 /*!
     Creates a QmlMetaProperty for the default property of \a obj. If there is no
@@ -131,23 +138,22 @@ void QmlMetaProperty::initDefault(QObject *obj)
         return;
 
     d->object = obj;
-    QHash<const QMetaObject *, QMetaPropertyEx>::ConstIterator iter =
+    QHash<const QMetaObject *, CachedPropertyData>::ConstIterator iter =
         qmlCacheDefProp.find(obj->metaObject());
     if (iter != qmlCacheDefProp.end()) {
-        d->prop = *iter;
-        d->propType = iter->propertyType;
-        d->coreIdx = iter->propertyType;
+        d->name = iter->name;
+        d->propType = iter->propType;
+        d->coreIdx = iter->coreIdx;
     } else {
         QMetaPropertyEx p(QmlMetaType::defaultProperty(obj));
-        d->prop = p;
+        d->name = QLatin1String(p.name());
         d->propType = p.propertyType;
-        d->coreIdx = d->prop.propertyIndex();
+        d->coreIdx = p.propertyIndex();
         if (!QObjectPrivate::get(obj)->metaObject)
-            qmlCacheDefProp.insert(obj->metaObject(), d->prop);
+            qmlCacheDefProp.insert(obj->metaObject(), CachedPropertyData(d->name, d->propType, d->coreIdx));
     }
-    if (d->prop.name() != 0) {
+    if (!d->name.isEmpty()) {
         d->type = Property | Default;
-        d->name = QLatin1String(d->prop.name());
     }
 }
 
@@ -166,15 +172,14 @@ QmlMetaProperty::QmlMetaProperty(QObject *obj, int idx, PropertyCategory cat, Qm
     d->type = Property;
     d->category = cat;
     QMetaPropertyEx p(obj->metaObject()->property(idx));
-    d->prop = p;
     d->propType = p.propertyType;
     d->coreIdx = idx;
-    if (d->prop.name() != 0)
-        d->name = QLatin1String(d->prop.name());
+    if (p.name() != 0)
+        d->name = QLatin1String(p.name());
 }
 
 // ### Not thread safe!!!!
-static QHash<const QMetaObject *, QHash<QString, QMetaPropertyEx> > qmlCacheProps;
+static QHash<const QMetaObject *, QHash<QString, CachedPropertyData> > qmlCacheProps;
 /*!
     Creates a QmlMetaProperty for the property \a name of \a obj.
  */
@@ -225,21 +230,21 @@ void QmlMetaProperty::initProperty(QObject *obj, const QString &name)
     } 
 
     // Property
-    QHash<QString, QMetaPropertyEx> &props = qmlCacheProps[obj->metaObject()];
-    QHash<QString, QMetaPropertyEx>::ConstIterator iter = props.find(name);
+    QHash<QString, CachedPropertyData> &props = qmlCacheProps[obj->metaObject()];
+    QHash<QString, CachedPropertyData>::ConstIterator iter = props.find(name);
     if (iter != props.end()) {
-        d->prop = *iter;
-        d->propType = iter->propertyType;
-        d->coreIdx = iter->propertyIndex();
+        d->name = iter->name;
+        d->propType = iter->propType;
+        d->coreIdx = iter->coreIdx;
     } else {
         QMetaPropertyEx p = QmlMetaType::property(obj, name.toLatin1().constData());
-        d->prop = p;
+        d->name = QLatin1String(p.name());
         d->propType = p.propertyType;
         d->coreIdx = p.propertyIndex();
         if (!QObjectPrivate::get(obj)->metaObject)
-            props.insert(name, p);
+            props.insert(name, CachedPropertyData(d->name, d->propType, d->coreIdx));
     }
-    if (d->prop.name() != 0) 
+    if (!d->name.isEmpty())
         d->type = Property;
 
     if (d->type == Invalid) {
@@ -352,8 +357,8 @@ QmlMetaProperty::propertyCategory(const QMetaProperty &prop)
 */
 const char *QmlMetaProperty::propertyTypeName() const
 {
-    if (d->prop.name()) {
-        return d->prop.typeName();
+    if (!d->name.isEmpty()) {
+        return d->object->metaObject()->property(d->coreIdx).typeName();
     } else {
         return 0;
     }
@@ -365,7 +370,7 @@ const char *QmlMetaProperty::propertyTypeName() const
 */
 bool QmlMetaProperty::operator==(const QmlMetaProperty &other) const
 {
-    return d->prop.name() == other.d->prop.name() &&
+    return d->name == other.d->name &&
            d->signal.signature() == other.d->signal.signature() &&
            d->type == other.d->type &&
            d->object == other.d->object;
@@ -384,7 +389,7 @@ int QmlMetaPropertyPrivate::propertyType() const
 {
     int rv = QVariant::Invalid;
 
-    if (prop.name()) {
+    if (!name.isEmpty()) {
         if (propType == (int)QVariant::LastType)
             rv = qMetaTypeId<QVariant>();
         else
@@ -434,7 +439,6 @@ QObject *QmlMetaProperty::object() const
 QmlMetaProperty &QmlMetaProperty::operator=(const QmlMetaProperty &other)
 {
     d->name = other.d->name;
-    d->prop = other.d->prop;
     d->propType = other.d->propType;
     d->type = other.d->type;
     d->signal = other.d->signal;
@@ -452,8 +456,8 @@ bool QmlMetaProperty::isWritable() const
 {
     if (propertyCategory() == List || propertyCategory() == QmlList)
         return true;
-    else if (d->prop.name() != 0)
-        return d->prop.isWritable();
+    else if (!d->name.isEmpty())
+        return d->object->metaObject()->property(d->coreIdx).isWritable();
     else if (type() & SignalProperty)
         return true;
     else
@@ -465,8 +469,8 @@ bool QmlMetaProperty::isWritable() const
 */
 bool QmlMetaProperty::isDesignable() const
 {
-    if (d->prop.name() != 0)
-        return d->prop.isDesignable();
+    if (!d->name.isEmpty())
+        return d->object->metaObject()->property(d->coreIdx).isDesignable();
     else
         return false;
 }
@@ -510,9 +514,9 @@ QString QmlMetaProperty::name() const
   Returns the \l{QMetaProperty} {Qt property} associated with
   this QML property.
  */
-const QMetaProperty &QmlMetaProperty::property() const
+QMetaProperty QmlMetaProperty::property() const
 {
-    return d->prop;
+    return d->object->metaObject()->property(d->coreIdx);
 }
 
 /*!
@@ -602,7 +606,7 @@ QVariant QmlMetaProperty::read() const
         if (type() & Attached) 
             return QVariant::fromValue(d->attachedObject());
         else
-            return d->prop.read(object());
+            return d->object->metaObject()->property(d->coreIdx).read(object());
     }
     return QVariant();
 }
@@ -636,6 +640,7 @@ void QmlMetaPropertyPrivate::writeSignalProperty(const QVariant &value)
 
 void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value)
 {
+    QMetaProperty prop = object->metaObject()->property(coreIdx);
     if (prop.isEnumType()) {
         QVariant v = value;
         if (value.type() == QVariant::Double) {   //enum values come through the script engine as doubles
@@ -805,13 +810,14 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value)
 */
 void QmlMetaProperty::write(const QVariant &value) const
 {
+    QMetaProperty prop = d->object->metaObject()->property(d->coreIdx);
     if (type() & SignalProperty) {
 
         d->writeSignalProperty(value);
 
-    } else if (d->prop.name()) {
+    } else if (prop.name()) {
 
-        if (d->prop.isEnumType()) {
+        if (prop.isEnumType()) {
             QVariant v = value;
             if (value.type() == QVariant::Double) {   //enum values come through the script engine as doubles
                 double integral;
@@ -819,7 +825,7 @@ void QmlMetaProperty::write(const QVariant &value) const
                 if (qFuzzyCompare(fractional, (double)0.0))
                     v.convert(QVariant::Int);
             }
-            d->prop.write(object(), v);
+            prop.write(object(), v);
         } else {
             if (!value.isValid())
                 return;
@@ -836,13 +842,13 @@ void QmlMetaProperty::write(const QVariant &value) const
 
             } else if (qMetaTypeId<QVariant>() == t) {
 
-                d->prop.write(object(), value);
+                prop.write(object(), value);
 
             } else if (propertyCategory() == Object) {
 
                 QObject *o = QmlMetaType::toQObject(value);
                 if (o) 
-                    d->prop.write(object(), QmlMetaType::fromObject(o, propertyType()));
+                    prop.write(object(), QmlMetaType::fromObject(o, propertyType()));
 
             } else if (propertyCategory() == List) {
 
@@ -850,7 +856,7 @@ void QmlMetaProperty::write(const QVariant &value) const
                 if (value.userType() == qMetaTypeId<QList<QObject *> >()) {
                     const QList<QObject *> &list =
                         qvariant_cast<QList<QObject *> >(value);
-                    QVariant listVar = d->prop.read(object());
+                    QVariant listVar = prop.read(object());
                     QmlMetaType::clear(listVar);
                     for (int ii = 0; ii < list.count(); ++ii) {
                         QVariant v = QmlMetaType::fromObject(list.at(ii), listType);
@@ -859,14 +865,14 @@ void QmlMetaProperty::write(const QVariant &value) const
 
                 } else if (vt == listType ||
                           value.userType() == listType) {
-                    QVariant listVar = d->prop.read(object());
+                    QVariant listVar = prop.read(object());
                     if (!QmlMetaType::append(listVar, value)) {
                         qWarning() << "QmlMetaProperty: Unable to assign object to list";
                     }
                 }
             } else if (propertyCategory() == QmlList) {
                 // XXX - optimize!
-                QVariant list = d->prop.read(object());
+                QVariant list = prop.read(object());
                 QmlPrivate::ListInterface *li =
                     *(QmlPrivate::ListInterface **)list.constData();
 
@@ -969,7 +975,7 @@ void QmlMetaProperty::write(const QVariant &value) const
                 default:
                     break;
                 }
-                d->prop.write(object(), value);
+                prop.write(object(), value);
             }
 
         }
@@ -982,7 +988,7 @@ void QmlMetaProperty::write(const QVariant &value) const
 bool QmlMetaProperty::hasChangedNotifier() const
 {
     if (type() & Property && !(type() & Attached)) {
-        return d->prop.hasNotifySignal();
+        return d->object->metaObject()->property(d->coreIdx).hasNotifySignal();
     }
     return false;
 }
@@ -1012,8 +1018,9 @@ bool QmlMetaProperty::connectNotifier(QObject *dest, int method) const
     if (!(type() & Property) || type() & Attached)
         return false;
 
-    if (d->prop.hasNotifySignal()) {
-        return QMetaObject::connect(d->object, d->prop.notifySignalIndex(), dest, method, Qt::DirectConnection);
+    QMetaProperty prop = d->object->metaObject()->property(d->coreIdx);
+    if (prop.hasNotifySignal()) {
+        return QMetaObject::connect(d->object, prop.notifySignalIndex(), dest, method, Qt::DirectConnection);
     } else {
         return false;
     }
@@ -1032,8 +1039,9 @@ bool QmlMetaProperty::connectNotifier(QObject *dest, const char *slot) const
     if (!(type() & Property) || type() & Attached)
         return false;
 
-    if (d->prop.hasNotifySignal()) {
-        QByteArray signal(QByteArray("2") + d->prop.notifySignal().signature());
+    QMetaProperty prop = d->object->metaObject()->property(d->coreIdx);
+    if (prop.hasNotifySignal()) {
+        QByteArray signal(QByteArray("2") + prop.notifySignal().signature());
         return QObject::connect(d->object, signal.constData(), dest, slot);
     } else  {
         return false;
@@ -1098,7 +1106,7 @@ void QmlMetaProperty::restore(quint32 id, QObject *obj)
         d->attachedFunc = id;
     } else if (d->type & Property) {
         QMetaPropertyEx p(obj->metaObject()->property(id));
-        d->prop = p;
+        d->name = QLatin1String(p.name());
         d->propType = p.propertyType;
         d->coreIdx = id;
     } else if (d->type & SignalProperty || d->type & Signal) {
diff --git a/src/declarative/qml/qmlmetaproperty.h b/src/declarative/qml/qmlmetaproperty.h
index 68b06e5..9daef59 100644
--- a/src/declarative/qml/qmlmetaproperty.h
+++ b/src/declarative/qml/qmlmetaproperty.h
@@ -43,7 +43,7 @@
 #define QMLMETAPROPERTY_H
 
 #include <QtDeclarative/qfxglobal.h>
-#include <QMetaProperty>
+#include <QtCore/QMetaProperty>
 
 QT_BEGIN_HEADER
 
@@ -121,7 +121,7 @@ public:
 
     bool operator==(const QmlMetaProperty &) const;
 
-    const QMetaProperty &property() const;
+    QMetaProperty property() const;
 
     QmlBindableValue *binding();
     static int findSignal(const QObject *, const char *);
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index 1ea38e9..738bfec 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -54,7 +54,7 @@ public:
     QmlMetaPropertyPrivate(const QmlMetaPropertyPrivate &other)
         : name(other.name), signal(other.signal), context(other.context), 
           coreIdx(other.coreIdx), type(other.type), attachedFunc(other.attachedFunc), 
-          object(other.object), prop(other.prop), propType(other.propType),
+          object(other.object), propType(other.propType),
           category(other.category) {}
 
     QString name;
@@ -64,7 +64,6 @@ public:
     uint type;
     int attachedFunc;
     QObject *object;
-    QMetaProperty prop;
     int propType;
 
     mutable QmlMetaProperty::PropertyCategory category;
diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp
index 7825e5c..2e490a4 100644
--- a/src/declarative/qml/qmlmetatype.cpp
+++ b/src/declarative/qml/qmlmetatype.cpp
@@ -95,8 +95,8 @@ struct QmlMetaTypeData
     QBitArray qmllists;
     QBitArray lists;
 };
-Q_GLOBAL_STATIC(QmlMetaTypeData, metaTypeData);
-Q_GLOBAL_STATIC(QReadWriteLock, metaTypeDataLock);
+Q_GLOBAL_STATIC(QmlMetaTypeData, metaTypeData)
+Q_GLOBAL_STATIC(QReadWriteLock, metaTypeDataLock)
 
 class QmlTypePrivate
 {
@@ -388,7 +388,8 @@ int QmlMetaType::registerInterface(const QmlPrivate::MetaTypeIds &id,
     data->idToType.insert(type->typeId(), type);
     data->idToType.insert(type->qListTypeId(), type);
     data->idToType.insert(type->qmlListTypeId(), type);
-    data->nameToType.insert(type->qmlTypeName(), type);
+    if (!type->qmlTypeName().isEmpty())
+        data->nameToType.insert(type->qmlTypeName(), type);
 
     if (data->interfaces.size() < id.typeId) 
         data->interfaces.resize(id.typeId + 16);
@@ -864,6 +865,14 @@ QmlType *QmlMetaType::qmlType(const QByteArray &name)
     return data->nameToType.value(name);
 }
 
+QmlType *QmlMetaType::qmlType(const QMetaObject *metaObject)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QmlMetaTypeData *data = metaTypeData();
+
+    return data->metaObjectToType.value(metaObject);
+}
+
 QList<QByteArray> QmlMetaType::qmlTypeNames()
 {
     QReadLocker lock(metaTypeDataLock());
diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h
index 7ab01a5..cc3887c 100644
--- a/src/declarative/qml/qmlmetatype.h
+++ b/src/declarative/qml/qmlmetatype.h
@@ -64,9 +64,11 @@ public:
 
     static bool copy(int type, void *data, const void *copy = 0);
 
-    static QmlType *qmlType(const QByteArray &);
     static QList<QByteArray> qmlTypeNames();
 
+    static QmlType *qmlType(const QByteArray &);
+    static QmlType *qmlType(const QMetaObject *);
+
     static QMetaProperty defaultProperty(const QMetaObject *);
     static QMetaProperty defaultProperty(QObject *);
     static QMetaMethod defaultMethod(const QMetaObject *);
@@ -108,7 +110,7 @@ public:
 };
 
 class QmlTypePrivate;
-class QmlType
+class Q_DECLARATIVE_EXPORT QmlType
 {
 public:
     QByteArray typeName() const;
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index d4f279b..add5773 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -42,10 +42,10 @@
 #ifndef QMLPARSER_P_H
 #define QMLPARSER_P_H
 
-#include <QByteArray>
-#include <QList>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
 #include <QtCore/qstring.h>
-#include <qml.h>
+#include <QtDeclarative/qml.h>
 #include <private/qmlrefcount_p.h>
 #include <private/qobject_p.h>
 
@@ -272,10 +272,10 @@ namespace QmlParser
         void dump(int = 0) const;
     };
 }
-
-#endif // QMLPARSER_P_H
-
+Q_DECLARE_METATYPE(QmlParser::Variant);
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
+
+#endif // QMLPARSER_P_H
diff --git a/src/declarative/qml/qmlpropertyvaluesource.h b/src/declarative/qml/qmlpropertyvaluesource.h
index 6ef2e38..736b25f 100644
--- a/src/declarative/qml/qmlpropertyvaluesource.h
+++ b/src/declarative/qml/qmlpropertyvaluesource.h
@@ -42,9 +42,9 @@
 #ifndef QMLPROPERTYVALUESOURCE_H
 #define QMLPROPERTYVALUESOURCE_H
 
-#include <qfxglobal.h>
-#include <qml.h>
-#include <QObject>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qml.h>
+#include <QtCore/QObject>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h
index 594e7a3..0ffa365 100644
--- a/src/declarative/qml/qmlproxymetaobject_p.h
+++ b/src/declarative/qml/qmlproxymetaobject_p.h
@@ -42,11 +42,11 @@
 #ifndef QMLPROXYMETAOBJECT_P_H
 #define QMLPROXYMETAOBJECT_P_H
 
-#include <QMetaObject>
+#include <QtCore/QMetaObject>
+#include <QtCore/QObject>
 #include <private/qmetaobjectbuilder_p.h>
 #include <private/qobject_p.h>
-#include <QObject>
-#include <qml.h>
+#include <QtDeclarative/qml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlrefcount_p.h b/src/declarative/qml/qmlrefcount_p.h
index 90b50a8..1355c86 100644
--- a/src/declarative/qml/qmlrefcount_p.h
+++ b/src/declarative/qml/qmlrefcount_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLREFCOUNT_P_H
 #define QMLREFCOUNT_P_H
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index ff19d25..ead7ee5 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -62,18 +62,16 @@ public:
     void operator()(const QString &code, AST::Node *node);
 
 protected:
-    Object *defineObjectBinding(int line,
-                             AST::UiQualifiedId *propertyName,
-                             const QString &objectType,
-                             AST::SourceLocation typeLocation,
-                             LocationSpan location,
-                             AST::UiObjectInitializer *initializer = 0);
-    Object *defineObjectBinding_helper(int line,
-                             AST::UiQualifiedId *propertyName,
-                             const QString &objectType,
-                             AST::SourceLocation typeLocation,
-                             LocationSpan location,
-                             AST::UiObjectInitializer *initializer = 0);
+    Object *defineObjectBinding(AST::UiQualifiedId *propertyName,
+                                AST::UiQualifiedId *objectTypeName,
+                                LocationSpan location,
+                                AST::UiObjectInitializer *initializer = 0);
+
+    Object *defineObjectBinding_helper(AST::UiQualifiedId *propertyName,
+                                       const QString &objectType,
+                                       AST::SourceLocation typeLocation,
+                                       LocationSpan location,
+                                       AST::UiObjectInitializer *initializer = 0);
 
     QmlParser::Variant getVariant(AST::ExpressionNode *expr);
 
@@ -199,8 +197,7 @@ QString ProcessAST::asString(AST::UiQualifiedId *node) const
 }
 
 Object *
-ProcessAST::defineObjectBinding_helper(int line,
-                                       AST::UiQualifiedId *propertyName,
+ProcessAST::defineObjectBinding_helper(AST::UiQualifiedId *propertyName,
                                        const QString &objectType,
                                        AST::SourceLocation typeLocation,
                                        LocationSpan location,
@@ -283,16 +280,17 @@ ProcessAST::defineObjectBinding_helper(int line,
     }
 }
 
-Object *ProcessAST::defineObjectBinding(int line,
-                                     AST::UiQualifiedId *qualifiedId,
-                                     const QString &objectType,
-                                     AST::SourceLocation typeLocation,
-                                     LocationSpan location,
-                                     AST::UiObjectInitializer *initializer)
+Object *ProcessAST::defineObjectBinding(AST::UiQualifiedId *qualifiedId,
+                                        AST::UiQualifiedId *objectTypeName,
+                                        LocationSpan location,
+                                        AST::UiObjectInitializer *initializer)
 {
+    const QString objectType = asString(objectTypeName);
+    const AST::SourceLocation typeLocation = objectTypeName->identifierToken;
+
     if (objectType == QLatin1String("Connection")) {
 
-        Object *obj = defineObjectBinding_helper(line, 0, objectType, typeLocation, location);
+        Object *obj = defineObjectBinding_helper(/*propertyName = */0, objectType, typeLocation, location);
 
         _stateStack.pushObject(obj);
 
@@ -331,7 +329,7 @@ Object *ProcessAST::defineObjectBinding(int line,
         return obj;
     }
 
-    return defineObjectBinding_helper(line, qualifiedId, objectType, typeLocation, location, initializer);
+    return defineObjectBinding_helper(qualifiedId, objectType, typeLocation, location, initializer);
 }
 
 LocationSpan ProcessAST::location(AST::UiQualifiedId *id)
@@ -446,16 +444,14 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
 }
 
 
-// UiObjectMember: T_IDENTIFIER UiObjectInitializer ;
+// UiObjectMember: UiQualifiedId UiObjectInitializer ;
 bool ProcessAST::visit(AST::UiObjectDefinition *node)
 {
     LocationSpan l = location(node->firstSourceLocation(),
-                              node->lastSourceLocation());;
+                              node->lastSourceLocation());
 
-    defineObjectBinding(node->identifierToken.startLine,
-                        0,
-                        node->name->asString(),
-                        node->identifierToken,
+    defineObjectBinding(/*propertyName = */ 0,
+                        node->qualifiedTypeNameId,
                         l,
                         node->initializer);
 
@@ -463,16 +459,14 @@ bool ProcessAST::visit(AST::UiObjectDefinition *node)
 }
 
 
-// UiObjectMember: UiQualifiedId T_COLON T_IDENTIFIER UiObjectInitializer ;
+// UiObjectMember: UiQualifiedId T_COLON UiQualifiedId UiObjectInitializer ;
 bool ProcessAST::visit(AST::UiObjectBinding *node)
 {
-    LocationSpan l;
-    l = location(node->identifierToken, node->initializer->rbraceToken);
+    LocationSpan l = location(node->qualifiedTypeNameId->identifierToken,
+                              node->initializer->rbraceToken);
 
-    defineObjectBinding(node->identifierToken.startLine,
-                        node->qualifiedId,
-                        node->name->asString(),
-                        node->identifierToken,
+    defineObjectBinding(node->qualifiedId,
+                        node->qualifiedTypeNameId,
                         l,
                         node->initializer);
 
@@ -632,20 +626,19 @@ bool QmlScriptParser::parse(const QByteArray &data, const QUrl &url)
     QTextStream stream(data, QIODevice::ReadOnly);
     const QString code = stream.readAll();
 
-    JavaScriptParser parser;
-    JavaScriptEnginePrivate driver;
+    Engine engine;
 
-    NodePool nodePool(fileName, &driver);
-    driver.setNodePool(&nodePool);
+    NodePool nodePool(fileName, &engine);
 
-    Lexer lexer(&driver);
+    Lexer lexer(&engine);
     lexer.setCode(code, /*line = */ 1);
-    driver.setLexer(&lexer);
 
-    if (! parser.parse(&driver) || !_errors.isEmpty()) {
+    Parser parser(&engine);
+
+    if (! parser.parse() || !_errors.isEmpty()) {
 
         // Extract errors from the parser
-        foreach (const JavaScriptParser::DiagnosticMessage &m, parser.diagnosticMessages()) {
+        foreach (const DiagnosticMessage &m, parser.diagnosticMessages()) {
 
             if (m.isWarning())
                 continue;
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index 51534e7..1552cb5 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -87,10 +87,7 @@ Q_DECLARE_PERFORMANCE_LOG(QFxCompiler) {
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreObject);
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreSignal);
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreObjectQmlList);
-    Q_DECLARE_PERFORMANCE_METRIC(InstrAssignConstant);
     Q_DECLARE_PERFORMANCE_METRIC(InstrAssignSignalObject);
-    Q_DECLARE_PERFORMANCE_METRIC(InstrAssignBinding);
-    Q_DECLARE_PERFORMANCE_METRIC(InstrAssignCompiledBinding);
     Q_DECLARE_PERFORMANCE_METRIC(InstrAssignValueSource);
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreBinding);
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreCompiledBinding);
@@ -136,10 +133,7 @@ Q_DEFINE_PERFORMANCE_LOG(QFxCompiler, "QFxCompiler") {
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreObject, "StoreObject");
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreSignal, "StoreSignal");
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreObjectQmlList, "StoreObjectQmlList");
-    Q_DEFINE_PERFORMANCE_METRIC(InstrAssignConstant, "AssignConstant");
     Q_DEFINE_PERFORMANCE_METRIC(InstrAssignSignalObject, "AssignSignalObject");
-    Q_DEFINE_PERFORMANCE_METRIC(InstrAssignBinding, "AssignBinding");
-    Q_DEFINE_PERFORMANCE_METRIC(InstrAssignCompiledBinding, "AssignCompiledBinding");
     Q_DEFINE_PERFORMANCE_METRIC(InstrAssignValueSource, "AssignValueSource");
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreBinding, "StoreBinding");
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreCompiledBinding, "StoreCompiledBinding");
@@ -409,64 +403,6 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
             }
             break;
 
-        case QmlInstruction::AssignConstant:
-            {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-                QFxCompilerTimer<QFxCompiler::InstrAssignConstant> cc;
-#endif
-                // Fixup instruction
-                QObject *target = stack.top();
-                int propIdx = instr.assignConstant.property;
-                int idx = instr.assignConstant.constant;
-                QByteArray pr;
-                if (propIdx == -1) {
-                    pr = QmlMetaType::defaultProperty(target).name();
-                    if (pr.isEmpty())
-                        VME_EXCEPTION("Cannot resolve defalt property on type" << target->metaObject()->className());
-                } else {
-                    pr = datas.at(propIdx);
-                }
-
-                int coreIdx = qIndexOfProperty(target, pr);
-
-                if (coreIdx != -1) {
-                    QMetaProperty prop = 
-                        target->metaObject()->property(coreIdx);
-                    bool replace = !prop.isDynamic();
-
-                    QmlInstruction *writeInstr = 0;
-                    QmlInstruction dummy;
-                    if (replace) {
-                        writeInstr = &instr;
-                    } else {
-                        writeInstr = &dummy;
-                        dummy = instr;
-                    }
-
-                    QmlCompiler::StoreInstructionResult r = QmlCompiler::generateStoreInstruction(*comp, *writeInstr, prop,
-                                                 coreIdx, idx, &primitives.at(idx));
-                    if (r != QmlCompiler::Ok) {
-                        if (prop.isEnumType()){
-                            VME_EXCEPTION(primitives.at(idx) << "is not a valid enumeration value");
-                        } else if (r == QmlCompiler::UnknownType) {
-                            VME_EXCEPTION("Property" << prop.name() << "is of an unknown type");
-                        } else if (r == QmlCompiler::InvalidData) {
-                            VME_EXCEPTION("Cannot assign value" << primitives.at(idx) << "to property" << prop.name());
-                        } else if (r == QmlCompiler::ReadOnly) {
-                            VME_EXCEPTION("Cannot assign value" << primitives.at(idx) << "to read-only property" << prop.name());
-                        } else {
-                            VME_EXCEPTION("Invalid property assignment for property" << prop.name());
-                        }
-                    } else {
-                        runStoreInstruction(stack, *writeInstr, comp);
-                    }
-
-                } else {
-                    VME_EXCEPTION("Unknown property" << pr);
-                }
-            }
-            break;
-
         case QmlInstruction::TryBeginObject:
             {
 #ifdef Q_ENABLE_PERFORMANCE_LOG
@@ -530,31 +466,6 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
             }
             break;
 
-        case QmlInstruction::AssignCompiledBinding:
-        case QmlInstruction::AssignBinding:
-            {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-                QFxCompilerTimer<QFxCompiler::InstrAssignBinding> cc;
-#endif
-                QObject *target = stack.top();
-                const QByteArray &pr = datas.at(instr.fetch.property);
-                int idx = qIndexOfProperty(target, pr);
-
-                // XXX - need to check if the type is QmlBindableValue*
-                if (idx == -1) {
-                    VME_EXCEPTION("Unknown property" << pr);
-                } else {
-                    if (QmlInstruction::AssignCompiledBinding == instr.type)
-                        instr.type = QmlInstruction::StoreCompiledBinding;
-                    else
-                        instr.type = QmlInstruction::StoreBinding;
-                    instr.assignBinding.property = idx;
-                    instr.assignBinding.category = QmlMetaProperty::Unknown;
-                }
-                ii--;
-            }
-            break;
-
         case QmlInstruction::AssignValueSource:
             {
                 QObject *target = stack.at(stack.count() - 2);
@@ -613,6 +524,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
                 QFx_setParent_noEvent(bind, target);
 
                 bind->setTarget(mp);
+                bind->setSourceLocation(comp->url.toString(), instr.line);
             }
             break;
 
@@ -638,6 +550,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
                 QFx_setParent_noEvent(bind, target);
 
                 bind->setTarget(mp);
+                bind->setSourceLocation(comp->url.toString(), instr.line);
             }
             break;
 
diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h
index f7e13d6..4e5c6c1 100644
--- a/src/declarative/qml/qmlvme_p.h
+++ b/src/declarative/qml/qmlvme_p.h
@@ -42,12 +42,12 @@
 #ifndef QMLVME_P_H
 #define QMLVME_P_H
 
-#include <QString>
-#include <QStack>
-#include <qmlerror.h>
-class QObject;
+#include <QtCore/QString>
+#include <QtCore/QStack>
+#include <QtDeclarative/qmlerror.h>
 
 QT_BEGIN_NAMESPACE
+class QObject;
 class QmlInstruction;
 class QmlCompiledComponent;
 class QmlCompiledData;
diff --git a/src/declarative/qml/qmlvmemetaobject_p.h b/src/declarative/qml/qmlvmemetaobject_p.h
index d8ed242..6f1e31b 100644
--- a/src/declarative/qml/qmlvmemetaobject_p.h
+++ b/src/declarative/qml/qmlvmemetaobject_p.h
@@ -42,9 +42,9 @@
 #ifndef QMLVMEMETAOBJECT_P_H
 #define QMLVMEMETAOBJECT_P_H
 
-#include <qml.h>
-#include <QMetaObject>
-#include <QBitArray>
+#include <QtDeclarative/qml.h>
+#include <QtCore/QMetaObject>
+#include <QtCore/QBitArray>
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/script/lexer.h b/src/declarative/qml/script/lexer.h
index 7781ee8..9de4afd 100644
--- a/src/declarative/qml/script/lexer.h
+++ b/src/declarative/qml/script/lexer.h
@@ -11,7 +11,7 @@
 #ifndef LEXER_H
 #define LEXER_H
 
-#include <QList>
+#include <QtCore/QList>
 #include "tokens.h"
 
 
diff --git a/src/declarative/qml/script/qmlbasicscript.h b/src/declarative/qml/script/qmlbasicscript.h
index d465f04..5ef2148 100644
--- a/src/declarative/qml/script/qmlbasicscript.h
+++ b/src/declarative/qml/script/qmlbasicscript.h
@@ -13,10 +13,10 @@
 #define QMLBASICSCRIPT_H
 
 #include "instructions.h"
-#include <QList>
-#include <QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QByteArray>
 #include "lexer.h"
-#include <QVariant>
+#include <QtCore/QVariant>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/test/qfxtestengine.h b/src/declarative/test/qfxtestengine.h
index 6698645..44a140f 100644
--- a/src/declarative/test/qfxtestengine.h
+++ b/src/declarative/test/qfxtestengine.h
@@ -42,8 +42,7 @@
 #ifndef _QFXTESTENGINE_H_
 #define _QFXTESTENGINE_H_
 
-#include <QObject>
-class QSimpleCanvas;
+#include <QtCore/QObject>
 
 QT_BEGIN_HEADER
 
@@ -51,6 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+class QSimpleCanvas;
 class QFxTestEnginePrivate;
 class Q_DECLARATIVE_EXPORT QFxTestEngine : public QObject
 {
diff --git a/src/declarative/test/qfxtestobjects.h b/src/declarative/test/qfxtestobjects.h
index 4273d4e..653656e 100644
--- a/src/declarative/test/qfxtestobjects.h
+++ b/src/declarative/test/qfxtestobjects.h
@@ -42,10 +42,10 @@
 #ifndef _QFXTESTOBJECTS_H_
 #define _QFXTESTOBJECTS_H_
 
-#include <QObject>
-#include <QPoint>
-#include <QList>
-#include <QXmlStreamWriter>
+#include <QtCore/QObject>
+#include <QtCore/QPoint>
+#include <QtCore/QList>
+#include <QtCore/QXmlStreamWriter>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/test/qfxtestview.h b/src/declarative/test/qfxtestview.h
index 33275b9..a8f78bf 100644
--- a/src/declarative/test/qfxtestview.h
+++ b/src/declarative/test/qfxtestview.h
@@ -42,7 +42,7 @@
 #ifndef _QFXTESTVIEW_H_
 #define _QFXTESTVIEW_H_
 
-#include <QFxView>
+#include <QtDeclarative/QFxView>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/timeline/qmltimeline.h b/src/declarative/timeline/qmltimeline.h
index ce9d1f2..23bdd64 100644
--- a/src/declarative/timeline/qmltimeline.h
+++ b/src/declarative/timeline/qmltimeline.h
@@ -42,9 +42,9 @@
 #ifndef QMLTIMELINE_H
 #define QMLTIMELINE_H
 
-#include <QObject>
-#include <qfxglobal.h>
-#include <QAbstractAnimation>
+#include <QtCore/QObject>
+#include <QtCore/QAbstractAnimation>
+#include <QtDeclarative/qfxglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/timeline/qmltimelinevalueproxy.h b/src/declarative/timeline/qmltimelinevalueproxy.h
index 853db4e..9ecdba1 100644
--- a/src/declarative/timeline/qmltimelinevalueproxy.h
+++ b/src/declarative/timeline/qmltimelinevalueproxy.h
@@ -42,7 +42,7 @@
 #ifndef QMLTIMELINEVALUEPROXY_H
 #define QMLTIMELINEVALUEPROXY_H
 
-#include "qmltimeline.h"
+#include <QtDeclarative/qmltimeline.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qbindablemap.h b/src/declarative/util/qbindablemap.h
index d617867..c76928d 100644
--- a/src/declarative/util/qbindablemap.h
+++ b/src/declarative/util/qbindablemap.h
@@ -42,11 +42,11 @@
 #ifndef QBINDABLEMAP_H
 #define QBINDABLEMAP_H
 
-#include <qfxglobal.h>
-#include <QObject>
-#include <QHash>
-#include <QStringList>
-#include <QVariant>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qfxglobal.h b/src/declarative/util/qfxglobal.h
index 887351d..6ba9409 100644
--- a/src/declarative/util/qfxglobal.h
+++ b/src/declarative/util/qfxglobal.h
@@ -42,8 +42,8 @@
 #ifndef QFXGLOBAL_H
 #define QFXGLOBAL_H
 
-#include <qglobal.h>
-#include <QObject>
+#include <QtCore/qglobal.h>
+#include <QtCore/QObject>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp
index 1c24e28..0d5b796 100644
--- a/src/declarative/util/qfxview.cpp
+++ b/src/declarative/util/qfxview.cpp
@@ -93,7 +93,7 @@ class QFxViewPrivate
 {
 public:
     QFxViewPrivate(QFxView *w)
-        : q(w), root(0), component(0) {}
+        : q(w), root(0), component(0), resizable(false) {}
 
     QFxView *q;
     QFxItem *root;
@@ -106,6 +106,7 @@ public:
     QBasicTimer resizetimer;
 
     QSize initialSize;
+    bool resizable;
 
     void init();
 };
@@ -344,7 +345,18 @@ void QFxView::continueExecute()
             d->root = item;
             connect(item, SIGNAL(widthChanged()), this, SLOT(sizeChanged()));
             connect(item, SIGNAL(heightChanged()), this, SLOT(sizeChanged()));
-            emit sceneResized(QSize(d->root->width(),d->root->height()));
+            if (d->initialSize.height() <= 0 && d->root->width() > 0)
+                d->initialSize.setWidth(d->root->width());
+            if (d->initialSize.height() <= 0 && d->root->height() > 0)
+                d->initialSize.setHeight(d->root->height());
+            if (d->resizable) {
+                d->root->setWidth(width());
+                d->root->setHeight(height());
+            } else {
+                QSize sz(d->root->width(),d->root->height());
+                emit sceneResized(sz);
+                resize(sz);
+            }
         } else if (QWidget *wid = qobject_cast<QWidget *>(obj)) {
             window()->setAttribute(Qt::WA_OpaquePaintEvent, false);
             window()->setAttribute(Qt::WA_NoSystemBackground, false);
@@ -381,14 +393,55 @@ void QFxView::sizeChanged()
  */
 void QFxView::timerEvent(QTimerEvent* e)
 {
-    if (e->timerId() == d->resizetimer.timerId()) {
-        if (d->root)
-            emit sceneResized(QSize(d->root->width(),d->root->height()));
+    if (!e || e->timerId() == d->resizetimer.timerId()) {
+        if (d->root) {
+            QSize sz(d->root->width(),d->root->height());
+            emit sceneResized(sz);
+            //if (!d->resizable)
+                //resize(sz);
+        }
         d->resizetimer.stop();
         updateGeometry();
     }
 }
 
+// modelled on QScrollArea::widgetResizable
+/*!
+    \property QFxView::contentResizable
+    \brief whether the view should resize the canvas contents
+
+    If this property is set to false (the default), the view
+    resizes with the root item in the QML.
+
+    If this property is set to true, the view will
+    automatically resize the root item.
+
+    Regardless of this property, the sizeHint of the view
+    is the initial size of the root item.
+*/
+
+void QFxView::setContentResizable(bool on)
+{
+    if (d->resizable != on) {
+        d->resizable = on;
+        if (d->root) {
+            if (on) {
+                d->root->setWidth(width());
+                d->root->setHeight(height());
+            } else {
+                d->root->setWidth(d->initialSize.width());
+                d->root->setHeight(d->initialSize.height());
+            }
+        }
+    }
+}
+
+bool QFxView::contentResizable() const
+{
+    return d->resizable;
+}
+
+
 /*!
     The size hint is the size of the root item.
 */
@@ -481,7 +534,7 @@ QFxItem *QFxView::root() const
  */
 void QFxView::resizeEvent(QResizeEvent *e)
 {
-    if (d->root) {
+    if (d->resizable && d->root) {
         d->root->setWidth(width());
         d->root->setHeight(height());
     }
diff --git a/src/declarative/util/qfxview.h b/src/declarative/util/qfxview.h
index d6f786c..05bf005 100644
--- a/src/declarative/util/qfxview.h
+++ b/src/declarative/util/qfxview.h
@@ -42,11 +42,11 @@
 #ifndef QFXVIEW_H
 #define QFXVIEW_H
 
-#include <qfxglobal.h>
 #include <QtCore/qdatetime.h>
 #include <QtGui/qgraphicssceneevent.h>
 #include <QtGui/qwidget.h>
-#include <qsimplecanvas.h>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qsimplecanvas.h>
 
 QT_BEGIN_HEADER
 
@@ -82,6 +82,8 @@ public:
 
     virtual QFxItem *root() const;
 
+    void setContentResizable(bool);
+    bool contentResizable() const;
     QSize sizeHint() const;
 
     void dumpRoot();
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index dd4e1eb..24bcac98 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -243,8 +243,12 @@ void QmlAbstractAnimation::setRunning(bool r)
             d->startOnCompletion = true;
         emit started();
     } else {
-        if (!d->finishPlaying)
+        if (d->finishPlaying) {
+            if (d->repeat)
+                qtAnimation()->setLoopCount(qtAnimation()->currentLoop()+1);
+        } else
             qtAnimation()->stop();
+
         emit completed();
     }
 
@@ -512,7 +516,11 @@ void QmlAbstractAnimation::transition(QmlStateActions &actions,
 
 void QmlAbstractAnimation::timelineComplete()
 {
+    Q_D(QmlAbstractAnimation);
     setRunning(false);
+    if (d->finishPlaying && d->repeat) {
+        qtAnimation()->setLoopCount(-1);
+    }
 }
 
 /*!
diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index 578631c..8bd53e2 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -43,12 +43,12 @@
 #define QMLANIMATION_H
 
 #include <QtCore/qvariant.h>
+#include <QtCore/QAbstractAnimation>
 #include <QtGui/qcolor.h>
-#include <qmltransition.h>
-#include <qmlpropertyvaluesource.h>
-#include <qmlstate.h>
-#include <qml.h>
-#include <QAbstractAnimation>
+#include <QtDeclarative/qmltransition.h>
+#include <QtDeclarative/qmlpropertyvaluesource.h>
+#include <QtDeclarative/qmlstate.h>
+#include <QtDeclarative/qml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 00937a6..36b826f 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -44,15 +44,15 @@
 
 #include <private/qobject_p.h>
 #include <private/qmlnullablevalue_p.h>
-#include <qmlanimation.h>
-#include <qml.h>
-#include <qmlcontext.h>
 #include <private/qvariantanimation_p.h>
-#include <QPauseAnimation>
-#include <QVariantAnimation>
-#include <QAnimationGroup>
-#include <QColor>
-#include <qmltimelinevalueproxy.h>
+#include <QtCore/QPauseAnimation>
+#include <QtCore/QVariantAnimation>
+#include <QtCore/QAnimationGroup>
+#include <QtGui/QColor>
+#include <QtDeclarative/qmlanimation.h>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qmlcontext.h>
+#include <QtDeclarative/qmltimelinevalueproxy.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlbehaviour.h b/src/declarative/util/qmlbehaviour.h
index 3d25cd8..7a54d63 100644
--- a/src/declarative/util/qmlbehaviour.h
+++ b/src/declarative/util/qmlbehaviour.h
@@ -42,9 +42,9 @@
 #ifndef QMLBEHAVIOUR_H
 #define QMLBEHAVIOUR_H
 
-#include <qmlpropertyvaluesource.h>
-#include <qml.h>
-#include <qmlstate.h>
+#include <QtDeclarative/qmlpropertyvaluesource.h>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qmlstate.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlbind.h b/src/declarative/util/qmlbind.h
index 355edfd..5576957 100644
--- a/src/declarative/util/qmlbind.h
+++ b/src/declarative/util/qmlbind.h
@@ -42,9 +42,9 @@
 #ifndef QMLBIND_H
 #define QMLBIND_H
 
-#include <qfxglobal.h>
+#include <QtDeclarative/qfxglobal.h>
 #include <QtCore/qobject.h>
-#include "qml.h"
+#include <QtDeclarative/qml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h
index bd9363a..fa0bff8 100644
--- a/src/declarative/util/qmlfollow.h
+++ b/src/declarative/util/qmlfollow.h
@@ -42,8 +42,8 @@
 #ifndef QMLFOLLOW_H
 #define QMLFOLLOW_H
 
-#include <qmlpropertyvaluesource.h>
-#include <qml.h>
+#include <QtDeclarative/qmlpropertyvaluesource.h>
+#include <QtDeclarative/qml.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlfont.h b/src/declarative/util/qmlfont.h
index b6bce7c..3a21c34 100644
--- a/src/declarative/util/qmlfont.h
+++ b/src/declarative/util/qmlfont.h
@@ -43,7 +43,7 @@
 #define QMLFONT_H
 
 #include <QtCore/qobject.h>
-#include <qml.h>
+#include <QtDeclarative/qml.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmllistaccessor.h b/src/declarative/util/qmllistaccessor.h
index 29f910d..dd766b2 100644
--- a/src/declarative/util/qmllistaccessor.h
+++ b/src/declarative/util/qmllistaccessor.h
@@ -42,7 +42,7 @@
 #ifndef QMLLISTACCESSOR_H
 #define QMLLISTACCESSOR_H
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 8184bda..80eb9c3 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -43,6 +43,7 @@
 #include <QtCore/qstack.h>
 #include <QXmlStreamReader>
 #include <private/qmlcustomparser_p.h>
+#include <private/qmlparser_p.h>
 #include "qmlopenmetaobject.h"
 #include <qmlcontext.h>
 #include <qmlbindablevalue.h>
@@ -414,8 +415,11 @@ bool ListModelParser::compileProperty(const QmlCustomParserProperty &prop, QList
 
         } else {
 
+            QmlParser::Variant variant = 
+                qvariant_cast<QmlParser::Variant>(value);
+
             int ref = data.count();
-            QByteArray d = value.toString().toLatin1();
+            QByteArray d = variant.asScript().toLatin1();
             d.append('\0');
             data.append(d);
 
diff --git a/src/declarative/util/qmllistmodel.h b/src/declarative/util/qmllistmodel.h
index 36aa009..ddf1e13 100644
--- a/src/declarative/util/qmllistmodel.h
+++ b/src/declarative/util/qmllistmodel.h
@@ -42,14 +42,14 @@
 #ifndef QMLLISTMODEL_H
 #define QMLLISTMODEL_H
 
-#include <QObject>
-#include <qfxglobal.h>
-#include <QStringList>
-#include <QHash>
-#include <QList>
-#include <QVariant>
-#include <qml.h>
-#include <qlistmodelinterface.h>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QHash>
+#include <QtCore/QList>
+#include <QtCore/QVariant>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qlistmodelinterface.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlopenmetaobject.h b/src/declarative/util/qmlopenmetaobject.h
index f842f96..239276d 100644
--- a/src/declarative/util/qmlopenmetaobject.h
+++ b/src/declarative/util/qmlopenmetaobject.h
@@ -42,9 +42,9 @@
 #ifndef QMLOPENMETAOBJECT_H
 #define QMLOPENMETAOBJECT_H
 
-#include <QMetaObject>
+#include <QtCore/QMetaObject>
 #include <QtCore/private/qobject_p.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlpackage.h b/src/declarative/util/qmlpackage.h
index 6652b98..3861890 100644
--- a/src/declarative/util/qmlpackage.h
+++ b/src/declarative/util/qmlpackage.h
@@ -42,7 +42,7 @@
 #ifndef QMLPACKAGE_H
 #define QMLPACKAGE_H
 
-#include <qml.h>
+#include <QtDeclarative/qml.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlscript.h b/src/declarative/util/qmlscript.h
index 8047a88..b739fd7 100644
--- a/src/declarative/util/qmlscript.h
+++ b/src/declarative/util/qmlscript.h
@@ -42,9 +42,9 @@
 #ifndef QMLSCRIPT_H
 #define QMLSCRIPT_H
 
-#include <qfxglobal.h>
+#include <QtDeclarative/qfxglobal.h>
 #include <QtCore/qobject.h>
-#include "qml.h"
+#include <QtDeclarative/qml.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp
index 9b5a58e..c986864 100644
--- a/src/declarative/util/qmlsetproperties.cpp
+++ b/src/declarative/util/qmlsetproperties.cpp
@@ -44,61 +44,12 @@
 #include "qmlsetproperties.h"
 #include <QtCore/qdebug.h>
 #include <QtDeclarative/qmlinfo.h>
+#include <private/qmlcustomparser_p.h>
+#include <private/qmlparser_p.h>
+#include <QtDeclarative/qmlexpression.h>
 
 
 QT_BEGIN_NAMESPACE
-class QmlSetPropertiesMetaObject : public QmlOpenMetaObject
-{
-public:
-    QmlSetPropertiesMetaObject(QObject *);
-
-protected:
-    virtual void propertyRead(int);
-    virtual void propertyWrite(int);
-};
-
-class QmlSetPropertiesProxyObject : public QObject
-{
-Q_OBJECT
-public:
-    QmlSetPropertiesProxyObject(QObject *);
-
-    QmlSetPropertiesMetaObject *fxMetaObject() const { return _mo; }
-private:
-    QmlSetPropertiesMetaObject *_mo;
-};
-
-QmlSetPropertiesProxyObject::QmlSetPropertiesProxyObject(QObject *parent)
-: QObject(parent), _mo(new QmlSetPropertiesMetaObject(this))
-{
-}
-
-QmlSetPropertiesMetaObject::QmlSetPropertiesMetaObject(QObject *obj)
-: QmlOpenMetaObject(obj)
-{
-}
-
-void QmlSetPropertiesMetaObject::propertyRead(int id)
-{
-    if (!value(id).isValid())  
-        setValue(id, QVariant::fromValue((QObject *)new QmlSetPropertiesProxyObject(object())));
-
-    QmlOpenMetaObject::propertyRead(id);
-}
-
-void QmlSetPropertiesMetaObject::propertyWrite(int id)
-{
-    if (value(id).userType() == qMetaTypeId<QObject *>()) {
-        QObject *val = qvariant_cast<QObject *>(value(id));
-        QmlSetPropertiesProxyObject *proxy = qobject_cast<QmlSetPropertiesProxyObject *>(val);
-        if (proxy) {
-            setValue(id, QVariant());
-            delete proxy;
-        }
-    }
-    QmlOpenMetaObject::propertyWrite(id);
-}
-
 /*!
     \qmlclass SetProperties QmlSetProperties
     \brief The SetProperties element describes new property values for a state.
@@ -149,109 +100,263 @@ void QmlSetPropertiesMetaObject::propertyWrite(int id)
     \sa QmlSetProperty
 */
 
+/*!
+    \qmlproperty Object SetProperties::target
+    This property holds the object that the properties to change belong to
+*/
+
+/*!
+    \property QmlSetProperties::target
+    \brief the object that the properties to change belong to
+*/
 class QmlSetPropertiesPrivate : public QObjectPrivate
 {
+    Q_DECLARE_PUBLIC(QmlSetProperties)
 public:
-    QmlSetPropertiesPrivate() : obj(0), mo(0) {}
+    QmlSetPropertiesPrivate() : object(0), decoded(true), restore(true) {}
+
+    QObject *object;
+    QByteArray data;
+    bool decoded;
+    void decode();
+
+    bool restore;
 
-    QObject *obj;
-    QmlSetPropertiesMetaObject *mo;
+    QList<QPair<QByteArray, QVariant> > properties;
+    QList<QPair<QByteArray, QmlExpression *> > expressions;
+
+    QmlMetaProperty property(const QByteArray &);
 };
 
-QML_DEFINE_TYPE(QmlSetProperties,SetProperties);
-QmlSetProperties::QmlSetProperties()
-    : QmlStateOperation(*(new QmlSetPropertiesPrivate))
+class QmlSetPropertiesParser : public QmlCustomParser
 {
-    Q_D(QmlSetProperties);
-    d->mo = new QmlSetPropertiesMetaObject(this);
+public:
+    void compileList(QList<QPair<QByteArray, QVariant> > &list, const QByteArray &pre, const QmlCustomParserProperty &prop);
+
+    virtual QByteArray compile(const QList<QmlCustomParserProperty> &, bool *ok);
+    virtual void setCustomData(QObject *, const QByteArray &);
+};
+
+void 
+QmlSetPropertiesParser::compileList(QList<QPair<QByteArray, QVariant> > &list, 
+                                     const QByteArray &pre, 
+                                     const QmlCustomParserProperty &prop)
+{
+    QByteArray propName = pre + prop.name();
+
+    QList<QVariant> values = prop.assignedValues();
+    for (int ii = 0; ii < values.count(); ++ii) {
+        const QVariant &value = values.at(ii);
+
+        if (value.userType() == qMetaTypeId<QmlCustomParserNode>()) {
+            continue;
+        } else if(value.userType() == qMetaTypeId<QmlCustomParserProperty>()) {
+
+            QmlCustomParserProperty prop = 
+                qvariant_cast<QmlCustomParserProperty>(value);
+            QByteArray pre = propName + ".";
+            compileList(list, pre, prop);
+
+        } else {
+            list << qMakePair(propName, value);
+        }
+    }
 }
 
-QmlSetProperties::QmlSetProperties(QObject *parent)
-    : QmlStateOperation(*(new QmlSetPropertiesPrivate), parent)
+QByteArray 
+QmlSetPropertiesParser::compile(const QList<QmlCustomParserProperty> &props, 
+                                bool *ok)
 {
-    Q_D(QmlSetProperties);
-    d->mo = new QmlSetPropertiesMetaObject(this);
+    *ok = true;
+
+    QList<QPair<QByteArray, QVariant> > data;
+    for(int ii = 0; ii < props.count(); ++ii)
+        compileList(data, QByteArray(), props.at(ii));
+
+    QByteArray rv;
+    QDataStream ds(&rv, QIODevice::WriteOnly);
+
+    ds << data.count();
+    for(int ii = 0; ii < data.count(); ++ii) {
+        QmlParser::Variant v = qvariant_cast<QmlParser::Variant>(data.at(ii).second);
+        QVariant var;
+        bool isScript = v.isScript();
+        switch(v.type()) {
+        case QmlParser::Variant::Boolean:
+            var = QVariant(v.asBoolean());
+            break;
+        case QmlParser::Variant::Number:
+            var = QVariant(v.asNumber());
+            break;
+        case QmlParser::Variant::String:
+            var = QVariant(v.asString());
+            break;
+        case QmlParser::Variant::Invalid:
+        case QmlParser::Variant::Script:
+            var = QVariant(v.asScript());
+            break;
+        }
+
+        ds << data.at(ii).first << isScript << var;
+    }
+
+    return rv;
 }
 
-QmlSetProperties::~QmlSetProperties()
+void QmlSetPropertiesPrivate::decode()
 {
+    if (decoded)
+        return;
+
+    QDataStream ds(&data, QIODevice::ReadOnly);
+
+    int count;
+    ds >> count;
+    for (int ii = 0; ii < count; ++ii) {
+        QByteArray name;
+        bool isScript;
+        QVariant data;
+        ds >> name;
+        ds >> isScript;
+        ds >> data;
+
+        if (isScript) {
+            QmlExpression *expression = new QmlExpression(qmlContext(object), data.toString(), object);
+            expression->setTrackChange(false);
+            expressions << qMakePair(name, expression);
+        } else {
+            properties << qMakePair(name, data);
+        }
+    }
+
+    decoded = true;
+    data.clear();
 }
 
-/*!
-    \qmlproperty Object SetProperties::target
-    This property holds the object that the properties to change belong to
-*/
+void QmlSetPropertiesParser::setCustomData(QObject *object, 
+                                            const QByteArray &data)
+{
+    QmlSetPropertiesPrivate *p = 
+        static_cast<QmlSetPropertiesPrivate *>(QObjectPrivate::get(object));
+    p->data = data;
+    p->decoded = false;
+}
 
-/*!
-    \property QmlSetProperties::target
-    \brief the object that the properties to change belong to
-*/
-QObject *QmlSetProperties::object()
+QmlSetProperties::QmlSetProperties()
+: QmlStateOperation(*(new QmlSetPropertiesPrivate))
+{
+}
+
+QmlSetProperties::~QmlSetProperties()
 {
     Q_D(QmlSetProperties);
-    return d->obj;
+    for(int ii = 0; ii < d->expressions.count(); ++ii)
+        delete d->expressions.at(ii).second;
+}
+
+QObject *QmlSetProperties::object() const
+{
+    Q_D(const QmlSetProperties);
+    return d->object;
 }
 
 void QmlSetProperties::setObject(QObject *o)
 {
     Q_D(QmlSetProperties);
-    d->obj = o;
+    d->object = o;
+}
+
+bool QmlSetProperties::restoreEntryValues() const
+{
+    Q_D(const QmlSetProperties);
+    return d->restore;
+}
+
+void QmlSetProperties::setRestoreEntryValues(bool v)
+{
+    Q_D(QmlSetProperties);
+    d->restore = v;
+}
+
+QmlMetaProperty 
+QmlSetPropertiesPrivate::property(const QByteArray &property) 
+{
+    Q_Q(QmlSetProperties);
+    QList<QByteArray> path = property.split('.');
+
+    QObject *obj = this->object;
+
+    for (int jj = 0; jj < path.count() - 1; ++jj) {
+        const QByteArray &pathName = path.at(jj);
+        QmlMetaProperty prop(obj, QLatin1String(pathName));
+        QObject *objVal = QmlMetaType::toQObject(prop.read());
+        if (!objVal) {
+            qmlInfo(q) << obj->metaObject()->className()
+                       << "has no object property named" << pathName;
+            return QmlMetaProperty();
+        }
+        obj = objVal;
+    }
+
+    const QByteArray &name = path.last();
+    QmlMetaProperty prop(obj, QLatin1String(name));
+    if (!prop.isValid()) {
+        qmlInfo(q) << obj->metaObject()->className()
+                   << "has no property named" << name;
+        return QmlMetaProperty();
+    } else if (!prop.isWritable()) {
+        qmlInfo(q) << obj->metaObject()->className()
+                   << name << "is not writable, and cannot be set.";
+        return QmlMetaProperty();
+    } else {
+        return prop;
+    }
 }
 
-QmlSetProperties::ActionList 
-QmlSetProperties::doAction(QmlSetPropertiesMetaObject *metaObject, 
-                           QObject *object)
+QmlSetProperties::ActionList QmlSetProperties::actions()
 {
+    Q_D(QmlSetProperties);
+
+    d->decode();
+
     ActionList list;
 
-    for (int ii = 0; ii < metaObject->count(); ++ii) {
+    for (int ii = 0; ii < d->properties.count(); ++ii) {
+
+        QByteArray property = d->properties.at(ii).first;
+        QmlMetaProperty prop = d->property(property);
 
-        QByteArray name = metaObject->name(ii);
-        QVariant value = metaObject->value(ii);
+        if (prop.isValid()) {
+            Action a;
+            a.restore = restoreEntryValues();
+            a.property = prop;
+            a.fromValue = a.property.read();
+            a.toValue = d->properties.at(ii).second;
 
-        QmlSetPropertiesProxyObject *po = qobject_cast<QmlSetPropertiesProxyObject *>(qvariant_cast<QObject *>(value));
+            list << a;
+        }
+    }
 
-        QmlMetaProperty prop(object, QLatin1String(name));
+    for (int ii = 0; ii < d->expressions.count(); ++ii) {
 
-        if (po) {
-            QObject *objVal = QmlMetaType::toQObject(prop.read());
-            if (!objVal) {
-                qmlInfo(this) << object->metaObject()->className()
-                              << "has no object property named" << name;
-                continue;
-            }
+        QByteArray property = d->expressions.at(ii).first;
+        QmlMetaProperty prop = d->property(property);
 
-            list << doAction(po->fxMetaObject(), objVal);
-        } else if (!prop.isValid()) {
-            qmlInfo(this) << object->metaObject()->className()
-                          << "has no property named" << name;
-            continue;
-        } else if (!prop.isWritable()) {
-            qmlInfo(this) << object->metaObject()->className()
-                          << name << "is not writable, and cannot be set.";
-            continue;
-        } else {
-            //append action
+        if (prop.isValid()) {
             Action a;
+            a.restore = restoreEntryValues();
             a.property = prop;
-            a.fromValue = prop.read();
-            a.toValue = value;
+            a.fromValue = a.property.read();
+            a.toValue = d->expressions.at(ii).second->value();
 
             list << a;
         }
+
     }
 
     return list;
 }
 
-QmlSetProperties::ActionList QmlSetProperties::actions()
-{
-    Q_D(QmlSetProperties);
-    if (!d->obj)
-        return ActionList();
-
-    return doAction(d->mo, d->obj);
-}
+QML_DEFINE_CUSTOM_TYPE(QmlSetProperties,SetProperties,QmlSetPropertiesParser);
 
 QT_END_NAMESPACE
-#include "qmlsetproperties.moc"
diff --git a/src/declarative/util/qmlsetproperties.h b/src/declarative/util/qmlsetproperties.h
index 456b672..24ad99a 100644
--- a/src/declarative/util/qmlsetproperties.h
+++ b/src/declarative/util/qmlsetproperties.h
@@ -42,7 +42,7 @@
 #ifndef QMLSETPROPERTIES_H
 #define QMLSETPROPERTIES_H
 
-#include <qmlstateoperations.h>
+#include <QtDeclarative/qmlstateoperations.h>
 
 
 QT_BEGIN_HEADER
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
-class QmlSetPropertiesMetaObject;
+    
 class QmlSetPropertiesPrivate;
 class Q_DECLARATIVE_EXPORT QmlSetProperties : public QmlStateOperation
 {
@@ -58,26 +58,23 @@ class Q_DECLARATIVE_EXPORT QmlSetProperties : public QmlStateOperation
     Q_DECLARE_PRIVATE(QmlSetProperties);
 
     Q_PROPERTY(QObject *target READ object WRITE setObject);
-
+    Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues);
 public:
     QmlSetProperties();
-    QmlSetProperties(QObject *parent);
     ~QmlSetProperties();
 
-    QObject *object();
+    QObject *object() const;
     void setObject(QObject *);
 
-    virtual ActionList actions();
+    bool restoreEntryValues() const;
+    void setRestoreEntryValues(bool);
 
-private:
-    ActionList doAction(QmlSetPropertiesMetaObject *, QObject *);
-    //QmlSetProperties::ActionList appendDotActions(const QVariant &, const QVariant &);
+    virtual ActionList actions();
 };
 QML_DECLARE_TYPE(QmlSetProperties);
 
-#endif // QMLSETPROPERTIES_H
-
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
+
+#endif // QMLSETPROPERTIES_H
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 194cc1b..6261003 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
 
-Action::Action() : bv(0), event(0), actionDone(false)
+Action::Action() : restore(true), bv(0), event(0), actionDone(false)
 {
 }
 
@@ -344,7 +344,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever
 
     for (int ii = 0; ii < applyList.count(); ++ii) {
         const Action &action = applyList.at(ii);
-        if (action.event)
+        if (action.event || !action.restore)
             continue;
 
         bool found = false;
diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h
index 68c43fa..aa8871f 100644
--- a/src/declarative/util/qmlstate.h
+++ b/src/declarative/util/qmlstate.h
@@ -43,9 +43,9 @@
 #define QMLSTATE_H
 
 #include <QtCore/qobject.h>
-#include <qfxglobal.h>
-#include <qml.h>
-#include <QSequentialAnimationGroup>
+#include <QtCore/QSequentialAnimationGroup>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qml.h>
 
 QT_BEGIN_HEADER
 
@@ -61,6 +61,7 @@ public:
     Action();
 
     QmlMetaProperty property;
+    bool restore;
     QVariant fromValue;
     QVariant toValue;
     QString fromBinding;
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h
index 28e1781..a2f18eb 100644
--- a/src/declarative/util/qmlstate_p.h
+++ b/src/declarative/util/qmlstate_p.h
@@ -42,9 +42,9 @@
 #ifndef QMLSTATE_P_H
 #define QMLSTATE_P_H
 
-#include <qmlstate.h>
-#include "private/qobject_p.h"
-#include "private/qmlanimation_p.h"
+#include <QtDeclarative/qmlstate.h>
+#include <private/qobject_p.h>
+#include <private/qmlanimation_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstategroup.h b/src/declarative/util/qmlstategroup.h
index 55b84eb..cca1015 100644
--- a/src/declarative/util/qmlstategroup.h
+++ b/src/declarative/util/qmlstategroup.h
@@ -42,7 +42,7 @@
 #ifndef QMLSTATEGROUP_H
 #define QMLSTATEGROUP_H
 
-#include <qmlstate.h>
+#include <QtDeclarative/qmlstate.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h
index 8ecdcd2..720c639 100644
--- a/src/declarative/util/qmlstateoperations.h
+++ b/src/declarative/util/qmlstateoperations.h
@@ -42,7 +42,7 @@
 #ifndef QMLSTATEOPERATIONS_H
 #define QMLSTATEOPERATIONS_H
 
-#include <qmlstate.h>
+#include <QtDeclarative/qmlstate.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmltransition.h b/src/declarative/util/qmltransition.h
index 0b7ea14..646746e 100644
--- a/src/declarative/util/qmltransition.h
+++ b/src/declarative/util/qmltransition.h
@@ -43,9 +43,9 @@
 #define QMLTRANSITION_H
 
 #include <QtCore/qobject.h>
-#include <qfxglobal.h>
-#include <qmlstate.h>
-#include <qml.h>
+#include <QtDeclarative/qfxglobal.h>
+#include <QtDeclarative/qmlstate.h>
+#include <QtDeclarative/qml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/widgets/graphicslayouts.h b/src/declarative/widgets/graphicslayouts.h
index beb4b65..e9930f1 100644
--- a/src/declarative/widgets/graphicslayouts.h
+++ b/src/declarative/widgets/graphicslayouts.h
@@ -42,9 +42,9 @@
 #ifndef GRAPHICSLAYOUTS_H
 #define GRAPHICSLAYOUTS_H
 
-#include "graphicswidgets.h"
-#include <QGraphicsLinearLayout>
-#include <QGraphicsGridLayout>
+#include <QtDeclarative/graphicswidgets.h>
+#include <QtGui/QGraphicsLinearLayout>
+#include <QtGui/QGraphicsGridLayout>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/widgets/graphicswidgets.h b/src/declarative/widgets/graphicswidgets.h
index 47a753a..cec15b6 100644
--- a/src/declarative/widgets/graphicswidgets.h
+++ b/src/declarative/widgets/graphicswidgets.h
@@ -42,11 +42,11 @@
 #ifndef GRAPHICSWIDGETS_H
 #define GRAPHICSWIDGETS_H
 
-#include <qml.h>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QGraphicsWidget>
-#include <QGraphicsItem>
+#include <QtDeclarative/qml.h>
+#include <QtGui/QGraphicsScene>
+#include <QtGui/QGraphicsView>
+#include <QtGui/QGraphicsWidget>
+#include <QtGui/QGraphicsItem>
 
 QT_BEGIN_NAMESPACE