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

27 files changed, 1426 insertions, 1440 deletions

diff --git a/demos/declarative/samegame/SameGame.qml b/demos/declarative/samegame/SameGame.qml
index 1788341..3b80692 100644
--- a/demos/declarative/samegame/SameGame.qml
+++ b/demos/declarative/samegame/SameGame.qml
@@ -5,6 +5,7 @@ import "content"
 Rect {
     id: page; width: 460; height: 700; color: activePalette.window
     Script { source: "content/samegame.js" }
+    Palette { id: activePalette; colorGroup: "Active" }
     Rect {
         id: gameCanvas
         property int score: 0
diff --git a/examples/declarative/follow/follow.qml b/examples/declarative/follow/follow.qml
index b906c12..59561b3 100644
--- a/examples/declarative/follow/follow.qml
+++ b/examples/declarative/follow/follow.qml
@@ -25,6 +25,7 @@ Rect {
     Rect {
         color: "#ff0000"
         x: Rect.width; width: Rect.width; height: 20
+        y: 200
         y: Follow { source: Rect.y; velocity: 200 }
     }
     Text { x: Rect.width; y: 220; text: "Velocity" }
@@ -32,8 +33,15 @@ Rect {
     // Spring
     Rect {
         color: "#ff0000"
-        x: Rect.width * 2; width: Rect.width; height: 20
-        y: Follow { source: Rect.y; spring: 1.2; damping: 0.1 }
+        x: Rect.width * 2; width: Rect.width/2; height: 20
+        y: 200
+        y: Follow { source: Rect.y; spring: 1.0; damping: 0.2 }
+    }
+    Rect {
+        color: "#880000"
+        x: Rect.width * 2.5; width: Rect.width/2; height: 20
+        y: 200
+        y: Follow { source: Rect.y; spring: 1.0; damping: 0.2; mass: 3.0 } // "heavier" object
     }
     Text { x: Rect.width * 2; y: 220; text: "Spring" }
 
diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index 5696f93..007b998 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -11,6 +11,8 @@ Rect {
 //        folder: "E:"
     }
 
+    Palette { id: activePalette; colorGroup: "Active" }
+
     Component {
         id: FolderDelegate
         Rect {
diff --git a/examples/declarative/loader/loader.qrc b/examples/declarative/loader/loader.qrc
index bdbcd5c..73ee253 100644
--- a/examples/declarative/loader/loader.qrc
+++ b/examples/declarative/loader/loader.qrc
@@ -4,5 +4,6 @@
         <file>Browser.qml</file>
         <file>images/fileopen.png</file>
         <file>images/up.png</file>
+        <file>Button.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/declarative/loader/main.cpp b/examples/declarative/loader/main.cpp
index aa86f8f..070ba75 100644
--- a/examples/declarative/loader/main.cpp
+++ b/examples/declarative/loader/main.cpp
@@ -2,13 +2,74 @@
 #include <QUrl>
 #include <QFileInfo>
 #include <QDir>
+#include <QPlainTextEdit>
+#include <QAction>
+#include <QVBoxLayout>
+#include <QMainWindow>
+#include <QMenuBar>
+#include <QDebug>
 #include <QmlContext>
 #include <QmlComponent>
 #include <qfxview.h>
-#include "qmlpalette.h"
+#include <QDebug>
 
 QFxView *canvas = 0;
 
+class Logger : public QWidget
+{
+    Q_OBJECT
+public:
+    Logger() : QWidget() {
+        logText = new QPlainTextEdit;
+        QVBoxLayout *layout = new QVBoxLayout;
+        layout->addWidget(logText);
+        layout->setMargin(0);
+        setLayout(layout);
+#ifdef Q_OS_SYMBIAN
+        QAction *closeAction = new QAction("Close", this);
+        closeAction->setSoftKeyRole(QAction::BackSoftKey);
+        connect(closeAction, SIGNAL(triggered()), this, SLOT(close()));
+
+        QList<QAction*> softKeys;
+        softKeys.append(closeAction);
+        setSoftKeys(softKeys);
+#endif
+    }
+
+    void append(const QString &text) {
+        logText->appendPlainText(text);
+    }
+
+    static Logger *instance() {
+        static Logger *logger = 0;
+        if (!logger)
+            logger = new Logger();
+        return logger;
+    }
+
+private:
+    QPlainTextEdit *logText;
+};
+
+void myMessageOutput(QtMsgType type, const char *msg)
+{
+    switch (type) {
+    case QtDebugMsg:
+        Logger::instance()->append(QString(msg));
+        break;
+    case QtWarningMsg:
+        Logger::instance()->append(QString(msg));
+        break;
+    case QtCriticalMsg:
+        Logger::instance()->append(QString(msg));
+        break;
+    case QtFatalMsg:
+        Logger::instance()->append(QString(msg));
+        abort();
+    }
+}
+
+
 class QmlLauncher : public QObject
 {
     Q_OBJECT
@@ -51,21 +112,75 @@ public:
         canvas->setUrl(fileName);
         canvas->execute();
     }
+
+signals:
+    void logUpdated();
+};
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+public:
+    MainWindow() : QMainWindow() {}
+
+
+public slots:
+    void toggleFullScreen()
+    {
+        if (isFullScreen()) {
+#ifdef Q_OS_SYMBIAN
+            showMaximized();
+#else
+            showNormal();
+#endif
+        } else {
+            showFullScreen();
+        }
+    }
+
+    void showLog()
+    {
+#ifdef Q_OS_SYMBIAN
+        Logger::instance()->showMaximized();
+#else
+        Logger::instance()->show();
+#endif
+    }
 };
 
+
 int main(int argc, char *argv[])
 {
+    qInstallMsgHandler(myMessageOutput);
     QApplication app(argc, argv);
 
+    MainWindow *mw = new MainWindow;
+
     QmlLauncher *launcher = new QmlLauncher;
 
+    QObject::connect(Logger::instance(), SIGNAL(textChanged()), launcher, SIGNAL(logUpdated()));
+
     canvas = new QFxView;
+    mw->setCentralWidget(canvas);
+
+    QMenuBar *mb = mw->menuBar();
+    QAction *showLogAction = new QAction("View Log...", mw);
+    mb->addAction(showLogAction);
+    QObject::connect(showLogAction, SIGNAL(triggered()), mw, SLOT(showLog()));
+    QAction *toggleFSAction = new QAction("Fullscreen", mw);
+    mb->addAction(toggleFSAction);
+    QObject::connect(toggleFSAction, SIGNAL(triggered()), mw, SLOT(toggleFullScreen()));
+
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("qmlLauncher", launcher);
-    ctxt->setContextProperty("activePalette", new QmlPalette);
     canvas->setUrl(QUrl("qrc:/loader.qml"));
+#ifdef Q_OS_SYMBIAN
+    canvas->setContentResizable(true);
+    mw->showMaximized();
+#else
+    mw->show();
+#endif
     canvas->execute();
-    canvas->show();
 
     return app.exec();
 }
diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp
index d94c6d8..e73c8a4 100644
--- a/src/declarative/fx/qfxflickable.cpp
+++ b/src/declarative/fx/qfxflickable.cpp
@@ -128,16 +128,17 @@ void QFxFlickablePrivate::fixupX()
 
     vTime = _tl.time();
 
-    if (_moveX.value() > q->minXExtent() || q->maxXExtent() > 0) {
+    if (_moveX.value() > q->minXExtent() || (q->maxXExtent() > q->maxXExtent())) {
         _tl.clear();
-        _tl.move(_moveX, q->minXExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200);
-        flicked = false;
+        if (_moveX.value() != q->minXExtent())
+            _tl.move(_moveX, q->minXExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200);
         //emit flickingChanged();
     } else if (_moveX.value() < q->maxXExtent()) {
         _tl.clear();
         _tl.move(_moveX,  q->maxXExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200);
-        flicked = false;
         //emit flickingChanged();
+    } else {
+        flicked = false;
     }
 }
 
@@ -151,7 +152,8 @@ void QFxFlickablePrivate::fixupY()
 
     if (_moveY.value() > q->minYExtent() || (q->maxYExtent() > q->minYExtent())) {
         _tl.clear();
-        _tl.move(_moveY, q->minYExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200);
+        if (_moveY.value() != q->minYExtent())
+            _tl.move(_moveY, q->minYExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200);
         //emit flickingChanged();
     } else if (_moveY.value() < q->maxYExtent()) {
         _tl.clear();
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index 6ffe603..27ac92d 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -1406,7 +1406,7 @@ void QFxGridView::refill()
 }
 
 
-QObject *QFxGridView::qmlAttachedProperties(QObject *obj)
+QFxGridViewAttached *QFxGridView::qmlAttachedProperties(QObject *obj)
 {
     return QFxGridViewAttached::properties(obj);
 }
diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h
index 3708f19..2541884 100644
--- a/src/declarative/fx/qfxgridview.h
+++ b/src/declarative/fx/qfxgridview.h
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 class QFxVisualItemModel;
+class QFxGridViewAttached;
 class QFxGridViewPrivate;
 class Q_DECLARATIVE_EXPORT QFxGridView : public QFxFlickable
 {
@@ -109,7 +110,7 @@ public:
     int cellHeight() const;
     void setCellHeight(int);
 
-    static QObject *qmlAttachedProperties(QObject *);
+    static QFxGridViewAttached *qmlAttachedProperties(QObject *);
 
 Q_SIGNALS:
     void countChanged();
diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp
index e563ecb..36ecddd 100644
--- a/src/declarative/fx/qfxlistview.cpp
+++ b/src/declarative/fx/qfxlistview.cpp
@@ -54,7 +54,7 @@ class QFxListViewAttached : public QObject
     Q_OBJECT
 public:
     QFxListViewAttached(QObject *parent)
-        : QObject(parent), m_isCurrent(false), m_delayRemove(false) {}
+        : QObject(parent), m_view(0), m_isCurrent(false), m_delayRemove(false) {}
     ~QFxListViewAttached() {
         attachedProperties.remove(parent());
     }
@@ -1630,7 +1630,7 @@ void QFxListView::destroyingItem(QFxItem *item)
     d->unrequestedItems.remove(item);
 }
 
-QObject *QFxListView::qmlAttachedProperties(QObject *obj)
+QFxListViewAttached *QFxListView::qmlAttachedProperties(QObject *obj)
 {
     return QFxListViewAttached::properties(obj);
 }
diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h
index cd27050..0a0737f 100644
--- a/src/declarative/fx/qfxlistview.h
+++ b/src/declarative/fx/qfxlistview.h
@@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QFxVisualItemModel;
+class QFxListViewAttached;
 class QFxListViewPrivate;
 class Q_DECLARATIVE_EXPORT QFxListView : public QFxFlickable
 {
@@ -116,7 +117,7 @@ public:
     void setSectionExpression(const QString &);
     QString currentSection() const;
 
-    static QObject *qmlAttachedProperties(QObject *);
+    static QFxListViewAttached *qmlAttachedProperties(QObject *);
 
 Q_SIGNALS:
     void countChanged();
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp
index d7bb7c9..bc19c23 100644
--- a/src/declarative/fx/qfxmouseregion.cpp
+++ b/src/declarative/fx/qfxmouseregion.cpp
@@ -46,7 +46,7 @@
 
 
 QT_BEGIN_NAMESPACE
-static const int DragThreshold = 5;
+static const qreal DragThreshold = 5;
 static const int PressAndHoldDelay = 800;
 
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Drag,QFxDrag)
@@ -85,12 +85,12 @@ void QFxDrag::setAxis(const QString &a)
 
     If x-axis dragging is enabled, xmin limits how far to the left the target can be dragged. If x-axis dragging is not enabled, this property has no effect.
 */
-int QFxDrag::xmin() const
+qreal QFxDrag::xmin() const
 {
     return _xmin;
 }
 
-void QFxDrag::setXmin(int m)
+void QFxDrag::setXmin(qreal m)
 {
     _xmin = m;
 }
@@ -101,12 +101,12 @@ void QFxDrag::setXmin(int m)
 
     If x-axis dragging is enabled, xmax limits how far to the right the target can be dragged. If x-axis dragging is not enabled, this property has no effect.
 */
-int QFxDrag::xmax() const
+qreal QFxDrag::xmax() const
 {
     return _xmax;
 }
 
-void QFxDrag::setXmax(int m)
+void QFxDrag::setXmax(qreal m)
 {
     _xmax = m;
 }
@@ -117,12 +117,12 @@ void QFxDrag::setXmax(int m)
 
     If y-axis dragging is enabled, ymin limits how far up the target can be dragged. If y-axis dragging is not enabled, this property has no effect.
 */
-int QFxDrag::ymin() const
+qreal QFxDrag::ymin() const
 {
     return _ymin;
 }
 
-void QFxDrag::setYmin(int m)
+void QFxDrag::setYmin(qreal m)
 {
     _ymin = m;
 }
@@ -133,12 +133,12 @@ void QFxDrag::setYmin(int m)
 
     If y-axis dragging is enabled, ymax limits how far down the target can be dragged. If y-axis dragging is not enabled, this property has no effect.
 */
-int QFxDrag::ymax() const
+qreal QFxDrag::ymax() const
 {
     return _ymax;
 }
 
-void QFxDrag::setYmax(int m)
+void QFxDrag::setYmax(qreal m)
 {
     _ymax = m;
 }
@@ -266,21 +266,21 @@ QFxMouseRegion::~QFxMouseRegion()
 }
 
 /*!
-    \qmlproperty int MouseRegion::mouseX
-    \qmlproperty int MouseRegion::mouseY
+    \qmlproperty real MouseRegion::mouseX
+    \qmlproperty real MouseRegion::mouseY
 
     The coordinates of the mouse while pressed. The coordinates are relative to the item that was pressed.
 */
-int QFxMouseRegion::mouseX() const
+qreal QFxMouseRegion::mouseX() const
 {
     Q_D(const QFxMouseRegion);
-    return int(d->lastPos.x());
+    return d->lastPos.x();
 }
 
-int QFxMouseRegion::mouseY() const
+qreal QFxMouseRegion::mouseY() const
 {
     Q_D(const QFxMouseRegion);
-    return int(d->lastPos.y());
+    return d->lastPos.y();
 }
 
 /*!
@@ -342,8 +342,8 @@ void QFxMouseRegion::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
     if (drag()->target()) {
         if (!d->moved) {
-            if (d->dragX) d->startX = int(drag()->target()->x());   //### change startX and startY to qreal?
-            if (d->dragY) d->startY = int(drag()->target()->y());
+            if (d->dragX) d->startX = drag()->target()->x();
+            if (d->dragY) d->startY = drag()->target()->y();
         }
 
         QPointF startLocalPos;
@@ -356,8 +356,8 @@ void QFxMouseRegion::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
             curLocalPos = event->scenePos();
         }
 
-        int dx = int(qAbs(curLocalPos.x() - startLocalPos.x()));
-        int dy = int(qAbs(curLocalPos.y() - startLocalPos.y()));
+        qreal dx = qAbs(curLocalPos.x() - startLocalPos.x());
+        qreal dy = qAbs(curLocalPos.y() - startLocalPos.y());
         if ((d->dragX && !(dx < DragThreshold)) || (d->dragY && !(dy < DragThreshold)))
             d->dragged = true;
         if (!keepMouseGrab()) {
@@ -530,10 +530,10 @@ QFxDrag *QFxMouseRegion::drag()
 /*!
     \qmlproperty Item MouseRegion::drag.target
     \qmlproperty string MouseRegion::drag.axis
-    \qmlproperty int MouseRegion::drag.xmin
-    \qmlproperty int MouseRegion::drag.xmax
-    \qmlproperty int MouseRegion::drag.ymin
-    \qmlproperty int MouseRegion::drag.ymax
+    \qmlproperty real MouseRegion::drag.xmin
+    \qmlproperty real MouseRegion::drag.xmax
+    \qmlproperty real MouseRegion::drag.ymin
+    \qmlproperty real MouseRegion::drag.ymax
 
     drag provides a convenient way to make an item draggable.
 
diff --git a/src/declarative/fx/qfxmouseregion.h b/src/declarative/fx/qfxmouseregion.h
index 47929be..6d85cea 100644
--- a/src/declarative/fx/qfxmouseregion.h
+++ b/src/declarative/fx/qfxmouseregion.h
@@ -56,10 +56,10 @@ class Q_DECLARATIVE_EXPORT QFxDrag : public QObject
 
     Q_PROPERTY(QFxItem *target READ target WRITE setTarget)
     Q_PROPERTY(QString axis READ axis WRITE setAxis)
-    Q_PROPERTY(int xmin READ xmin WRITE setXmin)
-    Q_PROPERTY(int xmax READ xmax WRITE setXmax)
-    Q_PROPERTY(int ymin READ ymin WRITE setYmin)
-    Q_PROPERTY(int ymax READ ymax WRITE setYmax)
+    Q_PROPERTY(qreal xmin READ xmin WRITE setXmin)
+    Q_PROPERTY(qreal xmax READ xmax WRITE setXmax)
+    Q_PROPERTY(qreal ymin READ ymin WRITE setYmin)
+    Q_PROPERTY(qreal ymax READ ymax WRITE setYmax)
 public:
     QFxDrag(QObject *parent=0);
     ~QFxDrag();
@@ -68,22 +68,22 @@ public:
     void setTarget(QFxItem *);
     QString axis() const;
     void setAxis(const QString &);
-    int xmin() const;
-    void setXmin(int);
-    int xmax() const;
-    void setXmax(int);
-    int ymin() const;
-    void setYmin(int);
-    int ymax() const;
-    void setYmax(int);
+    qreal xmin() const;
+    void setXmin(qreal);
+    qreal xmax() const;
+    void setXmax(qreal);
+    qreal ymin() const;
+    void setYmin(qreal);
+    qreal ymax() const;
+    void setYmax(qreal);
 
 private:
     QFxItem *_target;
     QString _axis;
-    int _xmin;
-    int _xmax;
-    int _ymin;
-    int _ymax;
+    qreal _xmin;
+    qreal _xmax;
+    qreal _ymin;
+    qreal _ymax;
     Q_DISABLE_COPY(QFxDrag)
 };
 
@@ -93,8 +93,8 @@ class Q_DECLARATIVE_EXPORT QFxMouseRegion : public QFxItem
 {
     Q_OBJECT
 
-    Q_PROPERTY(int mouseX READ mouseX NOTIFY positionChanged)
-    Q_PROPERTY(int mouseY READ mouseY NOTIFY positionChanged)
+    Q_PROPERTY(qreal mouseX READ mouseX NOTIFY positionChanged)
+    Q_PROPERTY(qreal mouseY READ mouseY NOTIFY positionChanged)
     Q_PROPERTY(bool containsMouse READ hovered NOTIFY hoveredChanged)
     Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
@@ -103,8 +103,8 @@ public:
     QFxMouseRegion(QFxItem *parent=0);
     ~QFxMouseRegion();
 
-    int mouseX() const;
-    int mouseY() const;
+    qreal mouseX() const;
+    qreal mouseY() const;
 
     bool isEnabled() const;
     void setEnabled(bool);
diff --git a/src/declarative/fx/qfxmouseregion_p.h b/src/declarative/fx/qfxmouseregion_p.h
index a41f32a..70d78f3 100644
--- a/src/declarative/fx/qfxmouseregion_p.h
+++ b/src/declarative/fx/qfxmouseregion_p.h
@@ -95,8 +95,8 @@ public:
     QFxDrag drag;
     QPointF start;
     QPointF startScene;
-    int startX;
-    int startY;
+    qreal startX;
+    qreal startY;
     QPointF lastPos;
     Qt::MouseButton lastButton;
     Qt::MouseButtons lastButtons;
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g
index a1c4ba2..8d153ea 100644
--- a/src/declarative/qml/parser/qmljs.g
+++ b/src/declarative/qml/parser/qmljs.g
@@ -46,7 +46,7 @@
 %decl           qmljsparser_p.h
 %impl           qmljsparser.cpp
 %expect         2
-%expect-rr      3
+%expect-rr      2
 
 %token T_AND "&"                T_AND_AND "&&"              T_AND_EQ "&="
 %token T_BREAK "break"          T_CASE "case"               T_CATCH "catch"
@@ -580,86 +580,73 @@ case $rule_number: {
 } break;
 ./
 
-UiImport: T_IMPORT T_STRING_LITERAL T_AUTOMATIC_SEMICOLON;
-UiImport: T_IMPORT T_STRING_LITERAL T_SEMICOLON;
-/.
-case $rule_number: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).sval);
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->semicolonToken = loc(3);
-    sym(1).Node = node;
-} break;
-./
+ImportId: MemberExpression ;
 
-UiImport: T_IMPORT T_STRING_LITERAL T_AS JsIdentifier T_AUTOMATIC_SEMICOLON;
-UiImport: T_IMPORT T_STRING_LITERAL T_AS JsIdentifier T_SEMICOLON;
+UiImport: UiImportHead T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_SEMICOLON ;
 /.
 case $rule_number: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).sval);
-    node->importId = sym(4).sval;
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->asToken = loc(3);
-    node->importIdToken = loc(4);
-    node->semicolonToken = loc(5);
-    sym(1).Node = node;
+    sym(1).UiImport->semicolonToken = loc(2);
 } break;
 ./
 
-UiImport: T_IMPORT UiQualifiedId T_AUTOMATIC_SEMICOLON;
-UiImport: T_IMPORT UiQualifiedId T_SEMICOLON;
+UiImport: UiImportHead T_NUMERIC_LITERAL T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_NUMERIC_LITERAL T_SEMICOLON ;
 /.
 case $rule_number: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->semicolonToken = loc(3);
-    sym(1).Node = node;
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->semicolonToken = loc(3);
 } break;
 ./
 
-UiImport: T_IMPORT UiQualifiedId T_NUMERIC_LITERAL T_AUTOMATIC_SEMICOLON;
-UiImport: T_IMPORT UiQualifiedId T_NUMERIC_LITERAL T_SEMICOLON;
+UiImport: UiImportHead T_NUMERIC_LITERAL T_AS JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_NUMERIC_LITERAL T_AS JsIdentifier T_SEMICOLON ;
 /.
 case $rule_number: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->versionToken = loc(3);
-    node->semicolonToken = loc(4);
-    sym(1).Node = node;
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->asToken = loc(3);
+    sym(1).UiImport->importIdToken = loc(4);
+    sym(1).UiImport->semicolonToken = loc(5);
 } break;
 ./
 
-UiImport: T_IMPORT UiQualifiedId T_NUMERIC_LITERAL T_AS JsIdentifier T_AUTOMATIC_SEMICOLON;
-UiImport: T_IMPORT UiQualifiedId T_NUMERIC_LITERAL T_AS JsIdentifier T_SEMICOLON;
+UiImport: UiImportHead T_AS JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_AS JsIdentifier T_SEMICOLON ;
 /.
 case $rule_number: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
-    node->importId = sym(5).sval;
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->versionToken = loc(3);
-    node->asToken = loc(4);
-    node->importIdToken = loc(5);
-    node->semicolonToken = loc(6);
-    sym(1).Node = node;
+    sym(1).UiImport->asToken = loc(2);
+    sym(1).UiImport->importIdToken = loc(3);
+    sym(1).UiImport->semicolonToken = loc(4);
 } break;
 ./
 
-UiImport: T_IMPORT UiQualifiedId T_AS JsIdentifier T_AUTOMATIC_SEMICOLON;
-UiImport: T_IMPORT UiQualifiedId T_AS JsIdentifier T_SEMICOLON;
+
+UiImportHead: T_IMPORT ImportId ;
 /.
 case $rule_number: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
-    node->importId = sym(4).sval;
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->asToken = loc(3);
-    node->importIdToken = loc(4);
-    node->semicolonToken = loc(5);
+    AST::UiImport *node = 0;
+
+    if (AST::StringLiteral *importIdLiteral = AST::cast<AST::StringLiteral *>(sym(2).Expression)) {
+        node = makeAstNode<AST::UiImport>(driver->nodePool(), importIdLiteral->value);
+        node->fileNameToken = loc(2);
+    } else if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(2).Expression)) {
+        QString text;
+        for (AST::UiQualifiedId *q = qualifiedId; q; q = q->next) {
+	   text += q->name->asString();
+           if (q->next) text += QLatin1String(".");
+        }
+        node = makeAstNode<AST::UiImport>(driver->nodePool(), qualifiedId);
+        node->fileNameToken = loc(2);
+    }
+
     sym(1).Node = node;
+
+    if (! node) {
+       diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1),
+         QLatin1String("Expected a qualified name id or a string literal")));
+
+        return false; // ### remove me
+    }
 } break;
 ./
 
@@ -733,7 +720,7 @@ case $rule_number: {
 UiObjectDefinition: UiQualifiedId UiObjectInitializer ;
 /.
 case $rule_number: {
-    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
+    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId,
         sym(2).UiObjectInitializer);
     sym(1).Node = node;
 }   break;
@@ -745,7 +732,7 @@ UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
 /.
 case $rule_number: {
     AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
-        sym(1).UiQualifiedId->finish(), sym(4).UiArrayMemberList->finish());
+        sym(1).UiQualifiedId, sym(4).UiArrayMemberList->finish());
     node->colonToken = loc(2);
     node->lbracketToken = loc(3);
     node->rbracketToken = loc(5);
@@ -753,67 +740,16 @@ case $rule_number: {
 }   break;
 ./
 
-UiObjectMember: UiQualifiedId             T_COLON Expression UiObjectInitializer ;
+UiObjectMember: UiQualifiedId             T_COLON UiQualifiedId  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);
+      sym(1).UiQualifiedId, sym(3).UiQualifiedId, 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 UiSignature T_COLON Expression UiObjectInitializer ;
-/.
-case $rule_number: {
-  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(4).Expression)) {
-    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
-      sym(1).UiQualifiedId->finish(), qualifiedId, sym(5).UiObjectInitializer);
-    node->colonToken = loc(3);
-    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 UiSignature T_COLON Block ;
-/.case $rule_number:./
-
-UiObjectMember: UiQualifiedId UiSignature T_COLON EmptyStatement ;
-/.case $rule_number:./
-
-UiObjectMember: UiQualifiedId UiSignature T_COLON ExpressionStatement ;
-/.case $rule_number:./
-
-UiObjectMember: UiQualifiedId UiSignature 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(4).Statement);
-    node->colonToken = loc(3);
-    sym(1).Node = node;
-}   break;
-./
-
-
-
 UiObjectMember: UiQualifiedId T_COLON Block ;
 /.case $rule_number:./
 
@@ -829,7 +765,7 @@ UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if
 /.
 {
     AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
-        sym(1).UiQualifiedId->finish(), sym(3).Statement);
+        sym(1).UiQualifiedId, sym(3).Statement);
     node->colonToken = loc(2);
     sym(1).Node = node;
 }   break;
@@ -882,64 +818,6 @@ case $rule_number: {
 } break;
 ./
 
-UiFormal: JsIdentifier ;
-/.
-case $rule_number: {
-    AST::UiFormal *node = makeAstNode<AST::UiFormal>(driver->nodePool(), sym(1).sval);
-    node->identifierToken = loc(1);
-    sym(1).UiFormal = node;
-} break;
-./
-
-UiFormal: JsIdentifier T_AS JsIdentifier ;
-/.
-case $rule_number: {
-    AST::UiFormal *node = makeAstNode<AST::UiFormal>(driver->nodePool(),
-        sym(1).sval, sym(3).sval);
-    node->identifierToken = loc(1);
-    node->asToken = loc(2);
-    node->aliasToken = loc(3);
-    sym(1).UiFormal = node;
-} break;
-./
-
-UiFormalList: UiFormal ;
-/.
-case $rule_number: {
-    sym(1).UiFormalList = makeAstNode<AST::UiFormalList>(driver->nodePool(),
-        sym(1).UiFormal);
-} break;
-./
-
-UiFormalList: UiFormalList T_COMMA UiFormal ;
-/.
-case $rule_number: {
-    sym(1).UiFormalList = makeAstNode<AST::UiFormalList>(driver->nodePool(),
-        sym(1).UiFormalList, sym(3).UiFormal);
-} break;
-./
-
-UiSignature: T_LPAREN              T_RPAREN ;
-/.
-case $rule_number: {
-    AST::UiSignature *node = makeAstNode<AST::UiSignature>(driver->nodePool());
-    node->lparenToken = loc(1);
-    node->rparenToken = loc(3);
-    sym(1).UiSignature = node;
-} break;
-./
-
-UiSignature: T_LPAREN UiFormalList T_RPAREN ;
-/.
-case $rule_number: {
-    AST::UiSignature *node = makeAstNode<AST::UiSignature>(driver->nodePool(),
-        sym(2).UiFormalList->finish());
-    node->lparenToken = loc(1);
-    node->rparenToken = loc(3);
-    sym(1).UiSignature = node;
-} break;
-./
-
 UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_AUTOMATIC_SEMICOLON ;
 UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_SEMICOLON ;
 /.
@@ -1043,19 +921,6 @@ case $rule_number: {
 }   break;
 ./
 
-UiQualifiedId: T_RESERVED_WORD ;
-/.case $rule_number: ./
-
-UiQualifiedId: T_RETURN ;
-/.
-case $rule_number:
-{
-    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
-    node->identifierToken = loc(1);
-    sym(1).Node = node;
-}   break;
-./
-
 JsIdentifier: T_IDENTIFIER;
 
 JsIdentifier: T_PROPERTY ;
@@ -1277,22 +1142,27 @@ case $rule_number: {
 } break;
 ./
 
-UiQualifiedId: JsIdentifier ;
+UiQualifiedId: MemberExpression ;
 /.
 case $rule_number: {
-    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
-    node->identifierToken = loc(1);
-    sym(1).Node = node;
-}   break;
-./
+  if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
+      QLatin1String("Ignored annotation")));
 
-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;
+    sym(1).Expression = mem->base;
+  }
+
+  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(1).Expression)) {
+    sym(1).UiQualifiedId = qualifiedId;
+  } else {
+    sym(1).UiQualifiedId = 0;
+
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1),
+      QLatin1String("Expected a qualified name id")));
+
+    return false; // ### recover
+  }
+} break;
 ./
 
 ElementList: AssignmentExpression ;
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
index 21dde3f..f980aa4 100644
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ b/src/declarative/qml/parser/qmljsgrammar.cpp
@@ -55,437 +55,424 @@ const char *const QmlJSGrammar::spell [] = {
   0, 0, 0, 0, 0};
 
 const int QmlJSGrammar::lhs [] = {
-  95, 95, 95, 96, 99, 99, 102, 102, 103, 103, 
-  103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 
-  101, 100, 107, 107, 109, 109, 110, 110, 106, 108, 
-  108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 
-  108, 116, 116, 116, 117, 117, 118, 118, 119, 119, 
-  120, 120, 111, 111, 108, 108, 108, 108, 108, 108, 
-  108, 108, 108, 108, 108, 108, 108, 108, 105, 105, 
-  104, 104, 104, 123, 123, 123, 123, 123, 123, 123, 
+  95, 95, 95, 96, 99, 99, 102, 102, 104, 103, 
+  103, 103, 103, 103, 103, 103, 103, 106, 101, 100, 
+  109, 109, 111, 111, 112, 112, 108, 110, 110, 110, 
+  110, 110, 110, 110, 118, 118, 118, 119, 119, 120, 
+  120, 110, 110, 110, 110, 110, 110, 110, 110, 110, 
+  110, 110, 110, 110, 110, 107, 107, 107, 123, 123, 
   123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 
-  123, 105, 105, 125, 125, 125, 125, 124, 124, 127, 
-  127, 129, 129, 129, 129, 129, 129, 130, 130, 130, 
+  123, 123, 123, 123, 123, 123, 113, 125, 125, 125, 
+  125, 124, 124, 127, 127, 129, 129, 129, 129, 129, 
+  129, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
   130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
   130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-  130, 130, 130, 130, 130, 130, 130, 130, 131, 131, 
-  132, 132, 132, 132, 132, 135, 135, 136, 136, 136, 
-  136, 134, 134, 137, 137, 138, 138, 139, 139, 139, 
-  140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 
-  141, 141, 141, 141, 142, 142, 142, 143, 143, 143, 
-  143, 144, 144, 144, 144, 144, 144, 144, 145, 145, 
-  145, 145, 145, 145, 146, 146, 146, 146, 146, 147, 
-  147, 147, 147, 147, 148, 148, 149, 149, 150, 150, 
-  151, 151, 152, 152, 153, 153, 154, 154, 155, 155, 
-  156, 156, 157, 157, 158, 158, 159, 159, 128, 128, 
-  160, 160, 161, 161, 161, 161, 161, 161, 161, 161, 
-  161, 161, 161, 161, 98, 98, 162, 162, 163, 163, 
-  164, 164, 97, 97, 97, 97, 97, 97, 97, 97, 
-  97, 97, 97, 97, 97, 97, 97, 112, 176, 176, 
-  175, 175, 122, 122, 177, 177, 178, 178, 180, 180, 
-  179, 181, 184, 182, 182, 185, 183, 183, 113, 114, 
-  114, 115, 115, 165, 165, 165, 165, 165, 165, 165, 
-  166, 166, 166, 166, 167, 167, 167, 167, 168, 168, 
-  169, 171, 186, 186, 189, 189, 187, 187, 190, 188, 
-  170, 170, 170, 172, 172, 173, 173, 173, 191, 192, 
-  174, 174, 121, 133, 196, 196, 193, 193, 194, 194, 
-  197, 198, 198, 199, 199, 195, 195, 126, 126, 200};
+  130, 130, 131, 131, 105, 105, 105, 105, 105, 134, 
+  134, 135, 135, 135, 135, 133, 133, 136, 136, 137, 
+  137, 138, 138, 138, 139, 139, 139, 139, 139, 139, 
+  139, 139, 139, 139, 140, 140, 140, 140, 141, 141, 
+  141, 142, 142, 142, 142, 143, 143, 143, 143, 143, 
+  143, 143, 144, 144, 144, 144, 144, 144, 145, 145, 
+  145, 145, 145, 146, 146, 146, 146, 146, 147, 147, 
+  148, 148, 149, 149, 150, 150, 151, 151, 152, 152, 
+  153, 153, 154, 154, 155, 155, 156, 156, 157, 157, 
+  158, 158, 128, 128, 159, 159, 160, 160, 160, 160, 
+  160, 160, 160, 160, 160, 160, 160, 160, 98, 98, 
+  161, 161, 162, 162, 163, 163, 97, 97, 97, 97, 
+  97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 
+  97, 114, 175, 175, 174, 174, 122, 122, 176, 176, 
+  177, 177, 179, 179, 178, 180, 183, 181, 181, 184, 
+  182, 182, 115, 116, 116, 117, 117, 164, 164, 164, 
+  164, 164, 164, 164, 165, 165, 165, 165, 166, 166, 
+  166, 166, 167, 167, 168, 170, 185, 185, 188, 188, 
+  186, 186, 189, 187, 169, 169, 169, 171, 171, 172, 
+  172, 172, 190, 191, 173, 173, 121, 132, 195, 195, 
+  192, 192, 193, 193, 196, 197, 197, 198, 198, 194, 
+  194, 126, 126, 199};
 
 const int QmlJSGrammar:: rhs[] = {
-  2, 2, 2, 2, 1, 1, 1, 2, 3, 3, 
-  5, 5, 3, 3, 4, 4, 6, 6, 5, 5, 
-  0, 1, 1, 2, 1, 3, 2, 3, 2, 1, 
-  5, 4, 5, 4, 4, 4, 4, 3, 3, 3, 
-  3, 1, 1, 1, 0, 1, 2, 4, 1, 3, 
-  1, 3, 2, 3, 6, 6, 3, 3, 4, 4, 
-  5, 5, 6, 6, 7, 7, 1, 1, 1, 1, 
+  2, 2, 2, 2, 1, 1, 1, 2, 1, 2, 
+  2, 3, 3, 5, 5, 4, 4, 2, 0, 1, 
+  1, 2, 1, 3, 2, 3, 2, 1, 5, 4, 
+  3, 3, 3, 3, 1, 1, 1, 0, 1, 2, 
+  4, 6, 6, 3, 3, 4, 4, 5, 5, 6, 
+  6, 7, 7, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 
+  3, 4, 5, 3, 4, 3, 1, 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, 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, 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, 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, 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, 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};
+  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, 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 QmlJSGrammar::action_default [] = {
-  0, 0, 0, 21, 0, 178, 245, 209, 217, 213, 
-  157, 229, 205, 3, 142, 75, 158, 221, 225, 146, 
-  175, 156, 161, 141, 195, 182, 0, 82, 83, 78, 
-  346, 71, 348, 0, 0, 0, 0, 80, 0, 0, 
-  76, 79, 0, 0, 72, 73, 81, 74, 0, 77, 
-  0, 0, 171, 0, 0, 158, 177, 160, 159, 0, 
-  0, 0, 173, 174, 172, 176, 0, 206, 0, 0, 
-  0, 0, 196, 0, 0, 0, 0, 0, 0, 186, 
-  0, 0, 0, 180, 181, 179, 184, 188, 187, 185, 
-  183, 198, 197, 199, 0, 214, 0, 210, 0, 0, 
-  152, 139, 151, 140, 108, 109, 110, 135, 111, 136, 
-  112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 
-  122, 123, 124, 137, 125, 126, 127, 128, 129, 130, 
-  131, 132, 133, 134, 138, 0, 0, 150, 246, 153, 
-  0, 154, 0, 155, 149, 0, 242, 235, 233, 240, 
-  241, 239, 238, 244, 237, 236, 234, 243, 230, 0, 
-  218, 0, 0, 222, 0, 0, 226, 0, 0, 152, 
-  144, 0, 143, 0, 148, 162, 0, 347, 337, 338, 
-  0, 335, 0, 336, 0, 339, 253, 260, 259, 267, 
-  255, 0, 256, 340, 0, 345, 257, 258, 263, 261, 
-  342, 341, 344, 264, 0, 275, 0, 0, 0, 0, 
-  346, 71, 0, 348, 72, 247, 289, 73, 0, 0, 
-  0, 276, 0, 0, 265, 266, 0, 254, 262, 290, 
-  291, 334, 343, 0, 305, 306, 307, 308, 0, 301, 
-  302, 303, 304, 331, 332, 0, 0, 0, 0, 0, 
-  294, 295, 251, 249, 211, 219, 215, 231, 207, 252, 
-  0, 158, 223, 227, 200, 189, 0, 0, 208, 0, 
-  0, 0, 0, 201, 0, 0, 0, 0, 0, 193, 
-  191, 194, 192, 190, 203, 202, 204, 0, 216, 0, 
-  212, 0, 250, 158, 0, 232, 247, 248, 0, 247, 
-  0, 0, 297, 0, 0, 0, 299, 0, 220, 0, 
-  0, 224, 0, 0, 228, 287, 0, 279, 288, 282, 
-  0, 286, 0, 247, 280, 0, 247, 0, 0, 298, 
-  0, 0, 0, 300, 347, 337, 0, 0, 339, 0, 
-  333, 0, 323, 0, 0, 0, 293, 0, 292, 0, 
-  349, 0, 107, 269, 272, 0, 108, 275, 111, 136, 
-  113, 114, 78, 118, 119, 71, 120, 123, 76, 79, 
-  72, 247, 73, 81, 126, 74, 128, 77, 130, 131, 
-  276, 133, 134, 138, 0, 100, 0, 0, 102, 106, 
-  104, 90, 103, 105, 0, 101, 89, 270, 268, 146, 
-  147, 152, 0, 145, 0, 322, 0, 309, 310, 0, 
-  321, 0, 0, 0, 312, 317, 315, 318, 0, 0, 
-  316, 317, 0, 313, 0, 314, 271, 320, 0, 271, 
-  319, 0, 324, 325, 0, 271, 326, 327, 0, 0, 
-  328, 0, 0, 0, 329, 330, 164, 163, 0, 0, 
-  0, 296, 0, 0, 0, 311, 284, 277, 0, 285, 
-  281, 0, 283, 273, 0, 274, 278, 94, 0, 0, 
-  98, 84, 0, 86, 96, 0, 87, 97, 99, 88, 
-  95, 85, 0, 91, 168, 166, 170, 167, 165, 169, 
-  2, 5, 0, 7, 6, 0, 1, 92, 69, 70, 
-  0, 0, 0, 9, 10, 0, 11, 12, 0, 13, 
-  0, 0, 14, 0, 19, 20, 93, 0, 15, 16, 
-  0, 17, 18, 8, 22, 0, 4, 0, 29, 67, 
-  0, 0, 72, 27, 73, 30, 23, 0, 0, 68, 
-  0, 44, 43, 42, 0, 0, 61, 0, 62, 0, 
-  65, 66, 0, 0, 0, 59, 0, 60, 0, 63, 
-  64, 0, 57, 45, 58, 46, 0, 0, 0, 0, 
-  48, 0, 55, 56, 47, 28, 24, 0, 0, 0, 
-  38, 39, 0, 40, 41, 271, 0, 32, 108, 275, 
-  111, 136, 113, 114, 78, 118, 119, 71, 120, 123, 
-  76, 79, 72, 247, 73, 81, 126, 74, 128, 77, 
-  130, 131, 276, 133, 134, 138, 75, 0, 25, 0, 
-  31, 26, 49, 53, 51, 0, 0, 50, 0, 54, 
-  52, 0, 34, 35, 0, 36, 37, 33, 350};
+  0, 0, 0, 19, 0, 162, 229, 193, 201, 197, 
+  141, 213, 189, 3, 126, 60, 142, 205, 209, 130, 
+  159, 140, 145, 125, 179, 166, 0, 67, 68, 63, 
+  330, 56, 332, 0, 0, 0, 0, 65, 0, 0, 
+  61, 64, 0, 0, 57, 58, 66, 59, 0, 62, 
+  0, 0, 155, 0, 0, 142, 161, 144, 143, 0, 
+  0, 0, 157, 158, 156, 160, 0, 190, 0, 0, 
+  0, 0, 180, 0, 0, 0, 0, 0, 0, 170, 
+  0, 0, 0, 164, 165, 163, 168, 172, 171, 169, 
+  167, 182, 181, 183, 0, 198, 0, 194, 0, 0, 
+  136, 123, 135, 124, 92, 93, 94, 119, 95, 120, 
+  96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 
+  106, 107, 108, 121, 109, 110, 111, 112, 113, 114, 
+  115, 116, 117, 118, 122, 0, 0, 134, 230, 137, 
+  0, 138, 0, 139, 133, 0, 226, 219, 217, 224, 
+  225, 223, 222, 228, 221, 220, 218, 227, 214, 0, 
+  202, 0, 0, 206, 0, 0, 210, 0, 0, 136, 
+  128, 0, 127, 0, 132, 146, 0, 331, 321, 322, 
+  0, 319, 0, 320, 0, 323, 237, 244, 243, 251, 
+  239, 0, 240, 324, 0, 329, 241, 242, 247, 245, 
+  326, 325, 328, 248, 0, 259, 0, 0, 0, 0, 
+  330, 56, 0, 332, 57, 231, 273, 58, 0, 0, 
+  0, 260, 0, 0, 249, 250, 0, 238, 246, 274, 
+  275, 318, 327, 0, 289, 290, 291, 292, 0, 285, 
+  286, 287, 288, 315, 316, 0, 0, 0, 0, 0, 
+  278, 279, 235, 233, 195, 203, 199, 215, 191, 236, 
+  0, 142, 207, 211, 184, 173, 0, 0, 192, 0, 
+  0, 0, 0, 185, 0, 0, 0, 0, 0, 177, 
+  175, 178, 176, 174, 187, 186, 188, 0, 200, 0, 
+  196, 0, 234, 142, 0, 216, 231, 232, 0, 231, 
+  0, 0, 281, 0, 0, 0, 283, 0, 204, 0, 
+  0, 208, 0, 0, 212, 271, 0, 263, 272, 266, 
+  0, 270, 0, 231, 264, 0, 231, 0, 0, 282, 
+  0, 0, 0, 284, 331, 321, 0, 0, 323, 0, 
+  317, 0, 307, 0, 0, 0, 277, 0, 276, 0, 
+  333, 0, 91, 253, 256, 0, 92, 259, 95, 120, 
+  97, 98, 63, 102, 103, 56, 104, 107, 61, 64, 
+  57, 231, 58, 66, 110, 59, 112, 62, 114, 115, 
+  260, 117, 118, 122, 0, 84, 0, 0, 86, 90, 
+  88, 75, 87, 89, 0, 85, 74, 254, 252, 130, 
+  131, 136, 0, 129, 0, 306, 0, 293, 294, 0, 
+  305, 0, 0, 0, 296, 301, 299, 302, 0, 0, 
+  300, 301, 0, 297, 0, 298, 255, 304, 0, 255, 
+  303, 0, 308, 309, 0, 255, 310, 311, 0, 0, 
+  312, 0, 0, 0, 313, 314, 148, 147, 0, 0, 
+  0, 280, 0, 0, 0, 295, 268, 261, 0, 269, 
+  265, 0, 267, 257, 0, 258, 262, 78, 0, 0, 
+  82, 69, 0, 71, 80, 0, 72, 81, 83, 73, 
+  79, 70, 0, 76, 152, 150, 154, 151, 149, 153, 
+  2, 5, 0, 7, 0, 6, 0, 1, 18, 9, 
+  0, 0, 0, 10, 0, 11, 0, 16, 17, 0, 
+  12, 13, 0, 14, 15, 8, 77, 20, 0, 4, 
+  0, 27, 54, 0, 57, 25, 58, 28, 21, 0, 
+  0, 55, 0, 37, 36, 35, 0, 0, 48, 0, 
+  49, 0, 52, 53, 0, 0, 46, 0, 47, 0, 
+  50, 51, 0, 44, 38, 45, 39, 0, 0, 0, 
+  0, 41, 0, 42, 43, 40, 26, 22, 0, 31, 
+  32, 33, 34, 130, 255, 0, 0, 92, 259, 95, 
+  120, 97, 98, 63, 102, 103, 56, 104, 107, 61, 
+  64, 57, 231, 58, 66, 110, 59, 112, 62, 114, 
+  115, 260, 117, 118, 122, 130, 0, 23, 0, 29, 
+  24, 30, 334};
 
 const int QmlJSGrammar::goto_default [] = {
-  4, 496, 353, 191, 495, 526, 491, 494, 493, 15, 
-  525, 535, 537, 536, 617, 528, 579, 186, 190, 192, 
-  196, 553, 566, 565, 624, 625, 195, 227, 23, 469, 
-  468, 351, 350, 6, 349, 352, 102, 19, 14, 140, 
-  21, 10, 139, 16, 22, 52, 20, 5, 25, 24, 
-  264, 12, 258, 7, 254, 9, 256, 8, 255, 17, 
-  262, 18, 263, 11, 257, 253, 294, 406, 259, 260, 
-  197, 188, 187, 199, 228, 198, 203, 224, 225, 189, 
-  355, 354, 226, 458, 457, 316, 317, 460, 319, 459, 
-  318, 414, 418, 421, 417, 416, 436, 437, 180, 194, 
-  176, 179, 193, 201, 200, 0};
+  4, 497, 353, 191, 496, 519, 491, 495, 493, 498, 
+  19, 494, 15, 527, 529, 528, 606, 521, 518, 186, 
+  190, 192, 196, 544, 557, 556, 195, 227, 23, 469, 
+  468, 351, 350, 6, 349, 352, 102, 14, 140, 21, 
+  10, 139, 16, 22, 52, 20, 5, 25, 24, 264, 
+  12, 258, 7, 254, 9, 256, 8, 255, 17, 262, 
+  18, 263, 11, 257, 253, 294, 406, 259, 260, 197, 
+  188, 187, 199, 228, 198, 203, 224, 225, 189, 355, 
+  354, 226, 458, 457, 316, 317, 460, 319, 459, 318, 
+  414, 418, 421, 417, 416, 436, 437, 180, 194, 176, 
+  179, 193, 201, 200, 0};
 
 const int QmlJSGrammar::action_index [] = {
-  157, 803, 2033, -22, 55, 68, -95, 96, 32, -10, 
-  282, -95, 348, 42, -95, -95, 636, 92, 75, 201, 
-  218, -95, -95, -95, 544, 253, 803, -95, -95, -95, 
-  179, -95, 1760, 1230, 803, 803, 803, -95, 719, 803, 
-  -95, -95, 803, 803, -95, -95, -95, -95, 803, -95, 
-  803, 803, -95, 803, 803, 104, 202, -95, -95, 803, 
-  803, 803, -95, -95, -95, 198, 803, 340, 803, 803, 
-  803, 803, 544, 803, 803, 803, 803, 803, 803, 206, 
-  803, 803, 803, 64, 72, 69, 253, 167, 182, 158, 
-  150, 454, 544, 544, 803, -70, 803, 96, 1669, 803, 
-  803, -95, -95, -95, -95, -95, -95, -95, -95, -95, 
+  214, 1098, 2066, -87, 48, 194, -95, 46, -8, -37, 
+  208, -95, 317, 34, -95, -95, 502, 42, 90, 188, 
+  197, -95, -95, -95, 475, 269, 1098, -95, -95, -95, 
+  226, -95, 1884, 1615, 1098, 1098, 1098, -95, 761, 1098, 
+  -95, -95, 1098, 1098, -95, -95, -95, -95, 1098, -95, 
+  1098, 1098, -95, 1098, 1098, 78, 141, -95, -95, 1098, 
+  1098, 1098, -95, -95, -95, 176, 1098, 313, 1098, 1098, 
+  1098, 1098, 485, 1098, 1098, 1098, 1098, 1098, 1098, 181, 
+  1098, 1098, 1098, 76, 123, 194, 270, 351, 351, 351, 
+  351, 455, 465, 445, 1098, -70, 1098, 10, 1793, 1098, 
+  1098, -95, -95, -95, -95, -95, -95, -95, -95, -95, 
   -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, 
   -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, 
-  -95, -95, -95, -95, -95, 137, 803, -95, -95, 82, 
-  61, -95, 803, -95, -95, 803, -95, -95, -95, -95, 
-  -95, -95, -95, -95, -95, -95, -95, -95, -95, 803, 
-  6, 803, 803, 43, 39, 803, -95, 1669, 803, 803, 
-  -95, 143, -95, 9, -95, -95, 29, -95, 264, 59, 
-  10, -95, 259, -95, 8, 1942, -95, -95, -95, -95, 
-  -95, 274, -95, -95, 31, -95, -95, -95, -95, -95, 
-  -95, 1942, -95, -95, 421, -95, 414, 105, 2033, 40, 
-  234, 71, 41, 2215, 66, 803, -95, 65, 28, 803, 
-  20, -95, 22, 11, -95, -95, 290, -95, -95, -95, 
-  -95, -95, -95, 119, -95, -95, -95, -95, 112, -95, 
-  -95, -95, -95, -95, -95, -17, 27, 803, 135, 117, 
-  -95, -95, 975, -95, 48, -6, 62, -95, 400, 85, 
-  63, 569, 93, 102, 472, 235, 205, 803, 400, 803, 
-  803, 803, 803, 398, 803, 803, 803, 803, 803, 253, 
-  295, 323, 241, 323, 472, 472, 355, 803, 5, 803, 
-  81, 803, -95, 636, 803, -95, 803, 76, 53, 803, 
-  57, 2033, -95, 803, 146, 2033, -95, 803, 54, 803, 
-  803, 90, 84, 803, -95, 12, 125, -24, -95, -95, 
-  803, -95, 203, 803, -95, -49, 803, -47, 2033, -95, 
-  803, 130, 2033, -95, -34, 285, -28, 0, 1942, -21, 
-  -95, 2033, -95, 803, 129, 2033, 1, 2033, -95, 17, 
-  19, -29, -95, -95, 2033, -33, 405, 21, 375, 107, 
-  803, 2033, 23, -20, 305, -1, -31, 719, 3, 4, 
-  -95, 891, -95, 7, -35, -3, 803, 33, 2, 803, 
-  13, 803, -18, -11, 803, -95, 1851, 16, -95, -95, 
-  -95, -95, -95, -95, 803, -95, -95, -95, -95, 281, 
-  -95, 803, -45, -95, 2033, -95, 70, -95, -95, 2033, 
-  -95, 803, 122, -12, -95, 14, -95, 34, 106, 803, 
-  -95, -2, 30, -95, -19, -95, 2033, -95, 103, 2033, 
-  -95, 250, -95, -95, 116, 2033, 18, -95, -5, 2, 
-  -95, 280, -60, 2, -95, -95, -95, -95, 803, 110, 
-  2033, -95, 803, 99, 2033, -95, -8, -95, 156, -95, 
-  -95, 803, -95, -95, 136, -95, -95, -95, 97, 1317, 
-  -95, -95, 1404, -95, -95, 1491, -95, -95, -95, -95, 
-  -95, -95, 98, -95, -95, -95, -95, -95, -95, -95, 
-  -95, -95, 433, -95, 51, 344, -95, -95, -95, -95, 
-  139, 366, 155, -95, -95, 73, -95, -95, 186, -95, 
-  190, 162, -95, 101, -95, -95, -95, 131, -95, -95, 
-  88, -95, -95, -95, -95, 111, -95, 495, -95, -95, 
-  47, 298, 221, -95, 60, -95, -95, 518, 306, -95, 
-  255, -95, -95, -95, 58, 292, -95, 803, -95, 246, 
-  -95, -95, 52, 56, 164, -95, 803, -95, 228, -95, 
-  -95, 151, -95, 209, -95, 95, 67, 175, 200, 210, 
-  -95, 86, -95, -95, -95, -95, -95, 1143, 303, 91, 
-  -95, -95, 347, -95, -95, 2124, 1578, -95, 397, 89, 
-  386, 80, 803, 2033, 94, 26, 308, 74, 25, 719, 
-  44, 49, -95, 891, -95, 45, 24, 37, 803, 36, 
-  15, 803, 50, 803, 38, 35, 46, 120, -95, 372, 
-  -95, -95, -14, -95, -95, 183, 238, -95, 257, -95, 
-  -95, 1059, -95, -95, 335, -95, -95, -95, -95, 
+  -95, -95, -95, -95, -95, 113, 1098, -95, -95, 82, 
+  6, -95, 1098, -95, -95, 1098, -95, -95, -95, -95, 
+  -95, -95, -95, -95, -95, -95, -95, -95, -95, 1098, 
+  23, 1098, 1098, 65, 67, 1098, -95, 1793, 1098, 1098, 
+  -95, 133, -95, -58, -95, -95, 7, -95, 209, 139, 
+  20, -95, 232, -95, 39, 2157, -95, -95, -95, -95, 
+  -95, 281, -95, -95, 0, -95, -95, -95, -95, -95, 
+  -95, 2157, -95, -95, 361, -95, 342, 114, 2066, -18, 
+  280, 15, -11, 2339, 87, 1098, -95, 72, 56, 1098, 
+  58, -95, 62, 59, -95, -95, 211, -95, -95, -95, 
+  -95, -95, -95, 84, -95, -95, -95, -95, 99, -95, 
+  -95, -95, -95, -95, -95, 74, 69, 1098, 121, 116, 
+  -95, -95, 1182, -95, 88, 80, 55, -95, 305, 73, 
+  57, 536, 81, 118, 503, 210, 186, 1098, 315, 1098, 
+  1098, 1098, 1098, 426, 1098, 1098, 1098, 1098, 1098, 244, 
+  174, 175, 180, 155, 375, 382, 407, 1098, 61, 1098, 
+  85, 1098, -95, 595, 1098, -95, 1098, 79, 63, 1098, 
+  66, 2066, -95, 1098, 91, 2066, -95, 1098, 64, 1098, 
+  1098, 86, 77, 1098, -95, 60, 109, 54, -95, -95, 
+  1098, -95, 271, 1098, -95, 75, 1098, 70, 2066, -95, 
+  1098, 111, 2066, -95, 71, 261, 5, -12, 2157, -32, 
+  -95, 2066, -95, 1098, 134, 2066, 13, 2066, -95, 12, 
+  9, -35, -95, -95, 2066, -28, 386, 17, 371, 124, 
+  1098, 2066, 25, -2, 316, 29, -1, 678, 26, 24, 
+  -95, 1270, -95, 19, -6, 21, 1098, 8, -20, 1098, 
+  52, 1098, -33, -31, 1098, -95, 1975, -3, -95, -95, 
+  -95, -95, -95, -95, 1098, -95, -95, -95, -95, 286, 
+  -95, 1098, -48, -95, 2066, -95, 103, -95, -95, 2066, 
+  -95, 1098, 102, -23, -95, 4, -95, 1, 83, 1098, 
+  -95, 11, 30, -95, 51, -95, 2066, -95, 93, 2066, 
+  -95, 251, -95, -95, 117, 2066, 40, -95, 37, 35, 
+  -95, 144, 18, 28, -95, -95, -95, -95, 1098, 127, 
+  2066, -95, 1098, 94, 2066, -95, 36, -95, 135, -95, 
+  -95, 1098, -95, -95, 150, -95, -95, -95, 96, 1702, 
+  -95, -95, 1528, -95, -95, 1441, -95, -95, -95, -95, 
+  -95, -95, 95, -95, -95, -95, -95, -95, -95, -95, 
+  -95, -95, 753, -95, 292, -24, 844, -95, -95, 100, 
+  650, 228, 221, -95, 195, -95, 105, -95, -95, 163, 
+  -95, -95, 97, -95, -95, -95, 98, -95, 43, -95, 
+  929, -95, -95, 3, 217, -95, 53, -95, -95, 1014, 
+  89, -95, 229, -95, -95, -95, 41, 256, -95, 1098, 
+  -95, 218, -95, -95, 33, 224, -95, 1098, -95, 206, 
+  -95, -95, 159, -95, 196, -95, 38, -15, 199, 198, 
+  207, -95, 122, -95, -95, -95, -95, -95, 1354, -95, 
+  -95, -95, -95, 431, 2248, 1615, 16, 326, 47, 335, 
+  129, 1098, 2066, 50, 27, 290, 49, 14, 678, 44, 
+  31, -95, 1270, -95, 45, 22, 32, 1098, 68, -19, 
+  1098, 52, 1098, -29, -36, 333, 101, -95, 844, -95, 
+  -95, -95, -95, 
 
-  -106, 3, 1, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -54, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, 72, -106, -106, -106, 
-  4, -106, -106, -16, 18, 100, 170, -106, 174, 167, 
-  -106, -106, 164, 182, -106, -106, -106, -106, 127, -106, 
-  126, 117, -106, 113, 131, -106, -106, -106, -106, 146, 
-  135, 143, -106, -106, -106, -106, 139, -106, 159, 173, 
-  109, 83, -106, 136, 149, 150, 156, 133, 120, -106, 
-  158, 176, 177, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, 91, -106, 101, -106, 94, -2, 
-  -29, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, 33, -106, -106, -106, 
-  -106, -106, 14, -106, -106, 19, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, 85, 
-  -106, 63, 49, -106, -106, 53, -106, 311, 60, 118, 
-  -106, -106, -106, -106, -106, -106, -106, -106, 51, -106, 
-  -106, -106, -4, -106, -106, 59, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, 122, -106, -106, 30, -106, 44, -106, 41, -106, 
-  27, -106, -106, -106, -106, 84, -106, -106, -106, 71, 
-  58, -106, -106, -106, -106, -106, 64, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, 13, -106, -106, 
-  -106, -106, 65, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -1, 197, -106, 188, 
-  187, 221, 229, -106, 90, 87, 93, 105, 107, -106, 
-  -106, -106, -106, -106, -106, -106, -106, 230, -106, 207, 
-  -106, 219, -106, -106, 205, -106, 180, -106, -106, 106, 
-  -106, 28, -106, 31, -106, 26, -106, 185, -106, 198, 
-  186, -106, -106, 217, -106, -106, -106, -106, -106, -106, 
-  220, -106, 81, 97, -106, -106, 172, -106, 76, -106, 
-  78, -106, 69, -106, -106, 89, -106, -106, 86, -106, 
-  -106, 75, -106, 80, -106, 70, -106, 82, -106, -106, 
-  -106, -106, -106, -106, 42, -106, 39, -106, 40, -106, 
-  214, 48, -106, -106, 37, -106, -106, 163, -106, -106, 
-  -106, 52, -106, -106, -106, -106, 61, -106, 50, 151, 
-  -106, 67, -106, -106, 43, -106, 45, -106, -106, -106, 
-  -106, -106, -106, -106, 47, -106, -106, -106, -106, -106, 
-  -106, 98, -106, -106, 57, -106, -106, -106, -106, 54, 
-  -106, 55, -106, -106, -106, -106, -106, -38, -106, 66, 
-  -106, -24, -106, -106, -106, -106, -15, -106, -106, -18, 
-  -106, -106, -106, -106, -106, -106, -46, -106, -106, 24, 
-  -106, 36, -106, 25, -106, -106, -106, -106, 35, -106, 
-  68, -106, 34, -106, 38, -106, -106, -106, -106, -106, 
-  -106, 21, -106, -106, 111, -106, -106, -106, -106, 62, 
-  -106, -106, 132, -106, -106, 56, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, 92, -106, 77, 96, -106, -106, -106, -106, 
-  -106, -106, -9, -106, -106, -106, -106, -106, 0, -106, 
-  -7, -106, -106, -106, -106, -106, -106, 22, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, 265, -106, -106, 
-  -106, 16, -106, -106, -106, -106, -106, 280, -106, -106, 
-  -11, -106, -106, -106, -106, -106, -106, 23, -106, -106, 
-  -106, -106, -106, -106, -106, -106, 29, -106, -106, -106, 
-  -106, -106, -106, 12, -106, -106, -106, 11, 8, 5, 
-  -106, -106, -106, -106, -106, -106, -106, 277, 2, -106, 
-  -106, -106, 7, -106, -106, -106, 233, -106, 9, -106, 
-  15, -106, 73, 17, -106, -106, 6, -106, -106, 74, 
-  -106, -106, -106, 32, -106, -106, -106, -106, 20, -106, 
-  10, 151, -106, 104, -106, -106, -106, -106, -106, 112, 
-  -106, -106, -106, -106, -106, -106, 88, -106, 95, -106, 
-  -106, 284, -106, -106, -8, -106, -106, -106, -106};
+  -105, 34, 32, -105, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -27, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, 82, -105, -105, -105, 
+  20, -105, -105, 13, 28, 94, 78, -105, 67, 63, 
+  -105, -105, 57, 56, -105, -105, -105, -105, 144, -105, 
+  150, 147, -105, 142, 128, -105, -105, -105, -105, 135, 
+  123, 157, -105, -105, -105, -105, 166, -105, 165, 154, 
+  164, 161, -105, 134, 117, 104, 108, 110, 107, -105, 
+  102, 99, 101, -105, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -105, -105, 114, -105, 119, -105, 148, 75, 
+  55, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, 22, -105, -105, -105, 
+  -105, -105, 24, -105, -105, 27, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -105, 162, 
+  -105, 216, -29, -105, -105, -3, -105, 199, 33, 152, 
+  -105, -105, -105, -105, -105, -105, -105, -105, 7, -105, 
+  -105, -105, 52, -105, -105, 66, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
+  -105, 95, -105, -105, 29, -105, 72, -105, 65, -105, 
+  61, -105, -105, -105, -105, 80, -105, -105, -105, 4, 
+  -9, -105, -105, -105, -105, -105, 23, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, 53, -105, -105, 
+  -105, -105, 116, -105, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, 68, 203, -105, 218, 
+  215, 214, 175, -105, 86, 92, 83, 85, 69, -105, 
+  -105, -105, -105, -105, -105, -105, -105, 196, -105, 186, 
+  -105, 185, -105, -105, 195, -105, 159, -105, -105, 163, 
+  -105, 26, -105, 90, -105, 9, -105, 173, -105, 279, 
+  206, -105, -105, 205, -105, -105, -105, -105, -105, -105, 
+  172, -105, 84, 106, -105, -105, 109, -105, 73, -105, 
+  79, -105, 74, -105, -105, 96, -105, -105, 112, -105, 
+  -105, 37, -105, 39, -105, 49, -105, 60, -105, -105, 
+  -105, -105, -105, -105, 50, -105, 46, -105, 38, -105, 
+  153, 77, -105, -105, 59, -105, -105, 143, -105, -105, 
+  -105, -2, -105, -105, -105, -105, 17, -105, 8, 98, 
+  -105, 136, -105, -105, -7, -105, -18, -105, -105, -105, 
+  -105, -105, -105, -105, -19, -105, -105, -105, -105, -105, 
+  -105, 167, -105, -105, 64, -105, -105, -105, -105, 70, 
+  -105, 62, -105, -105, -105, -105, -105, -54, -105, 40, 
+  -105, -28, -105, -105, -105, -105, -73, -105, -105, -25, 
+  -105, -105, -105, -105, -105, -105, -37, -105, -105, 42, 
+  -105, 41, -105, 25, -105, -105, -105, -105, 44, -105, 
+  47, -105, 45, -105, 43, -105, -105, -105, -105, -105, 
+  -105, 54, -105, -105, 91, -105, -105, -105, -105, 36, 
+  -105, -105, 88, -105, -105, 48, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -5, -105, -105, 5, 100, -105, -105, -105, 
+  -1, -105, -12, -105, -105, -105, -105, -105, -105, 3, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
+  258, -105, -105, -105, -105, -105, -105, -105, -105, 262, 
+  -105, -105, -6, -105, -105, -105, -105, -105, -105, 19, 
+  -105, -105, -105, -105, -105, -105, -105, 18, -105, -105, 
+  -105, -105, -105, -105, 2, -105, -105, -105, 6, 10, 
+  11, -105, -105, -105, -105, -105, -105, -105, 272, -105, 
+  -105, -105, -105, -105, -105, 213, 12, 0, -105, -10, 
+  -105, 153, 1, -105, -105, -4, -105, -105, 76, -105, 
+  -105, -105, 21, -105, -105, -105, -105, 71, -105, 51, 
+  87, -105, 93, -105, -105, -105, -105, -105, 81, -105, 
+  -105, -105, -105};
 
 const int QmlJSGrammar::action_info [] = {
-  443, 411, 335, 419, -127, 343, -102, 330, 96, 461, 
-  -124, -106, 326, 328, -105, 403, 252, 347, 448, 419, 
-  -132, 415, 398, 394, 384, 452, 396, 386, -135, 320, 
-  -116, 441, 337, 338, 340, 435, 425, 426, 439, 419, 
-  -129, 185, 287, -129, -127, 159, 165, 452, 435, 267, 
-  136, -124, -105, 435, 94, 638, -106, -132, 448, 246, 
-  411, 343, 252, 247, 411, 178, 492, 182, 96, 174, 
-  184, 452, 409, 404, 448, 626, 252, 343, 341, -92, 
-  94, -102, 267, 289, 136, 554, 231, 545, 335, 561, 
-  142, 313, 307, 291, 159, 307, -135, 66, 631, 0, 
-  0, -116, 287, 568, 53, 472, 136, 136, 53, 53, 
-  429, 136, 53, 540, 299, 54, 422, 301, 136, 54, 
-  54, 144, 438, 54, 296, 161, 510, 571, 619, 162, 
-  136, 408, 407, 322, 507, 506, 439, 136, 136, 492, 
-  289, 244, 243, 136, 527, 136, 57, 573, 572, 522, 
-  521, 136, 309, 473, 136, 0, 310, 58, 483, 454, 
-  31, 423, 515, 514, 464, 31, 244, 243, 244, 243, 
-  450, 556, 0, 242, 241, 80, 620, 81, 251, 250, 
-  237, 236, 413, 80, 31, 81, 323, 563, 82, 345, 
-  332, 628, 80, 137, 81, 249, 82, 44, 45, 172, 
-  504, 503, 44, 45, 31, 82, 305, 80, 31, 81, 
-  59, 0, 564, 562, 59, 31, 167, 465, 463, 31, 
-  82, 44, 45, 519, 518, 557, 555, 0, 502, 541, 
-  59, 80, 31, 81, 31, 168, 136, 169, 541, 31, 
-  0, 44, 45, 629, 82, 44, 45, 3, 2, 1, 
-  541, 517, 44, 45, 136, 60, 44, 45, 136, 60, 
-  80, 61, 81, 31, 0, 61, 80, 31, 81, 44, 
-  45, 44, 45, 82, 543, 60, 44, 45, 80, 82, 
-  81, 61, 136, 543, 541, 542, 31, 0, 31, 560, 
-  559, 82, 0, 31, 542, 543, 167, 98, 0, 547, 
-  44, 45, 0, 0, 44, 45, 542, 551, 550, 31, 
-  0, 433, 432, 577, 31, 168, 99, 401, 100, 31, 
-  80, 510, 81, 44, 45, 44, 45, 31, 0, 543, 
-  44, 45, 31, 82, 31, 230, 229, 31, 0, 527, 
-  542, -346, 578, 136, -346, 0, 44, 45, 80, 0, 
-  81, 44, 45, 548, 546, 136, 44, 45, 68, 69, 
-  0, 82, 0, 623, 44, 45, 68, 69, 527, 44, 
-  45, 44, 45, 31, 44, 45, 0, 0, 274, 275, 
-  527, 510, 0, 0, 0, 70, 71, 276, 0, 0, 
-  277, 0, 278, 70, 71, 0, 230, 229, 0, 0, 
-  0, 31, 0, 499, 31, 0, 0, 0, 230, 229, 
-  44, 45, 0, 511, 0, 31, 0, 0, 269, 270, 
-  0, 274, 275, 0, 0, 0, 31, 512, 509, 498, 
-  276, 499, 0, 277, 31, 278, 240, 239, 44, 45, 
-  0, 44, 45, 31, 0, 271, 272, 240, 239, 0, 
-  31, 0, 44, 45, 0, 508, 0, 498, 235, 234, 
-  0, 0, 31, 44, 45, 0, 235, 234, 0, 0, 
-  0, 44, 45, 0, 0, 240, 239, 73, 74, 0, 
-  44, 45, 235, 234, 0, 75, 76, 44, 45, 77, 
-  0, 78, 499, 0, 0, 274, 275, 0, 500, 44, 
-  45, 0, 0, 0, 276, 530, 0, 277, 0, 278, 
-  0, 0, 0, 0, 0, 0, 0, 531, 498, 0, 
-  0, 0, 0, 0, 31, 0, 0, 0, 530, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  531, 0, 0, 0, 0, 0, 0, 31, 0, 0, 
-  533, 0, 0, 0, 499, 0, 0, 0, 0, 0, 
-  0, 532, 534, 0, 0, 0, 0, 73, 74, 221, 
-  0, 0, 146, 575, 0, 75, 76, 499, 205, 77, 
-  498, 78, 147, 0, 532, 534, 148, 0, 0, 0, 
-  0, 0, 221, 0, 0, 149, 0, 150, 0, 0, 
-  303, 205, 0, 498, 0, 0, 0, 0, 151, 0, 
-  152, 57, 0, 0, 0, 0, 0, 0, 153, 0, 
-  0, 154, 58, 0, 0, 0, 0, 155, 0, 0, 
-  0, 0, 0, 156, 0, 0, 0, 0, 0, 146, 
-  0, 0, 0, 0, 0, 0, 0, 0, 157, 147, 
-  0, 0, 0, 148, 0, 0, 0, 0, 0, 0, 
-  0, 0, 149, 0, 150, 0, 0, 0, 0, 0, 
+  452, 492, 174, 448, 394, 452, 419, 448, 96, 419, 
+  415, 66, 403, 435, 435, -113, 419, 386, 252, 384, 
+  396, 338, 341, 340, -119, 343, -89, 398, -111, 347, 
+  411, -90, -100, -108, 252, 343, -86, 426, -90, -111, 
+  94, 96, 136, 178, 159, 562, 559, 66, 612, 520, 
+  343, -108, -89, 461, -119, 231, -86, -100, 411, -116, 
+  439, 435, 545, 252, 492, 337, 144, 159, 435, 532, 
+  537, 94, 185, 441, 165, -113, 520, 320, 443, 409, 
+  184, 291, 552, 307, 313, 330, 267, 136, 307, 267, 
+  142, 435, 411, 422, 404, 452, 568, 0, 448, 136, 
+  429, 136, 136, 136, 472, 247, 425, 335, 0, 608, 
+  136, 0, 287, 167, 0, 167, 53, 322, 296, 136, 
+  57, 136, 520, 438, 299, 0, 301, 54, 287, 136, 
+  328, 58, 168, 289, 168, 136, 326, 439, 423, 289, 
+  161, 136, 136, 464, 162, 237, 236, 182, 0, 0, 
+  246, 305, 473, 59, 454, 483, 0, 609, 514, 513, 
+  242, 241, 413, 53, 408, 407, 508, 507, 309, 137, 
+  323, 332, 310, 31, 54, 244, 243, 251, 250, 31, 
+  80, 249, 81, 564, 563, 244, 243, 450, 59, 172, 
+  244, 243, 31, 82, 345, 554, 465, 463, 60, 80, 
+  80, 81, 81, 167, 61, 80, 80, 81, 81, 59, 
+  44, 45, 82, 82, 136, 31, 44, 45, 82, 82, 
+  555, 553, 168, 98, 169, 533, 136, 533, 31, 44, 
+  45, 547, 0, 60, 53, 80, 31, 81, 31, 61, 
+  31, 0, 99, 167, 100, 54, 533, 0, 82, 0, 
+  31, 0, 44, 45, 60, 31, 511, 510, 533, 136, 
+  61, 31, 168, 539, 401, 44, 45, 551, 550, 80, 
+  535, 81, 535, 44, 45, 44, 45, 44, 45, 543, 
+  542, 534, 82, 534, 509, 548, 546, 44, 45, 136, 
+  31, 535, 44, 45, 80, 80, 81, 81, 44, 45, 
+  31, 167, 534, 535, 3, 2, 1, 82, 82, 31, 
+  0, 0, 433, 432, 534, 0, 0, 540, 538, 31, 
+  168, 0, 401, 269, 270, 0, -330, 44, 45, 0, 
+  0, 68, 69, 269, 270, 68, 69, 44, 45, 504, 
+  0, 0, 230, 229, 0, 31, 44, 45, 167, 0, 
+  271, 272, -330, 505, 503, 31, 44, 45, 70, 71, 
+  271, 272, 70, 71, 31, 0, -77, 168, 0, 169, 
+  0, 31, 0, 0, 0, 0, 80, 0, 81, 0, 
+  0, 502, 44, 45, 0, 0, 0, 235, 234, 82, 
+  31, 0, 44, 45, 0, 0, 240, 239, 274, 275, 
+  31, 44, 45, 240, 239, 274, 275, 276, 44, 45, 
+  277, 0, 278, 0, 276, 31, 0, 277, 0, 278, 
+  0, 0, 235, 234, 0, 0, 0, 44, 45, 0, 
+  274, 275, 240, 239, 0, 0, 0, 44, 45, 276, 
+  0, 0, 277, 0, 278, 0, 167, 235, 234, 274, 
+  275, 0, 44, 45, 0, 0, 0, 0, 276, 0, 
+  0, 277, 0, 278, -77, 168, 0, 169, 73, 74, 
+  0, 0, 0, 0, 0, 0, 75, 76, 73, 74, 
+  77, 0, 78, 0, 0, 0, 75, 76, 73, 74, 
+  77, 0, 78, 0, 0, 0, 75, 76, 73, 74, 
+  77, 0, 78, 0, 0, 146, 75, 76, 73, 74, 
+  77, 0, 78, 0, 0, 147, 75, 76, 0, 148, 
+  77, 0, 78, 0, 0, 0, 274, 275, 149, 0, 
+  150, 0, 0, 0, 0, 276, 0, 0, 277, 146, 
+  278, 151, 0, 152, 57, 0, 0, 0, 0, 147, 
+  0, 153, 0, 148, 154, 58, 0, 0, 0, 0, 
+  155, 0, 149, 0, 150, 0, 156, 303, 0, 0, 
   0, 0, 0, 0, 0, 151, 0, 152, 57, 0, 
-  0, 0, 0, 0, 0, 153, 0, 0, 154, 58, 
-  0, 0, 0, 0, 155, 0, 0, 0, 0, 0, 
-  156, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 157, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 27, 28, 0, 0, 0, 0, 0, 0, 0, 
-  0, 30, 0, 0, 0, 0, 0, 0, 31, 0, 
-  0, 0, 32, 33, 0, 34, 0, 0, 0, 0, 
-  0, 0, 38, 0, 0, 0, 41, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 46, 44, 45, 0, 47, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 
-  49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 
-  0, 0, 0, 0, 26, 27, 28, 0, 0, 0, 
-  0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 
-  0, 0, 31, 0, 0, 0, 32, 33, 0, 34, 
-  0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 
-  41, 0, 0, 0, 42, 0, 43, 0, 0, 0, 
+  0, 157, 0, 0, 0, 153, 0, 0, 154, 58, 
+  0, 0, 0, 0, 155, 0, 0, 0, 146, 0, 
+  156, 0, 0, 0, 0, 0, 0, 0, 147, 0, 
+  0, 0, 148, 0, 0, 157, 0, 0, 0, 0, 
+  0, 149, 0, 150, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 151, 0, 152, 57, 0, 0, 
+  0, 0, 0, 0, 153, 0, 0, 154, 58, 0, 
+  0, 0, 0, 155, 0, 0, 0, 0, 0, 156, 
+  0, 0, 27, 28, 0, 0, 0, 0, 0, 0, 
+  0, 0, 30, 0, 157, 0, 0, 0, 0, 31, 
+  0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 
+  27, 28, 0, 500, 0, 0, 0, 41, 0, 0, 
+  30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 
+  0, 32, 33, 0, 34, 46, 44, 45, 0, 47, 
+  0, 38, 0, 0, 0, 41, 0, 0, 0, 0, 
+  40, 49, 29, 0, 0, 0, 37, 0, 0, 0, 
+  0, 0, 0, 46, 44, 45, 0, 47, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 40, 49, 
+  29, 0, 0, 0, 37, 27, 28, 0, 0, 0, 
+  0, 0, 0, 27, 28, 30, 0, 0, 0, 0, 
+  0, 0, 31, 30, 0, 0, 32, 33, 0, 34, 
+  31, 0, 0, 0, 32, 33, 500, 34, 0, 0, 
+  41, 0, 0, 0, 38, 0, 0, 0, 41, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 46, 44, 
-  45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 
-  0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 
-  0, 0, 0, 0, 0, 0, 0, 0, -125, 0, 
-  0, 0, 26, 27, 28, 0, 0, 0, 0, 0, 
-  0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 
-  31, 0, 0, 0, 32, 33, 0, 34, 0, 0, 
-  0, 35, 0, 36, 38, 39, 0, 0, 41, 0, 
-  0, 0, 42, 0, 43, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 46, 44, 45, 0, 
-  47, 0, 48, 0, 50, 0, 51, 0, 0, 0, 
+  45, 0, 47, 0, 0, 0, 46, 44, 45, 0, 
+  47, 0, 0, 40, 49, 29, 0, 0, 0, 37, 
   0, 40, 49, 29, 0, 0, 0, 37, 0, 0, 
-  0, 0, 0, 0, 0, 0, 26, 27, 28, 0, 
-  0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 
-  0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 
-  0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 
-  0, 0, 41, 0, 0, 0, 42, 0, 43, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  46, 44, 45, 0, 47, 0, 48, 0, 50, 266, 
-  51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 
-  0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 
-  26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 
-  0, 30, 0, 0, 0, 0, 0, 0, 31, 212, 
-  0, 0, 585, 33, 0, 34, 0, 0, 0, 35, 
-  0, 36, 38, 39, 0, 0, 41, 0, 0, 0, 
-  42, 0, 43, 0, 0, 0, 0, 0, 0, 0, 
-  216, 0, 0, 0, 46, 44, 45, 0, 47, 0, 
-  48, 0, 50, 0, 51, 0, 0, 0, 0, 40, 
-  49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 
-  0, 0, 0, 0, 26, 27, 28, 0, 0, 0, 
-  0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 
-  0, 0, 31, 212, 0, 0, 585, 586, 0, 34, 
-  0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 
-  41, 0, 0, 0, 42, 0, 43, 0, 0, 0, 
-  0, 0, 0, 0, 216, 0, 0, 0, 46, 44, 
-  45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 
-  0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 
-  0, 0, 0, 0, 0, 0, 0, 0, 470, 0, 
+  0, 0, 0, 0, 0, 0, 27, 28, 0, 0, 
+  0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 
+  0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 
+  34, 0, 0, 0, 0, 0, 0, 500, 0, 0, 
+  0, 41, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 
+  44, 45, 0, 47, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 40, 49, 29, 0, 0, 0, 
+  37, 0, 0, 0, 0, 0, 0, 0, 0, 523, 
+  0, 27, 28, 0, 0, 0, 0, 0, 0, 0, 
+  0, 210, 0, 0, 0, 0, 0, 0, 31, 0, 
+  0, 0, 32, 33, 0, 34, 0, 0, 0, 0, 
+  0, 0, 500, 0, 0, 0, 41, 0, 0, 0, 
+  0, 0, 0, 0, 525, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 46, 524, 526, 0, 47, 0, 
+  0, 0, 0, 221, 0, 0, 0, 0, 0, 40, 
+  49, 29, 205, 0, 0, 37, 0, 0, 0, 0, 
+  0, 0, 0, 0, 523, 0, 27, 28, 0, 0, 
+  0, 0, 0, 0, 0, 0, 210, 0, 0, 0, 
+  0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 
+  34, 0, 0, 0, 0, 0, 0, 500, 0, 0, 
+  0, 41, 0, 0, 0, 0, 0, 0, 0, 566, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 
+  524, 526, 0, 47, 0, 0, 0, 0, 221, 0, 
+  0, 0, 0, 0, 40, 49, 29, 205, 0, 0, 
+  37, 0, 0, 0, 0, 0, 0, 0, 0, 26, 
+  27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 
+  30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 
+  0, 32, 33, 0, 34, 0, 0, 0, 35, 0, 
+  36, 38, 39, 0, 0, 41, 0, 0, 0, 42, 
+  0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 46, 44, 45, 0, 47, 0, 48, 
+  0, 50, 0, 51, 0, 0, 0, 0, 40, 49, 
+  29, 0, 0, 0, 37, 0, 0, 0, 0, 0, 
+  0, 0, 0, 26, 27, 28, 0, 0, 0, 0, 
+  0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 
+  0, 31, 0, 0, 0, 32, 33, 0, 34, 0, 
+  0, 0, 35, 0, 36, 38, 39, 0, 0, 41, 
+  0, 0, 0, 42, 0, 43, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 46, 44, 45, 
+  0, 47, 0, 48, 0, 50, 266, 51, 0, 0, 
+  0, 0, 40, 49, 29, 0, 0, 0, 37, 0, 
+  0, 0, 0, 0, 0, 0, 0, -109, 0, 0, 
   0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 
   0, 0, 30, 0, 0, 0, 0, 0, 0, 31, 
   0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 
   35, 0, 36, 38, 39, 0, 0, 41, 0, 0, 
-  0, 42, 0, 43, 0, 0, 471, 0, 0, 0, 
+  0, 42, 0, 43, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 46, 44, 45, 0, 47, 
   0, 48, 0, 50, 0, 51, 0, 0, 0, 0, 
   40, 49, 29, 0, 0, 0, 37, 0, 0, 0, 
-  0, 0, 0, 0, 0, 478, 0, 0, 26, 27, 
-  28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 
-  0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 
-  32, 33, 0, 34, 0, 0, 0, 35, 0, 36, 
-  38, 39, 0, 0, 41, 0, 0, 0, 42, 0, 
-  43, 0, 0, 481, 0, 0, 0, 0, 0, 0, 
-  0, 0, 46, 44, 45, 0, 47, 0, 48, 0, 
-  50, 0, 51, 0, 0, 0, 0, 40, 49, 29, 
-  0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 
-  0, 0, 470, 0, 0, 26, 27, 28, 0, 0, 
+  0, 0, 0, 0, 0, 26, 27, 28, 0, 0, 
   0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 
-  0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 
+  0, 0, 0, 31, 212, 0, 0, 574, 575, 0, 
   34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 
   0, 41, 0, 0, 0, 42, 0, 43, 0, 0, 
-  476, 0, 0, 0, 0, 0, 0, 0, 0, 46, 
+  0, 0, 0, 0, 0, 216, 0, 0, 0, 46, 
   44, 45, 0, 47, 0, 48, 0, 50, 0, 51, 
   0, 0, 0, 0, 40, 49, 29, 0, 0, 0, 
   37, 0, 0, 0, 0, 0, 0, 0, 0, 478, 
@@ -502,266 +489,276 @@ const int QmlJSGrammar::action_info [] = {
   30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 
   0, 32, 33, 0, 34, 0, 0, 0, 35, 0, 
   36, 38, 39, 0, 0, 41, 0, 0, 0, 42, 
-  0, 43, 0, 0, 471, 0, 0, 499, 0, 0, 
+  0, 43, 0, 0, 476, 0, 0, 0, 0, 0, 
   0, 0, 0, 46, 44, 45, 0, 47, 0, 48, 
   0, 50, 0, 51, 0, 0, 0, 0, 40, 49, 
-  29, 0, 0, 498, 37, 0, 0, 0, 0, 0, 
-  0, 0, 0, 104, 105, 106, 0, 0, 108, 110, 
-  111, 0, 0, 112, 0, 113, 0, 0, 0, 115, 
-  116, 117, 0, 0, 0, 0, 0, 0, 31, 118, 
-  119, 120, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 121, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 124, 0, 
-  0, 0, 0, 0, 0, 44, 45, 125, 126, 127, 
-  0, 129, 130, 131, 132, 133, 134, 0, 0, 122, 
-  128, 114, 107, 109, 123, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 104, 105, 106, 0, 0, 108, 
-  110, 111, 0, 0, 112, 0, 113, 0, 0, 0, 
-  115, 116, 117, 0, 0, 0, 0, 0, 0, 388, 
-  118, 119, 120, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 121, 0, 0, 0, 389, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 124, 
-  0, 0, 0, 0, 0, 393, 390, 392, 125, 126, 
-  127, 0, 129, 130, 131, 132, 133, 134, 0, 0, 
-  122, 128, 114, 107, 109, 123, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 104, 105, 106, 0, 0, 
-  108, 110, 111, 0, 0, 112, 0, 113, 0, 0, 
-  0, 115, 116, 117, 0, 0, 0, 0, 0, 0, 
-  388, 118, 119, 120, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 121, 0, 0, 0, 389, 0, 
-  0, 0, 0, 0, 0, 0, 391, 0, 0, 0, 
-  124, 0, 0, 0, 0, 0, 393, 390, 392, 125, 
-  126, 127, 0, 129, 130, 131, 132, 133, 134, 0, 
-  0, 122, 128, 114, 107, 109, 123, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 
-  0, 206, 0, 26, 27, 28, 208, 0, 0, 0, 
-  0, 0, 0, 209, 210, 0, 0, 0, 0, 0, 
-  0, 211, 212, 0, 0, 213, 33, 0, 34, 0, 
+  29, 0, 0, 0, 37, 0, 0, 0, 0, 0, 
+  0, 0, 0, 470, 0, 0, 26, 27, 28, 0, 
+  0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 
+  0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 
+  0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 
+  0, 0, 41, 0, 0, 0, 42, 0, 43, 0, 
+  0, 471, 0, 0, 0, 0, 0, 0, 0, 0, 
+  46, 44, 45, 0, 47, 0, 48, 0, 50, 0, 
+  51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 
+  0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 
+  478, 0, 0, 26, 27, 28, 0, 0, 0, 0, 
+  0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 
+  0, 31, 0, 0, 0, 32, 33, 0, 34, 0, 
   0, 0, 35, 0, 36, 38, 39, 0, 0, 41, 
-  0, 0, 0, 42, 0, 43, 0, 0, 0, 0, 
-  0, 215, 0, 216, 0, 0, 0, 46, 214, 217, 
-  218, 47, 219, 48, 220, 50, 221, 51, 222, 223, 
-  0, 0, 40, 49, 29, 205, 207, 0, 37, 0, 
-  0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 
-  0, 0, 206, 0, 26, 27, 28, 208, 0, 0, 
-  0, 0, 0, 0, 209, 30, 0, 0, 0, 0, 
-  0, 0, 211, 212, 0, 0, 213, 33, 0, 34, 
-  0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 
-  41, 0, 0, 0, 42, 0, 43, 0, 0, 0, 
-  0, 0, 215, 0, 216, 0, 0, 0, 46, 214, 
-  217, 218, 47, 219, 48, 220, 50, 221, 51, 222, 
-  223, 0, 0, 40, 49, 29, 205, 207, 0, 37, 
-  0, 0, 0, 0, 0, 0, 0, 0, 588, 105, 
-  106, 0, 0, 590, 110, 592, 27, 28, 593, 0, 
-  113, 0, 0, 0, 115, 595, 596, 0, 0, 0, 
-  0, 0, 0, 597, 598, 119, 120, 213, 33, 0, 
-  34, 0, 0, 0, 35, 0, 36, 599, 39, 0, 
-  0, 601, 0, 0, 0, 42, 0, 43, 0, 0, 
-  0, 0, 0, 603, 0, 216, 0, 0, 0, 605, 
-  602, 604, 606, 607, 608, 48, 610, 611, 612, 613, 
-  614, 615, 0, 0, 600, 609, 594, 589, 591, 123, 
-  37, 0, 0, 0, 0, 0, 0, 0, 0, 356, 
-  105, 106, 0, 0, 358, 110, 360, 27, 28, 361, 
-  0, 113, 0, 0, 0, 115, 363, 364, 0, 0, 
-  0, 0, 0, 0, 365, 366, 119, 120, 213, 33, 
-  0, 34, 0, 0, 0, 35, 0, 36, 367, 39, 
-  0, 0, 369, 0, 0, 0, 42, 0, 43, 0, 
-  -271, 0, 0, 0, 371, 0, 216, 0, 0, 0, 
-  373, 370, 372, 374, 375, 376, 48, 378, 379, 380, 
-  381, 382, 383, 0, 0, 368, 377, 362, 357, 359, 
-  123, 37, 0, 0, 0, 0, 0, 0, 0, 0, 
-
-  505, 135, 516, 490, 141, 183, 13, 637, 315, 513, 
-  544, 622, 145, 177, 570, 177, 248, 467, 233, 245, 
-  574, 482, 587, 431, 238, 552, 549, 434, 306, 569, 
-  302, 520, 558, 567, 304, 297, 334, 453, 449, 233, 
-  455, 445, 444, 245, 397, 442, 177, 143, 233, 238, 
-  245, 440, 158, 238, 462, 297, 410, 420, 412, 405, 
-  181, 202, 430, 171, 431, 427, 138, 434, 424, 428, 
-  451, 333, 346, 456, 431, 434, 385, 342, 329, 387, 
-  395, 331, 164, 344, 348, 523, 166, 297, 202, 477, 
-  315, 0, 0, 0, 0, 480, 0, 627, 181, 0, 
-  297, 497, 501, 101, 622, 497, 55, 524, 261, 297, 
-  55, 399, 447, 265, 400, 55, 55, 175, 175, 630, 
-  456, 497, 163, 621, 202, 0, 55, 0, 55, 103, 
-  55, 141, 93, 55, 55, 280, 55, 402, 279, 0, 
-  0, 281, 160, 55, 55, 484, 95, 55, 55, 447, 
-  55, 141, 55, 282, 97, 283, 55, 173, 92, 56, 
-  55, 475, 447, 55, 325, 474, 0, 324, 90, 55, 
-  55, 446, 489, 300, 55, 297, 55, 65, 55, 55, 
-  63, 89, 55, 297, 79, 339, 55, 336, 64, 55, 
-  67, 62, 55, 55, 55, 466, 446, 86, 87, 55, 
-  399, 55, 55, 400, 88, 83, 0, 55, 72, 487, 
-  55, 399, 486, 55, 400, 485, 55, 0, 0, 55, 
-  55, 0, 91, 84, 85, 55, 232, 488, 55, 293, 
-  55, 55, 0, 265, 265, 265, 265, 284, 273, 327, 
-  55, 55, 616, 308, 618, 265, 265, 298, 293, 268, 
-  55, 312, 0, 265, 0, 265, 0, 55, 311, 175, 
-  293, 290, 293, 293, 55, 265, 467, 265, 265, 265, 
-  295, 285, 55, 55, 497, 538, 0, 265, 265, 286, 
-  582, 0, 314, 0, 292, 321, 288, 634, 0, 497, 
-  538, 529, 539, 576, 580, 581, 583, 584, 0, 0, 
-  0, 632, 633, 635, 636, 0, 529, 539, 0, 0, 
+  0, 0, 0, 42, 0, 43, 0, 0, 481, 0, 
+  0, 0, 0, 0, 0, 0, 0, 46, 44, 45, 
+  0, 47, 0, 48, 0, 50, 0, 51, 0, 0, 
+  0, 0, 40, 49, 29, 0, 0, 0, 37, 0, 
+  0, 0, 0, 0, 0, 0, 0, 104, 105, 106, 
+  0, 0, 108, 110, 111, 0, 0, 112, 0, 113, 
+  0, 0, 0, 115, 116, 117, 0, 0, 0, 0, 
+  0, 0, 31, 118, 119, 120, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 121, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  101, 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, 103, 170, 0, 0, 
+  0, 0, 124, 0, 0, 0, 0, 0, 0, 44, 
+  45, 125, 126, 127, 0, 129, 130, 131, 132, 133, 
+  134, 0, 0, 122, 128, 114, 107, 109, 123, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 104, 105, 
+  106, 0, 0, 108, 110, 111, 0, 0, 112, 0, 
+  113, 0, 0, 0, 115, 116, 117, 0, 0, 0, 
+  0, 0, 0, 388, 118, 119, 120, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 121, 0, 0, 
+  0, 389, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 124, 0, 0, 0, 0, 0, 393, 
+  390, 392, 125, 126, 127, 0, 129, 130, 131, 132, 
+  133, 134, 0, 0, 122, 128, 114, 107, 109, 123, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 104, 
+  105, 106, 0, 0, 108, 110, 111, 0, 0, 112, 
+  0, 113, 0, 0, 0, 115, 116, 117, 0, 0, 
+  0, 0, 0, 0, 388, 118, 119, 120, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 121, 0, 
+  0, 0, 389, 0, 0, 0, 0, 0, 0, 0, 
+  391, 0, 0, 0, 124, 0, 0, 0, 0, 0, 
+  393, 390, 392, 125, 126, 127, 0, 129, 130, 131, 
+  132, 133, 134, 0, 0, 122, 128, 114, 107, 109, 
+  123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  204, 0, 0, 0, 0, 206, 0, 26, 27, 28, 
+  208, 0, 0, 0, 0, 0, 0, 209, 30, 0, 
+  0, 0, 0, 0, 0, 211, 212, 0, 0, 213, 
+  33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 
+  39, 0, 0, 41, 0, 0, 0, 42, 0, 43, 
+  0, 0, 0, 0, 0, 215, 0, 216, 0, 0, 
+  0, 46, 214, 217, 218, 47, 219, 48, 220, 50, 
+  221, 51, 222, 223, 0, 0, 40, 49, 29, 205, 
+  207, 0, 37, 0, 0, 0, 0, 0, 0, 0, 
+  0, 204, 0, 0, 0, 0, 206, 0, 26, 27, 
+  28, 208, 0, 0, 0, 0, 0, 0, 209, 210, 
+  0, 0, 0, 0, 0, 0, 211, 212, 0, 0, 
+  213, 33, 0, 34, 0, 0, 0, 35, 0, 36, 
+  38, 39, 0, 0, 41, 0, 0, 0, 42, 0, 
+  43, 0, 0, 0, 0, 0, 215, 0, 216, 0, 
+  0, 0, 46, 214, 217, 218, 47, 219, 48, 220, 
+  50, 221, 51, 222, 223, 0, 0, 40, 49, 29, 
+  205, 207, 0, 37, 0, 0, 0, 0, 0, 0, 
+  0, 0, 577, 105, 106, 0, 0, 579, 110, 581, 
+  27, 28, 582, 0, 113, 0, 0, 0, 115, 584, 
+  585, 0, 0, 0, 0, 0, 0, 586, 587, 119, 
+  120, 213, 33, 0, 34, 0, 0, 0, 35, 0, 
+  36, 588, 39, 0, 0, 590, 0, 0, 0, 42, 
+  0, 43, 0, 0, 0, 0, 0, 592, 0, 216, 
+  0, 0, 0, 594, 591, 593, 595, 596, 597, 48, 
+  599, 600, 601, 602, 603, 604, 0, 0, 589, 598, 
+  583, 578, 580, 123, 37, 0, 0, 0, 0, 0, 
+  0, 0, 0, 356, 105, 106, 0, 0, 358, 110, 
+  360, 27, 28, 361, 0, 113, 0, 0, 0, 115, 
+  363, 364, 0, 0, 0, 0, 0, 0, 365, 366, 
+  119, 120, 213, 33, 0, 34, 0, 0, 0, 35, 
+  0, 36, 367, 39, 0, 0, 369, 0, 0, 0, 
+  42, 0, 43, 0, -255, 0, 0, 0, 371, 0, 
+  216, 0, 0, 0, 373, 370, 372, 374, 375, 376, 
+  48, 378, 379, 380, 381, 382, 383, 0, 0, 368, 
+  377, 362, 357, 359, 123, 37, 0, 0, 0, 0, 
+  0, 0, 0, 0, 
+
+  506, 297, 238, 245, 164, 499, 427, 431, 177, 501, 
+  434, 306, 233, 515, 395, 512, 387, 536, 565, 181, 
+  431, 549, 541, 561, 297, 558, 385, 434, 302, 611, 
+  166, 482, 177, 560, 490, 456, 171, 13, 145, 342, 
+  420, 233, 344, 428, 444, 455, 467, 449, 453, 451, 
+  238, 346, 397, 442, 430, 138, 248, 143, 233, 440, 
+  158, 445, 348, 424, 183, 412, 405, 245, 202, 480, 
+  434, 177, 410, 334, 431, 329, 333, 399, 135, 245, 
+  315, 477, 331, 297, 238, 0, 399, 462, 141, 0, 
+  0, 516, 0, 304, 610, 0, 315, 202, 55, 55, 
+  488, 487, 0, 456, 0, 55, 400, 486, 181, 297, 
+  516, 55, 297, 517, 202, 400, 283, 475, 0, 0, 
+  55, 474, 485, 0, 55, 55, 175, 55, 55, 55, 
+  281, 446, 282, 279, 55, 55, 55, 447, 484, 280, 
+  55, 55, 446, 55, 55, 84, 55, 85, 83, 55, 
+  55, 87, 55, 399, 90, 88, 55, 89, 261, 55, 
+  101, 55, 297, 265, 86, 55, 297, 63, 95, 324, 
+  55, 97, 325, 65, 466, 327, 55, 55, 55, 62, 
+  447, 79, 400, 103, 55, 141, 55, 56, 489, 55, 
+  173, 447, 55, 336, 446, 55, 55, 175, 232, 55, 
+  141, 64, 91, 55, 55, 402, 55, 55, 55, 93, 
+  339, 101, 92, 72, 293, 55, 67, 55, 160, 265, 
+  265, 0, 265, 605, 286, 298, 607, 293, 55, 300, 
+  308, 0, 265, 265, 103, 170, 321, 293, 55, 290, 
+  0, 0, 265, 265, 0, 55, 467, 293, 293, 292, 
+  265, 288, 265, 265, 268, 0, 55, 55, 55, 295, 
+  55, 265, 265, 285, 284, 265, 0, 273, 516, 314, 
+  312, 0, 516, 0, 163, 0, 530, 567, 0, 0, 
+  530, 0, 573, 0, 522, 531, 0, 0, 522, 531, 
+  576, 569, 570, 571, 572, 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, 55, 0, 0, 0, 0, 265, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 311, 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 QmlJSGrammar::action_check [] = {
-  60, 36, 36, 5, 7, 36, 7, 31, 78, 17, 
-  7, 7, 61, 60, 7, 60, 36, 16, 36, 5, 
-  7, 33, 55, 7, 7, 36, 55, 8, 7, 17, 
-  7, 36, 60, 33, 55, 33, 55, 7, 20, 5, 
-  7, 33, 48, 7, 7, 2, 7, 36, 33, 1, 
-  8, 7, 7, 33, 48, 0, 7, 7, 36, 76, 
-  36, 36, 36, 36, 36, 36, 88, 8, 78, 60, 
-  60, 36, 7, 7, 36, 89, 36, 36, 7, 33, 
-  48, 7, 1, 78, 8, 29, 55, 29, 36, 29, 
-  8, 7, 2, 8, 2, 2, 7, 1, 7, -1, 
-  -1, 7, 48, 8, 40, 8, 8, 8, 40, 40, 
-  7, 8, 40, 66, 61, 51, 10, 60, 8, 51, 
-  51, 60, 6, 51, 61, 50, 15, 60, 8, 54, 
-  8, 61, 62, 8, 61, 62, 20, 8, 8, 88, 
-  78, 61, 62, 8, 33, 8, 42, 61, 62, 61, 
-  62, 8, 50, 56, 8, -1, 54, 53, 60, 60, 
-  29, 55, 61, 62, 8, 29, 61, 62, 61, 62, 
-  60, 7, -1, 61, 62, 25, 56, 27, 61, 62, 
-  61, 62, 60, 25, 29, 27, 61, 36, 38, 60, 
-  60, 8, 25, 56, 27, 60, 38, 66, 67, 56, 
-  61, 62, 66, 67, 29, 38, 60, 25, 29, 27, 
-  12, -1, 61, 62, 12, 29, 15, 61, 62, 29, 
-  38, 66, 67, 61, 62, 61, 62, -1, 89, 29, 
-  12, 25, 29, 27, 29, 34, 8, 36, 29, 29, 
-  -1, 66, 67, 60, 38, 66, 67, 90, 91, 92, 
-  29, 89, 66, 67, 8, 57, 66, 67, 8, 57, 
-  25, 63, 27, 29, -1, 63, 25, 29, 27, 66, 
-  67, 66, 67, 38, 74, 57, 66, 67, 25, 38, 
-  27, 63, 8, 74, 29, 85, 29, -1, 29, 61, 
-  62, 38, -1, 29, 85, 74, 15, 15, -1, 7, 
-  66, 67, -1, -1, 66, 67, 85, 61, 62, 29, 
-  -1, 61, 62, 7, 29, 34, 34, 36, 36, 29, 
-  25, 15, 27, 66, 67, 66, 67, 29, -1, 74, 
-  66, 67, 29, 38, 29, 61, 62, 29, -1, 33, 
-  85, 36, 36, 8, 36, -1, 66, 67, 25, -1, 
-  27, 66, 67, 61, 62, 8, 66, 67, 18, 19, 
-  -1, 38, -1, 60, 66, 67, 18, 19, 33, 66, 
-  67, 66, 67, 29, 66, 67, -1, -1, 23, 24, 
-  33, 15, -1, -1, -1, 45, 46, 32, -1, -1, 
-  35, -1, 37, 45, 46, -1, 61, 62, -1, -1, 
-  -1, 29, -1, 59, 29, -1, -1, -1, 61, 62, 
-  66, 67, -1, 47, -1, 29, -1, -1, 18, 19, 
-  -1, 23, 24, -1, -1, -1, 29, 61, 62, 85, 
-  32, 59, -1, 35, 29, 37, 61, 62, 66, 67, 
-  -1, 66, 67, 29, -1, 45, 46, 61, 62, -1, 
-  29, -1, 66, 67, -1, 89, -1, 85, 61, 62, 
-  -1, -1, 29, 66, 67, -1, 61, 62, -1, -1, 
-  -1, 66, 67, -1, -1, 61, 62, 23, 24, -1, 
-  66, 67, 61, 62, -1, 31, 32, 66, 67, 35, 
-  -1, 37, 59, -1, -1, 23, 24, -1, 65, 66, 
-  67, -1, -1, -1, 32, 10, -1, 35, -1, 37, 
-  -1, -1, -1, -1, -1, -1, -1, 22, 85, -1, 
-  -1, -1, -1, -1, 29, -1, -1, -1, 10, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
-  55, -1, -1, -1, 59, -1, -1, -1, -1, -1, 
-  -1, 66, 67, -1, -1, -1, -1, 23, 24, 74, 
-  -1, -1, 3, 55, -1, 31, 32, 59, 83, 35, 
-  85, 37, 13, -1, 66, 67, 17, -1, -1, -1, 
-  -1, -1, 74, -1, -1, 26, -1, 28, -1, -1, 
-  31, 83, -1, 85, -1, -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, -1, -1, -1, -1, 3, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 79, 13, 
-  -1, -1, -1, 17, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 26, -1, 28, -1, -1, -1, -1, -1, 
+  36, 88, 60, 36, 7, 36, 5, 36, 78, 5, 
+  33, 1, 60, 33, 33, 7, 5, 8, 36, 7, 
+  55, 33, 7, 55, 7, 36, 7, 55, 7, 16, 
+  36, 7, 7, 7, 36, 36, 7, 7, 7, 7, 
+  48, 78, 8, 36, 2, 60, 8, 1, 0, 33, 
+  36, 7, 7, 17, 7, 55, 7, 7, 36, 7, 
+  20, 33, 29, 36, 88, 60, 60, 2, 33, 66, 
+  29, 48, 33, 36, 7, 7, 33, 17, 60, 7, 
+  60, 8, 29, 2, 7, 31, 1, 8, 2, 1, 
+  8, 33, 36, 10, 7, 36, 7, -1, 36, 8, 
+  7, 8, 8, 8, 8, 36, 55, 36, -1, 8, 
+  8, -1, 48, 15, -1, 15, 40, 8, 61, 8, 
+  42, 8, 33, 6, 61, -1, 60, 51, 48, 8, 
+  60, 53, 34, 78, 34, 8, 61, 20, 55, 78, 
+  50, 8, 8, 8, 54, 61, 62, 8, -1, -1, 
+  76, 60, 56, 12, 60, 60, -1, 56, 61, 62, 
+  61, 62, 60, 40, 61, 62, 61, 62, 50, 56, 
+  61, 60, 54, 29, 51, 61, 62, 61, 62, 29, 
+  25, 60, 27, 61, 62, 61, 62, 60, 12, 56, 
+  61, 62, 29, 38, 60, 36, 61, 62, 57, 25, 
+  25, 27, 27, 15, 63, 25, 25, 27, 27, 12, 
+  66, 67, 38, 38, 8, 29, 66, 67, 38, 38, 
+  61, 62, 34, 15, 36, 29, 8, 29, 29, 66, 
+  67, 7, -1, 57, 40, 25, 29, 27, 29, 63, 
+  29, -1, 34, 15, 36, 51, 29, -1, 38, -1, 
+  29, -1, 66, 67, 57, 29, 61, 62, 29, 8, 
+  63, 29, 34, 7, 36, 66, 67, 61, 62, 25, 
+  74, 27, 74, 66, 67, 66, 67, 66, 67, 61, 
+  62, 85, 38, 85, 89, 61, 62, 66, 67, 8, 
+  29, 74, 66, 67, 25, 25, 27, 27, 66, 67, 
+  29, 15, 85, 74, 90, 91, 92, 38, 38, 29, 
+  -1, -1, 61, 62, 85, -1, -1, 61, 62, 29, 
+  34, -1, 36, 18, 19, -1, 36, 66, 67, -1, 
+  -1, 18, 19, 18, 19, 18, 19, 66, 67, 47, 
+  -1, -1, 61, 62, -1, 29, 66, 67, 15, -1, 
+  45, 46, 36, 61, 62, 29, 66, 67, 45, 46, 
+  45, 46, 45, 46, 29, -1, 33, 34, -1, 36, 
+  -1, 29, -1, -1, -1, -1, 25, -1, 27, -1, 
+  -1, 89, 66, 67, -1, -1, -1, 61, 62, 38, 
+  29, -1, 66, 67, -1, -1, 61, 62, 23, 24, 
+  29, 66, 67, 61, 62, 23, 24, 32, 66, 67, 
+  35, -1, 37, -1, 32, 29, -1, 35, -1, 37, 
+  -1, -1, 61, 62, -1, -1, -1, 66, 67, -1, 
+  23, 24, 61, 62, -1, -1, -1, 66, 67, 32, 
+  -1, -1, 35, -1, 37, -1, 15, 61, 62, 23, 
+  24, -1, 66, 67, -1, -1, -1, -1, 32, -1, 
+  -1, 35, -1, 37, 33, 34, -1, 36, 23, 24, 
+  -1, -1, -1, -1, -1, -1, 31, 32, 23, 24, 
+  35, -1, 37, -1, -1, -1, 31, 32, 23, 24, 
+  35, -1, 37, -1, -1, -1, 31, 32, 23, 24, 
+  35, -1, 37, -1, -1, 3, 31, 32, 23, 24, 
+  35, -1, 37, -1, -1, 13, 31, 32, -1, 17, 
+  35, -1, 37, -1, -1, -1, 23, 24, 26, -1, 
+  28, -1, -1, -1, -1, 32, -1, -1, 35, 3, 
+  37, 39, -1, 41, 42, -1, -1, -1, -1, 13, 
+  -1, 49, -1, 17, 52, 53, -1, -1, -1, -1, 
+  58, -1, 26, -1, 28, -1, 64, 31, -1, -1, 
   -1, -1, -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, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 79, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 79, -1, -1, -1, 49, -1, -1, 52, 53, 
+  -1, -1, -1, -1, 58, -1, -1, -1, 3, -1, 
+  64, -1, -1, -1, -1, -1, -1, -1, 13, -1, 
+  -1, -1, 17, -1, -1, 79, -1, -1, -1, -1, 
+  -1, 26, -1, 28, -1, -1, -1, -1, -1, -1, 
+  -1, -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, -1, 12, 13, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 22, -1, 79, -1, -1, -1, -1, 29, 
+  -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 
+  12, 13, -1, 43, -1, -1, -1, 47, -1, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
+  -1, 33, 34, -1, 36, 65, 66, 67, -1, 69, 
+  -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
+  80, 81, 82, -1, -1, -1, 86, -1, -1, -1, 
+  -1, -1, -1, 65, 66, 67, -1, 69, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 80, 81, 
+  82, -1, -1, -1, 86, 12, 13, -1, -1, -1, 
+  -1, -1, -1, 12, 13, 22, -1, -1, -1, -1, 
+  -1, -1, 29, 22, -1, -1, 33, 34, -1, 36, 
+  29, -1, -1, -1, 33, 34, 43, 36, -1, -1, 
+  47, -1, -1, -1, 43, -1, -1, -1, 47, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 
+  67, -1, 69, -1, -1, -1, 65, 66, 67, -1, 
+  69, -1, -1, 80, 81, 82, -1, -1, -1, 86, 
+  -1, 80, 81, 82, -1, -1, -1, 86, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 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, -1, -1, -1, 43, -1, -1, 
+  -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  66, 67, -1, 69, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, 
+  86, -1, -1, -1, -1, -1, -1, -1, -1, 10, 
   -1, 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, -1, 
   -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 55, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 80, 
-  81, 82, -1, -1, -1, 86, -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, -1, 75, -1, 
-  -1, -1, -1, 80, 81, 82, -1, -1, -1, 86, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 7, -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, -1, 75, -1, -1, -1, 
-  -1, 80, 81, 82, -1, -1, -1, 86, -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, 86, -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, 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, -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, -1, -1, 86, -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, 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, -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, -1, -1, 86, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, 
+  -1, -1, -1, 74, -1, -1, -1, -1, -1, 80, 
+  81, 82, 83, -1, -1, 86, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 10, -1, 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, -1, -1, -1, 43, -1, -1, 
+  -1, 47, -1, -1, -1, -1, -1, -1, -1, 55, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  66, 67, -1, 69, -1, -1, -1, -1, 74, -1, 
+  -1, -1, -1, -1, 80, 81, 82, 83, -1, -1, 
+  86, -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, -1, 75, -1, -1, -1, -1, 80, 81, 
+  82, -1, -1, -1, 86, -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, 86, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 7, -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, 51, -1, 53, -1, -1, -1, -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, 86, -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, 86, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 8, -1, -1, 11, 12, 13, -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, 
+  -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, 
-  56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  -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, -1, -1, 
   86, -1, -1, -1, -1, -1, -1, -1, -1, 8, 
@@ -778,115 +775,130 @@ const int QmlJSGrammar::action_check [] = {
   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, 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, 85, 86, -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, 
-  -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, -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, -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, 
+  82, -1, -1, -1, 86, -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, 86, -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, -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, -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, 86, 
+  -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, 86, -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, -1, -1, -1, -1, 4, 5, 
-  6, -1, -1, 9, 10, 11, 12, 13, 14, -1, 
+  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, -1, 
-  -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 
-  66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 
+  -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, 
-  86, -1, -1, -1, -1, -1, -1, -1, -1, 4, 
-  5, 6, -1, -1, 9, 10, 11, 12, 13, 14, 
+  -1, -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, 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, 
+  -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, 86, -1, -1, -1, -1, -1, -1, -1, -1, 
+  85, -1, -1, -1, -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, 86, -1, -1, -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, 86, -1, -1, -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, 86, -1, -1, -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, 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, 86, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 
 
-  9, 3, 9, 2, 33, 9, 3, 15, 9, 9, 
-  21, 9, 66, 9, 9, 9, 3, 33, 9, 2, 
-  9, 3, 15, 3, 9, 9, 3, 17, 2, 21, 
-  2, 9, 3, 21, 3, 3, 9, 3, 3, 9, 
-  2, 17, 17, 2, 2, 9, 9, 33, 9, 9, 
-  2, 97, 33, 9, 33, 3, 2, 95, 3, 2, 
-  9, 2, 80, 3, 3, 80, 33, 17, 92, 3, 
-  2, 2, 2, 9, 3, 17, 33, 2, 2, 34, 
-  33, 3, 33, 3, 2, 8, 33, 3, 2, 33, 
-  9, -1, -1, -1, -1, 33, -1, 9, 9, -1, 
-  3, 9, 10, 9, 9, 9, 43, 11, 43, 3, 
-  43, 37, 45, 48, 40, 43, 43, 45, 45, 24, 
-  9, 9, 59, 11, 2, -1, 43, -1, 43, 35, 
-  43, 33, 49, 43, 43, 48, 43, 39, 48, -1, 
-  -1, 48, 57, 43, 43, 45, 55, 43, 43, 45, 
-  43, 33, 43, 48, 53, 48, 43, 39, 49, 46, 
-  43, 29, 45, 43, 67, 33, -1, 86, 48, 43, 
-  43, 45, 45, 67, 43, 3, 43, 46, 43, 43, 
-  45, 48, 43, 3, 48, 99, 43, 98, 45, 43, 
-  51, 45, 43, 43, 43, 84, 45, 48, 48, 43, 
-  37, 43, 43, 40, 48, 47, -1, 43, 49, 45, 
-  43, 37, 45, 43, 40, 45, 43, -1, -1, 43, 
-  43, -1, 49, 47, 47, 43, 104, 45, 43, 43, 
-  43, 43, -1, 48, 48, 48, 48, 50, 50, 67, 
-  43, 43, 9, 58, 11, 48, 48, 67, 43, 52, 
-  43, 65, -1, 48, -1, 48, -1, 43, 60, 45, 
-  43, 54, 43, 43, 43, 48, 33, 48, 48, 48, 
-  65, 50, 43, 43, 9, 10, -1, 48, 48, 50, 
-  3, -1, 65, -1, 65, 65, 56, 3, -1, 9, 
-  10, 26, 27, 13, 17, 18, 19, 20, -1, -1, 
-  -1, 17, 18, 19, 20, -1, 26, 27, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  9, -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, 35, 36, -1, -1, 
+  12, 3, 12, 2, 33, 10, 79, 3, 12, 10, 
+  19, 2, 12, 8, 33, 12, 34, 23, 12, 12, 
+  3, 3, 3, 12, 3, 23, 33, 19, 2, 17, 
+  33, 3, 12, 23, 2, 12, 3, 3, 65, 2, 
+  94, 12, 3, 3, 19, 2, 33, 3, 3, 2, 
+  12, 2, 2, 12, 79, 33, 3, 33, 12, 96, 
+  33, 19, 2, 91, 12, 3, 2, 2, 2, 33, 
+  19, 12, 2, 12, 3, 2, 2, 10, 3, 2, 
+  12, 33, 3, 3, 12, -1, 10, 33, 33, -1, 
+  -1, 10, -1, 3, 13, -1, 12, 2, 42, 42, 
+  44, 44, -1, 12, -1, 42, 39, 44, 12, 3, 
+  10, 42, 3, 13, 2, 39, 47, 29, -1, -1, 
+  42, 33, 44, -1, 42, 42, 44, 42, 42, 42, 
+  47, 44, 47, 47, 42, 42, 42, 44, 44, 47, 
+  42, 42, 44, 42, 42, 46, 42, 46, 46, 42, 
+  42, 47, 42, 10, 47, 47, 42, 47, 42, 42, 
+  12, 42, 3, 47, 47, 42, 3, 44, 54, 85, 
+  42, 52, 66, 45, 83, 66, 42, 42, 42, 44, 
+  44, 47, 39, 35, 42, 33, 42, 45, 44, 42, 
+  38, 44, 42, 97, 44, 42, 42, 44, 103, 42, 
+  33, 44, 48, 42, 42, 38, 42, 42, 42, 48, 
+  98, 12, 48, 48, 42, 42, 50, 42, 56, 47, 
+  47, -1, 47, 10, 49, 66, 13, 42, 42, 66, 
+  57, -1, 47, 47, 35, 36, 64, 42, 42, 53, 
+  -1, -1, 47, 47, -1, 42, 33, 42, 42, 64, 
+  47, 55, 47, 47, 51, -1, 42, 42, 42, 64, 
+  42, 47, 47, 49, 49, 47, -1, 49, 10, 64, 
+  64, -1, 10, -1, 58, -1, 18, 15, -1, -1, 
+  18, -1, 10, -1, 26, 27, -1, -1, 26, 27, 
+  18, 19, 20, 21, 22, -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, 42, -1, -1, -1, -1, 47, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 59, -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/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h
index c2bc60e..3d48d4f 100644
--- a/src/declarative/qml/parser/qmljsgrammar_p.h
+++ b/src/declarative/qml/parser/qmljsgrammar_p.h
@@ -154,15 +154,15 @@ public:
     T_XOR = 78,
     T_XOR_EQ = 79,
 
-    ACCEPT_STATE = 638,
-    RULE_COUNT = 350,
-    STATE_COUNT = 639,
+    ACCEPT_STATE = 612,
+    RULE_COUNT = 334,
+    STATE_COUNT = 613,
     TERMINAL_COUNT = 95,
-    NON_TERMINAL_COUNT = 106,
+    NON_TERMINAL_COUNT = 105,
 
-    GOTO_INDEX_OFFSET = 639,
-    GOTO_INFO_OFFSET = 2310,
-    GOTO_CHECK_OFFSET = 2310
+    GOTO_INDEX_OFFSET = 613,
+    GOTO_INFO_OFFSET = 2434,
+    GOTO_CHECK_OFFSET = 2434
   };
 
   static const char  *const spell [];
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index 9bd6e6f..2ee0f88 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -228,238 +228,155 @@ case 7: {
         sym(1).UiImportList, sym(2).UiImport);
 } break;
 
-case 9: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).sval);
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->semicolonToken = loc(3);
-    sym(1).Node = node;
+case 10: {
+    sym(1).UiImport->semicolonToken = loc(2);
 } break;
 
-case 11: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).sval);
-    node->importId = sym(4).sval;
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->asToken = loc(3);
-    node->importIdToken = loc(4);
-    node->semicolonToken = loc(5);
-    sym(1).Node = node;
+case 12: {
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->semicolonToken = loc(3);
 } break;
 
-case 13: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->semicolonToken = loc(3);
-    sym(1).Node = node;
+case 14: {
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->asToken = loc(3);
+    sym(1).UiImport->importIdToken = loc(4);
+    sym(1).UiImport->semicolonToken = loc(5);
 } break;
 
-case 15: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->versionToken = loc(3);
-    node->semicolonToken = loc(4);
-    sym(1).Node = node;
+case 16: {
+    sym(1).UiImport->asToken = loc(2);
+    sym(1).UiImport->importIdToken = loc(3);
+    sym(1).UiImport->semicolonToken = loc(4);
 } break;
 
 case 17: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
-    node->importId = sym(5).sval;
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->versionToken = loc(3);
-    node->asToken = loc(4);
-    node->importIdToken = loc(5);
-    node->semicolonToken = loc(6);
-    sym(1).Node = node;
-} break;
+    AST::UiImport *node = 0;
+
+    if (AST::StringLiteral *importIdLiteral = AST::cast<AST::StringLiteral *>(sym(2).Expression)) {
+        node = makeAstNode<AST::UiImport>(driver->nodePool(), importIdLiteral->value);
+        node->fileNameToken = loc(2);
+    } else if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(2).Expression)) {
+        QString text;
+        for (AST::UiQualifiedId *q = qualifiedId; q; q = q->next) {
+	   text += q->name->asString();
+           if (q->next) text += QLatin1String(".");
+        }
+        node = makeAstNode<AST::UiImport>(driver->nodePool(), qualifiedId);
+        node->fileNameToken = loc(2);
+    }
 
-case 19: {
-    AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
-    node->importId = sym(4).sval;
-    node->importToken = loc(1);
-    node->fileNameToken = loc(2);
-    node->asToken = loc(3);
-    node->importIdToken = loc(4);
-    node->semicolonToken = loc(5);
     sym(1).Node = node;
+
+    if (! node) {
+       diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1),
+         QLatin1String("Expected a qualified name id or a string literal")));
+
+        return false; // ### remove me
+    }
 } break;
 
-case 20: {
+case 18: {
     sym(1).Node = 0;
 } break;
 
-case 21: {
+case 19: {
     sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
 } break;
 
-case 22: {
+case 20: {
     sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
 } break;
 
-case 23: {
+case 21: {
     AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
         sym(1).UiObjectMemberList, sym(2).UiObjectMember);
     sym(1).Node = node;
 } break;
 
-case 24: {
+case 22: {
     sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember);
 } break;
 
-case 25: {
+case 23: {
     AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(),
         sym(1).UiArrayMemberList, sym(3).UiObjectMember);
     node->commaToken = loc(2);
     sym(1).Node = node;
 } break;
 
-case 26: {
+case 24: {
     AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0);
     node->lbraceToken = loc(1);
     node->rbraceToken = loc(2);
     sym(1).Node = node;
 }   break;
 
-case 27: {
+case 25: {
     AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), sym(2).UiObjectMemberList->finish());
     node->lbraceToken = loc(1);
     node->rbraceToken = loc(3);
     sym(1).Node = node;
 }   break;
 
-case 28: {
-    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
+case 26: {
+    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId,
         sym(2).UiObjectInitializer);
     sym(1).Node = node;
 }   break;
 
-case 30: {
+case 28: {
     AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
-        sym(1).UiQualifiedId->finish(), sym(4).UiArrayMemberList->finish());
+        sym(1).UiQualifiedId, sym(4).UiArrayMemberList->finish());
     node->colonToken = loc(2);
     node->lbracketToken = loc(3);
     node->rbracketToken = loc(5);
     sym(1).Node = node;
 }   break;
 
-case 31: {
-  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) {
+case 29: {
     AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
-      sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer);
+      sym(1).UiQualifiedId, sym(3).UiQualifiedId, 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 32: {
-  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(4).Expression)) {
-    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
-      sym(1).UiQualifiedId->finish(), qualifiedId, sym(5).UiObjectInitializer);
-    node->colonToken = loc(3);
-    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 33:case 34:case 35:case 36:
-{
-    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
-        sym(1).UiQualifiedId->finish(), sym(4).Statement);
-    node->colonToken = loc(3);
-    sym(1).Node = node;
-}   break;
-case 37:case 38:case 39:case 40:
+case 30:case 31:case 32:case 33:
 {
     AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
-        sym(1).UiQualifiedId->finish(), sym(3).Statement);
+        sym(1).UiQualifiedId, sym(3).Statement);
     node->colonToken = loc(2);
     sym(1).Node = node;
 }   break;
 
-case 41:
+case 34:
 
-case 42: {
+case 35: {
     sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
     break;
 }
 
-case 44: {
+case 37: {
   sym(1).Node = 0;
 } break;
 
-case 45: {
+case 38: {
   sym(1).Node = sym(1).UiParameterList->finish ();
 } break;
 
-case 46: {
+case 39: {
   AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
   node->identifierToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 47: {
+case 40: {
   AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).UiParameterList, sym(3).sval, sym(4).sval);
   node->commaToken = loc(2);
   node->identifierToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 48: {
-    AST::UiFormal *node = makeAstNode<AST::UiFormal>(driver->nodePool(), sym(1).sval);
-    node->identifierToken = loc(1);
-    sym(1).UiFormal = node;
-} break;
-
-case 49: {
-    AST::UiFormal *node = makeAstNode<AST::UiFormal>(driver->nodePool(),
-        sym(1).sval, sym(3).sval);
-    node->identifierToken = loc(1);
-    node->asToken = loc(2);
-    node->aliasToken = loc(3);
-    sym(1).UiFormal = node;
-} break;
-
-case 50: {
-    sym(1).UiFormalList = makeAstNode<AST::UiFormalList>(driver->nodePool(),
-        sym(1).UiFormal);
-} break;
-
-case 51: {
-    sym(1).UiFormalList = makeAstNode<AST::UiFormalList>(driver->nodePool(),
-        sym(1).UiFormalList, sym(3).UiFormal);
-} break;
-
-case 52: {
-    AST::UiSignature *node = makeAstNode<AST::UiSignature>(driver->nodePool());
-    node->lparenToken = loc(1);
-    node->rparenToken = loc(3);
-    sym(1).UiSignature = node;
-} break;
-
-case 53: {
-    AST::UiSignature *node = makeAstNode<AST::UiSignature>(driver->nodePool(),
-        sym(2).UiFormalList->finish());
-    node->lparenToken = loc(1);
-    node->rparenToken = loc(3);
-    sym(1).UiSignature = node;
-} break;
-
-case 55: {
+case 42: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
@@ -470,7 +387,7 @@ case 55: {
     sym(1).Node = node;
 }   break;
 
-case 57: {
+case 44: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
@@ -480,7 +397,7 @@ case 57: {
     sym(1).Node = node;
 }   break;
 
-case 59: {
+case 46: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -489,7 +406,7 @@ case 59: {
     sym(1).Node = node;
 }   break;
 
-case 61: {
+case 48: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
@@ -500,7 +417,7 @@ case 61: {
     sym(1).Node = node;
 }   break;
 
-case 63: {
+case 50: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
         sym(5).Expression);
     node->propertyToken = loc(1);
@@ -511,7 +428,7 @@ case 63: {
     sym(1).Node = node;
 }   break;
 
-case 65: {
+case 52: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
         sym(6).Expression);
     node->isDefaultMember = true;
@@ -524,76 +441,69 @@ case 65: {
     sym(1).Node = node;
 }   break;
 
-case 66: {
+case 53: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
 
-case 67: {
+case 54: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
-case 68: 
-case 69:
-{
-    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
-    node->identifierToken = loc(1);
-    sym(1).Node = node;
-}   break;
 
-case 71: {
+case 56: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 72: {
+case 57: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 73: {
+case 58: {
   AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
   node->thisToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 74: {
+case 59: {
   AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 75: {
+case 60: {
   AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
   node->nullToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 76: {
+case 61: {
   AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
   node->trueToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 77: {
+case 62: {
   AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
   node->falseToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 78: {
+case 63: {
   AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
-case 79:
-case 80: {
+case 64:
+case 65: {
   AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 81: {
+case 66: {
   bool rx = lexer->scanRegExp(Lexer::NoPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -604,7 +514,7 @@ case 81: {
   sym(1).Node = node;
 } break;
 
-case 82: {
+case 67: {
   bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -615,28 +525,28 @@ case 82: {
   sym(1).Node = node;
 } break;
 
-case 83: {
+case 68: {
   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 84: {
+case 69: {
   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 85: {
+case 70: {
   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 86: {
+case 71: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
     (AST::Elision *) 0);
   node->lbracketToken = loc(1);
@@ -645,7 +555,7 @@ case 86: {
   sym(1).Node = node;
 } break;
 
-case 87: {
+case 72: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
     sym(4).Elision->finish());
   node->lbracketToken = loc(1);
@@ -654,7 +564,7 @@ case 87: {
   sym(1).Node = node;
 } break;
 
-case 88: {
+case 73: {
   AST::ObjectLiteral *node = 0;
   if (sym(2).Node)
     node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -666,7 +576,7 @@ case 88: {
   sym(1).Node = node;
 } break;
 
-case 89: {
+case 74: {
   AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
     sym(2).PropertyNameAndValueList->finish ());
   node->lbraceToken = loc(1);
@@ -674,67 +584,75 @@ case 89: {
   sym(1).Node = node;
 } break;
 
-case 90: {
+case 75: {
   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 91: {
-    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
-    node->identifierToken = loc(1);
-    sym(1).Node = node;
-}   break;
+case 76: {
+  if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
+      QLatin1String("Ignored annotation")));
 
-case 92: {
-    AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
-    node->identifierToken = loc(3);
-    sym(1).Node = node;
-}   break;
+    sym(1).Expression = mem->base;
+  }
+
+  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(1).Expression)) {
+    sym(1).UiQualifiedId = qualifiedId;
+  } else {
+    sym(1).UiQualifiedId = 0;
 
-case 93: {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1),
+      QLatin1String("Expected a qualified name id")));
+
+    return false; // ### recover
+  }
+} break;
+
+case 77: {
   sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
 } break;
 
-case 94: {
+case 78: {
   sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
 } break;
 
-case 95: {
+case 79: {
   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 96: {
+case 80: {
   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 97: {
+case 81: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
   node->commaToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 98: {
+case 82: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 99: {
+case 83: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyName, sym(3).Expression);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 100: {
+case 84: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
   node->commaToken = loc(2);
@@ -742,116 +660,116 @@ case 100: {
   sym(1).Node = node;
 } break;
 
-case 101: {
+case 85: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
-case 102:
-case 103: {
+case 86:
+case 87: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 104: {
+case 88: {
   AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 105: {
+case 89: {
   AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 106: {
+case 90: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 107:
+case 91:
 
-case 108:
+case 92:
 
-case 109:
+case 93:
 
-case 110:
+case 94:
 
-case 111:
+case 95:
 
-case 112:
+case 96:
 
-case 113:
+case 97:
 
-case 114:
+case 98:
 
-case 115:
+case 99:
 
-case 116:
+case 100:
 
-case 117:
+case 101:
 
-case 118:
+case 102:
 
-case 119:
+case 103:
 
-case 120:
+case 104:
 
-case 121:
+case 105:
 
-case 122:
+case 106:
 
-case 123:
+case 107:
 
-case 124:
+case 108:
 
-case 125:
+case 109:
 
-case 126:
+case 110:
 
-case 127:
+case 111:
 
-case 128:
+case 112:
 
-case 129:
+case 113:
 
-case 130:
+case 114:
 
-case 131:
+case 115:
 
-case 132:
+case 116:
 
-case 133:
+case 117:
 
-case 134:
+case 118:
 
-case 135:
+case 119:
 
-case 136:
+case 120:
 
-case 137:
+case 121:
 {
   sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
 } break;
 
-case 142: {
+case 126: {
   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 143: {
+case 127: {
   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 144: {
+case 128: {
   AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
   node->newToken = loc(1);
   node->lparenToken = loc(3);
@@ -859,384 +777,384 @@ case 144: {
   sym(1).Node = node;
 } break;
 
-case 146: {
+case 130: {
   AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
   node->newToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 147: {
+case 131: {
   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 148: {
+case 132: {
   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 149: {
+case 133: {
   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 150: {
+case 134: {
   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 151: {
+case 135: {
   sym(1).Node = 0;
 } break;
 
-case 152: {
+case 136: {
   sym(1).Node = sym(1).ArgumentList->finish();
 } break;
 
-case 153: {
+case 137: {
   sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
 } break;
 
-case 154: {
+case 138: {
   AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 158: {
+case 142: {
   AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
   node->incrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 159: {
+case 143: {
   AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
   node->decrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 161: {
+case 145: {
   AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
   node->deleteToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 162: {
+case 146: {
   AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
   node->voidToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 163: {
+case 147: {
   AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
   node->typeofToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 164: {
+case 148: {
   AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
   node->incrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 165: {
+case 149: {
   AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
   node->decrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 166: {
+case 150: {
   AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
   node->plusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 167: {
+case 151: {
   AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
   node->minusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 168: {
+case 152: {
   AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
   node->tildeToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 169: {
+case 153: {
   AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
   node->notToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 171: {
+case 155: {
   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 172: {
+case 156: {
   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 173: {
+case 157: {
   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 175: {
+case 159: {
   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 176: {
+case 160: {
   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 178: {
+case 162: {
   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 179: {
+case 163: {
   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 180: {
+case 164: {
   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 182: {
+case 166: {
   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 183: {
+case 167: {
   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 184: {
+case 168: {
   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 185: {
+case 169: {
   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 186: {
+case 170: {
   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 187: {
+case 171: {
   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 189: {
+case 173: {
   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 190: {
+case 174: {
   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 191: {
+case 175: {
   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 192: {
+case 176: {
   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 193: {
+case 177: {
   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 195: {
+case 179: {
   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 196: {
+case 180: {
   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 197: {
+case 181: {
   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 198: {
+case 182: {
   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 200: {
+case 184: {
   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 201: {
+case 185: {
   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 202: {
+case 186: {
   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 203: {
+case 187: {
   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 205: {
+case 189: {
   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 207: {
+case 191: {
   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 209: {
+case 193: {
   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 211: {
+case 195: {
   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 213: {
+case 197: {
   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 215: {
+case 199: {
   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 217: {
+case 201: {
   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 219: {
+case 203: {
   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 221: {
+case 205: {
   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 223: {
+case 207: {
   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 225: {
+case 209: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1244,7 +1162,7 @@ case 225: {
   sym(1).Node = node;
 } break;
 
-case 227: {
+case 211: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1252,112 +1170,112 @@ case 227: {
   sym(1).Node = node;
 } break;
 
-case 229: {
+case 213: {
   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 231: {
+case 215: {
   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 232: {
+case 216: {
   sym(1).ival = QSOperator::Assign;
 } break;
 
-case 233: {
+case 217: {
   sym(1).ival = QSOperator::InplaceMul;
 } break;
 
-case 234: {
+case 218: {
   sym(1).ival = QSOperator::InplaceDiv;
 } break;
 
-case 235: {
+case 219: {
   sym(1).ival = QSOperator::InplaceMod;
 } break;
 
-case 236: {
+case 220: {
   sym(1).ival = QSOperator::InplaceAdd;
 } break;
 
-case 237: {
+case 221: {
   sym(1).ival = QSOperator::InplaceSub;
 } break;
 
-case 238: {
+case 222: {
   sym(1).ival = QSOperator::InplaceLeftShift;
 } break;
 
-case 239: {
+case 223: {
   sym(1).ival = QSOperator::InplaceRightShift;
 } break;
 
-case 240: {
+case 224: {
   sym(1).ival = QSOperator::InplaceURightShift;
 } break;
 
-case 241: {
+case 225: {
   sym(1).ival = QSOperator::InplaceAnd;
 } break;
 
-case 242: {
+case 226: {
   sym(1).ival = QSOperator::InplaceXor;
 } break;
 
-case 243: {
+case 227: {
   sym(1).ival = QSOperator::InplaceOr;
 } break;
 
-case 245: {
+case 229: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 246: {
+case 230: {
   sym(1).Node = 0;
 } break;
 
-case 249: {
+case 233: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 250: {
+case 234: {
   sym(1).Node = 0;
 } break;
 
-case 267: {
+case 251: {
   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 268: {
+case 252: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 269: {
+case 253: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
 } break;
 
-case 270: {
+case 254: {
   sym(1).Node = 0;
 } break;
 
-case 271: {
+case 255: {
   sym(1).Node = sym(1).StatementList->finish ();
 } break;
 
-case 273: {
+case 257: {
   AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
      sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
   node->declarationKindToken = loc(1);
@@ -1365,76 +1283,76 @@ case 273: {
   sym(1).Node = node;
 } break;
 
-case 274: {
+case 258: {
   sym(1).ival = T_CONST;
 } break;
 
-case 275: {
+case 259: {
   sym(1).ival = T_VAR;
 } break;
 
-case 276: {
+case 260: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 277: {
+case 261: {
   AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
     sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 278: {
+case 262: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 279: {
+case 263: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
 } break;
 
-case 280: {
+case 264: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 281: {
+case 265: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 282: {
+case 266: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 283: {
+case 267: {
   sym(1).Node = 0;
 } break;
 
-case 285: {
+case 269: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 286: {
+case 270: {
   sym(1).Node = 0;
 } break;
 
-case 288: {
+case 272: {
   AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
   node->semicolonToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 290: {
+case 274: {
   AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 291: {
+case 275: {
   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);
@@ -1443,7 +1361,7 @@ case 291: {
   sym(1).Node = node;
 } break;
 
-case 292: {
+case 276: {
   AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1451,7 +1369,7 @@ case 292: {
   sym(1).Node = node;
 } break;
 
-case 294: {
+case 278: {
   AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
   node->doToken = loc(1);
   node->whileToken = loc(3);
@@ -1461,7 +1379,7 @@ case 294: {
   sym(1).Node = node;
 } break;
 
-case 295: {
+case 279: {
   AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->whileToken = loc(1);
   node->lparenToken = loc(2);
@@ -1469,7 +1387,7 @@ case 295: {
   sym(1).Node = node;
 } break;
 
-case 296: {
+case 280: {
   AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Expression, sym(9).Statement);
   node->forToken = loc(1);
@@ -1480,7 +1398,7 @@ case 296: {
   sym(1).Node = node;
 } break;
 
-case 297: {
+case 281: {
   AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
      sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
      sym(8).Expression, sym(10).Statement);
@@ -1493,7 +1411,7 @@ case 297: {
   sym(1).Node = node;
 } break;
 
-case 298: {
+case 282: {
   AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Statement);
   node->forToken = loc(1);
@@ -1503,7 +1421,7 @@ case 298: {
   sym(1).Node = node;
 } break;
 
-case 299: {
+case 283: {
   AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
     sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
   node->forToken = loc(1);
@@ -1514,14 +1432,14 @@ case 299: {
   sym(1).Node = node;
 } break;
 
-case 301: {
+case 285: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
   node->continueToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 303: {
+case 287: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
   node->continueToken = loc(1);
   node->identifierToken = loc(2);
@@ -1529,14 +1447,14 @@ case 303: {
   sym(1).Node = node;
 } break;
 
-case 305: {
+case 289: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
   node->breakToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 307: {
+case 291: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
   node->breakToken = loc(1);
   node->identifierToken = loc(2);
@@ -1544,14 +1462,14 @@ case 307: {
   sym(1).Node = node;
 } break;
 
-case 309: {
+case 293: {
   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 310: {
+case 294: {
   AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->withToken = loc(1);
   node->lparenToken = loc(2);
@@ -1559,7 +1477,7 @@ case 310: {
   sym(1).Node = node;
 } break;
 
-case 311: {
+case 295: {
   AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
   node->switchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1567,90 +1485,90 @@ case 311: {
   sym(1).Node = node;
 } break;
 
-case 312: {
+case 296: {
   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 313: {
+case 297: {
   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 314: {
+case 298: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
 } break;
 
-case 315: {
+case 299: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
 } break;
 
-case 316: {
+case 300: {
   sym(1).Node = 0;
 } break;
 
-case 317: {
+case 301: {
   sym(1).Node = sym(1).CaseClauses->finish ();
 } break;
 
-case 318: {
+case 302: {
   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 319: {
+case 303: {
   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 320:
-case 321: {
+case 304:
+case 305: {
   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 322: {
+case 306: {
   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 324: {
+case 308: {
   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 325: {
+case 309: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 326: {
+case 310: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 327: {
+case 311: {
   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 328: {
+case 312: {
   AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
   node->catchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1659,20 +1577,20 @@ case 328: {
   sym(1).Node = node;
 } break;
 
-case 329: {
+case 313: {
   AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
   node->finallyToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 331: {
+case 315: {
   AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
   node->debuggerToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 332: {
+case 316: {
   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);
@@ -1683,7 +1601,7 @@ case 332: {
   sym(1).Node = node;
 } break;
 
-case 333: {
+case 317: {
   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)
@@ -1695,56 +1613,56 @@ case 333: {
   sym(1).Node = node;
 } break;
 
-case 334: {
+case 318: {
   AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 335: {
+case 319: {
   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 336: {
+case 320: {
   sym(1).Node = 0;
 } break;
 
-case 337: {
+case 321: {
   sym(1).Node = sym(1).FormalParameterList->finish ();
 } break;
 
-case 338: {
+case 322: {
   sym(1).Node = 0;
 } break;
 
-case 340: {
+case 324: {
   sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
 } break;
 
-case 341: {
+case 325: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
 } break;
 
-case 342: {
+case 326: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
 } break;
 
-case 343: {
+case 327: {
   sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 344: {
+case 328: {
   sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
 } break;
 
-case 345: {
+case 329: {
   sym(1).sval = 0;
 } break;
 
-case 347: {
+case 331: {
   sym(1).Node = 0;
 } break;
 
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
index e352f43..685e286 100644
--- a/src/declarative/qml/parser/qmljsparser_p.h
+++ b/src/declarative/qml/parser/qmljsparser_p.h
@@ -222,9 +222,9 @@ protected:
 
 
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 81
+#define J_SCRIPT_REGEXPLITERAL_RULE1 66
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 82
+#define J_SCRIPT_REGEXPLITERAL_RULE2 67
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp
index 36e7f14..987ccb0 100644
--- a/src/declarative/util/qmlfollow.cpp
+++ b/src/declarative/util/qmlfollow.cpp
@@ -56,7 +56,8 @@ class QmlFollowPrivate : public QObjectPrivate
 public:
     QmlFollowPrivate()
         : sourceValue(0), maxVelocity(0), lastTime(0)
-        , mass(1.0), spring(0.), damping(0.), velocity(0), epsilon(0.01), modulus(0.0), enabled(true), mode(Track), clock(this) {}
+        , mass(1.0), useMass(false), spring(0.), damping(0.), velocity(0), epsilon(0.01)
+        , modulus(0.0), haveModulus(false), enabled(true), mode(Track), clock(this) {}
 
     QmlMetaProperty property;
     qreal currentValue;
@@ -70,6 +71,8 @@ public:
     qreal velocity;
     qreal epsilon;
     qreal modulus;
+    bool haveModulus;
+    bool useMass;
     bool enabled;
 
     enum Mode {
@@ -95,7 +98,7 @@ void QmlFollowPrivate::tick(int time)
     if (!elapsed)
         return;
     qreal srcVal = sourceValue;
-    if (modulus != 0.0) {
+    if (haveModulus) {
         currentValue = fmod(currentValue, modulus);
         srcVal = fmod(srcVal, modulus);
     }
@@ -107,15 +110,16 @@ void QmlFollowPrivate::tick(int time)
         int count = elapsed / 16;
         for (int i = 0; i < count; ++i) {
             qreal diff = srcVal - currentValue;
-            if (modulus != 0.0 && qAbs(diff) > modulus / 2) {
+            if (haveModulus && qAbs(diff) > modulus / 2) {
                 if (diff < 0)
                     diff += modulus;
                 else
                     diff -= modulus;
             }
-            velocity = velocity + spring * diff - damping * velocity;
-            // The following line supports mass.  Not sure its worth the extra divisions.
-            // velocity = velocity + spring / mass * diff - damping / mass * velocity;
+            if (useMass)
+                velocity = velocity + (spring * diff - damping * velocity) / mass;
+            else
+                velocity = velocity + spring * diff - damping * velocity;
             if (maxVelocity > 0.) {
                 // limit velocity
                 if (velocity > maxVelocity)
@@ -124,7 +128,7 @@ void QmlFollowPrivate::tick(int time)
                     velocity = -maxVelocity;
             }
             currentValue += velocity * 16.0 / 1000.0;
-            if (modulus != 0.0) {
+            if (haveModulus) {
                 currentValue = fmod(currentValue, modulus);
                 if (currentValue < 0.0)
                     currentValue += modulus;
@@ -139,7 +143,7 @@ void QmlFollowPrivate::tick(int time)
     } else {
         qreal moveBy = elapsed * velocityms;
         qreal diff = srcVal - currentValue;
-        if (modulus != 0.0 && qAbs(diff) > modulus / 2) {
+        if (haveModulus && qAbs(diff) > modulus / 2) {
             if (diff < 0)
                 diff += modulus;
             else
@@ -147,7 +151,7 @@ void QmlFollowPrivate::tick(int time)
         }
         if (diff > 0) {
             currentValue += moveBy;
-            if (modulus != 0.0)
+            if (haveModulus)
                 currentValue = fmod(currentValue, modulus);
             if (currentValue > sourceValue) {
                 currentValue = sourceValue;
@@ -155,7 +159,7 @@ void QmlFollowPrivate::tick(int time)
             }
         } else {
             currentValue -= moveBy;
-            if (modulus != 0.0 && currentValue < 0.0)
+            if (haveModulus && currentValue < 0.0)
                 currentValue = fmod(currentValue, modulus) + modulus;
             if (currentValue < sourceValue) {
                 currentValue = sourceValue;
@@ -375,7 +379,34 @@ qreal QmlFollow::modulus() const
 void QmlFollow::setModulus(qreal modulus)
 {
     Q_D(QmlFollow);
-    d->modulus = modulus;
+    if (d->modulus != modulus) {
+        d->haveModulus = modulus != 0.0;
+        d->modulus = modulus;
+        emit modulusChanged();
+    }
+}
+
+/*!
+    \qmlproperty qreal Follow::mass
+    This property holds the "mass" of the property being moved.
+
+    mass is 1.0 by default.  Setting a different mass changes the dynamics of
+    a \l spring follow.
+*/
+qreal QmlFollow::mass() const
+{
+    Q_D(const QmlFollow);
+    return d->mass;
+}
+
+void QmlFollow::setMass(qreal mass)
+{
+    Q_D(QmlFollow);
+    if (d->mass != mass && mass > 0.0) {
+        d->useMass = mass != 1.0;
+        d->mass = mass;
+        emit massChanged();
+    }
 }
 
 /*!
diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h
index e0a588b..5c1093e 100644
--- a/src/declarative/util/qmlfollow.h
+++ b/src/declarative/util/qmlfollow.h
@@ -68,6 +68,7 @@ class Q_DECLARATIVE_EXPORT QmlFollow : public QmlPropertyValueSource,
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
     Q_PROPERTY(qreal followValue READ value NOTIFY valueChanged)
     Q_PROPERTY(qreal modulus READ modulus WRITE setModulus NOTIFY modulusChanged)
+    Q_PROPERTY(qreal mass READ mass WRITE setMass NOTIFY massChanged)
     Q_PROPERTY(bool inSync READ inSync NOTIFY syncChanged)
 
 public:
@@ -86,6 +87,8 @@ public:
     void setDamping(qreal damping);
     qreal epsilon() const;
     void setEpsilon(qreal epsilon);
+    qreal mass() const;
+    void setMass(qreal modulus);
     qreal modulus() const;
     void setModulus(qreal modulus);
     bool enabled() const;
@@ -96,6 +99,8 @@ public:
 
 Q_SIGNALS:
     void valueChanged(qreal);
+    void modulusChanged();
+    void massChanged();
     void syncChanged();
 };
 
diff --git a/src/declarative/util/qmlpalette.cpp b/src/declarative/util/qmlpalette.cpp
index 01b5ad3..3a6dadc 100644
--- a/src/declarative/util/qmlpalette.cpp
+++ b/src/declarative/util/qmlpalette.cpp
@@ -161,10 +161,17 @@ QColor QmlPalette::darker(const QColor& color) const
     return color.darker();
 }
 
-void QmlPalette::setColorGroup(QPalette::ColorGroup colorGroup)
+QmlPalette::ColorGroup QmlPalette::colorGroup() const
+{
+    Q_D(const QmlPalette);
+    return (QmlPalette::ColorGroup)int(d->group);
+}
+
+void QmlPalette::setColorGroup(ColorGroup colorGroup)
 {
     Q_D(QmlPalette);
-    d->group = colorGroup;
+    d->group = (QPalette::ColorGroup)int(colorGroup);
+    emit paletteChanged();
 }
 
 QPalette QmlPalette::palette() const
diff --git a/src/declarative/util/qmlpalette.h b/src/declarative/util/qmlpalette.h
index 7f26f9a..3030557 100644
--- a/src/declarative/util/qmlpalette.h
+++ b/src/declarative/util/qmlpalette.h
@@ -57,11 +57,9 @@ class Q_DECLARATIVE_EXPORT QmlPalette : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QmlPalette)
+    Q_ENUMS(ColorGroup)
 
-public:
-    QmlPalette(QObject *parent=0);
-    ~QmlPalette();
-
+    Q_PROPERTY(ColorGroup colorGroup READ colorGroup WRITE setColorGroup NOTIFY paletteChanged)
     Q_PROPERTY(QColor window READ window NOTIFY paletteChanged)
     Q_PROPERTY(QColor windowText READ windowText NOTIFY paletteChanged)
     Q_PROPERTY(QColor base READ base NOTIFY paletteChanged)
@@ -76,6 +74,13 @@ public:
     Q_PROPERTY(QColor highlight READ highlight NOTIFY paletteChanged)
     Q_PROPERTY(QColor highlightedText READ highlightedText NOTIFY paletteChanged)
 
+public:
+    QmlPalette(QObject *parent=0);
+    ~QmlPalette();
+
+    enum ColorGroup { Disabled = QPalette::Disabled, Active = QPalette::Active,
+                      Inactive = QPalette::Inactive, Normal = QPalette::Normal };
+
     QColor window() const;
     QColor windowText() const;
 
@@ -96,7 +101,8 @@ public:
 
     QPalette palette() const;
 
-    void setColorGroup(QPalette::ColorGroup);
+    ColorGroup colorGroup() const;
+    void setColorGroup(ColorGroup);
 
     bool virtual eventFilter(QObject *watched, QEvent *event);
     bool virtual event(QEvent *event);
diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp
index 456b2ef..2d3a343 100644
--- a/src/declarative/util/qmltimer.cpp
+++ b/src/declarative/util/qmltimer.cpp
@@ -55,12 +55,13 @@ class QmlTimerPrivate : public QObjectPrivate
 public:
     QmlTimerPrivate()
         : interval(1000), running(false), repeating(false), triggeredOnStart(false)
-        , componentComplete(false) {}
+        , classBegun(false), componentComplete(false) {}
     int interval;
     bool running;
     bool repeating;
     bool triggeredOnStart;
     QPauseAnimation pause;
+    bool classBegun;
     bool componentComplete;
 };
 
@@ -190,7 +191,7 @@ void QmlTimer::setTriggeredOnStart(bool triggeredOnStart)
 void QmlTimer::update()
 {
     Q_D(QmlTimer);
-    if (!d->componentComplete)
+    if (d->classBegun && !d->componentComplete)
         return;
     d->pause.stop();
     if (d->running) {
@@ -204,6 +205,12 @@ void QmlTimer::update()
     }
 }
 
+void QmlTimer::classBegin()
+{
+    Q_D(QmlTimer);
+    d->classBegun = true;
+}
+
 void QmlTimer::componentComplete()
 {
     Q_D(QmlTimer);
diff --git a/src/declarative/util/qmltimer.h b/src/declarative/util/qmltimer.h
index 0df4cb9..d376834 100644
--- a/src/declarative/util/qmltimer.h
+++ b/src/declarative/util/qmltimer.h
@@ -80,6 +80,7 @@ public:
     void setTriggeredOnStart(bool triggeredOnStart);
 
 protected:
+    void classBegin();
     void componentComplete();
 
 Q_SIGNALS:
diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index e786edb..8784ae0 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -37,8 +37,6 @@ void usage()
     qWarning("  -autorecord [from-]<tomilliseconds> ...... set recording to start and stop");
     qWarning("  -devicekeys .............................. use numeric keys (see F1)");
     qWarning("  -netcache <size> ......................... set disk cache to size bytes");
-    qWarning("  -recordtest <directory> .................. record an autotest");
-    qWarning("  -runtest <directory> ..................... run a previously recorded test");
     qWarning("  -translation <translationfile> ........... set the language to run in");
     qWarning("  -L <directory> ........................... prepend to the library search path");
     qWarning(" ");
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 6e981de..4f35fe8 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -16,9 +16,10 @@
 #include "qmlviewer.h"
 #include <QtDeclarative/qmlcontext.h>
 #include <QtDeclarative/qmlengine.h>
-#include "qmlpalette.h"
 #include "qml.h"
 #include <private/qperformancelog_p.h>
+#include <QAbstractAnimation>
+#include <private/qabstractanimation_p.h>
 #include "deviceskin.h"
 
 #include <QNetworkDiskCache>
@@ -132,8 +133,6 @@ QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
     devicemode = false;
     skin = 0;
     canvas = 0;
-    palette = 0;
-    disabledPalette = 0;
     record_autotime = 0;
     record_period = 20;
 
@@ -157,6 +156,14 @@ QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
     layout->addWidget(canvas);
 
     setupProxy();
+
+    connect(&autoStartTimer, SIGNAL(triggered()), this, SLOT(autoStartRecording()));
+    connect(&autoStopTimer, SIGNAL(triggered()), this, SLOT(autoStopRecording()));
+    connect(&recordTimer, SIGNAL(triggered()), this, SLOT(recordFrame()));
+    autoStartTimer.setRunning(false);
+    autoStopTimer.setRunning(false);
+    recordTimer.setRunning(false);
+    recordTimer.setRepeating(true);
 }
 
 QMenuBar *QmlViewer::menuBar() const
@@ -302,7 +309,7 @@ void QmlViewer::takeSnapShot()
 
 void QmlViewer::toggleRecordingWithSelection()
 {
-    if (!recordTimer.isActive()) {
+    if (!recordTimer.isRunning()) {
         QString fileName = QFileDialog::getSaveFileName(this, tr("Save Video File"), "", tr("Common Video files (*.avi *.mpeg *.mov);; GIF Animation (*.gif);; Individual PNG frames (*.png);; All ffmpeg formats (*.*)"));
         if (fileName.isEmpty())
             return;
@@ -319,7 +326,7 @@ void QmlViewer::toggleRecording()
         toggleRecordingWithSelection();
         return;
     }
-    bool recording = !recordTimer.isActive();
+    bool recording = !recordTimer.isRunning();
     recordAction->setText(recording ? tr("&Stop Recording Video\tF2") : tr("&Start Recording Video\tF2"));
     setRecording(recording);
 }
@@ -382,7 +389,6 @@ void QmlViewer::openQml(const QString& fileName)
         }
     }
 
-    setupPalettes();
     canvas->setUrl(url);
 
     QTime t;
@@ -407,19 +413,6 @@ void QmlViewer::openQml(const QString& fileName)
 #endif
 }
 
-void QmlViewer:: setupPalettes()
-{
-    delete palette;
-    palette = new QmlPalette;
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("activePalette", palette);
-
-    delete disabledPalette;
-    disabledPalette = new QmlPalette;
-    disabledPalette->setColorGroup(QPalette::Disabled);
-    ctxt->setContextProperty("disabledPalette", disabledPalette);
-}
-
 void QmlViewer::setSkin(const QString& skinDirectory)
 {
     // XXX QWidget::setMask does not handle changes well, and we may
@@ -480,7 +473,7 @@ void QmlViewer::setSkin(const QString& skinDirectory)
 void QmlViewer::setAutoRecord(int from, int to)
 {
     record_autotime = to-from;
-    autoStartTimer.start(from,this);
+    autoStartTimer.setInterval(from);
 }
 
 void QmlViewer::setRecordArgs(const QStringList& a)
@@ -537,11 +530,15 @@ void QmlViewer::keyPressEvent(QKeyEvent *event)
 
 void QmlViewer::setRecording(bool on)
 {
-    if (on == recordTimer.isActive())
+    if (on == recordTimer.isRunning())
         return;
 
+    QUnifiedTimer::instance()->setTimingInterval(on ? record_period:16);
+    QUnifiedTimer::instance()->setConsistentTiming(on);
     if (on) {
-        recordTimer.start(record_period,this);
+        canvas->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+        recordTimer.setInterval(record_period);
+        recordTimer.setRunning(true);
         QString fmt = record_file.right(4).toLower();
         if (fmt != ".png" && fmt != ".gif") {
             // Stream video to ffmpeg
@@ -549,6 +546,7 @@ void QmlViewer::setRecording(bool on)
             QProcess *proc = new QProcess(this);
             connect(proc, SIGNAL(finished(int)), this, SLOT(ffmpegFinished(int)));
             frame_stream = proc;
+            frame = QImage(canvas->width(),canvas->height(),QImage::Format_RGB32);
 
             QStringList args;
             args << "-sameq"; // ie. high
@@ -567,7 +565,8 @@ void QmlViewer::setRecording(bool on)
             frame_stream = 0;
         }
     } else {
-        recordTimer.stop();
+        canvas->setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
+        recordTimer.setRunning(false);
         if (frame_stream) {
             qDebug() << "Saving video...";
             frame_stream->close();
@@ -645,7 +644,7 @@ void QmlViewer::setRecording(bool on)
             frames.clear();
         }
     }
-    qDebug() << "Recording: " << (recordTimer.isActive()?"ON":"OFF");
+    qDebug() << "Recording: " << (recordTimer.isRunning()?"ON":"OFF");
 }
 
 void QmlViewer::ffmpegFinished(int code)
@@ -653,23 +652,25 @@ void QmlViewer::ffmpegFinished(int code)
     qDebug() << "ffmpeg returned" << code << frame_stream->readAllStandardError();
 }
 
-void QmlViewer::timerEvent(QTimerEvent *event)
+void QmlViewer::autoStartRecording()
 {
-    if (event->timerId() == recordTimer.timerId()) {
-        if (frame_stream) {
-            QImage frame = QPixmap::grabWidget(canvas).toImage();
-            frame_stream->write((char*)frame.bits(),frame.numBytes());
-        } else {
-            frames.append(new QImage(QPixmap::grabWidget(canvas).toImage()));
-        }
-        if (record_autotime && autoTimer.elapsed() >= record_autotime)
-            setRecording(false);
-    } else if (event->timerId() == autoStartTimer.timerId()) {
-        autoTimer.start();
-        autoStartTimer.stop();
-        setRecording(true);
+    setRecording(true);
+    autoStopTimer.setInterval(record_autotime);
+    autoStopTimer.setRunning(true);
+}
+
+void QmlViewer::autoStopRecording()
+{
+    setRecording(true);
+}
+
+void QmlViewer::recordFrame()
+{
+    canvas->QWidget::render(&frame);
+    if (frame_stream) {
+        frame_stream->write((char*)frame.bits(),frame.numBytes());
     } else {
-        QWidget::timerEvent(event);
+        frames.append(new QImage(frame));
     }
 }
 
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index 62ee908..6d9f9d0 100644
--- a/tools/qmlviewer/qmlviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -15,7 +15,7 @@
 #define QMLVIEWER_H
 
 #include <QMenuBar>
-#include <QBasicTimer>
+#include <QmlTimer>
 #include <QTime>
 #include <QList>
 
@@ -24,7 +24,6 @@ QT_BEGIN_NAMESPACE
 class QFxView;
 class PreviewDeviceSkin;
 class QFxTestEngine;
-class QmlPalette;
 class QProcess;
 
 class QmlViewer : public QWidget
@@ -39,7 +38,7 @@ public:
     void setRecordArgs(const QStringList&);
     int recordPeriod() const { return record_period; }
     void setRecording(bool on);
-    bool isRecording() const { return recordTimer.isActive(); }
+    bool isRecording() const { return recordTimer.isRunning(); }
     void setAutoRecord(int from, int to);
     void setDeviceKeys(bool);
     void setNetworkCacheSize(int size);
@@ -60,29 +59,29 @@ public slots:
 
 protected:
     virtual void keyPressEvent(QKeyEvent *);
-    virtual void timerEvent(QTimerEvent *);
 
     void createMenu(QMenuBar *menu, QMenu *flatmenu);
 
 private slots:
     void setScaleSkin();
     void setScaleView();
+    void autoStartRecording();
+    void autoStopRecording();
+    void recordFrame();
 
 private:
     void setupProxy();
-    void setupPalettes();
 
     QString currentFileName;
     PreviewDeviceSkin *skin;
     QSize skinscreensize;
     QFxView *canvas;
-    QmlPalette *palette;
-    QmlPalette *disabledPalette;
-    QBasicTimer recordTimer;
+    QmlTimer recordTimer;
+    QImage frame;
     QList<QImage*> frames;
     QProcess* frame_stream;
-    QBasicTimer autoStartTimer;
-    QTime autoTimer;
+    QmlTimer autoStartTimer;
+    QmlTimer autoStopTimer;
     QString record_dither;
     QString record_file;
     QStringList record_args;